]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-3.0-3.18.2-201501111422.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.2-201501111422.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 8f73b41..320950a 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..8fa9957 100644
966 --- a/arch/arm/include/asm/atomic.h
967 +++ b/arch/arm/include/asm/atomic.h
968 @@ -18,17 +18,41 @@
969 #include <asm/barrier.h>
970 #include <asm/cmpxchg.h>
971
972 +#ifdef CONFIG_GENERIC_ATOMIC64
973 +#include <asm-generic/atomic64.h>
974 +#endif
975 +
976 #define ATOMIC_INIT(i) { (i) }
977
978 #ifdef __KERNEL__
979
980 +#ifdef CONFIG_THUMB2_KERNEL
981 +#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
982 +#else
983 +#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
984 +#endif
985 +
986 +#define _ASM_EXTABLE(from, to) \
987 +" .pushsection __ex_table,\"a\"\n"\
988 +" .align 3\n" \
989 +" .long " #from ", " #to"\n" \
990 +" .popsection"
991 +
992 /*
993 * On ARM, ordinary assignment (str instruction) doesn't clear the local
994 * strex/ldrex monitor on some implementations. The reason we can use it for
995 * atomic_set() is the clrex or dummy strex done on every exception return.
996 */
997 #define atomic_read(v) ACCESS_ONCE((v)->counter)
998 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
999 +{
1000 + return ACCESS_ONCE(v->counter);
1001 +}
1002 #define atomic_set(v,i) (((v)->counter) = (i))
1003 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1004 +{
1005 + v->counter = i;
1006 +}
1007
1008 #if __LINUX_ARM_ARCH__ >= 6
1009
1010 @@ -38,26 +62,50 @@
1011 * to ensure that the update happens.
1012 */
1013
1014 -#define ATOMIC_OP(op, c_op, asm_op) \
1015 -static inline void atomic_##op(int i, atomic_t *v) \
1016 +#ifdef CONFIG_PAX_REFCOUNT
1017 +#define __OVERFLOW_POST \
1018 + " bvc 3f\n" \
1019 + "2: " REFCOUNT_TRAP_INSN "\n"\
1020 + "3:\n"
1021 +#define __OVERFLOW_POST_RETURN \
1022 + " bvc 3f\n" \
1023 +" mov %0, %1\n" \
1024 + "2: " REFCOUNT_TRAP_INSN "\n"\
1025 + "3:\n"
1026 +#define __OVERFLOW_EXTABLE \
1027 + "4:\n" \
1028 + _ASM_EXTABLE(2b, 4b)
1029 +#else
1030 +#define __OVERFLOW_POST
1031 +#define __OVERFLOW_POST_RETURN
1032 +#define __OVERFLOW_EXTABLE
1033 +#endif
1034 +
1035 +#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1036 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1037 { \
1038 unsigned long tmp; \
1039 int result; \
1040 \
1041 prefetchw(&v->counter); \
1042 - __asm__ __volatile__("@ atomic_" #op "\n" \
1043 + __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1044 "1: ldrex %0, [%3]\n" \
1045 " " #asm_op " %0, %0, %4\n" \
1046 + post_op \
1047 " strex %1, %0, [%3]\n" \
1048 " teq %1, #0\n" \
1049 -" bne 1b" \
1050 +" bne 1b\n" \
1051 + extable \
1052 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1053 : "r" (&v->counter), "Ir" (i) \
1054 : "cc"); \
1055 } \
1056
1057 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1058 -static inline int atomic_##op##_return(int i, atomic_t *v) \
1059 +#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op, , )\
1060 + __ATOMIC_OP(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1061 +
1062 +#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1063 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1064 { \
1065 unsigned long tmp; \
1066 int result; \
1067 @@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1068 smp_mb(); \
1069 prefetchw(&v->counter); \
1070 \
1071 - __asm__ __volatile__("@ atomic_" #op "_return\n" \
1072 + __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1073 "1: ldrex %0, [%3]\n" \
1074 " " #asm_op " %0, %0, %4\n" \
1075 + post_op \
1076 " strex %1, %0, [%3]\n" \
1077 " teq %1, #0\n" \
1078 -" bne 1b" \
1079 +" bne 1b\n" \
1080 + extable \
1081 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1082 : "r" (&v->counter), "Ir" (i) \
1083 : "cc"); \
1084 @@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1085 return result; \
1086 }
1087
1088 +#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op, , )\
1089 + __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1090 +
1091 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1092 {
1093 int oldval;
1094 @@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1095 __asm__ __volatile__ ("@ atomic_add_unless\n"
1096 "1: ldrex %0, [%4]\n"
1097 " teq %0, %5\n"
1098 -" beq 2f\n"
1099 -" add %1, %0, %6\n"
1100 +" beq 4f\n"
1101 +" adds %1, %0, %6\n"
1102 +
1103 +#ifdef CONFIG_PAX_REFCOUNT
1104 +" bvc 3f\n"
1105 +"2: " REFCOUNT_TRAP_INSN "\n"
1106 +"3:\n"
1107 +#endif
1108 +
1109 " strex %2, %1, [%4]\n"
1110 " teq %2, #0\n"
1111 " bne 1b\n"
1112 -"2:"
1113 +"4:"
1114 +
1115 +#ifdef CONFIG_PAX_REFCOUNT
1116 + _ASM_EXTABLE(2b, 4b)
1117 +#endif
1118 +
1119 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1120 : "r" (&v->counter), "r" (u), "r" (a)
1121 : "cc");
1122 @@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1123 return oldval;
1124 }
1125
1126 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1127 +{
1128 + unsigned long oldval, res;
1129 +
1130 + smp_mb();
1131 +
1132 + do {
1133 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1134 + "ldrex %1, [%3]\n"
1135 + "mov %0, #0\n"
1136 + "teq %1, %4\n"
1137 + "strexeq %0, %5, [%3]\n"
1138 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1139 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
1140 + : "cc");
1141 + } while (res);
1142 +
1143 + smp_mb();
1144 +
1145 + return oldval;
1146 +}
1147 +
1148 #else /* ARM_ARCH_6 */
1149
1150 #ifdef CONFIG_SMP
1151 #error SMP not supported on pre-ARMv6 CPUs
1152 #endif
1153
1154 -#define ATOMIC_OP(op, c_op, asm_op) \
1155 -static inline void atomic_##op(int i, atomic_t *v) \
1156 +#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1157 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1158 { \
1159 unsigned long flags; \
1160 \
1161 @@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1162 raw_local_irq_restore(flags); \
1163 } \
1164
1165 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1166 -static inline int atomic_##op##_return(int i, atomic_t *v) \
1167 +#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1168 + __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1169 +
1170 +#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1171 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1172 { \
1173 unsigned long flags; \
1174 int val; \
1175 @@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1176 return val; \
1177 }
1178
1179 +#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1180 + __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1181 +
1182 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1183 {
1184 int ret;
1185 @@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1186 return ret;
1187 }
1188
1189 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1190 +{
1191 + return atomic_cmpxchg((atomic_t *)v, old, new);
1192 +}
1193 +
1194 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1195 {
1196 int c, old;
1197 @@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1198
1199 #undef ATOMIC_OPS
1200 #undef ATOMIC_OP_RETURN
1201 +#undef __ATOMIC_OP_RETURN
1202 #undef ATOMIC_OP
1203 +#undef __ATOMIC_OP
1204
1205 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1206 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1207 +{
1208 + return xchg(&v->counter, new);
1209 +}
1210
1211 #define atomic_inc(v) atomic_add(1, v)
1212 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1213 +{
1214 + atomic_add_unchecked(1, v);
1215 +}
1216 #define atomic_dec(v) atomic_sub(1, v)
1217 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1218 +{
1219 + atomic_sub_unchecked(1, v);
1220 +}
1221
1222 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1223 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1224 +{
1225 + return atomic_add_return_unchecked(1, v) == 0;
1226 +}
1227 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1228 #define atomic_inc_return(v) (atomic_add_return(1, v))
1229 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1230 +{
1231 + return atomic_add_return_unchecked(1, v);
1232 +}
1233 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1234 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1235
1236 @@ -216,6 +336,14 @@ typedef struct {
1237 long long counter;
1238 } atomic64_t;
1239
1240 +#ifdef CONFIG_PAX_REFCOUNT
1241 +typedef struct {
1242 + long long counter;
1243 +} atomic64_unchecked_t;
1244 +#else
1245 +typedef atomic64_t atomic64_unchecked_t;
1246 +#endif
1247 +
1248 #define ATOMIC64_INIT(i) { (i) }
1249
1250 #ifdef CONFIG_ARM_LPAE
1251 @@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1252 return result;
1253 }
1254
1255 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1256 +{
1257 + long long result;
1258 +
1259 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1260 +" ldrd %0, %H0, [%1]"
1261 + : "=&r" (result)
1262 + : "r" (&v->counter), "Qo" (v->counter)
1263 + );
1264 +
1265 + return result;
1266 +}
1267 +
1268 static inline void atomic64_set(atomic64_t *v, long long i)
1269 {
1270 __asm__ __volatile__("@ atomic64_set\n"
1271 @@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1272 : "r" (&v->counter), "r" (i)
1273 );
1274 }
1275 +
1276 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1277 +{
1278 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1279 +" strd %2, %H2, [%1]"
1280 + : "=Qo" (v->counter)
1281 + : "r" (&v->counter), "r" (i)
1282 + );
1283 +}
1284 #else
1285 static inline long long atomic64_read(const atomic64_t *v)
1286 {
1287 @@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1288 return result;
1289 }
1290
1291 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1292 +{
1293 + long long result;
1294 +
1295 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1296 +" ldrexd %0, %H0, [%1]"
1297 + : "=&r" (result)
1298 + : "r" (&v->counter), "Qo" (v->counter)
1299 + );
1300 +
1301 + return result;
1302 +}
1303 +
1304 static inline void atomic64_set(atomic64_t *v, long long i)
1305 {
1306 long long tmp;
1307 @@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1308 : "r" (&v->counter), "r" (i)
1309 : "cc");
1310 }
1311 +
1312 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1313 +{
1314 + long long tmp;
1315 +
1316 + prefetchw(&v->counter);
1317 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1318 +"1: ldrexd %0, %H0, [%2]\n"
1319 +" strexd %0, %3, %H3, [%2]\n"
1320 +" teq %0, #0\n"
1321 +" bne 1b"
1322 + : "=&r" (tmp), "=Qo" (v->counter)
1323 + : "r" (&v->counter), "r" (i)
1324 + : "cc");
1325 +}
1326 #endif
1327
1328 -#define ATOMIC64_OP(op, op1, op2) \
1329 -static inline void atomic64_##op(long long i, atomic64_t *v) \
1330 +#undef __OVERFLOW_POST_RETURN
1331 +#define __OVERFLOW_POST_RETURN \
1332 + " bvc 3f\n" \
1333 +" mov %0, %1\n" \
1334 +" mov %H0, %H1\n" \
1335 + "2: " REFCOUNT_TRAP_INSN "\n"\
1336 + "3:\n"
1337 +
1338 +#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1339 +static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1340 { \
1341 long long result; \
1342 unsigned long tmp; \
1343 \
1344 prefetchw(&v->counter); \
1345 - __asm__ __volatile__("@ atomic64_" #op "\n" \
1346 + __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1347 "1: ldrexd %0, %H0, [%3]\n" \
1348 " " #op1 " %Q0, %Q0, %Q4\n" \
1349 " " #op2 " %R0, %R0, %R4\n" \
1350 + post_op \
1351 " strexd %1, %0, %H0, [%3]\n" \
1352 " teq %1, #0\n" \
1353 -" bne 1b" \
1354 +" bne 1b\n" \
1355 + extable \
1356 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1357 : "r" (&v->counter), "r" (i) \
1358 : "cc"); \
1359 } \
1360
1361 -#define ATOMIC64_OP_RETURN(op, op1, op2) \
1362 -static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1363 +#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
1364 + __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1365 +
1366 +#define __ATOMIC64_OP_RETURN(op, op1, op2, post_op, extable) \
1367 +static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1368 { \
1369 long long result; \
1370 unsigned long tmp; \
1371 @@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1372 smp_mb(); \
1373 prefetchw(&v->counter); \
1374 \
1375 - __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1376 + __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1377 "1: ldrexd %0, %H0, [%3]\n" \
1378 " " #op1 " %Q0, %Q0, %Q4\n" \
1379 " " #op2 " %R0, %R0, %R4\n" \
1380 + post_op \
1381 " strexd %1, %0, %H0, [%3]\n" \
1382 " teq %1, #0\n" \
1383 -" bne 1b" \
1384 +" bne 1b\n" \
1385 + extable \
1386 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1387 : "r" (&v->counter), "r" (i) \
1388 : "cc"); \
1389 @@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1390 return result; \
1391 }
1392
1393 +#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
1394 + __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1395 +
1396 #define ATOMIC64_OPS(op, op1, op2) \
1397 ATOMIC64_OP(op, op1, op2) \
1398 ATOMIC64_OP_RETURN(op, op1, op2)
1399 @@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1400
1401 #undef ATOMIC64_OPS
1402 #undef ATOMIC64_OP_RETURN
1403 +#undef __ATOMIC64_OP_RETURN
1404 #undef ATOMIC64_OP
1405 +#undef __ATOMIC64_OP
1406 +#undef __OVERFLOW_EXTABLE
1407 +#undef __OVERFLOW_POST_RETURN
1408 +#undef __OVERFLOW_POST
1409
1410 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1411 long long new)
1412 @@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1413 return oldval;
1414 }
1415
1416 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1417 + long long new)
1418 +{
1419 + long long oldval;
1420 + unsigned long res;
1421 +
1422 + smp_mb();
1423 +
1424 + do {
1425 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1426 + "ldrexd %1, %H1, [%3]\n"
1427 + "mov %0, #0\n"
1428 + "teq %1, %4\n"
1429 + "teqeq %H1, %H4\n"
1430 + "strexdeq %0, %5, %H5, [%3]"
1431 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1432 + : "r" (&ptr->counter), "r" (old), "r" (new)
1433 + : "cc");
1434 + } while (res);
1435 +
1436 + smp_mb();
1437 +
1438 + return oldval;
1439 +}
1440 +
1441 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1442 {
1443 long long result;
1444 @@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1445 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1446 {
1447 long long result;
1448 - unsigned long tmp;
1449 + u64 tmp;
1450
1451 smp_mb();
1452 prefetchw(&v->counter);
1453
1454 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1455 -"1: ldrexd %0, %H0, [%3]\n"
1456 -" subs %Q0, %Q0, #1\n"
1457 -" sbc %R0, %R0, #0\n"
1458 +"1: ldrexd %1, %H1, [%3]\n"
1459 +" subs %Q0, %Q1, #1\n"
1460 +" sbcs %R0, %R1, #0\n"
1461 +
1462 +#ifdef CONFIG_PAX_REFCOUNT
1463 +" bvc 3f\n"
1464 +" mov %Q0, %Q1\n"
1465 +" mov %R0, %R1\n"
1466 +"2: " REFCOUNT_TRAP_INSN "\n"
1467 +"3:\n"
1468 +#endif
1469 +
1470 " teq %R0, #0\n"
1471 -" bmi 2f\n"
1472 +" bmi 4f\n"
1473 " strexd %1, %0, %H0, [%3]\n"
1474 " teq %1, #0\n"
1475 " bne 1b\n"
1476 -"2:"
1477 +"4:\n"
1478 +
1479 +#ifdef CONFIG_PAX_REFCOUNT
1480 + _ASM_EXTABLE(2b, 4b)
1481 +#endif
1482 +
1483 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1484 : "r" (&v->counter)
1485 : "cc");
1486 @@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1487 " teq %0, %5\n"
1488 " teqeq %H0, %H5\n"
1489 " moveq %1, #0\n"
1490 -" beq 2f\n"
1491 +" beq 4f\n"
1492 " adds %Q0, %Q0, %Q6\n"
1493 -" adc %R0, %R0, %R6\n"
1494 +" adcs %R0, %R0, %R6\n"
1495 +
1496 +#ifdef CONFIG_PAX_REFCOUNT
1497 +" bvc 3f\n"
1498 +"2: " REFCOUNT_TRAP_INSN "\n"
1499 +"3:\n"
1500 +#endif
1501 +
1502 " strexd %2, %0, %H0, [%4]\n"
1503 " teq %2, #0\n"
1504 " bne 1b\n"
1505 -"2:"
1506 +"4:\n"
1507 +
1508 +#ifdef CONFIG_PAX_REFCOUNT
1509 + _ASM_EXTABLE(2b, 4b)
1510 +#endif
1511 +
1512 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1513 : "r" (&v->counter), "r" (u), "r" (a)
1514 : "cc");
1515 @@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1516
1517 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1518 #define atomic64_inc(v) atomic64_add(1LL, (v))
1519 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1520 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1521 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1522 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1523 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1524 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1525 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1526 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1527 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1528 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1529 diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1530 index c6a3e73..35cca85 100644
1531 --- a/arch/arm/include/asm/barrier.h
1532 +++ b/arch/arm/include/asm/barrier.h
1533 @@ -63,7 +63,7 @@
1534 do { \
1535 compiletime_assert_atomic_type(*p); \
1536 smp_mb(); \
1537 - ACCESS_ONCE(*p) = (v); \
1538 + ACCESS_ONCE_RW(*p) = (v); \
1539 } while (0)
1540
1541 #define smp_load_acquire(p) \
1542 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1543 index 75fe66b..ba3dee4 100644
1544 --- a/arch/arm/include/asm/cache.h
1545 +++ b/arch/arm/include/asm/cache.h
1546 @@ -4,8 +4,10 @@
1547 #ifndef __ASMARM_CACHE_H
1548 #define __ASMARM_CACHE_H
1549
1550 +#include <linux/const.h>
1551 +
1552 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1553 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1554 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1555
1556 /*
1557 * Memory returned by kmalloc() may be used for DMA, so we must make
1558 @@ -24,5 +26,6 @@
1559 #endif
1560
1561 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1562 +#define __read_only __attribute__ ((__section__(".data..read_only")))
1563
1564 #endif
1565 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1566 index 10e78d0..dc8505d 100644
1567 --- a/arch/arm/include/asm/cacheflush.h
1568 +++ b/arch/arm/include/asm/cacheflush.h
1569 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
1570 void (*dma_unmap_area)(const void *, size_t, int);
1571
1572 void (*dma_flush_range)(const void *, const void *);
1573 -};
1574 +} __no_const;
1575
1576 /*
1577 * Select the calling method
1578 diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1579 index 5233151..87a71fa 100644
1580 --- a/arch/arm/include/asm/checksum.h
1581 +++ b/arch/arm/include/asm/checksum.h
1582 @@ -37,7 +37,19 @@ __wsum
1583 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1584
1585 __wsum
1586 -csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1587 +__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1588 +
1589 +static inline __wsum
1590 +csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1591 +{
1592 + __wsum ret;
1593 + pax_open_userland();
1594 + ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1595 + pax_close_userland();
1596 + return ret;
1597 +}
1598 +
1599 +
1600
1601 /*
1602 * Fold a partial checksum without adding pseudo headers
1603 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1604 index abb2c37..96db950 100644
1605 --- a/arch/arm/include/asm/cmpxchg.h
1606 +++ b/arch/arm/include/asm/cmpxchg.h
1607 @@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1608
1609 #define xchg(ptr,x) \
1610 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1611 +#define xchg_unchecked(ptr,x) \
1612 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1613
1614 #include <asm-generic/cmpxchg-local.h>
1615
1616 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1617 index 6ddbe44..b5e38b1 100644
1618 --- a/arch/arm/include/asm/domain.h
1619 +++ b/arch/arm/include/asm/domain.h
1620 @@ -48,18 +48,37 @@
1621 * Domain types
1622 */
1623 #define DOMAIN_NOACCESS 0
1624 -#define DOMAIN_CLIENT 1
1625 #ifdef CONFIG_CPU_USE_DOMAINS
1626 +#define DOMAIN_USERCLIENT 1
1627 +#define DOMAIN_KERNELCLIENT 1
1628 #define DOMAIN_MANAGER 3
1629 +#define DOMAIN_VECTORS DOMAIN_USER
1630 #else
1631 +
1632 +#ifdef CONFIG_PAX_KERNEXEC
1633 #define DOMAIN_MANAGER 1
1634 +#define DOMAIN_KERNEXEC 3
1635 +#else
1636 +#define DOMAIN_MANAGER 1
1637 +#endif
1638 +
1639 +#ifdef CONFIG_PAX_MEMORY_UDEREF
1640 +#define DOMAIN_USERCLIENT 0
1641 +#define DOMAIN_UDEREF 1
1642 +#define DOMAIN_VECTORS DOMAIN_KERNEL
1643 +#else
1644 +#define DOMAIN_USERCLIENT 1
1645 +#define DOMAIN_VECTORS DOMAIN_USER
1646 +#endif
1647 +#define DOMAIN_KERNELCLIENT 1
1648 +
1649 #endif
1650
1651 #define domain_val(dom,type) ((type) << (2*(dom)))
1652
1653 #ifndef __ASSEMBLY__
1654
1655 -#ifdef CONFIG_CPU_USE_DOMAINS
1656 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1657 static inline void set_domain(unsigned val)
1658 {
1659 asm volatile(
1660 @@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1661 isb();
1662 }
1663
1664 -#define modify_domain(dom,type) \
1665 - do { \
1666 - struct thread_info *thread = current_thread_info(); \
1667 - unsigned int domain = thread->cpu_domain; \
1668 - domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1669 - thread->cpu_domain = domain | domain_val(dom, type); \
1670 - set_domain(thread->cpu_domain); \
1671 - } while (0)
1672 -
1673 +extern void modify_domain(unsigned int dom, unsigned int type);
1674 #else
1675 static inline void set_domain(unsigned val) { }
1676 static inline void modify_domain(unsigned dom, unsigned type) { }
1677 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1678 index afb9caf..9a0bac0 100644
1679 --- a/arch/arm/include/asm/elf.h
1680 +++ b/arch/arm/include/asm/elf.h
1681 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1682 the loader. We need to make sure that it is out of the way of the program
1683 that it will "exec", and that there is sufficient room for the brk. */
1684
1685 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1686 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1687 +
1688 +#ifdef CONFIG_PAX_ASLR
1689 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1690 +
1691 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1692 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1693 +#endif
1694
1695 /* When the program starts, a1 contains a pointer to a function to be
1696 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1697 @@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1698 extern void elf_set_personality(const struct elf32_hdr *);
1699 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1700
1701 -struct mm_struct;
1702 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1703 -#define arch_randomize_brk arch_randomize_brk
1704 -
1705 #ifdef CONFIG_MMU
1706 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1707 struct linux_binprm;
1708 diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1709 index de53547..52b9a28 100644
1710 --- a/arch/arm/include/asm/fncpy.h
1711 +++ b/arch/arm/include/asm/fncpy.h
1712 @@ -81,7 +81,9 @@
1713 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1714 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1715 \
1716 + pax_open_kernel(); \
1717 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1718 + pax_close_kernel(); \
1719 flush_icache_range((unsigned long)(dest_buf), \
1720 (unsigned long)(dest_buf) + (size)); \
1721 \
1722 diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1723 index 53e69da..3fdc896 100644
1724 --- a/arch/arm/include/asm/futex.h
1725 +++ b/arch/arm/include/asm/futex.h
1726 @@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1727 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1728 return -EFAULT;
1729
1730 + pax_open_userland();
1731 +
1732 smp_mb();
1733 /* Prefetching cannot fault */
1734 prefetchw(uaddr);
1735 @@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1736 : "cc", "memory");
1737 smp_mb();
1738
1739 + pax_close_userland();
1740 +
1741 *uval = val;
1742 return ret;
1743 }
1744 @@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1745 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1746 return -EFAULT;
1747
1748 + pax_open_userland();
1749 +
1750 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1751 "1: " TUSER(ldr) " %1, [%4]\n"
1752 " teq %1, %2\n"
1753 @@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1755 : "cc", "memory");
1756
1757 + pax_close_userland();
1758 +
1759 *uval = val;
1760 return ret;
1761 }
1762 @@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1763 return -EFAULT;
1764
1765 pagefault_disable(); /* implies preempt_disable() */
1766 + pax_open_userland();
1767
1768 switch (op) {
1769 case FUTEX_OP_SET:
1770 @@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1771 ret = -ENOSYS;
1772 }
1773
1774 + pax_close_userland();
1775 pagefault_enable(); /* subsumes preempt_enable() */
1776
1777 if (!ret) {
1778 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1779 index 83eb2f7..ed77159 100644
1780 --- a/arch/arm/include/asm/kmap_types.h
1781 +++ b/arch/arm/include/asm/kmap_types.h
1782 @@ -4,6 +4,6 @@
1783 /*
1784 * This is the "bare minimum". AIO seems to require this.
1785 */
1786 -#define KM_TYPE_NR 16
1787 +#define KM_TYPE_NR 17
1788
1789 #endif
1790 diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1791 index 9e614a1..3302cca 100644
1792 --- a/arch/arm/include/asm/mach/dma.h
1793 +++ b/arch/arm/include/asm/mach/dma.h
1794 @@ -22,7 +22,7 @@ struct dma_ops {
1795 int (*residue)(unsigned int, dma_t *); /* optional */
1796 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1797 const char *type;
1798 -};
1799 +} __do_const;
1800
1801 struct dma_struct {
1802 void *addr; /* single DMA address */
1803 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1804 index f98c7f3..e5c626d 100644
1805 --- a/arch/arm/include/asm/mach/map.h
1806 +++ b/arch/arm/include/asm/mach/map.h
1807 @@ -23,17 +23,19 @@ struct map_desc {
1808
1809 /* types 0-3 are defined in asm/io.h */
1810 enum {
1811 - MT_UNCACHED = 4,
1812 - MT_CACHECLEAN,
1813 - MT_MINICLEAN,
1814 + MT_UNCACHED_RW = 4,
1815 + MT_CACHECLEAN_RO,
1816 + MT_MINICLEAN_RO,
1817 MT_LOW_VECTORS,
1818 MT_HIGH_VECTORS,
1819 - MT_MEMORY_RWX,
1820 + __MT_MEMORY_RWX,
1821 MT_MEMORY_RW,
1822 - MT_ROM,
1823 - MT_MEMORY_RWX_NONCACHED,
1824 + MT_MEMORY_RX,
1825 + MT_ROM_RX,
1826 + MT_MEMORY_RW_NONCACHED,
1827 + MT_MEMORY_RX_NONCACHED,
1828 MT_MEMORY_RW_DTCM,
1829 - MT_MEMORY_RWX_ITCM,
1830 + MT_MEMORY_RX_ITCM,
1831 MT_MEMORY_RW_SO,
1832 MT_MEMORY_DMA_READY,
1833 };
1834 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1835 index 891a56b..48f337e 100644
1836 --- a/arch/arm/include/asm/outercache.h
1837 +++ b/arch/arm/include/asm/outercache.h
1838 @@ -36,7 +36,7 @@ struct outer_cache_fns {
1839
1840 /* This is an ARM L2C thing */
1841 void (*write_sec)(unsigned long, unsigned);
1842 -};
1843 +} __no_const;
1844
1845 extern struct outer_cache_fns outer_cache;
1846
1847 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1848 index 4355f0e..cd9168e 100644
1849 --- a/arch/arm/include/asm/page.h
1850 +++ b/arch/arm/include/asm/page.h
1851 @@ -23,6 +23,7 @@
1852
1853 #else
1854
1855 +#include <linux/compiler.h>
1856 #include <asm/glue.h>
1857
1858 /*
1859 @@ -114,7 +115,7 @@ struct cpu_user_fns {
1860 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1861 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1862 unsigned long vaddr, struct vm_area_struct *vma);
1863 -};
1864 +} __no_const;
1865
1866 #ifdef MULTI_USER
1867 extern struct cpu_user_fns cpu_user;
1868 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1869 index 78a7793..e3dc06c 100644
1870 --- a/arch/arm/include/asm/pgalloc.h
1871 +++ b/arch/arm/include/asm/pgalloc.h
1872 @@ -17,6 +17,7 @@
1873 #include <asm/processor.h>
1874 #include <asm/cacheflush.h>
1875 #include <asm/tlbflush.h>
1876 +#include <asm/system_info.h>
1877
1878 #define check_pgt_cache() do { } while (0)
1879
1880 @@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1881 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1882 }
1883
1884 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1885 +{
1886 + pud_populate(mm, pud, pmd);
1887 +}
1888 +
1889 #else /* !CONFIG_ARM_LPAE */
1890
1891 /*
1892 @@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1893 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1894 #define pmd_free(mm, pmd) do { } while (0)
1895 #define pud_populate(mm,pmd,pte) BUG()
1896 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1897
1898 #endif /* CONFIG_ARM_LPAE */
1899
1900 @@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1901 __free_page(pte);
1902 }
1903
1904 +static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1905 +{
1906 +#ifdef CONFIG_ARM_LPAE
1907 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1908 +#else
1909 + if (addr & SECTION_SIZE)
1910 + pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1911 + else
1912 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913 +#endif
1914 + flush_pmd_entry(pmdp);
1915 +}
1916 +
1917 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1918 pmdval_t prot)
1919 {
1920 @@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1921 static inline void
1922 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1923 {
1924 - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1925 + __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1926 }
1927 #define pmd_pgtable(pmd) pmd_page(pmd)
1928
1929 diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1930 index 5cfba15..f415e1a 100644
1931 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1932 +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1933 @@ -20,12 +20,15 @@
1934 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1935 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1936 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1937 +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1938 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1939 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1940 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1941 +
1942 /*
1943 * - section
1944 */
1945 +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1946 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1947 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1948 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1949 @@ -37,6 +40,7 @@
1950 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1951 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1952 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1953 +#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1954
1955 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1956 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1957 @@ -66,6 +70,7 @@
1958 * - extended small page/tiny page
1959 */
1960 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1961 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1962 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1963 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1964 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1965 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1966 index f027941..f36ce30 100644
1967 --- a/arch/arm/include/asm/pgtable-2level.h
1968 +++ b/arch/arm/include/asm/pgtable-2level.h
1969 @@ -126,6 +126,9 @@
1970 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1971 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1972
1973 +/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1974 +#define L_PTE_PXN (_AT(pteval_t, 0))
1975 +
1976 /*
1977 * These are the memory types, defined to be compatible with
1978 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1979 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1980 index 9fd61c7..f8f1cff 100644
1981 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1982 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1983 @@ -76,6 +76,7 @@
1984 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1985 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1986 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1987 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1988 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1989
1990 /*
1991 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1992 index a31ecdad..95e98d4 100644
1993 --- a/arch/arm/include/asm/pgtable-3level.h
1994 +++ b/arch/arm/include/asm/pgtable-3level.h
1995 @@ -81,6 +81,7 @@
1996 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1997 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1998 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1999 +#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2000 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2001 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2002 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2003 @@ -92,10 +93,12 @@
2004 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2005 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2006 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2007 +#define PMD_SECT_RDONLY PMD_SECT_AP2
2008
2009 /*
2010 * To be used in assembly code with the upper page attributes.
2011 */
2012 +#define L_PTE_PXN_HIGH (1 << (53 - 32))
2013 #define L_PTE_XN_HIGH (1 << (54 - 32))
2014 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2015
2016 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2017 index 3b30062..01a5f9d 100644
2018 --- a/arch/arm/include/asm/pgtable.h
2019 +++ b/arch/arm/include/asm/pgtable.h
2020 @@ -33,6 +33,9 @@
2021 #include <asm/pgtable-2level.h>
2022 #endif
2023
2024 +#define ktla_ktva(addr) (addr)
2025 +#define ktva_ktla(addr) (addr)
2026 +
2027 /*
2028 * Just any arbitrary offset to the start of the vmalloc VM area: the
2029 * current 8MB value just means that there will be a 8MB "hole" after the
2030 @@ -48,6 +51,9 @@
2031 #define LIBRARY_TEXT_START 0x0c000000
2032
2033 #ifndef __ASSEMBLY__
2034 +extern pteval_t __supported_pte_mask;
2035 +extern pmdval_t __supported_pmd_mask;
2036 +
2037 extern void __pte_error(const char *file, int line, pte_t);
2038 extern void __pmd_error(const char *file, int line, pmd_t);
2039 extern void __pgd_error(const char *file, int line, pgd_t);
2040 @@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2041 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2042 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2043
2044 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
2045 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2046 +
2047 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2048 +#include <asm/domain.h>
2049 +#include <linux/thread_info.h>
2050 +#include <linux/preempt.h>
2051 +
2052 +static inline int test_domain(int domain, int domaintype)
2053 +{
2054 + return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2055 +}
2056 +#endif
2057 +
2058 +#ifdef CONFIG_PAX_KERNEXEC
2059 +static inline unsigned long pax_open_kernel(void) {
2060 +#ifdef CONFIG_ARM_LPAE
2061 + /* TODO */
2062 +#else
2063 + preempt_disable();
2064 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2065 + modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2066 +#endif
2067 + return 0;
2068 +}
2069 +
2070 +static inline unsigned long pax_close_kernel(void) {
2071 +#ifdef CONFIG_ARM_LPAE
2072 + /* TODO */
2073 +#else
2074 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2075 + /* DOMAIN_MANAGER = "client" under KERNEXEC */
2076 + modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2077 + preempt_enable_no_resched();
2078 +#endif
2079 + return 0;
2080 +}
2081 +#else
2082 +static inline unsigned long pax_open_kernel(void) { return 0; }
2083 +static inline unsigned long pax_close_kernel(void) { return 0; }
2084 +#endif
2085 +
2086 /*
2087 * This is the lowest virtual address we can permit any user space
2088 * mapping to be mapped at. This is particularly important for
2089 @@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2090 /*
2091 * The pgprot_* and protection_map entries will be fixed up in runtime
2092 * to include the cachable and bufferable bits based on memory policy,
2093 - * as well as any architecture dependent bits like global/ASID and SMP
2094 - * shared mapping bits.
2095 + * as well as any architecture dependent bits like global/ASID, PXN,
2096 + * and SMP shared mapping bits.
2097 */
2098 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2099
2100 @@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
2101 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2102 {
2103 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2104 - L_PTE_NONE | L_PTE_VALID;
2105 + L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2106 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2107 return pte;
2108 }
2109 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2110 index c25ef3e..735f14b 100644
2111 --- a/arch/arm/include/asm/psci.h
2112 +++ b/arch/arm/include/asm/psci.h
2113 @@ -32,7 +32,7 @@ struct psci_operations {
2114 int (*affinity_info)(unsigned long target_affinity,
2115 unsigned long lowest_affinity_level);
2116 int (*migrate_info_type)(void);
2117 -};
2118 +} __no_const;
2119
2120 extern struct psci_operations psci_ops;
2121 extern struct smp_operations psci_smp_ops;
2122 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2123 index 18f5a55..5072a40 100644
2124 --- a/arch/arm/include/asm/smp.h
2125 +++ b/arch/arm/include/asm/smp.h
2126 @@ -107,7 +107,7 @@ struct smp_operations {
2127 int (*cpu_disable)(unsigned int cpu);
2128 #endif
2129 #endif
2130 -};
2131 +} __no_const;
2132
2133 struct of_cpu_method {
2134 const char *method;
2135 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2136 index ce73ab6..7310f8a 100644
2137 --- a/arch/arm/include/asm/thread_info.h
2138 +++ b/arch/arm/include/asm/thread_info.h
2139 @@ -78,9 +78,9 @@ struct thread_info {
2140 .flags = 0, \
2141 .preempt_count = INIT_PREEMPT_COUNT, \
2142 .addr_limit = KERNEL_DS, \
2143 - .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2144 - domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2145 - domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2146 + .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2147 + domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2148 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2149 .restart_block = { \
2150 .fn = do_no_restart_syscall, \
2151 }, \
2152 @@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2153 #define TIF_SYSCALL_AUDIT 9
2154 #define TIF_SYSCALL_TRACEPOINT 10
2155 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2156 -#define TIF_NOHZ 12 /* in adaptive nohz mode */
2157 +/* within 8 bits of TIF_SYSCALL_TRACE
2158 + * to meet flexible second operand requirements
2159 + */
2160 +#define TIF_GRSEC_SETXID 12
2161 +#define TIF_NOHZ 13 /* in adaptive nohz mode */
2162 #define TIF_USING_IWMMXT 17
2163 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2164 #define TIF_RESTORE_SIGMASK 20
2165 @@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2166 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2167 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2168 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2169 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2170
2171 /* Checks for any syscall work in entry-common.S */
2172 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2173 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2174 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2175
2176 /*
2177 * Change these and you break ASM code in entry-common.S
2178 diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2179 index 5f833f7..76e6644 100644
2180 --- a/arch/arm/include/asm/tls.h
2181 +++ b/arch/arm/include/asm/tls.h
2182 @@ -3,6 +3,7 @@
2183
2184 #include <linux/compiler.h>
2185 #include <asm/thread_info.h>
2186 +#include <asm/pgtable.h>
2187
2188 #ifdef __ASSEMBLY__
2189 #include <asm/asm-offsets.h>
2190 @@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2191 * at 0xffff0fe0 must be used instead. (see
2192 * entry-armv.S for details)
2193 */
2194 + pax_open_kernel();
2195 *((unsigned int *)0xffff0ff0) = val;
2196 + pax_close_kernel();
2197 #endif
2198 }
2199
2200 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2201 index 4767eb9..bf00668 100644
2202 --- a/arch/arm/include/asm/uaccess.h
2203 +++ b/arch/arm/include/asm/uaccess.h
2204 @@ -18,6 +18,7 @@
2205 #include <asm/domain.h>
2206 #include <asm/unified.h>
2207 #include <asm/compiler.h>
2208 +#include <asm/pgtable.h>
2209
2210 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2211 #include <asm-generic/uaccess-unaligned.h>
2212 @@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2213 static inline void set_fs(mm_segment_t fs)
2214 {
2215 current_thread_info()->addr_limit = fs;
2216 - modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2217 + modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2218 }
2219
2220 #define segment_eq(a,b) ((a) == (b))
2221
2222 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
2223 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2224 +
2225 +static inline void pax_open_userland(void)
2226 +{
2227 +
2228 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2229 + if (segment_eq(get_fs(), USER_DS)) {
2230 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2231 + modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2232 + }
2233 +#endif
2234 +
2235 +}
2236 +
2237 +static inline void pax_close_userland(void)
2238 +{
2239 +
2240 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2241 + if (segment_eq(get_fs(), USER_DS)) {
2242 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2243 + modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2244 + }
2245 +#endif
2246 +
2247 +}
2248 +
2249 #define __addr_ok(addr) ({ \
2250 unsigned long flag; \
2251 __asm__("cmp %2, %0; movlo %0, #0" \
2252 @@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2253
2254 #define get_user(x,p) \
2255 ({ \
2256 + int __e; \
2257 might_fault(); \
2258 - __get_user_check(x,p); \
2259 + pax_open_userland(); \
2260 + __e = __get_user_check(x,p); \
2261 + pax_close_userland(); \
2262 + __e; \
2263 })
2264
2265 extern int __put_user_1(void *, unsigned int);
2266 @@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2267
2268 #define put_user(x,p) \
2269 ({ \
2270 + int __e; \
2271 might_fault(); \
2272 - __put_user_check(x,p); \
2273 + pax_open_userland(); \
2274 + __e = __put_user_check(x,p); \
2275 + pax_close_userland(); \
2276 + __e; \
2277 })
2278
2279 #else /* CONFIG_MMU */
2280 @@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2281
2282 #endif /* CONFIG_MMU */
2283
2284 +#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2285 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2286
2287 #define user_addr_max() \
2288 @@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2289 #define __get_user(x,ptr) \
2290 ({ \
2291 long __gu_err = 0; \
2292 + pax_open_userland(); \
2293 __get_user_err((x),(ptr),__gu_err); \
2294 + pax_close_userland(); \
2295 __gu_err; \
2296 })
2297
2298 #define __get_user_error(x,ptr,err) \
2299 ({ \
2300 + pax_open_userland(); \
2301 __get_user_err((x),(ptr),err); \
2302 + pax_close_userland(); \
2303 (void) 0; \
2304 })
2305
2306 @@ -368,13 +409,17 @@ do { \
2307 #define __put_user(x,ptr) \
2308 ({ \
2309 long __pu_err = 0; \
2310 + pax_open_userland(); \
2311 __put_user_err((x),(ptr),__pu_err); \
2312 + pax_close_userland(); \
2313 __pu_err; \
2314 })
2315
2316 #define __put_user_error(x,ptr,err) \
2317 ({ \
2318 + pax_open_userland(); \
2319 __put_user_err((x),(ptr),err); \
2320 + pax_close_userland(); \
2321 (void) 0; \
2322 })
2323
2324 @@ -474,11 +519,44 @@ do { \
2325
2326
2327 #ifdef CONFIG_MMU
2328 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2329 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2330 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2331 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2332 +
2333 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2334 +{
2335 + unsigned long ret;
2336 +
2337 + check_object_size(to, n, false);
2338 + pax_open_userland();
2339 + ret = ___copy_from_user(to, from, n);
2340 + pax_close_userland();
2341 + return ret;
2342 +}
2343 +
2344 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2345 +{
2346 + unsigned long ret;
2347 +
2348 + check_object_size(from, n, true);
2349 + pax_open_userland();
2350 + ret = ___copy_to_user(to, from, n);
2351 + pax_close_userland();
2352 + return ret;
2353 +}
2354 +
2355 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2356 -extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2357 +extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2358 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2359 +
2360 +static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2361 +{
2362 + unsigned long ret;
2363 + pax_open_userland();
2364 + ret = ___clear_user(addr, n);
2365 + pax_close_userland();
2366 + return ret;
2367 +}
2368 +
2369 #else
2370 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2371 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2372 @@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2373
2374 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2375 {
2376 + if ((long)n < 0)
2377 + return n;
2378 +
2379 if (access_ok(VERIFY_READ, from, n))
2380 n = __copy_from_user(to, from, n);
2381 else /* security hole - plug it */
2382 @@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2383
2384 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2385 {
2386 + if ((long)n < 0)
2387 + return n;
2388 +
2389 if (access_ok(VERIFY_WRITE, to, n))
2390 n = __copy_to_user(to, from, n);
2391 return n;
2392 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2393 index 5af0ed1..cea83883 100644
2394 --- a/arch/arm/include/uapi/asm/ptrace.h
2395 +++ b/arch/arm/include/uapi/asm/ptrace.h
2396 @@ -92,7 +92,7 @@
2397 * ARMv7 groups of PSR bits
2398 */
2399 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2400 -#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2401 +#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2402 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2403 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2404
2405 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2406 index a88671c..1cc895e 100644
2407 --- a/arch/arm/kernel/armksyms.c
2408 +++ b/arch/arm/kernel/armksyms.c
2409 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2410
2411 /* networking */
2412 EXPORT_SYMBOL(csum_partial);
2413 -EXPORT_SYMBOL(csum_partial_copy_from_user);
2414 +EXPORT_SYMBOL(__csum_partial_copy_from_user);
2415 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2416 EXPORT_SYMBOL(__csum_ipv6_magic);
2417
2418 @@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2419 #ifdef CONFIG_MMU
2420 EXPORT_SYMBOL(copy_page);
2421
2422 -EXPORT_SYMBOL(__copy_from_user);
2423 -EXPORT_SYMBOL(__copy_to_user);
2424 -EXPORT_SYMBOL(__clear_user);
2425 +EXPORT_SYMBOL(___copy_from_user);
2426 +EXPORT_SYMBOL(___copy_to_user);
2427 +EXPORT_SYMBOL(___clear_user);
2428
2429 EXPORT_SYMBOL(__get_user_1);
2430 EXPORT_SYMBOL(__get_user_2);
2431 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2432 index 2f5555d..d493c91 100644
2433 --- a/arch/arm/kernel/entry-armv.S
2434 +++ b/arch/arm/kernel/entry-armv.S
2435 @@ -47,6 +47,87 @@
2436 9997:
2437 .endm
2438
2439 + .macro pax_enter_kernel
2440 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2441 + @ make aligned space for saved DACR
2442 + sub sp, sp, #8
2443 + @ save regs
2444 + stmdb sp!, {r1, r2}
2445 + @ read DACR from cpu_domain into r1
2446 + mov r2, sp
2447 + @ assume 8K pages, since we have to split the immediate in two
2448 + bic r2, r2, #(0x1fc0)
2449 + bic r2, r2, #(0x3f)
2450 + ldr r1, [r2, #TI_CPU_DOMAIN]
2451 + @ store old DACR on stack
2452 + str r1, [sp, #8]
2453 +#ifdef CONFIG_PAX_KERNEXEC
2454 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2455 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2456 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2457 +#endif
2458 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2459 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2460 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2461 +#endif
2462 + @ write r1 to current_thread_info()->cpu_domain
2463 + str r1, [r2, #TI_CPU_DOMAIN]
2464 + @ write r1 to DACR
2465 + mcr p15, 0, r1, c3, c0, 0
2466 + @ instruction sync
2467 + instr_sync
2468 + @ restore regs
2469 + ldmia sp!, {r1, r2}
2470 +#endif
2471 + .endm
2472 +
2473 + .macro pax_open_userland
2474 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2475 + @ save regs
2476 + stmdb sp!, {r0, r1}
2477 + @ read DACR from cpu_domain into r1
2478 + mov r0, sp
2479 + @ assume 8K pages, since we have to split the immediate in two
2480 + bic r0, r0, #(0x1fc0)
2481 + bic r0, r0, #(0x3f)
2482 + ldr r1, [r0, #TI_CPU_DOMAIN]
2483 + @ set current DOMAIN_USER to DOMAIN_CLIENT
2484 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2485 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2486 + @ write r1 to current_thread_info()->cpu_domain
2487 + str r1, [r0, #TI_CPU_DOMAIN]
2488 + @ write r1 to DACR
2489 + mcr p15, 0, r1, c3, c0, 0
2490 + @ instruction sync
2491 + instr_sync
2492 + @ restore regs
2493 + ldmia sp!, {r0, r1}
2494 +#endif
2495 + .endm
2496 +
2497 + .macro pax_close_userland
2498 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2499 + @ save regs
2500 + stmdb sp!, {r0, r1}
2501 + @ read DACR from cpu_domain into r1
2502 + mov r0, sp
2503 + @ assume 8K pages, since we have to split the immediate in two
2504 + bic r0, r0, #(0x1fc0)
2505 + bic r0, r0, #(0x3f)
2506 + ldr r1, [r0, #TI_CPU_DOMAIN]
2507 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2508 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2509 + @ write r1 to current_thread_info()->cpu_domain
2510 + str r1, [r0, #TI_CPU_DOMAIN]
2511 + @ write r1 to DACR
2512 + mcr p15, 0, r1, c3, c0, 0
2513 + @ instruction sync
2514 + instr_sync
2515 + @ restore regs
2516 + ldmia sp!, {r0, r1}
2517 +#endif
2518 + .endm
2519 +
2520 .macro pabt_helper
2521 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2522 #ifdef MULTI_PABORT
2523 @@ -89,11 +170,15 @@
2524 * Invalid mode handlers
2525 */
2526 .macro inv_entry, reason
2527 +
2528 + pax_enter_kernel
2529 +
2530 sub sp, sp, #S_FRAME_SIZE
2531 ARM( stmib sp, {r1 - lr} )
2532 THUMB( stmia sp, {r0 - r12} )
2533 THUMB( str sp, [sp, #S_SP] )
2534 THUMB( str lr, [sp, #S_LR] )
2535 +
2536 mov r1, #\reason
2537 .endm
2538
2539 @@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2540 .macro svc_entry, stack_hole=0, trace=1
2541 UNWIND(.fnstart )
2542 UNWIND(.save {r0 - pc} )
2543 +
2544 + pax_enter_kernel
2545 +
2546 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2547 +
2548 #ifdef CONFIG_THUMB2_KERNEL
2549 SPFIX( str r0, [sp] ) @ temporarily saved
2550 SPFIX( mov r0, sp )
2551 @@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2552 ldmia r0, {r3 - r5}
2553 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2554 mov r6, #-1 @ "" "" "" ""
2555 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2556 + @ offset sp by 8 as done in pax_enter_kernel
2557 + add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2558 +#else
2559 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2560 +#endif
2561 SPFIX( addeq r2, r2, #4 )
2562 str r3, [sp, #-4]! @ save the "real" r0 copied
2563 @ from the exception stack
2564 @@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
2565 .macro usr_entry, trace=1
2566 UNWIND(.fnstart )
2567 UNWIND(.cantunwind ) @ don't unwind the user space
2568 +
2569 + pax_enter_kernel_user
2570 +
2571 sub sp, sp, #S_FRAME_SIZE
2572 ARM( stmib sp, {r1 - r12} )
2573 THUMB( stmia sp, {r0 - r12} )
2574 @@ -478,7 +575,9 @@ __und_usr:
2575 tst r3, #PSR_T_BIT @ Thumb mode?
2576 bne __und_usr_thumb
2577 sub r4, r2, #4 @ ARM instr at LR - 4
2578 + pax_open_userland
2579 1: ldrt r0, [r4]
2580 + pax_close_userland
2581 ARM_BE8(rev r0, r0) @ little endian instruction
2582
2583 @ r0 = 32-bit ARM instruction which caused the exception
2584 @@ -512,11 +611,15 @@ __und_usr_thumb:
2585 */
2586 .arch armv6t2
2587 #endif
2588 + pax_open_userland
2589 2: ldrht r5, [r4]
2590 + pax_close_userland
2591 ARM_BE8(rev16 r5, r5) @ little endian instruction
2592 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2593 blo __und_usr_fault_16 @ 16bit undefined instruction
2594 + pax_open_userland
2595 3: ldrht r0, [r2]
2596 + pax_close_userland
2597 ARM_BE8(rev16 r0, r0) @ little endian instruction
2598 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2599 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2600 @@ -546,7 +649,8 @@ ENDPROC(__und_usr)
2601 */
2602 .pushsection .fixup, "ax"
2603 .align 2
2604 -4: str r4, [sp, #S_PC] @ retry current instruction
2605 +4: pax_close_userland
2606 + str r4, [sp, #S_PC] @ retry current instruction
2607 ret r9
2608 .popsection
2609 .pushsection __ex_table,"a"
2610 @@ -766,7 +870,7 @@ ENTRY(__switch_to)
2611 THUMB( str lr, [ip], #4 )
2612 ldr r4, [r2, #TI_TP_VALUE]
2613 ldr r5, [r2, #TI_TP_VALUE + 4]
2614 -#ifdef CONFIG_CPU_USE_DOMAINS
2615 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2616 ldr r6, [r2, #TI_CPU_DOMAIN]
2617 #endif
2618 switch_tls r1, r4, r5, r3, r7
2619 @@ -775,7 +879,7 @@ ENTRY(__switch_to)
2620 ldr r8, =__stack_chk_guard
2621 ldr r7, [r7, #TSK_STACK_CANARY]
2622 #endif
2623 -#ifdef CONFIG_CPU_USE_DOMAINS
2624 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2625 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2626 #endif
2627 mov r5, r0
2628 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2629 index 6bb09d4..113e875 100644
2630 --- a/arch/arm/kernel/entry-common.S
2631 +++ b/arch/arm/kernel/entry-common.S
2632 @@ -11,18 +11,46 @@
2633 #include <asm/assembler.h>
2634 #include <asm/unistd.h>
2635 #include <asm/ftrace.h>
2636 +#include <asm/domain.h>
2637 #include <asm/unwind.h>
2638
2639 +#include "entry-header.S"
2640 +
2641 #ifdef CONFIG_NEED_RET_TO_USER
2642 #include <mach/entry-macro.S>
2643 #else
2644 .macro arch_ret_to_user, tmp1, tmp2
2645 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2646 + @ save regs
2647 + stmdb sp!, {r1, r2}
2648 + @ read DACR from cpu_domain into r1
2649 + mov r2, sp
2650 + @ assume 8K pages, since we have to split the immediate in two
2651 + bic r2, r2, #(0x1fc0)
2652 + bic r2, r2, #(0x3f)
2653 + ldr r1, [r2, #TI_CPU_DOMAIN]
2654 +#ifdef CONFIG_PAX_KERNEXEC
2655 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2656 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2657 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2658 +#endif
2659 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2660 + @ set current DOMAIN_USER to DOMAIN_UDEREF
2661 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2662 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2663 +#endif
2664 + @ write r1 to current_thread_info()->cpu_domain
2665 + str r1, [r2, #TI_CPU_DOMAIN]
2666 + @ write r1 to DACR
2667 + mcr p15, 0, r1, c3, c0, 0
2668 + @ instruction sync
2669 + instr_sync
2670 + @ restore regs
2671 + ldmia sp!, {r1, r2}
2672 +#endif
2673 .endm
2674 #endif
2675
2676 -#include "entry-header.S"
2677 -
2678 -
2679 .align 5
2680 /*
2681 * This is the fast syscall return path. We do as little as
2682 @@ -406,6 +434,12 @@ ENTRY(vector_swi)
2683 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2684 #endif
2685
2686 + /*
2687 + * do this here to avoid a performance hit of wrapping the code above
2688 + * that directly dereferences userland to parse the SWI instruction
2689 + */
2690 + pax_enter_kernel_user
2691 +
2692 adr tbl, sys_call_table @ load syscall table pointer
2693
2694 #if defined(CONFIG_OABI_COMPAT)
2695 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2696 index 4176df7..a901f8d 100644
2697 --- a/arch/arm/kernel/entry-header.S
2698 +++ b/arch/arm/kernel/entry-header.S
2699 @@ -196,6 +196,60 @@
2700 msr cpsr_c, \rtemp @ switch back to the SVC mode
2701 .endm
2702
2703 + .macro pax_enter_kernel_user
2704 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2705 + @ save regs
2706 + stmdb sp!, {r0, r1}
2707 + @ read DACR from cpu_domain into r1
2708 + mov r0, sp
2709 + @ assume 8K pages, since we have to split the immediate in two
2710 + bic r0, r0, #(0x1fc0)
2711 + bic r0, r0, #(0x3f)
2712 + ldr r1, [r0, #TI_CPU_DOMAIN]
2713 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2714 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2715 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2716 +#endif
2717 +#ifdef CONFIG_PAX_KERNEXEC
2718 + @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2719 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2720 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2721 +#endif
2722 + @ write r1 to current_thread_info()->cpu_domain
2723 + str r1, [r0, #TI_CPU_DOMAIN]
2724 + @ write r1 to DACR
2725 + mcr p15, 0, r1, c3, c0, 0
2726 + @ instruction sync
2727 + instr_sync
2728 + @ restore regs
2729 + ldmia sp!, {r0, r1}
2730 +#endif
2731 + .endm
2732 +
2733 + .macro pax_exit_kernel
2734 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2735 + @ save regs
2736 + stmdb sp!, {r0, r1}
2737 + @ read old DACR from stack into r1
2738 + ldr r1, [sp, #(8 + S_SP)]
2739 + sub r1, r1, #8
2740 + ldr r1, [r1]
2741 +
2742 + @ write r1 to current_thread_info()->cpu_domain
2743 + mov r0, sp
2744 + @ assume 8K pages, since we have to split the immediate in two
2745 + bic r0, r0, #(0x1fc0)
2746 + bic r0, r0, #(0x3f)
2747 + str r1, [r0, #TI_CPU_DOMAIN]
2748 + @ write r1 to DACR
2749 + mcr p15, 0, r1, c3, c0, 0
2750 + @ instruction sync
2751 + instr_sync
2752 + @ restore regs
2753 + ldmia sp!, {r0, r1}
2754 +#endif
2755 + .endm
2756 +
2757 #ifndef CONFIG_THUMB2_KERNEL
2758 .macro svc_exit, rpsr, irq = 0
2759 .if \irq != 0
2760 @@ -215,6 +269,9 @@
2761 blne trace_hardirqs_off
2762 #endif
2763 .endif
2764 +
2765 + pax_exit_kernel
2766 +
2767 msr spsr_cxsf, \rpsr
2768 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2769 @ We must avoid clrex due to Cortex-A15 erratum #830321
2770 @@ -290,6 +347,9 @@
2771 blne trace_hardirqs_off
2772 #endif
2773 .endif
2774 +
2775 + pax_exit_kernel
2776 +
2777 ldr lr, [sp, #S_SP] @ top of the stack
2778 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2779
2780 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2781 index b37752a..ff5cb72 100644
2782 --- a/arch/arm/kernel/fiq.c
2783 +++ b/arch/arm/kernel/fiq.c
2784 @@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2785 void *base = vectors_page;
2786 unsigned offset = FIQ_OFFSET;
2787
2788 + pax_open_kernel();
2789 memcpy(base + offset, start, length);
2790 + pax_close_kernel();
2791 +
2792 if (!cache_is_vipt_nonaliasing())
2793 flush_icache_range((unsigned long)base + offset, offset +
2794 length);
2795 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2796 index 664eee8..f470938 100644
2797 --- a/arch/arm/kernel/head.S
2798 +++ b/arch/arm/kernel/head.S
2799 @@ -437,7 +437,7 @@ __enable_mmu:
2800 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2802 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2803 - domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2804 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2805 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2806 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2807 #endif
2808 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2809 index 6a4dffe..4a86a70 100644
2810 --- a/arch/arm/kernel/module.c
2811 +++ b/arch/arm/kernel/module.c
2812 @@ -38,12 +38,39 @@
2813 #endif
2814
2815 #ifdef CONFIG_MMU
2816 -void *module_alloc(unsigned long size)
2817 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2818 {
2819 + if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2820 + return NULL;
2821 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2822 - GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2823 + GFP_KERNEL, prot, NUMA_NO_NODE,
2824 __builtin_return_address(0));
2825 }
2826 +
2827 +void *module_alloc(unsigned long size)
2828 +{
2829 +
2830 +#ifdef CONFIG_PAX_KERNEXEC
2831 + return __module_alloc(size, PAGE_KERNEL);
2832 +#else
2833 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2834 +#endif
2835 +
2836 +}
2837 +
2838 +#ifdef CONFIG_PAX_KERNEXEC
2839 +void module_free_exec(struct module *mod, void *module_region)
2840 +{
2841 + module_free(mod, module_region);
2842 +}
2843 +EXPORT_SYMBOL(module_free_exec);
2844 +
2845 +void *module_alloc_exec(unsigned long size)
2846 +{
2847 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2848 +}
2849 +EXPORT_SYMBOL(module_alloc_exec);
2850 +#endif
2851 #endif
2852
2853 int
2854 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2855 index 07314af..c46655c 100644
2856 --- a/arch/arm/kernel/patch.c
2857 +++ b/arch/arm/kernel/patch.c
2858 @@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2859 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2860 int size;
2861
2862 + pax_open_kernel();
2863 if (thumb2 && __opcode_is_thumb16(insn)) {
2864 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2865 size = sizeof(u16);
2866 @@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2867 *(u32 *)addr = insn;
2868 size = sizeof(u32);
2869 }
2870 + pax_close_kernel();
2871
2872 flush_icache_range((uintptr_t)(addr),
2873 (uintptr_t)(addr) + size);
2874 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2875 index fe972a2..a772d83 100644
2876 --- a/arch/arm/kernel/process.c
2877 +++ b/arch/arm/kernel/process.c
2878 @@ -207,6 +207,7 @@ void machine_power_off(void)
2879
2880 if (pm_power_off)
2881 pm_power_off();
2882 + BUG();
2883 }
2884
2885 /*
2886 @@ -220,7 +221,7 @@ void machine_power_off(void)
2887 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2888 * to use. Implementing such co-ordination would be essentially impossible.
2889 */
2890 -void machine_restart(char *cmd)
2891 +__noreturn void machine_restart(char *cmd)
2892 {
2893 local_irq_disable();
2894 smp_send_stop();
2895 @@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
2896
2897 show_regs_print_info(KERN_DEFAULT);
2898
2899 - print_symbol("PC is at %s\n", instruction_pointer(regs));
2900 - print_symbol("LR is at %s\n", regs->ARM_lr);
2901 + printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2902 + printk("LR is at %pA\n", (void *)regs->ARM_lr);
2903 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2904 "sp : %08lx ip : %08lx fp : %08lx\n",
2905 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2906 @@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
2907 return 0;
2908 }
2909
2910 -unsigned long arch_randomize_brk(struct mm_struct *mm)
2911 -{
2912 - unsigned long range_end = mm->brk + 0x02000000;
2913 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2914 -}
2915 -
2916 #ifdef CONFIG_MMU
2917 #ifdef CONFIG_KUSER_HELPERS
2918 /*
2919 @@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
2920
2921 static int __init gate_vma_init(void)
2922 {
2923 - gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2924 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2925 return 0;
2926 }
2927 arch_initcall(gate_vma_init);
2928 @@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2929 return is_gate_vma(vma) ? "[vectors]" : NULL;
2930 }
2931
2932 -/* If possible, provide a placement hint at a random offset from the
2933 - * stack for the signal page.
2934 - */
2935 -static unsigned long sigpage_addr(const struct mm_struct *mm,
2936 - unsigned int npages)
2937 -{
2938 - unsigned long offset;
2939 - unsigned long first;
2940 - unsigned long last;
2941 - unsigned long addr;
2942 - unsigned int slots;
2943 -
2944 - first = PAGE_ALIGN(mm->start_stack);
2945 -
2946 - last = TASK_SIZE - (npages << PAGE_SHIFT);
2947 -
2948 - /* No room after stack? */
2949 - if (first > last)
2950 - return 0;
2951 -
2952 - /* Just enough room? */
2953 - if (first == last)
2954 - return first;
2955 -
2956 - slots = ((last - first) >> PAGE_SHIFT) + 1;
2957 -
2958 - offset = get_random_int() % slots;
2959 -
2960 - addr = first + (offset << PAGE_SHIFT);
2961 -
2962 - return addr;
2963 -}
2964 -
2965 -static struct page *signal_page;
2966 -extern struct page *get_signal_page(void);
2967 -
2968 -static const struct vm_special_mapping sigpage_mapping = {
2969 - .name = "[sigpage]",
2970 - .pages = &signal_page,
2971 -};
2972 -
2973 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2974 {
2975 struct mm_struct *mm = current->mm;
2976 - struct vm_area_struct *vma;
2977 - unsigned long addr;
2978 - unsigned long hint;
2979 - int ret = 0;
2980 -
2981 - if (!signal_page)
2982 - signal_page = get_signal_page();
2983 - if (!signal_page)
2984 - return -ENOMEM;
2985
2986 down_write(&mm->mmap_sem);
2987 - hint = sigpage_addr(mm, 1);
2988 - addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2989 - if (IS_ERR_VALUE(addr)) {
2990 - ret = addr;
2991 - goto up_fail;
2992 - }
2993 -
2994 - vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2995 - VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2996 - &sigpage_mapping);
2997 -
2998 - if (IS_ERR(vma)) {
2999 - ret = PTR_ERR(vma);
3000 - goto up_fail;
3001 - }
3002 -
3003 - mm->context.sigpage = addr;
3004 -
3005 - up_fail:
3006 + mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3007 up_write(&mm->mmap_sem);
3008 - return ret;
3009 + return 0;
3010 }
3011 #endif
3012 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3013 index f73891b..cf3004e 100644
3014 --- a/arch/arm/kernel/psci.c
3015 +++ b/arch/arm/kernel/psci.c
3016 @@ -28,7 +28,7 @@
3017 #include <asm/psci.h>
3018 #include <asm/system_misc.h>
3019
3020 -struct psci_operations psci_ops;
3021 +struct psci_operations psci_ops __read_only;
3022
3023 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3024 typedef int (*psci_initcall_t)(const struct device_node *);
3025 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3026 index ef9119f..31995a3 100644
3027 --- a/arch/arm/kernel/ptrace.c
3028 +++ b/arch/arm/kernel/ptrace.c
3029 @@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3030 regs->ARM_ip = ip;
3031 }
3032
3033 +#ifdef CONFIG_GRKERNSEC_SETXID
3034 +extern void gr_delayed_cred_worker(void);
3035 +#endif
3036 +
3037 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3038 {
3039 current_thread_info()->syscall = scno;
3040
3041 +#ifdef CONFIG_GRKERNSEC_SETXID
3042 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3043 + gr_delayed_cred_worker();
3044 +#endif
3045 +
3046 /* Do the secure computing check first; failures should be fast. */
3047 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3048 if (secure_computing() == -1)
3049 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3050 index c031063..e277ab8 100644
3051 --- a/arch/arm/kernel/setup.c
3052 +++ b/arch/arm/kernel/setup.c
3053 @@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
3054 unsigned int elf_hwcap2 __read_mostly;
3055 EXPORT_SYMBOL(elf_hwcap2);
3056
3057 +pteval_t __supported_pte_mask __read_only;
3058 +pmdval_t __supported_pmd_mask __read_only;
3059
3060 #ifdef MULTI_CPU
3061 -struct processor processor __read_mostly;
3062 +struct processor processor __read_only;
3063 #endif
3064 #ifdef MULTI_TLB
3065 -struct cpu_tlb_fns cpu_tlb __read_mostly;
3066 +struct cpu_tlb_fns cpu_tlb __read_only;
3067 #endif
3068 #ifdef MULTI_USER
3069 -struct cpu_user_fns cpu_user __read_mostly;
3070 +struct cpu_user_fns cpu_user __read_only;
3071 #endif
3072 #ifdef MULTI_CACHE
3073 -struct cpu_cache_fns cpu_cache __read_mostly;
3074 +struct cpu_cache_fns cpu_cache __read_only;
3075 #endif
3076 #ifdef CONFIG_OUTER_CACHE
3077 -struct outer_cache_fns outer_cache __read_mostly;
3078 +struct outer_cache_fns outer_cache __read_only;
3079 EXPORT_SYMBOL(outer_cache);
3080 #endif
3081
3082 @@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
3083 asm("mrc p15, 0, %0, c0, c1, 4"
3084 : "=r" (mmfr0));
3085 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3086 - (mmfr0 & 0x000000f0) >= 0x00000030)
3087 + (mmfr0 & 0x000000f0) >= 0x00000030) {
3088 cpu_arch = CPU_ARCH_ARMv7;
3089 - else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3090 + if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3091 + __supported_pte_mask |= L_PTE_PXN;
3092 + __supported_pmd_mask |= PMD_PXNTABLE;
3093 + }
3094 + } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3095 (mmfr0 & 0x000000f0) == 0x00000020)
3096 cpu_arch = CPU_ARCH_ARMv6;
3097 else
3098 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3099 index bd19834..e4d8c66 100644
3100 --- a/arch/arm/kernel/signal.c
3101 +++ b/arch/arm/kernel/signal.c
3102 @@ -24,8 +24,6 @@
3103
3104 extern const unsigned long sigreturn_codes[7];
3105
3106 -static unsigned long signal_return_offset;
3107 -
3108 #ifdef CONFIG_CRUNCH
3109 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3110 {
3111 @@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3112 * except when the MPU has protected the vectors
3113 * page from PL0
3114 */
3115 - retcode = mm->context.sigpage + signal_return_offset +
3116 - (idx << 2) + thumb;
3117 + retcode = mm->context.sigpage + (idx << 2) + thumb;
3118 } else
3119 #endif
3120 {
3121 @@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3122 } while (thread_flags & _TIF_WORK_MASK);
3123 return 0;
3124 }
3125 -
3126 -struct page *get_signal_page(void)
3127 -{
3128 - unsigned long ptr;
3129 - unsigned offset;
3130 - struct page *page;
3131 - void *addr;
3132 -
3133 - page = alloc_pages(GFP_KERNEL, 0);
3134 -
3135 - if (!page)
3136 - return NULL;
3137 -
3138 - addr = page_address(page);
3139 -
3140 - /* Give the signal return code some randomness */
3141 - offset = 0x200 + (get_random_int() & 0x7fc);
3142 - signal_return_offset = offset;
3143 -
3144 - /*
3145 - * Copy signal return handlers into the vector page, and
3146 - * set sigreturn to be a pointer to these.
3147 - */
3148 - memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3149 -
3150 - ptr = (unsigned long)addr + offset;
3151 - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3152 -
3153 - return page;
3154 -}
3155 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3156 index 13396d3..589d615 100644
3157 --- a/arch/arm/kernel/smp.c
3158 +++ b/arch/arm/kernel/smp.c
3159 @@ -76,7 +76,7 @@ enum ipi_msg_type {
3160
3161 static DECLARE_COMPLETION(cpu_running);
3162
3163 -static struct smp_operations smp_ops;
3164 +static struct smp_operations smp_ops __read_only;
3165
3166 void __init smp_set_ops(struct smp_operations *ops)
3167 {
3168 diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3169 index 7a3be1d..b00c7de 100644
3170 --- a/arch/arm/kernel/tcm.c
3171 +++ b/arch/arm/kernel/tcm.c
3172 @@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3173 .virtual = ITCM_OFFSET,
3174 .pfn = __phys_to_pfn(ITCM_OFFSET),
3175 .length = 0,
3176 - .type = MT_MEMORY_RWX_ITCM,
3177 + .type = MT_MEMORY_RX_ITCM,
3178 }
3179 };
3180
3181 @@ -267,7 +267,9 @@ no_dtcm:
3182 start = &__sitcm_text;
3183 end = &__eitcm_text;
3184 ram = &__itcm_start;
3185 + pax_open_kernel();
3186 memcpy(start, ram, itcm_code_sz);
3187 + pax_close_kernel();
3188 pr_debug("CPU ITCM: copied code from %p - %p\n",
3189 start, end);
3190 itcm_present = true;
3191 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3192 index 9f5d818..e013427 100644
3193 --- a/arch/arm/kernel/traps.c
3194 +++ b/arch/arm/kernel/traps.c
3195 @@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3196 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3197 {
3198 #ifdef CONFIG_KALLSYMS
3199 - printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3200 + printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3201 #else
3202 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3203 #endif
3204 @@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3205 static int die_owner = -1;
3206 static unsigned int die_nest_count;
3207
3208 +extern void gr_handle_kernel_exploit(void);
3209 +
3210 static unsigned long oops_begin(void)
3211 {
3212 int cpu;
3213 @@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3214 panic("Fatal exception in interrupt");
3215 if (panic_on_oops)
3216 panic("Fatal exception");
3217 +
3218 + gr_handle_kernel_exploit();
3219 +
3220 if (signr)
3221 do_exit(signr);
3222 }
3223 @@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3224 kuser_init(vectors_base);
3225
3226 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3227 - modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3228 +
3229 +#ifndef CONFIG_PAX_MEMORY_UDEREF
3230 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3231 +#endif
3232 +
3233 #else /* ifndef CONFIG_CPU_V7M */
3234 /*
3235 * on V7-M there is no need to copy the vector table to a dedicated
3236 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3237 index 8e95aa4..595dfc8 100644
3238 --- a/arch/arm/kernel/vmlinux.lds.S
3239 +++ b/arch/arm/kernel/vmlinux.lds.S
3240 @@ -8,7 +8,11 @@
3241 #include <asm/thread_info.h>
3242 #include <asm/memory.h>
3243 #include <asm/page.h>
3244 -
3245 +
3246 +#ifdef CONFIG_PAX_KERNEXEC
3247 +#include <asm/pgtable.h>
3248 +#endif
3249 +
3250 #define PROC_INFO \
3251 . = ALIGN(4); \
3252 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3253 @@ -34,7 +38,7 @@
3254 #endif
3255
3256 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3257 - defined(CONFIG_GENERIC_BUG)
3258 + defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3259 #define ARM_EXIT_KEEP(x) x
3260 #define ARM_EXIT_DISCARD(x)
3261 #else
3262 @@ -90,6 +94,11 @@ SECTIONS
3263 _text = .;
3264 HEAD_TEXT
3265 }
3266 +
3267 +#ifdef CONFIG_PAX_KERNEXEC
3268 + . = ALIGN(1<<SECTION_SHIFT);
3269 +#endif
3270 +
3271 .text : { /* Real text segment */
3272 _stext = .; /* Text and read-only data */
3273 __exception_text_start = .;
3274 @@ -112,6 +121,8 @@ SECTIONS
3275 ARM_CPU_KEEP(PROC_INFO)
3276 }
3277
3278 + _etext = .; /* End of text section */
3279 +
3280 RO_DATA(PAGE_SIZE)
3281
3282 . = ALIGN(4);
3283 @@ -142,7 +153,9 @@ SECTIONS
3284
3285 NOTES
3286
3287 - _etext = .; /* End of text and rodata section */
3288 +#ifdef CONFIG_PAX_KERNEXEC
3289 + . = ALIGN(1<<SECTION_SHIFT);
3290 +#endif
3291
3292 #ifndef CONFIG_XIP_KERNEL
3293 . = ALIGN(PAGE_SIZE);
3294 @@ -221,6 +234,11 @@ SECTIONS
3295 #else
3296 . = ALIGN(THREAD_SIZE);
3297 __init_end = .;
3298 +
3299 +#ifdef CONFIG_PAX_KERNEXEC
3300 + . = ALIGN(1<<SECTION_SHIFT);
3301 +#endif
3302 +
3303 __data_loc = .;
3304 #endif
3305
3306 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3307 index 9e193c8..3560fe6 100644
3308 --- a/arch/arm/kvm/arm.c
3309 +++ b/arch/arm/kvm/arm.c
3310 @@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3311 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3312
3313 /* The VMID used in the VTTBR */
3314 -static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3315 +static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3316 static u8 kvm_next_vmid;
3317 static DEFINE_SPINLOCK(kvm_vmid_lock);
3318
3319 @@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
3320 */
3321 static bool need_new_vmid_gen(struct kvm *kvm)
3322 {
3323 - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3324 + return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3325 }
3326
3327 /**
3328 @@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
3329
3330 /* First user of a new VMID generation? */
3331 if (unlikely(kvm_next_vmid == 0)) {
3332 - atomic64_inc(&kvm_vmid_gen);
3333 + atomic64_inc_unchecked(&kvm_vmid_gen);
3334 kvm_next_vmid = 1;
3335
3336 /*
3337 @@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
3338 kvm_call_hyp(__kvm_flush_vm_context);
3339 }
3340
3341 - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3342 + kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3343 kvm->arch.vmid = kvm_next_vmid;
3344 kvm_next_vmid++;
3345
3346 @@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
3347 /**
3348 * Initialize Hyp-mode and memory mappings on all CPUs.
3349 */
3350 -int kvm_arch_init(void *opaque)
3351 +int kvm_arch_init(const void *opaque)
3352 {
3353 int err;
3354 int ret, cpu;
3355 diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3356 index 14a0d98..7771a7d 100644
3357 --- a/arch/arm/lib/clear_user.S
3358 +++ b/arch/arm/lib/clear_user.S
3359 @@ -12,14 +12,14 @@
3360
3361 .text
3362
3363 -/* Prototype: int __clear_user(void *addr, size_t sz)
3364 +/* Prototype: int ___clear_user(void *addr, size_t sz)
3365 * Purpose : clear some user memory
3366 * Params : addr - user memory address to clear
3367 * : sz - number of bytes to clear
3368 * Returns : number of bytes NOT cleared
3369 */
3370 ENTRY(__clear_user_std)
3371 -WEAK(__clear_user)
3372 +WEAK(___clear_user)
3373 stmfd sp!, {r1, lr}
3374 mov r2, #0
3375 cmp r1, #4
3376 @@ -44,7 +44,7 @@ WEAK(__clear_user)
3377 USER( strnebt r2, [r0])
3378 mov r0, #0
3379 ldmfd sp!, {r1, pc}
3380 -ENDPROC(__clear_user)
3381 +ENDPROC(___clear_user)
3382 ENDPROC(__clear_user_std)
3383
3384 .pushsection .fixup,"ax"
3385 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3386 index 66a477a..bee61d3 100644
3387 --- a/arch/arm/lib/copy_from_user.S
3388 +++ b/arch/arm/lib/copy_from_user.S
3389 @@ -16,7 +16,7 @@
3390 /*
3391 * Prototype:
3392 *
3393 - * size_t __copy_from_user(void *to, const void *from, size_t n)
3394 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
3395 *
3396 * Purpose:
3397 *
3398 @@ -84,11 +84,11 @@
3399
3400 .text
3401
3402 -ENTRY(__copy_from_user)
3403 +ENTRY(___copy_from_user)
3404
3405 #include "copy_template.S"
3406
3407 -ENDPROC(__copy_from_user)
3408 +ENDPROC(___copy_from_user)
3409
3410 .pushsection .fixup,"ax"
3411 .align 0
3412 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3413 index 6ee2f67..d1cce76 100644
3414 --- a/arch/arm/lib/copy_page.S
3415 +++ b/arch/arm/lib/copy_page.S
3416 @@ -10,6 +10,7 @@
3417 * ASM optimised string functions
3418 */
3419 #include <linux/linkage.h>
3420 +#include <linux/const.h>
3421 #include <asm/assembler.h>
3422 #include <asm/asm-offsets.h>
3423 #include <asm/cache.h>
3424 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3425 index d066df6..df28194 100644
3426 --- a/arch/arm/lib/copy_to_user.S
3427 +++ b/arch/arm/lib/copy_to_user.S
3428 @@ -16,7 +16,7 @@
3429 /*
3430 * Prototype:
3431 *
3432 - * size_t __copy_to_user(void *to, const void *from, size_t n)
3433 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
3434 *
3435 * Purpose:
3436 *
3437 @@ -88,11 +88,11 @@
3438 .text
3439
3440 ENTRY(__copy_to_user_std)
3441 -WEAK(__copy_to_user)
3442 +WEAK(___copy_to_user)
3443
3444 #include "copy_template.S"
3445
3446 -ENDPROC(__copy_to_user)
3447 +ENDPROC(___copy_to_user)
3448 ENDPROC(__copy_to_user_std)
3449
3450 .pushsection .fixup,"ax"
3451 diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3452 index 7d08b43..f7ca7ea 100644
3453 --- a/arch/arm/lib/csumpartialcopyuser.S
3454 +++ b/arch/arm/lib/csumpartialcopyuser.S
3455 @@ -57,8 +57,8 @@
3456 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3457 */
3458
3459 -#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3460 -#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3461 +#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3462 +#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3463
3464 #include "csumpartialcopygeneric.S"
3465
3466 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3467 index 312d43e..21d2322 100644
3468 --- a/arch/arm/lib/delay.c
3469 +++ b/arch/arm/lib/delay.c
3470 @@ -29,7 +29,7 @@
3471 /*
3472 * Default to the loop-based delay implementation.
3473 */
3474 -struct arm_delay_ops arm_delay_ops = {
3475 +struct arm_delay_ops arm_delay_ops __read_only = {
3476 .delay = __loop_delay,
3477 .const_udelay = __loop_const_udelay,
3478 .udelay = __loop_udelay,
3479 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3480 index 3e58d71..029817c 100644
3481 --- a/arch/arm/lib/uaccess_with_memcpy.c
3482 +++ b/arch/arm/lib/uaccess_with_memcpy.c
3483 @@ -136,7 +136,7 @@ out:
3484 }
3485
3486 unsigned long
3487 -__copy_to_user(void __user *to, const void *from, unsigned long n)
3488 +___copy_to_user(void __user *to, const void *from, unsigned long n)
3489 {
3490 /*
3491 * This test is stubbed out of the main function above to keep
3492 @@ -190,7 +190,7 @@ out:
3493 return n;
3494 }
3495
3496 -unsigned long __clear_user(void __user *addr, unsigned long n)
3497 +unsigned long ___clear_user(void __user *addr, unsigned long n)
3498 {
3499 /* See rational for this in __copy_to_user() above. */
3500 if (n < 64)
3501 diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3502 index 9610792..4dfb851 100644
3503 --- a/arch/arm/mach-at91/setup.c
3504 +++ b/arch/arm/mach-at91/setup.c
3505 @@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3506
3507 desc->pfn = __phys_to_pfn(base);
3508 desc->length = length;
3509 - desc->type = MT_MEMORY_RWX_NONCACHED;
3510 + desc->type = MT_MEMORY_RW_NONCACHED;
3511
3512 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3513 base, length, desc->virtual);
3514 diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3515 index 7f352de..6dc0929 100644
3516 --- a/arch/arm/mach-keystone/keystone.c
3517 +++ b/arch/arm/mach-keystone/keystone.c
3518 @@ -27,7 +27,7 @@
3519
3520 #include "keystone.h"
3521
3522 -static struct notifier_block platform_nb;
3523 +static notifier_block_no_const platform_nb;
3524 static unsigned long keystone_dma_pfn_offset __read_mostly;
3525
3526 static int keystone_platform_notifier(struct notifier_block *nb,
3527 diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3528 index c31f4c0..c86224d 100644
3529 --- a/arch/arm/mach-mvebu/coherency.c
3530 +++ b/arch/arm/mach-mvebu/coherency.c
3531 @@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3532
3533 /*
3534 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3535 - * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3536 + * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3537 * is needed as a workaround for a deadlock issue between the PCIe
3538 * interface and the cache controller.
3539 */
3540 @@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3541 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3542
3543 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3544 - mtype = MT_UNCACHED;
3545 + mtype = MT_UNCACHED_RW;
3546
3547 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3548 }
3549 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3550 index 97767a2..9233746 100644
3551 --- a/arch/arm/mach-omap2/board-n8x0.c
3552 +++ b/arch/arm/mach-omap2/board-n8x0.c
3553 @@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3554 }
3555 #endif
3556
3557 -struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3558 +struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3559 .late_init = n8x0_menelaus_late_init,
3560 };
3561
3562 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3563 index 5fa3755..1e8c247 100644
3564 --- a/arch/arm/mach-omap2/gpmc.c
3565 +++ b/arch/arm/mach-omap2/gpmc.c
3566 @@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
3567 };
3568
3569 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3570 -static struct irq_chip gpmc_irq_chip;
3571 static int gpmc_irq_start;
3572
3573 static struct resource gpmc_mem_root;
3574 @@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3575
3576 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3577
3578 +static struct irq_chip gpmc_irq_chip = {
3579 + .name = "gpmc",
3580 + .irq_startup = gpmc_irq_noop_ret,
3581 + .irq_enable = gpmc_irq_enable,
3582 + .irq_disable = gpmc_irq_disable,
3583 + .irq_shutdown = gpmc_irq_noop,
3584 + .irq_ack = gpmc_irq_noop,
3585 + .irq_mask = gpmc_irq_noop,
3586 + .irq_unmask = gpmc_irq_noop,
3587 +
3588 +};
3589 +
3590 static int gpmc_setup_irq(void)
3591 {
3592 int i;
3593 @@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
3594 return gpmc_irq_start;
3595 }
3596
3597 - gpmc_irq_chip.name = "gpmc";
3598 - gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3599 - gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3600 - gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3601 - gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3602 - gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3603 - gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3604 - gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3605 -
3606 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3607 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3608
3609 diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3610 index 6944ae3..bc587ca 100644
3611 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3612 +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3613 @@ -86,7 +86,7 @@ struct cpu_pm_ops {
3614 void (*resume)(void);
3615 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3616 void (*hotplug_restart)(void);
3617 -};
3618 +} __no_const;
3619
3620 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3621 static struct powerdomain *mpuss_pd;
3622 @@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3623 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3624 {}
3625
3626 -struct cpu_pm_ops omap_pm_ops = {
3627 +static struct cpu_pm_ops omap_pm_ops __read_only = {
3628 .finish_suspend = default_finish_suspend,
3629 .resume = dummy_cpu_resume,
3630 .scu_prepare = dummy_scu_prepare,
3631 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3632 index f961c46..4a453dc 100644
3633 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
3634 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3635 @@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3636 return NOTIFY_OK;
3637 }
3638
3639 -static struct notifier_block __refdata irq_hotplug_notifier = {
3640 +static struct notifier_block irq_hotplug_notifier = {
3641 .notifier_call = irq_cpu_hotplug_notify,
3642 };
3643
3644 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3645 index 8c58b71..95b655f 100644
3646 --- a/arch/arm/mach-omap2/omap_device.c
3647 +++ b/arch/arm/mach-omap2/omap_device.c
3648 @@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3649 struct platform_device __init *omap_device_build(const char *pdev_name,
3650 int pdev_id,
3651 struct omap_hwmod *oh,
3652 - void *pdata, int pdata_len)
3653 + const void *pdata, int pdata_len)
3654 {
3655 struct omap_hwmod *ohs[] = { oh };
3656
3657 @@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3658 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3659 int pdev_id,
3660 struct omap_hwmod **ohs,
3661 - int oh_cnt, void *pdata,
3662 + int oh_cnt, const void *pdata,
3663 int pdata_len)
3664 {
3665 int ret = -ENOMEM;
3666 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3667 index 78c02b3..c94109a 100644
3668 --- a/arch/arm/mach-omap2/omap_device.h
3669 +++ b/arch/arm/mach-omap2/omap_device.h
3670 @@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3671 /* Core code interface */
3672
3673 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3674 - struct omap_hwmod *oh, void *pdata,
3675 + struct omap_hwmod *oh, const void *pdata,
3676 int pdata_len);
3677
3678 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3679 struct omap_hwmod **oh, int oh_cnt,
3680 - void *pdata, int pdata_len);
3681 + const void *pdata, int pdata_len);
3682
3683 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3684 struct omap_hwmod **ohs, int oh_cnt);
3685 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3686 index 716247e..8df346d 100644
3687 --- a/arch/arm/mach-omap2/omap_hwmod.c
3688 +++ b/arch/arm/mach-omap2/omap_hwmod.c
3689 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3690 int (*init_clkdm)(struct omap_hwmod *oh);
3691 void (*update_context_lost)(struct omap_hwmod *oh);
3692 int (*get_context_lost)(struct omap_hwmod *oh);
3693 -};
3694 +} __no_const;
3695
3696 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3697 -static struct omap_hwmod_soc_ops soc_ops;
3698 +static struct omap_hwmod_soc_ops soc_ops __read_only;
3699
3700 /* omap_hwmod_list contains all registered struct omap_hwmods */
3701 static LIST_HEAD(omap_hwmod_list);
3702 diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3703 index 95fee54..cfa9cf1 100644
3704 --- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3705 +++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3706 @@ -10,6 +10,7 @@
3707
3708 #include <linux/kernel.h>
3709 #include <linux/init.h>
3710 +#include <asm/pgtable.h>
3711
3712 #include "powerdomain.h"
3713
3714 @@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3715
3716 void __init am43xx_powerdomains_init(void)
3717 {
3718 - omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3719 + pax_open_kernel();
3720 + *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3721 + pax_close_kernel();
3722 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3723 pwrdm_register_pwrdms(powerdomains_am43xx);
3724 pwrdm_complete_init();
3725 diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3726 index ff0a68c..b312aa0 100644
3727 --- a/arch/arm/mach-omap2/wd_timer.c
3728 +++ b/arch/arm/mach-omap2/wd_timer.c
3729 @@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3730 struct omap_hwmod *oh;
3731 char *oh_name = "wd_timer2";
3732 char *dev_name = "omap_wdt";
3733 - struct omap_wd_timer_platform_data pdata;
3734 + static struct omap_wd_timer_platform_data pdata = {
3735 + .read_reset_sources = prm_read_reset_sources
3736 + };
3737
3738 if (!cpu_class_is_omap2() || of_have_populated_dt())
3739 return 0;
3740 @@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3741 return -EINVAL;
3742 }
3743
3744 - pdata.read_reset_sources = prm_read_reset_sources;
3745 -
3746 pdev = omap_device_build(dev_name, id, oh, &pdata,
3747 sizeof(struct omap_wd_timer_platform_data));
3748 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3749 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3750 index b30bf5c..d0825bf 100644
3751 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3752 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3753 @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3754 bool entered_lp2 = false;
3755
3756 if (tegra_pending_sgi())
3757 - ACCESS_ONCE(abort_flag) = true;
3758 + ACCESS_ONCE_RW(abort_flag) = true;
3759
3760 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3761
3762 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3763 index 2dea8b5..6499da2 100644
3764 --- a/arch/arm/mach-ux500/setup.h
3765 +++ b/arch/arm/mach-ux500/setup.h
3766 @@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3767 .type = MT_DEVICE, \
3768 }
3769
3770 -#define __MEM_DEV_DESC(x, sz) { \
3771 - .virtual = IO_ADDRESS(x), \
3772 - .pfn = __phys_to_pfn(x), \
3773 - .length = sz, \
3774 - .type = MT_MEMORY_RWX, \
3775 -}
3776 -
3777 extern struct smp_operations ux500_smp_ops;
3778 extern void ux500_cpu_die(unsigned int cpu);
3779
3780 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3781 index 7eb94e6..799ad3e 100644
3782 --- a/arch/arm/mm/Kconfig
3783 +++ b/arch/arm/mm/Kconfig
3784 @@ -446,6 +446,7 @@ config CPU_32v5
3785
3786 config CPU_32v6
3787 bool
3788 + select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3789 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3790
3791 config CPU_32v6K
3792 @@ -600,6 +601,7 @@ config CPU_CP15_MPU
3793
3794 config CPU_USE_DOMAINS
3795 bool
3796 + depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3797 help
3798 This option enables or disables the use of domain switching
3799 via the set_fs() function.
3800 @@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3801
3802 config KUSER_HELPERS
3803 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3804 - depends on MMU
3805 + depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3806 default y
3807 help
3808 Warning: disabling this option may break user programs.
3809 @@ -812,7 +814,7 @@ config KUSER_HELPERS
3810 See Documentation/arm/kernel_user_helpers.txt for details.
3811
3812 However, the fixed address nature of these helpers can be used
3813 - by ROP (return orientated programming) authors when creating
3814 + by ROP (Return Oriented Programming) authors when creating
3815 exploits.
3816
3817 If all of the binaries and libraries which run on your platform
3818 diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3819 index 83792f4..c25d36b 100644
3820 --- a/arch/arm/mm/alignment.c
3821 +++ b/arch/arm/mm/alignment.c
3822 @@ -216,10 +216,12 @@ union offset_union {
3823 #define __get16_unaligned_check(ins,val,addr) \
3824 do { \
3825 unsigned int err = 0, v, a = addr; \
3826 + pax_open_userland(); \
3827 __get8_unaligned_check(ins,v,a,err); \
3828 val = v << ((BE) ? 8 : 0); \
3829 __get8_unaligned_check(ins,v,a,err); \
3830 val |= v << ((BE) ? 0 : 8); \
3831 + pax_close_userland(); \
3832 if (err) \
3833 goto fault; \
3834 } while (0)
3835 @@ -233,6 +235,7 @@ union offset_union {
3836 #define __get32_unaligned_check(ins,val,addr) \
3837 do { \
3838 unsigned int err = 0, v, a = addr; \
3839 + pax_open_userland(); \
3840 __get8_unaligned_check(ins,v,a,err); \
3841 val = v << ((BE) ? 24 : 0); \
3842 __get8_unaligned_check(ins,v,a,err); \
3843 @@ -241,6 +244,7 @@ union offset_union {
3844 val |= v << ((BE) ? 8 : 16); \
3845 __get8_unaligned_check(ins,v,a,err); \
3846 val |= v << ((BE) ? 0 : 24); \
3847 + pax_close_userland(); \
3848 if (err) \
3849 goto fault; \
3850 } while (0)
3851 @@ -254,6 +258,7 @@ union offset_union {
3852 #define __put16_unaligned_check(ins,val,addr) \
3853 do { \
3854 unsigned int err = 0, v = val, a = addr; \
3855 + pax_open_userland(); \
3856 __asm__( FIRST_BYTE_16 \
3857 ARM( "1: "ins" %1, [%2], #1\n" ) \
3858 THUMB( "1: "ins" %1, [%2]\n" ) \
3859 @@ -273,6 +278,7 @@ union offset_union {
3860 " .popsection\n" \
3861 : "=r" (err), "=&r" (v), "=&r" (a) \
3862 : "0" (err), "1" (v), "2" (a)); \
3863 + pax_close_userland(); \
3864 if (err) \
3865 goto fault; \
3866 } while (0)
3867 @@ -286,6 +292,7 @@ union offset_union {
3868 #define __put32_unaligned_check(ins,val,addr) \
3869 do { \
3870 unsigned int err = 0, v = val, a = addr; \
3871 + pax_open_userland(); \
3872 __asm__( FIRST_BYTE_32 \
3873 ARM( "1: "ins" %1, [%2], #1\n" ) \
3874 THUMB( "1: "ins" %1, [%2]\n" ) \
3875 @@ -315,6 +322,7 @@ union offset_union {
3876 " .popsection\n" \
3877 : "=r" (err), "=&r" (v), "=&r" (a) \
3878 : "0" (err), "1" (v), "2" (a)); \
3879 + pax_close_userland(); \
3880 if (err) \
3881 goto fault; \
3882 } while (0)
3883 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3884 index 5e65ca8..879e7b3 100644
3885 --- a/arch/arm/mm/cache-l2x0.c
3886 +++ b/arch/arm/mm/cache-l2x0.c
3887 @@ -42,7 +42,7 @@ struct l2c_init_data {
3888 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3889 void (*save)(void __iomem *);
3890 struct outer_cache_fns outer_cache;
3891 -};
3892 +} __do_const;
3893
3894 #define CACHE_LINE_SIZE 32
3895
3896 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3897 index 6eb97b3..ac509f6 100644
3898 --- a/arch/arm/mm/context.c
3899 +++ b/arch/arm/mm/context.c
3900 @@ -43,7 +43,7 @@
3901 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3902
3903 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3904 -static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3905 +static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3906 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3907
3908 static DEFINE_PER_CPU(atomic64_t, active_asids);
3909 @@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3910 {
3911 static u32 cur_idx = 1;
3912 u64 asid = atomic64_read(&mm->context.id);
3913 - u64 generation = atomic64_read(&asid_generation);
3914 + u64 generation = atomic64_read_unchecked(&asid_generation);
3915
3916 if (asid != 0 && is_reserved_asid(asid)) {
3917 /*
3918 @@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3919 */
3920 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3921 if (asid == NUM_USER_ASIDS) {
3922 - generation = atomic64_add_return(ASID_FIRST_VERSION,
3923 + generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3924 &asid_generation);
3925 flush_context(cpu);
3926 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3927 @@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3928 cpu_set_reserved_ttbr0();
3929
3930 asid = atomic64_read(&mm->context.id);
3931 - if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3932 + if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3933 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3934 goto switch_mm_fastpath;
3935
3936 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3937 /* Check that our ASID belongs to the current generation. */
3938 asid = atomic64_read(&mm->context.id);
3939 - if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3940 + if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3941 asid = new_context(mm, cpu);
3942 atomic64_set(&mm->context.id, asid);
3943 }
3944 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3945 index eb8830a..e8ff52e 100644
3946 --- a/arch/arm/mm/fault.c
3947 +++ b/arch/arm/mm/fault.c
3948 @@ -25,6 +25,7 @@
3949 #include <asm/system_misc.h>
3950 #include <asm/system_info.h>
3951 #include <asm/tlbflush.h>
3952 +#include <asm/sections.h>
3953
3954 #include "fault.h"
3955
3956 @@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3957 if (fixup_exception(regs))
3958 return;
3959
3960 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3961 + if (addr < TASK_SIZE) {
3962 + if (current->signal->curr_ip)
3963 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3964 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3965 + else
3966 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3967 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3968 + }
3969 +#endif
3970 +
3971 +#ifdef CONFIG_PAX_KERNEXEC
3972 + if ((fsr & FSR_WRITE) &&
3973 + (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3974 + (MODULES_VADDR <= addr && addr < MODULES_END)))
3975 + {
3976 + if (current->signal->curr_ip)
3977 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3978 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3979 + else
3980 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3981 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3982 + }
3983 +#endif
3984 +
3985 /*
3986 * No handler, we'll have to terminate things with extreme prejudice.
3987 */
3988 @@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3989 }
3990 #endif
3991
3992 +#ifdef CONFIG_PAX_PAGEEXEC
3993 + if (fsr & FSR_LNX_PF) {
3994 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3995 + do_group_exit(SIGKILL);
3996 + }
3997 +#endif
3998 +
3999 tsk->thread.address = addr;
4000 tsk->thread.error_code = fsr;
4001 tsk->thread.trap_no = 14;
4002 @@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4003 }
4004 #endif /* CONFIG_MMU */
4005
4006 +#ifdef CONFIG_PAX_PAGEEXEC
4007 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4008 +{
4009 + long i;
4010 +
4011 + printk(KERN_ERR "PAX: bytes at PC: ");
4012 + for (i = 0; i < 20; i++) {
4013 + unsigned char c;
4014 + if (get_user(c, (__force unsigned char __user *)pc+i))
4015 + printk(KERN_CONT "?? ");
4016 + else
4017 + printk(KERN_CONT "%02x ", c);
4018 + }
4019 + printk("\n");
4020 +
4021 + printk(KERN_ERR "PAX: bytes at SP-4: ");
4022 + for (i = -1; i < 20; i++) {
4023 + unsigned long c;
4024 + if (get_user(c, (__force unsigned long __user *)sp+i))
4025 + printk(KERN_CONT "???????? ");
4026 + else
4027 + printk(KERN_CONT "%08lx ", c);
4028 + }
4029 + printk("\n");
4030 +}
4031 +#endif
4032 +
4033 /*
4034 * First Level Translation Fault Handler
4035 *
4036 @@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4037 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4038 struct siginfo info;
4039
4040 +#ifdef CONFIG_PAX_MEMORY_UDEREF
4041 + if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4042 + if (current->signal->curr_ip)
4043 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4044 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4045 + else
4046 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4047 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4048 + goto die;
4049 + }
4050 +#endif
4051 +
4052 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4053 return;
4054
4055 +die:
4056 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4057 inf->name, fsr, addr);
4058
4059 @@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4060 ifsr_info[nr].name = name;
4061 }
4062
4063 +asmlinkage int sys_sigreturn(struct pt_regs *regs);
4064 +asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4065 +
4066 asmlinkage void __exception
4067 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4068 {
4069 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4070 struct siginfo info;
4071 + unsigned long pc = instruction_pointer(regs);
4072 +
4073 + if (user_mode(regs)) {
4074 + unsigned long sigpage = current->mm->context.sigpage;
4075 +
4076 + if (sigpage <= pc && pc < sigpage + 7*4) {
4077 + if (pc < sigpage + 3*4)
4078 + sys_sigreturn(regs);
4079 + else
4080 + sys_rt_sigreturn(regs);
4081 + return;
4082 + }
4083 + if (pc == 0xffff0f60UL) {
4084 + /*
4085 + * PaX: __kuser_cmpxchg64 emulation
4086 + */
4087 + // TODO
4088 + //regs->ARM_pc = regs->ARM_lr;
4089 + //return;
4090 + }
4091 + if (pc == 0xffff0fa0UL) {
4092 + /*
4093 + * PaX: __kuser_memory_barrier emulation
4094 + */
4095 + // dmb(); implied by the exception
4096 + regs->ARM_pc = regs->ARM_lr;
4097 + return;
4098 + }
4099 + if (pc == 0xffff0fc0UL) {
4100 + /*
4101 + * PaX: __kuser_cmpxchg emulation
4102 + */
4103 + // TODO
4104 + //long new;
4105 + //int op;
4106 +
4107 + //op = FUTEX_OP_SET << 28;
4108 + //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4109 + //regs->ARM_r0 = old != new;
4110 + //regs->ARM_pc = regs->ARM_lr;
4111 + //return;
4112 + }
4113 + if (pc == 0xffff0fe0UL) {
4114 + /*
4115 + * PaX: __kuser_get_tls emulation
4116 + */
4117 + regs->ARM_r0 = current_thread_info()->tp_value[0];
4118 + regs->ARM_pc = regs->ARM_lr;
4119 + return;
4120 + }
4121 + }
4122 +
4123 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4124 + else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4125 + if (current->signal->curr_ip)
4126 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4127 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4128 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4129 + else
4130 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4131 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4132 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4133 + goto die;
4134 + }
4135 +#endif
4136 +
4137 +#ifdef CONFIG_PAX_REFCOUNT
4138 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4139 +#ifdef CONFIG_THUMB2_KERNEL
4140 + unsigned short bkpt;
4141 +
4142 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4143 +#else
4144 + unsigned int bkpt;
4145 +
4146 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4147 +#endif
4148 + current->thread.error_code = ifsr;
4149 + current->thread.trap_no = 0;
4150 + pax_report_refcount_overflow(regs);
4151 + fixup_exception(regs);
4152 + return;
4153 + }
4154 + }
4155 +#endif
4156
4157 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4158 return;
4159
4160 +die:
4161 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4162 inf->name, ifsr, addr);
4163
4164 diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4165 index cf08bdf..772656c 100644
4166 --- a/arch/arm/mm/fault.h
4167 +++ b/arch/arm/mm/fault.h
4168 @@ -3,6 +3,7 @@
4169
4170 /*
4171 * Fault status register encodings. We steal bit 31 for our own purposes.
4172 + * Set when the FSR value is from an instruction fault.
4173 */
4174 #define FSR_LNX_PF (1 << 31)
4175 #define FSR_WRITE (1 << 11)
4176 @@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4177 }
4178 #endif
4179
4180 +/* valid for LPAE and !LPAE */
4181 +static inline int is_xn_fault(unsigned int fsr)
4182 +{
4183 + return ((fsr_fs(fsr) & 0x3c) == 0xc);
4184 +}
4185 +
4186 +static inline int is_domain_fault(unsigned int fsr)
4187 +{
4188 + return ((fsr_fs(fsr) & 0xD) == 0x9);
4189 +}
4190 +
4191 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4192 unsigned long search_exception_table(unsigned long addr);
4193
4194 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4195 index 9481f85..6dae261 100644
4196 --- a/arch/arm/mm/init.c
4197 +++ b/arch/arm/mm/init.c
4198 @@ -31,6 +31,8 @@
4199 #include <asm/setup.h>
4200 #include <asm/tlb.h>
4201 #include <asm/fixmap.h>
4202 +#include <asm/system_info.h>
4203 +#include <asm/cp15.h>
4204
4205 #include <asm/mach/arch.h>
4206 #include <asm/mach/map.h>
4207 @@ -619,7 +621,46 @@ void free_initmem(void)
4208 {
4209 #ifdef CONFIG_HAVE_TCM
4210 extern char __tcm_start, __tcm_end;
4211 +#endif
4212
4213 +#ifdef CONFIG_PAX_KERNEXEC
4214 + unsigned long addr;
4215 + pgd_t *pgd;
4216 + pud_t *pud;
4217 + pmd_t *pmd;
4218 + int cpu_arch = cpu_architecture();
4219 + unsigned int cr = get_cr();
4220 +
4221 + if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4222 + /* make pages tables, etc before .text NX */
4223 + for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4224 + pgd = pgd_offset_k(addr);
4225 + pud = pud_offset(pgd, addr);
4226 + pmd = pmd_offset(pud, addr);
4227 + __section_update(pmd, addr, PMD_SECT_XN);
4228 + }
4229 + /* make init NX */
4230 + for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4231 + pgd = pgd_offset_k(addr);
4232 + pud = pud_offset(pgd, addr);
4233 + pmd = pmd_offset(pud, addr);
4234 + __section_update(pmd, addr, PMD_SECT_XN);
4235 + }
4236 + /* make kernel code/rodata RX */
4237 + for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4238 + pgd = pgd_offset_k(addr);
4239 + pud = pud_offset(pgd, addr);
4240 + pmd = pmd_offset(pud, addr);
4241 +#ifdef CONFIG_ARM_LPAE
4242 + __section_update(pmd, addr, PMD_SECT_RDONLY);
4243 +#else
4244 + __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4245 +#endif
4246 + }
4247 + }
4248 +#endif
4249 +
4250 +#ifdef CONFIG_HAVE_TCM
4251 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4252 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4253 #endif
4254 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4255 index d1e5ad7..84dcbf2 100644
4256 --- a/arch/arm/mm/ioremap.c
4257 +++ b/arch/arm/mm/ioremap.c
4258 @@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4259 unsigned int mtype;
4260
4261 if (cached)
4262 - mtype = MT_MEMORY_RWX;
4263 + mtype = MT_MEMORY_RX;
4264 else
4265 - mtype = MT_MEMORY_RWX_NONCACHED;
4266 + mtype = MT_MEMORY_RX_NONCACHED;
4267
4268 return __arm_ioremap_caller(phys_addr, size, mtype,
4269 __builtin_return_address(0));
4270 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4271 index 5e85ed3..b10a7ed 100644
4272 --- a/arch/arm/mm/mmap.c
4273 +++ b/arch/arm/mm/mmap.c
4274 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4275 struct vm_area_struct *vma;
4276 int do_align = 0;
4277 int aliasing = cache_is_vipt_aliasing();
4278 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4279 struct vm_unmapped_area_info info;
4280
4281 /*
4282 @@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4283 if (len > TASK_SIZE)
4284 return -ENOMEM;
4285
4286 +#ifdef CONFIG_PAX_RANDMMAP
4287 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4288 +#endif
4289 +
4290 if (addr) {
4291 if (do_align)
4292 addr = COLOUR_ALIGN(addr, pgoff);
4293 @@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4294 addr = PAGE_ALIGN(addr);
4295
4296 vma = find_vma(mm, addr);
4297 - if (TASK_SIZE - len >= addr &&
4298 - (!vma || addr + len <= vma->vm_start))
4299 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4300 return addr;
4301 }
4302
4303 @@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4304 info.high_limit = TASK_SIZE;
4305 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4306 info.align_offset = pgoff << PAGE_SHIFT;
4307 + info.threadstack_offset = offset;
4308 return vm_unmapped_area(&info);
4309 }
4310
4311 @@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4312 unsigned long addr = addr0;
4313 int do_align = 0;
4314 int aliasing = cache_is_vipt_aliasing();
4315 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4316 struct vm_unmapped_area_info info;
4317
4318 /*
4319 @@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4320 return addr;
4321 }
4322
4323 +#ifdef CONFIG_PAX_RANDMMAP
4324 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4325 +#endif
4326 +
4327 /* requesting a specific address */
4328 if (addr) {
4329 if (do_align)
4330 @@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4331 else
4332 addr = PAGE_ALIGN(addr);
4333 vma = find_vma(mm, addr);
4334 - if (TASK_SIZE - len >= addr &&
4335 - (!vma || addr + len <= vma->vm_start))
4336 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4337 return addr;
4338 }
4339
4340 @@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4341 info.high_limit = mm->mmap_base;
4342 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4343 info.align_offset = pgoff << PAGE_SHIFT;
4344 + info.threadstack_offset = offset;
4345 addr = vm_unmapped_area(&info);
4346
4347 /*
4348 @@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4349 {
4350 unsigned long random_factor = 0UL;
4351
4352 +#ifdef CONFIG_PAX_RANDMMAP
4353 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4354 +#endif
4355 +
4356 /* 8 bits of randomness in 20 address space bits */
4357 if ((current->flags & PF_RANDOMIZE) &&
4358 !(current->personality & ADDR_NO_RANDOMIZE))
4359 @@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4360
4361 if (mmap_is_legacy()) {
4362 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4363 +
4364 +#ifdef CONFIG_PAX_RANDMMAP
4365 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4366 + mm->mmap_base += mm->delta_mmap;
4367 +#endif
4368 +
4369 mm->get_unmapped_area = arch_get_unmapped_area;
4370 } else {
4371 mm->mmap_base = mmap_base(random_factor);
4372 +
4373 +#ifdef CONFIG_PAX_RANDMMAP
4374 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4375 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4376 +#endif
4377 +
4378 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4379 }
4380 }
4381 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4382 index 9f98cec..115fcb6 100644
4383 --- a/arch/arm/mm/mmu.c
4384 +++ b/arch/arm/mm/mmu.c
4385 @@ -40,6 +40,22 @@
4386 #include "mm.h"
4387 #include "tcm.h"
4388
4389 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4390 +void modify_domain(unsigned int dom, unsigned int type)
4391 +{
4392 + struct thread_info *thread = current_thread_info();
4393 + unsigned int domain = thread->cpu_domain;
4394 + /*
4395 + * DOMAIN_MANAGER might be defined to some other value,
4396 + * use the arch-defined constant
4397 + */
4398 + domain &= ~domain_val(dom, 3);
4399 + thread->cpu_domain = domain | domain_val(dom, type);
4400 + set_domain(thread->cpu_domain);
4401 +}
4402 +EXPORT_SYMBOL(modify_domain);
4403 +#endif
4404 +
4405 /*
4406 * empty_zero_page is a special page that is used for
4407 * zero-initialized data and COW.
4408 @@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
4409 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4410 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4411
4412 -static struct mem_type mem_types[] = {
4413 +#ifdef CONFIG_PAX_KERNEXEC
4414 +#define L_PTE_KERNEXEC L_PTE_RDONLY
4415 +#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4416 +#else
4417 +#define L_PTE_KERNEXEC L_PTE_DIRTY
4418 +#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4419 +#endif
4420 +
4421 +static struct mem_type mem_types[] __read_only = {
4422 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4423 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4424 L_PTE_SHARED,
4425 @@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
4426 .prot_sect = PROT_SECT_DEVICE,
4427 .domain = DOMAIN_IO,
4428 },
4429 - [MT_UNCACHED] = {
4430 + [MT_UNCACHED_RW] = {
4431 .prot_pte = PROT_PTE_DEVICE,
4432 .prot_l1 = PMD_TYPE_TABLE,
4433 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4434 .domain = DOMAIN_IO,
4435 },
4436 - [MT_CACHECLEAN] = {
4437 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4438 + [MT_CACHECLEAN_RO] = {
4439 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4440 .domain = DOMAIN_KERNEL,
4441 },
4442 #ifndef CONFIG_ARM_LPAE
4443 - [MT_MINICLEAN] = {
4444 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4445 + [MT_MINICLEAN_RO] = {
4446 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449 #endif
4450 @@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
4451 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4452 L_PTE_RDONLY,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454 - .domain = DOMAIN_USER,
4455 + .domain = DOMAIN_VECTORS,
4456 },
4457 [MT_HIGH_VECTORS] = {
4458 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4459 L_PTE_USER | L_PTE_RDONLY,
4460 .prot_l1 = PMD_TYPE_TABLE,
4461 - .domain = DOMAIN_USER,
4462 + .domain = DOMAIN_VECTORS,
4463 },
4464 - [MT_MEMORY_RWX] = {
4465 + [__MT_MEMORY_RWX] = {
4466 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4467 .prot_l1 = PMD_TYPE_TABLE,
4468 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4469 @@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
4470 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4471 .domain = DOMAIN_KERNEL,
4472 },
4473 - [MT_ROM] = {
4474 - .prot_sect = PMD_TYPE_SECT,
4475 + [MT_MEMORY_RX] = {
4476 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4477 + .prot_l1 = PMD_TYPE_TABLE,
4478 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4479 + .domain = DOMAIN_KERNEL,
4480 + },
4481 + [MT_ROM_RX] = {
4482 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4483 .domain = DOMAIN_KERNEL,
4484 },
4485 - [MT_MEMORY_RWX_NONCACHED] = {
4486 + [MT_MEMORY_RW_NONCACHED] = {
4487 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4488 L_PTE_MT_BUFFERABLE,
4489 .prot_l1 = PMD_TYPE_TABLE,
4490 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4491 .domain = DOMAIN_KERNEL,
4492 },
4493 + [MT_MEMORY_RX_NONCACHED] = {
4494 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4495 + L_PTE_MT_BUFFERABLE,
4496 + .prot_l1 = PMD_TYPE_TABLE,
4497 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4498 + .domain = DOMAIN_KERNEL,
4499 + },
4500 [MT_MEMORY_RW_DTCM] = {
4501 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4502 L_PTE_XN,
4503 @@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
4504 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4505 .domain = DOMAIN_KERNEL,
4506 },
4507 - [MT_MEMORY_RWX_ITCM] = {
4508 - .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4509 + [MT_MEMORY_RX_ITCM] = {
4510 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4511 .prot_l1 = PMD_TYPE_TABLE,
4512 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4513 .domain = DOMAIN_KERNEL,
4514 },
4515 [MT_MEMORY_RW_SO] = {
4516 @@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
4517 * Mark cache clean areas and XIP ROM read only
4518 * from SVC mode and no access from userspace.
4519 */
4520 - mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4521 - mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4522 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4523 + mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4524 +#ifdef CONFIG_PAX_KERNEXEC
4525 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4526 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4527 + mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4528 +#endif
4529 + mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4530 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4531 #endif
4532
4533 /*
4534 @@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
4535 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4536 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4537 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4538 - mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4539 - mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4540 + mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4541 + mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4542 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4543 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4544 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4545 + mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4546 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4547 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4548 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4549 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4550 + mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4551 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4552 + mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4553 }
4554 }
4555
4556 @@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
4557 if (cpu_arch >= CPU_ARCH_ARMv6) {
4558 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4559 /* Non-cacheable Normal is XCB = 001 */
4560 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4561 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4562 + PMD_SECT_BUFFERED;
4563 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4564 PMD_SECT_BUFFERED;
4565 } else {
4566 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4567 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4568 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4569 + PMD_SECT_TEX(1);
4570 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4571 PMD_SECT_TEX(1);
4572 }
4573 } else {
4574 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4575 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4576 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4577 }
4578
4579 #ifdef CONFIG_ARM_LPAE
4580 @@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
4581 vecs_pgprot |= PTE_EXT_AF;
4582 #endif
4583
4584 + user_pgprot |= __supported_pte_mask;
4585 +
4586 for (i = 0; i < 16; i++) {
4587 pteval_t v = pgprot_val(protection_map[i]);
4588 protection_map[i] = __pgprot(v | user_pgprot);
4589 @@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
4590
4591 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4592 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4593 - mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4594 - mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4595 + mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4596 + mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4597 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4598 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4599 + mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4600 + mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4601 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4602 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4603 - mem_types[MT_ROM].prot_sect |= cp->pmd;
4604 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4605 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4606 + mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4607
4608 switch (cp->pmd) {
4609 case PMD_SECT_WT:
4610 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4611 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4612 break;
4613 case PMD_SECT_WB:
4614 case PMD_SECT_WBWA:
4615 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4616 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4617 break;
4618 }
4619 pr_info("Memory policy: %sData cache %s\n",
4620 @@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
4621 return;
4622 }
4623
4624 - if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4625 + if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4626 md->virtual >= PAGE_OFFSET &&
4627 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4628 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4629 @@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
4630 * called function. This means you can't use any function or debugging
4631 * method which may touch any device, otherwise the kernel _will_ crash.
4632 */
4633 +
4634 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4635 +
4636 static void __init devicemaps_init(const struct machine_desc *mdesc)
4637 {
4638 struct map_desc map;
4639 unsigned long addr;
4640 - void *vectors;
4641
4642 - /*
4643 - * Allocate the vector page early.
4644 - */
4645 - vectors = early_alloc(PAGE_SIZE * 2);
4646 -
4647 - early_trap_init(vectors);
4648 + early_trap_init(&vectors);
4649
4650 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4651 pmd_clear(pmd_off_k(addr));
4652 @@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4653 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4654 map.virtual = MODULES_VADDR;
4655 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4656 - map.type = MT_ROM;
4657 + map.type = MT_ROM_RX;
4658 create_mapping(&map);
4659 #endif
4660
4661 @@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4662 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4663 map.virtual = FLUSH_BASE;
4664 map.length = SZ_1M;
4665 - map.type = MT_CACHECLEAN;
4666 + map.type = MT_CACHECLEAN_RO;
4667 create_mapping(&map);
4668 #endif
4669 #ifdef FLUSH_BASE_MINICACHE
4670 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4671 map.virtual = FLUSH_BASE_MINICACHE;
4672 map.length = SZ_1M;
4673 - map.type = MT_MINICLEAN;
4674 + map.type = MT_MINICLEAN_RO;
4675 create_mapping(&map);
4676 #endif
4677
4678 @@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4679 * location (0xffff0000). If we aren't using high-vectors, also
4680 * create a mapping at the low-vectors virtual address.
4681 */
4682 - map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4683 + map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4684 map.virtual = 0xffff0000;
4685 map.length = PAGE_SIZE;
4686 #ifdef CONFIG_KUSER_HELPERS
4687 @@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
4688 static void __init map_lowmem(void)
4689 {
4690 struct memblock_region *reg;
4691 +#ifndef CONFIG_PAX_KERNEXEC
4692 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4693 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4694 +#endif
4695
4696 /* Map all the lowmem memory banks. */
4697 for_each_memblock(memory, reg) {
4698 @@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
4699 if (start >= end)
4700 break;
4701
4702 +#ifdef CONFIG_PAX_KERNEXEC
4703 + map.pfn = __phys_to_pfn(start);
4704 + map.virtual = __phys_to_virt(start);
4705 + map.length = end - start;
4706 +
4707 + if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4708 + struct map_desc kernel;
4709 + struct map_desc initmap;
4710 +
4711 + /* when freeing initmem we will make this RW */
4712 + initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4713 + initmap.virtual = (unsigned long)__init_begin;
4714 + initmap.length = _sdata - __init_begin;
4715 + initmap.type = __MT_MEMORY_RWX;
4716 + create_mapping(&initmap);
4717 +
4718 + /* when freeing initmem we will make this RX */
4719 + kernel.pfn = __phys_to_pfn(__pa(_stext));
4720 + kernel.virtual = (unsigned long)_stext;
4721 + kernel.length = __init_begin - _stext;
4722 + kernel.type = __MT_MEMORY_RWX;
4723 + create_mapping(&kernel);
4724 +
4725 + if (map.virtual < (unsigned long)_stext) {
4726 + map.length = (unsigned long)_stext - map.virtual;
4727 + map.type = __MT_MEMORY_RWX;
4728 + create_mapping(&map);
4729 + }
4730 +
4731 + map.pfn = __phys_to_pfn(__pa(_sdata));
4732 + map.virtual = (unsigned long)_sdata;
4733 + map.length = end - __pa(_sdata);
4734 + }
4735 +
4736 + map.type = MT_MEMORY_RW;
4737 + create_mapping(&map);
4738 +#else
4739 if (end < kernel_x_start || start >= kernel_x_end) {
4740 map.pfn = __phys_to_pfn(start);
4741 map.virtual = __phys_to_virt(start);
4742 map.length = end - start;
4743 - map.type = MT_MEMORY_RWX;
4744 + map.type = __MT_MEMORY_RWX;
4745
4746 create_mapping(&map);
4747 } else {
4748 @@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
4749 map.pfn = __phys_to_pfn(kernel_x_start);
4750 map.virtual = __phys_to_virt(kernel_x_start);
4751 map.length = kernel_x_end - kernel_x_start;
4752 - map.type = MT_MEMORY_RWX;
4753 + map.type = __MT_MEMORY_RWX;
4754
4755 create_mapping(&map);
4756
4757 @@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
4758 create_mapping(&map);
4759 }
4760 }
4761 +#endif
4762 }
4763 }
4764
4765 diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4766 index e1268f9..a9755a7 100644
4767 --- a/arch/arm/net/bpf_jit_32.c
4768 +++ b/arch/arm/net/bpf_jit_32.c
4769 @@ -20,6 +20,7 @@
4770 #include <asm/cacheflush.h>
4771 #include <asm/hwcap.h>
4772 #include <asm/opcodes.h>
4773 +#include <asm/pgtable.h>
4774
4775 #include "bpf_jit_32.h"
4776
4777 @@ -71,7 +72,11 @@ struct jit_ctx {
4778 #endif
4779 };
4780
4781 +#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4782 +int bpf_jit_enable __read_only;
4783 +#else
4784 int bpf_jit_enable __read_mostly;
4785 +#endif
4786
4787 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4788 {
4789 @@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4790 {
4791 u32 *ptr;
4792 /* We are guaranteed to have aligned memory. */
4793 + pax_open_kernel();
4794 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4795 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4796 + pax_close_kernel();
4797 }
4798
4799 static void build_prologue(struct jit_ctx *ctx)
4800 diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4801 index 5b217f4..c23f40e 100644
4802 --- a/arch/arm/plat-iop/setup.c
4803 +++ b/arch/arm/plat-iop/setup.c
4804 @@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4805 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4806 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4807 .length = IOP3XX_PERIPHERAL_SIZE,
4808 - .type = MT_UNCACHED,
4809 + .type = MT_UNCACHED_RW,
4810 },
4811 };
4812
4813 diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4814 index a5bc92d..0bb4730 100644
4815 --- a/arch/arm/plat-omap/sram.c
4816 +++ b/arch/arm/plat-omap/sram.c
4817 @@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4818 * Looks like we need to preserve some bootloader code at the
4819 * beginning of SRAM for jumping to flash for reboot to work...
4820 */
4821 + pax_open_kernel();
4822 memset_io(omap_sram_base + omap_sram_skip, 0,
4823 omap_sram_size - omap_sram_skip);
4824 + pax_close_kernel();
4825 }
4826 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4827 index ce6d763..cfea917 100644
4828 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4829 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4830 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
4831 int (*started)(unsigned ch);
4832 int (*flush)(unsigned ch);
4833 int (*stop)(unsigned ch);
4834 -};
4835 +} __no_const;
4836
4837 extern void *samsung_dmadev_get_ops(void);
4838 extern void *s3c_dma_get_ops(void);
4839 diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4840 index 6389d60..b5d3bdd 100644
4841 --- a/arch/arm64/include/asm/barrier.h
4842 +++ b/arch/arm64/include/asm/barrier.h
4843 @@ -41,7 +41,7 @@
4844 do { \
4845 compiletime_assert_atomic_type(*p); \
4846 barrier(); \
4847 - ACCESS_ONCE(*p) = (v); \
4848 + ACCESS_ONCE_RW(*p) = (v); \
4849 } while (0)
4850
4851 #define smp_load_acquire(p) \
4852 diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4853 index 3bf8f4e..5dd5491 100644
4854 --- a/arch/arm64/include/asm/uaccess.h
4855 +++ b/arch/arm64/include/asm/uaccess.h
4856 @@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4857 flag; \
4858 })
4859
4860 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4861 #define access_ok(type, addr, size) __range_ok(addr, size)
4862 #define user_addr_max get_fs
4863
4864 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4865 index c3a58a1..78fbf54 100644
4866 --- a/arch/avr32/include/asm/cache.h
4867 +++ b/arch/avr32/include/asm/cache.h
4868 @@ -1,8 +1,10 @@
4869 #ifndef __ASM_AVR32_CACHE_H
4870 #define __ASM_AVR32_CACHE_H
4871
4872 +#include <linux/const.h>
4873 +
4874 #define L1_CACHE_SHIFT 5
4875 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4876 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4877
4878 /*
4879 * Memory returned by kmalloc() may be used for DMA, so we must make
4880 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4881 index d232888..87c8df1 100644
4882 --- a/arch/avr32/include/asm/elf.h
4883 +++ b/arch/avr32/include/asm/elf.h
4884 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4885 the loader. We need to make sure that it is out of the way of the program
4886 that it will "exec", and that there is sufficient room for the brk. */
4887
4888 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4889 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4890
4891 +#ifdef CONFIG_PAX_ASLR
4892 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4893 +
4894 +#define PAX_DELTA_MMAP_LEN 15
4895 +#define PAX_DELTA_STACK_LEN 15
4896 +#endif
4897
4898 /* This yields a mask that user programs can use to figure out what
4899 instruction set this CPU supports. This could be done in user space,
4900 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4901 index 479330b..53717a8 100644
4902 --- a/arch/avr32/include/asm/kmap_types.h
4903 +++ b/arch/avr32/include/asm/kmap_types.h
4904 @@ -2,9 +2,9 @@
4905 #define __ASM_AVR32_KMAP_TYPES_H
4906
4907 #ifdef CONFIG_DEBUG_HIGHMEM
4908 -# define KM_TYPE_NR 29
4909 +# define KM_TYPE_NR 30
4910 #else
4911 -# define KM_TYPE_NR 14
4912 +# define KM_TYPE_NR 15
4913 #endif
4914
4915 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4916 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4917 index 0eca933..eb78c7b 100644
4918 --- a/arch/avr32/mm/fault.c
4919 +++ b/arch/avr32/mm/fault.c
4920 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4921
4922 int exception_trace = 1;
4923
4924 +#ifdef CONFIG_PAX_PAGEEXEC
4925 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4926 +{
4927 + unsigned long i;
4928 +
4929 + printk(KERN_ERR "PAX: bytes at PC: ");
4930 + for (i = 0; i < 20; i++) {
4931 + unsigned char c;
4932 + if (get_user(c, (unsigned char *)pc+i))
4933 + printk(KERN_CONT "???????? ");
4934 + else
4935 + printk(KERN_CONT "%02x ", c);
4936 + }
4937 + printk("\n");
4938 +}
4939 +#endif
4940 +
4941 /*
4942 * This routine handles page faults. It determines the address and the
4943 * problem, and then passes it off to one of the appropriate routines.
4944 @@ -176,6 +193,16 @@ bad_area:
4945 up_read(&mm->mmap_sem);
4946
4947 if (user_mode(regs)) {
4948 +
4949 +#ifdef CONFIG_PAX_PAGEEXEC
4950 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4951 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4952 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4953 + do_group_exit(SIGKILL);
4954 + }
4955 + }
4956 +#endif
4957 +
4958 if (exception_trace && printk_ratelimit())
4959 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4960 "sp %08lx ecr %lu\n",
4961 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4962 index 568885a..f8008df 100644
4963 --- a/arch/blackfin/include/asm/cache.h
4964 +++ b/arch/blackfin/include/asm/cache.h
4965 @@ -7,6 +7,7 @@
4966 #ifndef __ARCH_BLACKFIN_CACHE_H
4967 #define __ARCH_BLACKFIN_CACHE_H
4968
4969 +#include <linux/const.h>
4970 #include <linux/linkage.h> /* for asmlinkage */
4971
4972 /*
4973 @@ -14,7 +15,7 @@
4974 * Blackfin loads 32 bytes for cache
4975 */
4976 #define L1_CACHE_SHIFT 5
4977 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4978 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4979 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4980
4981 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4982 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4983 index aea2718..3639a60 100644
4984 --- a/arch/cris/include/arch-v10/arch/cache.h
4985 +++ b/arch/cris/include/arch-v10/arch/cache.h
4986 @@ -1,8 +1,9 @@
4987 #ifndef _ASM_ARCH_CACHE_H
4988 #define _ASM_ARCH_CACHE_H
4989
4990 +#include <linux/const.h>
4991 /* Etrax 100LX have 32-byte cache-lines. */
4992 -#define L1_CACHE_BYTES 32
4993 #define L1_CACHE_SHIFT 5
4994 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4995
4996 #endif /* _ASM_ARCH_CACHE_H */
4997 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4998 index 7caf25d..ee65ac5 100644
4999 --- a/arch/cris/include/arch-v32/arch/cache.h
5000 +++ b/arch/cris/include/arch-v32/arch/cache.h
5001 @@ -1,11 +1,12 @@
5002 #ifndef _ASM_CRIS_ARCH_CACHE_H
5003 #define _ASM_CRIS_ARCH_CACHE_H
5004
5005 +#include <linux/const.h>
5006 #include <arch/hwregs/dma.h>
5007
5008 /* A cache-line is 32 bytes. */
5009 -#define L1_CACHE_BYTES 32
5010 #define L1_CACHE_SHIFT 5
5011 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5012
5013 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5014
5015 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5016 index 102190a..5334cea 100644
5017 --- a/arch/frv/include/asm/atomic.h
5018 +++ b/arch/frv/include/asm/atomic.h
5019 @@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5020 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5021 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5022
5023 +#define atomic64_read_unchecked(v) atomic64_read(v)
5024 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5025 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5026 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5027 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5028 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5029 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5030 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5031 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5032 +
5033 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5034 {
5035 int c, old;
5036 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5037 index 2797163..c2a401df9 100644
5038 --- a/arch/frv/include/asm/cache.h
5039 +++ b/arch/frv/include/asm/cache.h
5040 @@ -12,10 +12,11 @@
5041 #ifndef __ASM_CACHE_H
5042 #define __ASM_CACHE_H
5043
5044 +#include <linux/const.h>
5045
5046 /* bytes per L1 cache line */
5047 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5048 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5049 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5050
5051 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5052 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5053 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5054 index 43901f2..0d8b865 100644
5055 --- a/arch/frv/include/asm/kmap_types.h
5056 +++ b/arch/frv/include/asm/kmap_types.h
5057 @@ -2,6 +2,6 @@
5058 #ifndef _ASM_KMAP_TYPES_H
5059 #define _ASM_KMAP_TYPES_H
5060
5061 -#define KM_TYPE_NR 17
5062 +#define KM_TYPE_NR 18
5063
5064 #endif
5065 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5066 index 836f147..4cf23f5 100644
5067 --- a/arch/frv/mm/elf-fdpic.c
5068 +++ b/arch/frv/mm/elf-fdpic.c
5069 @@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5070 {
5071 struct vm_area_struct *vma;
5072 struct vm_unmapped_area_info info;
5073 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5074
5075 if (len > TASK_SIZE)
5076 return -ENOMEM;
5077 @@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5078 if (addr) {
5079 addr = PAGE_ALIGN(addr);
5080 vma = find_vma(current->mm, addr);
5081 - if (TASK_SIZE - len >= addr &&
5082 - (!vma || addr + len <= vma->vm_start))
5083 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5084 goto success;
5085 }
5086
5087 @@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5088 info.high_limit = (current->mm->start_stack - 0x00200000);
5089 info.align_mask = 0;
5090 info.align_offset = 0;
5091 + info.threadstack_offset = offset;
5092 addr = vm_unmapped_area(&info);
5093 if (!(addr & ~PAGE_MASK))
5094 goto success;
5095 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5096 index 2635117..fa223cb 100644
5097 --- a/arch/hexagon/include/asm/cache.h
5098 +++ b/arch/hexagon/include/asm/cache.h
5099 @@ -21,9 +21,11 @@
5100 #ifndef __ASM_CACHE_H
5101 #define __ASM_CACHE_H
5102
5103 +#include <linux/const.h>
5104 +
5105 /* Bytes per L1 cache line */
5106 -#define L1_CACHE_SHIFT (5)
5107 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5108 +#define L1_CACHE_SHIFT 5
5109 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5110
5111 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5112 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5113 diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5114 index c84c88b..2a6e1ba 100644
5115 --- a/arch/ia64/Kconfig
5116 +++ b/arch/ia64/Kconfig
5117 @@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
5118 config KEXEC
5119 bool "kexec system call"
5120 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5121 + depends on !GRKERNSEC_KMEM
5122 help
5123 kexec is a system call that implements the ability to shutdown your
5124 current kernel, and to start another kernel. It is like a reboot
5125 diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5126 index 5441b14..039a446 100644
5127 --- a/arch/ia64/Makefile
5128 +++ b/arch/ia64/Makefile
5129 @@ -99,5 +99,6 @@ endef
5130 archprepare: make_nr_irqs_h FORCE
5131 PHONY += make_nr_irqs_h FORCE
5132
5133 +make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5134 make_nr_irqs_h: FORCE
5135 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5136 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5137 index 0bf0350..2ad1957 100644
5138 --- a/arch/ia64/include/asm/atomic.h
5139 +++ b/arch/ia64/include/asm/atomic.h
5140 @@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5141 #define atomic64_inc(v) atomic64_add(1, (v))
5142 #define atomic64_dec(v) atomic64_sub(1, (v))
5143
5144 +#define atomic64_read_unchecked(v) atomic64_read(v)
5145 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5146 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5147 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5148 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5149 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5150 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5151 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5152 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5153 +
5154 #endif /* _ASM_IA64_ATOMIC_H */
5155 diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5156 index a48957c..e097b56 100644
5157 --- a/arch/ia64/include/asm/barrier.h
5158 +++ b/arch/ia64/include/asm/barrier.h
5159 @@ -67,7 +67,7 @@
5160 do { \
5161 compiletime_assert_atomic_type(*p); \
5162 barrier(); \
5163 - ACCESS_ONCE(*p) = (v); \
5164 + ACCESS_ONCE_RW(*p) = (v); \
5165 } while (0)
5166
5167 #define smp_load_acquire(p) \
5168 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5169 index 988254a..e1ee885 100644
5170 --- a/arch/ia64/include/asm/cache.h
5171 +++ b/arch/ia64/include/asm/cache.h
5172 @@ -1,6 +1,7 @@
5173 #ifndef _ASM_IA64_CACHE_H
5174 #define _ASM_IA64_CACHE_H
5175
5176 +#include <linux/const.h>
5177
5178 /*
5179 * Copyright (C) 1998-2000 Hewlett-Packard Co
5180 @@ -9,7 +10,7 @@
5181
5182 /* Bytes per L1 (data) cache line. */
5183 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5184 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5185 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5186
5187 #ifdef CONFIG_SMP
5188 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5189 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5190 index 5a83c5c..4d7f553 100644
5191 --- a/arch/ia64/include/asm/elf.h
5192 +++ b/arch/ia64/include/asm/elf.h
5193 @@ -42,6 +42,13 @@
5194 */
5195 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5196
5197 +#ifdef CONFIG_PAX_ASLR
5198 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5199 +
5200 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5201 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5202 +#endif
5203 +
5204 #define PT_IA_64_UNWIND 0x70000001
5205
5206 /* IA-64 relocations: */
5207 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5208 index 5767cdf..7462574 100644
5209 --- a/arch/ia64/include/asm/pgalloc.h
5210 +++ b/arch/ia64/include/asm/pgalloc.h
5211 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5212 pgd_val(*pgd_entry) = __pa(pud);
5213 }
5214
5215 +static inline void
5216 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5217 +{
5218 + pgd_populate(mm, pgd_entry, pud);
5219 +}
5220 +
5221 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5222 {
5223 return quicklist_alloc(0, GFP_KERNEL, NULL);
5224 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5225 pud_val(*pud_entry) = __pa(pmd);
5226 }
5227
5228 +static inline void
5229 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5230 +{
5231 + pud_populate(mm, pud_entry, pmd);
5232 +}
5233 +
5234 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5235 {
5236 return quicklist_alloc(0, GFP_KERNEL, NULL);
5237 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5238 index 7935115..c0eca6a 100644
5239 --- a/arch/ia64/include/asm/pgtable.h
5240 +++ b/arch/ia64/include/asm/pgtable.h
5241 @@ -12,7 +12,7 @@
5242 * David Mosberger-Tang <davidm@hpl.hp.com>
5243 */
5244
5245 -
5246 +#include <linux/const.h>
5247 #include <asm/mman.h>
5248 #include <asm/page.h>
5249 #include <asm/processor.h>
5250 @@ -142,6 +142,17 @@
5251 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5252 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5253 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5254 +
5255 +#ifdef CONFIG_PAX_PAGEEXEC
5256 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5257 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5258 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5259 +#else
5260 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
5261 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
5262 +# define PAGE_COPY_NOEXEC PAGE_COPY
5263 +#endif
5264 +
5265 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5266 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5267 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5268 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5269 index 45698cd..e8e2dbc 100644
5270 --- a/arch/ia64/include/asm/spinlock.h
5271 +++ b/arch/ia64/include/asm/spinlock.h
5272 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5273 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5274
5275 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5276 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5277 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5278 }
5279
5280 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5281 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5282 index 449c8c0..3d4b1e9 100644
5283 --- a/arch/ia64/include/asm/uaccess.h
5284 +++ b/arch/ia64/include/asm/uaccess.h
5285 @@ -70,6 +70,7 @@
5286 && ((segment).seg == KERNEL_DS.seg \
5287 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5288 })
5289 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5290 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5291
5292 /*
5293 @@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5294 static inline unsigned long
5295 __copy_to_user (void __user *to, const void *from, unsigned long count)
5296 {
5297 + if (count > INT_MAX)
5298 + return count;
5299 +
5300 + if (!__builtin_constant_p(count))
5301 + check_object_size(from, count, true);
5302 +
5303 return __copy_user(to, (__force void __user *) from, count);
5304 }
5305
5306 static inline unsigned long
5307 __copy_from_user (void *to, const void __user *from, unsigned long count)
5308 {
5309 + if (count > INT_MAX)
5310 + return count;
5311 +
5312 + if (!__builtin_constant_p(count))
5313 + check_object_size(to, count, false);
5314 +
5315 return __copy_user((__force void __user *) to, from, count);
5316 }
5317
5318 @@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5319 ({ \
5320 void __user *__cu_to = (to); \
5321 const void *__cu_from = (from); \
5322 - long __cu_len = (n); \
5323 + unsigned long __cu_len = (n); \
5324 \
5325 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
5326 + if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5327 + if (!__builtin_constant_p(n)) \
5328 + check_object_size(__cu_from, __cu_len, true); \
5329 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5330 + } \
5331 __cu_len; \
5332 })
5333
5334 @@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5335 ({ \
5336 void *__cu_to = (to); \
5337 const void __user *__cu_from = (from); \
5338 - long __cu_len = (n); \
5339 + unsigned long __cu_len = (n); \
5340 \
5341 __chk_user_ptr(__cu_from); \
5342 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
5343 + if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5344 + if (!__builtin_constant_p(n)) \
5345 + check_object_size(__cu_to, __cu_len, false); \
5346 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5347 + } \
5348 __cu_len; \
5349 })
5350
5351 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5352 index 24603be..948052d 100644
5353 --- a/arch/ia64/kernel/module.c
5354 +++ b/arch/ia64/kernel/module.c
5355 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5356 void
5357 module_free (struct module *mod, void *module_region)
5358 {
5359 - if (mod && mod->arch.init_unw_table &&
5360 - module_region == mod->module_init) {
5361 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5362 unw_remove_unwind_table(mod->arch.init_unw_table);
5363 mod->arch.init_unw_table = NULL;
5364 }
5365 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5366 }
5367
5368 static inline int
5369 +in_init_rx (const struct module *mod, uint64_t addr)
5370 +{
5371 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5372 +}
5373 +
5374 +static inline int
5375 +in_init_rw (const struct module *mod, uint64_t addr)
5376 +{
5377 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5378 +}
5379 +
5380 +static inline int
5381 in_init (const struct module *mod, uint64_t addr)
5382 {
5383 - return addr - (uint64_t) mod->module_init < mod->init_size;
5384 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5385 +}
5386 +
5387 +static inline int
5388 +in_core_rx (const struct module *mod, uint64_t addr)
5389 +{
5390 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5391 +}
5392 +
5393 +static inline int
5394 +in_core_rw (const struct module *mod, uint64_t addr)
5395 +{
5396 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5397 }
5398
5399 static inline int
5400 in_core (const struct module *mod, uint64_t addr)
5401 {
5402 - return addr - (uint64_t) mod->module_core < mod->core_size;
5403 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5404 }
5405
5406 static inline int
5407 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5408 break;
5409
5410 case RV_BDREL:
5411 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5412 + if (in_init_rx(mod, val))
5413 + val -= (uint64_t) mod->module_init_rx;
5414 + else if (in_init_rw(mod, val))
5415 + val -= (uint64_t) mod->module_init_rw;
5416 + else if (in_core_rx(mod, val))
5417 + val -= (uint64_t) mod->module_core_rx;
5418 + else if (in_core_rw(mod, val))
5419 + val -= (uint64_t) mod->module_core_rw;
5420 break;
5421
5422 case RV_LTV:
5423 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5424 * addresses have been selected...
5425 */
5426 uint64_t gp;
5427 - if (mod->core_size > MAX_LTOFF)
5428 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5429 /*
5430 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5431 * at the end of the module.
5432 */
5433 - gp = mod->core_size - MAX_LTOFF / 2;
5434 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5435 else
5436 - gp = mod->core_size / 2;
5437 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5438 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5439 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5440 mod->arch.gp = gp;
5441 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5442 }
5443 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5444 index c39c3cd..3c77738 100644
5445 --- a/arch/ia64/kernel/palinfo.c
5446 +++ b/arch/ia64/kernel/palinfo.c
5447 @@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5448 return NOTIFY_OK;
5449 }
5450
5451 -static struct notifier_block __refdata palinfo_cpu_notifier =
5452 +static struct notifier_block palinfo_cpu_notifier =
5453 {
5454 .notifier_call = palinfo_cpu_callback,
5455 .priority = 0,
5456 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5457 index 41e33f8..65180b2a 100644
5458 --- a/arch/ia64/kernel/sys_ia64.c
5459 +++ b/arch/ia64/kernel/sys_ia64.c
5460 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5461 unsigned long align_mask = 0;
5462 struct mm_struct *mm = current->mm;
5463 struct vm_unmapped_area_info info;
5464 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5465
5466 if (len > RGN_MAP_LIMIT)
5467 return -ENOMEM;
5468 @@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5469 if (REGION_NUMBER(addr) == RGN_HPAGE)
5470 addr = 0;
5471 #endif
5472 +
5473 +#ifdef CONFIG_PAX_RANDMMAP
5474 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5475 + addr = mm->free_area_cache;
5476 + else
5477 +#endif
5478 +
5479 if (!addr)
5480 addr = TASK_UNMAPPED_BASE;
5481
5482 @@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5483 info.high_limit = TASK_SIZE;
5484 info.align_mask = align_mask;
5485 info.align_offset = 0;
5486 + info.threadstack_offset = offset;
5487 return vm_unmapped_area(&info);
5488 }
5489
5490 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5491 index 84f8a52..7c76178 100644
5492 --- a/arch/ia64/kernel/vmlinux.lds.S
5493 +++ b/arch/ia64/kernel/vmlinux.lds.S
5494 @@ -192,7 +192,7 @@ SECTIONS {
5495 /* Per-cpu data: */
5496 . = ALIGN(PERCPU_PAGE_SIZE);
5497 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5498 - __phys_per_cpu_start = __per_cpu_load;
5499 + __phys_per_cpu_start = per_cpu_load;
5500 /*
5501 * ensure percpu data fits
5502 * into percpu page size
5503 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5504 index 7225dad..2a7c8256 100644
5505 --- a/arch/ia64/mm/fault.c
5506 +++ b/arch/ia64/mm/fault.c
5507 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5508 return pte_present(pte);
5509 }
5510
5511 +#ifdef CONFIG_PAX_PAGEEXEC
5512 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5513 +{
5514 + unsigned long i;
5515 +
5516 + printk(KERN_ERR "PAX: bytes at PC: ");
5517 + for (i = 0; i < 8; i++) {
5518 + unsigned int c;
5519 + if (get_user(c, (unsigned int *)pc+i))
5520 + printk(KERN_CONT "???????? ");
5521 + else
5522 + printk(KERN_CONT "%08x ", c);
5523 + }
5524 + printk("\n");
5525 +}
5526 +#endif
5527 +
5528 # define VM_READ_BIT 0
5529 # define VM_WRITE_BIT 1
5530 # define VM_EXEC_BIT 2
5531 @@ -151,8 +168,21 @@ retry:
5532 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5533 goto bad_area;
5534
5535 - if ((vma->vm_flags & mask) != mask)
5536 + if ((vma->vm_flags & mask) != mask) {
5537 +
5538 +#ifdef CONFIG_PAX_PAGEEXEC
5539 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5540 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5541 + goto bad_area;
5542 +
5543 + up_read(&mm->mmap_sem);
5544 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5545 + do_group_exit(SIGKILL);
5546 + }
5547 +#endif
5548 +
5549 goto bad_area;
5550 + }
5551
5552 /*
5553 * If for any reason at all we couldn't handle the fault, make
5554 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5555 index 76069c1..c2aa816 100644
5556 --- a/arch/ia64/mm/hugetlbpage.c
5557 +++ b/arch/ia64/mm/hugetlbpage.c
5558 @@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5559 unsigned long pgoff, unsigned long flags)
5560 {
5561 struct vm_unmapped_area_info info;
5562 + unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5563
5564 if (len > RGN_MAP_LIMIT)
5565 return -ENOMEM;
5566 @@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5567 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5568 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5569 info.align_offset = 0;
5570 + info.threadstack_offset = offset;
5571 return vm_unmapped_area(&info);
5572 }
5573
5574 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5575 index 6b33457..88b5124 100644
5576 --- a/arch/ia64/mm/init.c
5577 +++ b/arch/ia64/mm/init.c
5578 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5579 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5580 vma->vm_end = vma->vm_start + PAGE_SIZE;
5581 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5582 +
5583 +#ifdef CONFIG_PAX_PAGEEXEC
5584 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5585 + vma->vm_flags &= ~VM_EXEC;
5586 +
5587 +#ifdef CONFIG_PAX_MPROTECT
5588 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
5589 + vma->vm_flags &= ~VM_MAYEXEC;
5590 +#endif
5591 +
5592 + }
5593 +#endif
5594 +
5595 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5596 down_write(&current->mm->mmap_sem);
5597 if (insert_vm_struct(current->mm, vma)) {
5598 @@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5599 gate_vma.vm_start = FIXADDR_USER_START;
5600 gate_vma.vm_end = FIXADDR_USER_END;
5601 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5602 - gate_vma.vm_page_prot = __P101;
5603 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5604
5605 return 0;
5606 }
5607 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5608 index 40b3ee9..8c2c112 100644
5609 --- a/arch/m32r/include/asm/cache.h
5610 +++ b/arch/m32r/include/asm/cache.h
5611 @@ -1,8 +1,10 @@
5612 #ifndef _ASM_M32R_CACHE_H
5613 #define _ASM_M32R_CACHE_H
5614
5615 +#include <linux/const.h>
5616 +
5617 /* L1 cache line size */
5618 #define L1_CACHE_SHIFT 4
5619 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5620 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5621
5622 #endif /* _ASM_M32R_CACHE_H */
5623 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5624 index 82abd15..d95ae5d 100644
5625 --- a/arch/m32r/lib/usercopy.c
5626 +++ b/arch/m32r/lib/usercopy.c
5627 @@ -14,6 +14,9 @@
5628 unsigned long
5629 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5630 {
5631 + if ((long)n < 0)
5632 + return n;
5633 +
5634 prefetch(from);
5635 if (access_ok(VERIFY_WRITE, to, n))
5636 __copy_user(to,from,n);
5637 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5638 unsigned long
5639 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5640 {
5641 + if ((long)n < 0)
5642 + return n;
5643 +
5644 prefetchw(to);
5645 if (access_ok(VERIFY_READ, from, n))
5646 __copy_user_zeroing(to,from,n);
5647 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5648 index 0395c51..5f26031 100644
5649 --- a/arch/m68k/include/asm/cache.h
5650 +++ b/arch/m68k/include/asm/cache.h
5651 @@ -4,9 +4,11 @@
5652 #ifndef __ARCH_M68K_CACHE_H
5653 #define __ARCH_M68K_CACHE_H
5654
5655 +#include <linux/const.h>
5656 +
5657 /* bytes per L1 cache line */
5658 #define L1_CACHE_SHIFT 4
5659 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5660 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5661
5662 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5663
5664 diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5665 index c7591e8..ecef036 100644
5666 --- a/arch/metag/include/asm/barrier.h
5667 +++ b/arch/metag/include/asm/barrier.h
5668 @@ -89,7 +89,7 @@ static inline void fence(void)
5669 do { \
5670 compiletime_assert_atomic_type(*p); \
5671 smp_mb(); \
5672 - ACCESS_ONCE(*p) = (v); \
5673 + ACCESS_ONCE_RW(*p) = (v); \
5674 } while (0)
5675
5676 #define smp_load_acquire(p) \
5677 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5678 index 3c32075..ae0ae75 100644
5679 --- a/arch/metag/mm/hugetlbpage.c
5680 +++ b/arch/metag/mm/hugetlbpage.c
5681 @@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5682 info.high_limit = TASK_SIZE;
5683 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5684 info.align_offset = 0;
5685 + info.threadstack_offset = 0;
5686 return vm_unmapped_area(&info);
5687 }
5688
5689 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5690 index 4efe96a..60e8699 100644
5691 --- a/arch/microblaze/include/asm/cache.h
5692 +++ b/arch/microblaze/include/asm/cache.h
5693 @@ -13,11 +13,12 @@
5694 #ifndef _ASM_MICROBLAZE_CACHE_H
5695 #define _ASM_MICROBLAZE_CACHE_H
5696
5697 +#include <linux/const.h>
5698 #include <asm/registers.h>
5699
5700 #define L1_CACHE_SHIFT 5
5701 /* word-granular cache in microblaze */
5702 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5703 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5704
5705 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5706
5707 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5708 index 9536ef9..9333776 100644
5709 --- a/arch/mips/Kconfig
5710 +++ b/arch/mips/Kconfig
5711 @@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
5712
5713 config KEXEC
5714 bool "Kexec system call"
5715 + depends on !GRKERNSEC_KMEM
5716 help
5717 kexec is a system call that implements the ability to shutdown your
5718 current kernel, and to start another kernel. It is like a reboot
5719 diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5720 index 02f2444..506969c 100644
5721 --- a/arch/mips/cavium-octeon/dma-octeon.c
5722 +++ b/arch/mips/cavium-octeon/dma-octeon.c
5723 @@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5724 if (dma_release_from_coherent(dev, order, vaddr))
5725 return;
5726
5727 - swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5728 + swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5729 }
5730
5731 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5732 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5733 index 6dd6bfc..903b0d6 100644
5734 --- a/arch/mips/include/asm/atomic.h
5735 +++ b/arch/mips/include/asm/atomic.h
5736 @@ -21,15 +21,39 @@
5737 #include <asm/cmpxchg.h>
5738 #include <asm/war.h>
5739
5740 +#ifdef CONFIG_GENERIC_ATOMIC64
5741 +#include <asm-generic/atomic64.h>
5742 +#endif
5743 +
5744 #define ATOMIC_INIT(i) { (i) }
5745
5746 +#ifdef CONFIG_64BIT
5747 +#define _ASM_EXTABLE(from, to) \
5748 +" .section __ex_table,\"a\"\n" \
5749 +" .dword " #from ", " #to"\n" \
5750 +" .previous\n"
5751 +#else
5752 +#define _ASM_EXTABLE(from, to) \
5753 +" .section __ex_table,\"a\"\n" \
5754 +" .word " #from ", " #to"\n" \
5755 +" .previous\n"
5756 +#endif
5757 +
5758 /*
5759 * atomic_read - read atomic variable
5760 * @v: pointer of type atomic_t
5761 *
5762 * Atomically reads the value of @v.
5763 */
5764 -#define atomic_read(v) ACCESS_ONCE((v)->counter)
5765 +static inline int atomic_read(const atomic_t *v)
5766 +{
5767 + return ACCESS_ONCE(v->counter);
5768 +}
5769 +
5770 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5771 +{
5772 + return ACCESS_ONCE(v->counter);
5773 +}
5774
5775 /*
5776 * atomic_set - set atomic variable
5777 @@ -38,47 +62,77 @@
5778 *
5779 * Atomically sets the value of @v to @i.
5780 */
5781 -#define atomic_set(v, i) ((v)->counter = (i))
5782 +static inline void atomic_set(atomic_t *v, int i)
5783 +{
5784 + v->counter = i;
5785 +}
5786
5787 -#define ATOMIC_OP(op, c_op, asm_op) \
5788 -static __inline__ void atomic_##op(int i, atomic_t * v) \
5789 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5790 +{
5791 + v->counter = i;
5792 +}
5793 +
5794 +#ifdef CONFIG_PAX_REFCOUNT
5795 +#define __OVERFLOW_POST \
5796 + " b 4f \n" \
5797 + " .set noreorder \n" \
5798 + "3: b 5f \n" \
5799 + " move %0, %1 \n" \
5800 + " .set reorder \n"
5801 +#define __OVERFLOW_EXTABLE \
5802 + "3:\n" \
5803 + _ASM_EXTABLE(2b, 3b)
5804 +#else
5805 +#define __OVERFLOW_POST
5806 +#define __OVERFLOW_EXTABLE
5807 +#endif
5808 +
5809 +#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5810 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5811 { \
5812 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5813 int temp; \
5814 \
5815 __asm__ __volatile__( \
5816 - " .set arch=r4000 \n" \
5817 - "1: ll %0, %1 # atomic_" #op " \n" \
5818 - " " #asm_op " %0, %2 \n" \
5819 + " .set mips3 \n" \
5820 + "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5821 + "2: " #asm_op " %0, %2 \n" \
5822 " sc %0, %1 \n" \
5823 " beqzl %0, 1b \n" \
5824 + extable \
5825 " .set mips0 \n" \
5826 : "=&r" (temp), "+m" (v->counter) \
5827 : "Ir" (i)); \
5828 } else if (kernel_uses_llsc) { \
5829 int temp; \
5830 \
5831 - do { \
5832 - __asm__ __volatile__( \
5833 - " .set arch=r4000 \n" \
5834 - " ll %0, %1 # atomic_" #op "\n" \
5835 - " " #asm_op " %0, %2 \n" \
5836 - " sc %0, %1 \n" \
5837 - " .set mips0 \n" \
5838 - : "=&r" (temp), "+m" (v->counter) \
5839 - : "Ir" (i)); \
5840 - } while (unlikely(!temp)); \
5841 + __asm__ __volatile__( \
5842 + " .set mips3 \n" \
5843 + " ll %0, %1 # atomic_" #op #suffix "\n" \
5844 + "2: " #asm_op " %0, %2 \n" \
5845 + " sc %0, %1 \n" \
5846 + " beqz %0, 1b \n" \
5847 + extable \
5848 + " .set mips0 \n" \
5849 + : "=&r" (temp), "+m" (v->counter) \
5850 + : "Ir" (i)); \
5851 } else { \
5852 unsigned long flags; \
5853 \
5854 raw_local_irq_save(flags); \
5855 - v->counter c_op i; \
5856 + __asm__ __volatile__( \
5857 + "2: " #asm_op " %0, %1 \n" \
5858 + extable \
5859 + : "+r" (v->counter) : "Ir" (i)); \
5860 raw_local_irq_restore(flags); \
5861 } \
5862 } \
5863
5864 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5865 -static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5866 +#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
5867 + __ATOMIC_OP(op, _unchecked, asm_op)
5868 +
5869 +#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5870 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5871 { \
5872 int result; \
5873 \
5874 @@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5875 int temp; \
5876 \
5877 __asm__ __volatile__( \
5878 - " .set arch=r4000 \n" \
5879 - "1: ll %1, %2 # atomic_" #op "_return \n" \
5880 - " " #asm_op " %0, %1, %3 \n" \
5881 + " .set mips3 \n" \
5882 + "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5883 + "2: " #asm_op " %0, %1, %3 \n" \
5884 " sc %0, %2 \n" \
5885 " beqzl %0, 1b \n" \
5886 - " " #asm_op " %0, %1, %3 \n" \
5887 + post_op \
5888 + extable \
5889 + "4: " #asm_op " %0, %1, %3 \n" \
5890 + "5: \n" \
5891 " .set mips0 \n" \
5892 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5893 : "Ir" (i)); \
5894 } else if (kernel_uses_llsc) { \
5895 int temp; \
5896 \
5897 - do { \
5898 - __asm__ __volatile__( \
5899 - " .set arch=r4000 \n" \
5900 - " ll %1, %2 # atomic_" #op "_return \n" \
5901 - " " #asm_op " %0, %1, %3 \n" \
5902 - " sc %0, %2 \n" \
5903 - " .set mips0 \n" \
5904 - : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5905 - : "Ir" (i)); \
5906 - } while (unlikely(!result)); \
5907 + __asm__ __volatile__( \
5908 + " .set mips3 \n" \
5909 + "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5910 + "2: " #asm_op " %0, %1, %3 \n" \
5911 + " sc %0, %2 \n" \
5912 + " beqz %0, 1b \n" \
5913 + post_op \
5914 + extable \
5915 + "4: " #asm_op " %0, %1, %3 \n" \
5916 + "5: \n" \
5917 + " .set mips0 \n" \
5918 + : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5919 + : "Ir" (i)); \
5920 \
5921 result = temp; result c_op i; \
5922 } else { \
5923 unsigned long flags; \
5924 \
5925 raw_local_irq_save(flags); \
5926 - result = v->counter; \
5927 - result c_op i; \
5928 - v->counter = result; \
5929 + __asm__ __volatile__( \
5930 + " lw %0, %1 \n" \
5931 + "2: " #asm_op " %0, %1, %2 \n" \
5932 + " sw %0, %1 \n" \
5933 + "3: \n" \
5934 + extable \
5935 + : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
5936 raw_local_irq_restore(flags); \
5937 } \
5938 \
5939 @@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5940 return result; \
5941 }
5942
5943 -#define ATOMIC_OPS(op, c_op, asm_op) \
5944 - ATOMIC_OP(op, c_op, asm_op) \
5945 - ATOMIC_OP_RETURN(op, c_op, asm_op)
5946 +#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
5947 + __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5948
5949 -ATOMIC_OPS(add, +=, addu)
5950 -ATOMIC_OPS(sub, -=, subu)
5951 +#define ATOMIC_OPS(op, asm_op) \
5952 + ATOMIC_OP(op, asm_op) \
5953 + ATOMIC_OP_RETURN(op, asm_op)
5954 +
5955 +ATOMIC_OPS(add, add)
5956 +ATOMIC_OPS(sub, sub)
5957
5958 #undef ATOMIC_OPS
5959 #undef ATOMIC_OP_RETURN
5960 +#undef __ATOMIC_OP_RETURN
5961 #undef ATOMIC_OP
5962 +#undef __ATOMIC_OP
5963
5964 /*
5965 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5966 @@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
5967 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5968 * The function returns the old value of @v minus @i.
5969 */
5970 -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5971 +static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5972 {
5973 int result;
5974
5975 @@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5976 return result;
5977 }
5978
5979 -#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5980 -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5981 +static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5982 +{
5983 + return cmpxchg(&v->counter, old, new);
5984 +}
5985 +
5986 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5987 + int new)
5988 +{
5989 + return cmpxchg(&(v->counter), old, new);
5990 +}
5991 +
5992 +static inline int atomic_xchg(atomic_t *v, int new)
5993 +{
5994 + return xchg(&v->counter, new);
5995 +}
5996 +
5997 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5998 +{
5999 + return xchg(&(v->counter), new);
6000 +}
6001
6002 /**
6003 * __atomic_add_unless - add unless the number is a given value
6004 @@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6005
6006 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6007 #define atomic_inc_return(v) atomic_add_return(1, (v))
6008 +static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6009 +{
6010 + return atomic_add_return_unchecked(1, v);
6011 +}
6012
6013 /*
6014 * atomic_sub_and_test - subtract value from variable and test result
6015 @@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6016 * other cases.
6017 */
6018 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6019 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6020 +{
6021 + return atomic_add_return_unchecked(1, v) == 0;
6022 +}
6023
6024 /*
6025 * atomic_dec_and_test - decrement by 1 and test
6026 @@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6027 * Atomically increments @v by 1.
6028 */
6029 #define atomic_inc(v) atomic_add(1, (v))
6030 +static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6031 +{
6032 + atomic_add_unchecked(1, v);
6033 +}
6034
6035 /*
6036 * atomic_dec - decrement and test
6037 @@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6038 * Atomically decrements @v by 1.
6039 */
6040 #define atomic_dec(v) atomic_sub(1, (v))
6041 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6042 +{
6043 + atomic_sub_unchecked(1, v);
6044 +}
6045
6046 /*
6047 * atomic_add_negative - add and test if negative
6048 @@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6049 * @v: pointer of type atomic64_t
6050 *
6051 */
6052 -#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6053 +static inline long atomic64_read(const atomic64_t *v)
6054 +{
6055 + return ACCESS_ONCE(v->counter);
6056 +}
6057 +
6058 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6059 +{
6060 + return ACCESS_ONCE(v->counter);
6061 +}
6062
6063 /*
6064 * atomic64_set - set atomic variable
6065 * @v: pointer of type atomic64_t
6066 * @i: required value
6067 */
6068 -#define atomic64_set(v, i) ((v)->counter = (i))
6069 +static inline void atomic64_set(atomic64_t *v, long i)
6070 +{
6071 + v->counter = i;
6072 +}
6073
6074 -#define ATOMIC64_OP(op, c_op, asm_op) \
6075 -static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6076 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6077 +{
6078 + v->counter = i;
6079 +}
6080 +
6081 +#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6082 +static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6083 { \
6084 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6085 long temp; \
6086 \
6087 __asm__ __volatile__( \
6088 - " .set arch=r4000 \n" \
6089 - "1: lld %0, %1 # atomic64_" #op " \n" \
6090 - " " #asm_op " %0, %2 \n" \
6091 + " .set mips3 \n" \
6092 + "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6093 + "2: " #asm_op " %0, %2 \n" \
6094 " scd %0, %1 \n" \
6095 " beqzl %0, 1b \n" \
6096 + extable \
6097 " .set mips0 \n" \
6098 : "=&r" (temp), "+m" (v->counter) \
6099 : "Ir" (i)); \
6100 } else if (kernel_uses_llsc) { \
6101 long temp; \
6102 \
6103 - do { \
6104 - __asm__ __volatile__( \
6105 - " .set arch=r4000 \n" \
6106 - " lld %0, %1 # atomic64_" #op "\n" \
6107 - " " #asm_op " %0, %2 \n" \
6108 - " scd %0, %1 \n" \
6109 - " .set mips0 \n" \
6110 - : "=&r" (temp), "+m" (v->counter) \
6111 - : "Ir" (i)); \
6112 - } while (unlikely(!temp)); \
6113 + __asm__ __volatile__( \
6114 + " .set mips3 \n" \
6115 + " lld %0, %1 # atomic64_" #op #suffix "\n" \
6116 + "2: " #asm_op " %0, %2 \n" \
6117 + " scd %0, %1 \n" \
6118 + " beqz %0, 1b \n" \
6119 + extable \
6120 + " .set mips0 \n" \
6121 + : "=&r" (temp), "+m" (v->counter) \
6122 + : "Ir" (i)); \
6123 } else { \
6124 unsigned long flags; \
6125 \
6126 raw_local_irq_save(flags); \
6127 - v->counter c_op i; \
6128 + __asm__ __volatile__( \
6129 + "2: " #asm_op " %0, %1 \n" \
6130 + extable \
6131 + : "+r" (v->counter) : "Ir" (i)); \
6132 raw_local_irq_restore(flags); \
6133 } \
6134 } \
6135
6136 -#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6137 -static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6138 +#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
6139 + __ATOMIC64_OP(op, _unchecked, asm_op)
6140 +
6141 +#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6142 +static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6143 { \
6144 long result; \
6145 \
6146 @@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6147 long temp; \
6148 \
6149 __asm__ __volatile__( \
6150 - " .set arch=r4000 \n" \
6151 + " .set mips3 \n" \
6152 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6153 - " " #asm_op " %0, %1, %3 \n" \
6154 + "2: " #asm_op " %0, %1, %3 \n" \
6155 " scd %0, %2 \n" \
6156 " beqzl %0, 1b \n" \
6157 - " " #asm_op " %0, %1, %3 \n" \
6158 + post_op \
6159 + extable \
6160 + "4: " #asm_op " %0, %1, %3 \n" \
6161 + "5: \n" \
6162 " .set mips0 \n" \
6163 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
6164 : "Ir" (i)); \
6165 } else if (kernel_uses_llsc) { \
6166 long temp; \
6167 \
6168 - do { \
6169 - __asm__ __volatile__( \
6170 - " .set arch=r4000 \n" \
6171 - " lld %1, %2 # atomic64_" #op "_return\n" \
6172 - " " #asm_op " %0, %1, %3 \n" \
6173 - " scd %0, %2 \n" \
6174 - " .set mips0 \n" \
6175 - : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6176 - : "Ir" (i), "m" (v->counter) \
6177 - : "memory"); \
6178 - } while (unlikely(!result)); \
6179 + __asm__ __volatile__( \
6180 + " .set mips3 \n" \
6181 + "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
6182 + "2: " #asm_op " %0, %1, %3 \n" \
6183 + " scd %0, %2 \n" \
6184 + " beqz %0, 1b \n" \
6185 + post_op \
6186 + extable \
6187 + "4: " #asm_op " %0, %1, %3 \n" \
6188 + "5: \n" \
6189 + " .set mips0 \n" \
6190 + : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6191 + : "Ir" (i), "m" (v->counter) \
6192 + : "memory"); \
6193 \
6194 result = temp; result c_op i; \
6195 } else { \
6196 unsigned long flags; \
6197 \
6198 raw_local_irq_save(flags); \
6199 - result = v->counter; \
6200 - result c_op i; \
6201 - v->counter = result; \
6202 + __asm__ __volatile__( \
6203 + " ld %0, %1 \n" \
6204 + "2: " #asm_op " %0, %1, %2 \n" \
6205 + " sd %0, %1 \n" \
6206 + "3: \n" \
6207 + extable \
6208 + : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
6209 raw_local_irq_restore(flags); \
6210 } \
6211 \
6212 @@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6213 return result; \
6214 }
6215
6216 -#define ATOMIC64_OPS(op, c_op, asm_op) \
6217 - ATOMIC64_OP(op, c_op, asm_op) \
6218 - ATOMIC64_OP_RETURN(op, c_op, asm_op)
6219 +#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
6220 + __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6221
6222 -ATOMIC64_OPS(add, +=, daddu)
6223 -ATOMIC64_OPS(sub, -=, dsubu)
6224 +#define ATOMIC64_OPS(op, asm_op) \
6225 + ATOMIC64_OP(op, asm_op) \
6226 + ATOMIC64_OP_RETURN(op, asm_op)
6227 +
6228 +ATOMIC64_OPS(add, dadd)
6229 +ATOMIC64_OPS(sub, dsub)
6230
6231 #undef ATOMIC64_OPS
6232 #undef ATOMIC64_OP_RETURN
6233 +#undef __ATOMIC64_OP_RETURN
6234 #undef ATOMIC64_OP
6235 +#undef __ATOMIC64_OP
6236 +#undef __OVERFLOW_EXTABLE
6237 +#undef __OVERFLOW_POST
6238
6239 /*
6240 * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
6241 @@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6242 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6243 * The function returns the old value of @v minus @i.
6244 */
6245 -static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6246 +static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6247 {
6248 long result;
6249
6250 @@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6251 return result;
6252 }
6253
6254 -#define atomic64_cmpxchg(v, o, n) \
6255 - ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6256 -#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6257 +static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6258 +{
6259 + return cmpxchg(&v->counter, old, new);
6260 +}
6261 +
6262 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6263 + long new)
6264 +{
6265 + return cmpxchg(&(v->counter), old, new);
6266 +}
6267 +
6268 +static inline long atomic64_xchg(atomic64_t *v, long new)
6269 +{
6270 + return xchg(&v->counter, new);
6271 +}
6272 +
6273 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6274 +{
6275 + return xchg(&(v->counter), new);
6276 +}
6277
6278 /**
6279 * atomic64_add_unless - add unless the number is a given value
6280 @@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6281
6282 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6283 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6284 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6285
6286 /*
6287 * atomic64_sub_and_test - subtract value from variable and test result
6288 @@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6289 * other cases.
6290 */
6291 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6292 +#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6293
6294 /*
6295 * atomic64_dec_and_test - decrement by 1 and test
6296 @@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6297 * Atomically increments @v by 1.
6298 */
6299 #define atomic64_inc(v) atomic64_add(1, (v))
6300 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6301
6302 /*
6303 * atomic64_dec - decrement and test
6304 @@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6305 * Atomically decrements @v by 1.
6306 */
6307 #define atomic64_dec(v) atomic64_sub(1, (v))
6308 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6309
6310 /*
6311 * atomic64_add_negative - add and test if negative
6312 diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6313 index d0101dd..266982c 100644
6314 --- a/arch/mips/include/asm/barrier.h
6315 +++ b/arch/mips/include/asm/barrier.h
6316 @@ -184,7 +184,7 @@
6317 do { \
6318 compiletime_assert_atomic_type(*p); \
6319 smp_mb(); \
6320 - ACCESS_ONCE(*p) = (v); \
6321 + ACCESS_ONCE_RW(*p) = (v); \
6322 } while (0)
6323
6324 #define smp_load_acquire(p) \
6325 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6326 index b4db69f..8f3b093 100644
6327 --- a/arch/mips/include/asm/cache.h
6328 +++ b/arch/mips/include/asm/cache.h
6329 @@ -9,10 +9,11 @@
6330 #ifndef _ASM_CACHE_H
6331 #define _ASM_CACHE_H
6332
6333 +#include <linux/const.h>
6334 #include <kmalloc.h>
6335
6336 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6337 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6338 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6339
6340 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6341 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6342 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6343 index 1d38fe0..9beabc9 100644
6344 --- a/arch/mips/include/asm/elf.h
6345 +++ b/arch/mips/include/asm/elf.h
6346 @@ -381,13 +381,16 @@ extern const char *__elf_platform;
6347 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6348 #endif
6349
6350 +#ifdef CONFIG_PAX_ASLR
6351 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6352 +
6353 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6354 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6355 +#endif
6356 +
6357 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6358 struct linux_binprm;
6359 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6360 int uses_interp);
6361
6362 -struct mm_struct;
6363 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6364 -#define arch_randomize_brk arch_randomize_brk
6365 -
6366 #endif /* _ASM_ELF_H */
6367 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6368 index c1f6afa..38cc6e9 100644
6369 --- a/arch/mips/include/asm/exec.h
6370 +++ b/arch/mips/include/asm/exec.h
6371 @@ -12,6 +12,6 @@
6372 #ifndef _ASM_EXEC_H
6373 #define _ASM_EXEC_H
6374
6375 -extern unsigned long arch_align_stack(unsigned long sp);
6376 +#define arch_align_stack(x) ((x) & ~0xfUL)
6377
6378 #endif /* _ASM_EXEC_H */
6379 diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6380 index 9e8ef59..1139d6b 100644
6381 --- a/arch/mips/include/asm/hw_irq.h
6382 +++ b/arch/mips/include/asm/hw_irq.h
6383 @@ -10,7 +10,7 @@
6384
6385 #include <linux/atomic.h>
6386
6387 -extern atomic_t irq_err_count;
6388 +extern atomic_unchecked_t irq_err_count;
6389
6390 /*
6391 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6392 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6393 index 46dfc3c..a16b13a 100644
6394 --- a/arch/mips/include/asm/local.h
6395 +++ b/arch/mips/include/asm/local.h
6396 @@ -12,15 +12,25 @@ typedef struct
6397 atomic_long_t a;
6398 } local_t;
6399
6400 +typedef struct {
6401 + atomic_long_unchecked_t a;
6402 +} local_unchecked_t;
6403 +
6404 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6405
6406 #define local_read(l) atomic_long_read(&(l)->a)
6407 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6408 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6409 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6410
6411 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6412 +#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6413 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6414 +#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6415 #define local_inc(l) atomic_long_inc(&(l)->a)
6416 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6417 #define local_dec(l) atomic_long_dec(&(l)->a)
6418 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6419
6420 /*
6421 * Same as above, but return the result value
6422 @@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6423 return result;
6424 }
6425
6426 +static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6427 +{
6428 + unsigned long result;
6429 +
6430 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6431 + unsigned long temp;
6432 +
6433 + __asm__ __volatile__(
6434 + " .set mips3 \n"
6435 + "1:" __LL "%1, %2 # local_add_return \n"
6436 + " addu %0, %1, %3 \n"
6437 + __SC "%0, %2 \n"
6438 + " beqzl %0, 1b \n"
6439 + " addu %0, %1, %3 \n"
6440 + " .set mips0 \n"
6441 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6442 + : "Ir" (i), "m" (l->a.counter)
6443 + : "memory");
6444 + } else if (kernel_uses_llsc) {
6445 + unsigned long temp;
6446 +
6447 + __asm__ __volatile__(
6448 + " .set mips3 \n"
6449 + "1:" __LL "%1, %2 # local_add_return \n"
6450 + " addu %0, %1, %3 \n"
6451 + __SC "%0, %2 \n"
6452 + " beqz %0, 1b \n"
6453 + " addu %0, %1, %3 \n"
6454 + " .set mips0 \n"
6455 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6456 + : "Ir" (i), "m" (l->a.counter)
6457 + : "memory");
6458 + } else {
6459 + unsigned long flags;
6460 +
6461 + local_irq_save(flags);
6462 + result = l->a.counter;
6463 + result += i;
6464 + l->a.counter = result;
6465 + local_irq_restore(flags);
6466 + }
6467 +
6468 + return result;
6469 +}
6470 +
6471 static __inline__ long local_sub_return(long i, local_t * l)
6472 {
6473 unsigned long result;
6474 @@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6475
6476 #define local_cmpxchg(l, o, n) \
6477 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6478 +#define local_cmpxchg_unchecked(l, o, n) \
6479 + ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6480 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6481
6482 /**
6483 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6484 index 3be8180..c4798d5 100644
6485 --- a/arch/mips/include/asm/page.h
6486 +++ b/arch/mips/include/asm/page.h
6487 @@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6488 #ifdef CONFIG_CPU_MIPS32
6489 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6490 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6491 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6492 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6493 #else
6494 typedef struct { unsigned long long pte; } pte_t;
6495 #define pte_val(x) ((x).pte)
6496 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6497 index b336037..5b874cc 100644
6498 --- a/arch/mips/include/asm/pgalloc.h
6499 +++ b/arch/mips/include/asm/pgalloc.h
6500 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6501 {
6502 set_pud(pud, __pud((unsigned long)pmd));
6503 }
6504 +
6505 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6506 +{
6507 + pud_populate(mm, pud, pmd);
6508 +}
6509 #endif
6510
6511 /*
6512 diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6513 index d6d1928..ce4f822 100644
6514 --- a/arch/mips/include/asm/pgtable.h
6515 +++ b/arch/mips/include/asm/pgtable.h
6516 @@ -20,6 +20,9 @@
6517 #include <asm/io.h>
6518 #include <asm/pgtable-bits.h>
6519
6520 +#define ktla_ktva(addr) (addr)
6521 +#define ktva_ktla(addr) (addr)
6522 +
6523 struct mm_struct;
6524 struct vm_area_struct;
6525
6526 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6527 index 7de8658..c109224 100644
6528 --- a/arch/mips/include/asm/thread_info.h
6529 +++ b/arch/mips/include/asm/thread_info.h
6530 @@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6531 #define TIF_SECCOMP 4 /* secure computing */
6532 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6533 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6534 +/* li takes a 32bit immediate */
6535 +#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6536 +
6537 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6538 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6539 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6540 @@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6541 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6542 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6543 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6544 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6545
6546 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6547 _TIF_SYSCALL_AUDIT | \
6548 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6549 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6550 + _TIF_GRSEC_SETXID)
6551
6552 /* work to do in syscall_trace_leave() */
6553 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6554 - _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6555 + _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6556
6557 /* work to do on interrupt/exception return */
6558 #define _TIF_WORK_MASK \
6559 @@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6560 /* work to do on any return to u-space */
6561 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6562 _TIF_WORK_SYSCALL_EXIT | \
6563 - _TIF_SYSCALL_TRACEPOINT)
6564 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6565
6566 /*
6567 * We stash processor id into a COP0 register to retrieve it fast
6568 diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6569 index 22a5624..7c96295 100644
6570 --- a/arch/mips/include/asm/uaccess.h
6571 +++ b/arch/mips/include/asm/uaccess.h
6572 @@ -130,6 +130,7 @@ extern u64 __ua_limit;
6573 __ok == 0; \
6574 })
6575
6576 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6577 #define access_ok(type, addr, size) \
6578 likely(__access_ok((addr), (size), __access_mask))
6579
6580 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6581 index 1188e00..41cf144 100644
6582 --- a/arch/mips/kernel/binfmt_elfn32.c
6583 +++ b/arch/mips/kernel/binfmt_elfn32.c
6584 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6585 #undef ELF_ET_DYN_BASE
6586 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6587
6588 +#ifdef CONFIG_PAX_ASLR
6589 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6590 +
6591 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6592 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6593 +#endif
6594 +
6595 #include <asm/processor.h>
6596 #include <linux/module.h>
6597 #include <linux/elfcore.h>
6598 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6599 index 9287678..f870e47 100644
6600 --- a/arch/mips/kernel/binfmt_elfo32.c
6601 +++ b/arch/mips/kernel/binfmt_elfo32.c
6602 @@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6603 #undef ELF_ET_DYN_BASE
6604 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6605
6606 +#ifdef CONFIG_PAX_ASLR
6607 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6608 +
6609 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6610 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6611 +#endif
6612 +
6613 #include <asm/processor.h>
6614
6615 #include <linux/module.h>
6616 diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6617 index 50b3648..c2f3cec 100644
6618 --- a/arch/mips/kernel/i8259.c
6619 +++ b/arch/mips/kernel/i8259.c
6620 @@ -201,7 +201,7 @@ spurious_8259A_irq:
6621 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6622 spurious_irq_mask |= irqmask;
6623 }
6624 - atomic_inc(&irq_err_count);
6625 + atomic_inc_unchecked(&irq_err_count);
6626 /*
6627 * Theoretically we do not have to handle this IRQ,
6628 * but in Linux this does not cause problems and is
6629 diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6630 index 44a1f79..2bd6aa3 100644
6631 --- a/arch/mips/kernel/irq-gt641xx.c
6632 +++ b/arch/mips/kernel/irq-gt641xx.c
6633 @@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6634 }
6635 }
6636
6637 - atomic_inc(&irq_err_count);
6638 + atomic_inc_unchecked(&irq_err_count);
6639 }
6640
6641 void __init gt641xx_irq_init(void)
6642 diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6643 index d2bfbc2..a8eacd2 100644
6644 --- a/arch/mips/kernel/irq.c
6645 +++ b/arch/mips/kernel/irq.c
6646 @@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6647 printk("unexpected IRQ # %d\n", irq);
6648 }
6649
6650 -atomic_t irq_err_count;
6651 +atomic_unchecked_t irq_err_count;
6652
6653 int arch_show_interrupts(struct seq_file *p, int prec)
6654 {
6655 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6656 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6657 return 0;
6658 }
6659
6660 asmlinkage void spurious_interrupt(void)
6661 {
6662 - atomic_inc(&irq_err_count);
6663 + atomic_inc_unchecked(&irq_err_count);
6664 }
6665
6666 void __init init_IRQ(void)
6667 @@ -109,7 +109,10 @@ void __init init_IRQ(void)
6668 #endif
6669 }
6670
6671 +
6672 #ifdef DEBUG_STACKOVERFLOW
6673 +extern void gr_handle_kernel_exploit(void);
6674 +
6675 static inline void check_stack_overflow(void)
6676 {
6677 unsigned long sp;
6678 @@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6679 printk("do_IRQ: stack overflow: %ld\n",
6680 sp - sizeof(struct thread_info));
6681 dump_stack();
6682 + gr_handle_kernel_exploit();
6683 }
6684 }
6685 #else
6686 diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6687 index 0614717..002fa43 100644
6688 --- a/arch/mips/kernel/pm-cps.c
6689 +++ b/arch/mips/kernel/pm-cps.c
6690 @@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6691 nc_core_ready_count = nc_addr;
6692
6693 /* Ensure ready_count is zero-initialised before the assembly runs */
6694 - ACCESS_ONCE(*nc_core_ready_count) = 0;
6695 + ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6696 coupled_barrier(&per_cpu(pm_barrier, core), online);
6697
6698 /* Run the generated entry code */
6699 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6700 index 636b074..8fbb91f 100644
6701 --- a/arch/mips/kernel/process.c
6702 +++ b/arch/mips/kernel/process.c
6703 @@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
6704 out:
6705 return pc;
6706 }
6707 -
6708 -/*
6709 - * Don't forget that the stack pointer must be aligned on a 8 bytes
6710 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6711 - */
6712 -unsigned long arch_align_stack(unsigned long sp)
6713 -{
6714 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6715 - sp -= get_random_int() & ~PAGE_MASK;
6716 -
6717 - return sp & ALMASK;
6718 -}
6719 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6720 index 9d1487d..10c5da5 100644
6721 --- a/arch/mips/kernel/ptrace.c
6722 +++ b/arch/mips/kernel/ptrace.c
6723 @@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6724 return ret;
6725 }
6726
6727 +#ifdef CONFIG_GRKERNSEC_SETXID
6728 +extern void gr_delayed_cred_worker(void);
6729 +#endif
6730 +
6731 /*
6732 * Notification of system call entry/exit
6733 * - triggered by current->work.syscall_trace
6734 @@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6735 tracehook_report_syscall_entry(regs))
6736 ret = -1;
6737
6738 +#ifdef CONFIG_GRKERNSEC_SETXID
6739 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6740 + gr_delayed_cred_worker();
6741 +#endif
6742 +
6743 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6744 trace_sys_enter(regs, regs->regs[2]);
6745
6746 diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6747 index 07fc524..b9d7f28 100644
6748 --- a/arch/mips/kernel/reset.c
6749 +++ b/arch/mips/kernel/reset.c
6750 @@ -13,6 +13,7 @@
6751 #include <linux/reboot.h>
6752
6753 #include <asm/reboot.h>
6754 +#include <asm/bug.h>
6755
6756 /*
6757 * Urgs ... Too many MIPS machines to handle this in a generic way.
6758 @@ -29,16 +30,19 @@ void machine_restart(char *command)
6759 {
6760 if (_machine_restart)
6761 _machine_restart(command);
6762 + BUG();
6763 }
6764
6765 void machine_halt(void)
6766 {
6767 if (_machine_halt)
6768 _machine_halt();
6769 + BUG();
6770 }
6771
6772 void machine_power_off(void)
6773 {
6774 if (pm_power_off)
6775 pm_power_off();
6776 + BUG();
6777 }
6778 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6779 index 2242bdd..b284048 100644
6780 --- a/arch/mips/kernel/sync-r4k.c
6781 +++ b/arch/mips/kernel/sync-r4k.c
6782 @@ -18,8 +18,8 @@
6783 #include <asm/mipsregs.h>
6784
6785 static atomic_t count_start_flag = ATOMIC_INIT(0);
6786 -static atomic_t count_count_start = ATOMIC_INIT(0);
6787 -static atomic_t count_count_stop = ATOMIC_INIT(0);
6788 +static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6789 +static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6790 static atomic_t count_reference = ATOMIC_INIT(0);
6791
6792 #define COUNTON 100
6793 @@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6794
6795 for (i = 0; i < NR_LOOPS; i++) {
6796 /* slaves loop on '!= 2' */
6797 - while (atomic_read(&count_count_start) != 1)
6798 + while (atomic_read_unchecked(&count_count_start) != 1)
6799 mb();
6800 - atomic_set(&count_count_stop, 0);
6801 + atomic_set_unchecked(&count_count_stop, 0);
6802 smp_wmb();
6803
6804 /* this lets the slaves write their count register */
6805 - atomic_inc(&count_count_start);
6806 + atomic_inc_unchecked(&count_count_start);
6807
6808 /*
6809 * Everyone initialises count in the last loop:
6810 @@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6811 /*
6812 * Wait for all slaves to leave the synchronization point:
6813 */
6814 - while (atomic_read(&count_count_stop) != 1)
6815 + while (atomic_read_unchecked(&count_count_stop) != 1)
6816 mb();
6817 - atomic_set(&count_count_start, 0);
6818 + atomic_set_unchecked(&count_count_start, 0);
6819 smp_wmb();
6820 - atomic_inc(&count_count_stop);
6821 + atomic_inc_unchecked(&count_count_stop);
6822 }
6823 /* Arrange for an interrupt in a short while */
6824 write_c0_compare(read_c0_count() + COUNTON);
6825 @@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6826 initcount = atomic_read(&count_reference);
6827
6828 for (i = 0; i < NR_LOOPS; i++) {
6829 - atomic_inc(&count_count_start);
6830 - while (atomic_read(&count_count_start) != 2)
6831 + atomic_inc_unchecked(&count_count_start);
6832 + while (atomic_read_unchecked(&count_count_start) != 2)
6833 mb();
6834
6835 /*
6836 @@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6837 if (i == NR_LOOPS-1)
6838 write_c0_count(initcount);
6839
6840 - atomic_inc(&count_count_stop);
6841 - while (atomic_read(&count_count_stop) != 2)
6842 + atomic_inc_unchecked(&count_count_stop);
6843 + while (atomic_read_unchecked(&count_count_stop) != 2)
6844 mb();
6845 }
6846 /* Arrange for an interrupt in a short while */
6847 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6848 index 22b19c2..c5cc8c4 100644
6849 --- a/arch/mips/kernel/traps.c
6850 +++ b/arch/mips/kernel/traps.c
6851 @@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6852 siginfo_t info;
6853
6854 prev_state = exception_enter();
6855 - die_if_kernel("Integer overflow", regs);
6856 + if (unlikely(!user_mode(regs))) {
6857 +
6858 +#ifdef CONFIG_PAX_REFCOUNT
6859 + if (fixup_exception(regs)) {
6860 + pax_report_refcount_overflow(regs);
6861 + exception_exit(prev_state);
6862 + return;
6863 + }
6864 +#endif
6865 +
6866 + die("Integer overflow", regs);
6867 + }
6868
6869 info.si_code = FPE_INTOVF;
6870 info.si_signo = SIGFPE;
6871 diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6872 index e3b21e5..ea5ff7c 100644
6873 --- a/arch/mips/kvm/mips.c
6874 +++ b/arch/mips/kvm/mips.c
6875 @@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6876 return r;
6877 }
6878
6879 -int kvm_arch_init(void *opaque)
6880 +int kvm_arch_init(const void *opaque)
6881 {
6882 if (kvm_mips_callbacks) {
6883 kvm_err("kvm: module already exists\n");
6884 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6885 index becc42b..9e43d4b 100644
6886 --- a/arch/mips/mm/fault.c
6887 +++ b/arch/mips/mm/fault.c
6888 @@ -28,6 +28,23 @@
6889 #include <asm/highmem.h> /* For VMALLOC_END */
6890 #include <linux/kdebug.h>
6891
6892 +#ifdef CONFIG_PAX_PAGEEXEC
6893 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6894 +{
6895 + unsigned long i;
6896 +
6897 + printk(KERN_ERR "PAX: bytes at PC: ");
6898 + for (i = 0; i < 5; i++) {
6899 + unsigned int c;
6900 + if (get_user(c, (unsigned int *)pc+i))
6901 + printk(KERN_CONT "???????? ");
6902 + else
6903 + printk(KERN_CONT "%08x ", c);
6904 + }
6905 + printk("\n");
6906 +}
6907 +#endif
6908 +
6909 /*
6910 * This routine handles page faults. It determines the address,
6911 * and the problem, and then passes it off to one of the appropriate
6912 @@ -199,6 +216,14 @@ bad_area:
6913 bad_area_nosemaphore:
6914 /* User mode accesses just cause a SIGSEGV */
6915 if (user_mode(regs)) {
6916 +
6917 +#ifdef CONFIG_PAX_PAGEEXEC
6918 + if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6919 + pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6920 + do_group_exit(SIGKILL);
6921 + }
6922 +#endif
6923 +
6924 tsk->thread.cp0_badvaddr = address;
6925 tsk->thread.error_code = write;
6926 #if 0
6927 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6928 index f1baadd..5472dca 100644
6929 --- a/arch/mips/mm/mmap.c
6930 +++ b/arch/mips/mm/mmap.c
6931 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6932 struct vm_area_struct *vma;
6933 unsigned long addr = addr0;
6934 int do_color_align;
6935 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6936 struct vm_unmapped_area_info info;
6937
6938 if (unlikely(len > TASK_SIZE))
6939 @@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6940 do_color_align = 1;
6941
6942 /* requesting a specific address */
6943 +
6944 +#ifdef CONFIG_PAX_RANDMMAP
6945 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6946 +#endif
6947 +
6948 if (addr) {
6949 if (do_color_align)
6950 addr = COLOUR_ALIGN(addr, pgoff);
6951 @@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6952 addr = PAGE_ALIGN(addr);
6953
6954 vma = find_vma(mm, addr);
6955 - if (TASK_SIZE - len >= addr &&
6956 - (!vma || addr + len <= vma->vm_start))
6957 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6958 return addr;
6959 }
6960
6961 info.length = len;
6962 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6963 info.align_offset = pgoff << PAGE_SHIFT;
6964 + info.threadstack_offset = offset;
6965
6966 if (dir == DOWN) {
6967 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6968 @@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6969 {
6970 unsigned long random_factor = 0UL;
6971
6972 +#ifdef CONFIG_PAX_RANDMMAP
6973 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6974 +#endif
6975 +
6976 if (current->flags & PF_RANDOMIZE) {
6977 random_factor = get_random_int();
6978 random_factor = random_factor << PAGE_SHIFT;
6979 @@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6980
6981 if (mmap_is_legacy()) {
6982 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6983 +
6984 +#ifdef CONFIG_PAX_RANDMMAP
6985 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6986 + mm->mmap_base += mm->delta_mmap;
6987 +#endif
6988 +
6989 mm->get_unmapped_area = arch_get_unmapped_area;
6990 } else {
6991 mm->mmap_base = mmap_base(random_factor);
6992 +
6993 +#ifdef CONFIG_PAX_RANDMMAP
6994 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6995 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6996 +#endif
6997 +
6998 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6999 }
7000 }
7001
7002 -static inline unsigned long brk_rnd(void)
7003 -{
7004 - unsigned long rnd = get_random_int();
7005 -
7006 - rnd = rnd << PAGE_SHIFT;
7007 - /* 8MB for 32bit, 256MB for 64bit */
7008 - if (TASK_IS_32BIT_ADDR)
7009 - rnd = rnd & 0x7ffffful;
7010 - else
7011 - rnd = rnd & 0xffffffful;
7012 -
7013 - return rnd;
7014 -}
7015 -
7016 -unsigned long arch_randomize_brk(struct mm_struct *mm)
7017 -{
7018 - unsigned long base = mm->brk;
7019 - unsigned long ret;
7020 -
7021 - ret = PAGE_ALIGN(base + brk_rnd());
7022 -
7023 - if (ret < mm->brk)
7024 - return mm->brk;
7025 -
7026 - return ret;
7027 -}
7028 -
7029 int __virt_addr_valid(const volatile void *kaddr)
7030 {
7031 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7032 diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7033 index 59cccd9..f39ac2f 100644
7034 --- a/arch/mips/pci/pci-octeon.c
7035 +++ b/arch/mips/pci/pci-octeon.c
7036 @@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7037
7038
7039 static struct pci_ops octeon_pci_ops = {
7040 - octeon_read_config,
7041 - octeon_write_config,
7042 + .read = octeon_read_config,
7043 + .write = octeon_write_config,
7044 };
7045
7046 static struct resource octeon_pci_mem_resource = {
7047 diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7048 index 5e36c33..eb4a17b 100644
7049 --- a/arch/mips/pci/pcie-octeon.c
7050 +++ b/arch/mips/pci/pcie-octeon.c
7051 @@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7052 }
7053
7054 static struct pci_ops octeon_pcie0_ops = {
7055 - octeon_pcie0_read_config,
7056 - octeon_pcie0_write_config,
7057 + .read = octeon_pcie0_read_config,
7058 + .write = octeon_pcie0_write_config,
7059 };
7060
7061 static struct resource octeon_pcie0_mem_resource = {
7062 @@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7063 };
7064
7065 static struct pci_ops octeon_pcie1_ops = {
7066 - octeon_pcie1_read_config,
7067 - octeon_pcie1_write_config,
7068 + .read = octeon_pcie1_read_config,
7069 + .write = octeon_pcie1_write_config,
7070 };
7071
7072 static struct resource octeon_pcie1_mem_resource = {
7073 @@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7074 };
7075
7076 static struct pci_ops octeon_dummy_ops = {
7077 - octeon_dummy_read_config,
7078 - octeon_dummy_write_config,
7079 + .read = octeon_dummy_read_config,
7080 + .write = octeon_dummy_write_config,
7081 };
7082
7083 static struct resource octeon_dummy_mem_resource = {
7084 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7085 index a2358b4..7cead4f 100644
7086 --- a/arch/mips/sgi-ip27/ip27-nmi.c
7087 +++ b/arch/mips/sgi-ip27/ip27-nmi.c
7088 @@ -187,9 +187,9 @@ void
7089 cont_nmi_dump(void)
7090 {
7091 #ifndef REAL_NMI_SIGNAL
7092 - static atomic_t nmied_cpus = ATOMIC_INIT(0);
7093 + static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7094
7095 - atomic_inc(&nmied_cpus);
7096 + atomic_inc_unchecked(&nmied_cpus);
7097 #endif
7098 /*
7099 * Only allow 1 cpu to proceed
7100 @@ -233,7 +233,7 @@ cont_nmi_dump(void)
7101 udelay(10000);
7102 }
7103 #else
7104 - while (atomic_read(&nmied_cpus) != num_online_cpus());
7105 + while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7106 #endif
7107
7108 /*
7109 diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7110 index a046b30..6799527 100644
7111 --- a/arch/mips/sni/rm200.c
7112 +++ b/arch/mips/sni/rm200.c
7113 @@ -270,7 +270,7 @@ spurious_8259A_irq:
7114 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7115 spurious_irq_mask |= irqmask;
7116 }
7117 - atomic_inc(&irq_err_count);
7118 + atomic_inc_unchecked(&irq_err_count);
7119 /*
7120 * Theoretically we do not have to handle this IRQ,
7121 * but in Linux this does not cause problems and is
7122 diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7123 index 41e873b..34d33a7 100644
7124 --- a/arch/mips/vr41xx/common/icu.c
7125 +++ b/arch/mips/vr41xx/common/icu.c
7126 @@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7127
7128 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7129
7130 - atomic_inc(&irq_err_count);
7131 + atomic_inc_unchecked(&irq_err_count);
7132
7133 return -1;
7134 }
7135 diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7136 index ae0e4ee..e8f0692 100644
7137 --- a/arch/mips/vr41xx/common/irq.c
7138 +++ b/arch/mips/vr41xx/common/irq.c
7139 @@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7140 irq_cascade_t *cascade;
7141
7142 if (irq >= NR_IRQS) {
7143 - atomic_inc(&irq_err_count);
7144 + atomic_inc_unchecked(&irq_err_count);
7145 return;
7146 }
7147
7148 @@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7149 ret = cascade->get_irq(irq);
7150 irq = ret;
7151 if (ret < 0)
7152 - atomic_inc(&irq_err_count);
7153 + atomic_inc_unchecked(&irq_err_count);
7154 else
7155 irq_dispatch(irq);
7156 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7157 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7158 index 967d144..db12197 100644
7159 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7160 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7161 @@ -11,12 +11,14 @@
7162 #ifndef _ASM_PROC_CACHE_H
7163 #define _ASM_PROC_CACHE_H
7164
7165 +#include <linux/const.h>
7166 +
7167 /* L1 cache */
7168
7169 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7170 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7171 -#define L1_CACHE_BYTES 16 /* bytes per entry */
7172 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7173 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7174 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7175
7176 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7177 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7178 index bcb5df2..84fabd2 100644
7179 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7180 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7181 @@ -16,13 +16,15 @@
7182 #ifndef _ASM_PROC_CACHE_H
7183 #define _ASM_PROC_CACHE_H
7184
7185 +#include <linux/const.h>
7186 +
7187 /*
7188 * L1 cache
7189 */
7190 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7191 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7192 -#define L1_CACHE_BYTES 32 /* bytes per entry */
7193 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7194 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7195 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7196
7197 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7198 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7199 index 4ce7a01..449202a 100644
7200 --- a/arch/openrisc/include/asm/cache.h
7201 +++ b/arch/openrisc/include/asm/cache.h
7202 @@ -19,11 +19,13 @@
7203 #ifndef __ASM_OPENRISC_CACHE_H
7204 #define __ASM_OPENRISC_CACHE_H
7205
7206 +#include <linux/const.h>
7207 +
7208 /* FIXME: How can we replace these with values from the CPU...
7209 * they shouldn't be hard-coded!
7210 */
7211
7212 -#define L1_CACHE_BYTES 16
7213 #define L1_CACHE_SHIFT 4
7214 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7215
7216 #endif /* __ASM_OPENRISC_CACHE_H */
7217 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7218 index 226f8ca..9d9b87d 100644
7219 --- a/arch/parisc/include/asm/atomic.h
7220 +++ b/arch/parisc/include/asm/atomic.h
7221 @@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7222 return dec;
7223 }
7224
7225 +#define atomic64_read_unchecked(v) atomic64_read(v)
7226 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7227 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7228 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7229 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7230 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7231 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7232 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7233 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7234 +
7235 #endif /* !CONFIG_64BIT */
7236
7237
7238 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7239 index 47f11c7..3420df2 100644
7240 --- a/arch/parisc/include/asm/cache.h
7241 +++ b/arch/parisc/include/asm/cache.h
7242 @@ -5,6 +5,7 @@
7243 #ifndef __ARCH_PARISC_CACHE_H
7244 #define __ARCH_PARISC_CACHE_H
7245
7246 +#include <linux/const.h>
7247
7248 /*
7249 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7250 @@ -15,13 +16,13 @@
7251 * just ruin performance.
7252 */
7253 #ifdef CONFIG_PA20
7254 -#define L1_CACHE_BYTES 64
7255 #define L1_CACHE_SHIFT 6
7256 #else
7257 -#define L1_CACHE_BYTES 32
7258 #define L1_CACHE_SHIFT 5
7259 #endif
7260
7261 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7262 +
7263 #ifndef __ASSEMBLY__
7264
7265 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7266 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7267 index 3391d06..c23a2cc 100644
7268 --- a/arch/parisc/include/asm/elf.h
7269 +++ b/arch/parisc/include/asm/elf.h
7270 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7271
7272 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7273
7274 +#ifdef CONFIG_PAX_ASLR
7275 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
7276 +
7277 +#define PAX_DELTA_MMAP_LEN 16
7278 +#define PAX_DELTA_STACK_LEN 16
7279 +#endif
7280 +
7281 /* This yields a mask that user programs can use to figure out what
7282 instruction set this CPU supports. This could be done in user space,
7283 but it's not easy, and we've already done it here. */
7284 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7285 index f213f5b..0af3e8e 100644
7286 --- a/arch/parisc/include/asm/pgalloc.h
7287 +++ b/arch/parisc/include/asm/pgalloc.h
7288 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7289 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7290 }
7291
7292 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7293 +{
7294 + pgd_populate(mm, pgd, pmd);
7295 +}
7296 +
7297 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7298 {
7299 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7300 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7301 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7302 #define pmd_free(mm, x) do { } while (0)
7303 #define pgd_populate(mm, pmd, pte) BUG()
7304 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
7305
7306 #endif
7307
7308 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7309 index 22b89d1..ce34230 100644
7310 --- a/arch/parisc/include/asm/pgtable.h
7311 +++ b/arch/parisc/include/asm/pgtable.h
7312 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7313 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7314 #define PAGE_COPY PAGE_EXECREAD
7315 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7316 +
7317 +#ifdef CONFIG_PAX_PAGEEXEC
7318 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7319 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7320 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7321 +#else
7322 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
7323 +# define PAGE_COPY_NOEXEC PAGE_COPY
7324 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
7325 +#endif
7326 +
7327 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7328 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7329 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7330 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7331 index a5cb070..8604ddc 100644
7332 --- a/arch/parisc/include/asm/uaccess.h
7333 +++ b/arch/parisc/include/asm/uaccess.h
7334 @@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7335 const void __user *from,
7336 unsigned long n)
7337 {
7338 - int sz = __compiletime_object_size(to);
7339 + size_t sz = __compiletime_object_size(to);
7340 int ret = -EFAULT;
7341
7342 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7343 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7344 ret = __copy_from_user(to, from, n);
7345 else
7346 copy_from_user_overflow();
7347 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7348 index 50dfafc..b9fc230 100644
7349 --- a/arch/parisc/kernel/module.c
7350 +++ b/arch/parisc/kernel/module.c
7351 @@ -98,16 +98,38 @@
7352
7353 /* three functions to determine where in the module core
7354 * or init pieces the location is */
7355 +static inline int in_init_rx(struct module *me, void *loc)
7356 +{
7357 + return (loc >= me->module_init_rx &&
7358 + loc < (me->module_init_rx + me->init_size_rx));
7359 +}
7360 +
7361 +static inline int in_init_rw(struct module *me, void *loc)
7362 +{
7363 + return (loc >= me->module_init_rw &&
7364 + loc < (me->module_init_rw + me->init_size_rw));
7365 +}
7366 +
7367 static inline int in_init(struct module *me, void *loc)
7368 {
7369 - return (loc >= me->module_init &&
7370 - loc <= (me->module_init + me->init_size));
7371 + return in_init_rx(me, loc) || in_init_rw(me, loc);
7372 +}
7373 +
7374 +static inline int in_core_rx(struct module *me, void *loc)
7375 +{
7376 + return (loc >= me->module_core_rx &&
7377 + loc < (me->module_core_rx + me->core_size_rx));
7378 +}
7379 +
7380 +static inline int in_core_rw(struct module *me, void *loc)
7381 +{
7382 + return (loc >= me->module_core_rw &&
7383 + loc < (me->module_core_rw + me->core_size_rw));
7384 }
7385
7386 static inline int in_core(struct module *me, void *loc)
7387 {
7388 - return (loc >= me->module_core &&
7389 - loc <= (me->module_core + me->core_size));
7390 + return in_core_rx(me, loc) || in_core_rw(me, loc);
7391 }
7392
7393 static inline int in_local(struct module *me, void *loc)
7394 @@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7395 }
7396
7397 /* align things a bit */
7398 - me->core_size = ALIGN(me->core_size, 16);
7399 - me->arch.got_offset = me->core_size;
7400 - me->core_size += gots * sizeof(struct got_entry);
7401 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7402 + me->arch.got_offset = me->core_size_rw;
7403 + me->core_size_rw += gots * sizeof(struct got_entry);
7404
7405 - me->core_size = ALIGN(me->core_size, 16);
7406 - me->arch.fdesc_offset = me->core_size;
7407 - me->core_size += fdescs * sizeof(Elf_Fdesc);
7408 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7409 + me->arch.fdesc_offset = me->core_size_rw;
7410 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7411
7412 me->arch.got_max = gots;
7413 me->arch.fdesc_max = fdescs;
7414 @@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7415
7416 BUG_ON(value == 0);
7417
7418 - got = me->module_core + me->arch.got_offset;
7419 + got = me->module_core_rw + me->arch.got_offset;
7420 for (i = 0; got[i].addr; i++)
7421 if (got[i].addr == value)
7422 goto out;
7423 @@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7424 #ifdef CONFIG_64BIT
7425 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7426 {
7427 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7428 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7429
7430 if (!value) {
7431 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7432 @@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7433
7434 /* Create new one */
7435 fdesc->addr = value;
7436 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7437 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7438 return (Elf_Addr)fdesc;
7439 }
7440 #endif /* CONFIG_64BIT */
7441 @@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7442
7443 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7444 end = table + sechdrs[me->arch.unwind_section].sh_size;
7445 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7446 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7447
7448 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7449 me->arch.unwind_section, table, end, gp);
7450 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7451 index e1ffea2..46ed66e 100644
7452 --- a/arch/parisc/kernel/sys_parisc.c
7453 +++ b/arch/parisc/kernel/sys_parisc.c
7454 @@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7455 unsigned long task_size = TASK_SIZE;
7456 int do_color_align, last_mmap;
7457 struct vm_unmapped_area_info info;
7458 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7459
7460 if (len > task_size)
7461 return -ENOMEM;
7462 @@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7463 goto found_addr;
7464 }
7465
7466 +#ifdef CONFIG_PAX_RANDMMAP
7467 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7468 +#endif
7469 +
7470 if (addr) {
7471 if (do_color_align && last_mmap)
7472 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7473 @@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7474 info.high_limit = mmap_upper_limit();
7475 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7476 info.align_offset = shared_align_offset(last_mmap, pgoff);
7477 + info.threadstack_offset = offset;
7478 addr = vm_unmapped_area(&info);
7479
7480 found_addr:
7481 @@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7482 unsigned long addr = addr0;
7483 int do_color_align, last_mmap;
7484 struct vm_unmapped_area_info info;
7485 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7486
7487 #ifdef CONFIG_64BIT
7488 /* This should only ever run for 32-bit processes. */
7489 @@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7490 }
7491
7492 /* requesting a specific address */
7493 +#ifdef CONFIG_PAX_RANDMMAP
7494 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7495 +#endif
7496 +
7497 if (addr) {
7498 if (do_color_align && last_mmap)
7499 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7500 @@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7501 info.high_limit = mm->mmap_base;
7502 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7503 info.align_offset = shared_align_offset(last_mmap, pgoff);
7504 + info.threadstack_offset = offset;
7505 addr = vm_unmapped_area(&info);
7506 if (!(addr & ~PAGE_MASK))
7507 goto found_addr;
7508 @@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7509 mm->mmap_legacy_base = mmap_legacy_base();
7510 mm->mmap_base = mmap_upper_limit();
7511
7512 +#ifdef CONFIG_PAX_RANDMMAP
7513 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
7514 + mm->mmap_legacy_base += mm->delta_mmap;
7515 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7516 + }
7517 +#endif
7518 +
7519 if (mmap_is_legacy()) {
7520 mm->mmap_base = mm->mmap_legacy_base;
7521 mm->get_unmapped_area = arch_get_unmapped_area;
7522 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7523 index 47ee620..1107387 100644
7524 --- a/arch/parisc/kernel/traps.c
7525 +++ b/arch/parisc/kernel/traps.c
7526 @@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7527
7528 down_read(&current->mm->mmap_sem);
7529 vma = find_vma(current->mm,regs->iaoq[0]);
7530 - if (vma && (regs->iaoq[0] >= vma->vm_start)
7531 - && (vma->vm_flags & VM_EXEC)) {
7532 -
7533 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7534 fault_address = regs->iaoq[0];
7535 fault_space = regs->iasq[0];
7536
7537 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7538 index 3ca9c11..d163ef7 100644
7539 --- a/arch/parisc/mm/fault.c
7540 +++ b/arch/parisc/mm/fault.c
7541 @@ -15,6 +15,7 @@
7542 #include <linux/sched.h>
7543 #include <linux/interrupt.h>
7544 #include <linux/module.h>
7545 +#include <linux/unistd.h>
7546
7547 #include <asm/uaccess.h>
7548 #include <asm/traps.h>
7549 @@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7550 static unsigned long
7551 parisc_acctyp(unsigned long code, unsigned int inst)
7552 {
7553 - if (code == 6 || code == 16)
7554 + if (code == 6 || code == 7 || code == 16)
7555 return VM_EXEC;
7556
7557 switch (inst & 0xf0000000) {
7558 @@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7559 }
7560 #endif
7561
7562 +#ifdef CONFIG_PAX_PAGEEXEC
7563 +/*
7564 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7565 + *
7566 + * returns 1 when task should be killed
7567 + * 2 when rt_sigreturn trampoline was detected
7568 + * 3 when unpatched PLT trampoline was detected
7569 + */
7570 +static int pax_handle_fetch_fault(struct pt_regs *regs)
7571 +{
7572 +
7573 +#ifdef CONFIG_PAX_EMUPLT
7574 + int err;
7575 +
7576 + do { /* PaX: unpatched PLT emulation */
7577 + unsigned int bl, depwi;
7578 +
7579 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7580 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7581 +
7582 + if (err)
7583 + break;
7584 +
7585 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7586 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7587 +
7588 + err = get_user(ldw, (unsigned int *)addr);
7589 + err |= get_user(bv, (unsigned int *)(addr+4));
7590 + err |= get_user(ldw2, (unsigned int *)(addr+8));
7591 +
7592 + if (err)
7593 + break;
7594 +
7595 + if (ldw == 0x0E801096U &&
7596 + bv == 0xEAC0C000U &&
7597 + ldw2 == 0x0E881095U)
7598 + {
7599 + unsigned int resolver, map;
7600 +
7601 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7602 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7603 + if (err)
7604 + break;
7605 +
7606 + regs->gr[20] = instruction_pointer(regs)+8;
7607 + regs->gr[21] = map;
7608 + regs->gr[22] = resolver;
7609 + regs->iaoq[0] = resolver | 3UL;
7610 + regs->iaoq[1] = regs->iaoq[0] + 4;
7611 + return 3;
7612 + }
7613 + }
7614 + } while (0);
7615 +#endif
7616 +
7617 +#ifdef CONFIG_PAX_EMUTRAMP
7618 +
7619 +#ifndef CONFIG_PAX_EMUSIGRT
7620 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7621 + return 1;
7622 +#endif
7623 +
7624 + do { /* PaX: rt_sigreturn emulation */
7625 + unsigned int ldi1, ldi2, bel, nop;
7626 +
7627 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7628 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7629 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7630 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7631 +
7632 + if (err)
7633 + break;
7634 +
7635 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7636 + ldi2 == 0x3414015AU &&
7637 + bel == 0xE4008200U &&
7638 + nop == 0x08000240U)
7639 + {
7640 + regs->gr[25] = (ldi1 & 2) >> 1;
7641 + regs->gr[20] = __NR_rt_sigreturn;
7642 + regs->gr[31] = regs->iaoq[1] + 16;
7643 + regs->sr[0] = regs->iasq[1];
7644 + regs->iaoq[0] = 0x100UL;
7645 + regs->iaoq[1] = regs->iaoq[0] + 4;
7646 + regs->iasq[0] = regs->sr[2];
7647 + regs->iasq[1] = regs->sr[2];
7648 + return 2;
7649 + }
7650 + } while (0);
7651 +#endif
7652 +
7653 + return 1;
7654 +}
7655 +
7656 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7657 +{
7658 + unsigned long i;
7659 +
7660 + printk(KERN_ERR "PAX: bytes at PC: ");
7661 + for (i = 0; i < 5; i++) {
7662 + unsigned int c;
7663 + if (get_user(c, (unsigned int *)pc+i))
7664 + printk(KERN_CONT "???????? ");
7665 + else
7666 + printk(KERN_CONT "%08x ", c);
7667 + }
7668 + printk("\n");
7669 +}
7670 +#endif
7671 +
7672 int fixup_exception(struct pt_regs *regs)
7673 {
7674 const struct exception_table_entry *fix;
7675 @@ -234,8 +345,33 @@ retry:
7676
7677 good_area:
7678
7679 - if ((vma->vm_flags & acc_type) != acc_type)
7680 + if ((vma->vm_flags & acc_type) != acc_type) {
7681 +
7682 +#ifdef CONFIG_PAX_PAGEEXEC
7683 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7684 + (address & ~3UL) == instruction_pointer(regs))
7685 + {
7686 + up_read(&mm->mmap_sem);
7687 + switch (pax_handle_fetch_fault(regs)) {
7688 +
7689 +#ifdef CONFIG_PAX_EMUPLT
7690 + case 3:
7691 + return;
7692 +#endif
7693 +
7694 +#ifdef CONFIG_PAX_EMUTRAMP
7695 + case 2:
7696 + return;
7697 +#endif
7698 +
7699 + }
7700 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7701 + do_group_exit(SIGKILL);
7702 + }
7703 +#endif
7704 +
7705 goto bad_area;
7706 + }
7707
7708 /*
7709 * If for any reason at all we couldn't handle the fault, make
7710 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7711 index 88eace4..4ba2591 100644
7712 --- a/arch/powerpc/Kconfig
7713 +++ b/arch/powerpc/Kconfig
7714 @@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7715 config KEXEC
7716 bool "kexec system call"
7717 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7718 + depends on !GRKERNSEC_KMEM
7719 help
7720 kexec is a system call that implements the ability to shutdown your
7721 current kernel, and to start another kernel. It is like a reboot
7722 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7723 index 512d278..d31fadd 100644
7724 --- a/arch/powerpc/include/asm/atomic.h
7725 +++ b/arch/powerpc/include/asm/atomic.h
7726 @@ -12,6 +12,11 @@
7727
7728 #define ATOMIC_INIT(i) { (i) }
7729
7730 +#define _ASM_EXTABLE(from, to) \
7731 +" .section __ex_table,\"a\"\n" \
7732 + PPC_LONG" " #from ", " #to"\n" \
7733 +" .previous\n"
7734 +
7735 static __inline__ int atomic_read(const atomic_t *v)
7736 {
7737 int t;
7738 @@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7739 return t;
7740 }
7741
7742 +static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7743 +{
7744 + int t;
7745 +
7746 + __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7747 +
7748 + return t;
7749 +}
7750 +
7751 static __inline__ void atomic_set(atomic_t *v, int i)
7752 {
7753 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7754 }
7755
7756 -#define ATOMIC_OP(op, asm_op) \
7757 -static __inline__ void atomic_##op(int a, atomic_t *v) \
7758 +static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7759 +{
7760 + __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7761 +}
7762 +
7763 +#ifdef CONFIG_PAX_REFCOUNT
7764 +#define __REFCOUNT_OP(op) op##o.
7765 +#define __OVERFLOW_PRE \
7766 + " mcrxr cr0\n"
7767 +#define __OVERFLOW_POST \
7768 + " bf 4*cr0+so, 3f\n" \
7769 + "2: .long 0x00c00b00\n" \
7770 + "3:\n"
7771 +#define __OVERFLOW_EXTABLE \
7772 + "\n4:\n"
7773 + _ASM_EXTABLE(2b, 4b)
7774 +#else
7775 +#define __REFCOUNT_OP(op) op
7776 +#define __OVERFLOW_PRE
7777 +#define __OVERFLOW_POST
7778 +#define __OVERFLOW_EXTABLE
7779 +#endif
7780 +
7781 +#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7782 +static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7783 { \
7784 int t; \
7785 \
7786 __asm__ __volatile__( \
7787 -"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7788 +"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7789 + pre_op \
7790 #asm_op " %0,%2,%0\n" \
7791 + post_op \
7792 PPC405_ERR77(0,%3) \
7793 " stwcx. %0,0,%3 \n" \
7794 " bne- 1b\n" \
7795 + extable \
7796 : "=&r" (t), "+m" (v->counter) \
7797 : "r" (a), "r" (&v->counter) \
7798 : "cc"); \
7799 } \
7800
7801 -#define ATOMIC_OP_RETURN(op, asm_op) \
7802 -static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7803 +#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7804 + __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7805 +
7806 +#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7807 +static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7808 { \
7809 int t; \
7810 \
7811 __asm__ __volatile__( \
7812 PPC_ATOMIC_ENTRY_BARRIER \
7813 -"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7814 +"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7815 + pre_op \
7816 #asm_op " %0,%1,%0\n" \
7817 + post_op \
7818 PPC405_ERR77(0,%2) \
7819 " stwcx. %0,0,%2 \n" \
7820 " bne- 1b\n" \
7821 + extable \
7822 PPC_ATOMIC_EXIT_BARRIER \
7823 : "=&r" (t) \
7824 : "r" (a), "r" (&v->counter) \
7825 @@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7826 return t; \
7827 }
7828
7829 +#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7830 + __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7831 +
7832 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7833
7834 ATOMIC_OPS(add, add)
7835 @@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7836
7837 #undef ATOMIC_OPS
7838 #undef ATOMIC_OP_RETURN
7839 +#undef __ATOMIC_OP_RETURN
7840 #undef ATOMIC_OP
7841 +#undef __ATOMIC_OP
7842
7843 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7844
7845 -static __inline__ void atomic_inc(atomic_t *v)
7846 -{
7847 - int t;
7848 +/*
7849 + * atomic_inc - increment atomic variable
7850 + * @v: pointer of type atomic_t
7851 + *
7852 + * Automatically increments @v by 1
7853 + */
7854 +#define atomic_inc(v) atomic_add(1, (v))
7855 +#define atomic_inc_return(v) atomic_add_return(1, (v))
7856
7857 - __asm__ __volatile__(
7858 -"1: lwarx %0,0,%2 # atomic_inc\n\
7859 - addic %0,%0,1\n"
7860 - PPC405_ERR77(0,%2)
7861 -" stwcx. %0,0,%2 \n\
7862 - bne- 1b"
7863 - : "=&r" (t), "+m" (v->counter)
7864 - : "r" (&v->counter)
7865 - : "cc", "xer");
7866 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7867 +{
7868 + atomic_add_unchecked(1, v);
7869 }
7870
7871 -static __inline__ int atomic_inc_return(atomic_t *v)
7872 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7873 {
7874 - int t;
7875 -
7876 - __asm__ __volatile__(
7877 - PPC_ATOMIC_ENTRY_BARRIER
7878 -"1: lwarx %0,0,%1 # atomic_inc_return\n\
7879 - addic %0,%0,1\n"
7880 - PPC405_ERR77(0,%1)
7881 -" stwcx. %0,0,%1 \n\
7882 - bne- 1b"
7883 - PPC_ATOMIC_EXIT_BARRIER
7884 - : "=&r" (t)
7885 - : "r" (&v->counter)
7886 - : "cc", "xer", "memory");
7887 -
7888 - return t;
7889 + return atomic_add_return_unchecked(1, v);
7890 }
7891
7892 /*
7893 @@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7894 */
7895 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7896
7897 -static __inline__ void atomic_dec(atomic_t *v)
7898 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7899 {
7900 - int t;
7901 -
7902 - __asm__ __volatile__(
7903 -"1: lwarx %0,0,%2 # atomic_dec\n\
7904 - addic %0,%0,-1\n"
7905 - PPC405_ERR77(0,%2)\
7906 -" stwcx. %0,0,%2\n\
7907 - bne- 1b"
7908 - : "=&r" (t), "+m" (v->counter)
7909 - : "r" (&v->counter)
7910 - : "cc", "xer");
7911 + return atomic_add_return_unchecked(1, v) == 0;
7912 }
7913
7914 -static __inline__ int atomic_dec_return(atomic_t *v)
7915 +/*
7916 + * atomic_dec - decrement atomic variable
7917 + * @v: pointer of type atomic_t
7918 + *
7919 + * Atomically decrements @v by 1
7920 + */
7921 +#define atomic_dec(v) atomic_sub(1, (v))
7922 +#define atomic_dec_return(v) atomic_sub_return(1, (v))
7923 +
7924 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7925 {
7926 - int t;
7927 -
7928 - __asm__ __volatile__(
7929 - PPC_ATOMIC_ENTRY_BARRIER
7930 -"1: lwarx %0,0,%1 # atomic_dec_return\n\
7931 - addic %0,%0,-1\n"
7932 - PPC405_ERR77(0,%1)
7933 -" stwcx. %0,0,%1\n\
7934 - bne- 1b"
7935 - PPC_ATOMIC_EXIT_BARRIER
7936 - : "=&r" (t)
7937 - : "r" (&v->counter)
7938 - : "cc", "xer", "memory");
7939 -
7940 - return t;
7941 + atomic_sub_unchecked(1, v);
7942 }
7943
7944 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7945 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7946
7947 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7948 +{
7949 + return cmpxchg(&(v->counter), old, new);
7950 +}
7951 +
7952 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7953 +{
7954 + return xchg(&(v->counter), new);
7955 +}
7956 +
7957 /**
7958 * __atomic_add_unless - add unless the number is a given value
7959 * @v: pointer of type atomic_t
7960 @@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7961 PPC_ATOMIC_ENTRY_BARRIER
7962 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7963 cmpw 0,%0,%3 \n\
7964 - beq- 2f \n\
7965 - add %0,%2,%0 \n"
7966 + beq- 2f \n"
7967 +
7968 +#ifdef CONFIG_PAX_REFCOUNT
7969 +" mcrxr cr0\n"
7970 +" addo. %0,%2,%0\n"
7971 +" bf 4*cr0+so, 4f\n"
7972 +"3:.long " "0x00c00b00""\n"
7973 +"4:\n"
7974 +#else
7975 + "add %0,%2,%0 \n"
7976 +#endif
7977 +
7978 PPC405_ERR77(0,%2)
7979 " stwcx. %0,0,%1 \n\
7980 bne- 1b \n"
7981 +"5:"
7982 +
7983 +#ifdef CONFIG_PAX_REFCOUNT
7984 + _ASM_EXTABLE(3b, 5b)
7985 +#endif
7986 +
7987 PPC_ATOMIC_EXIT_BARRIER
7988 " subf %0,%2,%0 \n\
7989 2:"
7990 @@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7991 }
7992 #define atomic_dec_if_positive atomic_dec_if_positive
7993
7994 +#define smp_mb__before_atomic_dec() smp_mb()
7995 +#define smp_mb__after_atomic_dec() smp_mb()
7996 +#define smp_mb__before_atomic_inc() smp_mb()
7997 +#define smp_mb__after_atomic_inc() smp_mb()
7998 +
7999 #ifdef __powerpc64__
8000
8001 #define ATOMIC64_INIT(i) { (i) }
8002 @@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8003 return t;
8004 }
8005
8006 +static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8007 +{
8008 + long t;
8009 +
8010 + __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8011 +
8012 + return t;
8013 +}
8014 +
8015 static __inline__ void atomic64_set(atomic64_t *v, long i)
8016 {
8017 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8018 }
8019
8020 -#define ATOMIC64_OP(op, asm_op) \
8021 -static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8022 +static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8023 +{
8024 + __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8025 +}
8026 +
8027 +#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8028 +static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8029 { \
8030 long t; \
8031 \
8032 __asm__ __volatile__( \
8033 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8034 + pre_op \
8035 #asm_op " %0,%2,%0\n" \
8036 + post_op \
8037 " stdcx. %0,0,%3 \n" \
8038 " bne- 1b\n" \
8039 + extable \
8040 : "=&r" (t), "+m" (v->counter) \
8041 : "r" (a), "r" (&v->counter) \
8042 : "cc"); \
8043 }
8044
8045 -#define ATOMIC64_OP_RETURN(op, asm_op) \
8046 -static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8047 +#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8048 + __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8049 +
8050 +#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8051 +static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8052 { \
8053 long t; \
8054 \
8055 __asm__ __volatile__( \
8056 PPC_ATOMIC_ENTRY_BARRIER \
8057 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8058 + pre_op \
8059 #asm_op " %0,%1,%0\n" \
8060 + post_op \
8061 " stdcx. %0,0,%2 \n" \
8062 " bne- 1b\n" \
8063 + extable \
8064 PPC_ATOMIC_EXIT_BARRIER \
8065 : "=&r" (t) \
8066 : "r" (a), "r" (&v->counter) \
8067 @@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8068 return t; \
8069 }
8070
8071 +#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8072 + __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8073 +
8074 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8075
8076 ATOMIC64_OPS(add, add)
8077 @@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8078
8079 #undef ATOMIC64_OPS
8080 #undef ATOMIC64_OP_RETURN
8081 +#undef __ATOMIC64_OP_RETURN
8082 #undef ATOMIC64_OP
8083 +#undef __ATOMIC64_OP
8084 +#undef __OVERFLOW_EXTABLE
8085 +#undef __OVERFLOW_POST
8086 +#undef __OVERFLOW_PRE
8087 +#undef __REFCOUNT_OP
8088
8089 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8090
8091 -static __inline__ void atomic64_inc(atomic64_t *v)
8092 -{
8093 - long t;
8094 +/*
8095 + * atomic64_inc - increment atomic variable
8096 + * @v: pointer of type atomic64_t
8097 + *
8098 + * Automatically increments @v by 1
8099 + */
8100 +#define atomic64_inc(v) atomic64_add(1, (v))
8101 +#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8102
8103 - __asm__ __volatile__(
8104 -"1: ldarx %0,0,%2 # atomic64_inc\n\
8105 - addic %0,%0,1\n\
8106 - stdcx. %0,0,%2 \n\
8107 - bne- 1b"
8108 - : "=&r" (t), "+m" (v->counter)
8109 - : "r" (&v->counter)
8110 - : "cc", "xer");
8111 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8112 +{
8113 + atomic64_add_unchecked(1, v);
8114 }
8115
8116 -static __inline__ long atomic64_inc_return(atomic64_t *v)
8117 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8118 {
8119 - long t;
8120 -
8121 - __asm__ __volatile__(
8122 - PPC_ATOMIC_ENTRY_BARRIER
8123 -"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8124 - addic %0,%0,1\n\
8125 - stdcx. %0,0,%1 \n\
8126 - bne- 1b"
8127 - PPC_ATOMIC_EXIT_BARRIER
8128 - : "=&r" (t)
8129 - : "r" (&v->counter)
8130 - : "cc", "xer", "memory");
8131 -
8132 - return t;
8133 + return atomic64_add_return_unchecked(1, v);
8134 }
8135
8136 /*
8137 @@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8138 */
8139 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8140
8141 -static __inline__ void atomic64_dec(atomic64_t *v)
8142 +/*
8143 + * atomic64_dec - decrement atomic variable
8144 + * @v: pointer of type atomic64_t
8145 + *
8146 + * Atomically decrements @v by 1
8147 + */
8148 +#define atomic64_dec(v) atomic64_sub(1, (v))
8149 +#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8150 +
8151 +static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8152 {
8153 - long t;
8154 -
8155 - __asm__ __volatile__(
8156 -"1: ldarx %0,0,%2 # atomic64_dec\n\
8157 - addic %0,%0,-1\n\
8158 - stdcx. %0,0,%2\n\
8159 - bne- 1b"
8160 - : "=&r" (t), "+m" (v->counter)
8161 - : "r" (&v->counter)
8162 - : "cc", "xer");
8163 -}
8164 -
8165 -static __inline__ long atomic64_dec_return(atomic64_t *v)
8166 -{
8167 - long t;
8168 -
8169 - __asm__ __volatile__(
8170 - PPC_ATOMIC_ENTRY_BARRIER
8171 -"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8172 - addic %0,%0,-1\n\
8173 - stdcx. %0,0,%1\n\
8174 - bne- 1b"
8175 - PPC_ATOMIC_EXIT_BARRIER
8176 - : "=&r" (t)
8177 - : "r" (&v->counter)
8178 - : "cc", "xer", "memory");
8179 -
8180 - return t;
8181 + atomic64_sub_unchecked(1, v);
8182 }
8183
8184 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8185 @@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8186 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8187 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8188
8189 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8190 +{
8191 + return cmpxchg(&(v->counter), old, new);
8192 +}
8193 +
8194 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8195 +{
8196 + return xchg(&(v->counter), new);
8197 +}
8198 +
8199 /**
8200 * atomic64_add_unless - add unless the number is a given value
8201 * @v: pointer of type atomic64_t
8202 @@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8203
8204 __asm__ __volatile__ (
8205 PPC_ATOMIC_ENTRY_BARRIER
8206 -"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8207 +"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8208 cmpd 0,%0,%3 \n\
8209 - beq- 2f \n\
8210 - add %0,%2,%0 \n"
8211 + beq- 2f \n"
8212 +
8213 +#ifdef CONFIG_PAX_REFCOUNT
8214 +" mcrxr cr0\n"
8215 +" addo. %0,%2,%0\n"
8216 +" bf 4*cr0+so, 4f\n"
8217 +"3:.long " "0x00c00b00""\n"
8218 +"4:\n"
8219 +#else
8220 + "add %0,%2,%0 \n"
8221 +#endif
8222 +
8223 " stdcx. %0,0,%1 \n\
8224 bne- 1b \n"
8225 PPC_ATOMIC_EXIT_BARRIER
8226 +"5:"
8227 +
8228 +#ifdef CONFIG_PAX_REFCOUNT
8229 + _ASM_EXTABLE(3b, 5b)
8230 +#endif
8231 +
8232 " subf %0,%2,%0 \n\
8233 2:"
8234 : "=&r" (t)
8235 diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8236 index bab79a1..4a3eabc 100644
8237 --- a/arch/powerpc/include/asm/barrier.h
8238 +++ b/arch/powerpc/include/asm/barrier.h
8239 @@ -73,7 +73,7 @@
8240 do { \
8241 compiletime_assert_atomic_type(*p); \
8242 __lwsync(); \
8243 - ACCESS_ONCE(*p) = (v); \
8244 + ACCESS_ONCE_RW(*p) = (v); \
8245 } while (0)
8246
8247 #define smp_load_acquire(p) \
8248 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8249 index 34a05a1..a1f2c67 100644
8250 --- a/arch/powerpc/include/asm/cache.h
8251 +++ b/arch/powerpc/include/asm/cache.h
8252 @@ -4,6 +4,7 @@
8253 #ifdef __KERNEL__
8254
8255 #include <asm/reg.h>
8256 +#include <linux/const.h>
8257
8258 /* bytes per L1 cache line */
8259 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8260 @@ -23,7 +24,7 @@
8261 #define L1_CACHE_SHIFT 7
8262 #endif
8263
8264 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8265 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8266
8267 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8268
8269 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8270 index 888d8f3..66f581c 100644
8271 --- a/arch/powerpc/include/asm/elf.h
8272 +++ b/arch/powerpc/include/asm/elf.h
8273 @@ -28,8 +28,19 @@
8274 the loader. We need to make sure that it is out of the way of the program
8275 that it will "exec", and that there is sufficient room for the brk. */
8276
8277 -extern unsigned long randomize_et_dyn(unsigned long base);
8278 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8279 +#define ELF_ET_DYN_BASE (0x20000000)
8280 +
8281 +#ifdef CONFIG_PAX_ASLR
8282 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8283 +
8284 +#ifdef __powerpc64__
8285 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8286 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8287 +#else
8288 +#define PAX_DELTA_MMAP_LEN 15
8289 +#define PAX_DELTA_STACK_LEN 15
8290 +#endif
8291 +#endif
8292
8293 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8294
8295 @@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8296 (0x7ff >> (PAGE_SHIFT - 12)) : \
8297 (0x3ffff >> (PAGE_SHIFT - 12)))
8298
8299 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8300 -#define arch_randomize_brk arch_randomize_brk
8301 -
8302 -
8303 #ifdef CONFIG_SPU_BASE
8304 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8305 #define NT_SPU 1
8306 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8307 index 8196e9c..d83a9f3 100644
8308 --- a/arch/powerpc/include/asm/exec.h
8309 +++ b/arch/powerpc/include/asm/exec.h
8310 @@ -4,6 +4,6 @@
8311 #ifndef _ASM_POWERPC_EXEC_H
8312 #define _ASM_POWERPC_EXEC_H
8313
8314 -extern unsigned long arch_align_stack(unsigned long sp);
8315 +#define arch_align_stack(x) ((x) & ~0xfUL)
8316
8317 #endif /* _ASM_POWERPC_EXEC_H */
8318 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8319 index 5acabbd..7ea14fa 100644
8320 --- a/arch/powerpc/include/asm/kmap_types.h
8321 +++ b/arch/powerpc/include/asm/kmap_types.h
8322 @@ -10,7 +10,7 @@
8323 * 2 of the License, or (at your option) any later version.
8324 */
8325
8326 -#define KM_TYPE_NR 16
8327 +#define KM_TYPE_NR 17
8328
8329 #endif /* __KERNEL__ */
8330 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8331 diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8332 index b8da913..c02b593 100644
8333 --- a/arch/powerpc/include/asm/local.h
8334 +++ b/arch/powerpc/include/asm/local.h
8335 @@ -9,21 +9,65 @@ typedef struct
8336 atomic_long_t a;
8337 } local_t;
8338
8339 +typedef struct
8340 +{
8341 + atomic_long_unchecked_t a;
8342 +} local_unchecked_t;
8343 +
8344 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8345
8346 #define local_read(l) atomic_long_read(&(l)->a)
8347 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8348 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8349 +#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8350
8351 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8352 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8353 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8354 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8355 #define local_inc(l) atomic_long_inc(&(l)->a)
8356 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8357 #define local_dec(l) atomic_long_dec(&(l)->a)
8358 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8359
8360 static __inline__ long local_add_return(long a, local_t *l)
8361 {
8362 long t;
8363
8364 __asm__ __volatile__(
8365 +"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8366 +
8367 +#ifdef CONFIG_PAX_REFCOUNT
8368 +" mcrxr cr0\n"
8369 +" addo. %0,%1,%0\n"
8370 +" bf 4*cr0+so, 3f\n"
8371 +"2:.long " "0x00c00b00""\n"
8372 +#else
8373 +" add %0,%1,%0\n"
8374 +#endif
8375 +
8376 +"3:\n"
8377 + PPC405_ERR77(0,%2)
8378 + PPC_STLCX "%0,0,%2 \n\
8379 + bne- 1b"
8380 +
8381 +#ifdef CONFIG_PAX_REFCOUNT
8382 +"\n4:\n"
8383 + _ASM_EXTABLE(2b, 4b)
8384 +#endif
8385 +
8386 + : "=&r" (t)
8387 + : "r" (a), "r" (&(l->a.counter))
8388 + : "cc", "memory");
8389 +
8390 + return t;
8391 +}
8392 +
8393 +static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8394 +{
8395 + long t;
8396 +
8397 + __asm__ __volatile__(
8398 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8399 add %0,%1,%0\n"
8400 PPC405_ERR77(0,%2)
8401 @@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8402
8403 #define local_cmpxchg(l, o, n) \
8404 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8405 +#define local_cmpxchg_unchecked(l, o, n) \
8406 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
8407 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8408
8409 /**
8410 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8411 index 8565c25..2865190 100644
8412 --- a/arch/powerpc/include/asm/mman.h
8413 +++ b/arch/powerpc/include/asm/mman.h
8414 @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8415 }
8416 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8417
8418 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8419 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8420 {
8421 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8422 }
8423 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8424 index 26fe1ae..987ffc5 100644
8425 --- a/arch/powerpc/include/asm/page.h
8426 +++ b/arch/powerpc/include/asm/page.h
8427 @@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8428 * and needs to be executable. This means the whole heap ends
8429 * up being executable.
8430 */
8431 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8432 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8433 +#define VM_DATA_DEFAULT_FLAGS32 \
8434 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8435 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8436
8437 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8438 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8439 @@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8440 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8441 #endif
8442
8443 +#define ktla_ktva(addr) (addr)
8444 +#define ktva_ktla(addr) (addr)
8445 +
8446 #ifndef CONFIG_PPC_BOOK3S_64
8447 /*
8448 * Use the top bit of the higher-level page table entries to indicate whether
8449 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8450 index d908a46..3753f71 100644
8451 --- a/arch/powerpc/include/asm/page_64.h
8452 +++ b/arch/powerpc/include/asm/page_64.h
8453 @@ -172,15 +172,18 @@ do { \
8454 * stack by default, so in the absence of a PT_GNU_STACK program header
8455 * we turn execute permission off.
8456 */
8457 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8458 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8459 +#define VM_STACK_DEFAULT_FLAGS32 \
8460 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8461 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8462
8463 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8464 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8465
8466 +#ifndef CONFIG_PAX_PAGEEXEC
8467 #define VM_STACK_DEFAULT_FLAGS \
8468 (is_32bit_task() ? \
8469 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8470 +#endif
8471
8472 #include <asm-generic/getorder.h>
8473
8474 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8475 index 4b0be20..c15a27d 100644
8476 --- a/arch/powerpc/include/asm/pgalloc-64.h
8477 +++ b/arch/powerpc/include/asm/pgalloc-64.h
8478 @@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8479 #ifndef CONFIG_PPC_64K_PAGES
8480
8481 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8482 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8483
8484 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8485 {
8486 @@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8487 pud_set(pud, (unsigned long)pmd);
8488 }
8489
8490 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8491 +{
8492 + pud_populate(mm, pud, pmd);
8493 +}
8494 +
8495 #define pmd_populate(mm, pmd, pte_page) \
8496 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8497 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8498 @@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8499 #endif
8500
8501 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8502 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8503
8504 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8505 pte_t *pte)
8506 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8507 index 316f9a5..ba05c77 100644
8508 --- a/arch/powerpc/include/asm/pgtable.h
8509 +++ b/arch/powerpc/include/asm/pgtable.h
8510 @@ -2,6 +2,7 @@
8511 #define _ASM_POWERPC_PGTABLE_H
8512 #ifdef __KERNEL__
8513
8514 +#include <linux/const.h>
8515 #ifndef __ASSEMBLY__
8516 #include <linux/mmdebug.h>
8517 #include <linux/mmzone.h>
8518 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8519 index 4aad413..85d86bf 100644
8520 --- a/arch/powerpc/include/asm/pte-hash32.h
8521 +++ b/arch/powerpc/include/asm/pte-hash32.h
8522 @@ -21,6 +21,7 @@
8523 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8524 #define _PAGE_USER 0x004 /* usermode access allowed */
8525 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8526 +#define _PAGE_EXEC _PAGE_GUARDED
8527 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8528 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8529 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8530 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8531 index c998279..d13a9f8 100644
8532 --- a/arch/powerpc/include/asm/reg.h
8533 +++ b/arch/powerpc/include/asm/reg.h
8534 @@ -251,6 +251,7 @@
8535 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8536 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8537 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8538 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8539 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8540 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8541 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8542 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8543 index 5a6614a..d89995d1 100644
8544 --- a/arch/powerpc/include/asm/smp.h
8545 +++ b/arch/powerpc/include/asm/smp.h
8546 @@ -51,7 +51,7 @@ struct smp_ops_t {
8547 int (*cpu_disable)(void);
8548 void (*cpu_die)(unsigned int nr);
8549 int (*cpu_bootable)(unsigned int nr);
8550 -};
8551 +} __no_const;
8552
8553 extern void smp_send_debugger_break(void);
8554 extern void start_secondary_resume(void);
8555 diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8556 index 4dbe072..b803275 100644
8557 --- a/arch/powerpc/include/asm/spinlock.h
8558 +++ b/arch/powerpc/include/asm/spinlock.h
8559 @@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8560 __asm__ __volatile__(
8561 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8562 __DO_SIGN_EXTEND
8563 -" addic. %0,%0,1\n\
8564 - ble- 2f\n"
8565 +
8566 +#ifdef CONFIG_PAX_REFCOUNT
8567 +" mcrxr cr0\n"
8568 +" addico. %0,%0,1\n"
8569 +" bf 4*cr0+so, 3f\n"
8570 +"2:.long " "0x00c00b00""\n"
8571 +#else
8572 +" addic. %0,%0,1\n"
8573 +#endif
8574 +
8575 +"3:\n"
8576 + "ble- 4f\n"
8577 PPC405_ERR77(0,%1)
8578 " stwcx. %0,0,%1\n\
8579 bne- 1b\n"
8580 PPC_ACQUIRE_BARRIER
8581 -"2:" : "=&r" (tmp)
8582 +"4:"
8583 +
8584 +#ifdef CONFIG_PAX_REFCOUNT
8585 + _ASM_EXTABLE(2b,4b)
8586 +#endif
8587 +
8588 + : "=&r" (tmp)
8589 : "r" (&rw->lock)
8590 : "cr0", "xer", "memory");
8591
8592 @@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8593 __asm__ __volatile__(
8594 "# read_unlock\n\t"
8595 PPC_RELEASE_BARRIER
8596 -"1: lwarx %0,0,%1\n\
8597 - addic %0,%0,-1\n"
8598 +"1: lwarx %0,0,%1\n"
8599 +
8600 +#ifdef CONFIG_PAX_REFCOUNT
8601 +" mcrxr cr0\n"
8602 +" addico. %0,%0,-1\n"
8603 +" bf 4*cr0+so, 3f\n"
8604 +"2:.long " "0x00c00b00""\n"
8605 +#else
8606 +" addic. %0,%0,-1\n"
8607 +#endif
8608 +
8609 +"3:\n"
8610 PPC405_ERR77(0,%1)
8611 " stwcx. %0,0,%1\n\
8612 bne- 1b"
8613 +
8614 +#ifdef CONFIG_PAX_REFCOUNT
8615 +"\n4:\n"
8616 + _ASM_EXTABLE(2b, 4b)
8617 +#endif
8618 +
8619 : "=&r"(tmp)
8620 : "r"(&rw->lock)
8621 : "cr0", "xer", "memory");
8622 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8623 index b034ecd..af7e31f 100644
8624 --- a/arch/powerpc/include/asm/thread_info.h
8625 +++ b/arch/powerpc/include/asm/thread_info.h
8626 @@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8627 #if defined(CONFIG_PPC64)
8628 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8629 #endif
8630 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8631 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8632
8633 /* as above, but as bit values */
8634 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8635 @@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8636 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8637 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8638 #define _TIF_NOHZ (1<<TIF_NOHZ)
8639 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8640 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8641 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8642 - _TIF_NOHZ)
8643 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
8644
8645 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8646 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8647 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8648 index 9485b43..3bd3c16 100644
8649 --- a/arch/powerpc/include/asm/uaccess.h
8650 +++ b/arch/powerpc/include/asm/uaccess.h
8651 @@ -58,6 +58,7 @@
8652
8653 #endif
8654
8655 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8656 #define access_ok(type, addr, size) \
8657 (__chk_user_ptr(addr), \
8658 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8659 @@ -318,52 +319,6 @@ do { \
8660 extern unsigned long __copy_tofrom_user(void __user *to,
8661 const void __user *from, unsigned long size);
8662
8663 -#ifndef __powerpc64__
8664 -
8665 -static inline unsigned long copy_from_user(void *to,
8666 - const void __user *from, unsigned long n)
8667 -{
8668 - unsigned long over;
8669 -
8670 - if (access_ok(VERIFY_READ, from, n))
8671 - return __copy_tofrom_user((__force void __user *)to, from, n);
8672 - if ((unsigned long)from < TASK_SIZE) {
8673 - over = (unsigned long)from + n - TASK_SIZE;
8674 - return __copy_tofrom_user((__force void __user *)to, from,
8675 - n - over) + over;
8676 - }
8677 - return n;
8678 -}
8679 -
8680 -static inline unsigned long copy_to_user(void __user *to,
8681 - const void *from, unsigned long n)
8682 -{
8683 - unsigned long over;
8684 -
8685 - if (access_ok(VERIFY_WRITE, to, n))
8686 - return __copy_tofrom_user(to, (__force void __user *)from, n);
8687 - if ((unsigned long)to < TASK_SIZE) {
8688 - over = (unsigned long)to + n - TASK_SIZE;
8689 - return __copy_tofrom_user(to, (__force void __user *)from,
8690 - n - over) + over;
8691 - }
8692 - return n;
8693 -}
8694 -
8695 -#else /* __powerpc64__ */
8696 -
8697 -#define __copy_in_user(to, from, size) \
8698 - __copy_tofrom_user((to), (from), (size))
8699 -
8700 -extern unsigned long copy_from_user(void *to, const void __user *from,
8701 - unsigned long n);
8702 -extern unsigned long copy_to_user(void __user *to, const void *from,
8703 - unsigned long n);
8704 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
8705 - unsigned long n);
8706 -
8707 -#endif /* __powerpc64__ */
8708 -
8709 static inline unsigned long __copy_from_user_inatomic(void *to,
8710 const void __user *from, unsigned long n)
8711 {
8712 @@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8713 if (ret == 0)
8714 return 0;
8715 }
8716 +
8717 + if (!__builtin_constant_p(n))
8718 + check_object_size(to, n, false);
8719 +
8720 return __copy_tofrom_user((__force void __user *)to, from, n);
8721 }
8722
8723 @@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8724 if (ret == 0)
8725 return 0;
8726 }
8727 +
8728 + if (!__builtin_constant_p(n))
8729 + check_object_size(from, n, true);
8730 +
8731 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8732 }
8733
8734 @@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8735 return __copy_to_user_inatomic(to, from, size);
8736 }
8737
8738 +#ifndef __powerpc64__
8739 +
8740 +static inline unsigned long __must_check copy_from_user(void *to,
8741 + const void __user *from, unsigned long n)
8742 +{
8743 + unsigned long over;
8744 +
8745 + if ((long)n < 0)
8746 + return n;
8747 +
8748 + if (access_ok(VERIFY_READ, from, n)) {
8749 + if (!__builtin_constant_p(n))
8750 + check_object_size(to, n, false);
8751 + return __copy_tofrom_user((__force void __user *)to, from, n);
8752 + }
8753 + if ((unsigned long)from < TASK_SIZE) {
8754 + over = (unsigned long)from + n - TASK_SIZE;
8755 + if (!__builtin_constant_p(n - over))
8756 + check_object_size(to, n - over, false);
8757 + return __copy_tofrom_user((__force void __user *)to, from,
8758 + n - over) + over;
8759 + }
8760 + return n;
8761 +}
8762 +
8763 +static inline unsigned long __must_check copy_to_user(void __user *to,
8764 + const void *from, unsigned long n)
8765 +{
8766 + unsigned long over;
8767 +
8768 + if ((long)n < 0)
8769 + return n;
8770 +
8771 + if (access_ok(VERIFY_WRITE, to, n)) {
8772 + if (!__builtin_constant_p(n))
8773 + check_object_size(from, n, true);
8774 + return __copy_tofrom_user(to, (__force void __user *)from, n);
8775 + }
8776 + if ((unsigned long)to < TASK_SIZE) {
8777 + over = (unsigned long)to + n - TASK_SIZE;
8778 + if (!__builtin_constant_p(n))
8779 + check_object_size(from, n - over, true);
8780 + return __copy_tofrom_user(to, (__force void __user *)from,
8781 + n - over) + over;
8782 + }
8783 + return n;
8784 +}
8785 +
8786 +#else /* __powerpc64__ */
8787 +
8788 +#define __copy_in_user(to, from, size) \
8789 + __copy_tofrom_user((to), (from), (size))
8790 +
8791 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8792 +{
8793 + if ((long)n < 0 || n > INT_MAX)
8794 + return n;
8795 +
8796 + if (!__builtin_constant_p(n))
8797 + check_object_size(to, n, false);
8798 +
8799 + if (likely(access_ok(VERIFY_READ, from, n)))
8800 + n = __copy_from_user(to, from, n);
8801 + else
8802 + memset(to, 0, n);
8803 + return n;
8804 +}
8805 +
8806 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8807 +{
8808 + if ((long)n < 0 || n > INT_MAX)
8809 + return n;
8810 +
8811 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
8812 + if (!__builtin_constant_p(n))
8813 + check_object_size(from, n, true);
8814 + n = __copy_to_user(to, from, n);
8815 + }
8816 + return n;
8817 +}
8818 +
8819 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
8820 + unsigned long n);
8821 +
8822 +#endif /* __powerpc64__ */
8823 +
8824 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8825
8826 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8827 diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8828 index 502cf69..822e63b 100644
8829 --- a/arch/powerpc/kernel/Makefile
8830 +++ b/arch/powerpc/kernel/Makefile
8831 @@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8832 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8833 endif
8834
8835 +CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8836 +
8837 obj-y := cputable.o ptrace.o syscalls.o \
8838 irq.o align.o signal_32.o pmc.o vdso.o \
8839 process.o systbl.o idle.o \
8840 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8841 index 3e68d1c..72a5ee6 100644
8842 --- a/arch/powerpc/kernel/exceptions-64e.S
8843 +++ b/arch/powerpc/kernel/exceptions-64e.S
8844 @@ -1010,6 +1010,7 @@ storage_fault_common:
8845 std r14,_DAR(r1)
8846 std r15,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848 + bl save_nvgprs
8849 mr r4,r14
8850 mr r5,r15
8851 ld r14,PACA_EXGEN+EX_R14(r13)
8852 @@ -1018,8 +1019,7 @@ storage_fault_common:
8853 cmpdi r3,0
8854 bne- 1f
8855 b ret_from_except_lite
8856 -1: bl save_nvgprs
8857 - mr r5,r3
8858 +1: mr r5,r3
8859 addi r3,r1,STACK_FRAME_OVERHEAD
8860 ld r4,_DAR(r1)
8861 bl bad_page_fault
8862 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8863 index 72e783e..fe058e2 100644
8864 --- a/arch/powerpc/kernel/exceptions-64s.S
8865 +++ b/arch/powerpc/kernel/exceptions-64s.S
8866 @@ -1588,10 +1588,10 @@ handle_page_fault:
8867 11: ld r4,_DAR(r1)
8868 ld r5,_DSISR(r1)
8869 addi r3,r1,STACK_FRAME_OVERHEAD
8870 + bl save_nvgprs
8871 bl do_page_fault
8872 cmpdi r3,0
8873 beq+ 12f
8874 - bl save_nvgprs
8875 mr r5,r3
8876 addi r3,r1,STACK_FRAME_OVERHEAD
8877 lwz r4,_DAR(r1)
8878 diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8879 index c143835..5a9697f 100644
8880 --- a/arch/powerpc/kernel/irq.c
8881 +++ b/arch/powerpc/kernel/irq.c
8882 @@ -461,6 +461,8 @@ void migrate_irqs(void)
8883 }
8884 #endif
8885
8886 +extern void gr_handle_kernel_exploit(void);
8887 +
8888 static inline void check_stack_overflow(void)
8889 {
8890 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8891 @@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
8892 pr_err("do_IRQ: stack overflow: %ld\n",
8893 sp - sizeof(struct thread_info));
8894 dump_stack();
8895 + gr_handle_kernel_exploit();
8896 }
8897 #endif
8898 }
8899 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8900 index c94d2e0..992a9ce 100644
8901 --- a/arch/powerpc/kernel/module_32.c
8902 +++ b/arch/powerpc/kernel/module_32.c
8903 @@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8904 me->arch.core_plt_section = i;
8905 }
8906 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8907 - pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8908 + pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8909 return -ENOEXEC;
8910 }
8911
8912 @@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8913
8914 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8915 /* Init, or core PLT? */
8916 - if (location >= mod->module_core
8917 - && location < mod->module_core + mod->core_size)
8918 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8919 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8920 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8921 - else
8922 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8923 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8924 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8925 + else {
8926 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8927 + return ~0UL;
8928 + }
8929
8930 /* Find this entry, or if that fails, the next avail. entry */
8931 while (entry->jump[0]) {
8932 @@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8933 }
8934 #ifdef CONFIG_DYNAMIC_FTRACE
8935 module->arch.tramp =
8936 - do_plt_call(module->module_core,
8937 + do_plt_call(module->module_core_rx,
8938 (unsigned long)ftrace_caller,
8939 sechdrs, module);
8940 #endif
8941 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8942 index 923cd2d..ae782a9 100644
8943 --- a/arch/powerpc/kernel/process.c
8944 +++ b/arch/powerpc/kernel/process.c
8945 @@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
8946 * Lookup NIP late so we have the best change of getting the
8947 * above info out without failing
8948 */
8949 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8950 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8951 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8952 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8953 #endif
8954 show_stack(current, (unsigned long *) regs->gpr[1]);
8955 if (!user_mode(regs))
8956 @@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8957 newsp = stack[0];
8958 ip = stack[STACK_FRAME_LR_SAVE];
8959 if (!firstframe || ip != lr) {
8960 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8961 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8962 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8963 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8964 - printk(" (%pS)",
8965 + printk(" (%pA)",
8966 (void *)current->ret_stack[curr_frame].ret);
8967 curr_frame--;
8968 }
8969 @@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8970 struct pt_regs *regs = (struct pt_regs *)
8971 (sp + STACK_FRAME_OVERHEAD);
8972 lr = regs->link;
8973 - printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8974 + printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8975 regs->trap, (void *)regs->nip, (void *)lr);
8976 firstframe = 1;
8977 }
8978 @@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
8979 mtspr(SPRN_CTRLT, ctrl);
8980 }
8981 #endif /* CONFIG_PPC64 */
8982 -
8983 -unsigned long arch_align_stack(unsigned long sp)
8984 -{
8985 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8986 - sp -= get_random_int() & ~PAGE_MASK;
8987 - return sp & ~0xf;
8988 -}
8989 -
8990 -static inline unsigned long brk_rnd(void)
8991 -{
8992 - unsigned long rnd = 0;
8993 -
8994 - /* 8MB for 32bit, 1GB for 64bit */
8995 - if (is_32bit_task())
8996 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8997 - else
8998 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8999 -
9000 - return rnd << PAGE_SHIFT;
9001 -}
9002 -
9003 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9004 -{
9005 - unsigned long base = mm->brk;
9006 - unsigned long ret;
9007 -
9008 -#ifdef CONFIG_PPC_STD_MMU_64
9009 - /*
9010 - * If we are using 1TB segments and we are allowed to randomise
9011 - * the heap, we can put it above 1TB so it is backed by a 1TB
9012 - * segment. Otherwise the heap will be in the bottom 1TB
9013 - * which always uses 256MB segments and this may result in a
9014 - * performance penalty.
9015 - */
9016 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9017 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9018 -#endif
9019 -
9020 - ret = PAGE_ALIGN(base + brk_rnd());
9021 -
9022 - if (ret < mm->brk)
9023 - return mm->brk;
9024 -
9025 - return ret;
9026 -}
9027 -
9028 -unsigned long randomize_et_dyn(unsigned long base)
9029 -{
9030 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
9031 -
9032 - if (ret < base)
9033 - return base;
9034 -
9035 - return ret;
9036 -}
9037 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9038 index f21897b..28c0428 100644
9039 --- a/arch/powerpc/kernel/ptrace.c
9040 +++ b/arch/powerpc/kernel/ptrace.c
9041 @@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9042 return ret;
9043 }
9044
9045 +#ifdef CONFIG_GRKERNSEC_SETXID
9046 +extern void gr_delayed_cred_worker(void);
9047 +#endif
9048 +
9049 /*
9050 * We must return the syscall number to actually look up in the table.
9051 * This can be -1L to skip running any syscall at all.
9052 @@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9053
9054 secure_computing_strict(regs->gpr[0]);
9055
9056 +#ifdef CONFIG_GRKERNSEC_SETXID
9057 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9058 + gr_delayed_cred_worker();
9059 +#endif
9060 +
9061 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9062 tracehook_report_syscall_entry(regs))
9063 /*
9064 @@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9065 {
9066 int step;
9067
9068 +#ifdef CONFIG_GRKERNSEC_SETXID
9069 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9070 + gr_delayed_cred_worker();
9071 +#endif
9072 +
9073 audit_syscall_exit(regs);
9074
9075 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9076 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9077 index b171001..4ac7ac5 100644
9078 --- a/arch/powerpc/kernel/signal_32.c
9079 +++ b/arch/powerpc/kernel/signal_32.c
9080 @@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9081 /* Save user registers on the stack */
9082 frame = &rt_sf->uc.uc_mcontext;
9083 addr = frame;
9084 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9085 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9086 sigret = 0;
9087 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9088 } else {
9089 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9090 index 2cb0c94..c0c0bc9 100644
9091 --- a/arch/powerpc/kernel/signal_64.c
9092 +++ b/arch/powerpc/kernel/signal_64.c
9093 @@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9094 current->thread.fp_state.fpscr = 0;
9095
9096 /* Set up to return from userspace. */
9097 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9098 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9099 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9100 } else {
9101 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9102 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9103 index 0dc43f9..a885d33 100644
9104 --- a/arch/powerpc/kernel/traps.c
9105 +++ b/arch/powerpc/kernel/traps.c
9106 @@ -36,6 +36,7 @@
9107 #include <linux/debugfs.h>
9108 #include <linux/ratelimit.h>
9109 #include <linux/context_tracking.h>
9110 +#include <linux/uaccess.h>
9111
9112 #include <asm/emulated_ops.h>
9113 #include <asm/pgtable.h>
9114 @@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9115 return flags;
9116 }
9117
9118 +extern void gr_handle_kernel_exploit(void);
9119 +
9120 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9121 int signr)
9122 {
9123 @@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9124 panic("Fatal exception in interrupt");
9125 if (panic_on_oops)
9126 panic("Fatal exception");
9127 +
9128 + gr_handle_kernel_exploit();
9129 +
9130 do_exit(signr);
9131 }
9132
9133 @@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9134 enum ctx_state prev_state = exception_enter();
9135 unsigned int reason = get_reason(regs);
9136
9137 +#ifdef CONFIG_PAX_REFCOUNT
9138 + unsigned int bkpt;
9139 + const struct exception_table_entry *entry;
9140 +
9141 + if (reason & REASON_ILLEGAL) {
9142 + /* Check if PaX bad instruction */
9143 + if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9144 + current->thread.trap_nr = 0;
9145 + pax_report_refcount_overflow(regs);
9146 + /* fixup_exception() for PowerPC does not exist, simulate its job */
9147 + if ((entry = search_exception_tables(regs->nip)) != NULL) {
9148 + regs->nip = entry->fixup;
9149 + return;
9150 + }
9151 + /* fixup_exception() could not handle */
9152 + goto bail;
9153 + }
9154 + }
9155 +#endif
9156 +
9157 /* We can now get here via a FP Unavailable exception if the core
9158 * has no FPU, in that case the reason flags will be 0 */
9159
9160 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9161 index f174351..5722009 100644
9162 --- a/arch/powerpc/kernel/vdso.c
9163 +++ b/arch/powerpc/kernel/vdso.c
9164 @@ -35,6 +35,7 @@
9165 #include <asm/vdso.h>
9166 #include <asm/vdso_datapage.h>
9167 #include <asm/setup.h>
9168 +#include <asm/mman.h>
9169
9170 #undef DEBUG
9171
9172 @@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9173 vdso_base = VDSO32_MBASE;
9174 #endif
9175
9176 - current->mm->context.vdso_base = 0;
9177 + current->mm->context.vdso_base = ~0UL;
9178
9179 /* vDSO has a problem and was disabled, just don't "enable" it for the
9180 * process
9181 @@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9182 vdso_base = get_unmapped_area(NULL, vdso_base,
9183 (vdso_pages << PAGE_SHIFT) +
9184 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9185 - 0, 0);
9186 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
9187 if (IS_ERR_VALUE(vdso_base)) {
9188 rc = vdso_base;
9189 goto fail_mmapsem;
9190 diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9191 index c1f8f53..71a3b96 100644
9192 --- a/arch/powerpc/kvm/powerpc.c
9193 +++ b/arch/powerpc/kvm/powerpc.c
9194 @@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9195 }
9196 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9197
9198 -int kvm_arch_init(void *opaque)
9199 +int kvm_arch_init(const void *opaque)
9200 {
9201 return 0;
9202 }
9203 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9204 index 5eea6f3..5d10396 100644
9205 --- a/arch/powerpc/lib/usercopy_64.c
9206 +++ b/arch/powerpc/lib/usercopy_64.c
9207 @@ -9,22 +9,6 @@
9208 #include <linux/module.h>
9209 #include <asm/uaccess.h>
9210
9211 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9212 -{
9213 - if (likely(access_ok(VERIFY_READ, from, n)))
9214 - n = __copy_from_user(to, from, n);
9215 - else
9216 - memset(to, 0, n);
9217 - return n;
9218 -}
9219 -
9220 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9221 -{
9222 - if (likely(access_ok(VERIFY_WRITE, to, n)))
9223 - n = __copy_to_user(to, from, n);
9224 - return n;
9225 -}
9226 -
9227 unsigned long copy_in_user(void __user *to, const void __user *from,
9228 unsigned long n)
9229 {
9230 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9231 return n;
9232 }
9233
9234 -EXPORT_SYMBOL(copy_from_user);
9235 -EXPORT_SYMBOL(copy_to_user);
9236 EXPORT_SYMBOL(copy_in_user);
9237
9238 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9239 index 08d659a..ab329f4 100644
9240 --- a/arch/powerpc/mm/fault.c
9241 +++ b/arch/powerpc/mm/fault.c
9242 @@ -33,6 +33,10 @@
9243 #include <linux/ratelimit.h>
9244 #include <linux/context_tracking.h>
9245 #include <linux/hugetlb.h>
9246 +#include <linux/slab.h>
9247 +#include <linux/pagemap.h>
9248 +#include <linux/compiler.h>
9249 +#include <linux/unistd.h>
9250
9251 #include <asm/firmware.h>
9252 #include <asm/page.h>
9253 @@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9254 }
9255 #endif
9256
9257 +#ifdef CONFIG_PAX_PAGEEXEC
9258 +/*
9259 + * PaX: decide what to do with offenders (regs->nip = fault address)
9260 + *
9261 + * returns 1 when task should be killed
9262 + */
9263 +static int pax_handle_fetch_fault(struct pt_regs *regs)
9264 +{
9265 + return 1;
9266 +}
9267 +
9268 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9269 +{
9270 + unsigned long i;
9271 +
9272 + printk(KERN_ERR "PAX: bytes at PC: ");
9273 + for (i = 0; i < 5; i++) {
9274 + unsigned int c;
9275 + if (get_user(c, (unsigned int __user *)pc+i))
9276 + printk(KERN_CONT "???????? ");
9277 + else
9278 + printk(KERN_CONT "%08x ", c);
9279 + }
9280 + printk("\n");
9281 +}
9282 +#endif
9283 +
9284 /*
9285 * Check whether the instruction at regs->nip is a store using
9286 * an update addressing form which will update r1.
9287 @@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9288 * indicate errors in DSISR but can validly be set in SRR1.
9289 */
9290 if (trap == 0x400)
9291 - error_code &= 0x48200000;
9292 + error_code &= 0x58200000;
9293 else
9294 is_write = error_code & DSISR_ISSTORE;
9295 #else
9296 @@ -390,7 +421,7 @@ good_area:
9297 * "undefined". Of those that can be set, this is the only
9298 * one which seems bad.
9299 */
9300 - if (error_code & 0x10000000)
9301 + if (error_code & DSISR_GUARDED)
9302 /* Guarded storage error. */
9303 goto bad_area;
9304 #endif /* CONFIG_8xx */
9305 @@ -405,7 +436,7 @@ good_area:
9306 * processors use the same I/D cache coherency mechanism
9307 * as embedded.
9308 */
9309 - if (error_code & DSISR_PROTFAULT)
9310 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9311 goto bad_area;
9312 #endif /* CONFIG_PPC_STD_MMU */
9313
9314 @@ -495,6 +526,23 @@ bad_area:
9315 bad_area_nosemaphore:
9316 /* User mode accesses cause a SIGSEGV */
9317 if (user_mode(regs)) {
9318 +
9319 +#ifdef CONFIG_PAX_PAGEEXEC
9320 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9321 +#ifdef CONFIG_PPC_STD_MMU
9322 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9323 +#else
9324 + if (is_exec && regs->nip == address) {
9325 +#endif
9326 + switch (pax_handle_fetch_fault(regs)) {
9327 + }
9328 +
9329 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9330 + do_group_exit(SIGKILL);
9331 + }
9332 + }
9333 +#endif
9334 +
9335 _exception(SIGSEGV, regs, code, address);
9336 goto bail;
9337 }
9338 diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9339 index cb8bdbe..cde4bc7 100644
9340 --- a/arch/powerpc/mm/mmap.c
9341 +++ b/arch/powerpc/mm/mmap.c
9342 @@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9343 return sysctl_legacy_va_layout;
9344 }
9345
9346 -static unsigned long mmap_rnd(void)
9347 +static unsigned long mmap_rnd(struct mm_struct *mm)
9348 {
9349 unsigned long rnd = 0;
9350
9351 +#ifdef CONFIG_PAX_RANDMMAP
9352 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9353 +#endif
9354 +
9355 if (current->flags & PF_RANDOMIZE) {
9356 /* 8MB for 32bit, 1GB for 64bit */
9357 if (is_32bit_task())
9358 @@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9359 return rnd << PAGE_SHIFT;
9360 }
9361
9362 -static inline unsigned long mmap_base(void)
9363 +static inline unsigned long mmap_base(struct mm_struct *mm)
9364 {
9365 unsigned long gap = rlimit(RLIMIT_STACK);
9366
9367 @@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9368 else if (gap > MAX_GAP)
9369 gap = MAX_GAP;
9370
9371 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9372 + return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9373 }
9374
9375 /*
9376 @@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9377 */
9378 if (mmap_is_legacy()) {
9379 mm->mmap_base = TASK_UNMAPPED_BASE;
9380 +
9381 +#ifdef CONFIG_PAX_RANDMMAP
9382 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9383 + mm->mmap_base += mm->delta_mmap;
9384 +#endif
9385 +
9386 mm->get_unmapped_area = arch_get_unmapped_area;
9387 } else {
9388 - mm->mmap_base = mmap_base();
9389 + mm->mmap_base = mmap_base(mm);
9390 +
9391 +#ifdef CONFIG_PAX_RANDMMAP
9392 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9393 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9394 +#endif
9395 +
9396 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9397 }
9398 }
9399 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9400 index ded0ea1..f213a9b 100644
9401 --- a/arch/powerpc/mm/slice.c
9402 +++ b/arch/powerpc/mm/slice.c
9403 @@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9404 if ((mm->task_size - len) < addr)
9405 return 0;
9406 vma = find_vma(mm, addr);
9407 - return (!vma || (addr + len) <= vma->vm_start);
9408 + return check_heap_stack_gap(vma, addr, len, 0);
9409 }
9410
9411 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9412 @@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9413 info.align_offset = 0;
9414
9415 addr = TASK_UNMAPPED_BASE;
9416 +
9417 +#ifdef CONFIG_PAX_RANDMMAP
9418 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9419 + addr += mm->delta_mmap;
9420 +#endif
9421 +
9422 while (addr < TASK_SIZE) {
9423 info.low_limit = addr;
9424 if (!slice_scan_available(addr, available, 1, &addr))
9425 @@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9426 if (fixed && addr > (mm->task_size - len))
9427 return -ENOMEM;
9428
9429 +#ifdef CONFIG_PAX_RANDMMAP
9430 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9431 + addr = 0;
9432 +#endif
9433 +
9434 /* If hint, make sure it matches our alignment restrictions */
9435 if (!fixed && addr) {
9436 addr = _ALIGN_UP(addr, 1ul << pshift);
9437 diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9438 index 4278acf..67fd0e6 100644
9439 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9440 +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9441 @@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9442 }
9443
9444 static struct pci_ops scc_pciex_pci_ops = {
9445 - scc_pciex_read_config,
9446 - scc_pciex_write_config,
9447 + .read = scc_pciex_read_config,
9448 + .write = scc_pciex_write_config,
9449 };
9450
9451 static void pciex_clear_intr_all(unsigned int __iomem *base)
9452 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9453 index d966bbe..372124a 100644
9454 --- a/arch/powerpc/platforms/cell/spufs/file.c
9455 +++ b/arch/powerpc/platforms/cell/spufs/file.c
9456 @@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9457 return VM_FAULT_NOPAGE;
9458 }
9459
9460 -static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9461 +static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9462 unsigned long address,
9463 - void *buf, int len, int write)
9464 + void *buf, size_t len, int write)
9465 {
9466 struct spu_context *ctx = vma->vm_file->private_data;
9467 unsigned long offset = address - vma->vm_start;
9468 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9469 index fa934fe..c296056 100644
9470 --- a/arch/s390/include/asm/atomic.h
9471 +++ b/arch/s390/include/asm/atomic.h
9472 @@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9473 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9474 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9475
9476 +#define atomic64_read_unchecked(v) atomic64_read(v)
9477 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9478 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9479 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9480 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9481 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
9482 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9483 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
9484 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9485 +
9486 #endif /* __ARCH_S390_ATOMIC__ */
9487 diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9488 index b5dce65..8aca09a 100644
9489 --- a/arch/s390/include/asm/barrier.h
9490 +++ b/arch/s390/include/asm/barrier.h
9491 @@ -39,7 +39,7 @@
9492 do { \
9493 compiletime_assert_atomic_type(*p); \
9494 barrier(); \
9495 - ACCESS_ONCE(*p) = (v); \
9496 + ACCESS_ONCE_RW(*p) = (v); \
9497 } while (0)
9498
9499 #define smp_load_acquire(p) \
9500 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9501 index 4d7ccac..d03d0ad 100644
9502 --- a/arch/s390/include/asm/cache.h
9503 +++ b/arch/s390/include/asm/cache.h
9504 @@ -9,8 +9,10 @@
9505 #ifndef __ARCH_S390_CACHE_H
9506 #define __ARCH_S390_CACHE_H
9507
9508 -#define L1_CACHE_BYTES 256
9509 +#include <linux/const.h>
9510 +
9511 #define L1_CACHE_SHIFT 8
9512 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9513 #define NET_SKB_PAD 32
9514
9515 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9516 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9517 index f6e43d3..5f57681 100644
9518 --- a/arch/s390/include/asm/elf.h
9519 +++ b/arch/s390/include/asm/elf.h
9520 @@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9521 the loader. We need to make sure that it is out of the way of the program
9522 that it will "exec", and that there is sufficient room for the brk. */
9523
9524 -extern unsigned long randomize_et_dyn(unsigned long base);
9525 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9526 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9527 +
9528 +#ifdef CONFIG_PAX_ASLR
9529 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9530 +
9531 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9532 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9533 +#endif
9534
9535 /* This yields a mask that user programs can use to figure out what
9536 instruction set this CPU supports. */
9537 @@ -223,9 +229,6 @@ struct linux_binprm;
9538 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9539 int arch_setup_additional_pages(struct linux_binprm *, int);
9540
9541 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9542 -#define arch_randomize_brk arch_randomize_brk
9543 -
9544 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9545
9546 #endif
9547 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9548 index c4a93d6..4d2a9b4 100644
9549 --- a/arch/s390/include/asm/exec.h
9550 +++ b/arch/s390/include/asm/exec.h
9551 @@ -7,6 +7,6 @@
9552 #ifndef __ASM_EXEC_H
9553 #define __ASM_EXEC_H
9554
9555 -extern unsigned long arch_align_stack(unsigned long sp);
9556 +#define arch_align_stack(x) ((x) & ~0xfUL)
9557
9558 #endif /* __ASM_EXEC_H */
9559 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9560 index cd4c68e..6764641 100644
9561 --- a/arch/s390/include/asm/uaccess.h
9562 +++ b/arch/s390/include/asm/uaccess.h
9563 @@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9564 __range_ok((unsigned long)(addr), (size)); \
9565 })
9566
9567 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9568 #define access_ok(type, addr, size) __access_ok(addr, size)
9569
9570 /*
9571 @@ -275,6 +276,10 @@ static inline unsigned long __must_check
9572 copy_to_user(void __user *to, const void *from, unsigned long n)
9573 {
9574 might_fault();
9575 +
9576 + if ((long)n < 0)
9577 + return n;
9578 +
9579 return __copy_to_user(to, from, n);
9580 }
9581
9582 @@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9583 static inline unsigned long __must_check
9584 copy_from_user(void *to, const void __user *from, unsigned long n)
9585 {
9586 - unsigned int sz = __compiletime_object_size(to);
9587 + size_t sz = __compiletime_object_size(to);
9588
9589 might_fault();
9590 - if (unlikely(sz != -1 && sz < n)) {
9591 +
9592 + if ((long)n < 0)
9593 + return n;
9594 +
9595 + if (unlikely(sz != (size_t)-1 && sz < n)) {
9596 copy_from_user_overflow();
9597 return n;
9598 }
9599 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9600 index b89b591..fd9609d 100644
9601 --- a/arch/s390/kernel/module.c
9602 +++ b/arch/s390/kernel/module.c
9603 @@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9604
9605 /* Increase core size by size of got & plt and set start
9606 offsets for got and plt. */
9607 - me->core_size = ALIGN(me->core_size, 4);
9608 - me->arch.got_offset = me->core_size;
9609 - me->core_size += me->arch.got_size;
9610 - me->arch.plt_offset = me->core_size;
9611 - me->core_size += me->arch.plt_size;
9612 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
9613 + me->arch.got_offset = me->core_size_rw;
9614 + me->core_size_rw += me->arch.got_size;
9615 + me->arch.plt_offset = me->core_size_rx;
9616 + me->core_size_rx += me->arch.plt_size;
9617 return 0;
9618 }
9619
9620 @@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9621 if (info->got_initialized == 0) {
9622 Elf_Addr *gotent;
9623
9624 - gotent = me->module_core + me->arch.got_offset +
9625 + gotent = me->module_core_rw + me->arch.got_offset +
9626 info->got_offset;
9627 *gotent = val;
9628 info->got_initialized = 1;
9629 @@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9630 rc = apply_rela_bits(loc, val, 0, 64, 0);
9631 else if (r_type == R_390_GOTENT ||
9632 r_type == R_390_GOTPLTENT) {
9633 - val += (Elf_Addr) me->module_core - loc;
9634 + val += (Elf_Addr) me->module_core_rw - loc;
9635 rc = apply_rela_bits(loc, val, 1, 32, 1);
9636 }
9637 break;
9638 @@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9639 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9640 if (info->plt_initialized == 0) {
9641 unsigned int *ip;
9642 - ip = me->module_core + me->arch.plt_offset +
9643 + ip = me->module_core_rx + me->arch.plt_offset +
9644 info->plt_offset;
9645 #ifndef CONFIG_64BIT
9646 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9647 @@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9648 val - loc + 0xffffUL < 0x1ffffeUL) ||
9649 (r_type == R_390_PLT32DBL &&
9650 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9651 - val = (Elf_Addr) me->module_core +
9652 + val = (Elf_Addr) me->module_core_rx +
9653 me->arch.plt_offset +
9654 info->plt_offset;
9655 val += rela->r_addend - loc;
9656 @@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9657 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9658 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9659 val = val + rela->r_addend -
9660 - ((Elf_Addr) me->module_core + me->arch.got_offset);
9661 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9662 if (r_type == R_390_GOTOFF16)
9663 rc = apply_rela_bits(loc, val, 0, 16, 0);
9664 else if (r_type == R_390_GOTOFF32)
9665 @@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9666 break;
9667 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9668 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9669 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
9670 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9671 rela->r_addend - loc;
9672 if (r_type == R_390_GOTPC)
9673 rc = apply_rela_bits(loc, val, 1, 32, 0);
9674 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9675 index ed84cc2..c05a9d2 100644
9676 --- a/arch/s390/kernel/process.c
9677 +++ b/arch/s390/kernel/process.c
9678 @@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
9679 }
9680 return 0;
9681 }
9682 -
9683 -unsigned long arch_align_stack(unsigned long sp)
9684 -{
9685 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9686 - sp -= get_random_int() & ~PAGE_MASK;
9687 - return sp & ~0xf;
9688 -}
9689 -
9690 -static inline unsigned long brk_rnd(void)
9691 -{
9692 - /* 8MB for 32bit, 1GB for 64bit */
9693 - if (is_32bit_task())
9694 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9695 - else
9696 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9697 -}
9698 -
9699 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9700 -{
9701 - unsigned long ret;
9702 -
9703 - ret = PAGE_ALIGN(mm->brk + brk_rnd());
9704 - return (ret > mm->brk) ? ret : mm->brk;
9705 -}
9706 -
9707 -unsigned long randomize_et_dyn(unsigned long base)
9708 -{
9709 - unsigned long ret;
9710 -
9711 - if (!(current->flags & PF_RANDOMIZE))
9712 - return base;
9713 - ret = PAGE_ALIGN(base + brk_rnd());
9714 - return (ret > base) ? ret : base;
9715 -}
9716 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9717 index 9b436c2..54fbf0a 100644
9718 --- a/arch/s390/mm/mmap.c
9719 +++ b/arch/s390/mm/mmap.c
9720 @@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9721 */
9722 if (mmap_is_legacy()) {
9723 mm->mmap_base = mmap_base_legacy();
9724 +
9725 +#ifdef CONFIG_PAX_RANDMMAP
9726 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9727 + mm->mmap_base += mm->delta_mmap;
9728 +#endif
9729 +
9730 mm->get_unmapped_area = arch_get_unmapped_area;
9731 } else {
9732 mm->mmap_base = mmap_base();
9733 +
9734 +#ifdef CONFIG_PAX_RANDMMAP
9735 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9736 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9737 +#endif
9738 +
9739 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9740 }
9741 }
9742 @@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9743 */
9744 if (mmap_is_legacy()) {
9745 mm->mmap_base = mmap_base_legacy();
9746 +
9747 +#ifdef CONFIG_PAX_RANDMMAP
9748 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9749 + mm->mmap_base += mm->delta_mmap;
9750 +#endif
9751 +
9752 mm->get_unmapped_area = s390_get_unmapped_area;
9753 } else {
9754 mm->mmap_base = mmap_base();
9755 +
9756 +#ifdef CONFIG_PAX_RANDMMAP
9757 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9758 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9759 +#endif
9760 +
9761 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9762 }
9763 }
9764 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9765 index ae3d59f..f65f075 100644
9766 --- a/arch/score/include/asm/cache.h
9767 +++ b/arch/score/include/asm/cache.h
9768 @@ -1,7 +1,9 @@
9769 #ifndef _ASM_SCORE_CACHE_H
9770 #define _ASM_SCORE_CACHE_H
9771
9772 +#include <linux/const.h>
9773 +
9774 #define L1_CACHE_SHIFT 4
9775 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9776 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9777
9778 #endif /* _ASM_SCORE_CACHE_H */
9779 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9780 index f9f3cd5..58ff438 100644
9781 --- a/arch/score/include/asm/exec.h
9782 +++ b/arch/score/include/asm/exec.h
9783 @@ -1,6 +1,6 @@
9784 #ifndef _ASM_SCORE_EXEC_H
9785 #define _ASM_SCORE_EXEC_H
9786
9787 -extern unsigned long arch_align_stack(unsigned long sp);
9788 +#define arch_align_stack(x) (x)
9789
9790 #endif /* _ASM_SCORE_EXEC_H */
9791 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9792 index a1519ad3..e8ac1ff 100644
9793 --- a/arch/score/kernel/process.c
9794 +++ b/arch/score/kernel/process.c
9795 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9796
9797 return task_pt_regs(task)->cp0_epc;
9798 }
9799 -
9800 -unsigned long arch_align_stack(unsigned long sp)
9801 -{
9802 - return sp;
9803 -}
9804 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9805 index ef9e555..331bd29 100644
9806 --- a/arch/sh/include/asm/cache.h
9807 +++ b/arch/sh/include/asm/cache.h
9808 @@ -9,10 +9,11 @@
9809 #define __ASM_SH_CACHE_H
9810 #ifdef __KERNEL__
9811
9812 +#include <linux/const.h>
9813 #include <linux/init.h>
9814 #include <cpu/cache.h>
9815
9816 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9817 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9818
9819 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9820
9821 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9822 index 6777177..cb5e44f 100644
9823 --- a/arch/sh/mm/mmap.c
9824 +++ b/arch/sh/mm/mmap.c
9825 @@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9826 struct mm_struct *mm = current->mm;
9827 struct vm_area_struct *vma;
9828 int do_colour_align;
9829 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9830 struct vm_unmapped_area_info info;
9831
9832 if (flags & MAP_FIXED) {
9833 @@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9834 if (filp || (flags & MAP_SHARED))
9835 do_colour_align = 1;
9836
9837 +#ifdef CONFIG_PAX_RANDMMAP
9838 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9839 +#endif
9840 +
9841 if (addr) {
9842 if (do_colour_align)
9843 addr = COLOUR_ALIGN(addr, pgoff);
9844 @@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9845 addr = PAGE_ALIGN(addr);
9846
9847 vma = find_vma(mm, addr);
9848 - if (TASK_SIZE - len >= addr &&
9849 - (!vma || addr + len <= vma->vm_start))
9850 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9851 return addr;
9852 }
9853
9854 info.flags = 0;
9855 info.length = len;
9856 - info.low_limit = TASK_UNMAPPED_BASE;
9857 + info.low_limit = mm->mmap_base;
9858 info.high_limit = TASK_SIZE;
9859 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9860 info.align_offset = pgoff << PAGE_SHIFT;
9861 @@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9862 struct mm_struct *mm = current->mm;
9863 unsigned long addr = addr0;
9864 int do_colour_align;
9865 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9866 struct vm_unmapped_area_info info;
9867
9868 if (flags & MAP_FIXED) {
9869 @@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9870 if (filp || (flags & MAP_SHARED))
9871 do_colour_align = 1;
9872
9873 +#ifdef CONFIG_PAX_RANDMMAP
9874 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9875 +#endif
9876 +
9877 /* requesting a specific address */
9878 if (addr) {
9879 if (do_colour_align)
9880 @@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9881 addr = PAGE_ALIGN(addr);
9882
9883 vma = find_vma(mm, addr);
9884 - if (TASK_SIZE - len >= addr &&
9885 - (!vma || addr + len <= vma->vm_start))
9886 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9887 return addr;
9888 }
9889
9890 @@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9891 VM_BUG_ON(addr != -ENOMEM);
9892 info.flags = 0;
9893 info.low_limit = TASK_UNMAPPED_BASE;
9894 +
9895 +#ifdef CONFIG_PAX_RANDMMAP
9896 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9897 + info.low_limit += mm->delta_mmap;
9898 +#endif
9899 +
9900 info.high_limit = TASK_SIZE;
9901 addr = vm_unmapped_area(&info);
9902 }
9903 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9904 index 4082749..fd97781 100644
9905 --- a/arch/sparc/include/asm/atomic_64.h
9906 +++ b/arch/sparc/include/asm/atomic_64.h
9907 @@ -15,18 +15,38 @@
9908 #define ATOMIC64_INIT(i) { (i) }
9909
9910 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9911 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9912 +{
9913 + return ACCESS_ONCE(v->counter);
9914 +}
9915 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9916 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9917 +{
9918 + return ACCESS_ONCE(v->counter);
9919 +}
9920
9921 #define atomic_set(v, i) (((v)->counter) = i)
9922 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9923 +{
9924 + v->counter = i;
9925 +}
9926 #define atomic64_set(v, i) (((v)->counter) = i)
9927 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9928 +{
9929 + v->counter = i;
9930 +}
9931
9932 -#define ATOMIC_OP(op) \
9933 -void atomic_##op(int, atomic_t *); \
9934 -void atomic64_##op(long, atomic64_t *);
9935 +#define __ATOMIC_OP(op, suffix) \
9936 +void atomic_##op##suffix(int, atomic##suffix##_t *); \
9937 +void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9938
9939 -#define ATOMIC_OP_RETURN(op) \
9940 -int atomic_##op##_return(int, atomic_t *); \
9941 -long atomic64_##op##_return(long, atomic64_t *);
9942 +#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9943 +
9944 +#define __ATOMIC_OP_RETURN(op, suffix) \
9945 +int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9946 +long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9947 +
9948 +#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9949
9950 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9951
9952 @@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9953
9954 #undef ATOMIC_OPS
9955 #undef ATOMIC_OP_RETURN
9956 +#undef __ATOMIC_OP_RETURN
9957 #undef ATOMIC_OP
9958 +#undef __ATOMIC_OP
9959
9960 #define atomic_dec_return(v) atomic_sub_return(1, v)
9961 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9962
9963 #define atomic_inc_return(v) atomic_add_return(1, v)
9964 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9965 +{
9966 + return atomic_add_return_unchecked(1, v);
9967 +}
9968 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9969 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9970 +{
9971 + return atomic64_add_return_unchecked(1, v);
9972 +}
9973
9974 /*
9975 * atomic_inc_and_test - increment and test
9976 @@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9977 * other cases.
9978 */
9979 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9980 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9981 +{
9982 + return atomic_inc_return_unchecked(v) == 0;
9983 +}
9984 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9985
9986 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9987 @@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9988 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9989
9990 #define atomic_inc(v) atomic_add(1, v)
9991 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9992 +{
9993 + atomic_add_unchecked(1, v);
9994 +}
9995 #define atomic64_inc(v) atomic64_add(1, v)
9996 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9997 +{
9998 + atomic64_add_unchecked(1, v);
9999 +}
10000
10001 #define atomic_dec(v) atomic_sub(1, v)
10002 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
10003 +{
10004 + atomic_sub_unchecked(1, v);
10005 +}
10006 #define atomic64_dec(v) atomic64_sub(1, v)
10007 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
10008 +{
10009 + atomic64_sub_unchecked(1, v);
10010 +}
10011
10012 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
10013 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
10014
10015 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
10016 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
10017 +{
10018 + return cmpxchg(&v->counter, old, new);
10019 +}
10020 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10021 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10022 +{
10023 + return xchg(&v->counter, new);
10024 +}
10025
10026 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10027 {
10028 - int c, old;
10029 + int c, old, new;
10030 c = atomic_read(v);
10031 for (;;) {
10032 - if (unlikely(c == (u)))
10033 + if (unlikely(c == u))
10034 break;
10035 - old = atomic_cmpxchg((v), c, c + (a));
10036 +
10037 + asm volatile("addcc %2, %0, %0\n"
10038 +
10039 +#ifdef CONFIG_PAX_REFCOUNT
10040 + "tvs %%icc, 6\n"
10041 +#endif
10042 +
10043 + : "=r" (new)
10044 + : "0" (c), "ir" (a)
10045 + : "cc");
10046 +
10047 + old = atomic_cmpxchg(v, c, new);
10048 if (likely(old == c))
10049 break;
10050 c = old;
10051 @@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10052 #define atomic64_cmpxchg(v, o, n) \
10053 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10054 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10055 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10056 +{
10057 + return xchg(&v->counter, new);
10058 +}
10059
10060 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10061 {
10062 - long c, old;
10063 + long c, old, new;
10064 c = atomic64_read(v);
10065 for (;;) {
10066 - if (unlikely(c == (u)))
10067 + if (unlikely(c == u))
10068 break;
10069 - old = atomic64_cmpxchg((v), c, c + (a));
10070 +
10071 + asm volatile("addcc %2, %0, %0\n"
10072 +
10073 +#ifdef CONFIG_PAX_REFCOUNT
10074 + "tvs %%xcc, 6\n"
10075 +#endif
10076 +
10077 + : "=r" (new)
10078 + : "0" (c), "ir" (a)
10079 + : "cc");
10080 +
10081 + old = atomic64_cmpxchg(v, c, new);
10082 if (likely(old == c))
10083 break;
10084 c = old;
10085 }
10086 - return c != (u);
10087 + return c != u;
10088 }
10089
10090 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10091 diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10092 index 305dcc3..7835030 100644
10093 --- a/arch/sparc/include/asm/barrier_64.h
10094 +++ b/arch/sparc/include/asm/barrier_64.h
10095 @@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10096 do { \
10097 compiletime_assert_atomic_type(*p); \
10098 barrier(); \
10099 - ACCESS_ONCE(*p) = (v); \
10100 + ACCESS_ONCE_RW(*p) = (v); \
10101 } while (0)
10102
10103 #define smp_load_acquire(p) \
10104 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10105 index 5bb6991..5c2132e 100644
10106 --- a/arch/sparc/include/asm/cache.h
10107 +++ b/arch/sparc/include/asm/cache.h
10108 @@ -7,10 +7,12 @@
10109 #ifndef _SPARC_CACHE_H
10110 #define _SPARC_CACHE_H
10111
10112 +#include <linux/const.h>
10113 +
10114 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10115
10116 #define L1_CACHE_SHIFT 5
10117 -#define L1_CACHE_BYTES 32
10118 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10119
10120 #ifdef CONFIG_SPARC32
10121 #define SMP_CACHE_BYTES_SHIFT 5
10122 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10123 index a24e41f..47677ff 100644
10124 --- a/arch/sparc/include/asm/elf_32.h
10125 +++ b/arch/sparc/include/asm/elf_32.h
10126 @@ -114,6 +114,13 @@ typedef struct {
10127
10128 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10129
10130 +#ifdef CONFIG_PAX_ASLR
10131 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
10132 +
10133 +#define PAX_DELTA_MMAP_LEN 16
10134 +#define PAX_DELTA_STACK_LEN 16
10135 +#endif
10136 +
10137 /* This yields a mask that user programs can use to figure out what
10138 instruction set this cpu supports. This can NOT be done in userspace
10139 on Sparc. */
10140 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10141 index 370ca1e..d4f4a98 100644
10142 --- a/arch/sparc/include/asm/elf_64.h
10143 +++ b/arch/sparc/include/asm/elf_64.h
10144 @@ -189,6 +189,13 @@ typedef struct {
10145 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10146 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10147
10148 +#ifdef CONFIG_PAX_ASLR
10149 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10150 +
10151 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10152 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10153 +#endif
10154 +
10155 extern unsigned long sparc64_elf_hwcap;
10156 #define ELF_HWCAP sparc64_elf_hwcap
10157
10158 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10159 index a3890da..f6a408e 100644
10160 --- a/arch/sparc/include/asm/pgalloc_32.h
10161 +++ b/arch/sparc/include/asm/pgalloc_32.h
10162 @@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10163 }
10164
10165 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10166 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10167
10168 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10169 unsigned long address)
10170 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10171 index 5e31871..13469c6 100644
10172 --- a/arch/sparc/include/asm/pgalloc_64.h
10173 +++ b/arch/sparc/include/asm/pgalloc_64.h
10174 @@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10175 }
10176
10177 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10178 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10179
10180 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10181 {
10182 @@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10183 }
10184
10185 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10186 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10187
10188 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10189 {
10190 diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10191 index 59ba6f6..4518128 100644
10192 --- a/arch/sparc/include/asm/pgtable.h
10193 +++ b/arch/sparc/include/asm/pgtable.h
10194 @@ -5,4 +5,8 @@
10195 #else
10196 #include <asm/pgtable_32.h>
10197 #endif
10198 +
10199 +#define ktla_ktva(addr) (addr)
10200 +#define ktva_ktla(addr) (addr)
10201 +
10202 #endif
10203 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10204 index b9b91ae..950b91e 100644
10205 --- a/arch/sparc/include/asm/pgtable_32.h
10206 +++ b/arch/sparc/include/asm/pgtable_32.h
10207 @@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10208 #define PAGE_SHARED SRMMU_PAGE_SHARED
10209 #define PAGE_COPY SRMMU_PAGE_COPY
10210 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10211 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10212 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10213 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10214 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10215
10216 /* Top-level page directory - dummy used by init-mm.
10217 @@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10218
10219 /* xwr */
10220 #define __P000 PAGE_NONE
10221 -#define __P001 PAGE_READONLY
10222 -#define __P010 PAGE_COPY
10223 -#define __P011 PAGE_COPY
10224 +#define __P001 PAGE_READONLY_NOEXEC
10225 +#define __P010 PAGE_COPY_NOEXEC
10226 +#define __P011 PAGE_COPY_NOEXEC
10227 #define __P100 PAGE_READONLY
10228 #define __P101 PAGE_READONLY
10229 #define __P110 PAGE_COPY
10230 #define __P111 PAGE_COPY
10231
10232 #define __S000 PAGE_NONE
10233 -#define __S001 PAGE_READONLY
10234 -#define __S010 PAGE_SHARED
10235 -#define __S011 PAGE_SHARED
10236 +#define __S001 PAGE_READONLY_NOEXEC
10237 +#define __S010 PAGE_SHARED_NOEXEC
10238 +#define __S011 PAGE_SHARED_NOEXEC
10239 #define __S100 PAGE_READONLY
10240 #define __S101 PAGE_READONLY
10241 #define __S110 PAGE_SHARED
10242 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10243 index 79da178..c2eede8 100644
10244 --- a/arch/sparc/include/asm/pgtsrmmu.h
10245 +++ b/arch/sparc/include/asm/pgtsrmmu.h
10246 @@ -115,6 +115,11 @@
10247 SRMMU_EXEC | SRMMU_REF)
10248 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10249 SRMMU_EXEC | SRMMU_REF)
10250 +
10251 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10252 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10253 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10254 +
10255 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10256 SRMMU_DIRTY | SRMMU_REF)
10257
10258 diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10259 index 29d64b1..4272fe8 100644
10260 --- a/arch/sparc/include/asm/setup.h
10261 +++ b/arch/sparc/include/asm/setup.h
10262 @@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10263 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10264
10265 /* init_64.c */
10266 -extern atomic_t dcpage_flushes;
10267 -extern atomic_t dcpage_flushes_xcall;
10268 +extern atomic_unchecked_t dcpage_flushes;
10269 +extern atomic_unchecked_t dcpage_flushes_xcall;
10270
10271 extern int sysctl_tsb_ratio;
10272 #endif
10273 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10274 index 9689176..63c18ea 100644
10275 --- a/arch/sparc/include/asm/spinlock_64.h
10276 +++ b/arch/sparc/include/asm/spinlock_64.h
10277 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10278
10279 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10280
10281 -static void inline arch_read_lock(arch_rwlock_t *lock)
10282 +static inline void arch_read_lock(arch_rwlock_t *lock)
10283 {
10284 unsigned long tmp1, tmp2;
10285
10286 __asm__ __volatile__ (
10287 "1: ldsw [%2], %0\n"
10288 " brlz,pn %0, 2f\n"
10289 -"4: add %0, 1, %1\n"
10290 +"4: addcc %0, 1, %1\n"
10291 +
10292 +#ifdef CONFIG_PAX_REFCOUNT
10293 +" tvs %%icc, 6\n"
10294 +#endif
10295 +
10296 " cas [%2], %0, %1\n"
10297 " cmp %0, %1\n"
10298 " bne,pn %%icc, 1b\n"
10299 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10300 " .previous"
10301 : "=&r" (tmp1), "=&r" (tmp2)
10302 : "r" (lock)
10303 - : "memory");
10304 + : "memory", "cc");
10305 }
10306
10307 -static int inline arch_read_trylock(arch_rwlock_t *lock)
10308 +static inline int arch_read_trylock(arch_rwlock_t *lock)
10309 {
10310 int tmp1, tmp2;
10311
10312 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10313 "1: ldsw [%2], %0\n"
10314 " brlz,a,pn %0, 2f\n"
10315 " mov 0, %0\n"
10316 -" add %0, 1, %1\n"
10317 +" addcc %0, 1, %1\n"
10318 +
10319 +#ifdef CONFIG_PAX_REFCOUNT
10320 +" tvs %%icc, 6\n"
10321 +#endif
10322 +
10323 " cas [%2], %0, %1\n"
10324 " cmp %0, %1\n"
10325 " bne,pn %%icc, 1b\n"
10326 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10327 return tmp1;
10328 }
10329
10330 -static void inline arch_read_unlock(arch_rwlock_t *lock)
10331 +static inline void arch_read_unlock(arch_rwlock_t *lock)
10332 {
10333 unsigned long tmp1, tmp2;
10334
10335 __asm__ __volatile__(
10336 "1: lduw [%2], %0\n"
10337 -" sub %0, 1, %1\n"
10338 +" subcc %0, 1, %1\n"
10339 +
10340 +#ifdef CONFIG_PAX_REFCOUNT
10341 +" tvs %%icc, 6\n"
10342 +#endif
10343 +
10344 " cas [%2], %0, %1\n"
10345 " cmp %0, %1\n"
10346 " bne,pn %%xcc, 1b\n"
10347 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10348 : "memory");
10349 }
10350
10351 -static void inline arch_write_lock(arch_rwlock_t *lock)
10352 +static inline void arch_write_lock(arch_rwlock_t *lock)
10353 {
10354 unsigned long mask, tmp1, tmp2;
10355
10356 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10357 : "memory");
10358 }
10359
10360 -static void inline arch_write_unlock(arch_rwlock_t *lock)
10361 +static inline void arch_write_unlock(arch_rwlock_t *lock)
10362 {
10363 __asm__ __volatile__(
10364 " stw %%g0, [%0]"
10365 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10366 : "memory");
10367 }
10368
10369 -static int inline arch_write_trylock(arch_rwlock_t *lock)
10370 +static inline int arch_write_trylock(arch_rwlock_t *lock)
10371 {
10372 unsigned long mask, tmp1, tmp2, result;
10373
10374 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10375 index 025c984..a216504 100644
10376 --- a/arch/sparc/include/asm/thread_info_32.h
10377 +++ b/arch/sparc/include/asm/thread_info_32.h
10378 @@ -49,6 +49,8 @@ struct thread_info {
10379 unsigned long w_saved;
10380
10381 struct restart_block restart_block;
10382 +
10383 + unsigned long lowest_stack;
10384 };
10385
10386 /*
10387 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10388 index 798f027..b009941 100644
10389 --- a/arch/sparc/include/asm/thread_info_64.h
10390 +++ b/arch/sparc/include/asm/thread_info_64.h
10391 @@ -63,6 +63,8 @@ struct thread_info {
10392 struct pt_regs *kern_una_regs;
10393 unsigned int kern_una_insn;
10394
10395 + unsigned long lowest_stack;
10396 +
10397 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10398 __attribute__ ((aligned(64)));
10399 };
10400 @@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10401 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10402 /* flag bit 4 is available */
10403 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10404 -/* flag bit 6 is available */
10405 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10406 #define TIF_32BIT 7 /* 32-bit binary */
10407 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10408 #define TIF_SECCOMP 9 /* secure computing */
10409 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10410 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10411 +
10412 /* NOTE: Thread flags >= 12 should be ones we have no interest
10413 * in using in assembly, else we can't use the mask as
10414 * an immediate value in instructions such as andcc.
10415 @@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10416 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10417 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10418 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10419 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10420
10421 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10422 _TIF_DO_NOTIFY_RESUME_MASK | \
10423 _TIF_NEED_RESCHED)
10424 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10425
10426 +#define _TIF_WORK_SYSCALL \
10427 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10428 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10429 +
10430 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10431
10432 /*
10433 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10434 index bd56c28..4b63d83 100644
10435 --- a/arch/sparc/include/asm/uaccess.h
10436 +++ b/arch/sparc/include/asm/uaccess.h
10437 @@ -1,5 +1,6 @@
10438 #ifndef ___ASM_SPARC_UACCESS_H
10439 #define ___ASM_SPARC_UACCESS_H
10440 +
10441 #if defined(__sparc__) && defined(__arch64__)
10442 #include <asm/uaccess_64.h>
10443 #else
10444 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10445 index 9634d08..f55fe4f 100644
10446 --- a/arch/sparc/include/asm/uaccess_32.h
10447 +++ b/arch/sparc/include/asm/uaccess_32.h
10448 @@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10449
10450 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10451 {
10452 - if (n && __access_ok((unsigned long) to, n))
10453 + if ((long)n < 0)
10454 + return n;
10455 +
10456 + if (n && __access_ok((unsigned long) to, n)) {
10457 + if (!__builtin_constant_p(n))
10458 + check_object_size(from, n, true);
10459 return __copy_user(to, (__force void __user *) from, n);
10460 - else
10461 + } else
10462 return n;
10463 }
10464
10465 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10466 {
10467 + if ((long)n < 0)
10468 + return n;
10469 +
10470 + if (!__builtin_constant_p(n))
10471 + check_object_size(from, n, true);
10472 +
10473 return __copy_user(to, (__force void __user *) from, n);
10474 }
10475
10476 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10477 {
10478 - if (n && __access_ok((unsigned long) from, n))
10479 + if ((long)n < 0)
10480 + return n;
10481 +
10482 + if (n && __access_ok((unsigned long) from, n)) {
10483 + if (!__builtin_constant_p(n))
10484 + check_object_size(to, n, false);
10485 return __copy_user((__force void __user *) to, from, n);
10486 - else
10487 + } else
10488 return n;
10489 }
10490
10491 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10492 {
10493 + if ((long)n < 0)
10494 + return n;
10495 +
10496 return __copy_user((__force void __user *) to, from, n);
10497 }
10498
10499 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10500 index c990a5e..f17b9c1 100644
10501 --- a/arch/sparc/include/asm/uaccess_64.h
10502 +++ b/arch/sparc/include/asm/uaccess_64.h
10503 @@ -10,6 +10,7 @@
10504 #include <linux/compiler.h>
10505 #include <linux/string.h>
10506 #include <linux/thread_info.h>
10507 +#include <linux/kernel.h>
10508 #include <asm/asi.h>
10509 #include <asm/spitfire.h>
10510 #include <asm-generic/uaccess-unaligned.h>
10511 @@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10512 static inline unsigned long __must_check
10513 copy_from_user(void *to, const void __user *from, unsigned long size)
10514 {
10515 - unsigned long ret = ___copy_from_user(to, from, size);
10516 + unsigned long ret;
10517
10518 + if ((long)size < 0 || size > INT_MAX)
10519 + return size;
10520 +
10521 + if (!__builtin_constant_p(size))
10522 + check_object_size(to, size, false);
10523 +
10524 + ret = ___copy_from_user(to, from, size);
10525 if (unlikely(ret))
10526 ret = copy_from_user_fixup(to, from, size);
10527
10528 @@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10529 static inline unsigned long __must_check
10530 copy_to_user(void __user *to, const void *from, unsigned long size)
10531 {
10532 - unsigned long ret = ___copy_to_user(to, from, size);
10533 + unsigned long ret;
10534
10535 + if ((long)size < 0 || size > INT_MAX)
10536 + return size;
10537 +
10538 + if (!__builtin_constant_p(size))
10539 + check_object_size(from, size, true);
10540 +
10541 + ret = ___copy_to_user(to, from, size);
10542 if (unlikely(ret))
10543 ret = copy_to_user_fixup(to, from, size);
10544 return ret;
10545 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10546 index 7cf9c6e..6206648 100644
10547 --- a/arch/sparc/kernel/Makefile
10548 +++ b/arch/sparc/kernel/Makefile
10549 @@ -4,7 +4,7 @@
10550 #
10551
10552 asflags-y := -ansi
10553 -ccflags-y := -Werror
10554 +#ccflags-y := -Werror
10555
10556 extra-y := head_$(BITS).o
10557
10558 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10559 index 50e7b62..79fae35 100644
10560 --- a/arch/sparc/kernel/process_32.c
10561 +++ b/arch/sparc/kernel/process_32.c
10562 @@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10563
10564 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10565 r->psr, r->pc, r->npc, r->y, print_tainted());
10566 - printk("PC: <%pS>\n", (void *) r->pc);
10567 + printk("PC: <%pA>\n", (void *) r->pc);
10568 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10569 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10570 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10571 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10572 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10573 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10574 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10575 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10576
10577 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10578 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10579 @@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10580 rw = (struct reg_window32 *) fp;
10581 pc = rw->ins[7];
10582 printk("[%08lx : ", pc);
10583 - printk("%pS ] ", (void *) pc);
10584 + printk("%pA ] ", (void *) pc);
10585 fp = rw->ins[6];
10586 } while (++count < 16);
10587 printk("\n");
10588 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10589 index 0be7bf9..2b1cba8 100644
10590 --- a/arch/sparc/kernel/process_64.c
10591 +++ b/arch/sparc/kernel/process_64.c
10592 @@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10593 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10594 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10595 if (regs->tstate & TSTATE_PRIV)
10596 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10597 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10598 }
10599
10600 void show_regs(struct pt_regs *regs)
10601 @@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10602
10603 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10604 regs->tpc, regs->tnpc, regs->y, print_tainted());
10605 - printk("TPC: <%pS>\n", (void *) regs->tpc);
10606 + printk("TPC: <%pA>\n", (void *) regs->tpc);
10607 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10608 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10609 regs->u_regs[3]);
10610 @@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10611 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10612 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10613 regs->u_regs[15]);
10614 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10615 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10616 show_regwindow(regs);
10617 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10618 }
10619 @@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10620 ((tp && tp->task) ? tp->task->pid : -1));
10621
10622 if (gp->tstate & TSTATE_PRIV) {
10623 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10624 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10625 (void *) gp->tpc,
10626 (void *) gp->o7,
10627 (void *) gp->i7,
10628 diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10629 index 79cc0d1..ec62734 100644
10630 --- a/arch/sparc/kernel/prom_common.c
10631 +++ b/arch/sparc/kernel/prom_common.c
10632 @@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10633
10634 unsigned int prom_early_allocated __initdata;
10635
10636 -static struct of_pdt_ops prom_sparc_ops __initdata = {
10637 +static struct of_pdt_ops prom_sparc_ops __initconst = {
10638 .nextprop = prom_common_nextprop,
10639 .getproplen = prom_getproplen,
10640 .getproperty = prom_getproperty,
10641 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10642 index 9ddc492..27a5619 100644
10643 --- a/arch/sparc/kernel/ptrace_64.c
10644 +++ b/arch/sparc/kernel/ptrace_64.c
10645 @@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10646 return ret;
10647 }
10648
10649 +#ifdef CONFIG_GRKERNSEC_SETXID
10650 +extern void gr_delayed_cred_worker(void);
10651 +#endif
10652 +
10653 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10654 {
10655 int ret = 0;
10656 @@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10657 if (test_thread_flag(TIF_NOHZ))
10658 user_exit();
10659
10660 +#ifdef CONFIG_GRKERNSEC_SETXID
10661 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10662 + gr_delayed_cred_worker();
10663 +#endif
10664 +
10665 if (test_thread_flag(TIF_SYSCALL_TRACE))
10666 ret = tracehook_report_syscall_entry(regs);
10667
10668 @@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10669 if (test_thread_flag(TIF_NOHZ))
10670 user_exit();
10671
10672 +#ifdef CONFIG_GRKERNSEC_SETXID
10673 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10674 + gr_delayed_cred_worker();
10675 +#endif
10676 +
10677 audit_syscall_exit(regs);
10678
10679 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10680 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10681 index da6f1a7..e5dea8f 100644
10682 --- a/arch/sparc/kernel/smp_64.c
10683 +++ b/arch/sparc/kernel/smp_64.c
10684 @@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10685 return;
10686
10687 #ifdef CONFIG_DEBUG_DCFLUSH
10688 - atomic_inc(&dcpage_flushes);
10689 + atomic_inc_unchecked(&dcpage_flushes);
10690 #endif
10691
10692 this_cpu = get_cpu();
10693 @@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10694 xcall_deliver(data0, __pa(pg_addr),
10695 (u64) pg_addr, cpumask_of(cpu));
10696 #ifdef CONFIG_DEBUG_DCFLUSH
10697 - atomic_inc(&dcpage_flushes_xcall);
10698 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10699 #endif
10700 }
10701 }
10702 @@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10703 preempt_disable();
10704
10705 #ifdef CONFIG_DEBUG_DCFLUSH
10706 - atomic_inc(&dcpage_flushes);
10707 + atomic_inc_unchecked(&dcpage_flushes);
10708 #endif
10709 data0 = 0;
10710 pg_addr = page_address(page);
10711 @@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10712 xcall_deliver(data0, __pa(pg_addr),
10713 (u64) pg_addr, cpu_online_mask);
10714 #ifdef CONFIG_DEBUG_DCFLUSH
10715 - atomic_inc(&dcpage_flushes_xcall);
10716 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10717 #endif
10718 }
10719 __local_flush_dcache_page(page);
10720 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10721 index 646988d..b88905f 100644
10722 --- a/arch/sparc/kernel/sys_sparc_32.c
10723 +++ b/arch/sparc/kernel/sys_sparc_32.c
10724 @@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10725 if (len > TASK_SIZE - PAGE_SIZE)
10726 return -ENOMEM;
10727 if (!addr)
10728 - addr = TASK_UNMAPPED_BASE;
10729 + addr = current->mm->mmap_base;
10730
10731 info.flags = 0;
10732 info.length = len;
10733 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10734 index c85403d..6af95c9 100644
10735 --- a/arch/sparc/kernel/sys_sparc_64.c
10736 +++ b/arch/sparc/kernel/sys_sparc_64.c
10737 @@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10738 struct vm_area_struct * vma;
10739 unsigned long task_size = TASK_SIZE;
10740 int do_color_align;
10741 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10742 struct vm_unmapped_area_info info;
10743
10744 if (flags & MAP_FIXED) {
10745 /* We do not accept a shared mapping if it would violate
10746 * cache aliasing constraints.
10747 */
10748 - if ((flags & MAP_SHARED) &&
10749 + if ((filp || (flags & MAP_SHARED)) &&
10750 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10751 return -EINVAL;
10752 return addr;
10753 @@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10754 if (filp || (flags & MAP_SHARED))
10755 do_color_align = 1;
10756
10757 +#ifdef CONFIG_PAX_RANDMMAP
10758 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10759 +#endif
10760 +
10761 if (addr) {
10762 if (do_color_align)
10763 addr = COLOR_ALIGN(addr, pgoff);
10764 @@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10765 addr = PAGE_ALIGN(addr);
10766
10767 vma = find_vma(mm, addr);
10768 - if (task_size - len >= addr &&
10769 - (!vma || addr + len <= vma->vm_start))
10770 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10771 return addr;
10772 }
10773
10774 info.flags = 0;
10775 info.length = len;
10776 - info.low_limit = TASK_UNMAPPED_BASE;
10777 + info.low_limit = mm->mmap_base;
10778 info.high_limit = min(task_size, VA_EXCLUDE_START);
10779 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10780 info.align_offset = pgoff << PAGE_SHIFT;
10781 + info.threadstack_offset = offset;
10782 addr = vm_unmapped_area(&info);
10783
10784 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10785 VM_BUG_ON(addr != -ENOMEM);
10786 info.low_limit = VA_EXCLUDE_END;
10787 +
10788 +#ifdef CONFIG_PAX_RANDMMAP
10789 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10790 + info.low_limit += mm->delta_mmap;
10791 +#endif
10792 +
10793 info.high_limit = task_size;
10794 addr = vm_unmapped_area(&info);
10795 }
10796 @@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10797 unsigned long task_size = STACK_TOP32;
10798 unsigned long addr = addr0;
10799 int do_color_align;
10800 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10801 struct vm_unmapped_area_info info;
10802
10803 /* This should only ever run for 32-bit processes. */
10804 @@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10805 /* We do not accept a shared mapping if it would violate
10806 * cache aliasing constraints.
10807 */
10808 - if ((flags & MAP_SHARED) &&
10809 + if ((filp || (flags & MAP_SHARED)) &&
10810 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10811 return -EINVAL;
10812 return addr;
10813 @@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10814 if (filp || (flags & MAP_SHARED))
10815 do_color_align = 1;
10816
10817 +#ifdef CONFIG_PAX_RANDMMAP
10818 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10819 +#endif
10820 +
10821 /* requesting a specific address */
10822 if (addr) {
10823 if (do_color_align)
10824 @@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10825 addr = PAGE_ALIGN(addr);
10826
10827 vma = find_vma(mm, addr);
10828 - if (task_size - len >= addr &&
10829 - (!vma || addr + len <= vma->vm_start))
10830 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10831 return addr;
10832 }
10833
10834 @@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10835 info.high_limit = mm->mmap_base;
10836 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10837 info.align_offset = pgoff << PAGE_SHIFT;
10838 + info.threadstack_offset = offset;
10839 addr = vm_unmapped_area(&info);
10840
10841 /*
10842 @@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10843 VM_BUG_ON(addr != -ENOMEM);
10844 info.flags = 0;
10845 info.low_limit = TASK_UNMAPPED_BASE;
10846 +
10847 +#ifdef CONFIG_PAX_RANDMMAP
10848 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10849 + info.low_limit += mm->delta_mmap;
10850 +#endif
10851 +
10852 info.high_limit = STACK_TOP32;
10853 addr = vm_unmapped_area(&info);
10854 }
10855 @@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10856 EXPORT_SYMBOL(get_fb_unmapped_area);
10857
10858 /* Essentially the same as PowerPC. */
10859 -static unsigned long mmap_rnd(void)
10860 +static unsigned long mmap_rnd(struct mm_struct *mm)
10861 {
10862 unsigned long rnd = 0UL;
10863
10864 +#ifdef CONFIG_PAX_RANDMMAP
10865 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10866 +#endif
10867 +
10868 if (current->flags & PF_RANDOMIZE) {
10869 unsigned long val = get_random_int();
10870 if (test_thread_flag(TIF_32BIT))
10871 @@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10872
10873 void arch_pick_mmap_layout(struct mm_struct *mm)
10874 {
10875 - unsigned long random_factor = mmap_rnd();
10876 + unsigned long random_factor = mmap_rnd(mm);
10877 unsigned long gap;
10878
10879 /*
10880 @@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10881 gap == RLIM_INFINITY ||
10882 sysctl_legacy_va_layout) {
10883 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10884 +
10885 +#ifdef CONFIG_PAX_RANDMMAP
10886 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10887 + mm->mmap_base += mm->delta_mmap;
10888 +#endif
10889 +
10890 mm->get_unmapped_area = arch_get_unmapped_area;
10891 } else {
10892 /* We know it's 32-bit */
10893 @@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10894 gap = (task_size / 6 * 5);
10895
10896 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10897 +
10898 +#ifdef CONFIG_PAX_RANDMMAP
10899 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10900 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10901 +#endif
10902 +
10903 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10904 }
10905 }
10906 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10907 index 33a17e7..d87fb1f 100644
10908 --- a/arch/sparc/kernel/syscalls.S
10909 +++ b/arch/sparc/kernel/syscalls.S
10910 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10911 #endif
10912 .align 32
10913 1: ldx [%g6 + TI_FLAGS], %l5
10914 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10915 + andcc %l5, _TIF_WORK_SYSCALL, %g0
10916 be,pt %icc, rtrap
10917 nop
10918 call syscall_trace_leave
10919 @@ -184,7 +184,7 @@ linux_sparc_syscall32:
10920
10921 srl %i3, 0, %o3 ! IEU0
10922 srl %i2, 0, %o2 ! IEU0 Group
10923 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10924 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10925 bne,pn %icc, linux_syscall_trace32 ! CTI
10926 mov %i0, %l5 ! IEU1
10927 5: call %l7 ! CTI Group brk forced
10928 @@ -208,7 +208,7 @@ linux_sparc_syscall:
10929
10930 mov %i3, %o3 ! IEU1
10931 mov %i4, %o4 ! IEU0 Group
10932 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10933 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10934 bne,pn %icc, linux_syscall_trace ! CTI Group
10935 mov %i0, %l5 ! IEU0
10936 2: call %l7 ! CTI Group brk forced
10937 @@ -223,7 +223,7 @@ ret_sys_call:
10938
10939 cmp %o0, -ERESTART_RESTARTBLOCK
10940 bgeu,pn %xcc, 1f
10941 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10942 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10943 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10944
10945 2:
10946 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10947 index 6fd386c5..6907d81 100644
10948 --- a/arch/sparc/kernel/traps_32.c
10949 +++ b/arch/sparc/kernel/traps_32.c
10950 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10951 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10952 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10953
10954 +extern void gr_handle_kernel_exploit(void);
10955 +
10956 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10957 {
10958 static int die_counter;
10959 @@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10960 count++ < 30 &&
10961 (((unsigned long) rw) >= PAGE_OFFSET) &&
10962 !(((unsigned long) rw) & 0x7)) {
10963 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
10964 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
10965 (void *) rw->ins[7]);
10966 rw = (struct reg_window32 *)rw->ins[6];
10967 }
10968 }
10969 printk("Instruction DUMP:");
10970 instruction_dump ((unsigned long *) regs->pc);
10971 - if(regs->psr & PSR_PS)
10972 + if(regs->psr & PSR_PS) {
10973 + gr_handle_kernel_exploit();
10974 do_exit(SIGKILL);
10975 + }
10976 do_exit(SIGSEGV);
10977 }
10978
10979 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10980 index 981a769..d906eda 100644
10981 --- a/arch/sparc/kernel/traps_64.c
10982 +++ b/arch/sparc/kernel/traps_64.c
10983 @@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10984 i + 1,
10985 p->trapstack[i].tstate, p->trapstack[i].tpc,
10986 p->trapstack[i].tnpc, p->trapstack[i].tt);
10987 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10988 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10989 }
10990 }
10991
10992 @@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10993
10994 lvl -= 0x100;
10995 if (regs->tstate & TSTATE_PRIV) {
10996 +
10997 +#ifdef CONFIG_PAX_REFCOUNT
10998 + if (lvl == 6)
10999 + pax_report_refcount_overflow(regs);
11000 +#endif
11001 +
11002 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11003 die_if_kernel(buffer, regs);
11004 }
11005 @@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11006 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11007 {
11008 char buffer[32];
11009 -
11010 +
11011 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11012 0, lvl, SIGTRAP) == NOTIFY_STOP)
11013 return;
11014
11015 +#ifdef CONFIG_PAX_REFCOUNT
11016 + if (lvl == 6)
11017 + pax_report_refcount_overflow(regs);
11018 +#endif
11019 +
11020 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11021
11022 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11023 @@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11024 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11025 printk("%s" "ERROR(%d): ",
11026 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11027 - printk("TPC<%pS>\n", (void *) regs->tpc);
11028 + printk("TPC<%pA>\n", (void *) regs->tpc);
11029 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11030 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11031 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11032 @@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11033 smp_processor_id(),
11034 (type & 0x1) ? 'I' : 'D',
11035 regs->tpc);
11036 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11037 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11038 panic("Irrecoverable Cheetah+ parity error.");
11039 }
11040
11041 @@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11042 smp_processor_id(),
11043 (type & 0x1) ? 'I' : 'D',
11044 regs->tpc);
11045 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11046 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11047 }
11048
11049 struct sun4v_error_entry {
11050 @@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11051 /*0x38*/u64 reserved_5;
11052 };
11053
11054 -static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11055 -static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11056 +static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11057 +static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11058
11059 static const char *sun4v_err_type_to_str(u8 type)
11060 {
11061 @@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11062 }
11063
11064 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11065 - int cpu, const char *pfx, atomic_t *ocnt)
11066 + int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11067 {
11068 u64 *raw_ptr = (u64 *) ent;
11069 u32 attrs;
11070 @@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11071
11072 show_regs(regs);
11073
11074 - if ((cnt = atomic_read(ocnt)) != 0) {
11075 - atomic_set(ocnt, 0);
11076 + if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11077 + atomic_set_unchecked(ocnt, 0);
11078 wmb();
11079 printk("%s: Queue overflowed %d times.\n",
11080 pfx, cnt);
11081 @@ -2048,7 +2059,7 @@ out:
11082 */
11083 void sun4v_resum_overflow(struct pt_regs *regs)
11084 {
11085 - atomic_inc(&sun4v_resum_oflow_cnt);
11086 + atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11087 }
11088
11089 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11090 @@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11091 /* XXX Actually even this can make not that much sense. Perhaps
11092 * XXX we should just pull the plug and panic directly from here?
11093 */
11094 - atomic_inc(&sun4v_nonresum_oflow_cnt);
11095 + atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11096 }
11097
11098 static void sun4v_tlb_error(struct pt_regs *regs)
11099 @@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11100
11101 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11102 regs->tpc, tl);
11103 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11104 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11105 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11106 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11107 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11108 (void *) regs->u_regs[UREG_I7]);
11109 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11110 "pte[%lx] error[%lx]\n",
11111 @@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11112
11113 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11114 regs->tpc, tl);
11115 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11116 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11117 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11118 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11119 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11120 (void *) regs->u_regs[UREG_I7]);
11121 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11122 "pte[%lx] error[%lx]\n",
11123 @@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11124 fp = (unsigned long)sf->fp + STACK_BIAS;
11125 }
11126
11127 - printk(" [%016lx] %pS\n", pc, (void *) pc);
11128 + printk(" [%016lx] %pA\n", pc, (void *) pc);
11129 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11130 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11131 int index = tsk->curr_ret_stack;
11132 if (tsk->ret_stack && index >= graph) {
11133 pc = tsk->ret_stack[index - graph].ret;
11134 - printk(" [%016lx] %pS\n", pc, (void *) pc);
11135 + printk(" [%016lx] %pA\n", pc, (void *) pc);
11136 graph++;
11137 }
11138 }
11139 @@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11140 return (struct reg_window *) (fp + STACK_BIAS);
11141 }
11142
11143 +extern void gr_handle_kernel_exploit(void);
11144 +
11145 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11146 {
11147 static int die_counter;
11148 @@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11149 while (rw &&
11150 count++ < 30 &&
11151 kstack_valid(tp, (unsigned long) rw)) {
11152 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
11153 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
11154 (void *) rw->ins[7]);
11155
11156 rw = kernel_stack_up(rw);
11157 @@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11158 }
11159 user_instruction_dump ((unsigned int __user *) regs->tpc);
11160 }
11161 - if (regs->tstate & TSTATE_PRIV)
11162 + if (regs->tstate & TSTATE_PRIV) {
11163 + gr_handle_kernel_exploit();
11164 do_exit(SIGKILL);
11165 + }
11166 do_exit(SIGSEGV);
11167 }
11168 EXPORT_SYMBOL(die_if_kernel);
11169 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11170 index 62098a8..547ab2c 100644
11171 --- a/arch/sparc/kernel/unaligned_64.c
11172 +++ b/arch/sparc/kernel/unaligned_64.c
11173 @@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11174 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11175
11176 if (__ratelimit(&ratelimit)) {
11177 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
11178 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
11179 regs->tpc, (void *) regs->tpc);
11180 }
11181 }
11182 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11183 index 3269b02..64f5231 100644
11184 --- a/arch/sparc/lib/Makefile
11185 +++ b/arch/sparc/lib/Makefile
11186 @@ -2,7 +2,7 @@
11187 #
11188
11189 asflags-y := -ansi -DST_DIV0=0x02
11190 -ccflags-y := -Werror
11191 +#ccflags-y := -Werror
11192
11193 lib-$(CONFIG_SPARC32) += ashrdi3.o
11194 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11195 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11196 index 05dac43..76f8ed4 100644
11197 --- a/arch/sparc/lib/atomic_64.S
11198 +++ b/arch/sparc/lib/atomic_64.S
11199 @@ -15,11 +15,22 @@
11200 * a value and does the barriers.
11201 */
11202
11203 -#define ATOMIC_OP(op) \
11204 -ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11205 +#ifdef CONFIG_PAX_REFCOUNT
11206 +#define __REFCOUNT_OP(op) op##cc
11207 +#define __OVERFLOW_IOP tvs %icc, 6;
11208 +#define __OVERFLOW_XOP tvs %xcc, 6;
11209 +#else
11210 +#define __REFCOUNT_OP(op) op
11211 +#define __OVERFLOW_IOP
11212 +#define __OVERFLOW_XOP
11213 +#endif
11214 +
11215 +#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11216 +ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11217 BACKOFF_SETUP(%o2); \
11218 1: lduw [%o1], %g1; \
11219 - op %g1, %o0, %g7; \
11220 + asm_op %g1, %o0, %g7; \
11221 + post_op \
11222 cas [%o1], %g1, %g7; \
11223 cmp %g1, %g7; \
11224 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11225 @@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11226 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11227 ENDPROC(atomic_##op); \
11228
11229 -#define ATOMIC_OP_RETURN(op) \
11230 -ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11231 +#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11232 + __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11233 +
11234 +#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11235 +ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11236 BACKOFF_SETUP(%o2); \
11237 1: lduw [%o1], %g1; \
11238 - op %g1, %o0, %g7; \
11239 + asm_op %g1, %o0, %g7; \
11240 + post_op \
11241 cas [%o1], %g1, %g7; \
11242 cmp %g1, %g7; \
11243 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11244 @@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11245 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11246 ENDPROC(atomic_##op##_return);
11247
11248 +#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11249 + __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11250 +
11251 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11252
11253 ATOMIC_OPS(add)
11254 @@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11255
11256 #undef ATOMIC_OPS
11257 #undef ATOMIC_OP_RETURN
11258 +#undef __ATOMIC_OP_RETURN
11259 #undef ATOMIC_OP
11260 +#undef __ATOMIC_OP
11261
11262 -#define ATOMIC64_OP(op) \
11263 -ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11264 +#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11265 +ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11266 BACKOFF_SETUP(%o2); \
11267 1: ldx [%o1], %g1; \
11268 - op %g1, %o0, %g7; \
11269 + asm_op %g1, %o0, %g7; \
11270 + post_op \
11271 casx [%o1], %g1, %g7; \
11272 cmp %g1, %g7; \
11273 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11274 @@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11275 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11276 ENDPROC(atomic64_##op); \
11277
11278 -#define ATOMIC64_OP_RETURN(op) \
11279 -ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11280 +#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11281 + __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11282 +
11283 +#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11284 +ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11285 BACKOFF_SETUP(%o2); \
11286 1: ldx [%o1], %g1; \
11287 - op %g1, %o0, %g7; \
11288 + asm_op %g1, %o0, %g7; \
11289 + post_op \
11290 casx [%o1], %g1, %g7; \
11291 cmp %g1, %g7; \
11292 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11293 @@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11294 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11295 ENDPROC(atomic64_##op##_return);
11296
11297 +#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11298 +i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11299 +
11300 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11301
11302 ATOMIC64_OPS(add)
11303 @@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11304
11305 #undef ATOMIC64_OPS
11306 #undef ATOMIC64_OP_RETURN
11307 +#undef __ATOMIC64_OP_RETURN
11308 #undef ATOMIC64_OP
11309 +#undef __ATOMIC64_OP
11310 +#undef __OVERFLOW_XOP
11311 +#undef __OVERFLOW_IOP
11312 +#undef __REFCOUNT_OP
11313
11314 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11315 BACKOFF_SETUP(%o2)
11316 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11317 index 1d649a9..fbc5bfc 100644
11318 --- a/arch/sparc/lib/ksyms.c
11319 +++ b/arch/sparc/lib/ksyms.c
11320 @@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11321 /* Atomic counter implementation. */
11322 #define ATOMIC_OP(op) \
11323 EXPORT_SYMBOL(atomic_##op); \
11324 -EXPORT_SYMBOL(atomic64_##op);
11325 +EXPORT_SYMBOL(atomic_##op##_unchecked); \
11326 +EXPORT_SYMBOL(atomic64_##op); \
11327 +EXPORT_SYMBOL(atomic64_##op##_unchecked);
11328
11329 #define ATOMIC_OP_RETURN(op) \
11330 EXPORT_SYMBOL(atomic_##op##_return); \
11331 @@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11332 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11333
11334 ATOMIC_OPS(add)
11335 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
11336 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11337 ATOMIC_OPS(sub)
11338
11339 #undef ATOMIC_OPS
11340 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11341 index 30c3ecc..736f015 100644
11342 --- a/arch/sparc/mm/Makefile
11343 +++ b/arch/sparc/mm/Makefile
11344 @@ -2,7 +2,7 @@
11345 #
11346
11347 asflags-y := -ansi
11348 -ccflags-y := -Werror
11349 +#ccflags-y := -Werror
11350
11351 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11352 obj-y += fault_$(BITS).o
11353 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11354 index 908e8c1..1524793 100644
11355 --- a/arch/sparc/mm/fault_32.c
11356 +++ b/arch/sparc/mm/fault_32.c
11357 @@ -21,6 +21,9 @@
11358 #include <linux/perf_event.h>
11359 #include <linux/interrupt.h>
11360 #include <linux/kdebug.h>
11361 +#include <linux/slab.h>
11362 +#include <linux/pagemap.h>
11363 +#include <linux/compiler.h>
11364
11365 #include <asm/page.h>
11366 #include <asm/pgtable.h>
11367 @@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11368 return safe_compute_effective_address(regs, insn);
11369 }
11370
11371 +#ifdef CONFIG_PAX_PAGEEXEC
11372 +#ifdef CONFIG_PAX_DLRESOLVE
11373 +static void pax_emuplt_close(struct vm_area_struct *vma)
11374 +{
11375 + vma->vm_mm->call_dl_resolve = 0UL;
11376 +}
11377 +
11378 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11379 +{
11380 + unsigned int *kaddr;
11381 +
11382 + vmf->page = alloc_page(GFP_HIGHUSER);
11383 + if (!vmf->page)
11384 + return VM_FAULT_OOM;
11385 +
11386 + kaddr = kmap(vmf->page);
11387 + memset(kaddr, 0, PAGE_SIZE);
11388 + kaddr[0] = 0x9DE3BFA8U; /* save */
11389 + flush_dcache_page(vmf->page);
11390 + kunmap(vmf->page);
11391 + return VM_FAULT_MAJOR;
11392 +}
11393 +
11394 +static const struct vm_operations_struct pax_vm_ops = {
11395 + .close = pax_emuplt_close,
11396 + .fault = pax_emuplt_fault
11397 +};
11398 +
11399 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11400 +{
11401 + int ret;
11402 +
11403 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11404 + vma->vm_mm = current->mm;
11405 + vma->vm_start = addr;
11406 + vma->vm_end = addr + PAGE_SIZE;
11407 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11408 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11409 + vma->vm_ops = &pax_vm_ops;
11410 +
11411 + ret = insert_vm_struct(current->mm, vma);
11412 + if (ret)
11413 + return ret;
11414 +
11415 + ++current->mm->total_vm;
11416 + return 0;
11417 +}
11418 +#endif
11419 +
11420 +/*
11421 + * PaX: decide what to do with offenders (regs->pc = fault address)
11422 + *
11423 + * returns 1 when task should be killed
11424 + * 2 when patched PLT trampoline was detected
11425 + * 3 when unpatched PLT trampoline was detected
11426 + */
11427 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11428 +{
11429 +
11430 +#ifdef CONFIG_PAX_EMUPLT
11431 + int err;
11432 +
11433 + do { /* PaX: patched PLT emulation #1 */
11434 + unsigned int sethi1, sethi2, jmpl;
11435 +
11436 + err = get_user(sethi1, (unsigned int *)regs->pc);
11437 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11438 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11439 +
11440 + if (err)
11441 + break;
11442 +
11443 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11444 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11445 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11446 + {
11447 + unsigned int addr;
11448 +
11449 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11450 + addr = regs->u_regs[UREG_G1];
11451 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11452 + regs->pc = addr;
11453 + regs->npc = addr+4;
11454 + return 2;
11455 + }
11456 + } while (0);
11457 +
11458 + do { /* PaX: patched PLT emulation #2 */
11459 + unsigned int ba;
11460 +
11461 + err = get_user(ba, (unsigned int *)regs->pc);
11462 +
11463 + if (err)
11464 + break;
11465 +
11466 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11467 + unsigned int addr;
11468 +
11469 + if ((ba & 0xFFC00000U) == 0x30800000U)
11470 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11471 + else
11472 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11473 + regs->pc = addr;
11474 + regs->npc = addr+4;
11475 + return 2;
11476 + }
11477 + } while (0);
11478 +
11479 + do { /* PaX: patched PLT emulation #3 */
11480 + unsigned int sethi, bajmpl, nop;
11481 +
11482 + err = get_user(sethi, (unsigned int *)regs->pc);
11483 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11484 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11485 +
11486 + if (err)
11487 + break;
11488 +
11489 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11490 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11491 + nop == 0x01000000U)
11492 + {
11493 + unsigned int addr;
11494 +
11495 + addr = (sethi & 0x003FFFFFU) << 10;
11496 + regs->u_regs[UREG_G1] = addr;
11497 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11498 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11499 + else
11500 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11501 + regs->pc = addr;
11502 + regs->npc = addr+4;
11503 + return 2;
11504 + }
11505 + } while (0);
11506 +
11507 + do { /* PaX: unpatched PLT emulation step 1 */
11508 + unsigned int sethi, ba, nop;
11509 +
11510 + err = get_user(sethi, (unsigned int *)regs->pc);
11511 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
11512 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11513 +
11514 + if (err)
11515 + break;
11516 +
11517 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11518 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11519 + nop == 0x01000000U)
11520 + {
11521 + unsigned int addr, save, call;
11522 +
11523 + if ((ba & 0xFFC00000U) == 0x30800000U)
11524 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11525 + else
11526 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11527 +
11528 + err = get_user(save, (unsigned int *)addr);
11529 + err |= get_user(call, (unsigned int *)(addr+4));
11530 + err |= get_user(nop, (unsigned int *)(addr+8));
11531 + if (err)
11532 + break;
11533 +
11534 +#ifdef CONFIG_PAX_DLRESOLVE
11535 + if (save == 0x9DE3BFA8U &&
11536 + (call & 0xC0000000U) == 0x40000000U &&
11537 + nop == 0x01000000U)
11538 + {
11539 + struct vm_area_struct *vma;
11540 + unsigned long call_dl_resolve;
11541 +
11542 + down_read(&current->mm->mmap_sem);
11543 + call_dl_resolve = current->mm->call_dl_resolve;
11544 + up_read(&current->mm->mmap_sem);
11545 + if (likely(call_dl_resolve))
11546 + goto emulate;
11547 +
11548 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11549 +
11550 + down_write(&current->mm->mmap_sem);
11551 + if (current->mm->call_dl_resolve) {
11552 + call_dl_resolve = current->mm->call_dl_resolve;
11553 + up_write(&current->mm->mmap_sem);
11554 + if (vma)
11555 + kmem_cache_free(vm_area_cachep, vma);
11556 + goto emulate;
11557 + }
11558 +
11559 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11560 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11561 + up_write(&current->mm->mmap_sem);
11562 + if (vma)
11563 + kmem_cache_free(vm_area_cachep, vma);
11564 + return 1;
11565 + }
11566 +
11567 + if (pax_insert_vma(vma, call_dl_resolve)) {
11568 + up_write(&current->mm->mmap_sem);
11569 + kmem_cache_free(vm_area_cachep, vma);
11570 + return 1;
11571 + }
11572 +
11573 + current->mm->call_dl_resolve = call_dl_resolve;
11574 + up_write(&current->mm->mmap_sem);
11575 +
11576 +emulate:
11577 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11578 + regs->pc = call_dl_resolve;
11579 + regs->npc = addr+4;
11580 + return 3;
11581 + }
11582 +#endif
11583 +
11584 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11585 + if ((save & 0xFFC00000U) == 0x05000000U &&
11586 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11587 + nop == 0x01000000U)
11588 + {
11589 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11590 + regs->u_regs[UREG_G2] = addr + 4;
11591 + addr = (save & 0x003FFFFFU) << 10;
11592 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11593 + regs->pc = addr;
11594 + regs->npc = addr+4;
11595 + return 3;
11596 + }
11597 + }
11598 + } while (0);
11599 +
11600 + do { /* PaX: unpatched PLT emulation step 2 */
11601 + unsigned int save, call, nop;
11602 +
11603 + err = get_user(save, (unsigned int *)(regs->pc-4));
11604 + err |= get_user(call, (unsigned int *)regs->pc);
11605 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
11606 + if (err)
11607 + break;
11608 +
11609 + if (save == 0x9DE3BFA8U &&
11610 + (call & 0xC0000000U) == 0x40000000U &&
11611 + nop == 0x01000000U)
11612 + {
11613 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11614 +
11615 + regs->u_regs[UREG_RETPC] = regs->pc;
11616 + regs->pc = dl_resolve;
11617 + regs->npc = dl_resolve+4;
11618 + return 3;
11619 + }
11620 + } while (0);
11621 +#endif
11622 +
11623 + return 1;
11624 +}
11625 +
11626 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11627 +{
11628 + unsigned long i;
11629 +
11630 + printk(KERN_ERR "PAX: bytes at PC: ");
11631 + for (i = 0; i < 8; i++) {
11632 + unsigned int c;
11633 + if (get_user(c, (unsigned int *)pc+i))
11634 + printk(KERN_CONT "???????? ");
11635 + else
11636 + printk(KERN_CONT "%08x ", c);
11637 + }
11638 + printk("\n");
11639 +}
11640 +#endif
11641 +
11642 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11643 int text_fault)
11644 {
11645 @@ -226,6 +500,24 @@ good_area:
11646 if (!(vma->vm_flags & VM_WRITE))
11647 goto bad_area;
11648 } else {
11649 +
11650 +#ifdef CONFIG_PAX_PAGEEXEC
11651 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11652 + up_read(&mm->mmap_sem);
11653 + switch (pax_handle_fetch_fault(regs)) {
11654 +
11655 +#ifdef CONFIG_PAX_EMUPLT
11656 + case 2:
11657 + case 3:
11658 + return;
11659 +#endif
11660 +
11661 + }
11662 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11663 + do_group_exit(SIGKILL);
11664 + }
11665 +#endif
11666 +
11667 /* Allow reads even for write-only mappings */
11668 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11669 goto bad_area;
11670 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11671 index 18fcd71..e4fe821 100644
11672 --- a/arch/sparc/mm/fault_64.c
11673 +++ b/arch/sparc/mm/fault_64.c
11674 @@ -22,6 +22,9 @@
11675 #include <linux/kdebug.h>
11676 #include <linux/percpu.h>
11677 #include <linux/context_tracking.h>
11678 +#include <linux/slab.h>
11679 +#include <linux/pagemap.h>
11680 +#include <linux/compiler.h>
11681
11682 #include <asm/page.h>
11683 #include <asm/pgtable.h>
11684 @@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11685 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11686 regs->tpc);
11687 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11688 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11689 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11690 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11691 dump_stack();
11692 unhandled_fault(regs->tpc, current, regs);
11693 @@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11694 show_regs(regs);
11695 }
11696
11697 +#ifdef CONFIG_PAX_PAGEEXEC
11698 +#ifdef CONFIG_PAX_DLRESOLVE
11699 +static void pax_emuplt_close(struct vm_area_struct *vma)
11700 +{
11701 + vma->vm_mm->call_dl_resolve = 0UL;
11702 +}
11703 +
11704 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11705 +{
11706 + unsigned int *kaddr;
11707 +
11708 + vmf->page = alloc_page(GFP_HIGHUSER);
11709 + if (!vmf->page)
11710 + return VM_FAULT_OOM;
11711 +
11712 + kaddr = kmap(vmf->page);
11713 + memset(kaddr, 0, PAGE_SIZE);
11714 + kaddr[0] = 0x9DE3BFA8U; /* save */
11715 + flush_dcache_page(vmf->page);
11716 + kunmap(vmf->page);
11717 + return VM_FAULT_MAJOR;
11718 +}
11719 +
11720 +static const struct vm_operations_struct pax_vm_ops = {
11721 + .close = pax_emuplt_close,
11722 + .fault = pax_emuplt_fault
11723 +};
11724 +
11725 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11726 +{
11727 + int ret;
11728 +
11729 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11730 + vma->vm_mm = current->mm;
11731 + vma->vm_start = addr;
11732 + vma->vm_end = addr + PAGE_SIZE;
11733 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11734 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11735 + vma->vm_ops = &pax_vm_ops;
11736 +
11737 + ret = insert_vm_struct(current->mm, vma);
11738 + if (ret)
11739 + return ret;
11740 +
11741 + ++current->mm->total_vm;
11742 + return 0;
11743 +}
11744 +#endif
11745 +
11746 +/*
11747 + * PaX: decide what to do with offenders (regs->tpc = fault address)
11748 + *
11749 + * returns 1 when task should be killed
11750 + * 2 when patched PLT trampoline was detected
11751 + * 3 when unpatched PLT trampoline was detected
11752 + */
11753 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11754 +{
11755 +
11756 +#ifdef CONFIG_PAX_EMUPLT
11757 + int err;
11758 +
11759 + do { /* PaX: patched PLT emulation #1 */
11760 + unsigned int sethi1, sethi2, jmpl;
11761 +
11762 + err = get_user(sethi1, (unsigned int *)regs->tpc);
11763 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11764 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11765 +
11766 + if (err)
11767 + break;
11768 +
11769 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11770 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11771 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11772 + {
11773 + unsigned long addr;
11774 +
11775 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11776 + addr = regs->u_regs[UREG_G1];
11777 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11778 +
11779 + if (test_thread_flag(TIF_32BIT))
11780 + addr &= 0xFFFFFFFFUL;
11781 +
11782 + regs->tpc = addr;
11783 + regs->tnpc = addr+4;
11784 + return 2;
11785 + }
11786 + } while (0);
11787 +
11788 + do { /* PaX: patched PLT emulation #2 */
11789 + unsigned int ba;
11790 +
11791 + err = get_user(ba, (unsigned int *)regs->tpc);
11792 +
11793 + if (err)
11794 + break;
11795 +
11796 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11797 + unsigned long addr;
11798 +
11799 + if ((ba & 0xFFC00000U) == 0x30800000U)
11800 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11801 + else
11802 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11803 +
11804 + if (test_thread_flag(TIF_32BIT))
11805 + addr &= 0xFFFFFFFFUL;
11806 +
11807 + regs->tpc = addr;
11808 + regs->tnpc = addr+4;
11809 + return 2;
11810 + }
11811 + } while (0);
11812 +
11813 + do { /* PaX: patched PLT emulation #3 */
11814 + unsigned int sethi, bajmpl, nop;
11815 +
11816 + err = get_user(sethi, (unsigned int *)regs->tpc);
11817 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11818 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11819 +
11820 + if (err)
11821 + break;
11822 +
11823 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11824 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11825 + nop == 0x01000000U)
11826 + {
11827 + unsigned long addr;
11828 +
11829 + addr = (sethi & 0x003FFFFFU) << 10;
11830 + regs->u_regs[UREG_G1] = addr;
11831 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11832 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11833 + else
11834 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11835 +
11836 + if (test_thread_flag(TIF_32BIT))
11837 + addr &= 0xFFFFFFFFUL;
11838 +
11839 + regs->tpc = addr;
11840 + regs->tnpc = addr+4;
11841 + return 2;
11842 + }
11843 + } while (0);
11844 +
11845 + do { /* PaX: patched PLT emulation #4 */
11846 + unsigned int sethi, mov1, call, mov2;
11847 +
11848 + err = get_user(sethi, (unsigned int *)regs->tpc);
11849 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11850 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
11851 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11852 +
11853 + if (err)
11854 + break;
11855 +
11856 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11857 + mov1 == 0x8210000FU &&
11858 + (call & 0xC0000000U) == 0x40000000U &&
11859 + mov2 == 0x9E100001U)
11860 + {
11861 + unsigned long addr;
11862 +
11863 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11864 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11865 +
11866 + if (test_thread_flag(TIF_32BIT))
11867 + addr &= 0xFFFFFFFFUL;
11868 +
11869 + regs->tpc = addr;
11870 + regs->tnpc = addr+4;
11871 + return 2;
11872 + }
11873 + } while (0);
11874 +
11875 + do { /* PaX: patched PLT emulation #5 */
11876 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11877 +
11878 + err = get_user(sethi, (unsigned int *)regs->tpc);
11879 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11880 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11881 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11882 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11883 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11884 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11885 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11886 +
11887 + if (err)
11888 + break;
11889 +
11890 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11891 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11892 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11893 + (or1 & 0xFFFFE000U) == 0x82106000U &&
11894 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11895 + sllx == 0x83287020U &&
11896 + jmpl == 0x81C04005U &&
11897 + nop == 0x01000000U)
11898 + {
11899 + unsigned long addr;
11900 +
11901 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11902 + regs->u_regs[UREG_G1] <<= 32;
11903 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11904 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11905 + regs->tpc = addr;
11906 + regs->tnpc = addr+4;
11907 + return 2;
11908 + }
11909 + } while (0);
11910 +
11911 + do { /* PaX: patched PLT emulation #6 */
11912 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11913 +
11914 + err = get_user(sethi, (unsigned int *)regs->tpc);
11915 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11916 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11917 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11918 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
11919 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11920 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11921 +
11922 + if (err)
11923 + break;
11924 +
11925 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11926 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11927 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11928 + sllx == 0x83287020U &&
11929 + (or & 0xFFFFE000U) == 0x8A116000U &&
11930 + jmpl == 0x81C04005U &&
11931 + nop == 0x01000000U)
11932 + {
11933 + unsigned long addr;
11934 +
11935 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11936 + regs->u_regs[UREG_G1] <<= 32;
11937 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11938 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11939 + regs->tpc = addr;
11940 + regs->tnpc = addr+4;
11941 + return 2;
11942 + }
11943 + } while (0);
11944 +
11945 + do { /* PaX: unpatched PLT emulation step 1 */
11946 + unsigned int sethi, ba, nop;
11947 +
11948 + err = get_user(sethi, (unsigned int *)regs->tpc);
11949 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11950 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11951 +
11952 + if (err)
11953 + break;
11954 +
11955 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11956 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11957 + nop == 0x01000000U)
11958 + {
11959 + unsigned long addr;
11960 + unsigned int save, call;
11961 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11962 +
11963 + if ((ba & 0xFFC00000U) == 0x30800000U)
11964 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11965 + else
11966 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11967 +
11968 + if (test_thread_flag(TIF_32BIT))
11969 + addr &= 0xFFFFFFFFUL;
11970 +
11971 + err = get_user(save, (unsigned int *)addr);
11972 + err |= get_user(call, (unsigned int *)(addr+4));
11973 + err |= get_user(nop, (unsigned int *)(addr+8));
11974 + if (err)
11975 + break;
11976 +
11977 +#ifdef CONFIG_PAX_DLRESOLVE
11978 + if (save == 0x9DE3BFA8U &&
11979 + (call & 0xC0000000U) == 0x40000000U &&
11980 + nop == 0x01000000U)
11981 + {
11982 + struct vm_area_struct *vma;
11983 + unsigned long call_dl_resolve;
11984 +
11985 + down_read(&current->mm->mmap_sem);
11986 + call_dl_resolve = current->mm->call_dl_resolve;
11987 + up_read(&current->mm->mmap_sem);
11988 + if (likely(call_dl_resolve))
11989 + goto emulate;
11990 +
11991 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11992 +
11993 + down_write(&current->mm->mmap_sem);
11994 + if (current->mm->call_dl_resolve) {
11995 + call_dl_resolve = current->mm->call_dl_resolve;
11996 + up_write(&current->mm->mmap_sem);
11997 + if (vma)
11998 + kmem_cache_free(vm_area_cachep, vma);
11999 + goto emulate;
12000 + }
12001 +
12002 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12003 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12004 + up_write(&current->mm->mmap_sem);
12005 + if (vma)
12006 + kmem_cache_free(vm_area_cachep, vma);
12007 + return 1;
12008 + }
12009 +
12010 + if (pax_insert_vma(vma, call_dl_resolve)) {
12011 + up_write(&current->mm->mmap_sem);
12012 + kmem_cache_free(vm_area_cachep, vma);
12013 + return 1;
12014 + }
12015 +
12016 + current->mm->call_dl_resolve = call_dl_resolve;
12017 + up_write(&current->mm->mmap_sem);
12018 +
12019 +emulate:
12020 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12021 + regs->tpc = call_dl_resolve;
12022 + regs->tnpc = addr+4;
12023 + return 3;
12024 + }
12025 +#endif
12026 +
12027 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12028 + if ((save & 0xFFC00000U) == 0x05000000U &&
12029 + (call & 0xFFFFE000U) == 0x85C0A000U &&
12030 + nop == 0x01000000U)
12031 + {
12032 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12033 + regs->u_regs[UREG_G2] = addr + 4;
12034 + addr = (save & 0x003FFFFFU) << 10;
12035 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12036 +
12037 + if (test_thread_flag(TIF_32BIT))
12038 + addr &= 0xFFFFFFFFUL;
12039 +
12040 + regs->tpc = addr;
12041 + regs->tnpc = addr+4;
12042 + return 3;
12043 + }
12044 +
12045 + /* PaX: 64-bit PLT stub */
12046 + err = get_user(sethi1, (unsigned int *)addr);
12047 + err |= get_user(sethi2, (unsigned int *)(addr+4));
12048 + err |= get_user(or1, (unsigned int *)(addr+8));
12049 + err |= get_user(or2, (unsigned int *)(addr+12));
12050 + err |= get_user(sllx, (unsigned int *)(addr+16));
12051 + err |= get_user(add, (unsigned int *)(addr+20));
12052 + err |= get_user(jmpl, (unsigned int *)(addr+24));
12053 + err |= get_user(nop, (unsigned int *)(addr+28));
12054 + if (err)
12055 + break;
12056 +
12057 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12058 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12059 + (or1 & 0xFFFFE000U) == 0x88112000U &&
12060 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
12061 + sllx == 0x89293020U &&
12062 + add == 0x8A010005U &&
12063 + jmpl == 0x89C14000U &&
12064 + nop == 0x01000000U)
12065 + {
12066 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12067 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12068 + regs->u_regs[UREG_G4] <<= 32;
12069 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12070 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12071 + regs->u_regs[UREG_G4] = addr + 24;
12072 + addr = regs->u_regs[UREG_G5];
12073 + regs->tpc = addr;
12074 + regs->tnpc = addr+4;
12075 + return 3;
12076 + }
12077 + }
12078 + } while (0);
12079 +
12080 +#ifdef CONFIG_PAX_DLRESOLVE
12081 + do { /* PaX: unpatched PLT emulation step 2 */
12082 + unsigned int save, call, nop;
12083 +
12084 + err = get_user(save, (unsigned int *)(regs->tpc-4));
12085 + err |= get_user(call, (unsigned int *)regs->tpc);
12086 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12087 + if (err)
12088 + break;
12089 +
12090 + if (save == 0x9DE3BFA8U &&
12091 + (call & 0xC0000000U) == 0x40000000U &&
12092 + nop == 0x01000000U)
12093 + {
12094 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12095 +
12096 + if (test_thread_flag(TIF_32BIT))
12097 + dl_resolve &= 0xFFFFFFFFUL;
12098 +
12099 + regs->u_regs[UREG_RETPC] = regs->tpc;
12100 + regs->tpc = dl_resolve;
12101 + regs->tnpc = dl_resolve+4;
12102 + return 3;
12103 + }
12104 + } while (0);
12105 +#endif
12106 +
12107 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12108 + unsigned int sethi, ba, nop;
12109 +
12110 + err = get_user(sethi, (unsigned int *)regs->tpc);
12111 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12112 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12113 +
12114 + if (err)
12115 + break;
12116 +
12117 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
12118 + (ba & 0xFFF00000U) == 0x30600000U &&
12119 + nop == 0x01000000U)
12120 + {
12121 + unsigned long addr;
12122 +
12123 + addr = (sethi & 0x003FFFFFU) << 10;
12124 + regs->u_regs[UREG_G1] = addr;
12125 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12126 +
12127 + if (test_thread_flag(TIF_32BIT))
12128 + addr &= 0xFFFFFFFFUL;
12129 +
12130 + regs->tpc = addr;
12131 + regs->tnpc = addr+4;
12132 + return 2;
12133 + }
12134 + } while (0);
12135 +
12136 +#endif
12137 +
12138 + return 1;
12139 +}
12140 +
12141 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12142 +{
12143 + unsigned long i;
12144 +
12145 + printk(KERN_ERR "PAX: bytes at PC: ");
12146 + for (i = 0; i < 8; i++) {
12147 + unsigned int c;
12148 + if (get_user(c, (unsigned int *)pc+i))
12149 + printk(KERN_CONT "???????? ");
12150 + else
12151 + printk(KERN_CONT "%08x ", c);
12152 + }
12153 + printk("\n");
12154 +}
12155 +#endif
12156 +
12157 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12158 {
12159 enum ctx_state prev_state = exception_enter();
12160 @@ -353,6 +816,29 @@ retry:
12161 if (!vma)
12162 goto bad_area;
12163
12164 +#ifdef CONFIG_PAX_PAGEEXEC
12165 + /* PaX: detect ITLB misses on non-exec pages */
12166 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12167 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12168 + {
12169 + if (address != regs->tpc)
12170 + goto good_area;
12171 +
12172 + up_read(&mm->mmap_sem);
12173 + switch (pax_handle_fetch_fault(regs)) {
12174 +
12175 +#ifdef CONFIG_PAX_EMUPLT
12176 + case 2:
12177 + case 3:
12178 + return;
12179 +#endif
12180 +
12181 + }
12182 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12183 + do_group_exit(SIGKILL);
12184 + }
12185 +#endif
12186 +
12187 /* Pure DTLB misses do not tell us whether the fault causing
12188 * load/store/atomic was a write or not, it only says that there
12189 * was no match. So in such a case we (carefully) read the
12190 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12191 index d329537..2c3746a 100644
12192 --- a/arch/sparc/mm/hugetlbpage.c
12193 +++ b/arch/sparc/mm/hugetlbpage.c
12194 @@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12195 unsigned long addr,
12196 unsigned long len,
12197 unsigned long pgoff,
12198 - unsigned long flags)
12199 + unsigned long flags,
12200 + unsigned long offset)
12201 {
12202 + struct mm_struct *mm = current->mm;
12203 unsigned long task_size = TASK_SIZE;
12204 struct vm_unmapped_area_info info;
12205
12206 @@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12207
12208 info.flags = 0;
12209 info.length = len;
12210 - info.low_limit = TASK_UNMAPPED_BASE;
12211 + info.low_limit = mm->mmap_base;
12212 info.high_limit = min(task_size, VA_EXCLUDE_START);
12213 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12214 info.align_offset = 0;
12215 + info.threadstack_offset = offset;
12216 addr = vm_unmapped_area(&info);
12217
12218 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12219 VM_BUG_ON(addr != -ENOMEM);
12220 info.low_limit = VA_EXCLUDE_END;
12221 +
12222 +#ifdef CONFIG_PAX_RANDMMAP
12223 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12224 + info.low_limit += mm->delta_mmap;
12225 +#endif
12226 +
12227 info.high_limit = task_size;
12228 addr = vm_unmapped_area(&info);
12229 }
12230 @@ -55,7 +64,8 @@ static unsigned long
12231 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12232 const unsigned long len,
12233 const unsigned long pgoff,
12234 - const unsigned long flags)
12235 + const unsigned long flags,
12236 + const unsigned long offset)
12237 {
12238 struct mm_struct *mm = current->mm;
12239 unsigned long addr = addr0;
12240 @@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12241 info.high_limit = mm->mmap_base;
12242 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12243 info.align_offset = 0;
12244 + info.threadstack_offset = offset;
12245 addr = vm_unmapped_area(&info);
12246
12247 /*
12248 @@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12249 VM_BUG_ON(addr != -ENOMEM);
12250 info.flags = 0;
12251 info.low_limit = TASK_UNMAPPED_BASE;
12252 +
12253 +#ifdef CONFIG_PAX_RANDMMAP
12254 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12255 + info.low_limit += mm->delta_mmap;
12256 +#endif
12257 +
12258 info.high_limit = STACK_TOP32;
12259 addr = vm_unmapped_area(&info);
12260 }
12261 @@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12262 struct mm_struct *mm = current->mm;
12263 struct vm_area_struct *vma;
12264 unsigned long task_size = TASK_SIZE;
12265 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12266
12267 if (test_thread_flag(TIF_32BIT))
12268 task_size = STACK_TOP32;
12269 @@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12270 return addr;
12271 }
12272
12273 +#ifdef CONFIG_PAX_RANDMMAP
12274 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12275 +#endif
12276 +
12277 if (addr) {
12278 addr = ALIGN(addr, HPAGE_SIZE);
12279 vma = find_vma(mm, addr);
12280 - if (task_size - len >= addr &&
12281 - (!vma || addr + len <= vma->vm_start))
12282 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12283 return addr;
12284 }
12285 if (mm->get_unmapped_area == arch_get_unmapped_area)
12286 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12287 - pgoff, flags);
12288 + pgoff, flags, offset);
12289 else
12290 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12291 - pgoff, flags);
12292 + pgoff, flags, offset);
12293 }
12294
12295 pte_t *huge_pte_alloc(struct mm_struct *mm,
12296 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12297 index 2d91c62..17a8fff 100644
12298 --- a/arch/sparc/mm/init_64.c
12299 +++ b/arch/sparc/mm/init_64.c
12300 @@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12301 int num_kernel_image_mappings;
12302
12303 #ifdef CONFIG_DEBUG_DCFLUSH
12304 -atomic_t dcpage_flushes = ATOMIC_INIT(0);
12305 +atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12306 #ifdef CONFIG_SMP
12307 -atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12308 +atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12309 #endif
12310 #endif
12311
12312 @@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12313 {
12314 BUG_ON(tlb_type == hypervisor);
12315 #ifdef CONFIG_DEBUG_DCFLUSH
12316 - atomic_inc(&dcpage_flushes);
12317 + atomic_inc_unchecked(&dcpage_flushes);
12318 #endif
12319
12320 #ifdef DCACHE_ALIASING_POSSIBLE
12321 @@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12322
12323 #ifdef CONFIG_DEBUG_DCFLUSH
12324 seq_printf(m, "DCPageFlushes\t: %d\n",
12325 - atomic_read(&dcpage_flushes));
12326 + atomic_read_unchecked(&dcpage_flushes));
12327 #ifdef CONFIG_SMP
12328 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12329 - atomic_read(&dcpage_flushes_xcall));
12330 + atomic_read_unchecked(&dcpage_flushes_xcall));
12331 #endif /* CONFIG_SMP */
12332 #endif /* CONFIG_DEBUG_DCFLUSH */
12333 }
12334 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12335 index 7cca418..53fc030 100644
12336 --- a/arch/tile/Kconfig
12337 +++ b/arch/tile/Kconfig
12338 @@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12339
12340 config KEXEC
12341 bool "kexec system call"
12342 + depends on !GRKERNSEC_KMEM
12343 ---help---
12344 kexec is a system call that implements the ability to shutdown your
12345 current kernel, and to start another kernel. It is like a reboot
12346 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12347 index 7b11c5f..755a026 100644
12348 --- a/arch/tile/include/asm/atomic_64.h
12349 +++ b/arch/tile/include/asm/atomic_64.h
12350 @@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12351
12352 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12353
12354 +#define atomic64_read_unchecked(v) atomic64_read(v)
12355 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12356 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12357 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12358 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12359 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
12360 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12361 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
12362 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12363 +
12364 /* Define this to indicate that cmpxchg is an efficient operation. */
12365 #define __HAVE_ARCH_CMPXCHG
12366
12367 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12368 index 6160761..00cac88 100644
12369 --- a/arch/tile/include/asm/cache.h
12370 +++ b/arch/tile/include/asm/cache.h
12371 @@ -15,11 +15,12 @@
12372 #ifndef _ASM_TILE_CACHE_H
12373 #define _ASM_TILE_CACHE_H
12374
12375 +#include <linux/const.h>
12376 #include <arch/chip.h>
12377
12378 /* bytes per L1 data cache line */
12379 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12380 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12381 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12382
12383 /* bytes per L2 cache line */
12384 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12385 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12386 index b6cde32..c0cb736 100644
12387 --- a/arch/tile/include/asm/uaccess.h
12388 +++ b/arch/tile/include/asm/uaccess.h
12389 @@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12390 const void __user *from,
12391 unsigned long n)
12392 {
12393 - int sz = __compiletime_object_size(to);
12394 + size_t sz = __compiletime_object_size(to);
12395
12396 - if (likely(sz == -1 || sz >= n))
12397 + if (likely(sz == (size_t)-1 || sz >= n))
12398 n = _copy_from_user(to, from, n);
12399 else
12400 copy_from_user_overflow();
12401 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12402 index e514899..f8743c4 100644
12403 --- a/arch/tile/mm/hugetlbpage.c
12404 +++ b/arch/tile/mm/hugetlbpage.c
12405 @@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12406 info.high_limit = TASK_SIZE;
12407 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12408 info.align_offset = 0;
12409 + info.threadstack_offset = 0;
12410 return vm_unmapped_area(&info);
12411 }
12412
12413 @@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12414 info.high_limit = current->mm->mmap_base;
12415 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12416 info.align_offset = 0;
12417 + info.threadstack_offset = 0;
12418 addr = vm_unmapped_area(&info);
12419
12420 /*
12421 diff --git a/arch/um/Makefile b/arch/um/Makefile
12422 index e4b1a96..16162f8 100644
12423 --- a/arch/um/Makefile
12424 +++ b/arch/um/Makefile
12425 @@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12426 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12427 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12428
12429 +ifdef CONSTIFY_PLUGIN
12430 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12431 +endif
12432 +
12433 #This will adjust *FLAGS accordingly to the platform.
12434 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12435
12436 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12437 index 19e1bdd..3665b77 100644
12438 --- a/arch/um/include/asm/cache.h
12439 +++ b/arch/um/include/asm/cache.h
12440 @@ -1,6 +1,7 @@
12441 #ifndef __UM_CACHE_H
12442 #define __UM_CACHE_H
12443
12444 +#include <linux/const.h>
12445
12446 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12447 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12448 @@ -12,6 +13,6 @@
12449 # define L1_CACHE_SHIFT 5
12450 #endif
12451
12452 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12453 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12454
12455 #endif
12456 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12457 index 2e0a6b1..a64d0f5 100644
12458 --- a/arch/um/include/asm/kmap_types.h
12459 +++ b/arch/um/include/asm/kmap_types.h
12460 @@ -8,6 +8,6 @@
12461
12462 /* No more #include "asm/arch/kmap_types.h" ! */
12463
12464 -#define KM_TYPE_NR 14
12465 +#define KM_TYPE_NR 15
12466
12467 #endif
12468 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12469 index 71c5d13..4c7b9f1 100644
12470 --- a/arch/um/include/asm/page.h
12471 +++ b/arch/um/include/asm/page.h
12472 @@ -14,6 +14,9 @@
12473 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12474 #define PAGE_MASK (~(PAGE_SIZE-1))
12475
12476 +#define ktla_ktva(addr) (addr)
12477 +#define ktva_ktla(addr) (addr)
12478 +
12479 #ifndef __ASSEMBLY__
12480
12481 struct page;
12482 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12483 index 0032f92..cd151e0 100644
12484 --- a/arch/um/include/asm/pgtable-3level.h
12485 +++ b/arch/um/include/asm/pgtable-3level.h
12486 @@ -58,6 +58,7 @@
12487 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12488 #define pud_populate(mm, pud, pmd) \
12489 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12490 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12491
12492 #ifdef CONFIG_64BIT
12493 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12494 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12495 index f17bca8..48adb87 100644
12496 --- a/arch/um/kernel/process.c
12497 +++ b/arch/um/kernel/process.c
12498 @@ -356,22 +356,6 @@ int singlestepping(void * t)
12499 return 2;
12500 }
12501
12502 -/*
12503 - * Only x86 and x86_64 have an arch_align_stack().
12504 - * All other arches have "#define arch_align_stack(x) (x)"
12505 - * in their asm/exec.h
12506 - * As this is included in UML from asm-um/system-generic.h,
12507 - * we can use it to behave as the subarch does.
12508 - */
12509 -#ifndef arch_align_stack
12510 -unsigned long arch_align_stack(unsigned long sp)
12511 -{
12512 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12513 - sp -= get_random_int() % 8192;
12514 - return sp & ~0xf;
12515 -}
12516 -#endif
12517 -
12518 unsigned long get_wchan(struct task_struct *p)
12519 {
12520 unsigned long stack_page, sp, ip;
12521 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12522 index ad8f795..2c7eec6 100644
12523 --- a/arch/unicore32/include/asm/cache.h
12524 +++ b/arch/unicore32/include/asm/cache.h
12525 @@ -12,8 +12,10 @@
12526 #ifndef __UNICORE_CACHE_H__
12527 #define __UNICORE_CACHE_H__
12528
12529 -#define L1_CACHE_SHIFT (5)
12530 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12531 +#include <linux/const.h>
12532 +
12533 +#define L1_CACHE_SHIFT 5
12534 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12535
12536 /*
12537 * Memory returned by kmalloc() may be used for DMA, so we must make
12538 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12539 index 41a503c..cf98b04 100644
12540 --- a/arch/x86/Kconfig
12541 +++ b/arch/x86/Kconfig
12542 @@ -129,7 +129,7 @@ config X86
12543 select RTC_LIB
12544 select HAVE_DEBUG_STACKOVERFLOW
12545 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12546 - select HAVE_CC_STACKPROTECTOR
12547 + select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12548 select GENERIC_CPU_AUTOPROBE
12549 select HAVE_ARCH_AUDITSYSCALL
12550 select ARCH_SUPPORTS_ATOMIC_RMW
12551 @@ -262,7 +262,7 @@ config X86_HT
12552
12553 config X86_32_LAZY_GS
12554 def_bool y
12555 - depends on X86_32 && !CC_STACKPROTECTOR
12556 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12557
12558 config ARCH_HWEIGHT_CFLAGS
12559 string
12560 @@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
12561
12562 menuconfig HYPERVISOR_GUEST
12563 bool "Linux guest support"
12564 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12565 ---help---
12566 Say Y here to enable options for running Linux under various hyper-
12567 visors. This option enables basic hypervisor detection and platform
12568 @@ -973,6 +974,7 @@ config VM86
12569
12570 config X86_16BIT
12571 bool "Enable support for 16-bit segments" if EXPERT
12572 + depends on !GRKERNSEC
12573 default y
12574 ---help---
12575 This option is required by programs like Wine to run 16-bit
12576 @@ -1128,6 +1130,7 @@ choice
12577
12578 config NOHIGHMEM
12579 bool "off"
12580 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12581 ---help---
12582 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12583 However, the address space of 32-bit x86 processors is only 4
12584 @@ -1164,6 +1167,7 @@ config NOHIGHMEM
12585
12586 config HIGHMEM4G
12587 bool "4GB"
12588 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12589 ---help---
12590 Select this if you have a 32-bit processor and between 1 and 4
12591 gigabytes of physical RAM.
12592 @@ -1216,7 +1220,7 @@ config PAGE_OFFSET
12593 hex
12594 default 0xB0000000 if VMSPLIT_3G_OPT
12595 default 0x80000000 if VMSPLIT_2G
12596 - default 0x78000000 if VMSPLIT_2G_OPT
12597 + default 0x70000000 if VMSPLIT_2G_OPT
12598 default 0x40000000 if VMSPLIT_1G
12599 default 0xC0000000
12600 depends on X86_32
12601 @@ -1631,6 +1635,7 @@ source kernel/Kconfig.hz
12602
12603 config KEXEC
12604 bool "kexec system call"
12605 + depends on !GRKERNSEC_KMEM
12606 ---help---
12607 kexec is a system call that implements the ability to shutdown your
12608 current kernel, and to start another kernel. It is like a reboot
12609 @@ -1816,7 +1821,9 @@ config X86_NEED_RELOCS
12610
12611 config PHYSICAL_ALIGN
12612 hex "Alignment value to which kernel should be aligned"
12613 - default "0x200000"
12614 + default "0x1000000"
12615 + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12616 + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12617 range 0x2000 0x1000000 if X86_32
12618 range 0x200000 0x1000000 if X86_64
12619 ---help---
12620 @@ -1899,6 +1906,7 @@ config COMPAT_VDSO
12621 def_bool n
12622 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12623 depends on X86_32 || IA32_EMULATION
12624 + depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12625 ---help---
12626 Certain buggy versions of glibc will crash if they are
12627 presented with a 32-bit vDSO that is not mapped at the address
12628 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12629 index 6983314..54ad7e8 100644
12630 --- a/arch/x86/Kconfig.cpu
12631 +++ b/arch/x86/Kconfig.cpu
12632 @@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12633
12634 config X86_F00F_BUG
12635 def_bool y
12636 - depends on M586MMX || M586TSC || M586 || M486
12637 + depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12638
12639 config X86_INVD_BUG
12640 def_bool y
12641 @@ -327,7 +327,7 @@ config X86_INVD_BUG
12642
12643 config X86_ALIGNMENT_16
12644 def_bool y
12645 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12646 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12647
12648 config X86_INTEL_USERCOPY
12649 def_bool y
12650 @@ -369,7 +369,7 @@ config X86_CMPXCHG64
12651 # generates cmov.
12652 config X86_CMOV
12653 def_bool y
12654 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12655 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12656
12657 config X86_MINIMUM_CPU_FAMILY
12658 int
12659 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12660 index 61bd2ad..50b625d 100644
12661 --- a/arch/x86/Kconfig.debug
12662 +++ b/arch/x86/Kconfig.debug
12663 @@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12664 config DEBUG_RODATA
12665 bool "Write protect kernel read-only data structures"
12666 default y
12667 - depends on DEBUG_KERNEL
12668 + depends on DEBUG_KERNEL && BROKEN
12669 ---help---
12670 Mark the kernel read-only data as write-protected in the pagetables,
12671 in order to catch accidental (and incorrect) writes to such const
12672 @@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12673
12674 config DEBUG_SET_MODULE_RONX
12675 bool "Set loadable kernel module data as NX and text as RO"
12676 - depends on MODULES
12677 + depends on MODULES && BROKEN
12678 ---help---
12679 This option helps catch unintended modifications to loadable
12680 kernel module's text and read-only data. It also prevents execution
12681 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12682 index 920e616..ac3d4df 100644
12683 --- a/arch/x86/Makefile
12684 +++ b/arch/x86/Makefile
12685 @@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12686 # CPU-specific tuning. Anything which can be shared with UML should go here.
12687 include $(srctree)/arch/x86/Makefile_32.cpu
12688 KBUILD_CFLAGS += $(cflags-y)
12689 -
12690 - # temporary until string.h is fixed
12691 - KBUILD_CFLAGS += -ffreestanding
12692 else
12693 BITS := 64
12694 UTS_MACHINE := x86_64
12695 @@ -107,6 +104,9 @@ else
12696 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12697 endif
12698
12699 +# temporary until string.h is fixed
12700 +KBUILD_CFLAGS += -ffreestanding
12701 +
12702 # Make sure compiler does not have buggy stack-protector support.
12703 ifdef CONFIG_CC_STACKPROTECTOR
12704 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12705 @@ -180,6 +180,7 @@ archheaders:
12706 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12707
12708 archprepare:
12709 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12710 ifeq ($(CONFIG_KEXEC_FILE),y)
12711 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12712 endif
12713 @@ -263,3 +264,9 @@ define archhelp
12714 echo ' FDARGS="..." arguments for the booted kernel'
12715 echo ' FDINITRD=file initrd for the booted kernel'
12716 endef
12717 +
12718 +define OLD_LD
12719 +
12720 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12721 +*** Please upgrade your binutils to 2.18 or newer
12722 +endef
12723 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12724 index 5b016e2..04ef69c 100644
12725 --- a/arch/x86/boot/Makefile
12726 +++ b/arch/x86/boot/Makefile
12727 @@ -55,6 +55,9 @@ endif
12728 # ---------------------------------------------------------------------------
12729
12730 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12731 +ifdef CONSTIFY_PLUGIN
12732 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12733 +endif
12734 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12735 GCOV_PROFILE := n
12736
12737 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12738 index 878e4b9..20537ab 100644
12739 --- a/arch/x86/boot/bitops.h
12740 +++ b/arch/x86/boot/bitops.h
12741 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12742 u8 v;
12743 const u32 *p = (const u32 *)addr;
12744
12745 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12746 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12747 return v;
12748 }
12749
12750 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12751
12752 static inline void set_bit(int nr, void *addr)
12753 {
12754 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12755 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12756 }
12757
12758 #endif /* BOOT_BITOPS_H */
12759 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12760 index bd49ec6..94c7f58 100644
12761 --- a/arch/x86/boot/boot.h
12762 +++ b/arch/x86/boot/boot.h
12763 @@ -84,7 +84,7 @@ static inline void io_delay(void)
12764 static inline u16 ds(void)
12765 {
12766 u16 seg;
12767 - asm("movw %%ds,%0" : "=rm" (seg));
12768 + asm volatile("movw %%ds,%0" : "=rm" (seg));
12769 return seg;
12770 }
12771
12772 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12773 index 45abc36..97bea2d 100644
12774 --- a/arch/x86/boot/compressed/Makefile
12775 +++ b/arch/x86/boot/compressed/Makefile
12776 @@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12777 KBUILD_CFLAGS += -mno-mmx -mno-sse
12778 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12779 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12780 +ifdef CONSTIFY_PLUGIN
12781 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12782 +endif
12783
12784 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12785 GCOV_PROFILE := n
12786 diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12787 index a53440e..c3dbf1e 100644
12788 --- a/arch/x86/boot/compressed/efi_stub_32.S
12789 +++ b/arch/x86/boot/compressed/efi_stub_32.S
12790 @@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12791 * parameter 2, ..., param n. To make things easy, we save the return
12792 * address of efi_call_phys in a global variable.
12793 */
12794 - popl %ecx
12795 - movl %ecx, saved_return_addr(%edx)
12796 - /* get the function pointer into ECX*/
12797 - popl %ecx
12798 - movl %ecx, efi_rt_function_ptr(%edx)
12799 + popl saved_return_addr(%edx)
12800 + popl efi_rt_function_ptr(%edx)
12801
12802 /*
12803 * 3. Call the physical function.
12804 */
12805 - call *%ecx
12806 + call *efi_rt_function_ptr(%edx)
12807
12808 /*
12809 * 4. Balance the stack. And because EAX contain the return value,
12810 @@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12811 1: popl %edx
12812 subl $1b, %edx
12813
12814 - movl efi_rt_function_ptr(%edx), %ecx
12815 - pushl %ecx
12816 + pushl efi_rt_function_ptr(%edx)
12817
12818 /*
12819 * 10. Push the saved return address onto the stack and return.
12820 */
12821 - movl saved_return_addr(%edx), %ecx
12822 - pushl %ecx
12823 - ret
12824 + jmpl *saved_return_addr(%edx)
12825 ENDPROC(efi_call_phys)
12826 .previous
12827
12828 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12829 index 1d7fbbc..36ecd58 100644
12830 --- a/arch/x86/boot/compressed/head_32.S
12831 +++ b/arch/x86/boot/compressed/head_32.S
12832 @@ -140,10 +140,10 @@ preferred_addr:
12833 addl %eax, %ebx
12834 notl %eax
12835 andl %eax, %ebx
12836 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12837 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12838 jge 1f
12839 #endif
12840 - movl $LOAD_PHYSICAL_ADDR, %ebx
12841 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12842 1:
12843
12844 /* Target address to relocate to for decompression */
12845 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12846 index 6b1766c..ad465c9 100644
12847 --- a/arch/x86/boot/compressed/head_64.S
12848 +++ b/arch/x86/boot/compressed/head_64.S
12849 @@ -94,10 +94,10 @@ ENTRY(startup_32)
12850 addl %eax, %ebx
12851 notl %eax
12852 andl %eax, %ebx
12853 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12854 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12855 jge 1f
12856 #endif
12857 - movl $LOAD_PHYSICAL_ADDR, %ebx
12858 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12859 1:
12860
12861 /* Target address to relocate to for decompression */
12862 @@ -322,10 +322,10 @@ preferred_addr:
12863 addq %rax, %rbp
12864 notq %rax
12865 andq %rax, %rbp
12866 - cmpq $LOAD_PHYSICAL_ADDR, %rbp
12867 + cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12868 jge 1f
12869 #endif
12870 - movq $LOAD_PHYSICAL_ADDR, %rbp
12871 + movq $____LOAD_PHYSICAL_ADDR, %rbp
12872 1:
12873
12874 /* Target address to relocate to for decompression */
12875 @@ -434,8 +434,8 @@ gdt:
12876 .long gdt
12877 .word 0
12878 .quad 0x0000000000000000 /* NULL descriptor */
12879 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
12880 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
12881 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
12882 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
12883 .quad 0x0080890000000000 /* TS descriptor */
12884 .quad 0x0000000000000000 /* TS continued */
12885 gdt_end:
12886 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12887 index 30dd59a..cd9edc3 100644
12888 --- a/arch/x86/boot/compressed/misc.c
12889 +++ b/arch/x86/boot/compressed/misc.c
12890 @@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12891 * Calculate the delta between where vmlinux was linked to load
12892 * and where it was actually loaded.
12893 */
12894 - delta = min_addr - LOAD_PHYSICAL_ADDR;
12895 + delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12896 if (!delta) {
12897 debug_putstr("No relocation needed... ");
12898 return;
12899 @@ -312,7 +312,7 @@ static void parse_elf(void *output)
12900 Elf32_Ehdr ehdr;
12901 Elf32_Phdr *phdrs, *phdr;
12902 #endif
12903 - void *dest;
12904 + void *dest, *prev;
12905 int i;
12906
12907 memcpy(&ehdr, output, sizeof(ehdr));
12908 @@ -339,13 +339,16 @@ static void parse_elf(void *output)
12909 case PT_LOAD:
12910 #ifdef CONFIG_RELOCATABLE
12911 dest = output;
12912 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12913 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12914 #else
12915 dest = (void *)(phdr->p_paddr);
12916 #endif
12917 memcpy(dest,
12918 output + phdr->p_offset,
12919 phdr->p_filesz);
12920 + if (i)
12921 + memset(prev, 0xff, dest - prev);
12922 + prev = dest + phdr->p_filesz;
12923 break;
12924 default: /* Ignore other PT_* */ break;
12925 }
12926 @@ -402,7 +405,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12927 error("Destination address too large");
12928 #endif
12929 #ifndef CONFIG_RELOCATABLE
12930 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12931 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12932 error("Wrong destination address");
12933 #endif
12934
12935 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12936 index 1fd7d57..0f7d096 100644
12937 --- a/arch/x86/boot/cpucheck.c
12938 +++ b/arch/x86/boot/cpucheck.c
12939 @@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12940 u32 ecx = MSR_K7_HWCR;
12941 u32 eax, edx;
12942
12943 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12944 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12945 eax &= ~(1 << 15);
12946 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12947 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12948
12949 get_cpuflags(); /* Make sure it really did something */
12950 err = check_cpuflags();
12951 @@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12952 u32 ecx = MSR_VIA_FCR;
12953 u32 eax, edx;
12954
12955 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12956 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12957 eax |= (1<<1)|(1<<7);
12958 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12959 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12960
12961 set_bit(X86_FEATURE_CX8, cpu.flags);
12962 err = check_cpuflags();
12963 @@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12964 u32 eax, edx;
12965 u32 level = 1;
12966
12967 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12968 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12969 - asm("cpuid"
12970 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12971 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12972 + asm volatile("cpuid"
12973 : "+a" (level), "=d" (cpu.flags[0])
12974 : : "ecx", "ebx");
12975 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12976 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12977
12978 err = check_cpuflags();
12979 } else if (err == 0x01 &&
12980 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12981 index 16ef025..91e033b 100644
12982 --- a/arch/x86/boot/header.S
12983 +++ b/arch/x86/boot/header.S
12984 @@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12985 # single linked list of
12986 # struct setup_data
12987
12988 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12989 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12990
12991 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12992 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12993 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12994 +#else
12995 #define VO_INIT_SIZE (VO__end - VO__text)
12996 +#endif
12997 #if ZO_INIT_SIZE > VO_INIT_SIZE
12998 #define INIT_SIZE ZO_INIT_SIZE
12999 #else
13000 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13001 index db75d07..8e6d0af 100644
13002 --- a/arch/x86/boot/memory.c
13003 +++ b/arch/x86/boot/memory.c
13004 @@ -19,7 +19,7 @@
13005
13006 static int detect_memory_e820(void)
13007 {
13008 - int count = 0;
13009 + unsigned int count = 0;
13010 struct biosregs ireg, oreg;
13011 struct e820entry *desc = boot_params.e820_map;
13012 static struct e820entry buf; /* static so it is zeroed */
13013 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13014 index ba3e100..6501b8f 100644
13015 --- a/arch/x86/boot/video-vesa.c
13016 +++ b/arch/x86/boot/video-vesa.c
13017 @@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13018
13019 boot_params.screen_info.vesapm_seg = oreg.es;
13020 boot_params.screen_info.vesapm_off = oreg.di;
13021 + boot_params.screen_info.vesapm_size = oreg.cx;
13022 }
13023
13024 /*
13025 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13026 index 43eda28..5ab5fdb 100644
13027 --- a/arch/x86/boot/video.c
13028 +++ b/arch/x86/boot/video.c
13029 @@ -96,7 +96,7 @@ static void store_mode_params(void)
13030 static unsigned int get_entry(void)
13031 {
13032 char entry_buf[4];
13033 - int i, len = 0;
13034 + unsigned int i, len = 0;
13035 int key;
13036 unsigned int v;
13037
13038 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13039 index 9105655..41779c1 100644
13040 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
13041 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13042 @@ -8,6 +8,8 @@
13043 * including this sentence is retained in full.
13044 */
13045
13046 +#include <asm/alternative-asm.h>
13047 +
13048 .extern crypto_ft_tab
13049 .extern crypto_it_tab
13050 .extern crypto_fl_tab
13051 @@ -70,6 +72,8 @@
13052 je B192; \
13053 leaq 32(r9),r9;
13054
13055 +#define ret pax_force_retaddr; ret
13056 +
13057 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13058 movq r1,r2; \
13059 movq r3,r4; \
13060 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13061 index 477e9d7..c92c7d8 100644
13062 --- a/arch/x86/crypto/aesni-intel_asm.S
13063 +++ b/arch/x86/crypto/aesni-intel_asm.S
13064 @@ -31,6 +31,7 @@
13065
13066 #include <linux/linkage.h>
13067 #include <asm/inst.h>
13068 +#include <asm/alternative-asm.h>
13069
13070 #ifdef __x86_64__
13071 .data
13072 @@ -205,7 +206,7 @@ enc: .octa 0x2
13073 * num_initial_blocks = b mod 4
13074 * encrypt the initial num_initial_blocks blocks and apply ghash on
13075 * the ciphertext
13076 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13077 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13078 * are clobbered
13079 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13080 */
13081 @@ -214,8 +215,8 @@ enc: .octa 0x2
13082 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13083 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13084 mov arg7, %r10 # %r10 = AAD
13085 - mov arg8, %r12 # %r12 = aadLen
13086 - mov %r12, %r11
13087 + mov arg8, %r15 # %r15 = aadLen
13088 + mov %r15, %r11
13089 pxor %xmm\i, %xmm\i
13090 _get_AAD_loop\num_initial_blocks\operation:
13091 movd (%r10), \TMP1
13092 @@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13093 psrldq $4, %xmm\i
13094 pxor \TMP1, %xmm\i
13095 add $4, %r10
13096 - sub $4, %r12
13097 + sub $4, %r15
13098 jne _get_AAD_loop\num_initial_blocks\operation
13099 cmp $16, %r11
13100 je _get_AAD_loop2_done\num_initial_blocks\operation
13101 - mov $16, %r12
13102 + mov $16, %r15
13103 _get_AAD_loop2\num_initial_blocks\operation:
13104 psrldq $4, %xmm\i
13105 - sub $4, %r12
13106 - cmp %r11, %r12
13107 + sub $4, %r15
13108 + cmp %r11, %r15
13109 jne _get_AAD_loop2\num_initial_blocks\operation
13110 _get_AAD_loop2_done\num_initial_blocks\operation:
13111 movdqa SHUF_MASK(%rip), %xmm14
13112 @@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13113 * num_initial_blocks = b mod 4
13114 * encrypt the initial num_initial_blocks blocks and apply ghash on
13115 * the ciphertext
13116 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13117 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13118 * are clobbered
13119 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13120 */
13121 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13122 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13123 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13124 mov arg7, %r10 # %r10 = AAD
13125 - mov arg8, %r12 # %r12 = aadLen
13126 - mov %r12, %r11
13127 + mov arg8, %r15 # %r15 = aadLen
13128 + mov %r15, %r11
13129 pxor %xmm\i, %xmm\i
13130 _get_AAD_loop\num_initial_blocks\operation:
13131 movd (%r10), \TMP1
13132 @@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13133 psrldq $4, %xmm\i
13134 pxor \TMP1, %xmm\i
13135 add $4, %r10
13136 - sub $4, %r12
13137 + sub $4, %r15
13138 jne _get_AAD_loop\num_initial_blocks\operation
13139 cmp $16, %r11
13140 je _get_AAD_loop2_done\num_initial_blocks\operation
13141 - mov $16, %r12
13142 + mov $16, %r15
13143 _get_AAD_loop2\num_initial_blocks\operation:
13144 psrldq $4, %xmm\i
13145 - sub $4, %r12
13146 - cmp %r11, %r12
13147 + sub $4, %r15
13148 + cmp %r11, %r15
13149 jne _get_AAD_loop2\num_initial_blocks\operation
13150 _get_AAD_loop2_done\num_initial_blocks\operation:
13151 movdqa SHUF_MASK(%rip), %xmm14
13152 @@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13153 *
13154 *****************************************************************************/
13155 ENTRY(aesni_gcm_dec)
13156 - push %r12
13157 + push %r15
13158 push %r13
13159 push %r14
13160 mov %rsp, %r14
13161 @@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13162 */
13163 sub $VARIABLE_OFFSET, %rsp
13164 and $~63, %rsp # align rsp to 64 bytes
13165 - mov %arg6, %r12
13166 - movdqu (%r12), %xmm13 # %xmm13 = HashKey
13167 + mov %arg6, %r15
13168 + movdqu (%r15), %xmm13 # %xmm13 = HashKey
13169 movdqa SHUF_MASK(%rip), %xmm2
13170 PSHUFB_XMM %xmm2, %xmm13
13171
13172 @@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13173 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13174 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13175 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13176 - mov %r13, %r12
13177 - and $(3<<4), %r12
13178 + mov %r13, %r15
13179 + and $(3<<4), %r15
13180 jz _initial_num_blocks_is_0_decrypt
13181 - cmp $(2<<4), %r12
13182 + cmp $(2<<4), %r15
13183 jb _initial_num_blocks_is_1_decrypt
13184 je _initial_num_blocks_is_2_decrypt
13185 _initial_num_blocks_is_3_decrypt:
13186 @@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13187 sub $16, %r11
13188 add %r13, %r11
13189 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13190 - lea SHIFT_MASK+16(%rip), %r12
13191 - sub %r13, %r12
13192 + lea SHIFT_MASK+16(%rip), %r15
13193 + sub %r13, %r15
13194 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13195 # (%r13 is the number of bytes in plaintext mod 16)
13196 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13197 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13198 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13199
13200 movdqa %xmm1, %xmm2
13201 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13202 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13203 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13204 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13205 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13206 pand %xmm1, %xmm2
13207 @@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13208 sub $1, %r13
13209 jne _less_than_8_bytes_left_decrypt
13210 _multiple_of_16_bytes_decrypt:
13211 - mov arg8, %r12 # %r13 = aadLen (number of bytes)
13212 - shl $3, %r12 # convert into number of bits
13213 - movd %r12d, %xmm15 # len(A) in %xmm15
13214 + mov arg8, %r15 # %r13 = aadLen (number of bytes)
13215 + shl $3, %r15 # convert into number of bits
13216 + movd %r15d, %xmm15 # len(A) in %xmm15
13217 shl $3, %arg4 # len(C) in bits (*128)
13218 MOVQ_R64_XMM %arg4, %xmm1
13219 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13220 @@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13221 mov %r14, %rsp
13222 pop %r14
13223 pop %r13
13224 - pop %r12
13225 + pop %r15
13226 + pax_force_retaddr
13227 ret
13228 ENDPROC(aesni_gcm_dec)
13229
13230 @@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13231 * poly = x^128 + x^127 + x^126 + x^121 + 1
13232 ***************************************************************************/
13233 ENTRY(aesni_gcm_enc)
13234 - push %r12
13235 + push %r15
13236 push %r13
13237 push %r14
13238 mov %rsp, %r14
13239 @@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13240 #
13241 sub $VARIABLE_OFFSET, %rsp
13242 and $~63, %rsp
13243 - mov %arg6, %r12
13244 - movdqu (%r12), %xmm13
13245 + mov %arg6, %r15
13246 + movdqu (%r15), %xmm13
13247 movdqa SHUF_MASK(%rip), %xmm2
13248 PSHUFB_XMM %xmm2, %xmm13
13249
13250 @@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13251 movdqa %xmm13, HashKey(%rsp)
13252 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13253 and $-16, %r13
13254 - mov %r13, %r12
13255 + mov %r13, %r15
13256
13257 # Encrypt first few blocks
13258
13259 - and $(3<<4), %r12
13260 + and $(3<<4), %r15
13261 jz _initial_num_blocks_is_0_encrypt
13262 - cmp $(2<<4), %r12
13263 + cmp $(2<<4), %r15
13264 jb _initial_num_blocks_is_1_encrypt
13265 je _initial_num_blocks_is_2_encrypt
13266 _initial_num_blocks_is_3_encrypt:
13267 @@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13268 sub $16, %r11
13269 add %r13, %r11
13270 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13271 - lea SHIFT_MASK+16(%rip), %r12
13272 - sub %r13, %r12
13273 + lea SHIFT_MASK+16(%rip), %r15
13274 + sub %r13, %r15
13275 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13276 # (%r13 is the number of bytes in plaintext mod 16)
13277 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13278 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13279 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13280 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13281 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13282 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13283 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13284 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13285 movdqa SHUF_MASK(%rip), %xmm10
13286 @@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13287 sub $1, %r13
13288 jne _less_than_8_bytes_left_encrypt
13289 _multiple_of_16_bytes_encrypt:
13290 - mov arg8, %r12 # %r12 = addLen (number of bytes)
13291 - shl $3, %r12
13292 - movd %r12d, %xmm15 # len(A) in %xmm15
13293 + mov arg8, %r15 # %r15 = addLen (number of bytes)
13294 + shl $3, %r15
13295 + movd %r15d, %xmm15 # len(A) in %xmm15
13296 shl $3, %arg4 # len(C) in bits (*128)
13297 MOVQ_R64_XMM %arg4, %xmm1
13298 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13299 @@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13300 mov %r14, %rsp
13301 pop %r14
13302 pop %r13
13303 - pop %r12
13304 + pop %r15
13305 + pax_force_retaddr
13306 ret
13307 ENDPROC(aesni_gcm_enc)
13308
13309 @@ -1722,6 +1725,7 @@ _key_expansion_256a:
13310 pxor %xmm1, %xmm0
13311 movaps %xmm0, (TKEYP)
13312 add $0x10, TKEYP
13313 + pax_force_retaddr
13314 ret
13315 ENDPROC(_key_expansion_128)
13316 ENDPROC(_key_expansion_256a)
13317 @@ -1748,6 +1752,7 @@ _key_expansion_192a:
13318 shufps $0b01001110, %xmm2, %xmm1
13319 movaps %xmm1, 0x10(TKEYP)
13320 add $0x20, TKEYP
13321 + pax_force_retaddr
13322 ret
13323 ENDPROC(_key_expansion_192a)
13324
13325 @@ -1768,6 +1773,7 @@ _key_expansion_192b:
13326
13327 movaps %xmm0, (TKEYP)
13328 add $0x10, TKEYP
13329 + pax_force_retaddr
13330 ret
13331 ENDPROC(_key_expansion_192b)
13332
13333 @@ -1781,6 +1787,7 @@ _key_expansion_256b:
13334 pxor %xmm1, %xmm2
13335 movaps %xmm2, (TKEYP)
13336 add $0x10, TKEYP
13337 + pax_force_retaddr
13338 ret
13339 ENDPROC(_key_expansion_256b)
13340
13341 @@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13342 #ifndef __x86_64__
13343 popl KEYP
13344 #endif
13345 + pax_force_retaddr
13346 ret
13347 ENDPROC(aesni_set_key)
13348
13349 @@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13350 popl KLEN
13351 popl KEYP
13352 #endif
13353 + pax_force_retaddr
13354 ret
13355 ENDPROC(aesni_enc)
13356
13357 @@ -1974,6 +1983,7 @@ _aesni_enc1:
13358 AESENC KEY STATE
13359 movaps 0x70(TKEYP), KEY
13360 AESENCLAST KEY STATE
13361 + pax_force_retaddr
13362 ret
13363 ENDPROC(_aesni_enc1)
13364
13365 @@ -2083,6 +2093,7 @@ _aesni_enc4:
13366 AESENCLAST KEY STATE2
13367 AESENCLAST KEY STATE3
13368 AESENCLAST KEY STATE4
13369 + pax_force_retaddr
13370 ret
13371 ENDPROC(_aesni_enc4)
13372
13373 @@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13374 popl KLEN
13375 popl KEYP
13376 #endif
13377 + pax_force_retaddr
13378 ret
13379 ENDPROC(aesni_dec)
13380
13381 @@ -2164,6 +2176,7 @@ _aesni_dec1:
13382 AESDEC KEY STATE
13383 movaps 0x70(TKEYP), KEY
13384 AESDECLAST KEY STATE
13385 + pax_force_retaddr
13386 ret
13387 ENDPROC(_aesni_dec1)
13388
13389 @@ -2273,6 +2286,7 @@ _aesni_dec4:
13390 AESDECLAST KEY STATE2
13391 AESDECLAST KEY STATE3
13392 AESDECLAST KEY STATE4
13393 + pax_force_retaddr
13394 ret
13395 ENDPROC(_aesni_dec4)
13396
13397 @@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13398 popl KEYP
13399 popl LEN
13400 #endif
13401 + pax_force_retaddr
13402 ret
13403 ENDPROC(aesni_ecb_enc)
13404
13405 @@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13406 popl KEYP
13407 popl LEN
13408 #endif
13409 + pax_force_retaddr
13410 ret
13411 ENDPROC(aesni_ecb_dec)
13412
13413 @@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13414 popl LEN
13415 popl IVP
13416 #endif
13417 + pax_force_retaddr
13418 ret
13419 ENDPROC(aesni_cbc_enc)
13420
13421 @@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13422 popl LEN
13423 popl IVP
13424 #endif
13425 + pax_force_retaddr
13426 ret
13427 ENDPROC(aesni_cbc_dec)
13428
13429 @@ -2550,6 +2568,7 @@ _aesni_inc_init:
13430 mov $1, TCTR_LOW
13431 MOVQ_R64_XMM TCTR_LOW INC
13432 MOVQ_R64_XMM CTR TCTR_LOW
13433 + pax_force_retaddr
13434 ret
13435 ENDPROC(_aesni_inc_init)
13436
13437 @@ -2579,6 +2598,7 @@ _aesni_inc:
13438 .Linc_low:
13439 movaps CTR, IV
13440 PSHUFB_XMM BSWAP_MASK IV
13441 + pax_force_retaddr
13442 ret
13443 ENDPROC(_aesni_inc)
13444
13445 @@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13446 .Lctr_enc_ret:
13447 movups IV, (IVP)
13448 .Lctr_enc_just_ret:
13449 + pax_force_retaddr
13450 ret
13451 ENDPROC(aesni_ctr_enc)
13452
13453 @@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13454 pxor INC, STATE4
13455 movdqu STATE4, 0x70(OUTP)
13456
13457 + pax_force_retaddr
13458 ret
13459 ENDPROC(aesni_xts_crypt8)
13460
13461 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13462 index 246c670..466e2d6 100644
13463 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13464 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13465 @@ -21,6 +21,7 @@
13466 */
13467
13468 #include <linux/linkage.h>
13469 +#include <asm/alternative-asm.h>
13470
13471 .file "blowfish-x86_64-asm.S"
13472 .text
13473 @@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13474 jnz .L__enc_xor;
13475
13476 write_block();
13477 + pax_force_retaddr
13478 ret;
13479 .L__enc_xor:
13480 xor_block();
13481 + pax_force_retaddr
13482 ret;
13483 ENDPROC(__blowfish_enc_blk)
13484
13485 @@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13486
13487 movq %r11, %rbp;
13488
13489 + pax_force_retaddr
13490 ret;
13491 ENDPROC(blowfish_dec_blk)
13492
13493 @@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13494
13495 popq %rbx;
13496 popq %rbp;
13497 + pax_force_retaddr
13498 ret;
13499
13500 .L__enc_xor4:
13501 @@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13502
13503 popq %rbx;
13504 popq %rbp;
13505 + pax_force_retaddr
13506 ret;
13507 ENDPROC(__blowfish_enc_blk_4way)
13508
13509 @@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13510 popq %rbx;
13511 popq %rbp;
13512
13513 + pax_force_retaddr
13514 ret;
13515 ENDPROC(blowfish_dec_blk_4way)
13516 diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13517 index ce71f92..1dce7ec 100644
13518 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13519 +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13520 @@ -16,6 +16,7 @@
13521 */
13522
13523 #include <linux/linkage.h>
13524 +#include <asm/alternative-asm.h>
13525
13526 #define CAMELLIA_TABLE_BYTE_LEN 272
13527
13528 @@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13529 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13530 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13531 %rcx, (%r9));
13532 + pax_force_retaddr
13533 ret;
13534 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13535
13536 @@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13537 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13538 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13539 %rax, (%r9));
13540 + pax_force_retaddr
13541 ret;
13542 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13543
13544 @@ -780,6 +783,7 @@ __camellia_enc_blk16:
13545 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13546 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13547
13548 + pax_force_retaddr
13549 ret;
13550
13551 .align 8
13552 @@ -865,6 +869,7 @@ __camellia_dec_blk16:
13553 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13554 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13555
13556 + pax_force_retaddr
13557 ret;
13558
13559 .align 8
13560 @@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13561 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13562 %xmm8, %rsi);
13563
13564 + pax_force_retaddr
13565 ret;
13566 ENDPROC(camellia_ecb_enc_16way)
13567
13568 @@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13569 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13570 %xmm8, %rsi);
13571
13572 + pax_force_retaddr
13573 ret;
13574 ENDPROC(camellia_ecb_dec_16way)
13575
13576 @@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13577 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13578 %xmm8, %rsi);
13579
13580 + pax_force_retaddr
13581 ret;
13582 ENDPROC(camellia_cbc_dec_16way)
13583
13584 @@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13585 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13586 %xmm8, %rsi);
13587
13588 + pax_force_retaddr
13589 ret;
13590 ENDPROC(camellia_ctr_16way)
13591
13592 @@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13593 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13594 %xmm8, %rsi);
13595
13596 + pax_force_retaddr
13597 ret;
13598 ENDPROC(camellia_xts_crypt_16way)
13599
13600 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13601 index 0e0b886..5a3123c 100644
13602 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13603 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13604 @@ -11,6 +11,7 @@
13605 */
13606
13607 #include <linux/linkage.h>
13608 +#include <asm/alternative-asm.h>
13609
13610 #define CAMELLIA_TABLE_BYTE_LEN 272
13611
13612 @@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13613 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13614 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13615 %rcx, (%r9));
13616 + pax_force_retaddr
13617 ret;
13618 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13619
13620 @@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13621 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13622 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13623 %rax, (%r9));
13624 + pax_force_retaddr
13625 ret;
13626 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13627
13628 @@ -820,6 +823,7 @@ __camellia_enc_blk32:
13629 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13630 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13631
13632 + pax_force_retaddr
13633 ret;
13634
13635 .align 8
13636 @@ -905,6 +909,7 @@ __camellia_dec_blk32:
13637 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13638 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13639
13640 + pax_force_retaddr
13641 ret;
13642
13643 .align 8
13644 @@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13645
13646 vzeroupper;
13647
13648 + pax_force_retaddr
13649 ret;
13650 ENDPROC(camellia_ecb_enc_32way)
13651
13652 @@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13653
13654 vzeroupper;
13655
13656 + pax_force_retaddr
13657 ret;
13658 ENDPROC(camellia_ecb_dec_32way)
13659
13660 @@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13661
13662 vzeroupper;
13663
13664 + pax_force_retaddr
13665 ret;
13666 ENDPROC(camellia_cbc_dec_32way)
13667
13668 @@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13669
13670 vzeroupper;
13671
13672 + pax_force_retaddr
13673 ret;
13674 ENDPROC(camellia_ctr_32way)
13675
13676 @@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13677
13678 vzeroupper;
13679
13680 + pax_force_retaddr
13681 ret;
13682 ENDPROC(camellia_xts_crypt_32way)
13683
13684 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13685 index 310319c..db3d7b5 100644
13686 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13687 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13688 @@ -21,6 +21,7 @@
13689 */
13690
13691 #include <linux/linkage.h>
13692 +#include <asm/alternative-asm.h>
13693
13694 .file "camellia-x86_64-asm_64.S"
13695 .text
13696 @@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13697 enc_outunpack(mov, RT1);
13698
13699 movq RRBP, %rbp;
13700 + pax_force_retaddr
13701 ret;
13702
13703 .L__enc_xor:
13704 enc_outunpack(xor, RT1);
13705
13706 movq RRBP, %rbp;
13707 + pax_force_retaddr
13708 ret;
13709 ENDPROC(__camellia_enc_blk)
13710
13711 @@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13712 dec_outunpack();
13713
13714 movq RRBP, %rbp;
13715 + pax_force_retaddr
13716 ret;
13717 ENDPROC(camellia_dec_blk)
13718
13719 @@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13720
13721 movq RRBP, %rbp;
13722 popq %rbx;
13723 + pax_force_retaddr
13724 ret;
13725
13726 .L__enc2_xor:
13727 @@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13728
13729 movq RRBP, %rbp;
13730 popq %rbx;
13731 + pax_force_retaddr
13732 ret;
13733 ENDPROC(__camellia_enc_blk_2way)
13734
13735 @@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13736
13737 movq RRBP, %rbp;
13738 movq RXOR, %rbx;
13739 + pax_force_retaddr
13740 ret;
13741 ENDPROC(camellia_dec_blk_2way)
13742 diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13743 index c35fd5d..2d8c7db 100644
13744 --- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13745 +++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13746 @@ -24,6 +24,7 @@
13747 */
13748
13749 #include <linux/linkage.h>
13750 +#include <asm/alternative-asm.h>
13751
13752 .file "cast5-avx-x86_64-asm_64.S"
13753
13754 @@ -281,6 +282,7 @@ __cast5_enc_blk16:
13755 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13756 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13757
13758 + pax_force_retaddr
13759 ret;
13760 ENDPROC(__cast5_enc_blk16)
13761
13762 @@ -352,6 +354,7 @@ __cast5_dec_blk16:
13763 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13764 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13765
13766 + pax_force_retaddr
13767 ret;
13768
13769 .L__skip_dec:
13770 @@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13771 vmovdqu RR4, (6*4*4)(%r11);
13772 vmovdqu RL4, (7*4*4)(%r11);
13773
13774 + pax_force_retaddr
13775 ret;
13776 ENDPROC(cast5_ecb_enc_16way)
13777
13778 @@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13779 vmovdqu RR4, (6*4*4)(%r11);
13780 vmovdqu RL4, (7*4*4)(%r11);
13781
13782 + pax_force_retaddr
13783 ret;
13784 ENDPROC(cast5_ecb_dec_16way)
13785
13786 @@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13787 * %rdx: src
13788 */
13789
13790 - pushq %r12;
13791 + pushq %r14;
13792
13793 movq %rsi, %r11;
13794 - movq %rdx, %r12;
13795 + movq %rdx, %r14;
13796
13797 vmovdqu (0*16)(%rdx), RL1;
13798 vmovdqu (1*16)(%rdx), RR1;
13799 @@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13800 call __cast5_dec_blk16;
13801
13802 /* xor with src */
13803 - vmovq (%r12), RX;
13804 + vmovq (%r14), RX;
13805 vpshufd $0x4f, RX, RX;
13806 vpxor RX, RR1, RR1;
13807 - vpxor 0*16+8(%r12), RL1, RL1;
13808 - vpxor 1*16+8(%r12), RR2, RR2;
13809 - vpxor 2*16+8(%r12), RL2, RL2;
13810 - vpxor 3*16+8(%r12), RR3, RR3;
13811 - vpxor 4*16+8(%r12), RL3, RL3;
13812 - vpxor 5*16+8(%r12), RR4, RR4;
13813 - vpxor 6*16+8(%r12), RL4, RL4;
13814 + vpxor 0*16+8(%r14), RL1, RL1;
13815 + vpxor 1*16+8(%r14), RR2, RR2;
13816 + vpxor 2*16+8(%r14), RL2, RL2;
13817 + vpxor 3*16+8(%r14), RR3, RR3;
13818 + vpxor 4*16+8(%r14), RL3, RL3;
13819 + vpxor 5*16+8(%r14), RR4, RR4;
13820 + vpxor 6*16+8(%r14), RL4, RL4;
13821
13822 vmovdqu RR1, (0*16)(%r11);
13823 vmovdqu RL1, (1*16)(%r11);
13824 @@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13825 vmovdqu RR4, (6*16)(%r11);
13826 vmovdqu RL4, (7*16)(%r11);
13827
13828 - popq %r12;
13829 + popq %r14;
13830
13831 + pax_force_retaddr
13832 ret;
13833 ENDPROC(cast5_cbc_dec_16way)
13834
13835 @@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13836 * %rcx: iv (big endian, 64bit)
13837 */
13838
13839 - pushq %r12;
13840 + pushq %r14;
13841
13842 movq %rsi, %r11;
13843 - movq %rdx, %r12;
13844 + movq %rdx, %r14;
13845
13846 vpcmpeqd RTMP, RTMP, RTMP;
13847 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13848 @@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13849 call __cast5_enc_blk16;
13850
13851 /* dst = src ^ iv */
13852 - vpxor (0*16)(%r12), RR1, RR1;
13853 - vpxor (1*16)(%r12), RL1, RL1;
13854 - vpxor (2*16)(%r12), RR2, RR2;
13855 - vpxor (3*16)(%r12), RL2, RL2;
13856 - vpxor (4*16)(%r12), RR3, RR3;
13857 - vpxor (5*16)(%r12), RL3, RL3;
13858 - vpxor (6*16)(%r12), RR4, RR4;
13859 - vpxor (7*16)(%r12), RL4, RL4;
13860 + vpxor (0*16)(%r14), RR1, RR1;
13861 + vpxor (1*16)(%r14), RL1, RL1;
13862 + vpxor (2*16)(%r14), RR2, RR2;
13863 + vpxor (3*16)(%r14), RL2, RL2;
13864 + vpxor (4*16)(%r14), RR3, RR3;
13865 + vpxor (5*16)(%r14), RL3, RL3;
13866 + vpxor (6*16)(%r14), RR4, RR4;
13867 + vpxor (7*16)(%r14), RL4, RL4;
13868 vmovdqu RR1, (0*16)(%r11);
13869 vmovdqu RL1, (1*16)(%r11);
13870 vmovdqu RR2, (2*16)(%r11);
13871 @@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13872 vmovdqu RR4, (6*16)(%r11);
13873 vmovdqu RL4, (7*16)(%r11);
13874
13875 - popq %r12;
13876 + popq %r14;
13877
13878 + pax_force_retaddr
13879 ret;
13880 ENDPROC(cast5_ctr_16way)
13881 diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13882 index e3531f8..e123f35 100644
13883 --- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13884 +++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13885 @@ -24,6 +24,7 @@
13886 */
13887
13888 #include <linux/linkage.h>
13889 +#include <asm/alternative-asm.h>
13890 #include "glue_helper-asm-avx.S"
13891
13892 .file "cast6-avx-x86_64-asm_64.S"
13893 @@ -295,6 +296,7 @@ __cast6_enc_blk8:
13894 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13895 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13896
13897 + pax_force_retaddr
13898 ret;
13899 ENDPROC(__cast6_enc_blk8)
13900
13901 @@ -340,6 +342,7 @@ __cast6_dec_blk8:
13902 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13903 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13904
13905 + pax_force_retaddr
13906 ret;
13907 ENDPROC(__cast6_dec_blk8)
13908
13909 @@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13910
13911 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13912
13913 + pax_force_retaddr
13914 ret;
13915 ENDPROC(cast6_ecb_enc_8way)
13916
13917 @@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13918
13919 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13920
13921 + pax_force_retaddr
13922 ret;
13923 ENDPROC(cast6_ecb_dec_8way)
13924
13925 @@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13926 * %rdx: src
13927 */
13928
13929 - pushq %r12;
13930 + pushq %r14;
13931
13932 movq %rsi, %r11;
13933 - movq %rdx, %r12;
13934 + movq %rdx, %r14;
13935
13936 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13937
13938 call __cast6_dec_blk8;
13939
13940 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13941 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13942
13943 - popq %r12;
13944 + popq %r14;
13945
13946 + pax_force_retaddr
13947 ret;
13948 ENDPROC(cast6_cbc_dec_8way)
13949
13950 @@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13951 * %rcx: iv (little endian, 128bit)
13952 */
13953
13954 - pushq %r12;
13955 + pushq %r14;
13956
13957 movq %rsi, %r11;
13958 - movq %rdx, %r12;
13959 + movq %rdx, %r14;
13960
13961 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13962 RD2, RX, RKR, RKM);
13963
13964 call __cast6_enc_blk8;
13965
13966 - store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967 + store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13968
13969 - popq %r12;
13970 + popq %r14;
13971
13972 + pax_force_retaddr
13973 ret;
13974 ENDPROC(cast6_ctr_8way)
13975
13976 @@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13977 /* dst <= regs xor IVs(in dst) */
13978 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13979
13980 + pax_force_retaddr
13981 ret;
13982 ENDPROC(cast6_xts_enc_8way)
13983
13984 @@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13985 /* dst <= regs xor IVs(in dst) */
13986 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13987
13988 + pax_force_retaddr
13989 ret;
13990 ENDPROC(cast6_xts_dec_8way)
13991 diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13992 index 26d49eb..c0a8c84 100644
13993 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13994 +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13995 @@ -45,6 +45,7 @@
13996
13997 #include <asm/inst.h>
13998 #include <linux/linkage.h>
13999 +#include <asm/alternative-asm.h>
14000
14001 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14002
14003 @@ -309,6 +310,7 @@ do_return:
14004 popq %rsi
14005 popq %rdi
14006 popq %rbx
14007 + pax_force_retaddr
14008 ret
14009
14010 ################################################################
14011 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14012 index 5d1e007..098cb4f 100644
14013 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14015 @@ -18,6 +18,7 @@
14016
14017 #include <linux/linkage.h>
14018 #include <asm/inst.h>
14019 +#include <asm/alternative-asm.h>
14020
14021 .data
14022
14023 @@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14024 psrlq $1, T2
14025 pxor T2, T1
14026 pxor T1, DATA
14027 + pax_force_retaddr
14028 ret
14029 ENDPROC(__clmul_gf128mul_ble)
14030
14031 @@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14032 call __clmul_gf128mul_ble
14033 PSHUFB_XMM BSWAP DATA
14034 movups DATA, (%rdi)
14035 + pax_force_retaddr
14036 ret
14037 ENDPROC(clmul_ghash_mul)
14038
14039 @@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14040 PSHUFB_XMM BSWAP DATA
14041 movups DATA, (%rdi)
14042 .Lupdate_just_ret:
14043 + pax_force_retaddr
14044 ret
14045 ENDPROC(clmul_ghash_update)
14046 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14047 index 9279e0b..c4b3d2c 100644
14048 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14050 @@ -1,4 +1,5 @@
14051 #include <linux/linkage.h>
14052 +#include <asm/alternative-asm.h>
14053
14054 # enter salsa20_encrypt_bytes
14055 ENTRY(salsa20_encrypt_bytes)
14056 @@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14057 add %r11,%rsp
14058 mov %rdi,%rax
14059 mov %rsi,%rdx
14060 + pax_force_retaddr
14061 ret
14062 # bytesatleast65:
14063 ._bytesatleast65:
14064 @@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14065 add %r11,%rsp
14066 mov %rdi,%rax
14067 mov %rsi,%rdx
14068 + pax_force_retaddr
14069 ret
14070 ENDPROC(salsa20_keysetup)
14071
14072 @@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14073 add %r11,%rsp
14074 mov %rdi,%rax
14075 mov %rsi,%rdx
14076 + pax_force_retaddr
14077 ret
14078 ENDPROC(salsa20_ivsetup)
14079 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14080 index 2f202f4..d9164d6 100644
14081 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14083 @@ -24,6 +24,7 @@
14084 */
14085
14086 #include <linux/linkage.h>
14087 +#include <asm/alternative-asm.h>
14088 #include "glue_helper-asm-avx.S"
14089
14090 .file "serpent-avx-x86_64-asm_64.S"
14091 @@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14092 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14093 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14094
14095 + pax_force_retaddr
14096 ret;
14097 ENDPROC(__serpent_enc_blk8_avx)
14098
14099 @@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14100 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14101 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14102
14103 + pax_force_retaddr
14104 ret;
14105 ENDPROC(__serpent_dec_blk8_avx)
14106
14107 @@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14108
14109 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14110
14111 + pax_force_retaddr
14112 ret;
14113 ENDPROC(serpent_ecb_enc_8way_avx)
14114
14115 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14116
14117 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14118
14119 + pax_force_retaddr
14120 ret;
14121 ENDPROC(serpent_ecb_dec_8way_avx)
14122
14123 @@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14124
14125 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14126
14127 + pax_force_retaddr
14128 ret;
14129 ENDPROC(serpent_cbc_dec_8way_avx)
14130
14131 @@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14132
14133 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14134
14135 + pax_force_retaddr
14136 ret;
14137 ENDPROC(serpent_ctr_8way_avx)
14138
14139 @@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14140 /* dst <= regs xor IVs(in dst) */
14141 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14142
14143 + pax_force_retaddr
14144 ret;
14145 ENDPROC(serpent_xts_enc_8way_avx)
14146
14147 @@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14148 /* dst <= regs xor IVs(in dst) */
14149 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14150
14151 + pax_force_retaddr
14152 ret;
14153 ENDPROC(serpent_xts_dec_8way_avx)
14154 diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14155 index b222085..abd483c 100644
14156 --- a/arch/x86/crypto/serpent-avx2-asm_64.S
14157 +++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14158 @@ -15,6 +15,7 @@
14159 */
14160
14161 #include <linux/linkage.h>
14162 +#include <asm/alternative-asm.h>
14163 #include "glue_helper-asm-avx2.S"
14164
14165 .file "serpent-avx2-asm_64.S"
14166 @@ -610,6 +611,7 @@ __serpent_enc_blk16:
14167 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14168 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14169
14170 + pax_force_retaddr
14171 ret;
14172 ENDPROC(__serpent_enc_blk16)
14173
14174 @@ -664,6 +666,7 @@ __serpent_dec_blk16:
14175 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14176 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14177
14178 + pax_force_retaddr
14179 ret;
14180 ENDPROC(__serpent_dec_blk16)
14181
14182 @@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14183
14184 vzeroupper;
14185
14186 + pax_force_retaddr
14187 ret;
14188 ENDPROC(serpent_ecb_enc_16way)
14189
14190 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14191
14192 vzeroupper;
14193
14194 + pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_dec_16way)
14197
14198 @@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14199
14200 vzeroupper;
14201
14202 + pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_cbc_dec_16way)
14205
14206 @@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14207
14208 vzeroupper;
14209
14210 + pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_ctr_16way)
14213
14214 @@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14215
14216 vzeroupper;
14217
14218 + pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_xts_enc_16way)
14221
14222 @@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14223
14224 vzeroupper;
14225
14226 + pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_dec_16way)
14229 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14230 index acc066c..1559cc4 100644
14231 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14233 @@ -25,6 +25,7 @@
14234 */
14235
14236 #include <linux/linkage.h>
14237 +#include <asm/alternative-asm.h>
14238
14239 .file "serpent-sse2-x86_64-asm_64.S"
14240 .text
14241 @@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14242 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14243 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14244
14245 + pax_force_retaddr
14246 ret;
14247
14248 .L__enc_xor8:
14249 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14250 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14251
14252 + pax_force_retaddr
14253 ret;
14254 ENDPROC(__serpent_enc_blk_8way)
14255
14256 @@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14257 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14258 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14259
14260 + pax_force_retaddr
14261 ret;
14262 ENDPROC(serpent_dec_blk_8way)
14263 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14264 index a410950..9dfe7ad 100644
14265 --- a/arch/x86/crypto/sha1_ssse3_asm.S
14266 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
14267 @@ -29,6 +29,7 @@
14268 */
14269
14270 #include <linux/linkage.h>
14271 +#include <asm/alternative-asm.h>
14272
14273 #define CTX %rdi // arg1
14274 #define BUF %rsi // arg2
14275 @@ -75,9 +76,9 @@
14276
14277 push %rbx
14278 push %rbp
14279 - push %r12
14280 + push %r14
14281
14282 - mov %rsp, %r12
14283 + mov %rsp, %r14
14284 sub $64, %rsp # allocate workspace
14285 and $~15, %rsp # align stack
14286
14287 @@ -99,11 +100,12 @@
14288 xor %rax, %rax
14289 rep stosq
14290
14291 - mov %r12, %rsp # deallocate workspace
14292 + mov %r14, %rsp # deallocate workspace
14293
14294 - pop %r12
14295 + pop %r14
14296 pop %rbp
14297 pop %rbx
14298 + pax_force_retaddr
14299 ret
14300
14301 ENDPROC(\name)
14302 diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14303 index 642f156..51a513c 100644
14304 --- a/arch/x86/crypto/sha256-avx-asm.S
14305 +++ b/arch/x86/crypto/sha256-avx-asm.S
14306 @@ -49,6 +49,7 @@
14307
14308 #ifdef CONFIG_AS_AVX
14309 #include <linux/linkage.h>
14310 +#include <asm/alternative-asm.h>
14311
14312 ## assume buffers not aligned
14313 #define VMOVDQ vmovdqu
14314 @@ -460,6 +461,7 @@ done_hash:
14315 popq %r13
14316 popq %rbp
14317 popq %rbx
14318 + pax_force_retaddr
14319 ret
14320 ENDPROC(sha256_transform_avx)
14321
14322 diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14323 index 9e86944..3795e6a 100644
14324 --- a/arch/x86/crypto/sha256-avx2-asm.S
14325 +++ b/arch/x86/crypto/sha256-avx2-asm.S
14326 @@ -50,6 +50,7 @@
14327
14328 #ifdef CONFIG_AS_AVX2
14329 #include <linux/linkage.h>
14330 +#include <asm/alternative-asm.h>
14331
14332 ## assume buffers not aligned
14333 #define VMOVDQ vmovdqu
14334 @@ -720,6 +721,7 @@ done_hash:
14335 popq %r12
14336 popq %rbp
14337 popq %rbx
14338 + pax_force_retaddr
14339 ret
14340 ENDPROC(sha256_transform_rorx)
14341
14342 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14343 index f833b74..8c62a9e 100644
14344 --- a/arch/x86/crypto/sha256-ssse3-asm.S
14345 +++ b/arch/x86/crypto/sha256-ssse3-asm.S
14346 @@ -47,6 +47,7 @@
14347 ########################################################################
14348
14349 #include <linux/linkage.h>
14350 +#include <asm/alternative-asm.h>
14351
14352 ## assume buffers not aligned
14353 #define MOVDQ movdqu
14354 @@ -471,6 +472,7 @@ done_hash:
14355 popq %rbp
14356 popq %rbx
14357
14358 + pax_force_retaddr
14359 ret
14360 ENDPROC(sha256_transform_ssse3)
14361
14362 diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14363 index 974dde9..a823ff9 100644
14364 --- a/arch/x86/crypto/sha512-avx-asm.S
14365 +++ b/arch/x86/crypto/sha512-avx-asm.S
14366 @@ -49,6 +49,7 @@
14367
14368 #ifdef CONFIG_AS_AVX
14369 #include <linux/linkage.h>
14370 +#include <asm/alternative-asm.h>
14371
14372 .text
14373
14374 @@ -364,6 +365,7 @@ updateblock:
14375 mov frame_RSPSAVE(%rsp), %rsp
14376
14377 nowork:
14378 + pax_force_retaddr
14379 ret
14380 ENDPROC(sha512_transform_avx)
14381
14382 diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14383 index 568b961..ed20c37 100644
14384 --- a/arch/x86/crypto/sha512-avx2-asm.S
14385 +++ b/arch/x86/crypto/sha512-avx2-asm.S
14386 @@ -51,6 +51,7 @@
14387
14388 #ifdef CONFIG_AS_AVX2
14389 #include <linux/linkage.h>
14390 +#include <asm/alternative-asm.h>
14391
14392 .text
14393
14394 @@ -678,6 +679,7 @@ done_hash:
14395
14396 # Restore Stack Pointer
14397 mov frame_RSPSAVE(%rsp), %rsp
14398 + pax_force_retaddr
14399 ret
14400 ENDPROC(sha512_transform_rorx)
14401
14402 diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14403 index fb56855..6edd768 100644
14404 --- a/arch/x86/crypto/sha512-ssse3-asm.S
14405 +++ b/arch/x86/crypto/sha512-ssse3-asm.S
14406 @@ -48,6 +48,7 @@
14407 ########################################################################
14408
14409 #include <linux/linkage.h>
14410 +#include <asm/alternative-asm.h>
14411
14412 .text
14413
14414 @@ -363,6 +364,7 @@ updateblock:
14415 mov frame_RSPSAVE(%rsp), %rsp
14416
14417 nowork:
14418 + pax_force_retaddr
14419 ret
14420 ENDPROC(sha512_transform_ssse3)
14421
14422 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14423 index 0505813..b067311 100644
14424 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14426 @@ -24,6 +24,7 @@
14427 */
14428
14429 #include <linux/linkage.h>
14430 +#include <asm/alternative-asm.h>
14431 #include "glue_helper-asm-avx.S"
14432
14433 .file "twofish-avx-x86_64-asm_64.S"
14434 @@ -284,6 +285,7 @@ __twofish_enc_blk8:
14435 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14436 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14437
14438 + pax_force_retaddr
14439 ret;
14440 ENDPROC(__twofish_enc_blk8)
14441
14442 @@ -324,6 +326,7 @@ __twofish_dec_blk8:
14443 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14444 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14445
14446 + pax_force_retaddr
14447 ret;
14448 ENDPROC(__twofish_dec_blk8)
14449
14450 @@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14451
14452 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14453
14454 + pax_force_retaddr
14455 ret;
14456 ENDPROC(twofish_ecb_enc_8way)
14457
14458 @@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14459
14460 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14461
14462 + pax_force_retaddr
14463 ret;
14464 ENDPROC(twofish_ecb_dec_8way)
14465
14466 @@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14467 * %rdx: src
14468 */
14469
14470 - pushq %r12;
14471 + pushq %r14;
14472
14473 movq %rsi, %r11;
14474 - movq %rdx, %r12;
14475 + movq %rdx, %r14;
14476
14477 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14478
14479 call __twofish_dec_blk8;
14480
14481 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14482 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14483
14484 - popq %r12;
14485 + popq %r14;
14486
14487 + pax_force_retaddr
14488 ret;
14489 ENDPROC(twofish_cbc_dec_8way)
14490
14491 @@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14492 * %rcx: iv (little endian, 128bit)
14493 */
14494
14495 - pushq %r12;
14496 + pushq %r14;
14497
14498 movq %rsi, %r11;
14499 - movq %rdx, %r12;
14500 + movq %rdx, %r14;
14501
14502 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14503 RD2, RX0, RX1, RY0);
14504
14505 call __twofish_enc_blk8;
14506
14507 - store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14508 + store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14509
14510 - popq %r12;
14511 + popq %r14;
14512
14513 + pax_force_retaddr
14514 ret;
14515 ENDPROC(twofish_ctr_8way)
14516
14517 @@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14518 /* dst <= regs xor IVs(in dst) */
14519 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14520
14521 + pax_force_retaddr
14522 ret;
14523 ENDPROC(twofish_xts_enc_8way)
14524
14525 @@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14526 /* dst <= regs xor IVs(in dst) */
14527 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14528
14529 + pax_force_retaddr
14530 ret;
14531 ENDPROC(twofish_xts_dec_8way)
14532 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14533 index 1c3b7ce..02f578d 100644
14534 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14536 @@ -21,6 +21,7 @@
14537 */
14538
14539 #include <linux/linkage.h>
14540 +#include <asm/alternative-asm.h>
14541
14542 .file "twofish-x86_64-asm-3way.S"
14543 .text
14544 @@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14545 popq %r13;
14546 popq %r14;
14547 popq %r15;
14548 + pax_force_retaddr
14549 ret;
14550
14551 .L__enc_xor3:
14552 @@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14553 popq %r13;
14554 popq %r14;
14555 popq %r15;
14556 + pax_force_retaddr
14557 ret;
14558 ENDPROC(__twofish_enc_blk_3way)
14559
14560 @@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14561 popq %r13;
14562 popq %r14;
14563 popq %r15;
14564 + pax_force_retaddr
14565 ret;
14566 ENDPROC(twofish_dec_blk_3way)
14567 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14568 index a039d21..524b8b2 100644
14569 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14570 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14571 @@ -22,6 +22,7 @@
14572
14573 #include <linux/linkage.h>
14574 #include <asm/asm-offsets.h>
14575 +#include <asm/alternative-asm.h>
14576
14577 #define a_offset 0
14578 #define b_offset 4
14579 @@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14580
14581 popq R1
14582 movq $1,%rax
14583 + pax_force_retaddr
14584 ret
14585 ENDPROC(twofish_enc_blk)
14586
14587 @@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14588
14589 popq R1
14590 movq $1,%rax
14591 + pax_force_retaddr
14592 ret
14593 ENDPROC(twofish_dec_blk)
14594 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14595 index df91466..74b31cb 100644
14596 --- a/arch/x86/ia32/ia32_aout.c
14597 +++ b/arch/x86/ia32/ia32_aout.c
14598 @@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14599 unsigned long dump_start, dump_size;
14600 struct user32 dump;
14601
14602 + memset(&dump, 0, sizeof(dump));
14603 +
14604 fs = get_fs();
14605 set_fs(KERNEL_DS);
14606 has_dumped = 1;
14607 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14608 index f9e181a..300544c 100644
14609 --- a/arch/x86/ia32/ia32_signal.c
14610 +++ b/arch/x86/ia32/ia32_signal.c
14611 @@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14612 if (__get_user(set.sig[0], &frame->sc.oldmask)
14613 || (_COMPAT_NSIG_WORDS > 1
14614 && __copy_from_user((((char *) &set.sig) + 4),
14615 - &frame->extramask,
14616 + frame->extramask,
14617 sizeof(frame->extramask))))
14618 goto badframe;
14619
14620 @@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14621 sp -= frame_size;
14622 /* Align the stack pointer according to the i386 ABI,
14623 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14624 - sp = ((sp + 4) & -16ul) - 4;
14625 + sp = ((sp - 12) & -16ul) - 4;
14626 return (void __user *) sp;
14627 }
14628
14629 @@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14630 } else {
14631 /* Return stub is in 32bit vsyscall page */
14632 if (current->mm->context.vdso)
14633 - restorer = current->mm->context.vdso +
14634 - selected_vdso32->sym___kernel_sigreturn;
14635 + restorer = (void __force_user *)(current->mm->context.vdso +
14636 + selected_vdso32->sym___kernel_sigreturn);
14637 else
14638 - restorer = &frame->retcode;
14639 + restorer = frame->retcode;
14640 }
14641
14642 put_user_try {
14643 @@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14644 * These are actually not used anymore, but left because some
14645 * gdb versions depend on them as a marker.
14646 */
14647 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14648 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14649 } put_user_catch(err);
14650
14651 if (err)
14652 @@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14653 0xb8,
14654 __NR_ia32_rt_sigreturn,
14655 0x80cd,
14656 - 0,
14657 + 0
14658 };
14659
14660 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14661 @@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14662
14663 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14664 restorer = ksig->ka.sa.sa_restorer;
14665 + else if (current->mm->context.vdso)
14666 + /* Return stub is in 32bit vsyscall page */
14667 + restorer = (void __force_user *)(current->mm->context.vdso +
14668 + selected_vdso32->sym___kernel_rt_sigreturn);
14669 else
14670 - restorer = current->mm->context.vdso +
14671 - selected_vdso32->sym___kernel_rt_sigreturn;
14672 + restorer = frame->retcode;
14673 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14674
14675 /*
14676 * Not actually used anymore, but left because some gdb
14677 * versions need it.
14678 */
14679 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14680 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14681 } put_user_catch(err);
14682
14683 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14684 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14685 index ffe7122..899bad3 100644
14686 --- a/arch/x86/ia32/ia32entry.S
14687 +++ b/arch/x86/ia32/ia32entry.S
14688 @@ -15,8 +15,10 @@
14689 #include <asm/irqflags.h>
14690 #include <asm/asm.h>
14691 #include <asm/smap.h>
14692 +#include <asm/pgtable.h>
14693 #include <linux/linkage.h>
14694 #include <linux/err.h>
14695 +#include <asm/alternative-asm.h>
14696
14697 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14698 #include <linux/elf-em.h>
14699 @@ -62,12 +64,12 @@
14700 */
14701 .macro LOAD_ARGS32 offset, _r9=0
14702 .if \_r9
14703 - movl \offset+16(%rsp),%r9d
14704 + movl \offset+R9(%rsp),%r9d
14705 .endif
14706 - movl \offset+40(%rsp),%ecx
14707 - movl \offset+48(%rsp),%edx
14708 - movl \offset+56(%rsp),%esi
14709 - movl \offset+64(%rsp),%edi
14710 + movl \offset+RCX(%rsp),%ecx
14711 + movl \offset+RDX(%rsp),%edx
14712 + movl \offset+RSI(%rsp),%esi
14713 + movl \offset+RDI(%rsp),%edi
14714 movl %eax,%eax /* zero extension */
14715 .endm
14716
14717 @@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14718 ENDPROC(native_irq_enable_sysexit)
14719 #endif
14720
14721 + .macro pax_enter_kernel_user
14722 + pax_set_fptr_mask
14723 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14724 + call pax_enter_kernel_user
14725 +#endif
14726 + .endm
14727 +
14728 + .macro pax_exit_kernel_user
14729 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14730 + call pax_exit_kernel_user
14731 +#endif
14732 +#ifdef CONFIG_PAX_RANDKSTACK
14733 + pushq %rax
14734 + pushq %r11
14735 + call pax_randomize_kstack
14736 + popq %r11
14737 + popq %rax
14738 +#endif
14739 + .endm
14740 +
14741 + .macro pax_erase_kstack
14742 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14743 + call pax_erase_kstack
14744 +#endif
14745 + .endm
14746 +
14747 /*
14748 * 32bit SYSENTER instruction entry.
14749 *
14750 @@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14751 CFI_REGISTER rsp,rbp
14752 SWAPGS_UNSAFE_STACK
14753 movq PER_CPU_VAR(kernel_stack), %rsp
14754 - addq $(KERNEL_STACK_OFFSET),%rsp
14755 - /*
14756 - * No need to follow this irqs on/off section: the syscall
14757 - * disabled irqs, here we enable it straight after entry:
14758 - */
14759 - ENABLE_INTERRUPTS(CLBR_NONE)
14760 movl %ebp,%ebp /* zero extension */
14761 pushq_cfi $__USER32_DS
14762 /*CFI_REL_OFFSET ss,0*/
14763 @@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14764 CFI_REL_OFFSET rsp,0
14765 pushfq_cfi
14766 /*CFI_REL_OFFSET rflags,0*/
14767 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14768 - CFI_REGISTER rip,r10
14769 + orl $X86_EFLAGS_IF,(%rsp)
14770 + GET_THREAD_INFO(%r11)
14771 + movl TI_sysenter_return(%r11), %r11d
14772 + CFI_REGISTER rip,r11
14773 pushq_cfi $__USER32_CS
14774 /*CFI_REL_OFFSET cs,0*/
14775 movl %eax, %eax
14776 - pushq_cfi %r10
14777 + pushq_cfi %r11
14778 CFI_REL_OFFSET rip,0
14779 pushq_cfi %rax
14780 cld
14781 SAVE_ARGS 0,1,0
14782 + pax_enter_kernel_user
14783 +
14784 +#ifdef CONFIG_PAX_RANDKSTACK
14785 + pax_erase_kstack
14786 +#endif
14787 +
14788 + /*
14789 + * No need to follow this irqs on/off section: the syscall
14790 + * disabled irqs, here we enable it straight after entry:
14791 + */
14792 + ENABLE_INTERRUPTS(CLBR_NONE)
14793 /* no need to do an access_ok check here because rbp has been
14794 32bit zero extended */
14795 +
14796 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14797 + addq pax_user_shadow_base,%rbp
14798 + ASM_PAX_OPEN_USERLAND
14799 +#endif
14800 +
14801 ASM_STAC
14802 1: movl (%rbp),%ebp
14803 _ASM_EXTABLE(1b,ia32_badarg)
14804 ASM_CLAC
14805
14806 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14807 + ASM_PAX_CLOSE_USERLAND
14808 +#endif
14809 +
14810 /*
14811 * Sysenter doesn't filter flags, so we need to clear NT
14812 * ourselves. To save a few cycles, we can check whether
14813 @@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14814 jnz sysenter_fix_flags
14815 sysenter_flags_fixed:
14816
14817 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14818 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14819 + GET_THREAD_INFO(%r11)
14820 + orl $TS_COMPAT,TI_status(%r11)
14821 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14822 CFI_REMEMBER_STATE
14823 jnz sysenter_tracesys
14824 cmpq $(IA32_NR_syscalls-1),%rax
14825 @@ -172,15 +218,18 @@ sysenter_do_call:
14826 sysenter_dispatch:
14827 call *ia32_sys_call_table(,%rax,8)
14828 movq %rax,RAX-ARGOFFSET(%rsp)
14829 + GET_THREAD_INFO(%r11)
14830 DISABLE_INTERRUPTS(CLBR_NONE)
14831 TRACE_IRQS_OFF
14832 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14833 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14834 jnz sysexit_audit
14835 sysexit_from_sys_call:
14836 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14837 + pax_exit_kernel_user
14838 + pax_erase_kstack
14839 + andl $~TS_COMPAT,TI_status(%r11)
14840 /* clear IF, that popfq doesn't enable interrupts early */
14841 - andl $~0x200,EFLAGS-R11(%rsp)
14842 - movl RIP-R11(%rsp),%edx /* User %eip */
14843 + andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14844 + movl RIP(%rsp),%edx /* User %eip */
14845 CFI_REGISTER rip,rdx
14846 RESTORE_ARGS 0,24,0,0,0,0
14847 xorq %r8,%r8
14848 @@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852 +
14853 + pax_erase_kstack
14854 +
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858 @@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867 @@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871 + GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877 + testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881 @@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890 @@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894 +
14895 + pax_erase_kstack
14896 +
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900 @@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905 + CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912 + SAVE_ARGS 8*6,0,0
14913 + pax_enter_kernel_user
14914 +
14915 +#ifdef CONFIG_PAX_RANDKSTACK
14916 + pax_erase_kstack
14917 +#endif
14918 +
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924 - SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928 @@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932 +
14933 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14934 + ASM_PAX_OPEN_USERLAND
14935 + movq pax_user_shadow_base,%r8
14936 + addq RSP-ARGOFFSET(%rsp),%r8
14937 +#endif
14938 +
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945 +
14946 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14947 + ASM_PAX_CLOSE_USERLAND
14948 +#endif
14949 +
14950 + GET_THREAD_INFO(%r11)
14951 + orl $TS_COMPAT,TI_status(%r11)
14952 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956 @@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960 + GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968 - RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969 + pax_exit_kernel_user
14970 + pax_erase_kstack
14971 + andl $~TS_COMPAT,TI_status(%r11)
14972 + RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976 @@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985 @@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989 +
14990 + pax_erase_kstack
14991 +
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997 +
14998 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14999 + ASM_PAX_CLOSE_USERLAND
15000 +#endif
15001 +
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005 @@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009 - /*
15010 - * No need to follow this irqs on/off section: the syscall
15011 - * disabled irqs and here we enable it straight after entry:
15012 - */
15013 - ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022 + pax_enter_kernel_user
15023 +
15024 +#ifdef CONFIG_PAX_RANDKSTACK
15025 + pax_erase_kstack
15026 +#endif
15027 +
15028 + /*
15029 + * No need to follow this irqs on/off section: the syscall
15030 + * disabled irqs and here we enable it straight after entry:
15031 + */
15032 + ENABLE_INTERRUPTS(CLBR_NONE)
15033 + GET_THREAD_INFO(%r11)
15034 + orl $TS_COMPAT,TI_status(%r11)
15035 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039 @@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043 +
15044 + pax_erase_kstack
15045 +
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050 index 8e0ceec..af13504 100644
15051 --- a/arch/x86/ia32/sys_ia32.c
15052 +++ b/arch/x86/ia32/sys_ia32.c
15053 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057 - typeof(ubuf->st_uid) uid = 0;
15058 - typeof(ubuf->st_gid) gid = 0;
15059 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065 index 372231c..51b537d 100644
15066 --- a/arch/x86/include/asm/alternative-asm.h
15067 +++ b/arch/x86/include/asm/alternative-asm.h
15068 @@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072 +#ifdef KERNEXEC_PLUGIN
15073 + .macro pax_force_retaddr_bts rip=0
15074 + btsq $63,\rip(%rsp)
15075 + .endm
15076 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077 + .macro pax_force_retaddr rip=0, reload=0
15078 + btsq $63,\rip(%rsp)
15079 + .endm
15080 + .macro pax_force_fptr ptr
15081 + btsq $63,\ptr
15082 + .endm
15083 + .macro pax_set_fptr_mask
15084 + .endm
15085 +#endif
15086 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087 + .macro pax_force_retaddr rip=0, reload=0
15088 + .if \reload
15089 + pax_set_fptr_mask
15090 + .endif
15091 + orq %r12,\rip(%rsp)
15092 + .endm
15093 + .macro pax_force_fptr ptr
15094 + orq %r12,\ptr
15095 + .endm
15096 + .macro pax_set_fptr_mask
15097 + movabs $0x8000000000000000,%r12
15098 + .endm
15099 +#endif
15100 +#else
15101 + .macro pax_force_retaddr rip=0, reload=0
15102 + .endm
15103 + .macro pax_force_fptr ptr
15104 + .endm
15105 + .macro pax_force_retaddr_bts rip=0
15106 + .endm
15107 + .macro pax_set_fptr_mask
15108 + .endm
15109 +#endif
15110 +
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115 index 473bdbe..b1e3377 100644
15116 --- a/arch/x86/include/asm/alternative.h
15117 +++ b/arch/x86/include/asm/alternative.h
15118 @@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122 - ".pushsection .altinstr_replacement, \"ax\"\n" \
15123 + ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127 @@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131 - ".pushsection .altinstr_replacement, \"ax\"\n" \
15132 + ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137 index 465b309..ab7e51f 100644
15138 --- a/arch/x86/include/asm/apic.h
15139 +++ b/arch/x86/include/asm/apic.h
15140 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144 -extern unsigned int apic_verbosity;
15145 +extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150 index 20370c6..a2eb9b0 100644
15151 --- a/arch/x86/include/asm/apm.h
15152 +++ b/arch/x86/include/asm/apm.h
15153 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157 - "lcall *%%cs:apm_bios_entry\n\t"
15158 + "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166 - "lcall *%%cs:apm_bios_entry\n\t"
15167 + "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172 index 5e5cd12..3d18208 100644
15173 --- a/arch/x86/include/asm/atomic.h
15174 +++ b/arch/x86/include/asm/atomic.h
15175 @@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179 + * atomic_read_unchecked - read atomic variable
15180 + * @v: pointer of type atomic_unchecked_t
15181 + *
15182 + * Atomically reads the value of @v.
15183 + */
15184 +static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185 +{
15186 + return ACCESS_ONCE((v)->counter);
15187 +}
15188 +
15189 +/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193 @@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197 + * atomic_set_unchecked - set atomic variable
15198 + * @v: pointer of type atomic_unchecked_t
15199 + * @i: required value
15200 + *
15201 + * Atomically sets the value of @v to @i.
15202 + */
15203 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204 +{
15205 + v->counter = i;
15206 +}
15207 +
15208 +/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212 @@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216 - asm volatile(LOCK_PREFIX "addl %1,%0"
15217 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218 +
15219 +#ifdef CONFIG_PAX_REFCOUNT
15220 + "jno 0f\n"
15221 + LOCK_PREFIX "subl %1,%0\n"
15222 + "int $4\n0:\n"
15223 + _ASM_EXTABLE(0b, 0b)
15224 +#endif
15225 +
15226 + : "+m" (v->counter)
15227 + : "ir" (i));
15228 +}
15229 +
15230 +/**
15231 + * atomic_add_unchecked - add integer to atomic variable
15232 + * @i: integer value to add
15233 + * @v: pointer of type atomic_unchecked_t
15234 + *
15235 + * Atomically adds @i to @v.
15236 + */
15237 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238 +{
15239 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243 @@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247 - asm volatile(LOCK_PREFIX "subl %1,%0"
15248 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249 +
15250 +#ifdef CONFIG_PAX_REFCOUNT
15251 + "jno 0f\n"
15252 + LOCK_PREFIX "addl %1,%0\n"
15253 + "int $4\n0:\n"
15254 + _ASM_EXTABLE(0b, 0b)
15255 +#endif
15256 +
15257 + : "+m" (v->counter)
15258 + : "ir" (i));
15259 +}
15260 +
15261 +/**
15262 + * atomic_sub_unchecked - subtract integer from atomic variable
15263 + * @i: integer value to subtract
15264 + * @v: pointer of type atomic_unchecked_t
15265 + *
15266 + * Atomically subtracts @i from @v.
15267 + */
15268 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269 +{
15270 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274 @@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278 - GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279 + GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283 @@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287 - asm volatile(LOCK_PREFIX "incl %0"
15288 + asm volatile(LOCK_PREFIX "incl %0\n"
15289 +
15290 +#ifdef CONFIG_PAX_REFCOUNT
15291 + "jno 0f\n"
15292 + LOCK_PREFIX "decl %0\n"
15293 + "int $4\n0:\n"
15294 + _ASM_EXTABLE(0b, 0b)
15295 +#endif
15296 +
15297 + : "+m" (v->counter));
15298 +}
15299 +
15300 +/**
15301 + * atomic_inc_unchecked - increment atomic variable
15302 + * @v: pointer of type atomic_unchecked_t
15303 + *
15304 + * Atomically increments @v by 1.
15305 + */
15306 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307 +{
15308 + asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312 @@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316 - asm volatile(LOCK_PREFIX "decl %0"
15317 + asm volatile(LOCK_PREFIX "decl %0\n"
15318 +
15319 +#ifdef CONFIG_PAX_REFCOUNT
15320 + "jno 0f\n"
15321 + LOCK_PREFIX "incl %0\n"
15322 + "int $4\n0:\n"
15323 + _ASM_EXTABLE(0b, 0b)
15324 +#endif
15325 +
15326 + : "+m" (v->counter));
15327 +}
15328 +
15329 +/**
15330 + * atomic_dec_unchecked - decrement atomic variable
15331 + * @v: pointer of type atomic_unchecked_t
15332 + *
15333 + * Atomically decrements @v by 1.
15334 + */
15335 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336 +{
15337 + asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341 @@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345 - GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346 + GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350 @@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354 - GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355 + GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356 +}
15357 +
15358 +/**
15359 + * atomic_inc_and_test_unchecked - increment and test
15360 + * @v: pointer of type atomic_unchecked_t
15361 + *
15362 + * Atomically increments @v by 1
15363 + * and returns true if the result is zero, or false for all
15364 + * other cases.
15365 + */
15366 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367 +{
15368 + GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372 @@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376 - GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377 + GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381 @@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385 -static inline int atomic_add_return(int i, atomic_t *v)
15386 +static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387 +{
15388 + return i + xadd_check_overflow(&v->counter, i);
15389 +}
15390 +
15391 +/**
15392 + * atomic_add_return_unchecked - add integer and return
15393 + * @i: integer value to add
15394 + * @v: pointer of type atomic_unchecked_t
15395 + *
15396 + * Atomically adds @i to @v and returns @i + @v
15397 + */
15398 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402 @@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406 -static inline int atomic_sub_return(int i, atomic_t *v)
15407 +static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414 +{
15415 + return atomic_add_return_unchecked(1, v);
15416 +}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419 -static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420 +static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421 +{
15422 + return cmpxchg(&v->counter, old, new);
15423 +}
15424 +
15425 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429 @@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434 +{
15435 + return xchg(&v->counter, new);
15436 +}
15437 +
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441 @@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 * Atomically adds @a to @v, so long as @v was not already @u.
15443 * Returns the old value of @v.
15444 */
15445 -static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15446 +static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15447 {
15448 - int c, old;
15449 + int c, old, new;
15450 c = atomic_read(v);
15451 for (;;) {
15452 - if (unlikely(c == (u)))
15453 + if (unlikely(c == u))
15454 break;
15455 - old = atomic_cmpxchg((v), c, c + (a));
15456 +
15457 + asm volatile("addl %2,%0\n"
15458 +
15459 +#ifdef CONFIG_PAX_REFCOUNT
15460 + "jno 0f\n"
15461 + "subl %2,%0\n"
15462 + "int $4\n0:\n"
15463 + _ASM_EXTABLE(0b, 0b)
15464 +#endif
15465 +
15466 + : "=r" (new)
15467 + : "0" (c), "ir" (a));
15468 +
15469 + old = atomic_cmpxchg(v, c, new);
15470 if (likely(old == c))
15471 break;
15472 c = old;
15473 @@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15474 }
15475
15476 /**
15477 + * atomic_inc_not_zero_hint - increment if not null
15478 + * @v: pointer of type atomic_t
15479 + * @hint: probable value of the atomic before the increment
15480 + *
15481 + * This version of atomic_inc_not_zero() gives a hint of probable
15482 + * value of the atomic. This helps processor to not read the memory
15483 + * before doing the atomic read/modify/write cycle, lowering
15484 + * number of bus transactions on some arches.
15485 + *
15486 + * Returns: 0 if increment was not done, 1 otherwise.
15487 + */
15488 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15489 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15490 +{
15491 + int val, c = hint, new;
15492 +
15493 + /* sanity test, should be removed by compiler if hint is a constant */
15494 + if (!hint)
15495 + return __atomic_add_unless(v, 1, 0);
15496 +
15497 + do {
15498 + asm volatile("incl %0\n"
15499 +
15500 +#ifdef CONFIG_PAX_REFCOUNT
15501 + "jno 0f\n"
15502 + "decl %0\n"
15503 + "int $4\n0:\n"
15504 + _ASM_EXTABLE(0b, 0b)
15505 +#endif
15506 +
15507 + : "=r" (new)
15508 + : "0" (c));
15509 +
15510 + val = atomic_cmpxchg(v, c, new);
15511 + if (val == c)
15512 + return 1;
15513 + c = val;
15514 + } while (c);
15515 +
15516 + return 0;
15517 +}
15518 +
15519 +/**
15520 * atomic_inc_short - increment of a short integer
15521 * @v: pointer to type int
15522 *
15523 @@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15524 }
15525
15526 /* These are x86-specific, used by some header files */
15527 -#define atomic_clear_mask(mask, addr) \
15528 - asm volatile(LOCK_PREFIX "andl %0,%1" \
15529 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
15530 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15531 +{
15532 + asm volatile(LOCK_PREFIX "andl %1,%0"
15533 + : "+m" (v->counter)
15534 + : "r" (~(mask))
15535 + : "memory");
15536 +}
15537
15538 -#define atomic_set_mask(mask, addr) \
15539 - asm volatile(LOCK_PREFIX "orl %0,%1" \
15540 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15541 - : "memory")
15542 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15543 +{
15544 + asm volatile(LOCK_PREFIX "andl %1,%0"
15545 + : "+m" (v->counter)
15546 + : "r" (~(mask))
15547 + : "memory");
15548 +}
15549 +
15550 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15551 +{
15552 + asm volatile(LOCK_PREFIX "orl %1,%0"
15553 + : "+m" (v->counter)
15554 + : "r" (mask)
15555 + : "memory");
15556 +}
15557 +
15558 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15559 +{
15560 + asm volatile(LOCK_PREFIX "orl %1,%0"
15561 + : "+m" (v->counter)
15562 + : "r" (mask)
15563 + : "memory");
15564 +}
15565
15566 #ifdef CONFIG_X86_32
15567 # include <asm/atomic64_32.h>
15568 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15569 index b154de7..bf18a5a 100644
15570 --- a/arch/x86/include/asm/atomic64_32.h
15571 +++ b/arch/x86/include/asm/atomic64_32.h
15572 @@ -12,6 +12,14 @@ typedef struct {
15573 u64 __aligned(8) counter;
15574 } atomic64_t;
15575
15576 +#ifdef CONFIG_PAX_REFCOUNT
15577 +typedef struct {
15578 + u64 __aligned(8) counter;
15579 +} atomic64_unchecked_t;
15580 +#else
15581 +typedef atomic64_t atomic64_unchecked_t;
15582 +#endif
15583 +
15584 #define ATOMIC64_INIT(val) { (val) }
15585
15586 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15587 @@ -37,21 +45,31 @@ typedef struct {
15588 ATOMIC64_DECL_ONE(sym##_386)
15589
15590 ATOMIC64_DECL_ONE(add_386);
15591 +ATOMIC64_DECL_ONE(add_unchecked_386);
15592 ATOMIC64_DECL_ONE(sub_386);
15593 +ATOMIC64_DECL_ONE(sub_unchecked_386);
15594 ATOMIC64_DECL_ONE(inc_386);
15595 +ATOMIC64_DECL_ONE(inc_unchecked_386);
15596 ATOMIC64_DECL_ONE(dec_386);
15597 +ATOMIC64_DECL_ONE(dec_unchecked_386);
15598 #endif
15599
15600 #define alternative_atomic64(f, out, in...) \
15601 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15602
15603 ATOMIC64_DECL(read);
15604 +ATOMIC64_DECL(read_unchecked);
15605 ATOMIC64_DECL(set);
15606 +ATOMIC64_DECL(set_unchecked);
15607 ATOMIC64_DECL(xchg);
15608 ATOMIC64_DECL(add_return);
15609 +ATOMIC64_DECL(add_return_unchecked);
15610 ATOMIC64_DECL(sub_return);
15611 +ATOMIC64_DECL(sub_return_unchecked);
15612 ATOMIC64_DECL(inc_return);
15613 +ATOMIC64_DECL(inc_return_unchecked);
15614 ATOMIC64_DECL(dec_return);
15615 +ATOMIC64_DECL(dec_return_unchecked);
15616 ATOMIC64_DECL(dec_if_positive);
15617 ATOMIC64_DECL(inc_not_zero);
15618 ATOMIC64_DECL(add_unless);
15619 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15620 }
15621
15622 /**
15623 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15624 + * @p: pointer to type atomic64_unchecked_t
15625 + * @o: expected value
15626 + * @n: new value
15627 + *
15628 + * Atomically sets @v to @n if it was equal to @o and returns
15629 + * the old value.
15630 + */
15631 +
15632 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15633 +{
15634 + return cmpxchg64(&v->counter, o, n);
15635 +}
15636 +
15637 +/**
15638 * atomic64_xchg - xchg atomic64 variable
15639 * @v: pointer to type atomic64_t
15640 * @n: value to assign
15641 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15642 }
15643
15644 /**
15645 + * atomic64_set_unchecked - set atomic64 variable
15646 + * @v: pointer to type atomic64_unchecked_t
15647 + * @n: value to assign
15648 + *
15649 + * Atomically sets the value of @v to @n.
15650 + */
15651 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15652 +{
15653 + unsigned high = (unsigned)(i >> 32);
15654 + unsigned low = (unsigned)i;
15655 + alternative_atomic64(set, /* no output */,
15656 + "S" (v), "b" (low), "c" (high)
15657 + : "eax", "edx", "memory");
15658 +}
15659 +
15660 +/**
15661 * atomic64_read - read atomic64 variable
15662 * @v: pointer to type atomic64_t
15663 *
15664 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15665 }
15666
15667 /**
15668 + * atomic64_read_unchecked - read atomic64 variable
15669 + * @v: pointer to type atomic64_unchecked_t
15670 + *
15671 + * Atomically reads the value of @v and returns it.
15672 + */
15673 +static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15674 +{
15675 + long long r;
15676 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15677 + return r;
15678 + }
15679 +
15680 +/**
15681 * atomic64_add_return - add and return
15682 * @i: integer value to add
15683 * @v: pointer to type atomic64_t
15684 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15685 return i;
15686 }
15687
15688 +/**
15689 + * atomic64_add_return_unchecked - add and return
15690 + * @i: integer value to add
15691 + * @v: pointer to type atomic64_unchecked_t
15692 + *
15693 + * Atomically adds @i to @v and returns @i + *@v
15694 + */
15695 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15696 +{
15697 + alternative_atomic64(add_return_unchecked,
15698 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15699 + ASM_NO_INPUT_CLOBBER("memory"));
15700 + return i;
15701 +}
15702 +
15703 /*
15704 * Other variants with different arithmetic operators:
15705 */
15706 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15707 return a;
15708 }
15709
15710 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15711 +{
15712 + long long a;
15713 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
15714 + "S" (v) : "memory", "ecx");
15715 + return a;
15716 +}
15717 +
15718 static inline long long atomic64_dec_return(atomic64_t *v)
15719 {
15720 long long a;
15721 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15722 }
15723
15724 /**
15725 + * atomic64_add_unchecked - add integer to atomic64 variable
15726 + * @i: integer value to add
15727 + * @v: pointer to type atomic64_unchecked_t
15728 + *
15729 + * Atomically adds @i to @v.
15730 + */
15731 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15732 +{
15733 + __alternative_atomic64(add_unchecked, add_return_unchecked,
15734 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15735 + ASM_NO_INPUT_CLOBBER("memory"));
15736 + return i;
15737 +}
15738 +
15739 +/**
15740 * atomic64_sub - subtract the atomic64 variable
15741 * @i: integer value to subtract
15742 * @v: pointer to type atomic64_t
15743 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15744 index f8d273e..02f39f3 100644
15745 --- a/arch/x86/include/asm/atomic64_64.h
15746 +++ b/arch/x86/include/asm/atomic64_64.h
15747 @@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15748 }
15749
15750 /**
15751 + * atomic64_read_unchecked - read atomic64 variable
15752 + * @v: pointer of type atomic64_unchecked_t
15753 + *
15754 + * Atomically reads the value of @v.
15755 + * Doesn't imply a read memory barrier.
15756 + */
15757 +static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15758 +{
15759 + return ACCESS_ONCE((v)->counter);
15760 +}
15761 +
15762 +/**
15763 * atomic64_set - set atomic64 variable
15764 * @v: pointer to type atomic64_t
15765 * @i: required value
15766 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15767 }
15768
15769 /**
15770 + * atomic64_set_unchecked - set atomic64 variable
15771 + * @v: pointer to type atomic64_unchecked_t
15772 + * @i: required value
15773 + *
15774 + * Atomically sets the value of @v to @i.
15775 + */
15776 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15777 +{
15778 + v->counter = i;
15779 +}
15780 +
15781 +/**
15782 * atomic64_add - add integer to atomic64 variable
15783 * @i: integer value to add
15784 * @v: pointer to type atomic64_t
15785 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15786 */
15787 static inline void atomic64_add(long i, atomic64_t *v)
15788 {
15789 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
15790 +
15791 +#ifdef CONFIG_PAX_REFCOUNT
15792 + "jno 0f\n"
15793 + LOCK_PREFIX "subq %1,%0\n"
15794 + "int $4\n0:\n"
15795 + _ASM_EXTABLE(0b, 0b)
15796 +#endif
15797 +
15798 + : "=m" (v->counter)
15799 + : "er" (i), "m" (v->counter));
15800 +}
15801 +
15802 +/**
15803 + * atomic64_add_unchecked - add integer to atomic64 variable
15804 + * @i: integer value to add
15805 + * @v: pointer to type atomic64_unchecked_t
15806 + *
15807 + * Atomically adds @i to @v.
15808 + */
15809 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15810 +{
15811 asm volatile(LOCK_PREFIX "addq %1,%0"
15812 : "=m" (v->counter)
15813 : "er" (i), "m" (v->counter));
15814 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15815 */
15816 static inline void atomic64_sub(long i, atomic64_t *v)
15817 {
15818 - asm volatile(LOCK_PREFIX "subq %1,%0"
15819 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15820 +
15821 +#ifdef CONFIG_PAX_REFCOUNT
15822 + "jno 0f\n"
15823 + LOCK_PREFIX "addq %1,%0\n"
15824 + "int $4\n0:\n"
15825 + _ASM_EXTABLE(0b, 0b)
15826 +#endif
15827 +
15828 + : "=m" (v->counter)
15829 + : "er" (i), "m" (v->counter));
15830 +}
15831 +
15832 +/**
15833 + * atomic64_sub_unchecked - subtract the atomic64 variable
15834 + * @i: integer value to subtract
15835 + * @v: pointer to type atomic64_unchecked_t
15836 + *
15837 + * Atomically subtracts @i from @v.
15838 + */
15839 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15840 +{
15841 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15842 : "=m" (v->counter)
15843 : "er" (i), "m" (v->counter));
15844 }
15845 @@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15846 */
15847 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15848 {
15849 - GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15850 + GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15851 }
15852
15853 /**
15854 @@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15855 */
15856 static inline void atomic64_inc(atomic64_t *v)
15857 {
15858 + asm volatile(LOCK_PREFIX "incq %0\n"
15859 +
15860 +#ifdef CONFIG_PAX_REFCOUNT
15861 + "jno 0f\n"
15862 + LOCK_PREFIX "decq %0\n"
15863 + "int $4\n0:\n"
15864 + _ASM_EXTABLE(0b, 0b)
15865 +#endif
15866 +
15867 + : "=m" (v->counter)
15868 + : "m" (v->counter));
15869 +}
15870 +
15871 +/**
15872 + * atomic64_inc_unchecked - increment atomic64 variable
15873 + * @v: pointer to type atomic64_unchecked_t
15874 + *
15875 + * Atomically increments @v by 1.
15876 + */
15877 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15878 +{
15879 asm volatile(LOCK_PREFIX "incq %0"
15880 : "=m" (v->counter)
15881 : "m" (v->counter));
15882 @@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15883 */
15884 static inline void atomic64_dec(atomic64_t *v)
15885 {
15886 - asm volatile(LOCK_PREFIX "decq %0"
15887 + asm volatile(LOCK_PREFIX "decq %0\n"
15888 +
15889 +#ifdef CONFIG_PAX_REFCOUNT
15890 + "jno 0f\n"
15891 + LOCK_PREFIX "incq %0\n"
15892 + "int $4\n0:\n"
15893 + _ASM_EXTABLE(0b, 0b)
15894 +#endif
15895 +
15896 + : "=m" (v->counter)
15897 + : "m" (v->counter));
15898 +}
15899 +
15900 +/**
15901 + * atomic64_dec_unchecked - decrement atomic64 variable
15902 + * @v: pointer to type atomic64_t
15903 + *
15904 + * Atomically decrements @v by 1.
15905 + */
15906 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15907 +{
15908 + asm volatile(LOCK_PREFIX "decq %0\n"
15909 : "=m" (v->counter)
15910 : "m" (v->counter));
15911 }
15912 @@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15913 */
15914 static inline int atomic64_dec_and_test(atomic64_t *v)
15915 {
15916 - GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15917 + GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15918 }
15919
15920 /**
15921 @@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15922 */
15923 static inline int atomic64_inc_and_test(atomic64_t *v)
15924 {
15925 - GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15926 + GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15927 }
15928
15929 /**
15930 @@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15931 */
15932 static inline int atomic64_add_negative(long i, atomic64_t *v)
15933 {
15934 - GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15935 + GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15936 }
15937
15938 /**
15939 @@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15940 */
15941 static inline long atomic64_add_return(long i, atomic64_t *v)
15942 {
15943 + return i + xadd_check_overflow(&v->counter, i);
15944 +}
15945 +
15946 +/**
15947 + * atomic64_add_return_unchecked - add and return
15948 + * @i: integer value to add
15949 + * @v: pointer to type atomic64_unchecked_t
15950 + *
15951 + * Atomically adds @i to @v and returns @i + @v
15952 + */
15953 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15954 +{
15955 return i + xadd(&v->counter, i);
15956 }
15957
15958 @@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15959 }
15960
15961 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15962 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15963 +{
15964 + return atomic64_add_return_unchecked(1, v);
15965 +}
15966 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15967
15968 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15969 @@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15970 return cmpxchg(&v->counter, old, new);
15971 }
15972
15973 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15974 +{
15975 + return cmpxchg(&v->counter, old, new);
15976 +}
15977 +
15978 static inline long atomic64_xchg(atomic64_t *v, long new)
15979 {
15980 return xchg(&v->counter, new);
15981 @@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15982 */
15983 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15984 {
15985 - long c, old;
15986 + long c, old, new;
15987 c = atomic64_read(v);
15988 for (;;) {
15989 - if (unlikely(c == (u)))
15990 + if (unlikely(c == u))
15991 break;
15992 - old = atomic64_cmpxchg((v), c, c + (a));
15993 +
15994 + asm volatile("add %2,%0\n"
15995 +
15996 +#ifdef CONFIG_PAX_REFCOUNT
15997 + "jno 0f\n"
15998 + "sub %2,%0\n"
15999 + "int $4\n0:\n"
16000 + _ASM_EXTABLE(0b, 0b)
16001 +#endif
16002 +
16003 + : "=r" (new)
16004 + : "0" (c), "ir" (a));
16005 +
16006 + old = atomic64_cmpxchg(v, c, new);
16007 if (likely(old == c))
16008 break;
16009 c = old;
16010 }
16011 - return c != (u);
16012 + return c != u;
16013 }
16014
16015 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16016 diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16017 index 0f4460b..fa1ee19 100644
16018 --- a/arch/x86/include/asm/barrier.h
16019 +++ b/arch/x86/include/asm/barrier.h
16020 @@ -107,7 +107,7 @@
16021 do { \
16022 compiletime_assert_atomic_type(*p); \
16023 smp_mb(); \
16024 - ACCESS_ONCE(*p) = (v); \
16025 + ACCESS_ONCE_RW(*p) = (v); \
16026 } while (0)
16027
16028 #define smp_load_acquire(p) \
16029 @@ -124,7 +124,7 @@ do { \
16030 do { \
16031 compiletime_assert_atomic_type(*p); \
16032 barrier(); \
16033 - ACCESS_ONCE(*p) = (v); \
16034 + ACCESS_ONCE_RW(*p) = (v); \
16035 } while (0)
16036
16037 #define smp_load_acquire(p) \
16038 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16039 index cfe3b95..d01b118 100644
16040 --- a/arch/x86/include/asm/bitops.h
16041 +++ b/arch/x86/include/asm/bitops.h
16042 @@ -50,7 +50,7 @@
16043 * a mask operation on a byte.
16044 */
16045 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16046 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16047 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16048 #define CONST_MASK(nr) (1 << ((nr) & 7))
16049
16050 /**
16051 @@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16052 */
16053 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16054 {
16055 - GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16056 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16057 }
16058
16059 /**
16060 @@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16061 */
16062 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16063 {
16064 - GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16065 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16066 }
16067
16068 /**
16069 @@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16070 */
16071 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16072 {
16073 - GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16074 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16075 }
16076
16077 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16078 @@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16079 *
16080 * Undefined if no bit exists, so code should check against 0 first.
16081 */
16082 -static inline unsigned long __ffs(unsigned long word)
16083 +static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16084 {
16085 asm("rep; bsf %1,%0"
16086 : "=r" (word)
16087 @@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16088 *
16089 * Undefined if no zero exists, so code should check against ~0UL first.
16090 */
16091 -static inline unsigned long ffz(unsigned long word)
16092 +static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16093 {
16094 asm("rep; bsf %1,%0"
16095 : "=r" (word)
16096 @@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16097 *
16098 * Undefined if no set bit exists, so code should check against 0 first.
16099 */
16100 -static inline unsigned long __fls(unsigned long word)
16101 +static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16102 {
16103 asm("bsr %1,%0"
16104 : "=r" (word)
16105 @@ -434,7 +434,7 @@ static inline int ffs(int x)
16106 * set bit if value is nonzero. The last (most significant) bit is
16107 * at position 32.
16108 */
16109 -static inline int fls(int x)
16110 +static inline int __intentional_overflow(-1) fls(int x)
16111 {
16112 int r;
16113
16114 @@ -476,7 +476,7 @@ static inline int fls(int x)
16115 * at position 64.
16116 */
16117 #ifdef CONFIG_X86_64
16118 -static __always_inline int fls64(__u64 x)
16119 +static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16120 {
16121 int bitpos = -1;
16122 /*
16123 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16124 index 4fa687a..60f2d39 100644
16125 --- a/arch/x86/include/asm/boot.h
16126 +++ b/arch/x86/include/asm/boot.h
16127 @@ -6,10 +6,15 @@
16128 #include <uapi/asm/boot.h>
16129
16130 /* Physical address where kernel should be loaded. */
16131 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16132 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16133 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16134 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16135
16136 +#ifndef __ASSEMBLY__
16137 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
16138 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16139 +#endif
16140 +
16141 /* Minimum kernel alignment, as a power of two */
16142 #ifdef CONFIG_X86_64
16143 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16144 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16145 index 48f99f1..d78ebf9 100644
16146 --- a/arch/x86/include/asm/cache.h
16147 +++ b/arch/x86/include/asm/cache.h
16148 @@ -5,12 +5,13 @@
16149
16150 /* L1 cache line size */
16151 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16152 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16153 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16154
16155 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16156 +#define __read_only __attribute__((__section__(".data..read_only")))
16157
16158 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16159 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16160 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16161
16162 #ifdef CONFIG_X86_VSMP
16163 #ifdef CONFIG_SMP
16164 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
16165 index 9863ee3..4a1f8e1 100644
16166 --- a/arch/x86/include/asm/cacheflush.h
16167 +++ b/arch/x86/include/asm/cacheflush.h
16168 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
16169 unsigned long pg_flags = pg->flags & _PGMT_MASK;
16170
16171 if (pg_flags == _PGMT_DEFAULT)
16172 - return -1;
16173 + return ~0UL;
16174 else if (pg_flags == _PGMT_WC)
16175 return _PAGE_CACHE_WC;
16176 else if (pg_flags == _PGMT_UC_MINUS)
16177 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16178 index 76659b6..72b8439 100644
16179 --- a/arch/x86/include/asm/calling.h
16180 +++ b/arch/x86/include/asm/calling.h
16181 @@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16182 #define RSP 152
16183 #define SS 160
16184
16185 -#define ARGOFFSET R11
16186 -#define SWFRAME ORIG_RAX
16187 +#define ARGOFFSET R15
16188
16189 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16190 - subq $9*8+\addskip, %rsp
16191 - CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16192 - movq_cfi rdi, 8*8
16193 - movq_cfi rsi, 7*8
16194 - movq_cfi rdx, 6*8
16195 + subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16196 + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16197 + movq_cfi rdi, RDI
16198 + movq_cfi rsi, RSI
16199 + movq_cfi rdx, RDX
16200
16201 .if \save_rcx
16202 - movq_cfi rcx, 5*8
16203 + movq_cfi rcx, RCX
16204 .endif
16205
16206 .if \rax_enosys
16207 - movq $-ENOSYS, 4*8(%rsp)
16208 + movq $-ENOSYS, RAX(%rsp)
16209 .else
16210 - movq_cfi rax, 4*8
16211 + movq_cfi rax, RAX
16212 .endif
16213
16214 .if \save_r891011
16215 - movq_cfi r8, 3*8
16216 - movq_cfi r9, 2*8
16217 - movq_cfi r10, 1*8
16218 - movq_cfi r11, 0*8
16219 + movq_cfi r8, R8
16220 + movq_cfi r9, R9
16221 + movq_cfi r10, R10
16222 + movq_cfi r11, R11
16223 .endif
16224
16225 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16226 + movq_cfi r12, R12
16227 +#endif
16228 +
16229 .endm
16230
16231 -#define ARG_SKIP (9*8)
16232 +#define ARG_SKIP ORIG_RAX
16233
16234 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16235 rstor_r8910=1, rstor_rdx=1
16236 +
16237 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16238 + movq_cfi_restore R12, r12
16239 +#endif
16240 +
16241 .if \rstor_r11
16242 - movq_cfi_restore 0*8, r11
16243 + movq_cfi_restore R11, r11
16244 .endif
16245
16246 .if \rstor_r8910
16247 - movq_cfi_restore 1*8, r10
16248 - movq_cfi_restore 2*8, r9
16249 - movq_cfi_restore 3*8, r8
16250 + movq_cfi_restore R10, r10
16251 + movq_cfi_restore R9, r9
16252 + movq_cfi_restore R8, r8
16253 .endif
16254
16255 .if \rstor_rax
16256 - movq_cfi_restore 4*8, rax
16257 + movq_cfi_restore RAX, rax
16258 .endif
16259
16260 .if \rstor_rcx
16261 - movq_cfi_restore 5*8, rcx
16262 + movq_cfi_restore RCX, rcx
16263 .endif
16264
16265 .if \rstor_rdx
16266 - movq_cfi_restore 6*8, rdx
16267 + movq_cfi_restore RDX, rdx
16268 .endif
16269
16270 - movq_cfi_restore 7*8, rsi
16271 - movq_cfi_restore 8*8, rdi
16272 + movq_cfi_restore RSI, rsi
16273 + movq_cfi_restore RDI, rdi
16274
16275 - .if ARG_SKIP+\addskip > 0
16276 - addq $ARG_SKIP+\addskip, %rsp
16277 - CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16278 + .if ORIG_RAX+\addskip > 0
16279 + addq $ORIG_RAX+\addskip, %rsp
16280 + CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16281 .endif
16282 .endm
16283
16284 - .macro LOAD_ARGS offset, skiprax=0
16285 - movq \offset(%rsp), %r11
16286 - movq \offset+8(%rsp), %r10
16287 - movq \offset+16(%rsp), %r9
16288 - movq \offset+24(%rsp), %r8
16289 - movq \offset+40(%rsp), %rcx
16290 - movq \offset+48(%rsp), %rdx
16291 - movq \offset+56(%rsp), %rsi
16292 - movq \offset+64(%rsp), %rdi
16293 + .macro LOAD_ARGS skiprax=0
16294 + movq R11(%rsp), %r11
16295 + movq R10(%rsp), %r10
16296 + movq R9(%rsp), %r9
16297 + movq R8(%rsp), %r8
16298 + movq RCX(%rsp), %rcx
16299 + movq RDX(%rsp), %rdx
16300 + movq RSI(%rsp), %rsi
16301 + movq RDI(%rsp), %rdi
16302 .if \skiprax
16303 .else
16304 - movq \offset+72(%rsp), %rax
16305 + movq ORIG_RAX(%rsp), %rax
16306 .endif
16307 .endm
16308
16309 -#define REST_SKIP (6*8)
16310 -
16311 .macro SAVE_REST
16312 - subq $REST_SKIP, %rsp
16313 - CFI_ADJUST_CFA_OFFSET REST_SKIP
16314 - movq_cfi rbx, 5*8
16315 - movq_cfi rbp, 4*8
16316 - movq_cfi r12, 3*8
16317 - movq_cfi r13, 2*8
16318 - movq_cfi r14, 1*8
16319 - movq_cfi r15, 0*8
16320 + movq_cfi rbx, RBX
16321 + movq_cfi rbp, RBP
16322 +
16323 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16324 + movq_cfi r12, R12
16325 +#endif
16326 +
16327 + movq_cfi r13, R13
16328 + movq_cfi r14, R14
16329 + movq_cfi r15, R15
16330 .endm
16331
16332 .macro RESTORE_REST
16333 - movq_cfi_restore 0*8, r15
16334 - movq_cfi_restore 1*8, r14
16335 - movq_cfi_restore 2*8, r13
16336 - movq_cfi_restore 3*8, r12
16337 - movq_cfi_restore 4*8, rbp
16338 - movq_cfi_restore 5*8, rbx
16339 - addq $REST_SKIP, %rsp
16340 - CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16341 + movq_cfi_restore R15, r15
16342 + movq_cfi_restore R14, r14
16343 + movq_cfi_restore R13, r13
16344 +
16345 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16346 + movq_cfi_restore R12, r12
16347 +#endif
16348 +
16349 + movq_cfi_restore RBP, rbp
16350 + movq_cfi_restore RBX, rbx
16351 .endm
16352
16353 .macro SAVE_ALL
16354 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16355 index f50de69..2b0a458 100644
16356 --- a/arch/x86/include/asm/checksum_32.h
16357 +++ b/arch/x86/include/asm/checksum_32.h
16358 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16359 int len, __wsum sum,
16360 int *src_err_ptr, int *dst_err_ptr);
16361
16362 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16363 + int len, __wsum sum,
16364 + int *src_err_ptr, int *dst_err_ptr);
16365 +
16366 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16367 + int len, __wsum sum,
16368 + int *src_err_ptr, int *dst_err_ptr);
16369 +
16370 /*
16371 * Note: when you get a NULL pointer exception here this means someone
16372 * passed in an incorrect kernel address to one of these functions.
16373 @@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16374
16375 might_sleep();
16376 stac();
16377 - ret = csum_partial_copy_generic((__force void *)src, dst,
16378 + ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16379 len, sum, err_ptr, NULL);
16380 clac();
16381
16382 @@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16383 might_sleep();
16384 if (access_ok(VERIFY_WRITE, dst, len)) {
16385 stac();
16386 - ret = csum_partial_copy_generic(src, (__force void *)dst,
16387 + ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16388 len, sum, NULL, err_ptr);
16389 clac();
16390 return ret;
16391 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16392 index 99c105d7..2f667ac 100644
16393 --- a/arch/x86/include/asm/cmpxchg.h
16394 +++ b/arch/x86/include/asm/cmpxchg.h
16395 @@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16396 __compiletime_error("Bad argument size for cmpxchg");
16397 extern void __xadd_wrong_size(void)
16398 __compiletime_error("Bad argument size for xadd");
16399 +extern void __xadd_check_overflow_wrong_size(void)
16400 + __compiletime_error("Bad argument size for xadd_check_overflow");
16401 extern void __add_wrong_size(void)
16402 __compiletime_error("Bad argument size for add");
16403 +extern void __add_check_overflow_wrong_size(void)
16404 + __compiletime_error("Bad argument size for add_check_overflow");
16405
16406 /*
16407 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16408 @@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16409 __ret; \
16410 })
16411
16412 +#ifdef CONFIG_PAX_REFCOUNT
16413 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16414 + ({ \
16415 + __typeof__ (*(ptr)) __ret = (arg); \
16416 + switch (sizeof(*(ptr))) { \
16417 + case __X86_CASE_L: \
16418 + asm volatile (lock #op "l %0, %1\n" \
16419 + "jno 0f\n" \
16420 + "mov %0,%1\n" \
16421 + "int $4\n0:\n" \
16422 + _ASM_EXTABLE(0b, 0b) \
16423 + : "+r" (__ret), "+m" (*(ptr)) \
16424 + : : "memory", "cc"); \
16425 + break; \
16426 + case __X86_CASE_Q: \
16427 + asm volatile (lock #op "q %q0, %1\n" \
16428 + "jno 0f\n" \
16429 + "mov %0,%1\n" \
16430 + "int $4\n0:\n" \
16431 + _ASM_EXTABLE(0b, 0b) \
16432 + : "+r" (__ret), "+m" (*(ptr)) \
16433 + : : "memory", "cc"); \
16434 + break; \
16435 + default: \
16436 + __ ## op ## _check_overflow_wrong_size(); \
16437 + } \
16438 + __ret; \
16439 + })
16440 +#else
16441 +#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16442 +#endif
16443 +
16444 /*
16445 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16446 * Since this is generally used to protect other memory information, we
16447 @@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16448 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16449 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16450
16451 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16452 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16453 +
16454 #define __add(ptr, inc, lock) \
16455 ({ \
16456 __typeof__ (*(ptr)) __ret = (inc); \
16457 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16458 index 59c6c40..5e0b22c 100644
16459 --- a/arch/x86/include/asm/compat.h
16460 +++ b/arch/x86/include/asm/compat.h
16461 @@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16462 typedef u32 compat_uint_t;
16463 typedef u32 compat_ulong_t;
16464 typedef u64 __attribute__((aligned(4))) compat_u64;
16465 -typedef u32 compat_uptr_t;
16466 +typedef u32 __user compat_uptr_t;
16467
16468 struct compat_timespec {
16469 compat_time_t tv_sec;
16470 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16471 index 0bb1335..8f1aec7 100644
16472 --- a/arch/x86/include/asm/cpufeature.h
16473 +++ b/arch/x86/include/asm/cpufeature.h
16474 @@ -207,7 +207,7 @@
16475 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16476 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16477 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16478 -
16479 +#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16480
16481 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16482 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16483 @@ -215,7 +215,7 @@
16484 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16485 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16486 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16487 -#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16488 +#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16489 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16490 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16491 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16492 @@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16493 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16494 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16495 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16496 +#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16497
16498 #if __GNUC__ >= 4
16499 extern void warn_pre_alternatives(void);
16500 @@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16501
16502 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16503 t_warn:
16504 - warn_pre_alternatives();
16505 + if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16506 + warn_pre_alternatives();
16507 return false;
16508 #endif
16509
16510 @@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16511 ".section .discard,\"aw\",@progbits\n"
16512 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16513 ".previous\n"
16514 - ".section .altinstr_replacement,\"ax\"\n"
16515 + ".section .altinstr_replacement,\"a\"\n"
16516 "3: movb $1,%0\n"
16517 "4:\n"
16518 ".previous\n"
16519 @@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16520 " .byte 2b - 1b\n" /* src len */
16521 " .byte 4f - 3f\n" /* repl len */
16522 ".previous\n"
16523 - ".section .altinstr_replacement,\"ax\"\n"
16524 + ".section .altinstr_replacement,\"a\"\n"
16525 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16526 "4:\n"
16527 ".previous\n"
16528 @@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16529 ".section .discard,\"aw\",@progbits\n"
16530 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16531 ".previous\n"
16532 - ".section .altinstr_replacement,\"ax\"\n"
16533 + ".section .altinstr_replacement,\"a\"\n"
16534 "3: movb $0,%0\n"
16535 "4:\n"
16536 ".previous\n"
16537 @@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16538 ".section .discard,\"aw\",@progbits\n"
16539 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16540 ".previous\n"
16541 - ".section .altinstr_replacement,\"ax\"\n"
16542 + ".section .altinstr_replacement,\"a\"\n"
16543 "5: movb $1,%0\n"
16544 "6:\n"
16545 ".previous\n"
16546 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16547 index 50d033a..37deb26 100644
16548 --- a/arch/x86/include/asm/desc.h
16549 +++ b/arch/x86/include/asm/desc.h
16550 @@ -4,6 +4,7 @@
16551 #include <asm/desc_defs.h>
16552 #include <asm/ldt.h>
16553 #include <asm/mmu.h>
16554 +#include <asm/pgtable.h>
16555
16556 #include <linux/smp.h>
16557 #include <linux/percpu.h>
16558 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16559
16560 desc->type = (info->read_exec_only ^ 1) << 1;
16561 desc->type |= info->contents << 2;
16562 + desc->type |= info->seg_not_present ^ 1;
16563
16564 desc->s = 1;
16565 desc->dpl = 0x3;
16566 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16567 }
16568
16569 extern struct desc_ptr idt_descr;
16570 -extern gate_desc idt_table[];
16571 -extern struct desc_ptr debug_idt_descr;
16572 -extern gate_desc debug_idt_table[];
16573 -
16574 -struct gdt_page {
16575 - struct desc_struct gdt[GDT_ENTRIES];
16576 -} __attribute__((aligned(PAGE_SIZE)));
16577 -
16578 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16579 +extern gate_desc idt_table[IDT_ENTRIES];
16580 +extern const struct desc_ptr debug_idt_descr;
16581 +extern gate_desc debug_idt_table[IDT_ENTRIES];
16582
16583 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16584 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16585 {
16586 - return per_cpu(gdt_page, cpu).gdt;
16587 + return cpu_gdt_table[cpu];
16588 }
16589
16590 #ifdef CONFIG_X86_64
16591 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16592 unsigned long base, unsigned dpl, unsigned flags,
16593 unsigned short seg)
16594 {
16595 - gate->a = (seg << 16) | (base & 0xffff);
16596 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16597 + gate->gate.offset_low = base;
16598 + gate->gate.seg = seg;
16599 + gate->gate.reserved = 0;
16600 + gate->gate.type = type;
16601 + gate->gate.s = 0;
16602 + gate->gate.dpl = dpl;
16603 + gate->gate.p = 1;
16604 + gate->gate.offset_high = base >> 16;
16605 }
16606
16607 #endif
16608 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16609
16610 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16611 {
16612 + pax_open_kernel();
16613 memcpy(&idt[entry], gate, sizeof(*gate));
16614 + pax_close_kernel();
16615 }
16616
16617 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16618 {
16619 + pax_open_kernel();
16620 memcpy(&ldt[entry], desc, 8);
16621 + pax_close_kernel();
16622 }
16623
16624 static inline void
16625 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16626 default: size = sizeof(*gdt); break;
16627 }
16628
16629 + pax_open_kernel();
16630 memcpy(&gdt[entry], desc, size);
16631 + pax_close_kernel();
16632 }
16633
16634 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16635 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16636
16637 static inline void native_load_tr_desc(void)
16638 {
16639 + pax_open_kernel();
16640 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16641 + pax_close_kernel();
16642 }
16643
16644 static inline void native_load_gdt(const struct desc_ptr *dtr)
16645 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16646 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16647 unsigned int i;
16648
16649 + pax_open_kernel();
16650 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16651 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16652 + pax_close_kernel();
16653 }
16654
16655 #define _LDT_empty(info) \
16656 @@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16657 preempt_enable();
16658 }
16659
16660 -static inline unsigned long get_desc_base(const struct desc_struct *desc)
16661 +static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16662 {
16663 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16664 }
16665 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16666 }
16667
16668 #ifdef CONFIG_X86_64
16669 -static inline void set_nmi_gate(int gate, void *addr)
16670 +static inline void set_nmi_gate(int gate, const void *addr)
16671 {
16672 gate_desc s;
16673
16674 @@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16675 #endif
16676
16677 #ifdef CONFIG_TRACING
16678 -extern struct desc_ptr trace_idt_descr;
16679 -extern gate_desc trace_idt_table[];
16680 +extern const struct desc_ptr trace_idt_descr;
16681 +extern gate_desc trace_idt_table[IDT_ENTRIES];
16682 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16683 {
16684 write_idt_entry(trace_idt_table, entry, gate);
16685 }
16686
16687 -static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16688 +static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16689 unsigned dpl, unsigned ist, unsigned seg)
16690 {
16691 gate_desc s;
16692 @@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16693 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16694 #endif
16695
16696 -static inline void _set_gate(int gate, unsigned type, void *addr,
16697 +static inline void _set_gate(int gate, unsigned type, const void *addr,
16698 unsigned dpl, unsigned ist, unsigned seg)
16699 {
16700 gate_desc s;
16701 @@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16702 #define set_intr_gate(n, addr) \
16703 do { \
16704 BUG_ON((unsigned)n > 0xFF); \
16705 - _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16706 + _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16707 __KERNEL_CS); \
16708 - _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16709 + _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16710 0, 0, __KERNEL_CS); \
16711 } while (0)
16712
16713 @@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16714 /*
16715 * This routine sets up an interrupt gate at directory privilege level 3.
16716 */
16717 -static inline void set_system_intr_gate(unsigned int n, void *addr)
16718 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
16719 {
16720 BUG_ON((unsigned)n > 0xFF);
16721 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16722 }
16723
16724 -static inline void set_system_trap_gate(unsigned int n, void *addr)
16725 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
16726 {
16727 BUG_ON((unsigned)n > 0xFF);
16728 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16729 }
16730
16731 -static inline void set_trap_gate(unsigned int n, void *addr)
16732 +static inline void set_trap_gate(unsigned int n, const void *addr)
16733 {
16734 BUG_ON((unsigned)n > 0xFF);
16735 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16736 @@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16737 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16738 {
16739 BUG_ON((unsigned)n > 0xFF);
16740 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16741 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16742 }
16743
16744 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16745 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16746 {
16747 BUG_ON((unsigned)n > 0xFF);
16748 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16749 }
16750
16751 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16752 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16753 {
16754 BUG_ON((unsigned)n > 0xFF);
16755 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16756 @@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16757 else
16758 load_idt((const struct desc_ptr *)&idt_descr);
16759 }
16760 +
16761 +#ifdef CONFIG_X86_32
16762 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16763 +{
16764 + struct desc_struct d;
16765 +
16766 + if (likely(limit))
16767 + limit = (limit - 1UL) >> PAGE_SHIFT;
16768 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
16769 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16770 +}
16771 +#endif
16772 +
16773 #endif /* _ASM_X86_DESC_H */
16774 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16775 index 278441f..b95a174 100644
16776 --- a/arch/x86/include/asm/desc_defs.h
16777 +++ b/arch/x86/include/asm/desc_defs.h
16778 @@ -31,6 +31,12 @@ struct desc_struct {
16779 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16780 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16781 };
16782 + struct {
16783 + u16 offset_low;
16784 + u16 seg;
16785 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16786 + unsigned offset_high: 16;
16787 + } gate;
16788 };
16789 } __attribute__((packed));
16790
16791 diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16792 index ced283a..ffe04cc 100644
16793 --- a/arch/x86/include/asm/div64.h
16794 +++ b/arch/x86/include/asm/div64.h
16795 @@ -39,7 +39,7 @@
16796 __mod; \
16797 })
16798
16799 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16800 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16801 {
16802 union {
16803 u64 v64;
16804 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16805 index ca3347a..1a5082a 100644
16806 --- a/arch/x86/include/asm/elf.h
16807 +++ b/arch/x86/include/asm/elf.h
16808 @@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16809
16810 #include <asm/vdso.h>
16811
16812 -#ifdef CONFIG_X86_64
16813 -extern unsigned int vdso64_enabled;
16814 -#endif
16815 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16816 extern unsigned int vdso32_enabled;
16817 #endif
16818 @@ -249,7 +246,25 @@ extern int force_personality32;
16819 the loader. We need to make sure that it is out of the way of the program
16820 that it will "exec", and that there is sufficient room for the brk. */
16821
16822 +#ifdef CONFIG_PAX_SEGMEXEC
16823 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16824 +#else
16825 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16826 +#endif
16827 +
16828 +#ifdef CONFIG_PAX_ASLR
16829 +#ifdef CONFIG_X86_32
16830 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16831 +
16832 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16833 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16834 +#else
16835 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
16836 +
16837 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16838 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16839 +#endif
16840 +#endif
16841
16842 /* This yields a mask that user programs can use to figure out what
16843 instruction set this CPU supports. This could be done in user space,
16844 @@ -298,17 +313,13 @@ do { \
16845
16846 #define ARCH_DLINFO \
16847 do { \
16848 - if (vdso64_enabled) \
16849 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16850 - (unsigned long __force)current->mm->context.vdso); \
16851 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16852 } while (0)
16853
16854 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16855 #define ARCH_DLINFO_X32 \
16856 do { \
16857 - if (vdso64_enabled) \
16858 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16859 - (unsigned long __force)current->mm->context.vdso); \
16860 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16861 } while (0)
16862
16863 #define AT_SYSINFO 32
16864 @@ -323,10 +334,10 @@ else \
16865
16866 #endif /* !CONFIG_X86_32 */
16867
16868 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16869 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16870
16871 #define VDSO_ENTRY \
16872 - ((unsigned long)current->mm->context.vdso + \
16873 + (current->mm->context.vdso + \
16874 selected_vdso32->sym___kernel_vsyscall)
16875
16876 struct linux_binprm;
16877 @@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16878 int uses_interp);
16879 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16880
16881 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16882 -#define arch_randomize_brk arch_randomize_brk
16883 -
16884 /*
16885 * True on X86_32 or when emulating IA32 on X86_64
16886 */
16887 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16888 index 77a99ac..39ff7f5 100644
16889 --- a/arch/x86/include/asm/emergency-restart.h
16890 +++ b/arch/x86/include/asm/emergency-restart.h
16891 @@ -1,6 +1,6 @@
16892 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16893 #define _ASM_X86_EMERGENCY_RESTART_H
16894
16895 -extern void machine_emergency_restart(void);
16896 +extern void machine_emergency_restart(void) __noreturn;
16897
16898 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16899 diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16900 index 1c7eefe..d0e4702 100644
16901 --- a/arch/x86/include/asm/floppy.h
16902 +++ b/arch/x86/include/asm/floppy.h
16903 @@ -229,18 +229,18 @@ static struct fd_routine_l {
16904 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16905 } fd_routine[] = {
16906 {
16907 - request_dma,
16908 - free_dma,
16909 - get_dma_residue,
16910 - dma_mem_alloc,
16911 - hard_dma_setup
16912 + ._request_dma = request_dma,
16913 + ._free_dma = free_dma,
16914 + ._get_dma_residue = get_dma_residue,
16915 + ._dma_mem_alloc = dma_mem_alloc,
16916 + ._dma_setup = hard_dma_setup
16917 },
16918 {
16919 - vdma_request_dma,
16920 - vdma_nop,
16921 - vdma_get_dma_residue,
16922 - vdma_mem_alloc,
16923 - vdma_dma_setup
16924 + ._request_dma = vdma_request_dma,
16925 + ._free_dma = vdma_nop,
16926 + ._get_dma_residue = vdma_get_dma_residue,
16927 + ._dma_mem_alloc = vdma_mem_alloc,
16928 + ._dma_setup = vdma_dma_setup
16929 }
16930 };
16931
16932 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16933 index e97622f..d0ba77a 100644
16934 --- a/arch/x86/include/asm/fpu-internal.h
16935 +++ b/arch/x86/include/asm/fpu-internal.h
16936 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16937 #define user_insn(insn, output, input...) \
16938 ({ \
16939 int err; \
16940 + pax_open_userland(); \
16941 asm volatile(ASM_STAC "\n" \
16942 - "1:" #insn "\n\t" \
16943 + "1:" \
16944 + __copyuser_seg \
16945 + #insn "\n\t" \
16946 "2: " ASM_CLAC "\n" \
16947 ".section .fixup,\"ax\"\n" \
16948 "3: movl $-1,%[err]\n" \
16949 @@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16950 _ASM_EXTABLE(1b, 3b) \
16951 : [err] "=r" (err), output \
16952 : "0"(0), input); \
16953 + pax_close_userland(); \
16954 err; \
16955 })
16956
16957 @@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16958 "fnclex\n\t"
16959 "emms\n\t"
16960 "fildl %P[addr]" /* set F?P to defined value */
16961 - : : [addr] "m" (tsk->thread.fpu.has_fpu));
16962 + : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16963 }
16964
16965 return fpu_restore_checking(&tsk->thread.fpu);
16966 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16967 index b4c1f54..e290c08 100644
16968 --- a/arch/x86/include/asm/futex.h
16969 +++ b/arch/x86/include/asm/futex.h
16970 @@ -12,6 +12,7 @@
16971 #include <asm/smap.h>
16972
16973 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16974 + typecheck(u32 __user *, uaddr); \
16975 asm volatile("\t" ASM_STAC "\n" \
16976 "1:\t" insn "\n" \
16977 "2:\t" ASM_CLAC "\n" \
16978 @@ -20,15 +21,16 @@
16979 "\tjmp\t2b\n" \
16980 "\t.previous\n" \
16981 _ASM_EXTABLE(1b, 3b) \
16982 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16983 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16984 : "i" (-EFAULT), "0" (oparg), "1" (0))
16985
16986 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16987 + typecheck(u32 __user *, uaddr); \
16988 asm volatile("\t" ASM_STAC "\n" \
16989 "1:\tmovl %2, %0\n" \
16990 "\tmovl\t%0, %3\n" \
16991 "\t" insn "\n" \
16992 - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16993 + "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16994 "\tjnz\t1b\n" \
16995 "3:\t" ASM_CLAC "\n" \
16996 "\t.section .fixup,\"ax\"\n" \
16997 @@ -38,7 +40,7 @@
16998 _ASM_EXTABLE(1b, 4b) \
16999 _ASM_EXTABLE(2b, 4b) \
17000 : "=&a" (oldval), "=&r" (ret), \
17001 - "+m" (*uaddr), "=&r" (tem) \
17002 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17003 : "r" (oparg), "i" (-EFAULT), "1" (0))
17004
17005 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006 @@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17007
17008 pagefault_disable();
17009
17010 + pax_open_userland();
17011 switch (op) {
17012 case FUTEX_OP_SET:
17013 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17014 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17015 break;
17016 case FUTEX_OP_ADD:
17017 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17018 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17019 uaddr, oparg);
17020 break;
17021 case FUTEX_OP_OR:
17022 @@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17023 default:
17024 ret = -ENOSYS;
17025 }
17026 + pax_close_userland();
17027
17028 pagefault_enable();
17029
17030 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17031 index 4615906..788c817 100644
17032 --- a/arch/x86/include/asm/hw_irq.h
17033 +++ b/arch/x86/include/asm/hw_irq.h
17034 @@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
17035 extern void enable_IO_APIC(void);
17036
17037 /* Statistics */
17038 -extern atomic_t irq_err_count;
17039 -extern atomic_t irq_mis_count;
17040 +extern atomic_unchecked_t irq_err_count;
17041 +extern atomic_unchecked_t irq_mis_count;
17042
17043 /* EISA */
17044 extern void eisa_set_level_irq(unsigned int irq);
17045 diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17046 index ccffa53..3c90c87 100644
17047 --- a/arch/x86/include/asm/i8259.h
17048 +++ b/arch/x86/include/asm/i8259.h
17049 @@ -62,7 +62,7 @@ struct legacy_pic {
17050 void (*init)(int auto_eoi);
17051 int (*irq_pending)(unsigned int irq);
17052 void (*make_irq)(unsigned int irq);
17053 -};
17054 +} __do_const;
17055
17056 extern struct legacy_pic *legacy_pic;
17057 extern struct legacy_pic null_legacy_pic;
17058 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17059 index b8237d8..3e8864e 100644
17060 --- a/arch/x86/include/asm/io.h
17061 +++ b/arch/x86/include/asm/io.h
17062 @@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17063 "m" (*(volatile type __force *)addr) barrier); }
17064
17065 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17066 -build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17067 -build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17068 +build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17069 +build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17070
17071 build_mmio_read(__readb, "b", unsigned char, "=q", )
17072 -build_mmio_read(__readw, "w", unsigned short, "=r", )
17073 -build_mmio_read(__readl, "l", unsigned int, "=r", )
17074 +build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17075 +build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17076
17077 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17078 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17079 @@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17080 * this function
17081 */
17082
17083 -static inline phys_addr_t virt_to_phys(volatile void *address)
17084 +static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17085 {
17086 return __pa(address);
17087 }
17088 @@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17089 return ioremap_nocache(offset, size);
17090 }
17091
17092 -extern void iounmap(volatile void __iomem *addr);
17093 +extern void iounmap(const volatile void __iomem *addr);
17094
17095 extern void set_iounmap_nonlazy(void);
17096
17097 @@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
17098
17099 #include <linux/vmalloc.h>
17100
17101 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17102 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17103 +{
17104 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17105 +}
17106 +
17107 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17108 +{
17109 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17110 +}
17111 +
17112 /*
17113 * Convert a virtual cached pointer to an uncached pointer
17114 */
17115 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17116 index 0a8b519..80e7d5b 100644
17117 --- a/arch/x86/include/asm/irqflags.h
17118 +++ b/arch/x86/include/asm/irqflags.h
17119 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17120 sti; \
17121 sysexit
17122
17123 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
17124 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17125 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
17126 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17127 +
17128 #else
17129 #define INTERRUPT_RETURN iret
17130 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17131 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17132 index 4421b5d..8543006 100644
17133 --- a/arch/x86/include/asm/kprobes.h
17134 +++ b/arch/x86/include/asm/kprobes.h
17135 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17136 #define RELATIVEJUMP_SIZE 5
17137 #define RELATIVECALL_OPCODE 0xe8
17138 #define RELATIVE_ADDR_SIZE 4
17139 -#define MAX_STACK_SIZE 64
17140 -#define MIN_STACK_SIZE(ADDR) \
17141 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17142 - THREAD_SIZE - (unsigned long)(ADDR))) \
17143 - ? (MAX_STACK_SIZE) \
17144 - : (((unsigned long)current_thread_info()) + \
17145 - THREAD_SIZE - (unsigned long)(ADDR)))
17146 +#define MAX_STACK_SIZE 64UL
17147 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17148
17149 #define flush_insn_slot(p) do { } while (0)
17150
17151 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17152 index 6ed0c30..74fb6c3 100644
17153 --- a/arch/x86/include/asm/kvm_host.h
17154 +++ b/arch/x86/include/asm/kvm_host.h
17155 @@ -51,6 +51,7 @@
17156 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17157
17158 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17159 +#define CR3_PCID_INVD (1UL << 63)
17160 #define CR4_RESERVED_BITS \
17161 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17162 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17163 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17164 index 4ad6560..75c7bdd 100644
17165 --- a/arch/x86/include/asm/local.h
17166 +++ b/arch/x86/include/asm/local.h
17167 @@ -10,33 +10,97 @@ typedef struct {
17168 atomic_long_t a;
17169 } local_t;
17170
17171 +typedef struct {
17172 + atomic_long_unchecked_t a;
17173 +} local_unchecked_t;
17174 +
17175 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17176
17177 #define local_read(l) atomic_long_read(&(l)->a)
17178 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17179 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17180 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17181
17182 static inline void local_inc(local_t *l)
17183 {
17184 - asm volatile(_ASM_INC "%0"
17185 + asm volatile(_ASM_INC "%0\n"
17186 +
17187 +#ifdef CONFIG_PAX_REFCOUNT
17188 + "jno 0f\n"
17189 + _ASM_DEC "%0\n"
17190 + "int $4\n0:\n"
17191 + _ASM_EXTABLE(0b, 0b)
17192 +#endif
17193 +
17194 + : "+m" (l->a.counter));
17195 +}
17196 +
17197 +static inline void local_inc_unchecked(local_unchecked_t *l)
17198 +{
17199 + asm volatile(_ASM_INC "%0\n"
17200 : "+m" (l->a.counter));
17201 }
17202
17203 static inline void local_dec(local_t *l)
17204 {
17205 - asm volatile(_ASM_DEC "%0"
17206 + asm volatile(_ASM_DEC "%0\n"
17207 +
17208 +#ifdef CONFIG_PAX_REFCOUNT
17209 + "jno 0f\n"
17210 + _ASM_INC "%0\n"
17211 + "int $4\n0:\n"
17212 + _ASM_EXTABLE(0b, 0b)
17213 +#endif
17214 +
17215 + : "+m" (l->a.counter));
17216 +}
17217 +
17218 +static inline void local_dec_unchecked(local_unchecked_t *l)
17219 +{
17220 + asm volatile(_ASM_DEC "%0\n"
17221 : "+m" (l->a.counter));
17222 }
17223
17224 static inline void local_add(long i, local_t *l)
17225 {
17226 - asm volatile(_ASM_ADD "%1,%0"
17227 + asm volatile(_ASM_ADD "%1,%0\n"
17228 +
17229 +#ifdef CONFIG_PAX_REFCOUNT
17230 + "jno 0f\n"
17231 + _ASM_SUB "%1,%0\n"
17232 + "int $4\n0:\n"
17233 + _ASM_EXTABLE(0b, 0b)
17234 +#endif
17235 +
17236 + : "+m" (l->a.counter)
17237 + : "ir" (i));
17238 +}
17239 +
17240 +static inline void local_add_unchecked(long i, local_unchecked_t *l)
17241 +{
17242 + asm volatile(_ASM_ADD "%1,%0\n"
17243 : "+m" (l->a.counter)
17244 : "ir" (i));
17245 }
17246
17247 static inline void local_sub(long i, local_t *l)
17248 {
17249 - asm volatile(_ASM_SUB "%1,%0"
17250 + asm volatile(_ASM_SUB "%1,%0\n"
17251 +
17252 +#ifdef CONFIG_PAX_REFCOUNT
17253 + "jno 0f\n"
17254 + _ASM_ADD "%1,%0\n"
17255 + "int $4\n0:\n"
17256 + _ASM_EXTABLE(0b, 0b)
17257 +#endif
17258 +
17259 + : "+m" (l->a.counter)
17260 + : "ir" (i));
17261 +}
17262 +
17263 +static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17264 +{
17265 + asm volatile(_ASM_SUB "%1,%0\n"
17266 : "+m" (l->a.counter)
17267 : "ir" (i));
17268 }
17269 @@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17270 */
17271 static inline int local_sub_and_test(long i, local_t *l)
17272 {
17273 - GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17274 + GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17275 }
17276
17277 /**
17278 @@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17279 */
17280 static inline int local_dec_and_test(local_t *l)
17281 {
17282 - GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17283 + GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17284 }
17285
17286 /**
17287 @@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17288 */
17289 static inline int local_inc_and_test(local_t *l)
17290 {
17291 - GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17292 + GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17293 }
17294
17295 /**
17296 @@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17297 */
17298 static inline int local_add_negative(long i, local_t *l)
17299 {
17300 - GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17301 + GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17302 }
17303
17304 /**
17305 @@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17306 static inline long local_add_return(long i, local_t *l)
17307 {
17308 long __i = i;
17309 + asm volatile(_ASM_XADD "%0, %1\n"
17310 +
17311 +#ifdef CONFIG_PAX_REFCOUNT
17312 + "jno 0f\n"
17313 + _ASM_MOV "%0,%1\n"
17314 + "int $4\n0:\n"
17315 + _ASM_EXTABLE(0b, 0b)
17316 +#endif
17317 +
17318 + : "+r" (i), "+m" (l->a.counter)
17319 + : : "memory");
17320 + return i + __i;
17321 +}
17322 +
17323 +/**
17324 + * local_add_return_unchecked - add and return
17325 + * @i: integer value to add
17326 + * @l: pointer to type local_unchecked_t
17327 + *
17328 + * Atomically adds @i to @l and returns @i + @l
17329 + */
17330 +static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17331 +{
17332 + long __i = i;
17333 asm volatile(_ASM_XADD "%0, %1;"
17334 : "+r" (i), "+m" (l->a.counter)
17335 : : "memory");
17336 @@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17337
17338 #define local_cmpxchg(l, o, n) \
17339 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17340 +#define local_cmpxchg_unchecked(l, o, n) \
17341 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
17342 /* Always has a lock prefix */
17343 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17344
17345 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17346 new file mode 100644
17347 index 0000000..2bfd3ba
17348 --- /dev/null
17349 +++ b/arch/x86/include/asm/mman.h
17350 @@ -0,0 +1,15 @@
17351 +#ifndef _X86_MMAN_H
17352 +#define _X86_MMAN_H
17353 +
17354 +#include <uapi/asm/mman.h>
17355 +
17356 +#ifdef __KERNEL__
17357 +#ifndef __ASSEMBLY__
17358 +#ifdef CONFIG_X86_32
17359 +#define arch_mmap_check i386_mmap_check
17360 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17361 +#endif
17362 +#endif
17363 +#endif
17364 +
17365 +#endif /* X86_MMAN_H */
17366 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17367 index 876e74e..e20bfb1 100644
17368 --- a/arch/x86/include/asm/mmu.h
17369 +++ b/arch/x86/include/asm/mmu.h
17370 @@ -9,7 +9,7 @@
17371 * we put the segment information here.
17372 */
17373 typedef struct {
17374 - void *ldt;
17375 + struct desc_struct *ldt;
17376 int size;
17377
17378 #ifdef CONFIG_X86_64
17379 @@ -18,7 +18,19 @@ typedef struct {
17380 #endif
17381
17382 struct mutex lock;
17383 - void __user *vdso;
17384 + unsigned long vdso;
17385 +
17386 +#ifdef CONFIG_X86_32
17387 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17388 + unsigned long user_cs_base;
17389 + unsigned long user_cs_limit;
17390 +
17391 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17392 + cpumask_t cpu_user_cs_mask;
17393 +#endif
17394 +
17395 +#endif
17396 +#endif
17397 } mm_context_t;
17398
17399 #ifdef CONFIG_SMP
17400 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17401 index 166af2a..648c200 100644
17402 --- a/arch/x86/include/asm/mmu_context.h
17403 +++ b/arch/x86/include/asm/mmu_context.h
17404 @@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
17405
17406 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17407 {
17408 +
17409 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17410 + if (!(static_cpu_has(X86_FEATURE_PCID))) {
17411 + unsigned int i;
17412 + pgd_t *pgd;
17413 +
17414 + pax_open_kernel();
17415 + pgd = get_cpu_pgd(smp_processor_id(), kernel);
17416 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17417 + set_pgd_batched(pgd+i, native_make_pgd(0));
17418 + pax_close_kernel();
17419 + }
17420 +#endif
17421 +
17422 #ifdef CONFIG_SMP
17423 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17424 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17425 @@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17426 struct task_struct *tsk)
17427 {
17428 unsigned cpu = smp_processor_id();
17429 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17430 + int tlbstate = TLBSTATE_OK;
17431 +#endif
17432
17433 if (likely(prev != next)) {
17434 #ifdef CONFIG_SMP
17435 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17436 + tlbstate = this_cpu_read(cpu_tlbstate.state);
17437 +#endif
17438 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17439 this_cpu_write(cpu_tlbstate.active_mm, next);
17440 #endif
17441 cpumask_set_cpu(cpu, mm_cpumask(next));
17442
17443 /* Re-load page tables */
17444 +#ifdef CONFIG_PAX_PER_CPU_PGD
17445 + pax_open_kernel();
17446 +
17447 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17448 + if (static_cpu_has(X86_FEATURE_PCID))
17449 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17450 + else
17451 +#endif
17452 +
17453 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17454 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17455 + pax_close_kernel();
17456 + BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17457 +
17458 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17459 + if (static_cpu_has(X86_FEATURE_PCID)) {
17460 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17461 + u64 descriptor[2];
17462 + descriptor[0] = PCID_USER;
17463 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17464 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17465 + descriptor[0] = PCID_KERNEL;
17466 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17467 + }
17468 + } else {
17469 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17470 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17471 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17472 + else
17473 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17474 + }
17475 + } else
17476 +#endif
17477 +
17478 + load_cr3(get_cpu_pgd(cpu, kernel));
17479 +#else
17480 load_cr3(next->pgd);
17481 +#endif
17482 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17483
17484 /* Stop flush ipis for the previous mm */
17485 @@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17486 /* Load the LDT, if the LDT is different: */
17487 if (unlikely(prev->context.ldt != next->context.ldt))
17488 load_LDT_nolock(&next->context);
17489 +
17490 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17491 + if (!(__supported_pte_mask & _PAGE_NX)) {
17492 + smp_mb__before_atomic();
17493 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17494 + smp_mb__after_atomic();
17495 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17496 + }
17497 +#endif
17498 +
17499 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17500 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17501 + prev->context.user_cs_limit != next->context.user_cs_limit))
17502 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17503 +#ifdef CONFIG_SMP
17504 + else if (unlikely(tlbstate != TLBSTATE_OK))
17505 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17506 +#endif
17507 +#endif
17508 +
17509 }
17510 + else {
17511 +
17512 +#ifdef CONFIG_PAX_PER_CPU_PGD
17513 + pax_open_kernel();
17514 +
17515 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17516 + if (static_cpu_has(X86_FEATURE_PCID))
17517 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17518 + else
17519 +#endif
17520 +
17521 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17522 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17523 + pax_close_kernel();
17524 + BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17525 +
17526 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17527 + if (static_cpu_has(X86_FEATURE_PCID)) {
17528 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17529 + u64 descriptor[2];
17530 + descriptor[0] = PCID_USER;
17531 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17532 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17533 + descriptor[0] = PCID_KERNEL;
17534 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17535 + }
17536 + } else {
17537 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17538 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17539 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17540 + else
17541 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17542 + }
17543 + } else
17544 +#endif
17545 +
17546 + load_cr3(get_cpu_pgd(cpu, kernel));
17547 +#endif
17548 +
17549 #ifdef CONFIG_SMP
17550 - else {
17551 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17552 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17553
17554 @@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17555 * tlb flush IPI delivery. We must reload CR3
17556 * to make sure to use no freed page tables.
17557 */
17558 +
17559 +#ifndef CONFIG_PAX_PER_CPU_PGD
17560 load_cr3(next->pgd);
17561 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17562 +#endif
17563 +
17564 load_LDT_nolock(&next->context);
17565 +
17566 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17567 + if (!(__supported_pte_mask & _PAGE_NX))
17568 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17569 +#endif
17570 +
17571 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17572 +#ifdef CONFIG_PAX_PAGEEXEC
17573 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17574 +#endif
17575 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17576 +#endif
17577 +
17578 }
17579 +#endif
17580 }
17581 -#endif
17582 }
17583
17584 #define activate_mm(prev, next) \
17585 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17586 index e3b7819..b257c64 100644
17587 --- a/arch/x86/include/asm/module.h
17588 +++ b/arch/x86/include/asm/module.h
17589 @@ -5,6 +5,7 @@
17590
17591 #ifdef CONFIG_X86_64
17592 /* X86_64 does not define MODULE_PROC_FAMILY */
17593 +#define MODULE_PROC_FAMILY ""
17594 #elif defined CONFIG_M486
17595 #define MODULE_PROC_FAMILY "486 "
17596 #elif defined CONFIG_M586
17597 @@ -57,8 +58,20 @@
17598 #error unknown processor family
17599 #endif
17600
17601 -#ifdef CONFIG_X86_32
17602 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17603 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17604 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17605 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17606 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17607 +#else
17608 +#define MODULE_PAX_KERNEXEC ""
17609 #endif
17610
17611 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17612 +#define MODULE_PAX_UDEREF "UDEREF "
17613 +#else
17614 +#define MODULE_PAX_UDEREF ""
17615 +#endif
17616 +
17617 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17618 +
17619 #endif /* _ASM_X86_MODULE_H */
17620 diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17621 index 5f2fc44..106caa6 100644
17622 --- a/arch/x86/include/asm/nmi.h
17623 +++ b/arch/x86/include/asm/nmi.h
17624 @@ -36,26 +36,35 @@ enum {
17625
17626 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17627
17628 +struct nmiaction;
17629 +
17630 +struct nmiwork {
17631 + const struct nmiaction *action;
17632 + u64 max_duration;
17633 + struct irq_work irq_work;
17634 +};
17635 +
17636 struct nmiaction {
17637 struct list_head list;
17638 nmi_handler_t handler;
17639 - u64 max_duration;
17640 - struct irq_work irq_work;
17641 unsigned long flags;
17642 const char *name;
17643 -};
17644 + struct nmiwork *work;
17645 +} __do_const;
17646
17647 #define register_nmi_handler(t, fn, fg, n, init...) \
17648 ({ \
17649 - static struct nmiaction init fn##_na = { \
17650 + static struct nmiwork fn##_nw; \
17651 + static const struct nmiaction init fn##_na = { \
17652 .handler = (fn), \
17653 .name = (n), \
17654 .flags = (fg), \
17655 + .work = &fn##_nw, \
17656 }; \
17657 __register_nmi_handler((t), &fn##_na); \
17658 })
17659
17660 -int __register_nmi_handler(unsigned int, struct nmiaction *);
17661 +int __register_nmi_handler(unsigned int, const struct nmiaction *);
17662
17663 void unregister_nmi_handler(unsigned int, const char *);
17664
17665 diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17666 index 802dde3..9183e68 100644
17667 --- a/arch/x86/include/asm/page.h
17668 +++ b/arch/x86/include/asm/page.h
17669 @@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17670 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17671
17672 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17673 +#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17674
17675 #define __boot_va(x) __va(x)
17676 #define __boot_pa(x) __pa(x)
17677 @@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17678 * virt_to_page(kaddr) returns a valid pointer if and only if
17679 * virt_addr_valid(kaddr) returns true.
17680 */
17681 -#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17682 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17683 extern bool __virt_addr_valid(unsigned long kaddr);
17684 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17685
17686 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17687 +#define virt_to_page(kaddr) \
17688 + ({ \
17689 + const void *__kaddr = (const void *)(kaddr); \
17690 + BUG_ON(!virt_addr_valid(__kaddr)); \
17691 + pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17692 + })
17693 +#else
17694 +#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17695 +#endif
17696 +
17697 #endif /* __ASSEMBLY__ */
17698
17699 #include <asm-generic/memory_model.h>
17700 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17701 index f408caf..4a0455e 100644
17702 --- a/arch/x86/include/asm/page_64.h
17703 +++ b/arch/x86/include/asm/page_64.h
17704 @@ -7,9 +7,9 @@
17705
17706 /* duplicated to the one in bootmem.h */
17707 extern unsigned long max_pfn;
17708 -extern unsigned long phys_base;
17709 +extern const unsigned long phys_base;
17710
17711 -static inline unsigned long __phys_addr_nodebug(unsigned long x)
17712 +static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17713 {
17714 unsigned long y = x - __START_KERNEL_map;
17715
17716 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17717 index cd6e1610..70f4418 100644
17718 --- a/arch/x86/include/asm/paravirt.h
17719 +++ b/arch/x86/include/asm/paravirt.h
17720 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17721 return (pmd_t) { ret };
17722 }
17723
17724 -static inline pmdval_t pmd_val(pmd_t pmd)
17725 +static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17726 {
17727 pmdval_t ret;
17728
17729 @@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17730 val);
17731 }
17732
17733 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17734 +{
17735 + pgdval_t val = native_pgd_val(pgd);
17736 +
17737 + if (sizeof(pgdval_t) > sizeof(long))
17738 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17739 + val, (u64)val >> 32);
17740 + else
17741 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17742 + val);
17743 +}
17744 +
17745 static inline void pgd_clear(pgd_t *pgdp)
17746 {
17747 set_pgd(pgdp, __pgd(0));
17748 @@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17749 pv_mmu_ops.set_fixmap(idx, phys, flags);
17750 }
17751
17752 +#ifdef CONFIG_PAX_KERNEXEC
17753 +static inline unsigned long pax_open_kernel(void)
17754 +{
17755 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17756 +}
17757 +
17758 +static inline unsigned long pax_close_kernel(void)
17759 +{
17760 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17761 +}
17762 +#else
17763 +static inline unsigned long pax_open_kernel(void) { return 0; }
17764 +static inline unsigned long pax_close_kernel(void) { return 0; }
17765 +#endif
17766 +
17767 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17768
17769 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17770 @@ -906,7 +933,7 @@ extern void default_banner(void);
17771
17772 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17773 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17774 -#define PARA_INDIRECT(addr) *%cs:addr
17775 +#define PARA_INDIRECT(addr) *%ss:addr
17776 #endif
17777
17778 #define INTERRUPT_RETURN \
17779 @@ -981,6 +1008,21 @@ extern void default_banner(void);
17780 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17781 CLBR_NONE, \
17782 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17783 +
17784 +#define GET_CR0_INTO_RDI \
17785 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17786 + mov %rax,%rdi
17787 +
17788 +#define SET_RDI_INTO_CR0 \
17789 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17790 +
17791 +#define GET_CR3_INTO_RDI \
17792 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17793 + mov %rax,%rdi
17794 +
17795 +#define SET_RDI_INTO_CR3 \
17796 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17797 +
17798 #endif /* CONFIG_X86_32 */
17799
17800 #endif /* __ASSEMBLY__ */
17801 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17802 index 7549b8b..f0edfda 100644
17803 --- a/arch/x86/include/asm/paravirt_types.h
17804 +++ b/arch/x86/include/asm/paravirt_types.h
17805 @@ -84,7 +84,7 @@ struct pv_init_ops {
17806 */
17807 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17808 unsigned long addr, unsigned len);
17809 -};
17810 +} __no_const __no_randomize_layout;
17811
17812
17813 struct pv_lazy_ops {
17814 @@ -92,13 +92,13 @@ struct pv_lazy_ops {
17815 void (*enter)(void);
17816 void (*leave)(void);
17817 void (*flush)(void);
17818 -};
17819 +} __no_randomize_layout;
17820
17821 struct pv_time_ops {
17822 unsigned long long (*sched_clock)(void);
17823 unsigned long long (*steal_clock)(int cpu);
17824 unsigned long (*get_tsc_khz)(void);
17825 -};
17826 +} __no_const __no_randomize_layout;
17827
17828 struct pv_cpu_ops {
17829 /* hooks for various privileged instructions */
17830 @@ -192,7 +192,7 @@ struct pv_cpu_ops {
17831
17832 void (*start_context_switch)(struct task_struct *prev);
17833 void (*end_context_switch)(struct task_struct *next);
17834 -};
17835 +} __no_const __no_randomize_layout;
17836
17837 struct pv_irq_ops {
17838 /*
17839 @@ -215,7 +215,7 @@ struct pv_irq_ops {
17840 #ifdef CONFIG_X86_64
17841 void (*adjust_exception_frame)(void);
17842 #endif
17843 -};
17844 +} __no_randomize_layout;
17845
17846 struct pv_apic_ops {
17847 #ifdef CONFIG_X86_LOCAL_APIC
17848 @@ -223,7 +223,7 @@ struct pv_apic_ops {
17849 unsigned long start_eip,
17850 unsigned long start_esp);
17851 #endif
17852 -};
17853 +} __no_const __no_randomize_layout;
17854
17855 struct pv_mmu_ops {
17856 unsigned long (*read_cr2)(void);
17857 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
17858 struct paravirt_callee_save make_pud;
17859
17860 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17861 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17862 #endif /* PAGETABLE_LEVELS == 4 */
17863 #endif /* PAGETABLE_LEVELS >= 3 */
17864
17865 @@ -324,7 +325,13 @@ struct pv_mmu_ops {
17866 an mfn. We can tell which is which from the index. */
17867 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17868 phys_addr_t phys, pgprot_t flags);
17869 -};
17870 +
17871 +#ifdef CONFIG_PAX_KERNEXEC
17872 + unsigned long (*pax_open_kernel)(void);
17873 + unsigned long (*pax_close_kernel)(void);
17874 +#endif
17875 +
17876 +} __no_randomize_layout;
17877
17878 struct arch_spinlock;
17879 #ifdef CONFIG_SMP
17880 @@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17881 struct pv_lock_ops {
17882 struct paravirt_callee_save lock_spinning;
17883 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17884 -};
17885 +} __no_randomize_layout;
17886
17887 /* This contains all the paravirt structures: we get a convenient
17888 * number for each function using the offset which we use to indicate
17889 - * what to patch. */
17890 + * what to patch.
17891 + * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17892 + */
17893 +
17894 struct paravirt_patch_template {
17895 struct pv_init_ops pv_init_ops;
17896 struct pv_time_ops pv_time_ops;
17897 @@ -349,7 +359,7 @@ struct paravirt_patch_template {
17898 struct pv_apic_ops pv_apic_ops;
17899 struct pv_mmu_ops pv_mmu_ops;
17900 struct pv_lock_ops pv_lock_ops;
17901 -};
17902 +} __no_randomize_layout;
17903
17904 extern struct pv_info pv_info;
17905 extern struct pv_init_ops pv_init_ops;
17906 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17907 index c4412e9..90e88c5 100644
17908 --- a/arch/x86/include/asm/pgalloc.h
17909 +++ b/arch/x86/include/asm/pgalloc.h
17910 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17911 pmd_t *pmd, pte_t *pte)
17912 {
17913 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17914 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17915 +}
17916 +
17917 +static inline void pmd_populate_user(struct mm_struct *mm,
17918 + pmd_t *pmd, pte_t *pte)
17919 +{
17920 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17921 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17922 }
17923
17924 @@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17925
17926 #ifdef CONFIG_X86_PAE
17927 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17928 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17929 +{
17930 + pud_populate(mm, pudp, pmd);
17931 +}
17932 #else /* !CONFIG_X86_PAE */
17933 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17934 {
17935 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17936 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17937 }
17938 +
17939 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17940 +{
17941 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17942 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17943 +}
17944 #endif /* CONFIG_X86_PAE */
17945
17946 #if PAGETABLE_LEVELS > 3
17947 @@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17948 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17949 }
17950
17951 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17952 +{
17953 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17954 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17955 +}
17956 +
17957 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17958 {
17959 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17960 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17961 index 206a87f..1623b06 100644
17962 --- a/arch/x86/include/asm/pgtable-2level.h
17963 +++ b/arch/x86/include/asm/pgtable-2level.h
17964 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17965
17966 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17967 {
17968 + pax_open_kernel();
17969 *pmdp = pmd;
17970 + pax_close_kernel();
17971 }
17972
17973 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17974 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17975 index 81bb91b..9392125 100644
17976 --- a/arch/x86/include/asm/pgtable-3level.h
17977 +++ b/arch/x86/include/asm/pgtable-3level.h
17978 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17979
17980 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17981 {
17982 + pax_open_kernel();
17983 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17984 + pax_close_kernel();
17985 }
17986
17987 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17988 {
17989 + pax_open_kernel();
17990 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17991 + pax_close_kernel();
17992 }
17993
17994 /*
17995 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17996 index aa97a07..5c53c32 100644
17997 --- a/arch/x86/include/asm/pgtable.h
17998 +++ b/arch/x86/include/asm/pgtable.h
17999 @@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18000
18001 #ifndef __PAGETABLE_PUD_FOLDED
18002 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18003 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18004 #define pgd_clear(pgd) native_pgd_clear(pgd)
18005 #endif
18006
18007 @@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18008
18009 #define arch_end_context_switch(prev) do {} while(0)
18010
18011 +#define pax_open_kernel() native_pax_open_kernel()
18012 +#define pax_close_kernel() native_pax_close_kernel()
18013 #endif /* CONFIG_PARAVIRT */
18014
18015 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
18016 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18017 +
18018 +#ifdef CONFIG_PAX_KERNEXEC
18019 +static inline unsigned long native_pax_open_kernel(void)
18020 +{
18021 + unsigned long cr0;
18022 +
18023 + preempt_disable();
18024 + barrier();
18025 + cr0 = read_cr0() ^ X86_CR0_WP;
18026 + BUG_ON(cr0 & X86_CR0_WP);
18027 + write_cr0(cr0);
18028 + barrier();
18029 + return cr0 ^ X86_CR0_WP;
18030 +}
18031 +
18032 +static inline unsigned long native_pax_close_kernel(void)
18033 +{
18034 + unsigned long cr0;
18035 +
18036 + barrier();
18037 + cr0 = read_cr0() ^ X86_CR0_WP;
18038 + BUG_ON(!(cr0 & X86_CR0_WP));
18039 + write_cr0(cr0);
18040 + barrier();
18041 + preempt_enable_no_resched();
18042 + return cr0 ^ X86_CR0_WP;
18043 +}
18044 +#else
18045 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
18046 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
18047 +#endif
18048 +
18049 /*
18050 * The following only work if pte_present() is true.
18051 * Undefined behaviour if not..
18052 */
18053 +static inline int pte_user(pte_t pte)
18054 +{
18055 + return pte_val(pte) & _PAGE_USER;
18056 +}
18057 +
18058 static inline int pte_dirty(pte_t pte)
18059 {
18060 return pte_flags(pte) & _PAGE_DIRTY;
18061 @@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18062 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18063 }
18064
18065 +static inline unsigned long pgd_pfn(pgd_t pgd)
18066 +{
18067 + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18068 +}
18069 +
18070 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18071
18072 static inline int pmd_large(pmd_t pte)
18073 @@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18074 return pte_clear_flags(pte, _PAGE_RW);
18075 }
18076
18077 +static inline pte_t pte_mkread(pte_t pte)
18078 +{
18079 + return __pte(pte_val(pte) | _PAGE_USER);
18080 +}
18081 +
18082 static inline pte_t pte_mkexec(pte_t pte)
18083 {
18084 - return pte_clear_flags(pte, _PAGE_NX);
18085 +#ifdef CONFIG_X86_PAE
18086 + if (__supported_pte_mask & _PAGE_NX)
18087 + return pte_clear_flags(pte, _PAGE_NX);
18088 + else
18089 +#endif
18090 + return pte_set_flags(pte, _PAGE_USER);
18091 +}
18092 +
18093 +static inline pte_t pte_exprotect(pte_t pte)
18094 +{
18095 +#ifdef CONFIG_X86_PAE
18096 + if (__supported_pte_mask & _PAGE_NX)
18097 + return pte_set_flags(pte, _PAGE_NX);
18098 + else
18099 +#endif
18100 + return pte_clear_flags(pte, _PAGE_USER);
18101 }
18102
18103 static inline pte_t pte_mkdirty(pte_t pte)
18104 @@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18105 #endif
18106
18107 #ifndef __ASSEMBLY__
18108 +
18109 +#ifdef CONFIG_PAX_PER_CPU_PGD
18110 +extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18111 +enum cpu_pgd_type {kernel = 0, user = 1};
18112 +static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18113 +{
18114 + return cpu_pgd[cpu][type];
18115 +}
18116 +#endif
18117 +
18118 #include <linux/mm_types.h>
18119 #include <linux/mmdebug.h>
18120 #include <linux/log2.h>
18121 @@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18122 * Currently stuck as a macro due to indirect forward reference to
18123 * linux/mmzone.h's __section_mem_map_addr() definition:
18124 */
18125 -#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18126 +#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18127
18128 /* Find an entry in the second-level page table.. */
18129 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18130 @@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18131 * Currently stuck as a macro due to indirect forward reference to
18132 * linux/mmzone.h's __section_mem_map_addr() definition:
18133 */
18134 -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18135 +#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18136
18137 /* to find an entry in a page-table-directory. */
18138 static inline unsigned long pud_index(unsigned long address)
18139 @@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18140
18141 static inline int pgd_bad(pgd_t pgd)
18142 {
18143 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18144 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18145 }
18146
18147 static inline int pgd_none(pgd_t pgd)
18148 @@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
18149 * pgd_offset() returns a (pgd_t *)
18150 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18151 */
18152 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18153 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18154 +
18155 +#ifdef CONFIG_PAX_PER_CPU_PGD
18156 +#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18157 +#endif
18158 +
18159 /*
18160 * a shortcut which implies the use of the kernel's pgd, instead
18161 * of a process's
18162 @@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
18163 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18164 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18165
18166 +#ifdef CONFIG_X86_32
18167 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18168 +#else
18169 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18170 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18171 +
18172 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18173 +#ifdef __ASSEMBLY__
18174 +#define pax_user_shadow_base pax_user_shadow_base(%rip)
18175 +#else
18176 +extern unsigned long pax_user_shadow_base;
18177 +extern pgdval_t clone_pgd_mask;
18178 +#endif
18179 +#endif
18180 +
18181 +#endif
18182 +
18183 #ifndef __ASSEMBLY__
18184
18185 extern int direct_gbpages;
18186 @@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18187 * dst and src can be on the same page, but the range must not overlap,
18188 * and must not cross a page boundary.
18189 */
18190 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18191 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18192 {
18193 - memcpy(dst, src, count * sizeof(pgd_t));
18194 + pax_open_kernel();
18195 + while (count--)
18196 + *dst++ = *src++;
18197 + pax_close_kernel();
18198 }
18199
18200 +#ifdef CONFIG_PAX_PER_CPU_PGD
18201 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18202 +#endif
18203 +
18204 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18205 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18206 +#else
18207 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18208 +#endif
18209 +
18210 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18211 static inline int page_level_shift(enum pg_level level)
18212 {
18213 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18214 index b6c0b40..3535d47 100644
18215 --- a/arch/x86/include/asm/pgtable_32.h
18216 +++ b/arch/x86/include/asm/pgtable_32.h
18217 @@ -25,9 +25,6 @@
18218 struct mm_struct;
18219 struct vm_area_struct;
18220
18221 -extern pgd_t swapper_pg_dir[1024];
18222 -extern pgd_t initial_page_table[1024];
18223 -
18224 static inline void pgtable_cache_init(void) { }
18225 static inline void check_pgt_cache(void) { }
18226 void paging_init(void);
18227 @@ -45,6 +42,12 @@ void paging_init(void);
18228 # include <asm/pgtable-2level.h>
18229 #endif
18230
18231 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18232 +extern pgd_t initial_page_table[PTRS_PER_PGD];
18233 +#ifdef CONFIG_X86_PAE
18234 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18235 +#endif
18236 +
18237 #if defined(CONFIG_HIGHPTE)
18238 #define pte_offset_map(dir, address) \
18239 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18240 @@ -59,12 +62,17 @@ void paging_init(void);
18241 /* Clear a kernel PTE and flush it from the TLB */
18242 #define kpte_clear_flush(ptep, vaddr) \
18243 do { \
18244 + pax_open_kernel(); \
18245 pte_clear(&init_mm, (vaddr), (ptep)); \
18246 + pax_close_kernel(); \
18247 __flush_tlb_one((vaddr)); \
18248 } while (0)
18249
18250 #endif /* !__ASSEMBLY__ */
18251
18252 +#define HAVE_ARCH_UNMAPPED_AREA
18253 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18254 +
18255 /*
18256 * kern_addr_valid() is (1) for FLATMEM and (0) for
18257 * SPARSEMEM and DISCONTIGMEM
18258 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18259 index ed5903b..c7fe163 100644
18260 --- a/arch/x86/include/asm/pgtable_32_types.h
18261 +++ b/arch/x86/include/asm/pgtable_32_types.h
18262 @@ -8,7 +8,7 @@
18263 */
18264 #ifdef CONFIG_X86_PAE
18265 # include <asm/pgtable-3level_types.h>
18266 -# define PMD_SIZE (1UL << PMD_SHIFT)
18267 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18268 # define PMD_MASK (~(PMD_SIZE - 1))
18269 #else
18270 # include <asm/pgtable-2level_types.h>
18271 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18272 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18273 #endif
18274
18275 +#ifdef CONFIG_PAX_KERNEXEC
18276 +#ifndef __ASSEMBLY__
18277 +extern unsigned char MODULES_EXEC_VADDR[];
18278 +extern unsigned char MODULES_EXEC_END[];
18279 +#endif
18280 +#include <asm/boot.h>
18281 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18282 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18283 +#else
18284 +#define ktla_ktva(addr) (addr)
18285 +#define ktva_ktla(addr) (addr)
18286 +#endif
18287 +
18288 #define MODULES_VADDR VMALLOC_START
18289 #define MODULES_END VMALLOC_END
18290 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18291 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18292 index 4572b2f..4430113 100644
18293 --- a/arch/x86/include/asm/pgtable_64.h
18294 +++ b/arch/x86/include/asm/pgtable_64.h
18295 @@ -16,11 +16,16 @@
18296
18297 extern pud_t level3_kernel_pgt[512];
18298 extern pud_t level3_ident_pgt[512];
18299 +extern pud_t level3_vmalloc_start_pgt[512];
18300 +extern pud_t level3_vmalloc_end_pgt[512];
18301 +extern pud_t level3_vmemmap_pgt[512];
18302 +extern pud_t level2_vmemmap_pgt[512];
18303 extern pmd_t level2_kernel_pgt[512];
18304 extern pmd_t level2_fixmap_pgt[512];
18305 -extern pmd_t level2_ident_pgt[512];
18306 +extern pmd_t level2_ident_pgt[512*2];
18307 extern pte_t level1_fixmap_pgt[512];
18308 -extern pgd_t init_level4_pgt[];
18309 +extern pte_t level1_vsyscall_pgt[512];
18310 +extern pgd_t init_level4_pgt[512];
18311
18312 #define swapper_pg_dir init_level4_pgt
18313
18314 @@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18315
18316 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18317 {
18318 + pax_open_kernel();
18319 *pmdp = pmd;
18320 + pax_close_kernel();
18321 }
18322
18323 static inline void native_pmd_clear(pmd_t *pmd)
18324 @@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18325
18326 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18327 {
18328 + pax_open_kernel();
18329 *pudp = pud;
18330 + pax_close_kernel();
18331 }
18332
18333 static inline void native_pud_clear(pud_t *pud)
18334 @@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18335
18336 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18337 {
18338 + pax_open_kernel();
18339 + *pgdp = pgd;
18340 + pax_close_kernel();
18341 +}
18342 +
18343 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18344 +{
18345 *pgdp = pgd;
18346 }
18347
18348 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18349 index 7166e25..baaa6fe 100644
18350 --- a/arch/x86/include/asm/pgtable_64_types.h
18351 +++ b/arch/x86/include/asm/pgtable_64_types.h
18352 @@ -61,9 +61,14 @@ typedef struct { pteval_t pte; } pte_t;
18353 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18354 #define MODULES_END _AC(0xffffffffff000000, UL)
18355 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18356 +#define MODULES_EXEC_VADDR MODULES_VADDR
18357 +#define MODULES_EXEC_END MODULES_END
18358 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18359 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18360
18361 +#define ktla_ktva(addr) (addr)
18362 +#define ktva_ktla(addr) (addr)
18363 +
18364 #define EARLY_DYNAMIC_PAGE_TABLES 64
18365
18366 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18367 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18368 index 0778964..0e94758 100644
18369 --- a/arch/x86/include/asm/pgtable_types.h
18370 +++ b/arch/x86/include/asm/pgtable_types.h
18371 @@ -110,8 +110,10 @@
18372
18373 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18374 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18375 -#else
18376 +#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18377 #define _PAGE_NX (_AT(pteval_t, 0))
18378 +#else
18379 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18380 #endif
18381
18382 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18383 @@ -150,6 +152,9 @@
18384 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18385 _PAGE_ACCESSED)
18386
18387 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
18388 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
18389 +
18390 #define __PAGE_KERNEL_EXEC \
18391 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18392 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18393 @@ -160,7 +165,7 @@
18394 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18395 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18396 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18397 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18398 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18399 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18400 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18401 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18402 @@ -217,7 +222,7 @@
18403 #ifdef CONFIG_X86_64
18404 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18405 #else
18406 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18407 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18408 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18409 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18410 #endif
18411 @@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18412 {
18413 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18414 }
18415 +#endif
18416
18417 +#if PAGETABLE_LEVELS == 3
18418 +#include <asm-generic/pgtable-nopud.h>
18419 +#endif
18420 +
18421 +#if PAGETABLE_LEVELS == 2
18422 +#include <asm-generic/pgtable-nopmd.h>
18423 +#endif
18424 +
18425 +#ifndef __ASSEMBLY__
18426 #if PAGETABLE_LEVELS > 3
18427 typedef struct { pudval_t pud; } pud_t;
18428
18429 @@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18430 return pud.pud;
18431 }
18432 #else
18433 -#include <asm-generic/pgtable-nopud.h>
18434 -
18435 static inline pudval_t native_pud_val(pud_t pud)
18436 {
18437 return native_pgd_val(pud.pgd);
18438 @@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18439 return pmd.pmd;
18440 }
18441 #else
18442 -#include <asm-generic/pgtable-nopmd.h>
18443 -
18444 static inline pmdval_t native_pmd_val(pmd_t pmd)
18445 {
18446 return native_pgd_val(pmd.pud.pgd);
18447 @@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
18448
18449 extern pteval_t __supported_pte_mask;
18450 extern void set_nx(void);
18451 -extern int nx_enabled;
18452
18453 #define pgprot_writecombine pgprot_writecombine
18454 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18455 diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18456 index 4008734..48f0d81 100644
18457 --- a/arch/x86/include/asm/preempt.h
18458 +++ b/arch/x86/include/asm/preempt.h
18459 @@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18460 */
18461 static __always_inline bool __preempt_count_dec_and_test(void)
18462 {
18463 - GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18464 + GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18465 }
18466
18467 /*
18468 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18469 index eb71ec7..f06532a 100644
18470 --- a/arch/x86/include/asm/processor.h
18471 +++ b/arch/x86/include/asm/processor.h
18472 @@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18473 /* Index into per_cpu list: */
18474 u16 cpu_index;
18475 u32 microcode;
18476 -} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18477 +} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18478
18479 #define X86_VENDOR_INTEL 0
18480 #define X86_VENDOR_CYRIX 1
18481 @@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18482 : "memory");
18483 }
18484
18485 +/* invpcid (%rdx),%rax */
18486 +#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18487 +
18488 +#define INVPCID_SINGLE_ADDRESS 0UL
18489 +#define INVPCID_SINGLE_CONTEXT 1UL
18490 +#define INVPCID_ALL_GLOBAL 2UL
18491 +#define INVPCID_ALL_NONGLOBAL 3UL
18492 +
18493 +#define PCID_KERNEL 0UL
18494 +#define PCID_USER 1UL
18495 +#define PCID_NOFLUSH (1UL << 63)
18496 +
18497 static inline void load_cr3(pgd_t *pgdir)
18498 {
18499 - write_cr3(__pa(pgdir));
18500 + write_cr3(__pa(pgdir) | PCID_KERNEL);
18501 }
18502
18503 #ifdef CONFIG_X86_32
18504 @@ -282,7 +294,7 @@ struct tss_struct {
18505
18506 } ____cacheline_aligned;
18507
18508 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18509 +extern struct tss_struct init_tss[NR_CPUS];
18510
18511 /*
18512 * Save the original ist values for checking stack pointers during debugging
18513 @@ -478,6 +490,7 @@ struct thread_struct {
18514 unsigned short ds;
18515 unsigned short fsindex;
18516 unsigned short gsindex;
18517 + unsigned short ss;
18518 #endif
18519 #ifdef CONFIG_X86_32
18520 unsigned long ip;
18521 @@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
18522 extern unsigned long mmu_cr4_features;
18523 extern u32 *trampoline_cr4_features;
18524
18525 -static inline void set_in_cr4(unsigned long mask)
18526 -{
18527 - unsigned long cr4;
18528 -
18529 - mmu_cr4_features |= mask;
18530 - if (trampoline_cr4_features)
18531 - *trampoline_cr4_features = mmu_cr4_features;
18532 - cr4 = read_cr4();
18533 - cr4 |= mask;
18534 - write_cr4(cr4);
18535 -}
18536 -
18537 -static inline void clear_in_cr4(unsigned long mask)
18538 -{
18539 - unsigned long cr4;
18540 -
18541 - mmu_cr4_features &= ~mask;
18542 - if (trampoline_cr4_features)
18543 - *trampoline_cr4_features = mmu_cr4_features;
18544 - cr4 = read_cr4();
18545 - cr4 &= ~mask;
18546 - write_cr4(cr4);
18547 -}
18548 +extern void set_in_cr4(unsigned long mask);
18549 +extern void clear_in_cr4(unsigned long mask);
18550
18551 typedef struct {
18552 unsigned long seg;
18553 @@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
18554 */
18555 #define TASK_SIZE PAGE_OFFSET
18556 #define TASK_SIZE_MAX TASK_SIZE
18557 +
18558 +#ifdef CONFIG_PAX_SEGMEXEC
18559 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18560 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18561 +#else
18562 #define STACK_TOP TASK_SIZE
18563 -#define STACK_TOP_MAX STACK_TOP
18564 +#endif
18565 +
18566 +#define STACK_TOP_MAX TASK_SIZE
18567
18568 #define INIT_THREAD { \
18569 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18570 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18571 .vm86_info = NULL, \
18572 .sysenter_cs = __KERNEL_CS, \
18573 .io_bitmap_ptr = NULL, \
18574 @@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18575 */
18576 #define INIT_TSS { \
18577 .x86_tss = { \
18578 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18579 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18580 .ss0 = __KERNEL_DS, \
18581 .ss1 = __KERNEL_CS, \
18582 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18583 @@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
18584 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18585
18586 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18587 -#define KSTK_TOP(info) \
18588 -({ \
18589 - unsigned long *__ptr = (unsigned long *)(info); \
18590 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18591 -})
18592 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18593
18594 /*
18595 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18596 @@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18597 #define task_pt_regs(task) \
18598 ({ \
18599 struct pt_regs *__regs__; \
18600 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18601 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18602 __regs__ - 1; \
18603 })
18604
18605 @@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18606 /*
18607 * User space process size. 47bits minus one guard page.
18608 */
18609 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18610 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18611
18612 /* This decides where the kernel will search for a free chunk of vm
18613 * space during mmap's.
18614 */
18615 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18616 - 0xc0000000 : 0xFFFFe000)
18617 + 0xc0000000 : 0xFFFFf000)
18618
18619 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18620 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18621 @@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18622 #define STACK_TOP_MAX TASK_SIZE_MAX
18623
18624 #define INIT_THREAD { \
18625 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18626 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18627 }
18628
18629 #define INIT_TSS { \
18630 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18631 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18632 }
18633
18634 /*
18635 @@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18636 */
18637 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18638
18639 +#ifdef CONFIG_PAX_SEGMEXEC
18640 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18641 +#endif
18642 +
18643 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18644
18645 /* Get/set a process' ability to use the timestamp counter instruction */
18646 @@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18647 return 0;
18648 }
18649
18650 -extern unsigned long arch_align_stack(unsigned long sp);
18651 +#define arch_align_stack(x) ((x) & ~0xfUL)
18652 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18653
18654 void default_idle(void);
18655 @@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
18656 #define xen_set_default_idle 0
18657 #endif
18658
18659 -void stop_this_cpu(void *dummy);
18660 +void stop_this_cpu(void *dummy) __noreturn;
18661 void df_debug(struct pt_regs *regs, long error_code);
18662 #endif /* _ASM_X86_PROCESSOR_H */
18663 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18664 index 86fc2bb..bd5049a 100644
18665 --- a/arch/x86/include/asm/ptrace.h
18666 +++ b/arch/x86/include/asm/ptrace.h
18667 @@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18668 }
18669
18670 /*
18671 - * user_mode_vm(regs) determines whether a register set came from user mode.
18672 + * user_mode(regs) determines whether a register set came from user mode.
18673 * This is true if V8086 mode was enabled OR if the register set was from
18674 * protected mode with RPL-3 CS value. This tricky test checks that with
18675 * one comparison. Many places in the kernel can bypass this full check
18676 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18677 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18678 + * be used.
18679 */
18680 -static inline int user_mode(struct pt_regs *regs)
18681 +static inline int user_mode_novm(struct pt_regs *regs)
18682 {
18683 #ifdef CONFIG_X86_32
18684 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18685 #else
18686 - return !!(regs->cs & 3);
18687 + return !!(regs->cs & SEGMENT_RPL_MASK);
18688 #endif
18689 }
18690
18691 -static inline int user_mode_vm(struct pt_regs *regs)
18692 +static inline int user_mode(struct pt_regs *regs)
18693 {
18694 #ifdef CONFIG_X86_32
18695 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18696 USER_RPL;
18697 #else
18698 - return user_mode(regs);
18699 + return user_mode_novm(regs);
18700 #endif
18701 }
18702
18703 @@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18704 #ifdef CONFIG_X86_64
18705 static inline bool user_64bit_mode(struct pt_regs *regs)
18706 {
18707 + unsigned long cs = regs->cs & 0xffff;
18708 #ifndef CONFIG_PARAVIRT
18709 /*
18710 * On non-paravirt systems, this is the only long mode CPL 3
18711 * selector. We do not allow long mode selectors in the LDT.
18712 */
18713 - return regs->cs == __USER_CS;
18714 + return cs == __USER_CS;
18715 #else
18716 /* Headers are too twisted for this to go in paravirt.h. */
18717 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18718 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18719 #endif
18720 }
18721
18722 @@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18723 * Traps from the kernel do not save sp and ss.
18724 * Use the helper function to retrieve sp.
18725 */
18726 - if (offset == offsetof(struct pt_regs, sp) &&
18727 - regs->cs == __KERNEL_CS)
18728 - return kernel_stack_pointer(regs);
18729 + if (offset == offsetof(struct pt_regs, sp)) {
18730 + unsigned long cs = regs->cs & 0xffff;
18731 + if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18732 + return kernel_stack_pointer(regs);
18733 + }
18734 #endif
18735 return *(unsigned long *)((unsigned long)regs + offset);
18736 }
18737 diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18738 index ae0e241..e80b10b 100644
18739 --- a/arch/x86/include/asm/qrwlock.h
18740 +++ b/arch/x86/include/asm/qrwlock.h
18741 @@ -7,8 +7,8 @@
18742 #define queue_write_unlock queue_write_unlock
18743 static inline void queue_write_unlock(struct qrwlock *lock)
18744 {
18745 - barrier();
18746 - ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18747 + barrier();
18748 + ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18749 }
18750 #endif
18751
18752 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18753 index 9c6b890..5305f53 100644
18754 --- a/arch/x86/include/asm/realmode.h
18755 +++ b/arch/x86/include/asm/realmode.h
18756 @@ -22,16 +22,14 @@ struct real_mode_header {
18757 #endif
18758 /* APM/BIOS reboot */
18759 u32 machine_real_restart_asm;
18760 -#ifdef CONFIG_X86_64
18761 u32 machine_real_restart_seg;
18762 -#endif
18763 };
18764
18765 /* This must match data at trampoline_32/64.S */
18766 struct trampoline_header {
18767 #ifdef CONFIG_X86_32
18768 u32 start;
18769 - u16 gdt_pad;
18770 + u16 boot_cs;
18771 u16 gdt_limit;
18772 u32 gdt_base;
18773 #else
18774 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18775 index a82c4f1..ac45053 100644
18776 --- a/arch/x86/include/asm/reboot.h
18777 +++ b/arch/x86/include/asm/reboot.h
18778 @@ -6,13 +6,13 @@
18779 struct pt_regs;
18780
18781 struct machine_ops {
18782 - void (*restart)(char *cmd);
18783 - void (*halt)(void);
18784 - void (*power_off)(void);
18785 + void (* __noreturn restart)(char *cmd);
18786 + void (* __noreturn halt)(void);
18787 + void (* __noreturn power_off)(void);
18788 void (*shutdown)(void);
18789 void (*crash_shutdown)(struct pt_regs *);
18790 - void (*emergency_restart)(void);
18791 -};
18792 + void (* __noreturn emergency_restart)(void);
18793 +} __no_const;
18794
18795 extern struct machine_ops machine_ops;
18796
18797 diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18798 index 8f7866a..e442f20 100644
18799 --- a/arch/x86/include/asm/rmwcc.h
18800 +++ b/arch/x86/include/asm/rmwcc.h
18801 @@ -3,7 +3,34 @@
18802
18803 #ifdef CC_HAVE_ASM_GOTO
18804
18805 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18806 +#ifdef CONFIG_PAX_REFCOUNT
18807 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18808 +do { \
18809 + asm_volatile_goto (fullop \
18810 + ";jno 0f\n" \
18811 + fullantiop \
18812 + ";int $4\n0:\n" \
18813 + _ASM_EXTABLE(0b, 0b) \
18814 + ";j" cc " %l[cc_label]" \
18815 + : : "m" (var), ## __VA_ARGS__ \
18816 + : "memory" : cc_label); \
18817 + return 0; \
18818 +cc_label: \
18819 + return 1; \
18820 +} while (0)
18821 +#else
18822 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18823 +do { \
18824 + asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18825 + : : "m" (var), ## __VA_ARGS__ \
18826 + : "memory" : cc_label); \
18827 + return 0; \
18828 +cc_label: \
18829 + return 1; \
18830 +} while (0)
18831 +#endif
18832 +
18833 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18834 do { \
18835 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18836 : : "m" (var), ## __VA_ARGS__ \
18837 @@ -13,15 +40,46 @@ cc_label: \
18838 return 1; \
18839 } while (0)
18840
18841 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18842 - __GEN_RMWcc(op " " arg0, var, cc)
18843 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18844 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18845
18846 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18847 - __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18848 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18849 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18850 +
18851 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18852 + __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18853 +
18854 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18855 + __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18856
18857 #else /* !CC_HAVE_ASM_GOTO */
18858
18859 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18860 +#ifdef CONFIG_PAX_REFCOUNT
18861 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18862 +do { \
18863 + char c; \
18864 + asm volatile (fullop \
18865 + ";jno 0f\n" \
18866 + fullantiop \
18867 + ";int $4\n0:\n" \
18868 + _ASM_EXTABLE(0b, 0b) \
18869 + "; set" cc " %1" \
18870 + : "+m" (var), "=qm" (c) \
18871 + : __VA_ARGS__ : "memory"); \
18872 + return c != 0; \
18873 +} while (0)
18874 +#else
18875 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18876 +do { \
18877 + char c; \
18878 + asm volatile (fullop "; set" cc " %1" \
18879 + : "+m" (var), "=qm" (c) \
18880 + : __VA_ARGS__ : "memory"); \
18881 + return c != 0; \
18882 +} while (0)
18883 +#endif
18884 +
18885 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18886 do { \
18887 char c; \
18888 asm volatile (fullop "; set" cc " %1" \
18889 @@ -30,11 +88,17 @@ do { \
18890 return c != 0; \
18891 } while (0)
18892
18893 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18894 - __GEN_RMWcc(op " " arg0, var, cc)
18895 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18896 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18897 +
18898 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18899 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18900 +
18901 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18902 + __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18903
18904 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18905 - __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18906 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18907 + __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18908
18909 #endif /* CC_HAVE_ASM_GOTO */
18910
18911 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18912 index cad82c9..2e5c5c1 100644
18913 --- a/arch/x86/include/asm/rwsem.h
18914 +++ b/arch/x86/include/asm/rwsem.h
18915 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18916 {
18917 asm volatile("# beginning down_read\n\t"
18918 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18919 +
18920 +#ifdef CONFIG_PAX_REFCOUNT
18921 + "jno 0f\n"
18922 + LOCK_PREFIX _ASM_DEC "(%1)\n"
18923 + "int $4\n0:\n"
18924 + _ASM_EXTABLE(0b, 0b)
18925 +#endif
18926 +
18927 /* adds 0x00000001 */
18928 " jns 1f\n"
18929 " call call_rwsem_down_read_failed\n"
18930 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18931 "1:\n\t"
18932 " mov %1,%2\n\t"
18933 " add %3,%2\n\t"
18934 +
18935 +#ifdef CONFIG_PAX_REFCOUNT
18936 + "jno 0f\n"
18937 + "sub %3,%2\n"
18938 + "int $4\n0:\n"
18939 + _ASM_EXTABLE(0b, 0b)
18940 +#endif
18941 +
18942 " jle 2f\n\t"
18943 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18944 " jnz 1b\n\t"
18945 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18946 long tmp;
18947 asm volatile("# beginning down_write\n\t"
18948 LOCK_PREFIX " xadd %1,(%2)\n\t"
18949 +
18950 +#ifdef CONFIG_PAX_REFCOUNT
18951 + "jno 0f\n"
18952 + "mov %1,(%2)\n"
18953 + "int $4\n0:\n"
18954 + _ASM_EXTABLE(0b, 0b)
18955 +#endif
18956 +
18957 /* adds 0xffff0001, returns the old value */
18958 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18959 /* was the active mask 0 before? */
18960 @@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18961 long tmp;
18962 asm volatile("# beginning __up_read\n\t"
18963 LOCK_PREFIX " xadd %1,(%2)\n\t"
18964 +
18965 +#ifdef CONFIG_PAX_REFCOUNT
18966 + "jno 0f\n"
18967 + "mov %1,(%2)\n"
18968 + "int $4\n0:\n"
18969 + _ASM_EXTABLE(0b, 0b)
18970 +#endif
18971 +
18972 /* subtracts 1, returns the old value */
18973 " jns 1f\n\t"
18974 " call call_rwsem_wake\n" /* expects old value in %edx */
18975 @@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18976 long tmp;
18977 asm volatile("# beginning __up_write\n\t"
18978 LOCK_PREFIX " xadd %1,(%2)\n\t"
18979 +
18980 +#ifdef CONFIG_PAX_REFCOUNT
18981 + "jno 0f\n"
18982 + "mov %1,(%2)\n"
18983 + "int $4\n0:\n"
18984 + _ASM_EXTABLE(0b, 0b)
18985 +#endif
18986 +
18987 /* subtracts 0xffff0001, returns the old value */
18988 " jns 1f\n\t"
18989 " call call_rwsem_wake\n" /* expects old value in %edx */
18990 @@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18991 {
18992 asm volatile("# beginning __downgrade_write\n\t"
18993 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18994 +
18995 +#ifdef CONFIG_PAX_REFCOUNT
18996 + "jno 0f\n"
18997 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18998 + "int $4\n0:\n"
18999 + _ASM_EXTABLE(0b, 0b)
19000 +#endif
19001 +
19002 /*
19003 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
19004 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
19005 @@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
19006 */
19007 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19008 {
19009 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
19010 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
19011 +
19012 +#ifdef CONFIG_PAX_REFCOUNT
19013 + "jno 0f\n"
19014 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
19015 + "int $4\n0:\n"
19016 + _ASM_EXTABLE(0b, 0b)
19017 +#endif
19018 +
19019 : "+m" (sem->count)
19020 : "er" (delta));
19021 }
19022 @@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19023 */
19024 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
19025 {
19026 - return delta + xadd(&sem->count, delta);
19027 + return delta + xadd_check_overflow(&sem->count, delta);
19028 }
19029
19030 #endif /* __KERNEL__ */
19031 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
19032 index 6f1c3a8..7744f19 100644
19033 --- a/arch/x86/include/asm/segment.h
19034 +++ b/arch/x86/include/asm/segment.h
19035 @@ -64,10 +64,15 @@
19036 * 26 - ESPFIX small SS
19037 * 27 - per-cpu [ offset to per-cpu data area ]
19038 * 28 - stack_canary-20 [ for stack protector ]
19039 - * 29 - unused
19040 - * 30 - unused
19041 + * 29 - PCI BIOS CS
19042 + * 30 - PCI BIOS DS
19043 * 31 - TSS for double fault handler
19044 */
19045 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19046 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19047 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19048 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19049 +
19050 #define GDT_ENTRY_TLS_MIN 6
19051 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19052
19053 @@ -79,6 +84,8 @@
19054
19055 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19056
19057 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19058 +
19059 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19060
19061 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19062 @@ -104,6 +111,12 @@
19063 #define __KERNEL_STACK_CANARY 0
19064 #endif
19065
19066 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19067 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19068 +
19069 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19070 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19071 +
19072 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19073
19074 /*
19075 @@ -141,7 +154,7 @@
19076 */
19077
19078 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19079 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19080 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19081
19082
19083 #else
19084 @@ -165,6 +178,8 @@
19085 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19086 #define __USER32_DS __USER_DS
19087
19088 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19089 +
19090 #define GDT_ENTRY_TSS 8 /* needs two entries */
19091 #define GDT_ENTRY_LDT 10 /* needs two entries */
19092 #define GDT_ENTRY_TLS_MIN 12
19093 @@ -173,6 +188,8 @@
19094 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19095 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19096
19097 +#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19098 +
19099 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19100 #define FS_TLS 0
19101 #define GS_TLS 1
19102 @@ -180,12 +197,14 @@
19103 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19104 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19105
19106 -#define GDT_ENTRIES 16
19107 +#define GDT_ENTRIES 17
19108
19109 #endif
19110
19111 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19112 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19113 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19114 +#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19115 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19116 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19117 #ifndef CONFIG_PARAVIRT
19118 @@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
19119 {
19120 unsigned long __limit;
19121 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19122 - return __limit + 1;
19123 + return __limit;
19124 }
19125
19126 #endif /* !__ASSEMBLY__ */
19127 diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19128 index 8d3120f..352b440 100644
19129 --- a/arch/x86/include/asm/smap.h
19130 +++ b/arch/x86/include/asm/smap.h
19131 @@ -25,11 +25,40 @@
19132
19133 #include <asm/alternative-asm.h>
19134
19135 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19136 +#define ASM_PAX_OPEN_USERLAND \
19137 + 661: jmp 663f; \
19138 + .pushsection .altinstr_replacement, "a" ; \
19139 + 662: pushq %rax; nop; \
19140 + .popsection ; \
19141 + .pushsection .altinstructions, "a" ; \
19142 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19143 + .popsection ; \
19144 + call __pax_open_userland; \
19145 + popq %rax; \
19146 + 663:
19147 +
19148 +#define ASM_PAX_CLOSE_USERLAND \
19149 + 661: jmp 663f; \
19150 + .pushsection .altinstr_replacement, "a" ; \
19151 + 662: pushq %rax; nop; \
19152 + .popsection; \
19153 + .pushsection .altinstructions, "a" ; \
19154 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19155 + .popsection; \
19156 + call __pax_close_userland; \
19157 + popq %rax; \
19158 + 663:
19159 +#else
19160 +#define ASM_PAX_OPEN_USERLAND
19161 +#define ASM_PAX_CLOSE_USERLAND
19162 +#endif
19163 +
19164 #ifdef CONFIG_X86_SMAP
19165
19166 #define ASM_CLAC \
19167 661: ASM_NOP3 ; \
19168 - .pushsection .altinstr_replacement, "ax" ; \
19169 + .pushsection .altinstr_replacement, "a" ; \
19170 662: __ASM_CLAC ; \
19171 .popsection ; \
19172 .pushsection .altinstructions, "a" ; \
19173 @@ -38,7 +67,7 @@
19174
19175 #define ASM_STAC \
19176 661: ASM_NOP3 ; \
19177 - .pushsection .altinstr_replacement, "ax" ; \
19178 + .pushsection .altinstr_replacement, "a" ; \
19179 662: __ASM_STAC ; \
19180 .popsection ; \
19181 .pushsection .altinstructions, "a" ; \
19182 @@ -56,6 +85,37 @@
19183
19184 #include <asm/alternative.h>
19185
19186 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
19187 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19188 +
19189 +extern void __pax_open_userland(void);
19190 +static __always_inline unsigned long pax_open_userland(void)
19191 +{
19192 +
19193 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19194 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19195 + :
19196 + : [open] "i" (__pax_open_userland)
19197 + : "memory", "rax");
19198 +#endif
19199 +
19200 + return 0;
19201 +}
19202 +
19203 +extern void __pax_close_userland(void);
19204 +static __always_inline unsigned long pax_close_userland(void)
19205 +{
19206 +
19207 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19208 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19209 + :
19210 + : [close] "i" (__pax_close_userland)
19211 + : "memory", "rax");
19212 +#endif
19213 +
19214 + return 0;
19215 +}
19216 +
19217 #ifdef CONFIG_X86_SMAP
19218
19219 static __always_inline void clac(void)
19220 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19221 index 8cd1cc3..827e09e 100644
19222 --- a/arch/x86/include/asm/smp.h
19223 +++ b/arch/x86/include/asm/smp.h
19224 @@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19225 /* cpus sharing the last level cache: */
19226 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19227 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19228 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19229 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19230
19231 static inline struct cpumask *cpu_sibling_mask(int cpu)
19232 {
19233 @@ -78,7 +78,7 @@ struct smp_ops {
19234
19235 void (*send_call_func_ipi)(const struct cpumask *mask);
19236 void (*send_call_func_single_ipi)(int cpu);
19237 -};
19238 +} __no_const;
19239
19240 /* Globals due to paravirt */
19241 extern void set_cpu_sibling_map(int cpu);
19242 @@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19243 extern int safe_smp_processor_id(void);
19244
19245 #elif defined(CONFIG_X86_64_SMP)
19246 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19247 -
19248 -#define stack_smp_processor_id() \
19249 -({ \
19250 - struct thread_info *ti; \
19251 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19252 - ti->cpu; \
19253 -})
19254 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19255 +#define stack_smp_processor_id() raw_smp_processor_id()
19256 #define safe_smp_processor_id() smp_processor_id()
19257
19258 #endif
19259 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19260 index 6a99859..03cb807 100644
19261 --- a/arch/x86/include/asm/stackprotector.h
19262 +++ b/arch/x86/include/asm/stackprotector.h
19263 @@ -47,7 +47,7 @@
19264 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19265 */
19266 #define GDT_STACK_CANARY_INIT \
19267 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19268 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19269
19270 /*
19271 * Initialize the stackprotector canary value.
19272 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19273
19274 static inline void load_stack_canary_segment(void)
19275 {
19276 -#ifdef CONFIG_X86_32
19277 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19278 asm volatile ("mov %0, %%gs" : : "r" (0));
19279 #endif
19280 }
19281 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19282 index 70bbe39..4ae2bd4 100644
19283 --- a/arch/x86/include/asm/stacktrace.h
19284 +++ b/arch/x86/include/asm/stacktrace.h
19285 @@ -11,28 +11,20 @@
19286
19287 extern int kstack_depth_to_print;
19288
19289 -struct thread_info;
19290 +struct task_struct;
19291 struct stacktrace_ops;
19292
19293 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19294 - unsigned long *stack,
19295 - unsigned long bp,
19296 - const struct stacktrace_ops *ops,
19297 - void *data,
19298 - unsigned long *end,
19299 - int *graph);
19300 +typedef unsigned long walk_stack_t(struct task_struct *task,
19301 + void *stack_start,
19302 + unsigned long *stack,
19303 + unsigned long bp,
19304 + const struct stacktrace_ops *ops,
19305 + void *data,
19306 + unsigned long *end,
19307 + int *graph);
19308
19309 -extern unsigned long
19310 -print_context_stack(struct thread_info *tinfo,
19311 - unsigned long *stack, unsigned long bp,
19312 - const struct stacktrace_ops *ops, void *data,
19313 - unsigned long *end, int *graph);
19314 -
19315 -extern unsigned long
19316 -print_context_stack_bp(struct thread_info *tinfo,
19317 - unsigned long *stack, unsigned long bp,
19318 - const struct stacktrace_ops *ops, void *data,
19319 - unsigned long *end, int *graph);
19320 +extern walk_stack_t print_context_stack;
19321 +extern walk_stack_t print_context_stack_bp;
19322
19323 /* Generic stack tracer with callbacks */
19324
19325 @@ -40,7 +32,7 @@ struct stacktrace_ops {
19326 void (*address)(void *data, unsigned long address, int reliable);
19327 /* On negative return stop dumping */
19328 int (*stack)(void *data, char *name);
19329 - walk_stack_t walk_stack;
19330 + walk_stack_t *walk_stack;
19331 };
19332
19333 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19334 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19335 index d7f3b3b..3cc39f1 100644
19336 --- a/arch/x86/include/asm/switch_to.h
19337 +++ b/arch/x86/include/asm/switch_to.h
19338 @@ -108,7 +108,7 @@ do { \
19339 "call __switch_to\n\t" \
19340 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19341 __switch_canary \
19342 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
19343 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19344 "movq %%rax,%%rdi\n\t" \
19345 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19346 "jnz ret_from_fork\n\t" \
19347 @@ -119,7 +119,7 @@ do { \
19348 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19349 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19350 [_tif_fork] "i" (_TIF_FORK), \
19351 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
19352 + [thread_info] "m" (current_tinfo), \
19353 [current_task] "m" (current_task) \
19354 __switch_canary_iparam \
19355 : "memory", "cc" __EXTRA_CLOBBER)
19356 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19357 index 547e344..6be1175 100644
19358 --- a/arch/x86/include/asm/thread_info.h
19359 +++ b/arch/x86/include/asm/thread_info.h
19360 @@ -24,7 +24,6 @@ struct exec_domain;
19361 #include <linux/atomic.h>
19362
19363 struct thread_info {
19364 - struct task_struct *task; /* main task structure */
19365 struct exec_domain *exec_domain; /* execution domain */
19366 __u32 flags; /* low level flags */
19367 __u32 status; /* thread synchronous flags */
19368 @@ -33,13 +32,13 @@ struct thread_info {
19369 mm_segment_t addr_limit;
19370 struct restart_block restart_block;
19371 void __user *sysenter_return;
19372 + unsigned long lowest_stack;
19373 unsigned int sig_on_uaccess_error:1;
19374 unsigned int uaccess_err:1; /* uaccess failed */
19375 };
19376
19377 -#define INIT_THREAD_INFO(tsk) \
19378 +#define INIT_THREAD_INFO \
19379 { \
19380 - .task = &tsk, \
19381 .exec_domain = &default_exec_domain, \
19382 .flags = 0, \
19383 .cpu = 0, \
19384 @@ -50,7 +49,7 @@ struct thread_info {
19385 }, \
19386 }
19387
19388 -#define init_thread_info (init_thread_union.thread_info)
19389 +#define init_thread_info (init_thread_union.stack)
19390 #define init_stack (init_thread_union.stack)
19391
19392 #else /* !__ASSEMBLY__ */
19393 @@ -91,6 +90,7 @@ struct thread_info {
19394 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19395 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19396 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19397 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19398
19399 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19400 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19401 @@ -115,17 +115,18 @@ struct thread_info {
19402 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19403 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19404 #define _TIF_X32 (1 << TIF_X32)
19405 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19406
19407 /* work to do in syscall_trace_enter() */
19408 #define _TIF_WORK_SYSCALL_ENTRY \
19409 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19410 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19411 - _TIF_NOHZ)
19412 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19413
19414 /* work to do in syscall_trace_leave() */
19415 #define _TIF_WORK_SYSCALL_EXIT \
19416 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19417 - _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19418 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19419
19420 /* work to do on interrupt/exception return */
19421 #define _TIF_WORK_MASK \
19422 @@ -136,7 +137,7 @@ struct thread_info {
19423 /* work to do on any return to user space */
19424 #define _TIF_ALLWORK_MASK \
19425 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19426 - _TIF_NOHZ)
19427 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19428
19429 /* Only used for 64 bit */
19430 #define _TIF_DO_NOTIFY_MASK \
19431 @@ -151,7 +152,6 @@ struct thread_info {
19432 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19433
19434 #define STACK_WARN (THREAD_SIZE/8)
19435 -#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19436
19437 /*
19438 * macros/functions for gaining access to the thread information structure
19439 @@ -162,26 +162,18 @@ struct thread_info {
19440
19441 DECLARE_PER_CPU(unsigned long, kernel_stack);
19442
19443 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19444 +
19445 static inline struct thread_info *current_thread_info(void)
19446 {
19447 - struct thread_info *ti;
19448 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
19449 - KERNEL_STACK_OFFSET - THREAD_SIZE);
19450 - return ti;
19451 + return this_cpu_read_stable(current_tinfo);
19452 }
19453
19454 #else /* !__ASSEMBLY__ */
19455
19456 /* how to get the thread information struct from ASM */
19457 #define GET_THREAD_INFO(reg) \
19458 - _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19459 - _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19460 -
19461 -/*
19462 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19463 - * a certain register (to be used in assembler memory operands).
19464 - */
19465 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19466 + _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19467
19468 #endif
19469
19470 @@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19471 extern void arch_task_cache_init(void);
19472 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19473 extern void arch_release_task_struct(struct task_struct *tsk);
19474 +
19475 +#define __HAVE_THREAD_FUNCTIONS
19476 +#define task_thread_info(task) (&(task)->tinfo)
19477 +#define task_stack_page(task) ((task)->stack)
19478 +#define setup_thread_stack(p, org) do {} while (0)
19479 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19480 +
19481 #endif
19482 #endif /* _ASM_X86_THREAD_INFO_H */
19483 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19484 index 04905bf..1178cdf 100644
19485 --- a/arch/x86/include/asm/tlbflush.h
19486 +++ b/arch/x86/include/asm/tlbflush.h
19487 @@ -17,18 +17,44 @@
19488
19489 static inline void __native_flush_tlb(void)
19490 {
19491 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19492 + u64 descriptor[2];
19493 +
19494 + descriptor[0] = PCID_KERNEL;
19495 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19496 + return;
19497 + }
19498 +
19499 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19500 + if (static_cpu_has(X86_FEATURE_PCID)) {
19501 + unsigned int cpu = raw_get_cpu();
19502 +
19503 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19504 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19505 + raw_put_cpu_no_resched();
19506 + return;
19507 + }
19508 +#endif
19509 +
19510 native_write_cr3(native_read_cr3());
19511 }
19512
19513 static inline void __native_flush_tlb_global_irq_disabled(void)
19514 {
19515 - unsigned long cr4;
19516 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19517 + u64 descriptor[2];
19518
19519 - cr4 = native_read_cr4();
19520 - /* clear PGE */
19521 - native_write_cr4(cr4 & ~X86_CR4_PGE);
19522 - /* write old PGE again and flush TLBs */
19523 - native_write_cr4(cr4);
19524 + descriptor[0] = PCID_KERNEL;
19525 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19526 + } else {
19527 + unsigned long cr4;
19528 +
19529 + cr4 = native_read_cr4();
19530 + /* clear PGE */
19531 + native_write_cr4(cr4 & ~X86_CR4_PGE);
19532 + /* write old PGE again and flush TLBs */
19533 + native_write_cr4(cr4);
19534 + }
19535 }
19536
19537 static inline void __native_flush_tlb_global(void)
19538 @@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19539
19540 static inline void __native_flush_tlb_single(unsigned long addr)
19541 {
19542 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19543 + u64 descriptor[2];
19544 +
19545 + descriptor[0] = PCID_KERNEL;
19546 + descriptor[1] = addr;
19547 +
19548 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19549 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19550 + if (addr < TASK_SIZE_MAX)
19551 + descriptor[1] += pax_user_shadow_base;
19552 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19553 + }
19554 +
19555 + descriptor[0] = PCID_USER;
19556 + descriptor[1] = addr;
19557 +#endif
19558 +
19559 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19560 + return;
19561 + }
19562 +
19563 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19564 + if (static_cpu_has(X86_FEATURE_PCID)) {
19565 + unsigned int cpu = raw_get_cpu();
19566 +
19567 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19568 + asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19569 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19570 + raw_put_cpu_no_resched();
19571 +
19572 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19573 + addr += pax_user_shadow_base;
19574 + }
19575 +#endif
19576 +
19577 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19578 }
19579
19580 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19581 index 0d592e0..526f797 100644
19582 --- a/arch/x86/include/asm/uaccess.h
19583 +++ b/arch/x86/include/asm/uaccess.h
19584 @@ -7,6 +7,7 @@
19585 #include <linux/compiler.h>
19586 #include <linux/thread_info.h>
19587 #include <linux/string.h>
19588 +#include <linux/spinlock.h>
19589 #include <asm/asm.h>
19590 #include <asm/page.h>
19591 #include <asm/smap.h>
19592 @@ -29,7 +30,12 @@
19593
19594 #define get_ds() (KERNEL_DS)
19595 #define get_fs() (current_thread_info()->addr_limit)
19596 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19597 +void __set_fs(mm_segment_t x);
19598 +void set_fs(mm_segment_t x);
19599 +#else
19600 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19601 +#endif
19602
19603 #define segment_eq(a, b) ((a).seg == (b).seg)
19604
19605 @@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19606 * checks that the pointer is in the user space range - after calling
19607 * this function, memory access functions may still return -EFAULT.
19608 */
19609 -#define access_ok(type, addr, size) \
19610 - likely(!__range_not_ok(addr, size, user_addr_max()))
19611 +extern int _cond_resched(void);
19612 +#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19613 +#define access_ok(type, addr, size) \
19614 +({ \
19615 + unsigned long __size = size; \
19616 + unsigned long __addr = (unsigned long)addr; \
19617 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19618 + if (__ret_ao && __size) { \
19619 + unsigned long __addr_ao = __addr & PAGE_MASK; \
19620 + unsigned long __end_ao = __addr + __size - 1; \
19621 + if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19622 + while (__addr_ao <= __end_ao) { \
19623 + char __c_ao; \
19624 + __addr_ao += PAGE_SIZE; \
19625 + if (__size > PAGE_SIZE) \
19626 + _cond_resched(); \
19627 + if (__get_user(__c_ao, (char __user *)__addr)) \
19628 + break; \
19629 + if (type != VERIFY_WRITE) { \
19630 + __addr = __addr_ao; \
19631 + continue; \
19632 + } \
19633 + if (__put_user(__c_ao, (char __user *)__addr)) \
19634 + break; \
19635 + __addr = __addr_ao; \
19636 + } \
19637 + } \
19638 + } \
19639 + __ret_ao; \
19640 +})
19641
19642 /*
19643 * The exception table consists of pairs of addresses relative to the
19644 @@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19645 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19646 __chk_user_ptr(ptr); \
19647 might_fault(); \
19648 + pax_open_userland(); \
19649 asm volatile("call __get_user_%P3" \
19650 : "=a" (__ret_gu), "=r" (__val_gu) \
19651 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19652 (x) = (__typeof__(*(ptr))) __val_gu; \
19653 + pax_close_userland(); \
19654 __ret_gu; \
19655 })
19656
19657 @@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19658 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19659 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19660
19661 -
19662 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19663 +#define __copyuser_seg "gs;"
19664 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19665 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19666 +#else
19667 +#define __copyuser_seg
19668 +#define __COPYUSER_SET_ES
19669 +#define __COPYUSER_RESTORE_ES
19670 +#endif
19671
19672 #ifdef CONFIG_X86_32
19673 #define __put_user_asm_u64(x, addr, err, errret) \
19674 asm volatile(ASM_STAC "\n" \
19675 - "1: movl %%eax,0(%2)\n" \
19676 - "2: movl %%edx,4(%2)\n" \
19677 + "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19678 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19679 "3: " ASM_CLAC "\n" \
19680 ".section .fixup,\"ax\"\n" \
19681 "4: movl %3,%0\n" \
19682 @@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19683
19684 #define __put_user_asm_ex_u64(x, addr) \
19685 asm volatile(ASM_STAC "\n" \
19686 - "1: movl %%eax,0(%1)\n" \
19687 - "2: movl %%edx,4(%1)\n" \
19688 + "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19689 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19690 "3: " ASM_CLAC "\n" \
19691 _ASM_EXTABLE_EX(1b, 2b) \
19692 _ASM_EXTABLE_EX(2b, 3b) \
19693 @@ -257,7 +301,8 @@ extern void __put_user_8(void);
19694 __typeof__(*(ptr)) __pu_val; \
19695 __chk_user_ptr(ptr); \
19696 might_fault(); \
19697 - __pu_val = x; \
19698 + __pu_val = (x); \
19699 + pax_open_userland(); \
19700 switch (sizeof(*(ptr))) { \
19701 case 1: \
19702 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19703 @@ -275,6 +320,7 @@ extern void __put_user_8(void);
19704 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19705 break; \
19706 } \
19707 + pax_close_userland(); \
19708 __ret_pu; \
19709 })
19710
19711 @@ -355,8 +401,10 @@ do { \
19712 } while (0)
19713
19714 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19715 +do { \
19716 + pax_open_userland(); \
19717 asm volatile(ASM_STAC "\n" \
19718 - "1: mov"itype" %2,%"rtype"1\n" \
19719 + "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19720 "2: " ASM_CLAC "\n" \
19721 ".section .fixup,\"ax\"\n" \
19722 "3: mov %3,%0\n" \
19723 @@ -364,8 +412,10 @@ do { \
19724 " jmp 2b\n" \
19725 ".previous\n" \
19726 _ASM_EXTABLE(1b, 3b) \
19727 - : "=r" (err), ltype(x) \
19728 - : "m" (__m(addr)), "i" (errret), "0" (err))
19729 + : "=r" (err), ltype (x) \
19730 + : "m" (__m(addr)), "i" (errret), "0" (err)); \
19731 + pax_close_userland(); \
19732 +} while (0)
19733
19734 #define __get_user_size_ex(x, ptr, size) \
19735 do { \
19736 @@ -389,7 +439,7 @@ do { \
19737 } while (0)
19738
19739 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19740 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19741 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19742 "2:\n" \
19743 _ASM_EXTABLE_EX(1b, 2b) \
19744 : ltype(x) : "m" (__m(addr)))
19745 @@ -406,13 +456,24 @@ do { \
19746 int __gu_err; \
19747 unsigned long __gu_val; \
19748 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19749 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
19750 + (x) = (__typeof__(*(ptr)))__gu_val; \
19751 __gu_err; \
19752 })
19753
19754 /* FIXME: this hack is definitely wrong -AK */
19755 struct __large_struct { unsigned long buf[100]; };
19756 -#define __m(x) (*(struct __large_struct __user *)(x))
19757 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19758 +#define ____m(x) \
19759 +({ \
19760 + unsigned long ____x = (unsigned long)(x); \
19761 + if (____x < pax_user_shadow_base) \
19762 + ____x += pax_user_shadow_base; \
19763 + (typeof(x))____x; \
19764 +})
19765 +#else
19766 +#define ____m(x) (x)
19767 +#endif
19768 +#define __m(x) (*(struct __large_struct __user *)____m(x))
19769
19770 /*
19771 * Tell gcc we read from memory instead of writing: this is because
19772 @@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19773 * aliasing issues.
19774 */
19775 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19776 +do { \
19777 + pax_open_userland(); \
19778 asm volatile(ASM_STAC "\n" \
19779 - "1: mov"itype" %"rtype"1,%2\n" \
19780 + "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19781 "2: " ASM_CLAC "\n" \
19782 ".section .fixup,\"ax\"\n" \
19783 "3: mov %3,%0\n" \
19784 @@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19785 ".previous\n" \
19786 _ASM_EXTABLE(1b, 3b) \
19787 : "=r"(err) \
19788 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19789 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19790 + pax_close_userland(); \
19791 +} while (0)
19792
19793 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19794 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19795 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19796 "2:\n" \
19797 _ASM_EXTABLE_EX(1b, 2b) \
19798 : : ltype(x), "m" (__m(addr)))
19799 @@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19800 */
19801 #define uaccess_try do { \
19802 current_thread_info()->uaccess_err = 0; \
19803 + pax_open_userland(); \
19804 stac(); \
19805 barrier();
19806
19807 #define uaccess_catch(err) \
19808 clac(); \
19809 + pax_close_userland(); \
19810 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19811 } while (0)
19812
19813 @@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19814 * On error, the variable @x is set to zero.
19815 */
19816
19817 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19818 +#define __get_user(x, ptr) get_user((x), (ptr))
19819 +#else
19820 #define __get_user(x, ptr) \
19821 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19822 +#endif
19823
19824 /**
19825 * __put_user: - Write a simple value into user space, with less checking.
19826 @@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19827 * Returns zero on success, or -EFAULT on error.
19828 */
19829
19830 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19831 +#define __put_user(x, ptr) put_user((x), (ptr))
19832 +#else
19833 #define __put_user(x, ptr) \
19834 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19835 +#endif
19836
19837 #define __get_user_unaligned __get_user
19838 #define __put_user_unaligned __put_user
19839 @@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19840 #define get_user_ex(x, ptr) do { \
19841 unsigned long __gue_val; \
19842 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19843 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
19844 + (x) = (__typeof__(*(ptr)))__gue_val; \
19845 } while (0)
19846
19847 #define put_user_try uaccess_try
19848 @@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19849 __typeof__(ptr) __uval = (uval); \
19850 __typeof__(*(ptr)) __old = (old); \
19851 __typeof__(*(ptr)) __new = (new); \
19852 + pax_open_userland(); \
19853 switch (size) { \
19854 case 1: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857 - "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19858 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870 @@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 2: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874 - "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19875 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887 @@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19888 case 4: \
19889 { \
19890 asm volatile("\t" ASM_STAC "\n" \
19891 - "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19892 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904 @@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19905 __cmpxchg_wrong_size(); \
19906 \
19907 asm volatile("\t" ASM_STAC "\n" \
19908 - "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19909 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19910 "2:\t" ASM_CLAC "\n" \
19911 "\t.section .fixup, \"ax\"\n" \
19912 "3:\tmov %3, %0\n" \
19913 "\tjmp 2b\n" \
19914 "\t.previous\n" \
19915 _ASM_EXTABLE(1b, 3b) \
19916 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19917 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19918 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19919 : "memory" \
19920 ); \
19921 @@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19922 default: \
19923 __cmpxchg_wrong_size(); \
19924 } \
19925 + pax_close_userland(); \
19926 *__uval = __old; \
19927 __ret; \
19928 })
19929 @@ -636,17 +713,6 @@ extern struct movsl_mask {
19930
19931 #define ARCH_HAS_NOCACHE_UACCESS 1
19932
19933 -#ifdef CONFIG_X86_32
19934 -# include <asm/uaccess_32.h>
19935 -#else
19936 -# include <asm/uaccess_64.h>
19937 -#endif
19938 -
19939 -unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19940 - unsigned n);
19941 -unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19942 - unsigned n);
19943 -
19944 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19945 # define copy_user_diag __compiletime_error
19946 #else
19947 @@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19948 extern void copy_user_diag("copy_from_user() buffer size is too small")
19949 copy_from_user_overflow(void);
19950 extern void copy_user_diag("copy_to_user() buffer size is too small")
19951 -copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19952 +copy_to_user_overflow(void);
19953
19954 #undef copy_user_diag
19955
19956 @@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19957
19958 extern void
19959 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19960 -__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19961 +__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19962 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19963
19964 #else
19965 @@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19966
19967 #endif
19968
19969 +#ifdef CONFIG_X86_32
19970 +# include <asm/uaccess_32.h>
19971 +#else
19972 +# include <asm/uaccess_64.h>
19973 +#endif
19974 +
19975 static inline unsigned long __must_check
19976 copy_from_user(void *to, const void __user *from, unsigned long n)
19977 {
19978 - int sz = __compiletime_object_size(to);
19979 + size_t sz = __compiletime_object_size(to);
19980
19981 might_fault();
19982
19983 @@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19984 * case, and do only runtime checking for non-constant sizes.
19985 */
19986
19987 - if (likely(sz < 0 || sz >= n))
19988 - n = _copy_from_user(to, from, n);
19989 - else if(__builtin_constant_p(n))
19990 - copy_from_user_overflow();
19991 - else
19992 - __copy_from_user_overflow(sz, n);
19993 + if (likely(sz != (size_t)-1 && sz < n)) {
19994 + if(__builtin_constant_p(n))
19995 + copy_from_user_overflow();
19996 + else
19997 + __copy_from_user_overflow(sz, n);
19998 + } else if (access_ok(VERIFY_READ, from, n))
19999 + n = __copy_from_user(to, from, n);
20000 + else if ((long)n > 0)
20001 + memset(to, 0, n);
20002
20003 return n;
20004 }
20005 @@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
20006 static inline unsigned long __must_check
20007 copy_to_user(void __user *to, const void *from, unsigned long n)
20008 {
20009 - int sz = __compiletime_object_size(from);
20010 + size_t sz = __compiletime_object_size(from);
20011
20012 might_fault();
20013
20014 /* See the comment in copy_from_user() above. */
20015 - if (likely(sz < 0 || sz >= n))
20016 - n = _copy_to_user(to, from, n);
20017 - else if(__builtin_constant_p(n))
20018 - copy_to_user_overflow();
20019 - else
20020 - __copy_to_user_overflow(sz, n);
20021 + if (likely(sz != (size_t)-1 && sz < n)) {
20022 + if(__builtin_constant_p(n))
20023 + copy_to_user_overflow();
20024 + else
20025 + __copy_to_user_overflow(sz, n);
20026 + } else if (access_ok(VERIFY_WRITE, to, n))
20027 + n = __copy_to_user(to, from, n);
20028
20029 return n;
20030 }
20031 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20032 index 3c03a5d..1071638 100644
20033 --- a/arch/x86/include/asm/uaccess_32.h
20034 +++ b/arch/x86/include/asm/uaccess_32.h
20035 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20036 static __always_inline unsigned long __must_check
20037 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20038 {
20039 + if ((long)n < 0)
20040 + return n;
20041 +
20042 + check_object_size(from, n, true);
20043 +
20044 if (__builtin_constant_p(n)) {
20045 unsigned long ret;
20046
20047 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20048 __copy_to_user(void __user *to, const void *from, unsigned long n)
20049 {
20050 might_fault();
20051 +
20052 return __copy_to_user_inatomic(to, from, n);
20053 }
20054
20055 static __always_inline unsigned long
20056 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20057 {
20058 + if ((long)n < 0)
20059 + return n;
20060 +
20061 /* Avoid zeroing the tail if the copy fails..
20062 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20063 * but as the zeroing behaviour is only significant when n is not
20064 @@ -137,6 +146,12 @@ static __always_inline unsigned long
20065 __copy_from_user(void *to, const void __user *from, unsigned long n)
20066 {
20067 might_fault();
20068 +
20069 + if ((long)n < 0)
20070 + return n;
20071 +
20072 + check_object_size(to, n, false);
20073 +
20074 if (__builtin_constant_p(n)) {
20075 unsigned long ret;
20076
20077 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20078 const void __user *from, unsigned long n)
20079 {
20080 might_fault();
20081 +
20082 + if ((long)n < 0)
20083 + return n;
20084 +
20085 if (__builtin_constant_p(n)) {
20086 unsigned long ret;
20087
20088 @@ -181,7 +200,10 @@ static __always_inline unsigned long
20089 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20090 unsigned long n)
20091 {
20092 - return __copy_from_user_ll_nocache_nozero(to, from, n);
20093 + if ((long)n < 0)
20094 + return n;
20095 +
20096 + return __copy_from_user_ll_nocache_nozero(to, from, n);
20097 }
20098
20099 #endif /* _ASM_X86_UACCESS_32_H */
20100 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20101 index 12a26b9..206c200 100644
20102 --- a/arch/x86/include/asm/uaccess_64.h
20103 +++ b/arch/x86/include/asm/uaccess_64.h
20104 @@ -10,6 +10,9 @@
20105 #include <asm/alternative.h>
20106 #include <asm/cpufeature.h>
20107 #include <asm/page.h>
20108 +#include <asm/pgtable.h>
20109 +
20110 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
20111
20112 /*
20113 * Copy To/From Userspace
20114 @@ -17,14 +20,14 @@
20115
20116 /* Handles exceptions in both to and from, but doesn't do access_ok */
20117 __must_check unsigned long
20118 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
20119 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
20120 __must_check unsigned long
20121 -copy_user_generic_string(void *to, const void *from, unsigned len);
20122 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
20123 __must_check unsigned long
20124 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20125 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
20126
20127 static __always_inline __must_check unsigned long
20128 -copy_user_generic(void *to, const void *from, unsigned len)
20129 +copy_user_generic(void *to, const void *from, unsigned long len)
20130 {
20131 unsigned ret;
20132
20133 @@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20134 }
20135
20136 __must_check unsigned long
20137 -copy_in_user(void __user *to, const void __user *from, unsigned len);
20138 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
20139
20140 static __always_inline __must_check
20141 -int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20142 +unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20143 {
20144 - int ret = 0;
20145 + size_t sz = __compiletime_object_size(dst);
20146 + unsigned ret = 0;
20147 +
20148 + if (size > INT_MAX)
20149 + return size;
20150 +
20151 + check_object_size(dst, size, false);
20152 +
20153 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20154 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20155 + return size;
20156 +#endif
20157 +
20158 + if (unlikely(sz != (size_t)-1 && sz < size)) {
20159 + if(__builtin_constant_p(size))
20160 + copy_from_user_overflow();
20161 + else
20162 + __copy_from_user_overflow(sz, size);
20163 + return size;
20164 + }
20165
20166 if (!__builtin_constant_p(size))
20167 - return copy_user_generic(dst, (__force void *)src, size);
20168 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20169 switch (size) {
20170 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20171 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20172 ret, "b", "b", "=q", 1);
20173 return ret;
20174 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20175 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20176 ret, "w", "w", "=r", 2);
20177 return ret;
20178 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20179 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20180 ret, "l", "k", "=r", 4);
20181 return ret;
20182 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20183 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20184 ret, "q", "", "=r", 8);
20185 return ret;
20186 case 10:
20187 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20188 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20189 ret, "q", "", "=r", 10);
20190 if (unlikely(ret))
20191 return ret;
20192 __get_user_asm(*(u16 *)(8 + (char *)dst),
20193 - (u16 __user *)(8 + (char __user *)src),
20194 + (const u16 __user *)(8 + (const char __user *)src),
20195 ret, "w", "w", "=r", 2);
20196 return ret;
20197 case 16:
20198 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20199 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20200 ret, "q", "", "=r", 16);
20201 if (unlikely(ret))
20202 return ret;
20203 __get_user_asm(*(u64 *)(8 + (char *)dst),
20204 - (u64 __user *)(8 + (char __user *)src),
20205 + (const u64 __user *)(8 + (const char __user *)src),
20206 ret, "q", "", "=r", 8);
20207 return ret;
20208 default:
20209 - return copy_user_generic(dst, (__force void *)src, size);
20210 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20211 }
20212 }
20213
20214 static __always_inline __must_check
20215 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
20216 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20217 {
20218 might_fault();
20219 return __copy_from_user_nocheck(dst, src, size);
20220 }
20221
20222 static __always_inline __must_check
20223 -int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20224 +unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20225 {
20226 - int ret = 0;
20227 + size_t sz = __compiletime_object_size(src);
20228 + unsigned ret = 0;
20229 +
20230 + if (size > INT_MAX)
20231 + return size;
20232 +
20233 + check_object_size(src, size, true);
20234 +
20235 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20236 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20237 + return size;
20238 +#endif
20239 +
20240 + if (unlikely(sz != (size_t)-1 && sz < size)) {
20241 + if(__builtin_constant_p(size))
20242 + copy_to_user_overflow();
20243 + else
20244 + __copy_to_user_overflow(sz, size);
20245 + return size;
20246 + }
20247
20248 if (!__builtin_constant_p(size))
20249 - return copy_user_generic((__force void *)dst, src, size);
20250 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20251 switch (size) {
20252 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20253 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20254 ret, "b", "b", "iq", 1);
20255 return ret;
20256 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20257 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20258 ret, "w", "w", "ir", 2);
20259 return ret;
20260 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20261 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20262 ret, "l", "k", "ir", 4);
20263 return ret;
20264 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20265 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20266 ret, "q", "", "er", 8);
20267 return ret;
20268 case 10:
20269 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20270 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20271 ret, "q", "", "er", 10);
20272 if (unlikely(ret))
20273 return ret;
20274 asm("":::"memory");
20275 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20276 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20277 ret, "w", "w", "ir", 2);
20278 return ret;
20279 case 16:
20280 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20281 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20282 ret, "q", "", "er", 16);
20283 if (unlikely(ret))
20284 return ret;
20285 asm("":::"memory");
20286 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20287 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20288 ret, "q", "", "er", 8);
20289 return ret;
20290 default:
20291 - return copy_user_generic((__force void *)dst, src, size);
20292 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20293 }
20294 }
20295
20296 static __always_inline __must_check
20297 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
20298 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20299 {
20300 might_fault();
20301 return __copy_to_user_nocheck(dst, src, size);
20302 }
20303
20304 static __always_inline __must_check
20305 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20306 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20307 {
20308 - int ret = 0;
20309 + unsigned ret = 0;
20310
20311 might_fault();
20312 +
20313 + if (size > INT_MAX)
20314 + return size;
20315 +
20316 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20317 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20318 + return size;
20319 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20320 + return size;
20321 +#endif
20322 +
20323 if (!__builtin_constant_p(size))
20324 - return copy_user_generic((__force void *)dst,
20325 - (__force void *)src, size);
20326 + return copy_user_generic((__force_kernel void *)____m(dst),
20327 + (__force_kernel const void *)____m(src), size);
20328 switch (size) {
20329 case 1: {
20330 u8 tmp;
20331 - __get_user_asm(tmp, (u8 __user *)src,
20332 + __get_user_asm(tmp, (const u8 __user *)src,
20333 ret, "b", "b", "=q", 1);
20334 if (likely(!ret))
20335 __put_user_asm(tmp, (u8 __user *)dst,
20336 @@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20337 }
20338 case 2: {
20339 u16 tmp;
20340 - __get_user_asm(tmp, (u16 __user *)src,
20341 + __get_user_asm(tmp, (const u16 __user *)src,
20342 ret, "w", "w", "=r", 2);
20343 if (likely(!ret))
20344 __put_user_asm(tmp, (u16 __user *)dst,
20345 @@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20346
20347 case 4: {
20348 u32 tmp;
20349 - __get_user_asm(tmp, (u32 __user *)src,
20350 + __get_user_asm(tmp, (const u32 __user *)src,
20351 ret, "l", "k", "=r", 4);
20352 if (likely(!ret))
20353 __put_user_asm(tmp, (u32 __user *)dst,
20354 @@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20355 }
20356 case 8: {
20357 u64 tmp;
20358 - __get_user_asm(tmp, (u64 __user *)src,
20359 + __get_user_asm(tmp, (const u64 __user *)src,
20360 ret, "q", "", "=r", 8);
20361 if (likely(!ret))
20362 __put_user_asm(tmp, (u64 __user *)dst,
20363 @@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20364 return ret;
20365 }
20366 default:
20367 - return copy_user_generic((__force void *)dst,
20368 - (__force void *)src, size);
20369 + return copy_user_generic((__force_kernel void *)____m(dst),
20370 + (__force_kernel const void *)____m(src), size);
20371 }
20372 }
20373
20374 -static __must_check __always_inline int
20375 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20376 +static __must_check __always_inline unsigned long
20377 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20378 {
20379 return __copy_from_user_nocheck(dst, src, size);
20380 }
20381
20382 -static __must_check __always_inline int
20383 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20384 +static __must_check __always_inline unsigned long
20385 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20386 {
20387 return __copy_to_user_nocheck(dst, src, size);
20388 }
20389
20390 -extern long __copy_user_nocache(void *dst, const void __user *src,
20391 - unsigned size, int zerorest);
20392 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20393 + unsigned long size, int zerorest);
20394
20395 -static inline int
20396 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20397 +static inline unsigned long
20398 +__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20399 {
20400 might_fault();
20401 +
20402 + if (size > INT_MAX)
20403 + return size;
20404 +
20405 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20406 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20407 + return size;
20408 +#endif
20409 +
20410 return __copy_user_nocache(dst, src, size, 1);
20411 }
20412
20413 -static inline int
20414 +static inline unsigned long
20415 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20416 - unsigned size)
20417 + unsigned long size)
20418 {
20419 + if (size > INT_MAX)
20420 + return size;
20421 +
20422 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20423 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20424 + return size;
20425 +#endif
20426 +
20427 return __copy_user_nocache(dst, src, size, 0);
20428 }
20429
20430 unsigned long
20431 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20432 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20433
20434 #endif /* _ASM_X86_UACCESS_64_H */
20435 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20436 index 5b238981..77fdd78 100644
20437 --- a/arch/x86/include/asm/word-at-a-time.h
20438 +++ b/arch/x86/include/asm/word-at-a-time.h
20439 @@ -11,7 +11,7 @@
20440 * and shift, for example.
20441 */
20442 struct word_at_a_time {
20443 - const unsigned long one_bits, high_bits;
20444 + unsigned long one_bits, high_bits;
20445 };
20446
20447 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20448 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20449 index e45e4da..44e8572 100644
20450 --- a/arch/x86/include/asm/x86_init.h
20451 +++ b/arch/x86/include/asm/x86_init.h
20452 @@ -129,7 +129,7 @@ struct x86_init_ops {
20453 struct x86_init_timers timers;
20454 struct x86_init_iommu iommu;
20455 struct x86_init_pci pci;
20456 -};
20457 +} __no_const;
20458
20459 /**
20460 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20461 @@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20462 void (*setup_percpu_clockev)(void);
20463 void (*early_percpu_clock_init)(void);
20464 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20465 -};
20466 +} __no_const;
20467
20468 struct timespec;
20469
20470 @@ -168,7 +168,7 @@ struct x86_platform_ops {
20471 void (*save_sched_clock_state)(void);
20472 void (*restore_sched_clock_state)(void);
20473 void (*apic_post_init)(void);
20474 -};
20475 +} __no_const;
20476
20477 struct pci_dev;
20478 struct msi_msg;
20479 @@ -185,7 +185,7 @@ struct x86_msi_ops {
20480 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20481 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20482 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20483 -};
20484 +} __no_const;
20485
20486 struct IO_APIC_route_entry;
20487 struct io_apic_irq_attr;
20488 @@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20489 unsigned int destination, int vector,
20490 struct io_apic_irq_attr *attr);
20491 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20492 -};
20493 +} __no_const;
20494
20495 extern struct x86_init_ops x86_init;
20496 extern struct x86_cpuinit_ops x86_cpuinit;
20497 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20498 index c949923..c22bfa4 100644
20499 --- a/arch/x86/include/asm/xen/page.h
20500 +++ b/arch/x86/include/asm/xen/page.h
20501 @@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20502 extern struct page *m2p_find_override(unsigned long mfn);
20503 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20504
20505 -static inline unsigned long pfn_to_mfn(unsigned long pfn)
20506 +static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20507 {
20508 unsigned long mfn;
20509
20510 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20511 index 7e7a79a..0824666 100644
20512 --- a/arch/x86/include/asm/xsave.h
20513 +++ b/arch/x86/include/asm/xsave.h
20514 @@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20515 if (unlikely(err))
20516 return -EFAULT;
20517
20518 + pax_open_userland();
20519 __asm__ __volatile__(ASM_STAC "\n"
20520 - "1:"XSAVE"\n"
20521 + "1:"
20522 + __copyuser_seg
20523 + XSAVE"\n"
20524 "2: " ASM_CLAC "\n"
20525 xstate_fault
20526 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20527 : "memory");
20528 + pax_close_userland();
20529 return err;
20530 }
20531
20532 @@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20533 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20534 {
20535 int err = 0;
20536 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20537 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20538 u32 lmask = mask;
20539 u32 hmask = mask >> 32;
20540
20541 + pax_open_userland();
20542 __asm__ __volatile__(ASM_STAC "\n"
20543 - "1:"XRSTOR"\n"
20544 + "1:"
20545 + __copyuser_seg
20546 + XRSTOR"\n"
20547 "2: " ASM_CLAC "\n"
20548 xstate_fault
20549 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20550 : "memory"); /* memory required? */
20551 + pax_close_userland();
20552 return err;
20553 }
20554
20555 diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20556 index d993e33..8db1b18 100644
20557 --- a/arch/x86/include/uapi/asm/e820.h
20558 +++ b/arch/x86/include/uapi/asm/e820.h
20559 @@ -58,7 +58,7 @@ struct e820map {
20560 #define ISA_START_ADDRESS 0xa0000
20561 #define ISA_END_ADDRESS 0x100000
20562
20563 -#define BIOS_BEGIN 0x000a0000
20564 +#define BIOS_BEGIN 0x000c0000
20565 #define BIOS_END 0x00100000
20566
20567 #define BIOS_ROM_BASE 0xffe00000
20568 diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20569 index 7b0a55a..ad115bf 100644
20570 --- a/arch/x86/include/uapi/asm/ptrace-abi.h
20571 +++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20572 @@ -49,7 +49,6 @@
20573 #define EFLAGS 144
20574 #define RSP 152
20575 #define SS 160
20576 -#define ARGOFFSET R11
20577 #endif /* __ASSEMBLY__ */
20578
20579 /* top of stack page */
20580 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20581 index 8f1e774..9b4c381 100644
20582 --- a/arch/x86/kernel/Makefile
20583 +++ b/arch/x86/kernel/Makefile
20584 @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20585 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20586 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20587 obj-y += probe_roms.o
20588 -obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20589 +obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20590 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20591 obj-$(CONFIG_X86_64) += mcount_64.o
20592 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20593 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20594 index a142e77..6222cdd 100644
20595 --- a/arch/x86/kernel/acpi/boot.c
20596 +++ b/arch/x86/kernel/acpi/boot.c
20597 @@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20598 * If your system is blacklisted here, but you find that acpi=force
20599 * works for you, please contact linux-acpi@vger.kernel.org
20600 */
20601 -static struct dmi_system_id __initdata acpi_dmi_table[] = {
20602 +static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20603 /*
20604 * Boxes that need ACPI disabled
20605 */
20606 @@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20607 };
20608
20609 /* second table for DMI checks that should run after early-quirks */
20610 -static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20611 +static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20612 /*
20613 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20614 * which includes some code which overrides all temperature
20615 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20616 index 3136820..e2c6577 100644
20617 --- a/arch/x86/kernel/acpi/sleep.c
20618 +++ b/arch/x86/kernel/acpi/sleep.c
20619 @@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20620 #else /* CONFIG_64BIT */
20621 #ifdef CONFIG_SMP
20622 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20623 +
20624 + pax_open_kernel();
20625 early_gdt_descr.address =
20626 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20627 + pax_close_kernel();
20628 +
20629 initial_gs = per_cpu_offset(smp_processor_id());
20630 #endif
20631 initial_code = (unsigned long)wakeup_long64;
20632 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20633 index 665c6b7..eae4d56 100644
20634 --- a/arch/x86/kernel/acpi/wakeup_32.S
20635 +++ b/arch/x86/kernel/acpi/wakeup_32.S
20636 @@ -29,13 +29,11 @@ wakeup_pmode_return:
20637 # and restore the stack ... but you need gdt for this to work
20638 movl saved_context_esp, %esp
20639
20640 - movl %cs:saved_magic, %eax
20641 - cmpl $0x12345678, %eax
20642 + cmpl $0x12345678, saved_magic
20643 jne bogus_magic
20644
20645 # jump to place where we left off
20646 - movl saved_eip, %eax
20647 - jmp *%eax
20648 + jmp *(saved_eip)
20649
20650 bogus_magic:
20651 jmp bogus_magic
20652 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20653 index 703130f..27a155d 100644
20654 --- a/arch/x86/kernel/alternative.c
20655 +++ b/arch/x86/kernel/alternative.c
20656 @@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20657 */
20658 for (a = start; a < end; a++) {
20659 instr = (u8 *)&a->instr_offset + a->instr_offset;
20660 +
20661 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20662 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20663 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20664 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20665 +#endif
20666 +
20667 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20668 BUG_ON(a->replacementlen > a->instrlen);
20669 BUG_ON(a->instrlen > sizeof(insnbuf));
20670 @@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20671 add_nops(insnbuf + a->replacementlen,
20672 a->instrlen - a->replacementlen);
20673
20674 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20675 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20676 + instr = ktva_ktla(instr);
20677 +#endif
20678 +
20679 text_poke_early(instr, insnbuf, a->instrlen);
20680 }
20681 }
20682 @@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20683 for (poff = start; poff < end; poff++) {
20684 u8 *ptr = (u8 *)poff + *poff;
20685
20686 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20687 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20689 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20690 +#endif
20691 +
20692 if (!*poff || ptr < text || ptr >= text_end)
20693 continue;
20694 /* turn DS segment override prefix into lock prefix */
20695 - if (*ptr == 0x3e)
20696 + if (*ktla_ktva(ptr) == 0x3e)
20697 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20698 }
20699 mutex_unlock(&text_mutex);
20700 @@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20701 for (poff = start; poff < end; poff++) {
20702 u8 *ptr = (u8 *)poff + *poff;
20703
20704 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20705 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20706 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20707 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20708 +#endif
20709 +
20710 if (!*poff || ptr < text || ptr >= text_end)
20711 continue;
20712 /* turn lock prefix into DS segment override prefix */
20713 - if (*ptr == 0xf0)
20714 + if (*ktla_ktva(ptr) == 0xf0)
20715 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20716 }
20717 mutex_unlock(&text_mutex);
20718 @@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20719
20720 BUG_ON(p->len > MAX_PATCH_LEN);
20721 /* prep the buffer with the original instructions */
20722 - memcpy(insnbuf, p->instr, p->len);
20723 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20724 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20725 (unsigned long)p->instr, p->len);
20726
20727 @@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20728 if (!uniproc_patched || num_possible_cpus() == 1)
20729 free_init_pages("SMP alternatives",
20730 (unsigned long)__smp_locks,
20731 - (unsigned long)__smp_locks_end);
20732 + PAGE_ALIGN((unsigned long)__smp_locks_end));
20733 #endif
20734
20735 apply_paravirt(__parainstructions, __parainstructions_end);
20736 @@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20737 * instructions. And on the local CPU you need to be protected again NMI or MCE
20738 * handlers seeing an inconsistent instruction while you patch.
20739 */
20740 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
20741 +void *__kprobes text_poke_early(void *addr, const void *opcode,
20742 size_t len)
20743 {
20744 unsigned long flags;
20745 local_irq_save(flags);
20746 - memcpy(addr, opcode, len);
20747 +
20748 + pax_open_kernel();
20749 + memcpy(ktla_ktva(addr), opcode, len);
20750 sync_core();
20751 + pax_close_kernel();
20752 +
20753 local_irq_restore(flags);
20754 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20755 that causes hangs on some VIA CPUs. */
20756 @@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20757 */
20758 void *text_poke(void *addr, const void *opcode, size_t len)
20759 {
20760 - unsigned long flags;
20761 - char *vaddr;
20762 + unsigned char *vaddr = ktla_ktva(addr);
20763 struct page *pages[2];
20764 - int i;
20765 + size_t i;
20766
20767 if (!core_kernel_text((unsigned long)addr)) {
20768 - pages[0] = vmalloc_to_page(addr);
20769 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20770 + pages[0] = vmalloc_to_page(vaddr);
20771 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20772 } else {
20773 - pages[0] = virt_to_page(addr);
20774 + pages[0] = virt_to_page(vaddr);
20775 WARN_ON(!PageReserved(pages[0]));
20776 - pages[1] = virt_to_page(addr + PAGE_SIZE);
20777 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20778 }
20779 BUG_ON(!pages[0]);
20780 - local_irq_save(flags);
20781 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20782 - if (pages[1])
20783 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20784 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20785 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20786 - clear_fixmap(FIX_TEXT_POKE0);
20787 - if (pages[1])
20788 - clear_fixmap(FIX_TEXT_POKE1);
20789 - local_flush_tlb();
20790 - sync_core();
20791 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
20792 - that causes hangs on some VIA CPUs. */
20793 + text_poke_early(addr, opcode, len);
20794 for (i = 0; i < len; i++)
20795 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20796 - local_irq_restore(flags);
20797 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20798 return addr;
20799 }
20800
20801 @@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20802 if (likely(!bp_patching_in_progress))
20803 return 0;
20804
20805 - if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20806 + if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20807 return 0;
20808
20809 /* set up the specified breakpoint handler */
20810 @@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20811 */
20812 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20813 {
20814 - unsigned char int3 = 0xcc;
20815 + const unsigned char int3 = 0xcc;
20816
20817 bp_int3_handler = handler;
20818 bp_int3_addr = (u8 *)addr + sizeof(int3);
20819 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20820 index ba6cc04..06fd971 100644
20821 --- a/arch/x86/kernel/apic/apic.c
20822 +++ b/arch/x86/kernel/apic/apic.c
20823 @@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20824 /*
20825 * Debug level, exported for io_apic.c
20826 */
20827 -unsigned int apic_verbosity;
20828 +int apic_verbosity;
20829
20830 int pic_mode;
20831
20832 @@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20833 apic_write(APIC_ESR, 0);
20834 v = apic_read(APIC_ESR);
20835 ack_APIC_irq();
20836 - atomic_inc(&irq_err_count);
20837 + atomic_inc_unchecked(&irq_err_count);
20838
20839 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20840 smp_processor_id(), v);
20841 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20842 index de918c4..32eed23 100644
20843 --- a/arch/x86/kernel/apic/apic_flat_64.c
20844 +++ b/arch/x86/kernel/apic/apic_flat_64.c
20845 @@ -154,7 +154,7 @@ static int flat_probe(void)
20846 return 1;
20847 }
20848
20849 -static struct apic apic_flat = {
20850 +static struct apic apic_flat __read_only = {
20851 .name = "flat",
20852 .probe = flat_probe,
20853 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20854 @@ -260,7 +260,7 @@ static int physflat_probe(void)
20855 return 0;
20856 }
20857
20858 -static struct apic apic_physflat = {
20859 +static struct apic apic_physflat __read_only = {
20860
20861 .name = "physical flat",
20862 .probe = physflat_probe,
20863 diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20864 index b205cdb..d8503ff 100644
20865 --- a/arch/x86/kernel/apic/apic_noop.c
20866 +++ b/arch/x86/kernel/apic/apic_noop.c
20867 @@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20868 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20869 }
20870
20871 -struct apic apic_noop = {
20872 +struct apic apic_noop __read_only = {
20873 .name = "noop",
20874 .probe = noop_probe,
20875 .acpi_madt_oem_check = NULL,
20876 diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20877 index c4a8d63..fe893ac 100644
20878 --- a/arch/x86/kernel/apic/bigsmp_32.c
20879 +++ b/arch/x86/kernel/apic/bigsmp_32.c
20880 @@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20881 return dmi_bigsmp;
20882 }
20883
20884 -static struct apic apic_bigsmp = {
20885 +static struct apic apic_bigsmp __read_only = {
20886
20887 .name = "bigsmp",
20888 .probe = probe_bigsmp,
20889 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20890 index 1183d54..6158e47 100644
20891 --- a/arch/x86/kernel/apic/io_apic.c
20892 +++ b/arch/x86/kernel/apic/io_apic.c
20893 @@ -1230,7 +1230,7 @@ out:
20894 }
20895 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20896
20897 -void lock_vector_lock(void)
20898 +void lock_vector_lock(void) __acquires(vector_lock)
20899 {
20900 /* Used to the online set of cpus does not change
20901 * during assign_irq_vector.
20902 @@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
20903 raw_spin_lock(&vector_lock);
20904 }
20905
20906 -void unlock_vector_lock(void)
20907 +void unlock_vector_lock(void) __releases(vector_lock)
20908 {
20909 raw_spin_unlock(&vector_lock);
20910 }
20911 @@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
20912 ack_APIC_irq();
20913 }
20914
20915 -atomic_t irq_mis_count;
20916 +atomic_unchecked_t irq_mis_count;
20917
20918 #ifdef CONFIG_GENERIC_PENDING_IRQ
20919 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20920 @@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
20921 * at the cpu.
20922 */
20923 if (!(v & (1 << (i & 0x1f)))) {
20924 - atomic_inc(&irq_mis_count);
20925 + atomic_inc_unchecked(&irq_mis_count);
20926
20927 eoi_ioapic_irq(irq, cfg);
20928 }
20929 diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20930 index bda4886..f9c7195 100644
20931 --- a/arch/x86/kernel/apic/probe_32.c
20932 +++ b/arch/x86/kernel/apic/probe_32.c
20933 @@ -72,7 +72,7 @@ static int probe_default(void)
20934 return 1;
20935 }
20936
20937 -static struct apic apic_default = {
20938 +static struct apic apic_default __read_only = {
20939
20940 .name = "default",
20941 .probe = probe_default,
20942 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20943 index e658f21..b695a1a 100644
20944 --- a/arch/x86/kernel/apic/x2apic_cluster.c
20945 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
20946 @@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20947 return notifier_from_errno(err);
20948 }
20949
20950 -static struct notifier_block __refdata x2apic_cpu_notifier = {
20951 +static struct notifier_block x2apic_cpu_notifier = {
20952 .notifier_call = update_clusterinfo,
20953 };
20954
20955 @@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20956 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20957 }
20958
20959 -static struct apic apic_x2apic_cluster = {
20960 +static struct apic apic_x2apic_cluster __read_only = {
20961
20962 .name = "cluster x2apic",
20963 .probe = x2apic_cluster_probe,
20964 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20965 index 6fae733..5ca17af 100644
20966 --- a/arch/x86/kernel/apic/x2apic_phys.c
20967 +++ b/arch/x86/kernel/apic/x2apic_phys.c
20968 @@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20969 return apic == &apic_x2apic_phys;
20970 }
20971
20972 -static struct apic apic_x2apic_phys = {
20973 +static struct apic apic_x2apic_phys __read_only = {
20974
20975 .name = "physical x2apic",
20976 .probe = x2apic_phys_probe,
20977 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20978 index 8e9dcfd..c61b3e4 100644
20979 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
20980 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20981 @@ -348,7 +348,7 @@ static int uv_probe(void)
20982 return apic == &apic_x2apic_uv_x;
20983 }
20984
20985 -static struct apic __refdata apic_x2apic_uv_x = {
20986 +static struct apic apic_x2apic_uv_x __read_only = {
20987
20988 .name = "UV large system",
20989 .probe = uv_probe,
20990 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20991 index 5848744..56cb598 100644
20992 --- a/arch/x86/kernel/apm_32.c
20993 +++ b/arch/x86/kernel/apm_32.c
20994 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20995 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20996 * even though they are called in protected mode.
20997 */
20998 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20999 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21000 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21001
21002 static const char driver_version[] = "1.16ac"; /* no spaces */
21003 @@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
21004 BUG_ON(cpu != 0);
21005 gdt = get_cpu_gdt_table(cpu);
21006 save_desc_40 = gdt[0x40 / 8];
21007 +
21008 + pax_open_kernel();
21009 gdt[0x40 / 8] = bad_bios_desc;
21010 + pax_close_kernel();
21011
21012 apm_irq_save(flags);
21013 APM_DO_SAVE_SEGS;
21014 @@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
21015 &call->esi);
21016 APM_DO_RESTORE_SEGS;
21017 apm_irq_restore(flags);
21018 +
21019 + pax_open_kernel();
21020 gdt[0x40 / 8] = save_desc_40;
21021 + pax_close_kernel();
21022 +
21023 put_cpu();
21024
21025 return call->eax & 0xff;
21026 @@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
21027 BUG_ON(cpu != 0);
21028 gdt = get_cpu_gdt_table(cpu);
21029 save_desc_40 = gdt[0x40 / 8];
21030 +
21031 + pax_open_kernel();
21032 gdt[0x40 / 8] = bad_bios_desc;
21033 + pax_close_kernel();
21034
21035 apm_irq_save(flags);
21036 APM_DO_SAVE_SEGS;
21037 @@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
21038 &call->eax);
21039 APM_DO_RESTORE_SEGS;
21040 apm_irq_restore(flags);
21041 +
21042 + pax_open_kernel();
21043 gdt[0x40 / 8] = save_desc_40;
21044 + pax_close_kernel();
21045 +
21046 put_cpu();
21047 return error;
21048 }
21049 @@ -2350,12 +2364,15 @@ static int __init apm_init(void)
21050 * code to that CPU.
21051 */
21052 gdt = get_cpu_gdt_table(0);
21053 +
21054 + pax_open_kernel();
21055 set_desc_base(&gdt[APM_CS >> 3],
21056 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21057 set_desc_base(&gdt[APM_CS_16 >> 3],
21058 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21059 set_desc_base(&gdt[APM_DS >> 3],
21060 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21061 + pax_close_kernel();
21062
21063 proc_create("apm", 0, NULL, &apm_file_ops);
21064
21065 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21066 index 9f6b934..cf5ffb3 100644
21067 --- a/arch/x86/kernel/asm-offsets.c
21068 +++ b/arch/x86/kernel/asm-offsets.c
21069 @@ -32,6 +32,8 @@ void common(void) {
21070 OFFSET(TI_flags, thread_info, flags);
21071 OFFSET(TI_status, thread_info, status);
21072 OFFSET(TI_addr_limit, thread_info, addr_limit);
21073 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21074 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21075
21076 BLANK();
21077 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21078 @@ -52,8 +54,26 @@ void common(void) {
21079 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21080 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21081 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21082 +
21083 +#ifdef CONFIG_PAX_KERNEXEC
21084 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21085 #endif
21086
21087 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21088 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21089 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21090 +#ifdef CONFIG_X86_64
21091 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21092 +#endif
21093 +#endif
21094 +
21095 +#endif
21096 +
21097 + BLANK();
21098 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21099 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21100 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21101 +
21102 #ifdef CONFIG_XEN
21103 BLANK();
21104 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21105 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21106 index e7c798b..2b2019b 100644
21107 --- a/arch/x86/kernel/asm-offsets_64.c
21108 +++ b/arch/x86/kernel/asm-offsets_64.c
21109 @@ -77,6 +77,7 @@ int main(void)
21110 BLANK();
21111 #undef ENTRY
21112
21113 + DEFINE(TSS_size, sizeof(struct tss_struct));
21114 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21115 BLANK();
21116
21117 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21118 index e27b49d..85b106c 100644
21119 --- a/arch/x86/kernel/cpu/Makefile
21120 +++ b/arch/x86/kernel/cpu/Makefile
21121 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21122 CFLAGS_REMOVE_perf_event.o = -pg
21123 endif
21124
21125 -# Make sure load_percpu_segment has no stackprotector
21126 -nostackp := $(call cc-option, -fno-stack-protector)
21127 -CFLAGS_common.o := $(nostackp)
21128 -
21129 obj-y := intel_cacheinfo.o scattered.o topology.o
21130 obj-y += common.o
21131 obj-y += rdrand.o
21132 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21133 index 813d29d..6e542d4 100644
21134 --- a/arch/x86/kernel/cpu/amd.c
21135 +++ b/arch/x86/kernel/cpu/amd.c
21136 @@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21137 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21138 {
21139 /* AMD errata T13 (order #21922) */
21140 - if ((c->x86 == 6)) {
21141 + if (c->x86 == 6) {
21142 /* Duron Rev A0 */
21143 if (c->x86_model == 3 && c->x86_mask == 0)
21144 size = 64;
21145 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21146 index cfa9b5b..19b5084 100644
21147 --- a/arch/x86/kernel/cpu/common.c
21148 +++ b/arch/x86/kernel/cpu/common.c
21149 @@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21150
21151 static const struct cpu_dev *this_cpu = &default_cpu;
21152
21153 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21154 -#ifdef CONFIG_X86_64
21155 - /*
21156 - * We need valid kernel segments for data and code in long mode too
21157 - * IRET will check the segment types kkeil 2000/10/28
21158 - * Also sysret mandates a special GDT layout
21159 - *
21160 - * TLS descriptors are currently at a different place compared to i386.
21161 - * Hopefully nobody expects them at a fixed place (Wine?)
21162 - */
21163 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21164 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21165 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21166 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21167 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21168 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21169 -#else
21170 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21171 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21172 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21173 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21174 - /*
21175 - * Segments used for calling PnP BIOS have byte granularity.
21176 - * They code segments and data segments have fixed 64k limits,
21177 - * the transfer segment sizes are set at run time.
21178 - */
21179 - /* 32-bit code */
21180 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21181 - /* 16-bit code */
21182 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21183 - /* 16-bit data */
21184 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21185 - /* 16-bit data */
21186 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21187 - /* 16-bit data */
21188 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21189 - /*
21190 - * The APM segments have byte granularity and their bases
21191 - * are set at run time. All have 64k limits.
21192 - */
21193 - /* 32-bit code */
21194 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21195 - /* 16-bit code */
21196 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21197 - /* data */
21198 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21199 -
21200 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21201 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21202 - GDT_STACK_CANARY_INIT
21203 -#endif
21204 -} };
21205 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21206 -
21207 static int __init x86_xsave_setup(char *s)
21208 {
21209 if (strlen(s))
21210 @@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21211 }
21212 }
21213
21214 +#ifdef CONFIG_X86_64
21215 +static __init int setup_disable_pcid(char *arg)
21216 +{
21217 + setup_clear_cpu_cap(X86_FEATURE_PCID);
21218 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21219 +
21220 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21221 + if (clone_pgd_mask != ~(pgdval_t)0UL)
21222 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21223 +#endif
21224 +
21225 + return 1;
21226 +}
21227 +__setup("nopcid", setup_disable_pcid);
21228 +
21229 +static void setup_pcid(struct cpuinfo_x86 *c)
21230 +{
21231 + if (!cpu_has(c, X86_FEATURE_PCID)) {
21232 + clear_cpu_cap(c, X86_FEATURE_INVPCID);
21233 +
21234 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21235 + if (clone_pgd_mask != ~(pgdval_t)0UL) {
21236 + pax_open_kernel();
21237 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21238 + pax_close_kernel();
21239 + printk("PAX: slow and weak UDEREF enabled\n");
21240 + } else
21241 + printk("PAX: UDEREF disabled\n");
21242 +#endif
21243 +
21244 + return;
21245 + }
21246 +
21247 + printk("PAX: PCID detected\n");
21248 + set_in_cr4(X86_CR4_PCIDE);
21249 +
21250 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21251 + pax_open_kernel();
21252 + clone_pgd_mask = ~(pgdval_t)0UL;
21253 + pax_close_kernel();
21254 + if (pax_user_shadow_base)
21255 + printk("PAX: weak UDEREF enabled\n");
21256 + else {
21257 + set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21258 + printk("PAX: strong UDEREF enabled\n");
21259 + }
21260 +#endif
21261 +
21262 + if (cpu_has(c, X86_FEATURE_INVPCID))
21263 + printk("PAX: INVPCID detected\n");
21264 +}
21265 +#endif
21266 +
21267 /*
21268 * Some CPU features depend on higher CPUID levels, which may not always
21269 * be available due to CPUID level capping or broken virtualization
21270 @@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21271 {
21272 struct desc_ptr gdt_descr;
21273
21274 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21275 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21276 gdt_descr.size = GDT_SIZE - 1;
21277 load_gdt(&gdt_descr);
21278 /* Reload the per-cpu base */
21279 @@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21280 setup_smep(c);
21281 setup_smap(c);
21282
21283 +#ifdef CONFIG_X86_64
21284 + setup_pcid(c);
21285 +#endif
21286 +
21287 /*
21288 * The vendor-specific functions might have changed features.
21289 * Now we do "generic changes."
21290 @@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 /* Filter out anything that depends on CPUID levels we don't have */
21292 filter_cpuid_features(c, true);
21293
21294 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21295 + setup_clear_cpu_cap(X86_FEATURE_SEP);
21296 +#endif
21297 +
21298 /* If the model name is still unset, do table lookup. */
21299 if (!c->x86_model_id[0]) {
21300 const char *p;
21301 @@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
21302 void enable_sep_cpu(void)
21303 {
21304 int cpu = get_cpu();
21305 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
21306 + struct tss_struct *tss = init_tss + cpu;
21307
21308 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21309 put_cpu();
21310 @@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
21311 }
21312 __setup("clearcpuid=", setup_disablecpuid);
21313
21314 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21315 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
21316 +
21317 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21318 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21319 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21320 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21321
21322 #ifdef CONFIG_X86_64
21323 -struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21324 -struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21325 - (unsigned long) debug_idt_table };
21326 +struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21327 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21328
21329 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21330 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21331 @@ -1309,7 +1318,7 @@ void cpu_init(void)
21332 */
21333 load_ucode_ap();
21334
21335 - t = &per_cpu(init_tss, cpu);
21336 + t = init_tss + cpu;
21337 oist = &per_cpu(orig_ist, cpu);
21338
21339 #ifdef CONFIG_NUMA
21340 @@ -1341,7 +1350,6 @@ void cpu_init(void)
21341 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21342 barrier();
21343
21344 - x86_configure_nx();
21345 enable_x2apic();
21346
21347 /*
21348 @@ -1393,7 +1401,7 @@ void cpu_init(void)
21349 {
21350 int cpu = smp_processor_id();
21351 struct task_struct *curr = current;
21352 - struct tss_struct *t = &per_cpu(init_tss, cpu);
21353 + struct tss_struct *t = init_tss + cpu;
21354 struct thread_struct *thread = &curr->thread;
21355
21356 wait_for_master_cpu(cpu);
21357 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21358 index c703507..28535e3 100644
21359 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21360 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21361 @@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21362 };
21363
21364 #ifdef CONFIG_AMD_NB
21365 +static struct attribute *default_attrs_amd_nb[] = {
21366 + &type.attr,
21367 + &level.attr,
21368 + &coherency_line_size.attr,
21369 + &physical_line_partition.attr,
21370 + &ways_of_associativity.attr,
21371 + &number_of_sets.attr,
21372 + &size.attr,
21373 + &shared_cpu_map.attr,
21374 + &shared_cpu_list.attr,
21375 + NULL,
21376 + NULL,
21377 + NULL,
21378 + NULL
21379 +};
21380 +
21381 static struct attribute **amd_l3_attrs(void)
21382 {
21383 static struct attribute **attrs;
21384 @@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21385
21386 n = ARRAY_SIZE(default_attrs);
21387
21388 - if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21389 - n += 2;
21390 -
21391 - if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21392 - n += 1;
21393 -
21394 - attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21395 - if (attrs == NULL)
21396 - return attrs = default_attrs;
21397 -
21398 - for (n = 0; default_attrs[n]; n++)
21399 - attrs[n] = default_attrs[n];
21400 + attrs = default_attrs_amd_nb;
21401
21402 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21403 attrs[n++] = &cache_disable_0.attr;
21404 @@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21405 .default_attrs = default_attrs,
21406 };
21407
21408 +#ifdef CONFIG_AMD_NB
21409 +static struct kobj_type ktype_cache_amd_nb = {
21410 + .sysfs_ops = &sysfs_ops,
21411 + .default_attrs = default_attrs_amd_nb,
21412 +};
21413 +#endif
21414 +
21415 static struct kobj_type ktype_percpu_entry = {
21416 .sysfs_ops = &sysfs_ops,
21417 };
21418 @@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21419 return retval;
21420 }
21421
21422 +#ifdef CONFIG_AMD_NB
21423 + amd_l3_attrs();
21424 +#endif
21425 +
21426 for (i = 0; i < num_cache_leaves; i++) {
21427 + struct kobj_type *ktype;
21428 +
21429 this_object = INDEX_KOBJECT_PTR(cpu, i);
21430 this_object->cpu = cpu;
21431 this_object->index = i;
21432
21433 this_leaf = CPUID4_INFO_IDX(cpu, i);
21434
21435 - ktype_cache.default_attrs = default_attrs;
21436 + ktype = &ktype_cache;
21437 #ifdef CONFIG_AMD_NB
21438 if (this_leaf->base.nb)
21439 - ktype_cache.default_attrs = amd_l3_attrs();
21440 + ktype = &ktype_cache_amd_nb;
21441 #endif
21442 retval = kobject_init_and_add(&(this_object->kobj),
21443 - &ktype_cache,
21444 + ktype,
21445 per_cpu(ici_cache_kobject, cpu),
21446 "index%1lu", i);
21447 if (unlikely(retval)) {
21448 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21449 index 61a9668ce..b446a37 100644
21450 --- a/arch/x86/kernel/cpu/mcheck/mce.c
21451 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
21452 @@ -45,6 +45,7 @@
21453 #include <asm/processor.h>
21454 #include <asm/mce.h>
21455 #include <asm/msr.h>
21456 +#include <asm/local.h>
21457
21458 #include "mce-internal.h"
21459
21460 @@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21461 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21462 m->cs, m->ip);
21463
21464 - if (m->cs == __KERNEL_CS)
21465 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21466 print_symbol("{%s}", m->ip);
21467 pr_cont("\n");
21468 }
21469 @@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21470
21471 #define PANIC_TIMEOUT 5 /* 5 seconds */
21472
21473 -static atomic_t mce_paniced;
21474 +static atomic_unchecked_t mce_paniced;
21475
21476 static int fake_panic;
21477 -static atomic_t mce_fake_paniced;
21478 +static atomic_unchecked_t mce_fake_paniced;
21479
21480 /* Panic in progress. Enable interrupts and wait for final IPI */
21481 static void wait_for_panic(void)
21482 @@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21483 /*
21484 * Make sure only one CPU runs in machine check panic
21485 */
21486 - if (atomic_inc_return(&mce_paniced) > 1)
21487 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21488 wait_for_panic();
21489 barrier();
21490
21491 @@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21492 console_verbose();
21493 } else {
21494 /* Don't log too much for fake panic */
21495 - if (atomic_inc_return(&mce_fake_paniced) > 1)
21496 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21497 return;
21498 }
21499 /* First print corrected ones that are still unlogged */
21500 @@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21501 if (!fake_panic) {
21502 if (panic_timeout == 0)
21503 panic_timeout = mca_cfg.panic_timeout;
21504 - panic(msg);
21505 + panic("%s", msg);
21506 } else
21507 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21508 }
21509 @@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
21510 * might have been modified by someone else.
21511 */
21512 rmb();
21513 - if (atomic_read(&mce_paniced))
21514 + if (atomic_read_unchecked(&mce_paniced))
21515 wait_for_panic();
21516 if (!mca_cfg.monarch_timeout)
21517 goto out;
21518 @@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21519 }
21520
21521 /* Call the installed machine check handler for this CPU setup. */
21522 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
21523 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21524 unexpected_machine_check;
21525
21526 /*
21527 @@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21528 return;
21529 }
21530
21531 + pax_open_kernel();
21532 machine_check_vector = do_machine_check;
21533 + pax_close_kernel();
21534
21535 __mcheck_cpu_init_generic();
21536 __mcheck_cpu_init_vendor(c);
21537 @@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 */
21539
21540 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21541 -static int mce_chrdev_open_count; /* #times opened */
21542 +static local_t mce_chrdev_open_count; /* #times opened */
21543 static int mce_chrdev_open_exclu; /* already open exclusive? */
21544
21545 static int mce_chrdev_open(struct inode *inode, struct file *file)
21546 @@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21547 spin_lock(&mce_chrdev_state_lock);
21548
21549 if (mce_chrdev_open_exclu ||
21550 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21551 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21552 spin_unlock(&mce_chrdev_state_lock);
21553
21554 return -EBUSY;
21555 @@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21556
21557 if (file->f_flags & O_EXCL)
21558 mce_chrdev_open_exclu = 1;
21559 - mce_chrdev_open_count++;
21560 + local_inc(&mce_chrdev_open_count);
21561
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564 @@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21565 {
21566 spin_lock(&mce_chrdev_state_lock);
21567
21568 - mce_chrdev_open_count--;
21569 + local_dec(&mce_chrdev_open_count);
21570 mce_chrdev_open_exclu = 0;
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573 @@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
21574
21575 for (i = 0; i < mca_cfg.banks; i++) {
21576 struct mce_bank *b = &mce_banks[i];
21577 - struct device_attribute *a = &b->attr;
21578 + device_attribute_no_const *a = &b->attr;
21579
21580 sysfs_attr_init(&a->attr);
21581 a->attr.name = b->attrname;
21582 @@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
21583 static void mce_reset(void)
21584 {
21585 cpu_missing = 0;
21586 - atomic_set(&mce_fake_paniced, 0);
21587 + atomic_set_unchecked(&mce_fake_paniced, 0);
21588 atomic_set(&mce_executing, 0);
21589 atomic_set(&mce_callin, 0);
21590 atomic_set(&global_nwo, 0);
21591 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21592 index a304298..49b6d06 100644
21593 --- a/arch/x86/kernel/cpu/mcheck/p5.c
21594 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
21595 @@ -10,6 +10,7 @@
21596 #include <asm/processor.h>
21597 #include <asm/mce.h>
21598 #include <asm/msr.h>
21599 +#include <asm/pgtable.h>
21600
21601 /* By default disabled */
21602 int mce_p5_enabled __read_mostly;
21603 @@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21604 if (!cpu_has(c, X86_FEATURE_MCE))
21605 return;
21606
21607 + pax_open_kernel();
21608 machine_check_vector = pentium_machine_check;
21609 + pax_close_kernel();
21610 /* Make sure the vector pointer is visible before we enable MCEs: */
21611 wmb();
21612
21613 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21614 index 7dc5564..1273569 100644
21615 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
21616 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21617 @@ -9,6 +9,7 @@
21618 #include <asm/processor.h>
21619 #include <asm/mce.h>
21620 #include <asm/msr.h>
21621 +#include <asm/pgtable.h>
21622
21623 /* Machine check handler for WinChip C6: */
21624 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21625 @@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21626 {
21627 u32 lo, hi;
21628
21629 + pax_open_kernel();
21630 machine_check_vector = winchip_machine_check;
21631 + pax_close_kernel();
21632 /* Make sure the vector pointer is visible before we enable MCEs: */
21633 wmb();
21634
21635 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21636 index 15c2909..2cef20c 100644
21637 --- a/arch/x86/kernel/cpu/microcode/core.c
21638 +++ b/arch/x86/kernel/cpu/microcode/core.c
21639 @@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21640 return NOTIFY_OK;
21641 }
21642
21643 -static struct notifier_block __refdata mc_cpu_notifier = {
21644 +static struct notifier_block mc_cpu_notifier = {
21645 .notifier_call = mc_cpu_callback,
21646 };
21647
21648 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21649 index c6826d1..ad18e14a 100644
21650 --- a/arch/x86/kernel/cpu/microcode/intel.c
21651 +++ b/arch/x86/kernel/cpu/microcode/intel.c
21652 @@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21653
21654 static int get_ucode_user(void *to, const void *from, size_t n)
21655 {
21656 - return copy_from_user(to, from, n);
21657 + return copy_from_user(to, (const void __force_user *)from, n);
21658 }
21659
21660 static enum ucode_state
21661 request_microcode_user(int cpu, const void __user *buf, size_t size)
21662 {
21663 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21664 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21665 }
21666
21667 static void microcode_fini_cpu(int cpu)
21668 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21669 index ea5f363..cb0e905 100644
21670 --- a/arch/x86/kernel/cpu/mtrr/main.c
21671 +++ b/arch/x86/kernel/cpu/mtrr/main.c
21672 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21673 u64 size_or_mask, size_and_mask;
21674 static bool mtrr_aps_delayed_init;
21675
21676 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21677 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21678
21679 const struct mtrr_ops *mtrr_if;
21680
21681 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21682 index df5e41f..816c719 100644
21683 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21684 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21685 @@ -25,7 +25,7 @@ struct mtrr_ops {
21686 int (*validate_add_page)(unsigned long base, unsigned long size,
21687 unsigned int type);
21688 int (*have_wrcomb)(void);
21689 -};
21690 +} __do_const;
21691
21692 extern int generic_get_free_region(unsigned long base, unsigned long size,
21693 int replace_reg);
21694 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21695 index 143e5f5..5825081 100644
21696 --- a/arch/x86/kernel/cpu/perf_event.c
21697 +++ b/arch/x86/kernel/cpu/perf_event.c
21698 @@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21699
21700 }
21701
21702 -static struct attribute_group x86_pmu_format_group = {
21703 +static attribute_group_no_const x86_pmu_format_group = {
21704 .name = "format",
21705 .attrs = NULL,
21706 };
21707 @@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21708 NULL,
21709 };
21710
21711 -static struct attribute_group x86_pmu_events_group = {
21712 +static attribute_group_no_const x86_pmu_events_group = {
21713 .name = "events",
21714 .attrs = events_attr,
21715 };
21716 @@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21717 if (idx > GDT_ENTRIES)
21718 return 0;
21719
21720 - desc = raw_cpu_ptr(gdt_page.gdt);
21721 + desc = get_cpu_gdt_table(smp_processor_id());
21722 }
21723
21724 return get_desc_base(desc + idx);
21725 @@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21726 break;
21727
21728 perf_callchain_store(entry, frame.return_address);
21729 - fp = frame.next_frame;
21730 + fp = (const void __force_user *)frame.next_frame;
21731 }
21732 }
21733
21734 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21735 index 639d128..e92d7e5 100644
21736 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21737 +++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21738 @@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21739 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21740 {
21741 struct attribute **attrs;
21742 - struct attribute_group *attr_group;
21743 + attribute_group_no_const *attr_group;
21744 int i = 0, j;
21745
21746 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21747 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21748 index 944bf01..4a4392f 100644
21749 --- a/arch/x86/kernel/cpu/perf_event_intel.c
21750 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
21751 @@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21752 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21753
21754 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21755 - u64 capabilities;
21756 + u64 capabilities = x86_pmu.intel_cap.capabilities;
21757
21758 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21759 - x86_pmu.intel_cap.capabilities = capabilities;
21760 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21761 + x86_pmu.intel_cap.capabilities = capabilities;
21762 }
21763
21764 intel_ds_init();
21765 diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21766 index d64f275..26522ff 100644
21767 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21768 +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21769 @@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21770 NULL,
21771 };
21772
21773 -static struct attribute_group rapl_pmu_events_group = {
21774 +static attribute_group_no_const rapl_pmu_events_group __read_only = {
21775 .name = "events",
21776 .attrs = NULL, /* patched at runtime */
21777 };
21778 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21779 index 9762dbd..53d5d21 100644
21780 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21781 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21782 @@ -721,7 +721,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21783 static int __init uncore_type_init(struct intel_uncore_type *type)
21784 {
21785 struct intel_uncore_pmu *pmus;
21786 - struct attribute_group *attr_group;
21787 + attribute_group_no_const *attr_group;
21788 struct attribute **attrs;
21789 int i, j;
21790
21791 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21792 index 18eb78b..18747cc 100644
21793 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21794 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21795 @@ -114,7 +114,7 @@ struct intel_uncore_box {
21796 struct uncore_event_desc {
21797 struct kobj_attribute attr;
21798 const char *config;
21799 -};
21800 +} __do_const;
21801
21802 ssize_t uncore_event_show(struct kobject *kobj,
21803 struct kobj_attribute *attr, char *buf);
21804 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21805 index 3225ae6c..ee3c6db 100644
21806 --- a/arch/x86/kernel/cpuid.c
21807 +++ b/arch/x86/kernel/cpuid.c
21808 @@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21809 return notifier_from_errno(err);
21810 }
21811
21812 -static struct notifier_block __refdata cpuid_class_cpu_notifier =
21813 +static struct notifier_block cpuid_class_cpu_notifier =
21814 {
21815 .notifier_call = cpuid_class_cpu_callback,
21816 };
21817 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21818 index f5ab56d..d3b201a 100644
21819 --- a/arch/x86/kernel/crash.c
21820 +++ b/arch/x86/kernel/crash.c
21821 @@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21822 #ifdef CONFIG_X86_32
21823 struct pt_regs fixed_regs;
21824
21825 - if (!user_mode_vm(regs)) {
21826 + if (!user_mode(regs)) {
21827 crash_fixup_ss_esp(&fixed_regs, regs);
21828 regs = &fixed_regs;
21829 }
21830 diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21831 index afa64ad..dce67dd 100644
21832 --- a/arch/x86/kernel/crash_dump_64.c
21833 +++ b/arch/x86/kernel/crash_dump_64.c
21834 @@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21835 return -ENOMEM;
21836
21837 if (userbuf) {
21838 - if (copy_to_user(buf, vaddr + offset, csize)) {
21839 + if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21840 iounmap(vaddr);
21841 return -EFAULT;
21842 }
21843 diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21844 index f6dfd93..892ade4 100644
21845 --- a/arch/x86/kernel/doublefault.c
21846 +++ b/arch/x86/kernel/doublefault.c
21847 @@ -12,7 +12,7 @@
21848
21849 #define DOUBLEFAULT_STACKSIZE (1024)
21850 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21851 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21852 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21853
21854 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21855
21856 @@ -22,7 +22,7 @@ static void doublefault_fn(void)
21857 unsigned long gdt, tss;
21858
21859 native_store_gdt(&gdt_desc);
21860 - gdt = gdt_desc.address;
21861 + gdt = (unsigned long)gdt_desc.address;
21862
21863 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21864
21865 @@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21866 /* 0x2 bit is always set */
21867 .flags = X86_EFLAGS_SF | 0x2,
21868 .sp = STACK_START,
21869 - .es = __USER_DS,
21870 + .es = __KERNEL_DS,
21871 .cs = __KERNEL_CS,
21872 .ss = __KERNEL_DS,
21873 - .ds = __USER_DS,
21874 + .ds = __KERNEL_DS,
21875 .fs = __KERNEL_PERCPU,
21876
21877 .__cr3 = __pa_nodebug(swapper_pg_dir),
21878 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21879 index b74ebc7..2c95874 100644
21880 --- a/arch/x86/kernel/dumpstack.c
21881 +++ b/arch/x86/kernel/dumpstack.c
21882 @@ -2,6 +2,9 @@
21883 * Copyright (C) 1991, 1992 Linus Torvalds
21884 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21885 */
21886 +#ifdef CONFIG_GRKERNSEC_HIDESYM
21887 +#define __INCLUDED_BY_HIDESYM 1
21888 +#endif
21889 #include <linux/kallsyms.h>
21890 #include <linux/kprobes.h>
21891 #include <linux/uaccess.h>
21892 @@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21893
21894 void printk_address(unsigned long address)
21895 {
21896 - pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21897 + pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21898 }
21899
21900 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21901 static void
21902 print_ftrace_graph_addr(unsigned long addr, void *data,
21903 const struct stacktrace_ops *ops,
21904 - struct thread_info *tinfo, int *graph)
21905 + struct task_struct *task, int *graph)
21906 {
21907 - struct task_struct *task;
21908 unsigned long ret_addr;
21909 int index;
21910
21911 if (addr != (unsigned long)return_to_handler)
21912 return;
21913
21914 - task = tinfo->task;
21915 index = task->curr_ret_stack;
21916
21917 if (!task->ret_stack || index < *graph)
21918 @@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21919 static inline void
21920 print_ftrace_graph_addr(unsigned long addr, void *data,
21921 const struct stacktrace_ops *ops,
21922 - struct thread_info *tinfo, int *graph)
21923 + struct task_struct *task, int *graph)
21924 { }
21925 #endif
21926
21927 @@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21928 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21929 */
21930
21931 -static inline int valid_stack_ptr(struct thread_info *tinfo,
21932 - void *p, unsigned int size, void *end)
21933 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21934 {
21935 - void *t = tinfo;
21936 if (end) {
21937 if (p < end && p >= (end-THREAD_SIZE))
21938 return 1;
21939 @@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21940 }
21941
21942 unsigned long
21943 -print_context_stack(struct thread_info *tinfo,
21944 +print_context_stack(struct task_struct *task, void *stack_start,
21945 unsigned long *stack, unsigned long bp,
21946 const struct stacktrace_ops *ops, void *data,
21947 unsigned long *end, int *graph)
21948 {
21949 struct stack_frame *frame = (struct stack_frame *)bp;
21950
21951 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21952 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21953 unsigned long addr;
21954
21955 addr = *stack;
21956 @@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21957 } else {
21958 ops->address(data, addr, 0);
21959 }
21960 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21961 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21962 }
21963 stack++;
21964 }
21965 @@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21966 EXPORT_SYMBOL_GPL(print_context_stack);
21967
21968 unsigned long
21969 -print_context_stack_bp(struct thread_info *tinfo,
21970 +print_context_stack_bp(struct task_struct *task, void *stack_start,
21971 unsigned long *stack, unsigned long bp,
21972 const struct stacktrace_ops *ops, void *data,
21973 unsigned long *end, int *graph)
21974 @@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21975 struct stack_frame *frame = (struct stack_frame *)bp;
21976 unsigned long *ret_addr = &frame->return_address;
21977
21978 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21979 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21980 unsigned long addr = *ret_addr;
21981
21982 if (!__kernel_text_address(addr))
21983 @@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21984 ops->address(data, addr, 1);
21985 frame = frame->next_frame;
21986 ret_addr = &frame->return_address;
21987 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21988 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21989 }
21990
21991 return (unsigned long)frame;
21992 @@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21993 static void print_trace_address(void *data, unsigned long addr, int reliable)
21994 {
21995 touch_nmi_watchdog();
21996 - printk(data);
21997 + printk("%s", (char *)data);
21998 printk_stack_address(addr, reliable);
21999 }
22000
22001 @@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22002 EXPORT_SYMBOL_GPL(oops_begin);
22003 NOKPROBE_SYMBOL(oops_begin);
22004
22005 +extern void gr_handle_kernel_exploit(void);
22006 +
22007 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22008 {
22009 if (regs && kexec_should_crash(current))
22010 @@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22011 panic("Fatal exception in interrupt");
22012 if (panic_on_oops)
22013 panic("Fatal exception");
22014 - do_exit(signr);
22015 +
22016 + gr_handle_kernel_exploit();
22017 +
22018 + do_group_exit(signr);
22019 }
22020 NOKPROBE_SYMBOL(oops_end);
22021
22022 @@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22023 print_modules();
22024 show_regs(regs);
22025 #ifdef CONFIG_X86_32
22026 - if (user_mode_vm(regs)) {
22027 + if (user_mode(regs)) {
22028 sp = regs->sp;
22029 ss = regs->ss & 0xffff;
22030 } else {
22031 @@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22032 unsigned long flags = oops_begin();
22033 int sig = SIGSEGV;
22034
22035 - if (!user_mode_vm(regs))
22036 + if (!user_mode(regs))
22037 report_bug(regs->ip, regs);
22038
22039 if (__die(str, regs, err))
22040 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22041 index 5abd4cd..c65733b 100644
22042 --- a/arch/x86/kernel/dumpstack_32.c
22043 +++ b/arch/x86/kernel/dumpstack_32.c
22044 @@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22045 bp = stack_frame(task, regs);
22046
22047 for (;;) {
22048 - struct thread_info *context;
22049 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22050 void *end_stack;
22051
22052 end_stack = is_hardirq_stack(stack, cpu);
22053 if (!end_stack)
22054 end_stack = is_softirq_stack(stack, cpu);
22055
22056 - context = task_thread_info(task);
22057 - bp = ops->walk_stack(context, stack, bp, ops, data,
22058 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22059 end_stack, &graph);
22060
22061 /* Stop if not on irq stack */
22062 @@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22063 int i;
22064
22065 show_regs_print_info(KERN_EMERG);
22066 - __show_regs(regs, !user_mode_vm(regs));
22067 + __show_regs(regs, !user_mode(regs));
22068
22069 /*
22070 * When in-kernel, we also print out the stack and code at the
22071 * time of the fault..
22072 */
22073 - if (!user_mode_vm(regs)) {
22074 + if (!user_mode(regs)) {
22075 unsigned int code_prologue = code_bytes * 43 / 64;
22076 unsigned int code_len = code_bytes;
22077 unsigned char c;
22078 u8 *ip;
22079 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22080
22081 pr_emerg("Stack:\n");
22082 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22083
22084 pr_emerg("Code:");
22085
22086 - ip = (u8 *)regs->ip - code_prologue;
22087 + ip = (u8 *)regs->ip - code_prologue + cs_base;
22088 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22089 /* try starting at IP */
22090 - ip = (u8 *)regs->ip;
22091 + ip = (u8 *)regs->ip + cs_base;
22092 code_len = code_len - code_prologue + 1;
22093 }
22094 for (i = 0; i < code_len; i++, ip++) {
22095 @@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22096 pr_cont(" Bad EIP value.");
22097 break;
22098 }
22099 - if (ip == (u8 *)regs->ip)
22100 + if (ip == (u8 *)regs->ip + cs_base)
22101 pr_cont(" <%02x>", c);
22102 else
22103 pr_cont(" %02x", c);
22104 @@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22105 {
22106 unsigned short ud2;
22107
22108 + ip = ktla_ktva(ip);
22109 if (ip < PAGE_OFFSET)
22110 return 0;
22111 if (probe_kernel_address((unsigned short *)ip, ud2))
22112 @@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22113
22114 return ud2 == 0x0b0f;
22115 }
22116 +
22117 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22118 +void pax_check_alloca(unsigned long size)
22119 +{
22120 + unsigned long sp = (unsigned long)&sp, stack_left;
22121 +
22122 + /* all kernel stacks are of the same size */
22123 + stack_left = sp & (THREAD_SIZE - 1);
22124 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22125 +}
22126 +EXPORT_SYMBOL(pax_check_alloca);
22127 +#endif
22128 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22129 index ff86f19..a20c62c 100644
22130 --- a/arch/x86/kernel/dumpstack_64.c
22131 +++ b/arch/x86/kernel/dumpstack_64.c
22132 @@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22133 const struct stacktrace_ops *ops, void *data)
22134 {
22135 const unsigned cpu = get_cpu();
22136 - struct thread_info *tinfo;
22137 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22138 unsigned long dummy;
22139 unsigned used = 0;
22140 int graph = 0;
22141 int done = 0;
22142 + void *stack_start;
22143
22144 if (!task)
22145 task = current;
22146 @@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22147 * current stack address. If the stacks consist of nested
22148 * exceptions
22149 */
22150 - tinfo = task_thread_info(task);
22151 while (!done) {
22152 unsigned long *stack_end;
22153 enum stack_type stype;
22154 @@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22155 if (ops->stack(data, id) < 0)
22156 break;
22157
22158 - bp = ops->walk_stack(tinfo, stack, bp, ops,
22159 + bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22160 data, stack_end, &graph);
22161 ops->stack(data, "<EOE>");
22162 /*
22163 @@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22164 * second-to-last pointer (index -2 to end) in the
22165 * exception stack:
22166 */
22167 + if ((u16)stack_end[-1] != __KERNEL_DS)
22168 + goto out;
22169 stack = (unsigned long *) stack_end[-2];
22170 done = 0;
22171 break;
22172 @@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22173
22174 if (ops->stack(data, "IRQ") < 0)
22175 break;
22176 - bp = ops->walk_stack(tinfo, stack, bp,
22177 + bp = ops->walk_stack(task, irq_stack, stack, bp,
22178 ops, data, stack_end, &graph);
22179 /*
22180 * We link to the next stack (which would be
22181 @@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22182 /*
22183 * This handles the process stack:
22184 */
22185 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22186 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22187 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22188 +out:
22189 put_cpu();
22190 }
22191 EXPORT_SYMBOL(dump_trace);
22192 @@ -349,3 +352,50 @@ int is_valid_bugaddr(unsigned long ip)
22193
22194 return ud2 == 0x0b0f;
22195 }
22196 +
22197 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22198 +void pax_check_alloca(unsigned long size)
22199 +{
22200 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22201 + unsigned cpu, used;
22202 + char *id;
22203 +
22204 + /* check the process stack first */
22205 + stack_start = (unsigned long)task_stack_page(current);
22206 + stack_end = stack_start + THREAD_SIZE;
22207 + if (likely(stack_start <= sp && sp < stack_end)) {
22208 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
22209 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22210 + return;
22211 + }
22212 +
22213 + cpu = get_cpu();
22214 +
22215 + /* check the irq stacks */
22216 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22217 + stack_start = stack_end - IRQ_STACK_SIZE;
22218 + if (stack_start <= sp && sp < stack_end) {
22219 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22220 + put_cpu();
22221 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22222 + return;
22223 + }
22224 +
22225 + /* check the exception stacks */
22226 + used = 0;
22227 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22228 + stack_start = stack_end - EXCEPTION_STKSZ;
22229 + if (stack_end && stack_start <= sp && sp < stack_end) {
22230 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22231 + put_cpu();
22232 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22233 + return;
22234 + }
22235 +
22236 + put_cpu();
22237 +
22238 + /* unknown stack */
22239 + BUG();
22240 +}
22241 +EXPORT_SYMBOL(pax_check_alloca);
22242 +#endif
22243 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22244 index 49f8864..1cc6d07 100644
22245 --- a/arch/x86/kernel/e820.c
22246 +++ b/arch/x86/kernel/e820.c
22247 @@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22248
22249 static void early_panic(char *msg)
22250 {
22251 - early_printk(msg);
22252 - panic(msg);
22253 + early_printk("%s", msg);
22254 + panic("%s", msg);
22255 }
22256
22257 static int userdef __initdata;
22258 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22259 index 01d1c18..8073693 100644
22260 --- a/arch/x86/kernel/early_printk.c
22261 +++ b/arch/x86/kernel/early_printk.c
22262 @@ -7,6 +7,7 @@
22263 #include <linux/pci_regs.h>
22264 #include <linux/pci_ids.h>
22265 #include <linux/errno.h>
22266 +#include <linux/sched.h>
22267 #include <asm/io.h>
22268 #include <asm/processor.h>
22269 #include <asm/fcntl.h>
22270 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22271 index 344b63f..ccdac7a 100644
22272 --- a/arch/x86/kernel/entry_32.S
22273 +++ b/arch/x86/kernel/entry_32.S
22274 @@ -177,13 +177,153 @@
22275 /*CFI_REL_OFFSET gs, PT_GS*/
22276 .endm
22277 .macro SET_KERNEL_GS reg
22278 +
22279 +#ifdef CONFIG_CC_STACKPROTECTOR
22280 movl $(__KERNEL_STACK_CANARY), \reg
22281 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22282 + movl $(__USER_DS), \reg
22283 +#else
22284 + xorl \reg, \reg
22285 +#endif
22286 +
22287 movl \reg, %gs
22288 .endm
22289
22290 #endif /* CONFIG_X86_32_LAZY_GS */
22291
22292 -.macro SAVE_ALL
22293 +.macro pax_enter_kernel
22294 +#ifdef CONFIG_PAX_KERNEXEC
22295 + call pax_enter_kernel
22296 +#endif
22297 +.endm
22298 +
22299 +.macro pax_exit_kernel
22300 +#ifdef CONFIG_PAX_KERNEXEC
22301 + call pax_exit_kernel
22302 +#endif
22303 +.endm
22304 +
22305 +#ifdef CONFIG_PAX_KERNEXEC
22306 +ENTRY(pax_enter_kernel)
22307 +#ifdef CONFIG_PARAVIRT
22308 + pushl %eax
22309 + pushl %ecx
22310 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22311 + mov %eax, %esi
22312 +#else
22313 + mov %cr0, %esi
22314 +#endif
22315 + bts $16, %esi
22316 + jnc 1f
22317 + mov %cs, %esi
22318 + cmp $__KERNEL_CS, %esi
22319 + jz 3f
22320 + ljmp $__KERNEL_CS, $3f
22321 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22322 +2:
22323 +#ifdef CONFIG_PARAVIRT
22324 + mov %esi, %eax
22325 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22326 +#else
22327 + mov %esi, %cr0
22328 +#endif
22329 +3:
22330 +#ifdef CONFIG_PARAVIRT
22331 + popl %ecx
22332 + popl %eax
22333 +#endif
22334 + ret
22335 +ENDPROC(pax_enter_kernel)
22336 +
22337 +ENTRY(pax_exit_kernel)
22338 +#ifdef CONFIG_PARAVIRT
22339 + pushl %eax
22340 + pushl %ecx
22341 +#endif
22342 + mov %cs, %esi
22343 + cmp $__KERNEXEC_KERNEL_CS, %esi
22344 + jnz 2f
22345 +#ifdef CONFIG_PARAVIRT
22346 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22347 + mov %eax, %esi
22348 +#else
22349 + mov %cr0, %esi
22350 +#endif
22351 + btr $16, %esi
22352 + ljmp $__KERNEL_CS, $1f
22353 +1:
22354 +#ifdef CONFIG_PARAVIRT
22355 + mov %esi, %eax
22356 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22357 +#else
22358 + mov %esi, %cr0
22359 +#endif
22360 +2:
22361 +#ifdef CONFIG_PARAVIRT
22362 + popl %ecx
22363 + popl %eax
22364 +#endif
22365 + ret
22366 +ENDPROC(pax_exit_kernel)
22367 +#endif
22368 +
22369 + .macro pax_erase_kstack
22370 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22371 + call pax_erase_kstack
22372 +#endif
22373 + .endm
22374 +
22375 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22376 +/*
22377 + * ebp: thread_info
22378 + */
22379 +ENTRY(pax_erase_kstack)
22380 + pushl %edi
22381 + pushl %ecx
22382 + pushl %eax
22383 +
22384 + mov TI_lowest_stack(%ebp), %edi
22385 + mov $-0xBEEF, %eax
22386 + std
22387 +
22388 +1: mov %edi, %ecx
22389 + and $THREAD_SIZE_asm - 1, %ecx
22390 + shr $2, %ecx
22391 + repne scasl
22392 + jecxz 2f
22393 +
22394 + cmp $2*16, %ecx
22395 + jc 2f
22396 +
22397 + mov $2*16, %ecx
22398 + repe scasl
22399 + jecxz 2f
22400 + jne 1b
22401 +
22402 +2: cld
22403 + mov %esp, %ecx
22404 + sub %edi, %ecx
22405 +
22406 + cmp $THREAD_SIZE_asm, %ecx
22407 + jb 3f
22408 + ud2
22409 +3:
22410 +
22411 + shr $2, %ecx
22412 + rep stosl
22413 +
22414 + mov TI_task_thread_sp0(%ebp), %edi
22415 + sub $128, %edi
22416 + mov %edi, TI_lowest_stack(%ebp)
22417 +
22418 + popl %eax
22419 + popl %ecx
22420 + popl %edi
22421 + ret
22422 +ENDPROC(pax_erase_kstack)
22423 +#endif
22424 +
22425 +.macro __SAVE_ALL _DS
22426 cld
22427 PUSH_GS
22428 pushl_cfi %fs
22429 @@ -206,7 +346,7 @@
22430 CFI_REL_OFFSET ecx, 0
22431 pushl_cfi %ebx
22432 CFI_REL_OFFSET ebx, 0
22433 - movl $(__USER_DS), %edx
22434 + movl $\_DS, %edx
22435 movl %edx, %ds
22436 movl %edx, %es
22437 movl $(__KERNEL_PERCPU), %edx
22438 @@ -214,6 +354,15 @@
22439 SET_KERNEL_GS %edx
22440 .endm
22441
22442 +.macro SAVE_ALL
22443 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22444 + __SAVE_ALL __KERNEL_DS
22445 + pax_enter_kernel
22446 +#else
22447 + __SAVE_ALL __USER_DS
22448 +#endif
22449 +.endm
22450 +
22451 .macro RESTORE_INT_REGS
22452 popl_cfi %ebx
22453 CFI_RESTORE ebx
22454 @@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
22455 popfl_cfi
22456 jmp syscall_exit
22457 CFI_ENDPROC
22458 -END(ret_from_fork)
22459 +ENDPROC(ret_from_fork)
22460
22461 ENTRY(ret_from_kernel_thread)
22462 CFI_STARTPROC
22463 @@ -340,7 +489,15 @@ ret_from_intr:
22464 andl $SEGMENT_RPL_MASK, %eax
22465 #endif
22466 cmpl $USER_RPL, %eax
22467 +
22468 +#ifdef CONFIG_PAX_KERNEXEC
22469 + jae resume_userspace
22470 +
22471 + pax_exit_kernel
22472 + jmp resume_kernel
22473 +#else
22474 jb resume_kernel # not returning to v8086 or userspace
22475 +#endif
22476
22477 ENTRY(resume_userspace)
22478 LOCKDEP_SYS_EXIT
22479 @@ -352,8 +509,8 @@ ENTRY(resume_userspace)
22480 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22481 # int/exception return?
22482 jne work_pending
22483 - jmp restore_all
22484 -END(ret_from_exception)
22485 + jmp restore_all_pax
22486 +ENDPROC(ret_from_exception)
22487
22488 #ifdef CONFIG_PREEMPT
22489 ENTRY(resume_kernel)
22490 @@ -365,7 +522,7 @@ need_resched:
22491 jz restore_all
22492 call preempt_schedule_irq
22493 jmp need_resched
22494 -END(resume_kernel)
22495 +ENDPROC(resume_kernel)
22496 #endif
22497 CFI_ENDPROC
22498
22499 @@ -395,30 +552,45 @@ sysenter_past_esp:
22500 /*CFI_REL_OFFSET cs, 0*/
22501 /*
22502 * Push current_thread_info()->sysenter_return to the stack.
22503 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22504 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
22505 */
22506 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22507 + pushl_cfi $0
22508 CFI_REL_OFFSET eip, 0
22509
22510 pushl_cfi %eax
22511 SAVE_ALL
22512 + GET_THREAD_INFO(%ebp)
22513 + movl TI_sysenter_return(%ebp),%ebp
22514 + movl %ebp,PT_EIP(%esp)
22515 ENABLE_INTERRUPTS(CLBR_NONE)
22516
22517 /*
22518 * Load the potential sixth argument from user stack.
22519 * Careful about security.
22520 */
22521 + movl PT_OLDESP(%esp),%ebp
22522 +
22523 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22524 + mov PT_OLDSS(%esp),%ds
22525 +1: movl %ds:(%ebp),%ebp
22526 + push %ss
22527 + pop %ds
22528 +#else
22529 cmpl $__PAGE_OFFSET-3,%ebp
22530 jae syscall_fault
22531 ASM_STAC
22532 1: movl (%ebp),%ebp
22533 ASM_CLAC
22534 +#endif
22535 +
22536 movl %ebp,PT_EBP(%esp)
22537 _ASM_EXTABLE(1b,syscall_fault)
22538
22539 GET_THREAD_INFO(%ebp)
22540
22541 +#ifdef CONFIG_PAX_RANDKSTACK
22542 + pax_erase_kstack
22543 +#endif
22544 +
22545 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22546 jnz sysenter_audit
22547 sysenter_do_call:
22548 @@ -434,12 +606,24 @@ sysenter_after_call:
22549 testl $_TIF_ALLWORK_MASK, %ecx
22550 jne sysexit_audit
22551 sysenter_exit:
22552 +
22553 +#ifdef CONFIG_PAX_RANDKSTACK
22554 + pushl_cfi %eax
22555 + movl %esp, %eax
22556 + call pax_randomize_kstack
22557 + popl_cfi %eax
22558 +#endif
22559 +
22560 + pax_erase_kstack
22561 +
22562 /* if something modifies registers it must also disable sysexit */
22563 movl PT_EIP(%esp), %edx
22564 movl PT_OLDESP(%esp), %ecx
22565 xorl %ebp,%ebp
22566 TRACE_IRQS_ON
22567 1: mov PT_FS(%esp), %fs
22568 +2: mov PT_DS(%esp), %ds
22569 +3: mov PT_ES(%esp), %es
22570 PTGS_TO_GS
22571 ENABLE_INTERRUPTS_SYSEXIT
22572
22573 @@ -453,6 +637,9 @@ sysenter_audit:
22574 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22575 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22576 call __audit_syscall_entry
22577 +
22578 + pax_erase_kstack
22579 +
22580 popl_cfi %ecx /* get that remapped edx off the stack */
22581 popl_cfi %ecx /* get that remapped esi off the stack */
22582 movl PT_EAX(%esp),%eax /* reload syscall number */
22583 @@ -479,10 +666,16 @@ sysexit_audit:
22584
22585 CFI_ENDPROC
22586 .pushsection .fixup,"ax"
22587 -2: movl $0,PT_FS(%esp)
22588 +4: movl $0,PT_FS(%esp)
22589 + jmp 1b
22590 +5: movl $0,PT_DS(%esp)
22591 + jmp 1b
22592 +6: movl $0,PT_ES(%esp)
22593 jmp 1b
22594 .popsection
22595 - _ASM_EXTABLE(1b,2b)
22596 + _ASM_EXTABLE(1b,4b)
22597 + _ASM_EXTABLE(2b,5b)
22598 + _ASM_EXTABLE(3b,6b)
22599 PTGS_TO_GS_EX
22600 ENDPROC(ia32_sysenter_target)
22601
22602 @@ -493,6 +686,11 @@ ENTRY(system_call)
22603 pushl_cfi %eax # save orig_eax
22604 SAVE_ALL
22605 GET_THREAD_INFO(%ebp)
22606 +
22607 +#ifdef CONFIG_PAX_RANDKSTACK
22608 + pax_erase_kstack
22609 +#endif
22610 +
22611 # system call tracing in operation / emulation
22612 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22613 jnz syscall_trace_entry
22614 @@ -512,6 +710,15 @@ syscall_exit:
22615 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22616 jne syscall_exit_work
22617
22618 +restore_all_pax:
22619 +
22620 +#ifdef CONFIG_PAX_RANDKSTACK
22621 + movl %esp, %eax
22622 + call pax_randomize_kstack
22623 +#endif
22624 +
22625 + pax_erase_kstack
22626 +
22627 restore_all:
22628 TRACE_IRQS_IRET
22629 restore_all_notrace:
22630 @@ -566,14 +773,34 @@ ldt_ss:
22631 * compensating for the offset by changing to the ESPFIX segment with
22632 * a base address that matches for the difference.
22633 */
22634 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22635 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22636 mov %esp, %edx /* load kernel esp */
22637 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22638 mov %dx, %ax /* eax: new kernel esp */
22639 sub %eax, %edx /* offset (low word is 0) */
22640 +#ifdef CONFIG_SMP
22641 + movl PER_CPU_VAR(cpu_number), %ebx
22642 + shll $PAGE_SHIFT_asm, %ebx
22643 + addl $cpu_gdt_table, %ebx
22644 +#else
22645 + movl $cpu_gdt_table, %ebx
22646 +#endif
22647 shr $16, %edx
22648 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22649 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22650 +
22651 +#ifdef CONFIG_PAX_KERNEXEC
22652 + mov %cr0, %esi
22653 + btr $16, %esi
22654 + mov %esi, %cr0
22655 +#endif
22656 +
22657 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22658 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22659 +
22660 +#ifdef CONFIG_PAX_KERNEXEC
22661 + bts $16, %esi
22662 + mov %esi, %cr0
22663 +#endif
22664 +
22665 pushl_cfi $__ESPFIX_SS
22666 pushl_cfi %eax /* new kernel esp */
22667 /* Disable interrupts, but do not irqtrace this section: we
22668 @@ -603,20 +830,18 @@ work_resched:
22669 movl TI_flags(%ebp), %ecx
22670 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22671 # than syscall tracing?
22672 - jz restore_all
22673 + jz restore_all_pax
22674 testb $_TIF_NEED_RESCHED, %cl
22675 jnz work_resched
22676
22677 work_notifysig: # deal with pending signals and
22678 # notify-resume requests
22679 + movl %esp, %eax
22680 #ifdef CONFIG_VM86
22681 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22682 - movl %esp, %eax
22683 jne work_notifysig_v86 # returning to kernel-space or
22684 # vm86-space
22685 1:
22686 -#else
22687 - movl %esp, %eax
22688 #endif
22689 TRACE_IRQS_ON
22690 ENABLE_INTERRUPTS(CLBR_NONE)
22691 @@ -637,7 +862,7 @@ work_notifysig_v86:
22692 movl %eax, %esp
22693 jmp 1b
22694 #endif
22695 -END(work_pending)
22696 +ENDPROC(work_pending)
22697
22698 # perform syscall exit tracing
22699 ALIGN
22700 @@ -645,11 +870,14 @@ syscall_trace_entry:
22701 movl $-ENOSYS,PT_EAX(%esp)
22702 movl %esp, %eax
22703 call syscall_trace_enter
22704 +
22705 + pax_erase_kstack
22706 +
22707 /* What it returned is what we'll actually use. */
22708 cmpl $(NR_syscalls), %eax
22709 jnae syscall_call
22710 jmp syscall_exit
22711 -END(syscall_trace_entry)
22712 +ENDPROC(syscall_trace_entry)
22713
22714 # perform syscall exit tracing
22715 ALIGN
22716 @@ -662,26 +890,30 @@ syscall_exit_work:
22717 movl %esp, %eax
22718 call syscall_trace_leave
22719 jmp resume_userspace
22720 -END(syscall_exit_work)
22721 +ENDPROC(syscall_exit_work)
22722 CFI_ENDPROC
22723
22724 RING0_INT_FRAME # can't unwind into user space anyway
22725 syscall_fault:
22726 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22727 + push %ss
22728 + pop %ds
22729 +#endif
22730 ASM_CLAC
22731 GET_THREAD_INFO(%ebp)
22732 movl $-EFAULT,PT_EAX(%esp)
22733 jmp resume_userspace
22734 -END(syscall_fault)
22735 +ENDPROC(syscall_fault)
22736
22737 syscall_badsys:
22738 movl $-ENOSYS,%eax
22739 jmp syscall_after_call
22740 -END(syscall_badsys)
22741 +ENDPROC(syscall_badsys)
22742
22743 sysenter_badsys:
22744 movl $-ENOSYS,%eax
22745 jmp sysenter_after_call
22746 -END(sysenter_badsys)
22747 +ENDPROC(sysenter_badsys)
22748 CFI_ENDPROC
22749
22750 .macro FIXUP_ESPFIX_STACK
22751 @@ -694,8 +926,15 @@ END(sysenter_badsys)
22752 */
22753 #ifdef CONFIG_X86_ESPFIX32
22754 /* fixup the stack */
22755 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22756 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22757 +#ifdef CONFIG_SMP
22758 + movl PER_CPU_VAR(cpu_number), %ebx
22759 + shll $PAGE_SHIFT_asm, %ebx
22760 + addl $cpu_gdt_table, %ebx
22761 +#else
22762 + movl $cpu_gdt_table, %ebx
22763 +#endif
22764 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22765 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22766 shl $16, %eax
22767 addl %esp, %eax /* the adjusted stack pointer */
22768 pushl_cfi $__KERNEL_DS
22769 @@ -751,7 +990,7 @@ vector=vector+1
22770 .endr
22771 2: jmp common_interrupt
22772 .endr
22773 -END(irq_entries_start)
22774 +ENDPROC(irq_entries_start)
22775
22776 .previous
22777 END(interrupt)
22778 @@ -808,7 +1047,7 @@ ENTRY(coprocessor_error)
22779 pushl_cfi $do_coprocessor_error
22780 jmp error_code
22781 CFI_ENDPROC
22782 -END(coprocessor_error)
22783 +ENDPROC(coprocessor_error)
22784
22785 ENTRY(simd_coprocessor_error)
22786 RING0_INT_FRAME
22787 @@ -821,7 +1060,7 @@ ENTRY(simd_coprocessor_error)
22788 .section .altinstructions,"a"
22789 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22790 .previous
22791 -.section .altinstr_replacement,"ax"
22792 +.section .altinstr_replacement,"a"
22793 663: pushl $do_simd_coprocessor_error
22794 664:
22795 .previous
22796 @@ -830,7 +1069,7 @@ ENTRY(simd_coprocessor_error)
22797 #endif
22798 jmp error_code
22799 CFI_ENDPROC
22800 -END(simd_coprocessor_error)
22801 +ENDPROC(simd_coprocessor_error)
22802
22803 ENTRY(device_not_available)
22804 RING0_INT_FRAME
22805 @@ -839,18 +1078,18 @@ ENTRY(device_not_available)
22806 pushl_cfi $do_device_not_available
22807 jmp error_code
22808 CFI_ENDPROC
22809 -END(device_not_available)
22810 +ENDPROC(device_not_available)
22811
22812 #ifdef CONFIG_PARAVIRT
22813 ENTRY(native_iret)
22814 iret
22815 _ASM_EXTABLE(native_iret, iret_exc)
22816 -END(native_iret)
22817 +ENDPROC(native_iret)
22818
22819 ENTRY(native_irq_enable_sysexit)
22820 sti
22821 sysexit
22822 -END(native_irq_enable_sysexit)
22823 +ENDPROC(native_irq_enable_sysexit)
22824 #endif
22825
22826 ENTRY(overflow)
22827 @@ -860,7 +1099,7 @@ ENTRY(overflow)
22828 pushl_cfi $do_overflow
22829 jmp error_code
22830 CFI_ENDPROC
22831 -END(overflow)
22832 +ENDPROC(overflow)
22833
22834 ENTRY(bounds)
22835 RING0_INT_FRAME
22836 @@ -869,7 +1108,7 @@ ENTRY(bounds)
22837 pushl_cfi $do_bounds
22838 jmp error_code
22839 CFI_ENDPROC
22840 -END(bounds)
22841 +ENDPROC(bounds)
22842
22843 ENTRY(invalid_op)
22844 RING0_INT_FRAME
22845 @@ -878,7 +1117,7 @@ ENTRY(invalid_op)
22846 pushl_cfi $do_invalid_op
22847 jmp error_code
22848 CFI_ENDPROC
22849 -END(invalid_op)
22850 +ENDPROC(invalid_op)
22851
22852 ENTRY(coprocessor_segment_overrun)
22853 RING0_INT_FRAME
22854 @@ -887,7 +1126,7 @@ ENTRY(coprocessor_segment_overrun)
22855 pushl_cfi $do_coprocessor_segment_overrun
22856 jmp error_code
22857 CFI_ENDPROC
22858 -END(coprocessor_segment_overrun)
22859 +ENDPROC(coprocessor_segment_overrun)
22860
22861 ENTRY(invalid_TSS)
22862 RING0_EC_FRAME
22863 @@ -895,7 +1134,7 @@ ENTRY(invalid_TSS)
22864 pushl_cfi $do_invalid_TSS
22865 jmp error_code
22866 CFI_ENDPROC
22867 -END(invalid_TSS)
22868 +ENDPROC(invalid_TSS)
22869
22870 ENTRY(segment_not_present)
22871 RING0_EC_FRAME
22872 @@ -903,7 +1142,7 @@ ENTRY(segment_not_present)
22873 pushl_cfi $do_segment_not_present
22874 jmp error_code
22875 CFI_ENDPROC
22876 -END(segment_not_present)
22877 +ENDPROC(segment_not_present)
22878
22879 ENTRY(stack_segment)
22880 RING0_EC_FRAME
22881 @@ -911,7 +1150,7 @@ ENTRY(stack_segment)
22882 pushl_cfi $do_stack_segment
22883 jmp error_code
22884 CFI_ENDPROC
22885 -END(stack_segment)
22886 +ENDPROC(stack_segment)
22887
22888 ENTRY(alignment_check)
22889 RING0_EC_FRAME
22890 @@ -919,7 +1158,7 @@ ENTRY(alignment_check)
22891 pushl_cfi $do_alignment_check
22892 jmp error_code
22893 CFI_ENDPROC
22894 -END(alignment_check)
22895 +ENDPROC(alignment_check)
22896
22897 ENTRY(divide_error)
22898 RING0_INT_FRAME
22899 @@ -928,7 +1167,7 @@ ENTRY(divide_error)
22900 pushl_cfi $do_divide_error
22901 jmp error_code
22902 CFI_ENDPROC
22903 -END(divide_error)
22904 +ENDPROC(divide_error)
22905
22906 #ifdef CONFIG_X86_MCE
22907 ENTRY(machine_check)
22908 @@ -938,7 +1177,7 @@ ENTRY(machine_check)
22909 pushl_cfi machine_check_vector
22910 jmp error_code
22911 CFI_ENDPROC
22912 -END(machine_check)
22913 +ENDPROC(machine_check)
22914 #endif
22915
22916 ENTRY(spurious_interrupt_bug)
22917 @@ -948,7 +1187,7 @@ ENTRY(spurious_interrupt_bug)
22918 pushl_cfi $do_spurious_interrupt_bug
22919 jmp error_code
22920 CFI_ENDPROC
22921 -END(spurious_interrupt_bug)
22922 +ENDPROC(spurious_interrupt_bug)
22923
22924 #ifdef CONFIG_XEN
22925 /* Xen doesn't set %esp to be precisely what the normal sysenter
22926 @@ -1054,7 +1293,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22927
22928 ENTRY(mcount)
22929 ret
22930 -END(mcount)
22931 +ENDPROC(mcount)
22932
22933 ENTRY(ftrace_caller)
22934 pushl %eax
22935 @@ -1084,7 +1323,7 @@ ftrace_graph_call:
22936 .globl ftrace_stub
22937 ftrace_stub:
22938 ret
22939 -END(ftrace_caller)
22940 +ENDPROC(ftrace_caller)
22941
22942 ENTRY(ftrace_regs_caller)
22943 pushf /* push flags before compare (in cs location) */
22944 @@ -1182,7 +1421,7 @@ trace:
22945 popl %ecx
22946 popl %eax
22947 jmp ftrace_stub
22948 -END(mcount)
22949 +ENDPROC(mcount)
22950 #endif /* CONFIG_DYNAMIC_FTRACE */
22951 #endif /* CONFIG_FUNCTION_TRACER */
22952
22953 @@ -1200,7 +1439,7 @@ ENTRY(ftrace_graph_caller)
22954 popl %ecx
22955 popl %eax
22956 ret
22957 -END(ftrace_graph_caller)
22958 +ENDPROC(ftrace_graph_caller)
22959
22960 .globl return_to_handler
22961 return_to_handler:
22962 @@ -1261,15 +1500,18 @@ error_code:
22963 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22964 REG_TO_PTGS %ecx
22965 SET_KERNEL_GS %ecx
22966 - movl $(__USER_DS), %ecx
22967 + movl $(__KERNEL_DS), %ecx
22968 movl %ecx, %ds
22969 movl %ecx, %es
22970 +
22971 + pax_enter_kernel
22972 +
22973 TRACE_IRQS_OFF
22974 movl %esp,%eax # pt_regs pointer
22975 call *%edi
22976 jmp ret_from_exception
22977 CFI_ENDPROC
22978 -END(page_fault)
22979 +ENDPROC(page_fault)
22980
22981 /*
22982 * Debug traps and NMI can happen at the one SYSENTER instruction
22983 @@ -1312,7 +1554,7 @@ debug_stack_correct:
22984 call do_debug
22985 jmp ret_from_exception
22986 CFI_ENDPROC
22987 -END(debug)
22988 +ENDPROC(debug)
22989
22990 /*
22991 * NMI is doubly nasty. It can happen _while_ we're handling
22992 @@ -1352,6 +1594,9 @@ nmi_stack_correct:
22993 xorl %edx,%edx # zero error code
22994 movl %esp,%eax # pt_regs pointer
22995 call do_nmi
22996 +
22997 + pax_exit_kernel
22998 +
22999 jmp restore_all_notrace
23000 CFI_ENDPROC
23001
23002 @@ -1389,13 +1634,16 @@ nmi_espfix_stack:
23003 FIXUP_ESPFIX_STACK # %eax == %esp
23004 xorl %edx,%edx # zero error code
23005 call do_nmi
23006 +
23007 + pax_exit_kernel
23008 +
23009 RESTORE_REGS
23010 lss 12+4(%esp), %esp # back to espfix stack
23011 CFI_ADJUST_CFA_OFFSET -24
23012 jmp irq_return
23013 #endif
23014 CFI_ENDPROC
23015 -END(nmi)
23016 +ENDPROC(nmi)
23017
23018 ENTRY(int3)
23019 RING0_INT_FRAME
23020 @@ -1408,14 +1656,14 @@ ENTRY(int3)
23021 call do_int3
23022 jmp ret_from_exception
23023 CFI_ENDPROC
23024 -END(int3)
23025 +ENDPROC(int3)
23026
23027 ENTRY(general_protection)
23028 RING0_EC_FRAME
23029 pushl_cfi $do_general_protection
23030 jmp error_code
23031 CFI_ENDPROC
23032 -END(general_protection)
23033 +ENDPROC(general_protection)
23034
23035 #ifdef CONFIG_KVM_GUEST
23036 ENTRY(async_page_fault)
23037 @@ -1424,6 +1672,6 @@ ENTRY(async_page_fault)
23038 pushl_cfi $do_async_page_fault
23039 jmp error_code
23040 CFI_ENDPROC
23041 -END(async_page_fault)
23042 +ENDPROC(async_page_fault)
23043 #endif
23044
23045 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23046 index c0226ab..96a8ab7 100644
23047 --- a/arch/x86/kernel/entry_64.S
23048 +++ b/arch/x86/kernel/entry_64.S
23049 @@ -59,6 +59,8 @@
23050 #include <asm/smap.h>
23051 #include <asm/pgtable_types.h>
23052 #include <linux/err.h>
23053 +#include <asm/pgtable.h>
23054 +#include <asm/alternative-asm.h>
23055
23056 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23057 #include <linux/elf-em.h>
23058 @@ -81,6 +83,430 @@ ENTRY(native_usergs_sysret64)
23059 ENDPROC(native_usergs_sysret64)
23060 #endif /* CONFIG_PARAVIRT */
23061
23062 + .macro ljmpq sel, off
23063 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23064 + .byte 0x48; ljmp *1234f(%rip)
23065 + .pushsection .rodata
23066 + .align 16
23067 + 1234: .quad \off; .word \sel
23068 + .popsection
23069 +#else
23070 + pushq $\sel
23071 + pushq $\off
23072 + lretq
23073 +#endif
23074 + .endm
23075 +
23076 + .macro pax_enter_kernel
23077 + pax_set_fptr_mask
23078 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23079 + call pax_enter_kernel
23080 +#endif
23081 + .endm
23082 +
23083 + .macro pax_exit_kernel
23084 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23085 + call pax_exit_kernel
23086 +#endif
23087 +
23088 + .endm
23089 +
23090 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23091 +ENTRY(pax_enter_kernel)
23092 + pushq %rdi
23093 +
23094 +#ifdef CONFIG_PARAVIRT
23095 + PV_SAVE_REGS(CLBR_RDI)
23096 +#endif
23097 +
23098 +#ifdef CONFIG_PAX_KERNEXEC
23099 + GET_CR0_INTO_RDI
23100 + bts $16,%rdi
23101 + jnc 3f
23102 + mov %cs,%edi
23103 + cmp $__KERNEL_CS,%edi
23104 + jnz 2f
23105 +1:
23106 +#endif
23107 +
23108 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23109 + 661: jmp 111f
23110 + .pushsection .altinstr_replacement, "a"
23111 + 662: ASM_NOP2
23112 + .popsection
23113 + .pushsection .altinstructions, "a"
23114 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23115 + .popsection
23116 + GET_CR3_INTO_RDI
23117 + cmp $0,%dil
23118 + jnz 112f
23119 + mov $__KERNEL_DS,%edi
23120 + mov %edi,%ss
23121 + jmp 111f
23122 +112: cmp $1,%dil
23123 + jz 113f
23124 + ud2
23125 +113: sub $4097,%rdi
23126 + bts $63,%rdi
23127 + SET_RDI_INTO_CR3
23128 + mov $__UDEREF_KERNEL_DS,%edi
23129 + mov %edi,%ss
23130 +111:
23131 +#endif
23132 +
23133 +#ifdef CONFIG_PARAVIRT
23134 + PV_RESTORE_REGS(CLBR_RDI)
23135 +#endif
23136 +
23137 + popq %rdi
23138 + pax_force_retaddr
23139 + retq
23140 +
23141 +#ifdef CONFIG_PAX_KERNEXEC
23142 +2: ljmpq __KERNEL_CS,1b
23143 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
23144 +4: SET_RDI_INTO_CR0
23145 + jmp 1b
23146 +#endif
23147 +ENDPROC(pax_enter_kernel)
23148 +
23149 +ENTRY(pax_exit_kernel)
23150 + pushq %rdi
23151 +
23152 +#ifdef CONFIG_PARAVIRT
23153 + PV_SAVE_REGS(CLBR_RDI)
23154 +#endif
23155 +
23156 +#ifdef CONFIG_PAX_KERNEXEC
23157 + mov %cs,%rdi
23158 + cmp $__KERNEXEC_KERNEL_CS,%edi
23159 + jz 2f
23160 + GET_CR0_INTO_RDI
23161 + bts $16,%rdi
23162 + jnc 4f
23163 +1:
23164 +#endif
23165 +
23166 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23167 + 661: jmp 111f
23168 + .pushsection .altinstr_replacement, "a"
23169 + 662: ASM_NOP2
23170 + .popsection
23171 + .pushsection .altinstructions, "a"
23172 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23173 + .popsection
23174 + mov %ss,%edi
23175 + cmp $__UDEREF_KERNEL_DS,%edi
23176 + jnz 111f
23177 + GET_CR3_INTO_RDI
23178 + cmp $0,%dil
23179 + jz 112f
23180 + ud2
23181 +112: add $4097,%rdi
23182 + bts $63,%rdi
23183 + SET_RDI_INTO_CR3
23184 + mov $__KERNEL_DS,%edi
23185 + mov %edi,%ss
23186 +111:
23187 +#endif
23188 +
23189 +#ifdef CONFIG_PARAVIRT
23190 + PV_RESTORE_REGS(CLBR_RDI);
23191 +#endif
23192 +
23193 + popq %rdi
23194 + pax_force_retaddr
23195 + retq
23196 +
23197 +#ifdef CONFIG_PAX_KERNEXEC
23198 +2: GET_CR0_INTO_RDI
23199 + btr $16,%rdi
23200 + jnc 4f
23201 + ljmpq __KERNEL_CS,3f
23202 +3: SET_RDI_INTO_CR0
23203 + jmp 1b
23204 +4: ud2
23205 + jmp 4b
23206 +#endif
23207 +ENDPROC(pax_exit_kernel)
23208 +#endif
23209 +
23210 + .macro pax_enter_kernel_user
23211 + pax_set_fptr_mask
23212 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23213 + call pax_enter_kernel_user
23214 +#endif
23215 + .endm
23216 +
23217 + .macro pax_exit_kernel_user
23218 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23219 + call pax_exit_kernel_user
23220 +#endif
23221 +#ifdef CONFIG_PAX_RANDKSTACK
23222 + pushq %rax
23223 + pushq %r11
23224 + call pax_randomize_kstack
23225 + popq %r11
23226 + popq %rax
23227 +#endif
23228 + .endm
23229 +
23230 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23231 +ENTRY(pax_enter_kernel_user)
23232 + pushq %rdi
23233 + pushq %rbx
23234 +
23235 +#ifdef CONFIG_PARAVIRT
23236 + PV_SAVE_REGS(CLBR_RDI)
23237 +#endif
23238 +
23239 + 661: jmp 111f
23240 + .pushsection .altinstr_replacement, "a"
23241 + 662: ASM_NOP2
23242 + .popsection
23243 + .pushsection .altinstructions, "a"
23244 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23245 + .popsection
23246 + GET_CR3_INTO_RDI
23247 + cmp $1,%dil
23248 + jnz 4f
23249 + sub $4097,%rdi
23250 + bts $63,%rdi
23251 + SET_RDI_INTO_CR3
23252 + jmp 3f
23253 +111:
23254 +
23255 + GET_CR3_INTO_RDI
23256 + mov %rdi,%rbx
23257 + add $__START_KERNEL_map,%rbx
23258 + sub phys_base(%rip),%rbx
23259 +
23260 +#ifdef CONFIG_PARAVIRT
23261 + cmpl $0, pv_info+PARAVIRT_enabled
23262 + jz 1f
23263 + pushq %rdi
23264 + i = 0
23265 + .rept USER_PGD_PTRS
23266 + mov i*8(%rbx),%rsi
23267 + mov $0,%sil
23268 + lea i*8(%rbx),%rdi
23269 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23270 + i = i + 1
23271 + .endr
23272 + popq %rdi
23273 + jmp 2f
23274 +1:
23275 +#endif
23276 +
23277 + i = 0
23278 + .rept USER_PGD_PTRS
23279 + movb $0,i*8(%rbx)
23280 + i = i + 1
23281 + .endr
23282 +
23283 +2: SET_RDI_INTO_CR3
23284 +
23285 +#ifdef CONFIG_PAX_KERNEXEC
23286 + GET_CR0_INTO_RDI
23287 + bts $16,%rdi
23288 + SET_RDI_INTO_CR0
23289 +#endif
23290 +
23291 +3:
23292 +
23293 +#ifdef CONFIG_PARAVIRT
23294 + PV_RESTORE_REGS(CLBR_RDI)
23295 +#endif
23296 +
23297 + popq %rbx
23298 + popq %rdi
23299 + pax_force_retaddr
23300 + retq
23301 +4: ud2
23302 +ENDPROC(pax_enter_kernel_user)
23303 +
23304 +ENTRY(pax_exit_kernel_user)
23305 + pushq %rdi
23306 + pushq %rbx
23307 +
23308 +#ifdef CONFIG_PARAVIRT
23309 + PV_SAVE_REGS(CLBR_RDI)
23310 +#endif
23311 +
23312 + GET_CR3_INTO_RDI
23313 + 661: jmp 1f
23314 + .pushsection .altinstr_replacement, "a"
23315 + 662: ASM_NOP2
23316 + .popsection
23317 + .pushsection .altinstructions, "a"
23318 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23319 + .popsection
23320 + cmp $0,%dil
23321 + jnz 3f
23322 + add $4097,%rdi
23323 + bts $63,%rdi
23324 + SET_RDI_INTO_CR3
23325 + jmp 2f
23326 +1:
23327 +
23328 + mov %rdi,%rbx
23329 +
23330 +#ifdef CONFIG_PAX_KERNEXEC
23331 + GET_CR0_INTO_RDI
23332 + btr $16,%rdi
23333 + jnc 3f
23334 + SET_RDI_INTO_CR0
23335 +#endif
23336 +
23337 + add $__START_KERNEL_map,%rbx
23338 + sub phys_base(%rip),%rbx
23339 +
23340 +#ifdef CONFIG_PARAVIRT
23341 + cmpl $0, pv_info+PARAVIRT_enabled
23342 + jz 1f
23343 + i = 0
23344 + .rept USER_PGD_PTRS
23345 + mov i*8(%rbx),%rsi
23346 + mov $0x67,%sil
23347 + lea i*8(%rbx),%rdi
23348 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23349 + i = i + 1
23350 + .endr
23351 + jmp 2f
23352 +1:
23353 +#endif
23354 +
23355 + i = 0
23356 + .rept USER_PGD_PTRS
23357 + movb $0x67,i*8(%rbx)
23358 + i = i + 1
23359 + .endr
23360 +2:
23361 +
23362 +#ifdef CONFIG_PARAVIRT
23363 + PV_RESTORE_REGS(CLBR_RDI)
23364 +#endif
23365 +
23366 + popq %rbx
23367 + popq %rdi
23368 + pax_force_retaddr
23369 + retq
23370 +3: ud2
23371 +ENDPROC(pax_exit_kernel_user)
23372 +#endif
23373 +
23374 + .macro pax_enter_kernel_nmi
23375 + pax_set_fptr_mask
23376 +
23377 +#ifdef CONFIG_PAX_KERNEXEC
23378 + GET_CR0_INTO_RDI
23379 + bts $16,%rdi
23380 + jc 110f
23381 + SET_RDI_INTO_CR0
23382 + or $2,%ebx
23383 +110:
23384 +#endif
23385 +
23386 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23387 + 661: jmp 111f
23388 + .pushsection .altinstr_replacement, "a"
23389 + 662: ASM_NOP2
23390 + .popsection
23391 + .pushsection .altinstructions, "a"
23392 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23393 + .popsection
23394 + GET_CR3_INTO_RDI
23395 + cmp $0,%dil
23396 + jz 111f
23397 + sub $4097,%rdi
23398 + or $4,%ebx
23399 + bts $63,%rdi
23400 + SET_RDI_INTO_CR3
23401 + mov $__UDEREF_KERNEL_DS,%edi
23402 + mov %edi,%ss
23403 +111:
23404 +#endif
23405 + .endm
23406 +
23407 + .macro pax_exit_kernel_nmi
23408 +#ifdef CONFIG_PAX_KERNEXEC
23409 + btr $1,%ebx
23410 + jnc 110f
23411 + GET_CR0_INTO_RDI
23412 + btr $16,%rdi
23413 + SET_RDI_INTO_CR0
23414 +110:
23415 +#endif
23416 +
23417 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23418 + btr $2,%ebx
23419 + jnc 111f
23420 + GET_CR3_INTO_RDI
23421 + add $4097,%rdi
23422 + bts $63,%rdi
23423 + SET_RDI_INTO_CR3
23424 + mov $__KERNEL_DS,%edi
23425 + mov %edi,%ss
23426 +111:
23427 +#endif
23428 + .endm
23429 +
23430 + .macro pax_erase_kstack
23431 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23432 + call pax_erase_kstack
23433 +#endif
23434 + .endm
23435 +
23436 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23437 +ENTRY(pax_erase_kstack)
23438 + pushq %rdi
23439 + pushq %rcx
23440 + pushq %rax
23441 + pushq %r11
23442 +
23443 + GET_THREAD_INFO(%r11)
23444 + mov TI_lowest_stack(%r11), %rdi
23445 + mov $-0xBEEF, %rax
23446 + std
23447 +
23448 +1: mov %edi, %ecx
23449 + and $THREAD_SIZE_asm - 1, %ecx
23450 + shr $3, %ecx
23451 + repne scasq
23452 + jecxz 2f
23453 +
23454 + cmp $2*8, %ecx
23455 + jc 2f
23456 +
23457 + mov $2*8, %ecx
23458 + repe scasq
23459 + jecxz 2f
23460 + jne 1b
23461 +
23462 +2: cld
23463 + mov %esp, %ecx
23464 + sub %edi, %ecx
23465 +
23466 + cmp $THREAD_SIZE_asm, %rcx
23467 + jb 3f
23468 + ud2
23469 +3:
23470 +
23471 + shr $3, %ecx
23472 + rep stosq
23473 +
23474 + mov TI_task_thread_sp0(%r11), %rdi
23475 + sub $256, %rdi
23476 + mov %rdi, TI_lowest_stack(%r11)
23477 +
23478 + popq %r11
23479 + popq %rax
23480 + popq %rcx
23481 + popq %rdi
23482 + pax_force_retaddr
23483 + ret
23484 +ENDPROC(pax_erase_kstack)
23485 +#endif
23486
23487 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23488 #ifdef CONFIG_TRACE_IRQFLAGS
23489 @@ -117,7 +543,7 @@ ENDPROC(native_usergs_sysret64)
23490 .endm
23491
23492 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23493 - bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23494 + bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23495 jnc 1f
23496 TRACE_IRQS_ON_DEBUG
23497 1:
23498 @@ -155,27 +581,6 @@ ENDPROC(native_usergs_sysret64)
23499 movq \tmp,R11+\offset(%rsp)
23500 .endm
23501
23502 - .macro FAKE_STACK_FRAME child_rip
23503 - /* push in order ss, rsp, eflags, cs, rip */
23504 - xorl %eax, %eax
23505 - pushq_cfi $__KERNEL_DS /* ss */
23506 - /*CFI_REL_OFFSET ss,0*/
23507 - pushq_cfi %rax /* rsp */
23508 - CFI_REL_OFFSET rsp,0
23509 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23510 - /*CFI_REL_OFFSET rflags,0*/
23511 - pushq_cfi $__KERNEL_CS /* cs */
23512 - /*CFI_REL_OFFSET cs,0*/
23513 - pushq_cfi \child_rip /* rip */
23514 - CFI_REL_OFFSET rip,0
23515 - pushq_cfi %rax /* orig rax */
23516 - .endm
23517 -
23518 - .macro UNFAKE_STACK_FRAME
23519 - addq $8*6, %rsp
23520 - CFI_ADJUST_CFA_OFFSET -(6*8)
23521 - .endm
23522 -
23523 /*
23524 * initial frame state for interrupts (and exceptions without error code)
23525 */
23526 @@ -241,25 +646,26 @@ ENDPROC(native_usergs_sysret64)
23527 /* save partial stack frame */
23528 .macro SAVE_ARGS_IRQ
23529 cld
23530 - /* start from rbp in pt_regs and jump over */
23531 - movq_cfi rdi, (RDI-RBP)
23532 - movq_cfi rsi, (RSI-RBP)
23533 - movq_cfi rdx, (RDX-RBP)
23534 - movq_cfi rcx, (RCX-RBP)
23535 - movq_cfi rax, (RAX-RBP)
23536 - movq_cfi r8, (R8-RBP)
23537 - movq_cfi r9, (R9-RBP)
23538 - movq_cfi r10, (R10-RBP)
23539 - movq_cfi r11, (R11-RBP)
23540 + /* start from r15 in pt_regs and jump over */
23541 + movq_cfi rdi, RDI
23542 + movq_cfi rsi, RSI
23543 + movq_cfi rdx, RDX
23544 + movq_cfi rcx, RCX
23545 + movq_cfi rax, RAX
23546 + movq_cfi r8, R8
23547 + movq_cfi r9, R9
23548 + movq_cfi r10, R10
23549 + movq_cfi r11, R11
23550 + movq_cfi r12, R12
23551
23552 /* Save rbp so that we can unwind from get_irq_regs() */
23553 - movq_cfi rbp, 0
23554 + movq_cfi rbp, RBP
23555
23556 /* Save previous stack value */
23557 movq %rsp, %rsi
23558
23559 - leaq -RBP(%rsp),%rdi /* arg1 for handler */
23560 - testl $3, CS-RBP(%rsi)
23561 + movq %rsp,%rdi /* arg1 for handler */
23562 + testb $3, CS(%rsi)
23563 je 1f
23564 SWAPGS
23565 /*
23566 @@ -279,6 +685,18 @@ ENDPROC(native_usergs_sysret64)
23567 0x06 /* DW_OP_deref */, \
23568 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23569 0x22 /* DW_OP_plus */
23570 +
23571 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23572 + testb $3, CS(%rdi)
23573 + jnz 1f
23574 + pax_enter_kernel
23575 + jmp 2f
23576 +1: pax_enter_kernel_user
23577 +2:
23578 +#else
23579 + pax_enter_kernel
23580 +#endif
23581 +
23582 /* We entered an interrupt context - irqs are off: */
23583 TRACE_IRQS_OFF
23584 .endm
23585 @@ -308,9 +726,52 @@ ENTRY(save_paranoid)
23586 js 1f /* negative -> in kernel */
23587 SWAPGS
23588 xorl %ebx,%ebx
23589 -1: ret
23590 +1:
23591 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23592 + testb $3, CS+8(%rsp)
23593 + jnz 1f
23594 + pax_enter_kernel
23595 + jmp 2f
23596 +1: pax_enter_kernel_user
23597 +2:
23598 +#else
23599 + pax_enter_kernel
23600 +#endif
23601 + pax_force_retaddr
23602 + ret
23603 CFI_ENDPROC
23604 -END(save_paranoid)
23605 +ENDPROC(save_paranoid)
23606 +
23607 +ENTRY(save_paranoid_nmi)
23608 + XCPT_FRAME 1 RDI+8
23609 + cld
23610 + movq_cfi rdi, RDI+8
23611 + movq_cfi rsi, RSI+8
23612 + movq_cfi rdx, RDX+8
23613 + movq_cfi rcx, RCX+8
23614 + movq_cfi rax, RAX+8
23615 + movq_cfi r8, R8+8
23616 + movq_cfi r9, R9+8
23617 + movq_cfi r10, R10+8
23618 + movq_cfi r11, R11+8
23619 + movq_cfi rbx, RBX+8
23620 + movq_cfi rbp, RBP+8
23621 + movq_cfi r12, R12+8
23622 + movq_cfi r13, R13+8
23623 + movq_cfi r14, R14+8
23624 + movq_cfi r15, R15+8
23625 + movl $1,%ebx
23626 + movl $MSR_GS_BASE,%ecx
23627 + rdmsr
23628 + testl %edx,%edx
23629 + js 1f /* negative -> in kernel */
23630 + SWAPGS
23631 + xorl %ebx,%ebx
23632 +1: pax_enter_kernel_nmi
23633 + pax_force_retaddr
23634 + ret
23635 + CFI_ENDPROC
23636 +ENDPROC(save_paranoid_nmi)
23637
23638 /*
23639 * A newly forked process directly context switches into this address.
23640 @@ -331,7 +792,7 @@ ENTRY(ret_from_fork)
23641
23642 RESTORE_REST
23643
23644 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23645 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23646 jz 1f
23647
23648 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23649 @@ -341,15 +802,13 @@ ENTRY(ret_from_fork)
23650 jmp ret_from_sys_call # go to the SYSRET fastpath
23651
23652 1:
23653 - subq $REST_SKIP, %rsp # leave space for volatiles
23654 - CFI_ADJUST_CFA_OFFSET REST_SKIP
23655 movq %rbp, %rdi
23656 call *%rbx
23657 movl $0, RAX(%rsp)
23658 RESTORE_REST
23659 jmp int_ret_from_sys_call
23660 CFI_ENDPROC
23661 -END(ret_from_fork)
23662 +ENDPROC(ret_from_fork)
23663
23664 /*
23665 * System call entry. Up to 6 arguments in registers are supported.
23666 @@ -386,7 +845,7 @@ END(ret_from_fork)
23667 ENTRY(system_call)
23668 CFI_STARTPROC simple
23669 CFI_SIGNAL_FRAME
23670 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23671 + CFI_DEF_CFA rsp,0
23672 CFI_REGISTER rip,rcx
23673 /*CFI_REGISTER rflags,r11*/
23674 SWAPGS_UNSAFE_STACK
23675 @@ -399,16 +858,23 @@ GLOBAL(system_call_after_swapgs)
23676
23677 movq %rsp,PER_CPU_VAR(old_rsp)
23678 movq PER_CPU_VAR(kernel_stack),%rsp
23679 + SAVE_ARGS 8*6, 0, rax_enosys=1
23680 + pax_enter_kernel_user
23681 +
23682 +#ifdef CONFIG_PAX_RANDKSTACK
23683 + pax_erase_kstack
23684 +#endif
23685 +
23686 /*
23687 * No need to follow this irqs off/on section - it's straight
23688 * and short:
23689 */
23690 ENABLE_INTERRUPTS(CLBR_NONE)
23691 - SAVE_ARGS 8, 0, rax_enosys=1
23692 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23693 movq %rcx,RIP-ARGOFFSET(%rsp)
23694 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23695 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23696 + GET_THREAD_INFO(%rcx)
23697 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23698 jnz tracesys
23699 system_call_fastpath:
23700 #if __SYSCALL_MASK == ~0
23701 @@ -432,10 +898,13 @@ sysret_check:
23702 LOCKDEP_SYS_EXIT
23703 DISABLE_INTERRUPTS(CLBR_NONE)
23704 TRACE_IRQS_OFF
23705 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23706 + GET_THREAD_INFO(%rcx)
23707 + movl TI_flags(%rcx),%edx
23708 andl %edi,%edx
23709 jnz sysret_careful
23710 CFI_REMEMBER_STATE
23711 + pax_exit_kernel_user
23712 + pax_erase_kstack
23713 /*
23714 * sysretq will re-enable interrupts:
23715 */
23716 @@ -494,12 +963,15 @@ sysret_audit:
23717
23718 /* Do syscall tracing */
23719 tracesys:
23720 - leaq -REST_SKIP(%rsp), %rdi
23721 + movq %rsp, %rdi
23722 movq $AUDIT_ARCH_X86_64, %rsi
23723 call syscall_trace_enter_phase1
23724 test %rax, %rax
23725 jnz tracesys_phase2 /* if needed, run the slow path */
23726 - LOAD_ARGS 0 /* else restore clobbered regs */
23727 +
23728 + pax_erase_kstack
23729 +
23730 + LOAD_ARGS /* else restore clobbered regs */
23731 jmp system_call_fastpath /* and return to the fast path */
23732
23733 tracesys_phase2:
23734 @@ -510,12 +982,14 @@ tracesys_phase2:
23735 movq %rax,%rdx
23736 call syscall_trace_enter_phase2
23737
23738 + pax_erase_kstack
23739 +
23740 /*
23741 * Reload arg registers from stack in case ptrace changed them.
23742 * We don't reload %rax because syscall_trace_entry_phase2() returned
23743 * the value it wants us to use in the table lookup.
23744 */
23745 - LOAD_ARGS ARGOFFSET, 1
23746 + LOAD_ARGS 1
23747 RESTORE_REST
23748 #if __SYSCALL_MASK == ~0
23749 cmpq $__NR_syscall_max,%rax
23750 @@ -545,7 +1019,9 @@ GLOBAL(int_with_check)
23751 andl %edi,%edx
23752 jnz int_careful
23753 andl $~TS_COMPAT,TI_status(%rcx)
23754 - jmp retint_swapgs
23755 + pax_exit_kernel_user
23756 + pax_erase_kstack
23757 + jmp retint_swapgs_pax
23758
23759 /* Either reschedule or signal or syscall exit tracking needed. */
23760 /* First do a reschedule test. */
23761 @@ -591,7 +1067,7 @@ int_restore_rest:
23762 TRACE_IRQS_OFF
23763 jmp int_with_check
23764 CFI_ENDPROC
23765 -END(system_call)
23766 +ENDPROC(system_call)
23767
23768 .macro FORK_LIKE func
23769 ENTRY(stub_\func)
23770 @@ -604,9 +1080,10 @@ ENTRY(stub_\func)
23771 DEFAULT_FRAME 0 8 /* offset 8: return address */
23772 call sys_\func
23773 RESTORE_TOP_OF_STACK %r11, 8
23774 - ret $REST_SKIP /* pop extended registers */
23775 + pax_force_retaddr
23776 + ret
23777 CFI_ENDPROC
23778 -END(stub_\func)
23779 +ENDPROC(stub_\func)
23780 .endm
23781
23782 .macro FIXED_FRAME label,func
23783 @@ -616,9 +1093,10 @@ ENTRY(\label)
23784 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23785 call \func
23786 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23787 + pax_force_retaddr
23788 ret
23789 CFI_ENDPROC
23790 -END(\label)
23791 +ENDPROC(\label)
23792 .endm
23793
23794 FORK_LIKE clone
23795 @@ -626,19 +1104,6 @@ END(\label)
23796 FORK_LIKE vfork
23797 FIXED_FRAME stub_iopl, sys_iopl
23798
23799 -ENTRY(ptregscall_common)
23800 - DEFAULT_FRAME 1 8 /* offset 8: return address */
23801 - RESTORE_TOP_OF_STACK %r11, 8
23802 - movq_cfi_restore R15+8, r15
23803 - movq_cfi_restore R14+8, r14
23804 - movq_cfi_restore R13+8, r13
23805 - movq_cfi_restore R12+8, r12
23806 - movq_cfi_restore RBP+8, rbp
23807 - movq_cfi_restore RBX+8, rbx
23808 - ret $REST_SKIP /* pop extended registers */
23809 - CFI_ENDPROC
23810 -END(ptregscall_common)
23811 -
23812 ENTRY(stub_execve)
23813 CFI_STARTPROC
23814 addq $8, %rsp
23815 @@ -650,7 +1115,7 @@ ENTRY(stub_execve)
23816 RESTORE_REST
23817 jmp int_ret_from_sys_call
23818 CFI_ENDPROC
23819 -END(stub_execve)
23820 +ENDPROC(stub_execve)
23821
23822 /*
23823 * sigreturn is special because it needs to restore all registers on return.
23824 @@ -667,7 +1132,7 @@ ENTRY(stub_rt_sigreturn)
23825 RESTORE_REST
23826 jmp int_ret_from_sys_call
23827 CFI_ENDPROC
23828 -END(stub_rt_sigreturn)
23829 +ENDPROC(stub_rt_sigreturn)
23830
23831 #ifdef CONFIG_X86_X32_ABI
23832 ENTRY(stub_x32_rt_sigreturn)
23833 @@ -681,7 +1146,7 @@ ENTRY(stub_x32_rt_sigreturn)
23834 RESTORE_REST
23835 jmp int_ret_from_sys_call
23836 CFI_ENDPROC
23837 -END(stub_x32_rt_sigreturn)
23838 +ENDPROC(stub_x32_rt_sigreturn)
23839
23840 ENTRY(stub_x32_execve)
23841 CFI_STARTPROC
23842 @@ -695,7 +1160,7 @@ ENTRY(stub_x32_execve)
23843 RESTORE_REST
23844 jmp int_ret_from_sys_call
23845 CFI_ENDPROC
23846 -END(stub_x32_execve)
23847 +ENDPROC(stub_x32_execve)
23848
23849 #endif
23850
23851 @@ -732,7 +1197,7 @@ vector=vector+1
23852 2: jmp common_interrupt
23853 .endr
23854 CFI_ENDPROC
23855 -END(irq_entries_start)
23856 +ENDPROC(irq_entries_start)
23857
23858 .previous
23859 END(interrupt)
23860 @@ -749,8 +1214,8 @@ END(interrupt)
23861 /* 0(%rsp): ~(interrupt number) */
23862 .macro interrupt func
23863 /* reserve pt_regs for scratch regs and rbp */
23864 - subq $ORIG_RAX-RBP, %rsp
23865 - CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23866 + subq $ORIG_RAX, %rsp
23867 + CFI_ADJUST_CFA_OFFSET ORIG_RAX
23868 SAVE_ARGS_IRQ
23869 call \func
23870 .endm
23871 @@ -773,14 +1238,14 @@ ret_from_intr:
23872
23873 /* Restore saved previous stack */
23874 popq %rsi
23875 - CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23876 - leaq ARGOFFSET-RBP(%rsi), %rsp
23877 + CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23878 + movq %rsi, %rsp
23879 CFI_DEF_CFA_REGISTER rsp
23880 - CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23881 + CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23882
23883 exit_intr:
23884 GET_THREAD_INFO(%rcx)
23885 - testl $3,CS-ARGOFFSET(%rsp)
23886 + testb $3,CS-ARGOFFSET(%rsp)
23887 je retint_kernel
23888
23889 /* Interrupt came from user space */
23890 @@ -802,12 +1267,35 @@ retint_swapgs: /* return to user-space */
23891 * The iretq could re-enable interrupts:
23892 */
23893 DISABLE_INTERRUPTS(CLBR_ANY)
23894 + pax_exit_kernel_user
23895 +retint_swapgs_pax:
23896 TRACE_IRQS_IRETQ
23897 SWAPGS
23898 jmp restore_args
23899
23900 retint_restore_args: /* return to kernel space */
23901 DISABLE_INTERRUPTS(CLBR_ANY)
23902 + pax_exit_kernel
23903 +
23904 +#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23905 + /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23906 + * namely calling EFI runtime services with a phys mapping. We're
23907 + * starting off with NOPs and patch in the real instrumentation
23908 + * (BTS/OR) before starting any userland process; even before starting
23909 + * up the APs.
23910 + */
23911 + .pushsection .altinstr_replacement, "a"
23912 + 601: pax_force_retaddr (RIP-ARGOFFSET)
23913 + 602:
23914 + .popsection
23915 + 603: .fill 602b-601b, 1, 0x90
23916 + .pushsection .altinstructions, "a"
23917 + altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23918 + .popsection
23919 +#else
23920 + pax_force_retaddr (RIP-ARGOFFSET)
23921 +#endif
23922 +
23923 /*
23924 * The iretq could re-enable interrupts:
23925 */
23926 @@ -845,15 +1333,15 @@ native_irq_return_ldt:
23927 SWAPGS
23928 movq PER_CPU_VAR(espfix_waddr),%rdi
23929 movq %rax,(0*8)(%rdi) /* RAX */
23930 - movq (2*8)(%rsp),%rax /* RIP */
23931 + movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23932 movq %rax,(1*8)(%rdi)
23933 - movq (3*8)(%rsp),%rax /* CS */
23934 + movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23935 movq %rax,(2*8)(%rdi)
23936 - movq (4*8)(%rsp),%rax /* RFLAGS */
23937 + movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23938 movq %rax,(3*8)(%rdi)
23939 - movq (6*8)(%rsp),%rax /* SS */
23940 + movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23941 movq %rax,(5*8)(%rdi)
23942 - movq (5*8)(%rsp),%rax /* RSP */
23943 + movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23944 movq %rax,(4*8)(%rdi)
23945 andl $0xffff0000,%eax
23946 popq_cfi %rdi
23947 @@ -907,7 +1395,7 @@ ENTRY(retint_kernel)
23948 jmp exit_intr
23949 #endif
23950 CFI_ENDPROC
23951 -END(common_interrupt)
23952 +ENDPROC(common_interrupt)
23953
23954 /*
23955 * APIC interrupts.
23956 @@ -921,7 +1409,7 @@ ENTRY(\sym)
23957 interrupt \do_sym
23958 jmp ret_from_intr
23959 CFI_ENDPROC
23960 -END(\sym)
23961 +ENDPROC(\sym)
23962 .endm
23963
23964 #ifdef CONFIG_TRACING
23965 @@ -994,7 +1482,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23966 /*
23967 * Exception entry points.
23968 */
23969 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23970 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23971
23972 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23973 ENTRY(\sym)
23974 @@ -1045,6 +1533,12 @@ ENTRY(\sym)
23975 .endif
23976
23977 .if \shift_ist != -1
23978 +#ifdef CONFIG_SMP
23979 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23980 + lea init_tss(%r13), %r13
23981 +#else
23982 + lea init_tss(%rip), %r13
23983 +#endif
23984 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23985 .endif
23986
23987 @@ -1061,7 +1555,7 @@ ENTRY(\sym)
23988 .endif
23989
23990 CFI_ENDPROC
23991 -END(\sym)
23992 +ENDPROC(\sym)
23993 .endm
23994
23995 #ifdef CONFIG_TRACING
23996 @@ -1102,9 +1596,10 @@ gs_change:
23997 2: mfence /* workaround */
23998 SWAPGS
23999 popfq_cfi
24000 + pax_force_retaddr
24001 ret
24002 CFI_ENDPROC
24003 -END(native_load_gs_index)
24004 +ENDPROC(native_load_gs_index)
24005
24006 _ASM_EXTABLE(gs_change,bad_gs)
24007 .section .fixup,"ax"
24008 @@ -1132,9 +1627,10 @@ ENTRY(do_softirq_own_stack)
24009 CFI_DEF_CFA_REGISTER rsp
24010 CFI_ADJUST_CFA_OFFSET -8
24011 decl PER_CPU_VAR(irq_count)
24012 + pax_force_retaddr
24013 ret
24014 CFI_ENDPROC
24015 -END(do_softirq_own_stack)
24016 +ENDPROC(do_softirq_own_stack)
24017
24018 #ifdef CONFIG_XEN
24019 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24020 @@ -1172,7 +1668,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24021 decl PER_CPU_VAR(irq_count)
24022 jmp error_exit
24023 CFI_ENDPROC
24024 -END(xen_do_hypervisor_callback)
24025 +ENDPROC(xen_do_hypervisor_callback)
24026
24027 /*
24028 * Hypervisor uses this for application faults while it executes.
24029 @@ -1231,7 +1727,7 @@ ENTRY(xen_failsafe_callback)
24030 SAVE_ALL
24031 jmp error_exit
24032 CFI_ENDPROC
24033 -END(xen_failsafe_callback)
24034 +ENDPROC(xen_failsafe_callback)
24035
24036 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24037 xen_hvm_callback_vector xen_evtchn_do_upcall
24038 @@ -1278,18 +1774,33 @@ ENTRY(paranoid_exit)
24039 DEFAULT_FRAME
24040 DISABLE_INTERRUPTS(CLBR_NONE)
24041 TRACE_IRQS_OFF_DEBUG
24042 - testl %ebx,%ebx /* swapgs needed? */
24043 + testl $1,%ebx /* swapgs needed? */
24044 jnz paranoid_restore
24045 - testl $3,CS(%rsp)
24046 + testb $3,CS(%rsp)
24047 jnz paranoid_userspace
24048 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24049 + pax_exit_kernel
24050 + TRACE_IRQS_IRETQ 0
24051 + SWAPGS_UNSAFE_STACK
24052 + RESTORE_ALL 8
24053 + pax_force_retaddr_bts
24054 + jmp irq_return
24055 +#endif
24056 paranoid_swapgs:
24057 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24058 + pax_exit_kernel_user
24059 +#else
24060 + pax_exit_kernel
24061 +#endif
24062 TRACE_IRQS_IRETQ 0
24063 SWAPGS_UNSAFE_STACK
24064 RESTORE_ALL 8
24065 jmp irq_return
24066 paranoid_restore:
24067 + pax_exit_kernel
24068 TRACE_IRQS_IRETQ_DEBUG 0
24069 RESTORE_ALL 8
24070 + pax_force_retaddr_bts
24071 jmp irq_return
24072 paranoid_userspace:
24073 GET_THREAD_INFO(%rcx)
24074 @@ -1318,7 +1829,7 @@ paranoid_schedule:
24075 TRACE_IRQS_OFF
24076 jmp paranoid_userspace
24077 CFI_ENDPROC
24078 -END(paranoid_exit)
24079 +ENDPROC(paranoid_exit)
24080
24081 /*
24082 * Exception entry point. This expects an error code/orig_rax on the stack.
24083 @@ -1345,12 +1856,23 @@ ENTRY(error_entry)
24084 movq %r14, R14+8(%rsp)
24085 movq %r15, R15+8(%rsp)
24086 xorl %ebx,%ebx
24087 - testl $3,CS+8(%rsp)
24088 + testb $3,CS+8(%rsp)
24089 je error_kernelspace
24090 error_swapgs:
24091 SWAPGS
24092 error_sti:
24093 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24094 + testb $3, CS+8(%rsp)
24095 + jnz 1f
24096 + pax_enter_kernel
24097 + jmp 2f
24098 +1: pax_enter_kernel_user
24099 +2:
24100 +#else
24101 + pax_enter_kernel
24102 +#endif
24103 TRACE_IRQS_OFF
24104 + pax_force_retaddr
24105 ret
24106
24107 /*
24108 @@ -1385,7 +1907,7 @@ error_bad_iret:
24109 decl %ebx /* Return to usergs */
24110 jmp error_sti
24111 CFI_ENDPROC
24112 -END(error_entry)
24113 +ENDPROC(error_entry)
24114
24115
24116 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24117 @@ -1396,7 +1918,7 @@ ENTRY(error_exit)
24118 DISABLE_INTERRUPTS(CLBR_NONE)
24119 TRACE_IRQS_OFF
24120 GET_THREAD_INFO(%rcx)
24121 - testl %eax,%eax
24122 + testl $1,%eax
24123 jne retint_kernel
24124 LOCKDEP_SYS_EXIT_IRQ
24125 movl TI_flags(%rcx),%edx
24126 @@ -1405,7 +1927,7 @@ ENTRY(error_exit)
24127 jnz retint_careful
24128 jmp retint_swapgs
24129 CFI_ENDPROC
24130 -END(error_exit)
24131 +ENDPROC(error_exit)
24132
24133 /*
24134 * Test if a given stack is an NMI stack or not.
24135 @@ -1463,9 +1985,11 @@ ENTRY(nmi)
24136 * If %cs was not the kernel segment, then the NMI triggered in user
24137 * space, which means it is definitely not nested.
24138 */
24139 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24140 + je 1f
24141 cmpl $__KERNEL_CS, 16(%rsp)
24142 jne first_nmi
24143 -
24144 +1:
24145 /*
24146 * Check the special variable on the stack to see if NMIs are
24147 * executing.
24148 @@ -1499,8 +2023,7 @@ nested_nmi:
24149
24150 1:
24151 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24152 - leaq -1*8(%rsp), %rdx
24153 - movq %rdx, %rsp
24154 + subq $8, %rsp
24155 CFI_ADJUST_CFA_OFFSET 1*8
24156 leaq -10*8(%rsp), %rdx
24157 pushq_cfi $__KERNEL_DS
24158 @@ -1518,6 +2041,7 @@ nested_nmi_out:
24159 CFI_RESTORE rdx
24160
24161 /* No need to check faults here */
24162 +# pax_force_retaddr_bts
24163 INTERRUPT_RETURN
24164
24165 CFI_RESTORE_STATE
24166 @@ -1614,13 +2138,13 @@ end_repeat_nmi:
24167 subq $ORIG_RAX-R15, %rsp
24168 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24169 /*
24170 - * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24171 + * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24172 * as we should not be calling schedule in NMI context.
24173 * Even with normal interrupts enabled. An NMI should not be
24174 * setting NEED_RESCHED or anything that normal interrupts and
24175 * exceptions might do.
24176 */
24177 - call save_paranoid
24178 + call save_paranoid_nmi
24179 DEFAULT_FRAME 0
24180
24181 /*
24182 @@ -1630,9 +2154,9 @@ end_repeat_nmi:
24183 * NMI itself takes a page fault, the page fault that was preempted
24184 * will read the information from the NMI page fault and not the
24185 * origin fault. Save it off and restore it if it changes.
24186 - * Use the r12 callee-saved register.
24187 + * Use the r13 callee-saved register.
24188 */
24189 - movq %cr2, %r12
24190 + movq %cr2, %r13
24191
24192 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24193 movq %rsp,%rdi
24194 @@ -1641,29 +2165,34 @@ end_repeat_nmi:
24195
24196 /* Did the NMI take a page fault? Restore cr2 if it did */
24197 movq %cr2, %rcx
24198 - cmpq %rcx, %r12
24199 + cmpq %rcx, %r13
24200 je 1f
24201 - movq %r12, %cr2
24202 + movq %r13, %cr2
24203 1:
24204
24205 - testl %ebx,%ebx /* swapgs needed? */
24206 + testl $1,%ebx /* swapgs needed? */
24207 jnz nmi_restore
24208 nmi_swapgs:
24209 SWAPGS_UNSAFE_STACK
24210 nmi_restore:
24211 + pax_exit_kernel_nmi
24212 /* Pop the extra iret frame at once */
24213 RESTORE_ALL 6*8
24214 + testb $3, 8(%rsp)
24215 + jnz 1f
24216 + pax_force_retaddr_bts
24217 +1:
24218
24219 /* Clear the NMI executing stack variable */
24220 movq $0, 5*8(%rsp)
24221 jmp irq_return
24222 CFI_ENDPROC
24223 -END(nmi)
24224 +ENDPROC(nmi)
24225
24226 ENTRY(ignore_sysret)
24227 CFI_STARTPROC
24228 mov $-ENOSYS,%eax
24229 sysret
24230 CFI_ENDPROC
24231 -END(ignore_sysret)
24232 +ENDPROC(ignore_sysret)
24233
24234 diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24235 index 94d857f..5bce89c 100644
24236 --- a/arch/x86/kernel/espfix_64.c
24237 +++ b/arch/x86/kernel/espfix_64.c
24238 @@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24239 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24240 static void *espfix_pages[ESPFIX_MAX_PAGES];
24241
24242 -static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24243 - __aligned(PAGE_SIZE);
24244 +static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24245
24246 static unsigned int page_random, slot_random;
24247
24248 @@ -122,14 +121,17 @@ static void init_espfix_random(void)
24249 void __init init_espfix_bsp(void)
24250 {
24251 pgd_t *pgd_p;
24252 - pteval_t ptemask;
24253 -
24254 - ptemask = __supported_pte_mask;
24255 + unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24256
24257 /* Install the espfix pud into the kernel page directory */
24258 - pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24259 + pgd_p = &init_level4_pgt[index];
24260 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24261
24262 +#ifdef CONFIG_PAX_PER_CPU_PGD
24263 + clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24264 + clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24265 +#endif
24266 +
24267 /* Randomize the locations */
24268 init_espfix_random();
24269
24270 @@ -197,7 +199,7 @@ void init_espfix_ap(void)
24271 set_pte(&pte_p[n*PTE_STRIDE], pte);
24272
24273 /* Job is done for this CPU and any CPU which shares this page */
24274 - ACCESS_ONCE(espfix_pages[page]) = stack_page;
24275 + ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24276
24277 unlock_done:
24278 mutex_unlock(&espfix_init_mutex);
24279 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24280 index 3386dc9..28bdf81 100644
24281 --- a/arch/x86/kernel/ftrace.c
24282 +++ b/arch/x86/kernel/ftrace.c
24283 @@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24284 * kernel identity mapping to modify code.
24285 */
24286 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24287 - ip = (unsigned long)__va(__pa_symbol(ip));
24288 + ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24289
24290 return ip;
24291 }
24292 @@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24293 {
24294 unsigned char replaced[MCOUNT_INSN_SIZE];
24295
24296 + ip = ktla_ktva(ip);
24297 +
24298 /*
24299 * Note: Due to modules and __init, code can
24300 * disappear and change, we need to protect against faulting
24301 @@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24302 unsigned char old[MCOUNT_INSN_SIZE];
24303 int ret;
24304
24305 - memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24306 + memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24307
24308 ftrace_update_func = ip;
24309 /* Make sure the breakpoints see the ftrace_update_func update */
24310 @@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
24311 unsigned char replaced[MCOUNT_INSN_SIZE];
24312 unsigned char brk = BREAKPOINT_INSTRUCTION;
24313
24314 - if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24315 + if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24316 return -EFAULT;
24317
24318 /* Make sure it is what we expect it to be */
24319 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24320 index eda1a86..8f6df48 100644
24321 --- a/arch/x86/kernel/head64.c
24322 +++ b/arch/x86/kernel/head64.c
24323 @@ -67,12 +67,12 @@ again:
24324 pgd = *pgd_p;
24325
24326 /*
24327 - * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24328 - * critical -- __PAGE_OFFSET would point us back into the dynamic
24329 + * The use of __early_va rather than __va here is critical:
24330 + * __va would point us back into the dynamic
24331 * range and we might end up looping forever...
24332 */
24333 if (pgd)
24334 - pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24335 + pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24336 else {
24337 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24338 reset_early_page_tables();
24339 @@ -82,13 +82,13 @@ again:
24340 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24341 for (i = 0; i < PTRS_PER_PUD; i++)
24342 pud_p[i] = 0;
24343 - *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24344 + *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24345 }
24346 pud_p += pud_index(address);
24347 pud = *pud_p;
24348
24349 if (pud)
24350 - pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24351 + pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24352 else {
24353 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24354 reset_early_page_tables();
24355 @@ -98,7 +98,7 @@ again:
24356 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24357 for (i = 0; i < PTRS_PER_PMD; i++)
24358 pmd_p[i] = 0;
24359 - *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24360 + *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24361 }
24362 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24363 pmd_p[pmd_index(address)] = pmd;
24364 @@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24365 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24366 early_printk("Kernel alive\n");
24367
24368 - clear_page(init_level4_pgt);
24369 /* set init_level4_pgt kernel high mapping*/
24370 init_level4_pgt[511] = early_level4_pgt[511];
24371
24372 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24373 index f36bd42..0ab4474 100644
24374 --- a/arch/x86/kernel/head_32.S
24375 +++ b/arch/x86/kernel/head_32.S
24376 @@ -26,6 +26,12 @@
24377 /* Physical address */
24378 #define pa(X) ((X) - __PAGE_OFFSET)
24379
24380 +#ifdef CONFIG_PAX_KERNEXEC
24381 +#define ta(X) (X)
24382 +#else
24383 +#define ta(X) ((X) - __PAGE_OFFSET)
24384 +#endif
24385 +
24386 /*
24387 * References to members of the new_cpu_data structure.
24388 */
24389 @@ -55,11 +61,7 @@
24390 * and small than max_low_pfn, otherwise will waste some page table entries
24391 */
24392
24393 -#if PTRS_PER_PMD > 1
24394 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24395 -#else
24396 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24397 -#endif
24398 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24399
24400 /* Number of possible pages in the lowmem region */
24401 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24402 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24403 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24404
24405 /*
24406 + * Real beginning of normal "text" segment
24407 + */
24408 +ENTRY(stext)
24409 +ENTRY(_stext)
24410 +
24411 +/*
24412 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24413 * %esi points to the real-mode code as a 32-bit pointer.
24414 * CS and DS must be 4 GB flat segments, but we don't depend on
24415 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24416 * can.
24417 */
24418 __HEAD
24419 +
24420 +#ifdef CONFIG_PAX_KERNEXEC
24421 + jmp startup_32
24422 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24423 +.fill PAGE_SIZE-5,1,0xcc
24424 +#endif
24425 +
24426 ENTRY(startup_32)
24427 movl pa(stack_start),%ecx
24428
24429 @@ -106,6 +121,59 @@ ENTRY(startup_32)
24430 2:
24431 leal -__PAGE_OFFSET(%ecx),%esp
24432
24433 +#ifdef CONFIG_SMP
24434 + movl $pa(cpu_gdt_table),%edi
24435 + movl $__per_cpu_load,%eax
24436 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24437 + rorl $16,%eax
24438 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24439 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24440 + movl $__per_cpu_end - 1,%eax
24441 + subl $__per_cpu_start,%eax
24442 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24443 +#endif
24444 +
24445 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24446 + movl $NR_CPUS,%ecx
24447 + movl $pa(cpu_gdt_table),%edi
24448 +1:
24449 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24450 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24451 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24452 + addl $PAGE_SIZE_asm,%edi
24453 + loop 1b
24454 +#endif
24455 +
24456 +#ifdef CONFIG_PAX_KERNEXEC
24457 + movl $pa(boot_gdt),%edi
24458 + movl $__LOAD_PHYSICAL_ADDR,%eax
24459 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24460 + rorl $16,%eax
24461 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24462 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24463 + rorl $16,%eax
24464 +
24465 + ljmp $(__BOOT_CS),$1f
24466 +1:
24467 +
24468 + movl $NR_CPUS,%ecx
24469 + movl $pa(cpu_gdt_table),%edi
24470 + addl $__PAGE_OFFSET,%eax
24471 +1:
24472 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24473 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24474 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24475 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24476 + rorl $16,%eax
24477 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24478 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24479 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24480 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24481 + rorl $16,%eax
24482 + addl $PAGE_SIZE_asm,%edi
24483 + loop 1b
24484 +#endif
24485 +
24486 /*
24487 * Clear BSS first so that there are no surprises...
24488 */
24489 @@ -201,8 +269,11 @@ ENTRY(startup_32)
24490 movl %eax, pa(max_pfn_mapped)
24491
24492 /* Do early initialization of the fixmap area */
24493 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24494 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24495 +#ifdef CONFIG_COMPAT_VDSO
24496 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24497 +#else
24498 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24499 +#endif
24500 #else /* Not PAE */
24501
24502 page_pde_offset = (__PAGE_OFFSET >> 20);
24503 @@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24504 movl %eax, pa(max_pfn_mapped)
24505
24506 /* Do early initialization of the fixmap area */
24507 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24508 - movl %eax,pa(initial_page_table+0xffc)
24509 +#ifdef CONFIG_COMPAT_VDSO
24510 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24511 +#else
24512 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24513 +#endif
24514 #endif
24515
24516 #ifdef CONFIG_PARAVIRT
24517 @@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24518 cmpl $num_subarch_entries, %eax
24519 jae bad_subarch
24520
24521 - movl pa(subarch_entries)(,%eax,4), %eax
24522 - subl $__PAGE_OFFSET, %eax
24523 - jmp *%eax
24524 + jmp *pa(subarch_entries)(,%eax,4)
24525
24526 bad_subarch:
24527 WEAK(lguest_entry)
24528 @@ -261,10 +333,10 @@ WEAK(xen_entry)
24529 __INITDATA
24530
24531 subarch_entries:
24532 - .long default_entry /* normal x86/PC */
24533 - .long lguest_entry /* lguest hypervisor */
24534 - .long xen_entry /* Xen hypervisor */
24535 - .long default_entry /* Moorestown MID */
24536 + .long ta(default_entry) /* normal x86/PC */
24537 + .long ta(lguest_entry) /* lguest hypervisor */
24538 + .long ta(xen_entry) /* Xen hypervisor */
24539 + .long ta(default_entry) /* Moorestown MID */
24540 num_subarch_entries = (. - subarch_entries) / 4
24541 .previous
24542 #else
24543 @@ -354,6 +426,7 @@ default_entry:
24544 movl pa(mmu_cr4_features),%eax
24545 movl %eax,%cr4
24546
24547 +#ifdef CONFIG_X86_PAE
24548 testb $X86_CR4_PAE, %al # check if PAE is enabled
24549 jz enable_paging
24550
24551 @@ -382,6 +455,9 @@ default_entry:
24552 /* Make changes effective */
24553 wrmsr
24554
24555 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24556 +#endif
24557 +
24558 enable_paging:
24559
24560 /*
24561 @@ -449,14 +525,20 @@ is486:
24562 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24563 movl %eax,%ss # after changing gdt.
24564
24565 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
24566 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24567 movl %eax,%ds
24568 movl %eax,%es
24569
24570 movl $(__KERNEL_PERCPU), %eax
24571 movl %eax,%fs # set this cpu's percpu
24572
24573 +#ifdef CONFIG_CC_STACKPROTECTOR
24574 movl $(__KERNEL_STACK_CANARY),%eax
24575 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24576 + movl $(__USER_DS),%eax
24577 +#else
24578 + xorl %eax,%eax
24579 +#endif
24580 movl %eax,%gs
24581
24582 xorl %eax,%eax # Clear LDT
24583 @@ -512,8 +594,11 @@ setup_once:
24584 * relocation. Manually set base address in stack canary
24585 * segment descriptor.
24586 */
24587 - movl $gdt_page,%eax
24588 + movl $cpu_gdt_table,%eax
24589 movl $stack_canary,%ecx
24590 +#ifdef CONFIG_SMP
24591 + addl $__per_cpu_load,%ecx
24592 +#endif
24593 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24594 shrl $16, %ecx
24595 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24596 @@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24597 cmpl $2,(%esp) # X86_TRAP_NMI
24598 je is_nmi # Ignore NMI
24599
24600 - cmpl $2,%ss:early_recursion_flag
24601 + cmpl $1,%ss:early_recursion_flag
24602 je hlt_loop
24603 incl %ss:early_recursion_flag
24604
24605 @@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24606 pushl (20+6*4)(%esp) /* trapno */
24607 pushl $fault_msg
24608 call printk
24609 -#endif
24610 call dump_stack
24611 +#endif
24612 hlt_loop:
24613 hlt
24614 jmp hlt_loop
24615 @@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24616 /* This is the default interrupt "handler" :-) */
24617 ALIGN
24618 ignore_int:
24619 - cld
24620 #ifdef CONFIG_PRINTK
24621 + cmpl $2,%ss:early_recursion_flag
24622 + je hlt_loop
24623 + incl %ss:early_recursion_flag
24624 + cld
24625 pushl %eax
24626 pushl %ecx
24627 pushl %edx
24628 @@ -617,9 +705,6 @@ ignore_int:
24629 movl $(__KERNEL_DS),%eax
24630 movl %eax,%ds
24631 movl %eax,%es
24632 - cmpl $2,early_recursion_flag
24633 - je hlt_loop
24634 - incl early_recursion_flag
24635 pushl 16(%esp)
24636 pushl 24(%esp)
24637 pushl 32(%esp)
24638 @@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24639 /*
24640 * BSS section
24641 */
24642 -__PAGE_ALIGNED_BSS
24643 - .align PAGE_SIZE
24644 #ifdef CONFIG_X86_PAE
24645 +.section .initial_pg_pmd,"a",@progbits
24646 initial_pg_pmd:
24647 .fill 1024*KPMDS,4,0
24648 #else
24649 +.section .initial_page_table,"a",@progbits
24650 ENTRY(initial_page_table)
24651 .fill 1024,4,0
24652 #endif
24653 +.section .initial_pg_fixmap,"a",@progbits
24654 initial_pg_fixmap:
24655 .fill 1024,4,0
24656 +.section .empty_zero_page,"a",@progbits
24657 ENTRY(empty_zero_page)
24658 .fill 4096,1,0
24659 +.section .swapper_pg_dir,"a",@progbits
24660 ENTRY(swapper_pg_dir)
24661 +#ifdef CONFIG_X86_PAE
24662 + .fill 4,8,0
24663 +#else
24664 .fill 1024,4,0
24665 +#endif
24666
24667 /*
24668 * This starts the data section.
24669 */
24670 #ifdef CONFIG_X86_PAE
24671 -__PAGE_ALIGNED_DATA
24672 - /* Page-aligned for the benefit of paravirt? */
24673 - .align PAGE_SIZE
24674 +.section .initial_page_table,"a",@progbits
24675 ENTRY(initial_page_table)
24676 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24677 # if KPMDS == 3
24678 @@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24679 # error "Kernel PMDs should be 1, 2 or 3"
24680 # endif
24681 .align PAGE_SIZE /* needs to be page-sized too */
24682 +
24683 +#ifdef CONFIG_PAX_PER_CPU_PGD
24684 +ENTRY(cpu_pgd)
24685 + .rept 2*NR_CPUS
24686 + .fill 4,8,0
24687 + .endr
24688 +#endif
24689 +
24690 #endif
24691
24692 .data
24693 .balign 4
24694 ENTRY(stack_start)
24695 - .long init_thread_union+THREAD_SIZE
24696 + .long init_thread_union+THREAD_SIZE-8
24697
24698 __INITRODATA
24699 int_msg:
24700 @@ -727,7 +825,7 @@ fault_msg:
24701 * segment size, and 32-bit linear address value:
24702 */
24703
24704 - .data
24705 +.section .rodata,"a",@progbits
24706 .globl boot_gdt_descr
24707 .globl idt_descr
24708
24709 @@ -736,7 +834,7 @@ fault_msg:
24710 .word 0 # 32 bit align gdt_desc.address
24711 boot_gdt_descr:
24712 .word __BOOT_DS+7
24713 - .long boot_gdt - __PAGE_OFFSET
24714 + .long pa(boot_gdt)
24715
24716 .word 0 # 32-bit align idt_desc.address
24717 idt_descr:
24718 @@ -747,7 +845,7 @@ idt_descr:
24719 .word 0 # 32 bit align gdt_desc.address
24720 ENTRY(early_gdt_descr)
24721 .word GDT_ENTRIES*8-1
24722 - .long gdt_page /* Overwritten for secondary CPUs */
24723 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
24724
24725 /*
24726 * The boot_gdt must mirror the equivalent in setup.S and is
24727 @@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24728 .align L1_CACHE_BYTES
24729 ENTRY(boot_gdt)
24730 .fill GDT_ENTRY_BOOT_CS,8,0
24731 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24732 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24733 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24734 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24735 +
24736 + .align PAGE_SIZE_asm
24737 +ENTRY(cpu_gdt_table)
24738 + .rept NR_CPUS
24739 + .quad 0x0000000000000000 /* NULL descriptor */
24740 + .quad 0x0000000000000000 /* 0x0b reserved */
24741 + .quad 0x0000000000000000 /* 0x13 reserved */
24742 + .quad 0x0000000000000000 /* 0x1b reserved */
24743 +
24744 +#ifdef CONFIG_PAX_KERNEXEC
24745 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24746 +#else
24747 + .quad 0x0000000000000000 /* 0x20 unused */
24748 +#endif
24749 +
24750 + .quad 0x0000000000000000 /* 0x28 unused */
24751 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24752 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24753 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24754 + .quad 0x0000000000000000 /* 0x4b reserved */
24755 + .quad 0x0000000000000000 /* 0x53 reserved */
24756 + .quad 0x0000000000000000 /* 0x5b reserved */
24757 +
24758 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24759 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24760 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24761 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24762 +
24763 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24764 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24765 +
24766 + /*
24767 + * Segments used for calling PnP BIOS have byte granularity.
24768 + * The code segments and data segments have fixed 64k limits,
24769 + * the transfer segment sizes are set at run time.
24770 + */
24771 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
24772 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
24773 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
24774 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
24775 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
24776 +
24777 + /*
24778 + * The APM segments have byte granularity and their bases
24779 + * are set at run time. All have 64k limits.
24780 + */
24781 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24782 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24783 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
24784 +
24785 + .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24786 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24787 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24788 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24789 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24790 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24791 +
24792 + /* Be sure this is zeroed to avoid false validations in Xen */
24793 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24794 + .endr
24795 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24796 index a468c0a..8b5a879 100644
24797 --- a/arch/x86/kernel/head_64.S
24798 +++ b/arch/x86/kernel/head_64.S
24799 @@ -20,6 +20,8 @@
24800 #include <asm/processor-flags.h>
24801 #include <asm/percpu.h>
24802 #include <asm/nops.h>
24803 +#include <asm/cpufeature.h>
24804 +#include <asm/alternative-asm.h>
24805
24806 #ifdef CONFIG_PARAVIRT
24807 #include <asm/asm-offsets.h>
24808 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24809 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24810 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24811 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24812 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
24813 +L3_VMALLOC_START = pud_index(VMALLOC_START)
24814 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
24815 +L3_VMALLOC_END = pud_index(VMALLOC_END)
24816 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24817 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24818
24819 .text
24820 __HEAD
24821 @@ -89,11 +97,24 @@ startup_64:
24822 * Fixup the physical addresses in the page table
24823 */
24824 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24825 + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24826 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24827 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24828 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24829 + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24830
24831 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24832 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24833 + addq %rbp, level3_ident_pgt + (0*8)(%rip)
24834 +#ifndef CONFIG_XEN
24835 + addq %rbp, level3_ident_pgt + (1*8)(%rip)
24836 +#endif
24837 +
24838 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24839 +
24840 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24841 + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24842
24843 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24844 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24845
24846 /*
24847 * Set up the identity mapping for the switchover. These
24848 @@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24849 * after the boot processor executes this code.
24850 */
24851
24852 + orq $-1, %rbp
24853 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24854 1:
24855
24856 - /* Enable PAE mode and PGE */
24857 - movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24858 + /* Enable PAE mode and PSE/PGE */
24859 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24860 movq %rcx, %cr4
24861
24862 /* Setup early boot stage 4 level pagetables. */
24863 @@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
24864 movl $MSR_EFER, %ecx
24865 rdmsr
24866 btsl $_EFER_SCE, %eax /* Enable System Call */
24867 - btl $20,%edi /* No Execute supported? */
24868 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24869 jnc 1f
24870 btsl $_EFER_NX, %eax
24871 + cmpq $-1, %rbp
24872 + je 1f
24873 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24874 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24875 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24876 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24877 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24878 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24879 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24880 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24881 1: wrmsr /* Make changes effective */
24882
24883 /* Setup cr0 */
24884 @@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
24885 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24886 * address given in m16:64.
24887 */
24888 + pax_set_fptr_mask
24889 movq initial_code(%rip),%rax
24890 pushq $0 # fake return address to stop unwinder
24891 pushq $__KERNEL_CS # set correct cs
24892 @@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
24893 .quad INIT_PER_CPU_VAR(irq_stack_union)
24894
24895 GLOBAL(stack_start)
24896 - .quad init_thread_union+THREAD_SIZE-8
24897 + .quad init_thread_union+THREAD_SIZE-16
24898 .word 0
24899 __FINITDATA
24900
24901 @@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
24902 call dump_stack
24903 #ifdef CONFIG_KALLSYMS
24904 leaq early_idt_ripmsg(%rip),%rdi
24905 - movq 40(%rsp),%rsi # %rip again
24906 + movq 88(%rsp),%rsi # %rip again
24907 call __print_symbol
24908 #endif
24909 #endif /* EARLY_PRINTK */
24910 @@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
24911 early_recursion_flag:
24912 .long 0
24913
24914 + .section .rodata,"a",@progbits
24915 #ifdef CONFIG_EARLY_PRINTK
24916 early_idt_msg:
24917 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24918 @@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
24919 NEXT_PAGE(early_dynamic_pgts)
24920 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24921
24922 - .data
24923 + .section .rodata,"a",@progbits
24924
24925 -#ifndef CONFIG_XEN
24926 NEXT_PAGE(init_level4_pgt)
24927 - .fill 512,8,0
24928 -#else
24929 -NEXT_PAGE(init_level4_pgt)
24930 - .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24931 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24932 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24933 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
24934 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24935 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
24936 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24937 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24938 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24939 .org init_level4_pgt + L4_START_KERNEL*8, 0
24940 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24941 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24942
24943 +#ifdef CONFIG_PAX_PER_CPU_PGD
24944 +NEXT_PAGE(cpu_pgd)
24945 + .rept 2*NR_CPUS
24946 + .fill 512,8,0
24947 + .endr
24948 +#endif
24949 +
24950 NEXT_PAGE(level3_ident_pgt)
24951 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24952 +#ifdef CONFIG_XEN
24953 .fill 511, 8, 0
24954 +#else
24955 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24956 + .fill 510,8,0
24957 +#endif
24958 +
24959 +NEXT_PAGE(level3_vmalloc_start_pgt)
24960 + .fill 512,8,0
24961 +
24962 +NEXT_PAGE(level3_vmalloc_end_pgt)
24963 + .fill 512,8,0
24964 +
24965 +NEXT_PAGE(level3_vmemmap_pgt)
24966 + .fill L3_VMEMMAP_START,8,0
24967 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24968 +
24969 NEXT_PAGE(level2_ident_pgt)
24970 - /* Since I easily can, map the first 1G.
24971 + /* Since I easily can, map the first 2G.
24972 * Don't set NX because code runs from these pages.
24973 */
24974 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24975 -#endif
24976 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24977
24978 NEXT_PAGE(level3_kernel_pgt)
24979 .fill L3_START_KERNEL,8,0
24980 @@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
24981 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24982 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24983
24984 +NEXT_PAGE(level2_vmemmap_pgt)
24985 + .fill 512,8,0
24986 +
24987 NEXT_PAGE(level2_kernel_pgt)
24988 /*
24989 * 512 MB kernel mapping. We spend a full page on this pagetable
24990 @@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
24991 NEXT_PAGE(level2_fixmap_pgt)
24992 .fill 506,8,0
24993 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24994 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24995 - .fill 5,8,0
24996 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24997 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24998 + .fill 4,8,0
24999
25000 NEXT_PAGE(level1_fixmap_pgt)
25001 .fill 512,8,0
25002
25003 +NEXT_PAGE(level1_vsyscall_pgt)
25004 + .fill 512,8,0
25005 +
25006 #undef PMDS
25007
25008 - .data
25009 + .align PAGE_SIZE
25010 +ENTRY(cpu_gdt_table)
25011 + .rept NR_CPUS
25012 + .quad 0x0000000000000000 /* NULL descriptor */
25013 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25014 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
25015 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
25016 + .quad 0x00cffb000000ffff /* __USER32_CS */
25017 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25018 + .quad 0x00affb000000ffff /* __USER_CS */
25019 +
25020 +#ifdef CONFIG_PAX_KERNEXEC
25021 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25022 +#else
25023 + .quad 0x0 /* unused */
25024 +#endif
25025 +
25026 + .quad 0,0 /* TSS */
25027 + .quad 0,0 /* LDT */
25028 + .quad 0,0,0 /* three TLS descriptors */
25029 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
25030 + /* asm/segment.h:GDT_ENTRIES must match this */
25031 +
25032 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25033 + .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25034 +#else
25035 + .quad 0x0 /* unused */
25036 +#endif
25037 +
25038 + /* zero the remaining page */
25039 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25040 + .endr
25041 +
25042 .align 16
25043 .globl early_gdt_descr
25044 early_gdt_descr:
25045 .word GDT_ENTRIES*8-1
25046 early_gdt_descr_base:
25047 - .quad INIT_PER_CPU_VAR(gdt_page)
25048 + .quad cpu_gdt_table
25049
25050 ENTRY(phys_base)
25051 /* This must match the first entry in level2_kernel_pgt */
25052 .quad 0x0000000000000000
25053
25054 #include "../../x86/xen/xen-head.S"
25055 -
25056 - __PAGE_ALIGNED_BSS
25057 +
25058 + .section .rodata,"a",@progbits
25059 NEXT_PAGE(empty_zero_page)
25060 .skip PAGE_SIZE
25061 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25062 index 05fd74f..c3548b1 100644
25063 --- a/arch/x86/kernel/i386_ksyms_32.c
25064 +++ b/arch/x86/kernel/i386_ksyms_32.c
25065 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25066 EXPORT_SYMBOL(cmpxchg8b_emu);
25067 #endif
25068
25069 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
25070 +
25071 /* Networking helper routines. */
25072 EXPORT_SYMBOL(csum_partial_copy_generic);
25073 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25074 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25075
25076 EXPORT_SYMBOL(__get_user_1);
25077 EXPORT_SYMBOL(__get_user_2);
25078 @@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25079 EXPORT_SYMBOL(___preempt_schedule_context);
25080 #endif
25081 #endif
25082 +
25083 +#ifdef CONFIG_PAX_KERNEXEC
25084 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25085 +#endif
25086 +
25087 +#ifdef CONFIG_PAX_PER_CPU_PGD
25088 +EXPORT_SYMBOL(cpu_pgd);
25089 +#endif
25090 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25091 index a9a4229..6f4d476 100644
25092 --- a/arch/x86/kernel/i387.c
25093 +++ b/arch/x86/kernel/i387.c
25094 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25095 static inline bool interrupted_user_mode(void)
25096 {
25097 struct pt_regs *regs = get_irq_regs();
25098 - return regs && user_mode_vm(regs);
25099 + return regs && user_mode(regs);
25100 }
25101
25102 /*
25103 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25104 index e7cc537..67d7372 100644
25105 --- a/arch/x86/kernel/i8259.c
25106 +++ b/arch/x86/kernel/i8259.c
25107 @@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25108 static void make_8259A_irq(unsigned int irq)
25109 {
25110 disable_irq_nosync(irq);
25111 - io_apic_irqs &= ~(1<<irq);
25112 + io_apic_irqs &= ~(1UL<<irq);
25113 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25114 enable_irq(irq);
25115 }
25116 @@ -208,7 +208,7 @@ spurious_8259A_irq:
25117 "spurious 8259A interrupt: IRQ%d.\n", irq);
25118 spurious_irq_mask |= irqmask;
25119 }
25120 - atomic_inc(&irq_err_count);
25121 + atomic_inc_unchecked(&irq_err_count);
25122 /*
25123 * Theoretically we do not have to handle this IRQ,
25124 * but in Linux this does not cause problems and is
25125 @@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25126 /* (slave's support for AEOI in flat mode is to be investigated) */
25127 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25128
25129 + pax_open_kernel();
25130 if (auto_eoi)
25131 /*
25132 * In AEOI mode we just have to mask the interrupt
25133 * when acking.
25134 */
25135 - i8259A_chip.irq_mask_ack = disable_8259A_irq;
25136 + *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25137 else
25138 - i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25139 + *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25140 + pax_close_kernel();
25141
25142 udelay(100); /* wait for 8259A to initialize */
25143
25144 diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25145 index a979b5b..1d6db75 100644
25146 --- a/arch/x86/kernel/io_delay.c
25147 +++ b/arch/x86/kernel/io_delay.c
25148 @@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25149 * Quirk table for systems that misbehave (lock up, etc.) if port
25150 * 0x80 is used:
25151 */
25152 -static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25153 +static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25154 {
25155 .callback = dmi_io_delay_0xed_port,
25156 .ident = "Compaq Presario V6000",
25157 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25158 index 4ddaf66..49d5c18 100644
25159 --- a/arch/x86/kernel/ioport.c
25160 +++ b/arch/x86/kernel/ioport.c
25161 @@ -6,6 +6,7 @@
25162 #include <linux/sched.h>
25163 #include <linux/kernel.h>
25164 #include <linux/capability.h>
25165 +#include <linux/security.h>
25166 #include <linux/errno.h>
25167 #include <linux/types.h>
25168 #include <linux/ioport.h>
25169 @@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25170 return -EINVAL;
25171 if (turn_on && !capable(CAP_SYS_RAWIO))
25172 return -EPERM;
25173 +#ifdef CONFIG_GRKERNSEC_IO
25174 + if (turn_on && grsec_disable_privio) {
25175 + gr_handle_ioperm();
25176 + return -ENODEV;
25177 + }
25178 +#endif
25179
25180 /*
25181 * If it's the first ioperm() call in this thread's lifetime, set the
25182 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25183 * because the ->io_bitmap_max value must match the bitmap
25184 * contents:
25185 */
25186 - tss = &per_cpu(init_tss, get_cpu());
25187 + tss = init_tss + get_cpu();
25188
25189 if (turn_on)
25190 bitmap_clear(t->io_bitmap_ptr, from, num);
25191 @@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25192 if (level > old) {
25193 if (!capable(CAP_SYS_RAWIO))
25194 return -EPERM;
25195 +#ifdef CONFIG_GRKERNSEC_IO
25196 + if (grsec_disable_privio) {
25197 + gr_handle_iopl();
25198 + return -ENODEV;
25199 + }
25200 +#endif
25201 }
25202 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25203 t->iopl = level << 12;
25204 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25205 index 922d285..6d20692 100644
25206 --- a/arch/x86/kernel/irq.c
25207 +++ b/arch/x86/kernel/irq.c
25208 @@ -22,7 +22,7 @@
25209 #define CREATE_TRACE_POINTS
25210 #include <asm/trace/irq_vectors.h>
25211
25212 -atomic_t irq_err_count;
25213 +atomic_unchecked_t irq_err_count;
25214
25215 /* Function pointer for generic interrupt vector handling */
25216 void (*x86_platform_ipi_callback)(void) = NULL;
25217 @@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25218 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25219 seq_printf(p, " Hypervisor callback interrupts\n");
25220 #endif
25221 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25222 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25223 #if defined(CONFIG_X86_IO_APIC)
25224 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25225 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25226 #endif
25227 return 0;
25228 }
25229 @@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25230
25231 u64 arch_irq_stat(void)
25232 {
25233 - u64 sum = atomic_read(&irq_err_count);
25234 + u64 sum = atomic_read_unchecked(&irq_err_count);
25235 return sum;
25236 }
25237
25238 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25239 index 63ce838..2ea3e06 100644
25240 --- a/arch/x86/kernel/irq_32.c
25241 +++ b/arch/x86/kernel/irq_32.c
25242 @@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25243
25244 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25245
25246 +extern void gr_handle_kernel_exploit(void);
25247 +
25248 int sysctl_panic_on_stackoverflow __read_mostly;
25249
25250 /* Debugging check for stack overflow: is there less than 1KB free? */
25251 @@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25252 __asm__ __volatile__("andl %%esp,%0" :
25253 "=r" (sp) : "0" (THREAD_SIZE - 1));
25254
25255 - return sp < (sizeof(struct thread_info) + STACK_WARN);
25256 + return sp < STACK_WARN;
25257 }
25258
25259 static void print_stack_overflow(void)
25260 {
25261 printk(KERN_WARNING "low stack detected by irq handler\n");
25262 dump_stack();
25263 + gr_handle_kernel_exploit();
25264 if (sysctl_panic_on_stackoverflow)
25265 panic("low stack detected by irq handler - check messages\n");
25266 }
25267 @@ -84,10 +87,9 @@ static inline void *current_stack(void)
25268 static inline int
25269 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25270 {
25271 - struct irq_stack *curstk, *irqstk;
25272 + struct irq_stack *irqstk;
25273 u32 *isp, *prev_esp, arg1, arg2;
25274
25275 - curstk = (struct irq_stack *) current_stack();
25276 irqstk = __this_cpu_read(hardirq_stack);
25277
25278 /*
25279 @@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25280 * handler) we can't do that and just have to keep using the
25281 * current stack (which is the irq stack already after all)
25282 */
25283 - if (unlikely(curstk == irqstk))
25284 + if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25285 return 0;
25286
25287 - isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25288 + isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25289
25290 /* Save the next esp at the bottom of the stack */
25291 prev_esp = (u32 *)irqstk;
25292 *prev_esp = current_stack_pointer;
25293
25294 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25295 + __set_fs(MAKE_MM_SEG(0));
25296 +#endif
25297 +
25298 if (unlikely(overflow))
25299 call_on_stack(print_stack_overflow, isp);
25300
25301 @@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25302 : "0" (irq), "1" (desc), "2" (isp),
25303 "D" (desc->handle_irq)
25304 : "memory", "cc", "ecx");
25305 +
25306 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25307 + __set_fs(current_thread_info()->addr_limit);
25308 +#endif
25309 +
25310 return 1;
25311 }
25312
25313 @@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25314 */
25315 void irq_ctx_init(int cpu)
25316 {
25317 - struct irq_stack *irqstk;
25318 -
25319 if (per_cpu(hardirq_stack, cpu))
25320 return;
25321
25322 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25323 - THREADINFO_GFP,
25324 - THREAD_SIZE_ORDER));
25325 - per_cpu(hardirq_stack, cpu) = irqstk;
25326 -
25327 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25328 - THREADINFO_GFP,
25329 - THREAD_SIZE_ORDER));
25330 - per_cpu(softirq_stack, cpu) = irqstk;
25331 -
25332 - printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25333 - cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25334 + per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25335 + per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25336 }
25337
25338 void do_softirq_own_stack(void)
25339 {
25340 - struct thread_info *curstk;
25341 struct irq_stack *irqstk;
25342 u32 *isp, *prev_esp;
25343
25344 - curstk = current_stack();
25345 irqstk = __this_cpu_read(softirq_stack);
25346
25347 /* build the stack frame on the softirq stack */
25348 @@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25349 prev_esp = (u32 *)irqstk;
25350 *prev_esp = current_stack_pointer;
25351
25352 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25353 + __set_fs(MAKE_MM_SEG(0));
25354 +#endif
25355 +
25356 call_on_stack(__do_softirq, isp);
25357 +
25358 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25359 + __set_fs(current_thread_info()->addr_limit);
25360 +#endif
25361 +
25362 }
25363
25364 bool handle_irq(unsigned irq, struct pt_regs *regs)
25365 @@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25366 if (unlikely(!desc))
25367 return false;
25368
25369 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25370 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25371 if (unlikely(overflow))
25372 print_stack_overflow();
25373 desc->handle_irq(irq, desc);
25374 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25375 index e4b503d..824fce8 100644
25376 --- a/arch/x86/kernel/irq_64.c
25377 +++ b/arch/x86/kernel/irq_64.c
25378 @@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25379 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25380 EXPORT_PER_CPU_SYMBOL(irq_regs);
25381
25382 +extern void gr_handle_kernel_exploit(void);
25383 +
25384 int sysctl_panic_on_stackoverflow;
25385
25386 /*
25387 @@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25388 u64 estack_top, estack_bottom;
25389 u64 curbase = (u64)task_stack_page(current);
25390
25391 - if (user_mode_vm(regs))
25392 + if (user_mode(regs))
25393 return;
25394
25395 if (regs->sp >= curbase + sizeof(struct thread_info) +
25396 @@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25397 irq_stack_top, irq_stack_bottom,
25398 estack_top, estack_bottom);
25399
25400 + gr_handle_kernel_exploit();
25401 +
25402 if (sysctl_panic_on_stackoverflow)
25403 panic("low stack detected by irq handler - check messages\n");
25404 #endif
25405 diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25406 index 26d5a55..a01160a 100644
25407 --- a/arch/x86/kernel/jump_label.c
25408 +++ b/arch/x86/kernel/jump_label.c
25409 @@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25410 * Jump label is enabled for the first time.
25411 * So we expect a default_nop...
25412 */
25413 - if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25414 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25415 != 0))
25416 bug_at((void *)entry->code, __LINE__);
25417 } else {
25418 @@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25419 * ...otherwise expect an ideal_nop. Otherwise
25420 * something went horribly wrong.
25421 */
25422 - if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25423 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25424 != 0))
25425 bug_at((void *)entry->code, __LINE__);
25426 }
25427 @@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25428 * are converting the default nop to the ideal nop.
25429 */
25430 if (init) {
25431 - if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25432 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25433 bug_at((void *)entry->code, __LINE__);
25434 } else {
25435 code.jump = 0xe9;
25436 code.offset = entry->target -
25437 (entry->code + JUMP_LABEL_NOP_SIZE);
25438 - if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25439 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25440 bug_at((void *)entry->code, __LINE__);
25441 }
25442 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25443 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25444 index 7ec1d5f..5a7d130 100644
25445 --- a/arch/x86/kernel/kgdb.c
25446 +++ b/arch/x86/kernel/kgdb.c
25447 @@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25448 #ifdef CONFIG_X86_32
25449 switch (regno) {
25450 case GDB_SS:
25451 - if (!user_mode_vm(regs))
25452 + if (!user_mode(regs))
25453 *(unsigned long *)mem = __KERNEL_DS;
25454 break;
25455 case GDB_SP:
25456 - if (!user_mode_vm(regs))
25457 + if (!user_mode(regs))
25458 *(unsigned long *)mem = kernel_stack_pointer(regs);
25459 break;
25460 case GDB_GS:
25461 @@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25462 bp->attr.bp_addr = breakinfo[breakno].addr;
25463 bp->attr.bp_len = breakinfo[breakno].len;
25464 bp->attr.bp_type = breakinfo[breakno].type;
25465 - info->address = breakinfo[breakno].addr;
25466 + if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25467 + info->address = ktla_ktva(breakinfo[breakno].addr);
25468 + else
25469 + info->address = breakinfo[breakno].addr;
25470 info->len = breakinfo[breakno].len;
25471 info->type = breakinfo[breakno].type;
25472 val = arch_install_hw_breakpoint(bp);
25473 @@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25474 case 'k':
25475 /* clear the trace bit */
25476 linux_regs->flags &= ~X86_EFLAGS_TF;
25477 - atomic_set(&kgdb_cpu_doing_single_step, -1);
25478 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25479
25480 /* set the trace bit if we're stepping */
25481 if (remcomInBuffer[0] == 's') {
25482 linux_regs->flags |= X86_EFLAGS_TF;
25483 - atomic_set(&kgdb_cpu_doing_single_step,
25484 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25485 raw_smp_processor_id());
25486 }
25487
25488 @@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25489
25490 switch (cmd) {
25491 case DIE_DEBUG:
25492 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25493 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25494 if (user_mode(regs))
25495 return single_step_cont(regs, args);
25496 break;
25497 @@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25498 #endif /* CONFIG_DEBUG_RODATA */
25499
25500 bpt->type = BP_BREAKPOINT;
25501 - err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25502 + err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25503 BREAK_INSTR_SIZE);
25504 if (err)
25505 return err;
25506 - err = probe_kernel_write((char *)bpt->bpt_addr,
25507 + err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25508 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25509 #ifdef CONFIG_DEBUG_RODATA
25510 if (!err)
25511 @@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25512 return -EBUSY;
25513 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25514 BREAK_INSTR_SIZE);
25515 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25516 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25517 if (err)
25518 return err;
25519 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25520 @@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25521 if (mutex_is_locked(&text_mutex))
25522 goto knl_write;
25523 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25524 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25525 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25526 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25527 goto knl_write;
25528 return err;
25529 knl_write:
25530 #endif /* CONFIG_DEBUG_RODATA */
25531 - return probe_kernel_write((char *)bpt->bpt_addr,
25532 + return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25533 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25534 }
25535
25536 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25537 index 67e6d19..731ed28 100644
25538 --- a/arch/x86/kernel/kprobes/core.c
25539 +++ b/arch/x86/kernel/kprobes/core.c
25540 @@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25541 s32 raddr;
25542 } __packed *insn;
25543
25544 - insn = (struct __arch_relative_insn *)from;
25545 + insn = (struct __arch_relative_insn *)ktla_ktva(from);
25546 +
25547 + pax_open_kernel();
25548 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25549 insn->op = op;
25550 + pax_close_kernel();
25551 }
25552
25553 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25554 @@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25555 kprobe_opcode_t opcode;
25556 kprobe_opcode_t *orig_opcodes = opcodes;
25557
25558 - if (search_exception_tables((unsigned long)opcodes))
25559 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25560 return 0; /* Page fault may occur on this address. */
25561
25562 retry:
25563 @@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25564 * for the first byte, we can recover the original instruction
25565 * from it and kp->opcode.
25566 */
25567 - memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25568 + memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25569 buf[0] = kp->opcode;
25570 - return (unsigned long)buf;
25571 + return ktva_ktla((unsigned long)buf);
25572 }
25573
25574 /*
25575 @@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25576 /* Another subsystem puts a breakpoint, failed to recover */
25577 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25578 return 0;
25579 + pax_open_kernel();
25580 memcpy(dest, insn.kaddr, insn.length);
25581 + pax_close_kernel();
25582
25583 #ifdef CONFIG_X86_64
25584 if (insn_rip_relative(&insn)) {
25585 @@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25586 return 0;
25587 }
25588 disp = (u8 *) dest + insn_offset_displacement(&insn);
25589 + pax_open_kernel();
25590 *(s32 *) disp = (s32) newdisp;
25591 + pax_close_kernel();
25592 }
25593 #endif
25594 return insn.length;
25595 @@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25596 * nor set current_kprobe, because it doesn't use single
25597 * stepping.
25598 */
25599 - regs->ip = (unsigned long)p->ainsn.insn;
25600 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25601 preempt_enable_no_resched();
25602 return;
25603 }
25604 @@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25605 regs->flags &= ~X86_EFLAGS_IF;
25606 /* single step inline if the instruction is an int3 */
25607 if (p->opcode == BREAKPOINT_INSTRUCTION)
25608 - regs->ip = (unsigned long)p->addr;
25609 + regs->ip = ktla_ktva((unsigned long)p->addr);
25610 else
25611 - regs->ip = (unsigned long)p->ainsn.insn;
25612 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25613 }
25614 NOKPROBE_SYMBOL(setup_singlestep);
25615
25616 @@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25617 struct kprobe *p;
25618 struct kprobe_ctlblk *kcb;
25619
25620 - if (user_mode_vm(regs))
25621 + if (user_mode(regs))
25622 return 0;
25623
25624 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25625 @@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25626 setup_singlestep(p, regs, kcb, 0);
25627 return 1;
25628 }
25629 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
25630 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25631 /*
25632 * The breakpoint instruction was removed right
25633 * after we hit it. Another cpu has removed
25634 @@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
25635 " movq %rax, 152(%rsp)\n"
25636 RESTORE_REGS_STRING
25637 " popfq\n"
25638 +#ifdef KERNEXEC_PLUGIN
25639 + " btsq $63,(%rsp)\n"
25640 +#endif
25641 #else
25642 " pushf\n"
25643 SAVE_REGS_STRING
25644 @@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25645 struct kprobe_ctlblk *kcb)
25646 {
25647 unsigned long *tos = stack_addr(regs);
25648 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25649 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25650 unsigned long orig_ip = (unsigned long)p->addr;
25651 kprobe_opcode_t *insn = p->ainsn.insn;
25652
25653 @@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25654 struct die_args *args = data;
25655 int ret = NOTIFY_DONE;
25656
25657 - if (args->regs && user_mode_vm(args->regs))
25658 + if (args->regs && user_mode(args->regs))
25659 return ret;
25660
25661 if (val == DIE_GPF) {
25662 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25663 index f1314d0..15f3154 100644
25664 --- a/arch/x86/kernel/kprobes/opt.c
25665 +++ b/arch/x86/kernel/kprobes/opt.c
25666 @@ -79,6 +79,7 @@ found:
25667 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25668 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25669 {
25670 + pax_open_kernel();
25671 #ifdef CONFIG_X86_64
25672 *addr++ = 0x48;
25673 *addr++ = 0xbf;
25674 @@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25675 *addr++ = 0xb8;
25676 #endif
25677 *(unsigned long *)addr = val;
25678 + pax_close_kernel();
25679 }
25680
25681 asm (
25682 @@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25683 * Verify if the address gap is in 2GB range, because this uses
25684 * a relative jump.
25685 */
25686 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25687 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25688 if (abs(rel) > 0x7fffffff) {
25689 __arch_remove_optimized_kprobe(op, 0);
25690 return -ERANGE;
25691 @@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25692 op->optinsn.size = ret;
25693
25694 /* Copy arch-dep-instance from template */
25695 - memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25696 + pax_open_kernel();
25697 + memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25698 + pax_close_kernel();
25699
25700 /* Set probe information */
25701 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25702
25703 /* Set probe function call */
25704 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25705 + synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25706
25707 /* Set returning jmp instruction at the tail of out-of-line buffer */
25708 - synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25709 + synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25710 (u8 *)op->kp.addr + op->optinsn.size);
25711
25712 flush_icache_range((unsigned long) buf,
25713 @@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25714 WARN_ON(kprobe_disabled(&op->kp));
25715
25716 /* Backup instructions which will be replaced by jump address */
25717 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25718 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25719 RELATIVE_ADDR_SIZE);
25720
25721 insn_buf[0] = RELATIVEJUMP_OPCODE;
25722 @@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25723 /* This kprobe is really able to run optimized path. */
25724 op = container_of(p, struct optimized_kprobe, kp);
25725 /* Detour through copied instructions */
25726 - regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25727 + regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25728 if (!reenter)
25729 reset_current_kprobe();
25730 preempt_enable_no_resched();
25731 diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25732 index c2bedae..25e7ab60 100644
25733 --- a/arch/x86/kernel/ksysfs.c
25734 +++ b/arch/x86/kernel/ksysfs.c
25735 @@ -184,7 +184,7 @@ out:
25736
25737 static struct kobj_attribute type_attr = __ATTR_RO(type);
25738
25739 -static struct bin_attribute data_attr = {
25740 +static bin_attribute_no_const data_attr __read_only = {
25741 .attr = {
25742 .name = "data",
25743 .mode = S_IRUGO,
25744 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25745 index c37886d..d851d32 100644
25746 --- a/arch/x86/kernel/ldt.c
25747 +++ b/arch/x86/kernel/ldt.c
25748 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25749 if (reload) {
25750 #ifdef CONFIG_SMP
25751 preempt_disable();
25752 - load_LDT(pc);
25753 + load_LDT_nolock(pc);
25754 if (!cpumask_equal(mm_cpumask(current->mm),
25755 cpumask_of(smp_processor_id())))
25756 smp_call_function(flush_ldt, current->mm, 1);
25757 preempt_enable();
25758 #else
25759 - load_LDT(pc);
25760 + load_LDT_nolock(pc);
25761 #endif
25762 }
25763 if (oldsize) {
25764 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25765 return err;
25766
25767 for (i = 0; i < old->size; i++)
25768 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25769 + write_ldt_entry(new->ldt, i, old->ldt + i);
25770 return 0;
25771 }
25772
25773 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25774 retval = copy_ldt(&mm->context, &old_mm->context);
25775 mutex_unlock(&old_mm->context.lock);
25776 }
25777 +
25778 + if (tsk == current) {
25779 + mm->context.vdso = 0;
25780 +
25781 +#ifdef CONFIG_X86_32
25782 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25783 + mm->context.user_cs_base = 0UL;
25784 + mm->context.user_cs_limit = ~0UL;
25785 +
25786 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25787 + cpus_clear(mm->context.cpu_user_cs_mask);
25788 +#endif
25789 +
25790 +#endif
25791 +#endif
25792 +
25793 + }
25794 +
25795 return retval;
25796 }
25797
25798 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25799 }
25800 }
25801
25802 +#ifdef CONFIG_PAX_SEGMEXEC
25803 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25804 + error = -EINVAL;
25805 + goto out_unlock;
25806 + }
25807 +#endif
25808 +
25809 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25810 error = -EINVAL;
25811 goto out_unlock;
25812 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25813 index 72e8e31..f2f1605 100644
25814 --- a/arch/x86/kernel/machine_kexec_32.c
25815 +++ b/arch/x86/kernel/machine_kexec_32.c
25816 @@ -25,7 +25,7 @@
25817 #include <asm/cacheflush.h>
25818 #include <asm/debugreg.h>
25819
25820 -static void set_idt(void *newidt, __u16 limit)
25821 +static void set_idt(struct desc_struct *newidt, __u16 limit)
25822 {
25823 struct desc_ptr curidt;
25824
25825 @@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25826 }
25827
25828
25829 -static void set_gdt(void *newgdt, __u16 limit)
25830 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25831 {
25832 struct desc_ptr curgdt;
25833
25834 @@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25835 }
25836
25837 control_page = page_address(image->control_code_page);
25838 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25839 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25840
25841 relocate_kernel_ptr = control_page;
25842 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25843 diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25844 index c73aecf..4c63630 100644
25845 --- a/arch/x86/kernel/mcount_64.S
25846 +++ b/arch/x86/kernel/mcount_64.S
25847 @@ -7,7 +7,7 @@
25848 #include <linux/linkage.h>
25849 #include <asm/ptrace.h>
25850 #include <asm/ftrace.h>
25851 -
25852 +#include <asm/alternative-asm.h>
25853
25854 .code64
25855 .section .entry.text, "ax"
25856 @@ -24,8 +24,9 @@
25857 #ifdef CONFIG_DYNAMIC_FTRACE
25858
25859 ENTRY(function_hook)
25860 + pax_force_retaddr
25861 retq
25862 -END(function_hook)
25863 +ENDPROC(function_hook)
25864
25865 /* skip is set if stack has been adjusted */
25866 .macro ftrace_caller_setup skip=0
25867 @@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
25868 #endif
25869
25870 GLOBAL(ftrace_stub)
25871 + pax_force_retaddr
25872 retq
25873 -END(ftrace_caller)
25874 +ENDPROC(ftrace_caller)
25875
25876 ENTRY(ftrace_regs_caller)
25877 /* Save the current flags before compare (in SS location)*/
25878 @@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
25879 popfq
25880 jmp ftrace_stub
25881
25882 -END(ftrace_regs_caller)
25883 +ENDPROC(ftrace_regs_caller)
25884
25885
25886 #else /* ! CONFIG_DYNAMIC_FTRACE */
25887 @@ -145,6 +147,7 @@ ENTRY(function_hook)
25888 #endif
25889
25890 GLOBAL(ftrace_stub)
25891 + pax_force_retaddr
25892 retq
25893
25894 trace:
25895 @@ -158,12 +161,13 @@ trace:
25896 #endif
25897 subq $MCOUNT_INSN_SIZE, %rdi
25898
25899 + pax_force_fptr ftrace_trace_function
25900 call *ftrace_trace_function
25901
25902 MCOUNT_RESTORE_FRAME
25903
25904 jmp ftrace_stub
25905 -END(function_hook)
25906 +ENDPROC(function_hook)
25907 #endif /* CONFIG_DYNAMIC_FTRACE */
25908 #endif /* CONFIG_FUNCTION_TRACER */
25909
25910 @@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
25911
25912 MCOUNT_RESTORE_FRAME
25913
25914 + pax_force_retaddr
25915 retq
25916 -END(ftrace_graph_caller)
25917 +ENDPROC(ftrace_graph_caller)
25918
25919 GLOBAL(return_to_handler)
25920 subq $24, %rsp
25921 @@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
25922 movq 8(%rsp), %rdx
25923 movq (%rsp), %rax
25924 addq $24, %rsp
25925 + pax_force_fptr %rdi
25926 jmp *%rdi
25927 +ENDPROC(return_to_handler)
25928 #endif
25929 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25930 index e69f988..da078ea 100644
25931 --- a/arch/x86/kernel/module.c
25932 +++ b/arch/x86/kernel/module.c
25933 @@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25934 }
25935 #endif
25936
25937 -void *module_alloc(unsigned long size)
25938 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25939 {
25940 - if (PAGE_ALIGN(size) > MODULES_LEN)
25941 + if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25942 return NULL;
25943 return __vmalloc_node_range(size, 1,
25944 MODULES_VADDR + get_module_load_offset(),
25945 - MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25946 - PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25947 + MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25948 + prot, NUMA_NO_NODE,
25949 __builtin_return_address(0));
25950 }
25951
25952 +void *module_alloc(unsigned long size)
25953 +{
25954 +
25955 +#ifdef CONFIG_PAX_KERNEXEC
25956 + return __module_alloc(size, PAGE_KERNEL);
25957 +#else
25958 + return __module_alloc(size, PAGE_KERNEL_EXEC);
25959 +#endif
25960 +
25961 +}
25962 +
25963 +#ifdef CONFIG_PAX_KERNEXEC
25964 +#ifdef CONFIG_X86_32
25965 +void *module_alloc_exec(unsigned long size)
25966 +{
25967 + struct vm_struct *area;
25968 +
25969 + if (size == 0)
25970 + return NULL;
25971 +
25972 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25973 +return area ? area->addr : NULL;
25974 +}
25975 +EXPORT_SYMBOL(module_alloc_exec);
25976 +
25977 +void module_free_exec(struct module *mod, void *module_region)
25978 +{
25979 + vunmap(module_region);
25980 +}
25981 +EXPORT_SYMBOL(module_free_exec);
25982 +#else
25983 +void module_free_exec(struct module *mod, void *module_region)
25984 +{
25985 + module_free(mod, module_region);
25986 +}
25987 +EXPORT_SYMBOL(module_free_exec);
25988 +
25989 +void *module_alloc_exec(unsigned long size)
25990 +{
25991 + return __module_alloc(size, PAGE_KERNEL_RX);
25992 +}
25993 +EXPORT_SYMBOL(module_alloc_exec);
25994 +#endif
25995 +#endif
25996 +
25997 #ifdef CONFIG_X86_32
25998 int apply_relocate(Elf32_Shdr *sechdrs,
25999 const char *strtab,
26000 @@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26001 unsigned int i;
26002 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26003 Elf32_Sym *sym;
26004 - uint32_t *location;
26005 + uint32_t *plocation, location;
26006
26007 DEBUGP("Applying relocate section %u to %u\n",
26008 relsec, sechdrs[relsec].sh_info);
26009 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26010 /* This is where to make the change */
26011 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26012 - + rel[i].r_offset;
26013 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26014 + location = (uint32_t)plocation;
26015 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26016 + plocation = ktla_ktva((void *)plocation);
26017 /* This is the symbol it is referring to. Note that all
26018 undefined symbols have been resolved. */
26019 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26020 @@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26021 switch (ELF32_R_TYPE(rel[i].r_info)) {
26022 case R_386_32:
26023 /* We add the value into the location given */
26024 - *location += sym->st_value;
26025 + pax_open_kernel();
26026 + *plocation += sym->st_value;
26027 + pax_close_kernel();
26028 break;
26029 case R_386_PC32:
26030 /* Add the value, subtract its position */
26031 - *location += sym->st_value - (uint32_t)location;
26032 + pax_open_kernel();
26033 + *plocation += sym->st_value - location;
26034 + pax_close_kernel();
26035 break;
26036 default:
26037 pr_err("%s: Unknown relocation: %u\n",
26038 @@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26039 case R_X86_64_NONE:
26040 break;
26041 case R_X86_64_64:
26042 + pax_open_kernel();
26043 *(u64 *)loc = val;
26044 + pax_close_kernel();
26045 break;
26046 case R_X86_64_32:
26047 + pax_open_kernel();
26048 *(u32 *)loc = val;
26049 + pax_close_kernel();
26050 if (val != *(u32 *)loc)
26051 goto overflow;
26052 break;
26053 case R_X86_64_32S:
26054 + pax_open_kernel();
26055 *(s32 *)loc = val;
26056 + pax_close_kernel();
26057 if ((s64)val != *(s32 *)loc)
26058 goto overflow;
26059 break;
26060 case R_X86_64_PC32:
26061 val -= (u64)loc;
26062 + pax_open_kernel();
26063 *(u32 *)loc = val;
26064 + pax_close_kernel();
26065 +
26066 #if 0
26067 if ((s64)val != *(s32 *)loc)
26068 goto overflow;
26069 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26070 index c9603ac..9f88728 100644
26071 --- a/arch/x86/kernel/msr.c
26072 +++ b/arch/x86/kernel/msr.c
26073 @@ -37,6 +37,7 @@
26074 #include <linux/notifier.h>
26075 #include <linux/uaccess.h>
26076 #include <linux/gfp.h>
26077 +#include <linux/grsecurity.h>
26078
26079 #include <asm/processor.h>
26080 #include <asm/msr.h>
26081 @@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26082 int err = 0;
26083 ssize_t bytes = 0;
26084
26085 +#ifdef CONFIG_GRKERNSEC_KMEM
26086 + gr_handle_msr_write();
26087 + return -EPERM;
26088 +#endif
26089 +
26090 if (count % 8)
26091 return -EINVAL; /* Invalid chunk size */
26092
26093 @@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26094 err = -EBADF;
26095 break;
26096 }
26097 +#ifdef CONFIG_GRKERNSEC_KMEM
26098 + gr_handle_msr_write();
26099 + return -EPERM;
26100 +#endif
26101 if (copy_from_user(&regs, uregs, sizeof regs)) {
26102 err = -EFAULT;
26103 break;
26104 @@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26105 return notifier_from_errno(err);
26106 }
26107
26108 -static struct notifier_block __refdata msr_class_cpu_notifier = {
26109 +static struct notifier_block msr_class_cpu_notifier = {
26110 .notifier_call = msr_class_cpu_callback,
26111 };
26112
26113 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26114 index c3e985d..110a36a 100644
26115 --- a/arch/x86/kernel/nmi.c
26116 +++ b/arch/x86/kernel/nmi.c
26117 @@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26118
26119 static void nmi_max_handler(struct irq_work *w)
26120 {
26121 - struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26122 + struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26123 int remainder_ns, decimal_msecs;
26124 - u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26125 + u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26126
26127 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26128 decimal_msecs = remainder_ns / 1000;
26129
26130 printk_ratelimited(KERN_INFO
26131 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26132 - a->handler, whole_msecs, decimal_msecs);
26133 + n->action->handler, whole_msecs, decimal_msecs);
26134 }
26135
26136 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26137 @@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26138 delta = sched_clock() - delta;
26139 trace_nmi_handler(a->handler, (int)delta, thishandled);
26140
26141 - if (delta < nmi_longest_ns || delta < a->max_duration)
26142 + if (delta < nmi_longest_ns || delta < a->work->max_duration)
26143 continue;
26144
26145 - a->max_duration = delta;
26146 - irq_work_queue(&a->irq_work);
26147 + a->work->max_duration = delta;
26148 + irq_work_queue(&a->work->irq_work);
26149 }
26150
26151 rcu_read_unlock();
26152 @@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26153 }
26154 NOKPROBE_SYMBOL(nmi_handle);
26155
26156 -int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26157 +int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26158 {
26159 struct nmi_desc *desc = nmi_to_desc(type);
26160 unsigned long flags;
26161 @@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26162 if (!action->handler)
26163 return -EINVAL;
26164
26165 - init_irq_work(&action->irq_work, nmi_max_handler);
26166 + action->work->action = action;
26167 + init_irq_work(&action->work->irq_work, nmi_max_handler);
26168
26169 spin_lock_irqsave(&desc->lock, flags);
26170
26171 @@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26172 * event confuses some handlers (kdump uses this flag)
26173 */
26174 if (action->flags & NMI_FLAG_FIRST)
26175 - list_add_rcu(&action->list, &desc->head);
26176 + pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26177 else
26178 - list_add_tail_rcu(&action->list, &desc->head);
26179 + pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26180
26181 spin_unlock_irqrestore(&desc->lock, flags);
26182 return 0;
26183 @@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26184 if (!strcmp(n->name, name)) {
26185 WARN(in_nmi(),
26186 "Trying to free NMI (%s) from NMI context!\n", n->name);
26187 - list_del_rcu(&n->list);
26188 + pax_list_del_rcu((struct list_head *)&n->list);
26189 break;
26190 }
26191 }
26192 @@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26193 dotraplinkage notrace void
26194 do_nmi(struct pt_regs *regs, long error_code)
26195 {
26196 +
26197 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26198 + if (!user_mode(regs)) {
26199 + unsigned long cs = regs->cs & 0xFFFF;
26200 + unsigned long ip = ktva_ktla(regs->ip);
26201 +
26202 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26203 + regs->ip = ip;
26204 + }
26205 +#endif
26206 +
26207 nmi_nesting_preprocess(regs);
26208
26209 nmi_enter();
26210 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26211 index 6d9582e..f746287 100644
26212 --- a/arch/x86/kernel/nmi_selftest.c
26213 +++ b/arch/x86/kernel/nmi_selftest.c
26214 @@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26215 {
26216 /* trap all the unknown NMIs we may generate */
26217 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26218 - __initdata);
26219 + __initconst);
26220 }
26221
26222 static void __init cleanup_nmi_testsuite(void)
26223 @@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26224 unsigned long timeout;
26225
26226 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26227 - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26228 + NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26229 nmi_fail = FAILURE;
26230 return;
26231 }
26232 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26233 index bbb6c73..24a58ef 100644
26234 --- a/arch/x86/kernel/paravirt-spinlocks.c
26235 +++ b/arch/x86/kernel/paravirt-spinlocks.c
26236 @@ -8,7 +8,7 @@
26237
26238 #include <asm/paravirt.h>
26239
26240 -struct pv_lock_ops pv_lock_ops = {
26241 +struct pv_lock_ops pv_lock_ops __read_only = {
26242 #ifdef CONFIG_SMP
26243 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26244 .unlock_kick = paravirt_nop,
26245 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26246 index 548d25f..f8fb99c 100644
26247 --- a/arch/x86/kernel/paravirt.c
26248 +++ b/arch/x86/kernel/paravirt.c
26249 @@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26250 {
26251 return x;
26252 }
26253 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26254 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26255 +#endif
26256
26257 void __init default_banner(void)
26258 {
26259 @@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26260
26261 if (opfunc == NULL)
26262 /* If there's no function, patch it with a ud2a (BUG) */
26263 - ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26264 - else if (opfunc == _paravirt_nop)
26265 + ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26266 + else if (opfunc == (void *)_paravirt_nop)
26267 /* If the operation is a nop, then nop the callsite */
26268 ret = paravirt_patch_nop();
26269
26270 /* identity functions just return their single argument */
26271 - else if (opfunc == _paravirt_ident_32)
26272 + else if (opfunc == (void *)_paravirt_ident_32)
26273 ret = paravirt_patch_ident_32(insnbuf, len);
26274 - else if (opfunc == _paravirt_ident_64)
26275 + else if (opfunc == (void *)_paravirt_ident_64)
26276 ret = paravirt_patch_ident_64(insnbuf, len);
26277 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26278 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26279 + ret = paravirt_patch_ident_64(insnbuf, len);
26280 +#endif
26281
26282 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26283 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26284 @@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26285 if (insn_len > len || start == NULL)
26286 insn_len = len;
26287 else
26288 - memcpy(insnbuf, start, insn_len);
26289 + memcpy(insnbuf, ktla_ktva(start), insn_len);
26290
26291 return insn_len;
26292 }
26293 @@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26294 return this_cpu_read(paravirt_lazy_mode);
26295 }
26296
26297 -struct pv_info pv_info = {
26298 +struct pv_info pv_info __read_only = {
26299 .name = "bare hardware",
26300 .paravirt_enabled = 0,
26301 .kernel_rpl = 0,
26302 @@ -311,16 +318,16 @@ struct pv_info pv_info = {
26303 #endif
26304 };
26305
26306 -struct pv_init_ops pv_init_ops = {
26307 +struct pv_init_ops pv_init_ops __read_only = {
26308 .patch = native_patch,
26309 };
26310
26311 -struct pv_time_ops pv_time_ops = {
26312 +struct pv_time_ops pv_time_ops __read_only = {
26313 .sched_clock = native_sched_clock,
26314 .steal_clock = native_steal_clock,
26315 };
26316
26317 -__visible struct pv_irq_ops pv_irq_ops = {
26318 +__visible struct pv_irq_ops pv_irq_ops __read_only = {
26319 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26320 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26321 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26322 @@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26323 #endif
26324 };
26325
26326 -__visible struct pv_cpu_ops pv_cpu_ops = {
26327 +__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26328 .cpuid = native_cpuid,
26329 .get_debugreg = native_get_debugreg,
26330 .set_debugreg = native_set_debugreg,
26331 @@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26332 NOKPROBE_SYMBOL(native_set_debugreg);
26333 NOKPROBE_SYMBOL(native_load_idt);
26334
26335 -struct pv_apic_ops pv_apic_ops = {
26336 +struct pv_apic_ops pv_apic_ops __read_only= {
26337 #ifdef CONFIG_X86_LOCAL_APIC
26338 .startup_ipi_hook = paravirt_nop,
26339 #endif
26340 };
26341
26342 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26343 +#ifdef CONFIG_X86_32
26344 +#ifdef CONFIG_X86_PAE
26345 +/* 64-bit pagetable entries */
26346 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26347 +#else
26348 /* 32-bit pagetable entries */
26349 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26350 +#endif
26351 #else
26352 /* 64-bit pagetable entries */
26353 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26354 #endif
26355
26356 -struct pv_mmu_ops pv_mmu_ops = {
26357 +struct pv_mmu_ops pv_mmu_ops __read_only = {
26358
26359 .read_cr2 = native_read_cr2,
26360 .write_cr2 = native_write_cr2,
26361 @@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26362 .make_pud = PTE_IDENT,
26363
26364 .set_pgd = native_set_pgd,
26365 + .set_pgd_batched = native_set_pgd_batched,
26366 #endif
26367 #endif /* PAGETABLE_LEVELS >= 3 */
26368
26369 @@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26370 },
26371
26372 .set_fixmap = native_set_fixmap,
26373 +
26374 +#ifdef CONFIG_PAX_KERNEXEC
26375 + .pax_open_kernel = native_pax_open_kernel,
26376 + .pax_close_kernel = native_pax_close_kernel,
26377 +#endif
26378 +
26379 };
26380
26381 EXPORT_SYMBOL_GPL(pv_time_ops);
26382 diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26383 index a1da673..b6f5831 100644
26384 --- a/arch/x86/kernel/paravirt_patch_64.c
26385 +++ b/arch/x86/kernel/paravirt_patch_64.c
26386 @@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26387 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26388 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26389 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26390 +
26391 +#ifndef CONFIG_PAX_MEMORY_UDEREF
26392 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26393 +#endif
26394 +
26395 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26396 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26397
26398 @@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26399 PATCH_SITE(pv_mmu_ops, read_cr3);
26400 PATCH_SITE(pv_mmu_ops, write_cr3);
26401 PATCH_SITE(pv_cpu_ops, clts);
26402 +
26403 +#ifndef CONFIG_PAX_MEMORY_UDEREF
26404 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26405 +#endif
26406 +
26407 PATCH_SITE(pv_cpu_ops, wbinvd);
26408
26409 patch_site:
26410 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26411 index 0497f71..7186c0d 100644
26412 --- a/arch/x86/kernel/pci-calgary_64.c
26413 +++ b/arch/x86/kernel/pci-calgary_64.c
26414 @@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26415 tce_space = be64_to_cpu(readq(target));
26416 tce_space = tce_space & TAR_SW_BITS;
26417
26418 - tce_space = tce_space & (~specified_table_size);
26419 + tce_space = tce_space & (~(unsigned long)specified_table_size);
26420 info->tce_space = (u64 *)__va(tce_space);
26421 }
26422 }
26423 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26424 index 35ccf75..7a15747 100644
26425 --- a/arch/x86/kernel/pci-iommu_table.c
26426 +++ b/arch/x86/kernel/pci-iommu_table.c
26427 @@ -2,7 +2,7 @@
26428 #include <asm/iommu_table.h>
26429 #include <linux/string.h>
26430 #include <linux/kallsyms.h>
26431 -
26432 +#include <linux/sched.h>
26433
26434 #define DEBUG 1
26435
26436 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26437 index 77dd0ad..9ec4723 100644
26438 --- a/arch/x86/kernel/pci-swiotlb.c
26439 +++ b/arch/x86/kernel/pci-swiotlb.c
26440 @@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26441 struct dma_attrs *attrs)
26442 {
26443 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26444 - swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26445 + swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26446 else
26447 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26448 }
26449 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26450 index e127dda..94e384d 100644
26451 --- a/arch/x86/kernel/process.c
26452 +++ b/arch/x86/kernel/process.c
26453 @@ -36,7 +36,8 @@
26454 * section. Since TSS's are completely CPU-local, we want them
26455 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26456 */
26457 -__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26458 +struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26459 +EXPORT_SYMBOL(init_tss);
26460
26461 #ifdef CONFIG_X86_64
26462 static DEFINE_PER_CPU(unsigned char, is_idle);
26463 @@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26464 task_xstate_cachep =
26465 kmem_cache_create("task_xstate", xstate_size,
26466 __alignof__(union thread_xstate),
26467 - SLAB_PANIC | SLAB_NOTRACK, NULL);
26468 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26469 setup_xstate_comp();
26470 }
26471
26472 @@ -108,7 +109,7 @@ void exit_thread(void)
26473 unsigned long *bp = t->io_bitmap_ptr;
26474
26475 if (bp) {
26476 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26477 + struct tss_struct *tss = init_tss + get_cpu();
26478
26479 t->io_bitmap_ptr = NULL;
26480 clear_thread_flag(TIF_IO_BITMAP);
26481 @@ -128,6 +129,9 @@ void flush_thread(void)
26482 {
26483 struct task_struct *tsk = current;
26484
26485 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26486 + loadsegment(gs, 0);
26487 +#endif
26488 flush_ptrace_hw_breakpoint(tsk);
26489 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26490 drop_init_fpu(tsk);
26491 @@ -274,7 +278,7 @@ static void __exit_idle(void)
26492 void exit_idle(void)
26493 {
26494 /* idle loop has pid 0 */
26495 - if (current->pid)
26496 + if (task_pid_nr(current))
26497 return;
26498 __exit_idle();
26499 }
26500 @@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26501 return ret;
26502 }
26503 #endif
26504 -void stop_this_cpu(void *dummy)
26505 +__noreturn void stop_this_cpu(void *dummy)
26506 {
26507 local_irq_disable();
26508 /*
26509 @@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26510 }
26511 early_param("idle", idle_setup);
26512
26513 -unsigned long arch_align_stack(unsigned long sp)
26514 +#ifdef CONFIG_PAX_RANDKSTACK
26515 +void pax_randomize_kstack(struct pt_regs *regs)
26516 {
26517 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26518 - sp -= get_random_int() % 8192;
26519 - return sp & ~0xf;
26520 -}
26521 + struct thread_struct *thread = &current->thread;
26522 + unsigned long time;
26523
26524 -unsigned long arch_randomize_brk(struct mm_struct *mm)
26525 -{
26526 - unsigned long range_end = mm->brk + 0x02000000;
26527 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26528 -}
26529 + if (!randomize_va_space)
26530 + return;
26531 +
26532 + if (v8086_mode(regs))
26533 + return;
26534
26535 + rdtscl(time);
26536 +
26537 + /* P4 seems to return a 0 LSB, ignore it */
26538 +#ifdef CONFIG_MPENTIUM4
26539 + time &= 0x3EUL;
26540 + time <<= 2;
26541 +#elif defined(CONFIG_X86_64)
26542 + time &= 0xFUL;
26543 + time <<= 4;
26544 +#else
26545 + time &= 0x1FUL;
26546 + time <<= 3;
26547 +#endif
26548 +
26549 + thread->sp0 ^= time;
26550 + load_sp0(init_tss + smp_processor_id(), thread);
26551 +
26552 +#ifdef CONFIG_X86_64
26553 + this_cpu_write(kernel_stack, thread->sp0);
26554 +#endif
26555 +}
26556 +#endif
26557 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26558 index 8f3ebfe..e6ced5a 100644
26559 --- a/arch/x86/kernel/process_32.c
26560 +++ b/arch/x86/kernel/process_32.c
26561 @@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26562 unsigned long thread_saved_pc(struct task_struct *tsk)
26563 {
26564 return ((unsigned long *)tsk->thread.sp)[3];
26565 +//XXX return tsk->thread.eip;
26566 }
26567
26568 void __show_regs(struct pt_regs *regs, int all)
26569 @@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26570 unsigned long sp;
26571 unsigned short ss, gs;
26572
26573 - if (user_mode_vm(regs)) {
26574 + if (user_mode(regs)) {
26575 sp = regs->sp;
26576 ss = regs->ss & 0xffff;
26577 - gs = get_user_gs(regs);
26578 } else {
26579 sp = kernel_stack_pointer(regs);
26580 savesegment(ss, ss);
26581 - savesegment(gs, gs);
26582 }
26583 + gs = get_user_gs(regs);
26584
26585 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26586 (u16)regs->cs, regs->ip, regs->flags,
26587 - smp_processor_id());
26588 + raw_smp_processor_id());
26589 print_symbol("EIP is at %s\n", regs->ip);
26590
26591 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26592 @@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26593 int copy_thread(unsigned long clone_flags, unsigned long sp,
26594 unsigned long arg, struct task_struct *p)
26595 {
26596 - struct pt_regs *childregs = task_pt_regs(p);
26597 + struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26598 struct task_struct *tsk;
26599 int err;
26600
26601 p->thread.sp = (unsigned long) childregs;
26602 p->thread.sp0 = (unsigned long) (childregs+1);
26603 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26604 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26605
26606 if (unlikely(p->flags & PF_KTHREAD)) {
26607 /* kernel thread */
26608 memset(childregs, 0, sizeof(struct pt_regs));
26609 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26610 - task_user_gs(p) = __KERNEL_STACK_CANARY;
26611 - childregs->ds = __USER_DS;
26612 - childregs->es = __USER_DS;
26613 + savesegment(gs, childregs->gs);
26614 + childregs->ds = __KERNEL_DS;
26615 + childregs->es = __KERNEL_DS;
26616 childregs->fs = __KERNEL_PERCPU;
26617 childregs->bx = sp; /* function */
26618 childregs->bp = arg;
26619 @@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26620 struct thread_struct *prev = &prev_p->thread,
26621 *next = &next_p->thread;
26622 int cpu = smp_processor_id();
26623 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26624 + struct tss_struct *tss = init_tss + cpu;
26625 fpu_switch_t fpu;
26626
26627 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26628 @@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26629 */
26630 lazy_save_gs(prev->gs);
26631
26632 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26633 + __set_fs(task_thread_info(next_p)->addr_limit);
26634 +#endif
26635 +
26636 /*
26637 * Load the per-thread Thread-Local Storage descriptor.
26638 */
26639 @@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26640 */
26641 arch_end_context_switch(next_p);
26642
26643 - this_cpu_write(kernel_stack,
26644 - (unsigned long)task_stack_page(next_p) +
26645 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26646 + this_cpu_write(current_task, next_p);
26647 + this_cpu_write(current_tinfo, &next_p->tinfo);
26648 + this_cpu_write(kernel_stack, next->sp0);
26649
26650 /*
26651 * Restore %gs if needed (which is common)
26652 @@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26653
26654 switch_fpu_finish(next_p, fpu);
26655
26656 - this_cpu_write(current_task, next_p);
26657 -
26658 return prev_p;
26659 }
26660
26661 @@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26662 } while (count++ < 16);
26663 return 0;
26664 }
26665 -
26666 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26667 index 5a2c029..a7f67d3 100644
26668 --- a/arch/x86/kernel/process_64.c
26669 +++ b/arch/x86/kernel/process_64.c
26670 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26671 struct pt_regs *childregs;
26672 struct task_struct *me = current;
26673
26674 - p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26675 + p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26676 childregs = task_pt_regs(p);
26677 p->thread.sp = (unsigned long) childregs;
26678 p->thread.usersp = me->thread.usersp;
26679 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26680 set_tsk_thread_flag(p, TIF_FORK);
26681 p->thread.io_bitmap_ptr = NULL;
26682
26683 @@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26684 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26685 savesegment(es, p->thread.es);
26686 savesegment(ds, p->thread.ds);
26687 + savesegment(ss, p->thread.ss);
26688 + BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26689 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26690
26691 if (unlikely(p->flags & PF_KTHREAD)) {
26692 @@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26693 struct thread_struct *prev = &prev_p->thread;
26694 struct thread_struct *next = &next_p->thread;
26695 int cpu = smp_processor_id();
26696 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26697 + struct tss_struct *tss = init_tss + cpu;
26698 unsigned fsindex, gsindex;
26699 fpu_switch_t fpu;
26700
26701 @@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26702 if (unlikely(next->ds | prev->ds))
26703 loadsegment(ds, next->ds);
26704
26705 + savesegment(ss, prev->ss);
26706 + if (unlikely(next->ss != prev->ss))
26707 + loadsegment(ss, next->ss);
26708 +
26709 /*
26710 * Switch FS and GS.
26711 *
26712 @@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26713 prev->usersp = this_cpu_read(old_rsp);
26714 this_cpu_write(old_rsp, next->usersp);
26715 this_cpu_write(current_task, next_p);
26716 + this_cpu_write(current_tinfo, &next_p->tinfo);
26717
26718 /*
26719 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26720 @@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26721 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26722 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26723
26724 - this_cpu_write(kernel_stack,
26725 - (unsigned long)task_stack_page(next_p) +
26726 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26727 + this_cpu_write(kernel_stack, next->sp0);
26728
26729 /*
26730 * Now maybe reload the debug registers and handle I/O bitmaps
26731 @@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26732 if (!p || p == current || p->state == TASK_RUNNING)
26733 return 0;
26734 stack = (unsigned long)task_stack_page(p);
26735 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26736 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26737 return 0;
26738 fp = *(u64 *)(p->thread.sp);
26739 do {
26740 - if (fp < (unsigned long)stack ||
26741 - fp >= (unsigned long)stack+THREAD_SIZE)
26742 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26743 return 0;
26744 ip = *(u64 *)(fp+8);
26745 if (!in_sched_functions(ip))
26746 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26747 index e510618..5165ac0 100644
26748 --- a/arch/x86/kernel/ptrace.c
26749 +++ b/arch/x86/kernel/ptrace.c
26750 @@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26751 unsigned long sp = (unsigned long)&regs->sp;
26752 u32 *prev_esp;
26753
26754 - if (context == (sp & ~(THREAD_SIZE - 1)))
26755 + if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26756 return sp;
26757
26758 - prev_esp = (u32 *)(context);
26759 + prev_esp = *(u32 **)(context);
26760 if (prev_esp)
26761 return (unsigned long)prev_esp;
26762
26763 @@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26764 if (child->thread.gs != value)
26765 return do_arch_prctl(child, ARCH_SET_GS, value);
26766 return 0;
26767 +
26768 + case offsetof(struct user_regs_struct,ip):
26769 + /*
26770 + * Protect against any attempt to set ip to an
26771 + * impossible address. There are dragons lurking if the
26772 + * address is noncanonical. (This explicitly allows
26773 + * setting ip to TASK_SIZE_MAX, because user code can do
26774 + * that all by itself by running off the end of its
26775 + * address space.
26776 + */
26777 + if (value > TASK_SIZE_MAX)
26778 + return -EIO;
26779 + break;
26780 +
26781 #endif
26782 }
26783
26784 @@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26785 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26786 {
26787 int i;
26788 - int dr7 = 0;
26789 + unsigned long dr7 = 0;
26790 struct arch_hw_breakpoint *info;
26791
26792 for (i = 0; i < HBP_NUM; i++) {
26793 @@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26794 unsigned long addr, unsigned long data)
26795 {
26796 int ret;
26797 - unsigned long __user *datap = (unsigned long __user *)data;
26798 + unsigned long __user *datap = (__force unsigned long __user *)data;
26799
26800 switch (request) {
26801 /* read the word at location addr in the USER area. */
26802 @@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26803 if ((int) addr < 0)
26804 return -EIO;
26805 ret = do_get_thread_area(child, addr,
26806 - (struct user_desc __user *)data);
26807 + (__force struct user_desc __user *) data);
26808 break;
26809
26810 case PTRACE_SET_THREAD_AREA:
26811 if ((int) addr < 0)
26812 return -EIO;
26813 ret = do_set_thread_area(child, addr,
26814 - (struct user_desc __user *)data, 0);
26815 + (__force struct user_desc __user *) data, 0);
26816 break;
26817 #endif
26818
26819 @@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26820
26821 #ifdef CONFIG_X86_64
26822
26823 -static struct user_regset x86_64_regsets[] __read_mostly = {
26824 +static user_regset_no_const x86_64_regsets[] __read_only = {
26825 [REGSET_GENERAL] = {
26826 .core_note_type = NT_PRSTATUS,
26827 .n = sizeof(struct user_regs_struct) / sizeof(long),
26828 @@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26829 #endif /* CONFIG_X86_64 */
26830
26831 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26832 -static struct user_regset x86_32_regsets[] __read_mostly = {
26833 +static user_regset_no_const x86_32_regsets[] __read_only = {
26834 [REGSET_GENERAL] = {
26835 .core_note_type = NT_PRSTATUS,
26836 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26837 @@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26838 */
26839 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26840
26841 -void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26842 +void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26843 {
26844 #ifdef CONFIG_X86_64
26845 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26846 @@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26847 memset(info, 0, sizeof(*info));
26848 info->si_signo = SIGTRAP;
26849 info->si_code = si_code;
26850 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26851 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26852 }
26853
26854 void user_single_step_siginfo(struct task_struct *tsk,
26855 @@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26856 }
26857 }
26858
26859 +#ifdef CONFIG_GRKERNSEC_SETXID
26860 +extern void gr_delayed_cred_worker(void);
26861 +#endif
26862 +
26863 /*
26864 * We can return 0 to resume the syscall or anything else to go to phase
26865 * 2. If we resume the syscall, we need to put something appropriate in
26866 @@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26867
26868 BUG_ON(regs != task_pt_regs(current));
26869
26870 +#ifdef CONFIG_GRKERNSEC_SETXID
26871 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26872 + gr_delayed_cred_worker();
26873 +#endif
26874 +
26875 /*
26876 * If we stepped into a sysenter/syscall insn, it trapped in
26877 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26878 @@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26879 */
26880 user_exit();
26881
26882 +#ifdef CONFIG_GRKERNSEC_SETXID
26883 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26884 + gr_delayed_cred_worker();
26885 +#endif
26886 +
26887 audit_syscall_exit(regs);
26888
26889 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26890 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26891 index 2f355d2..e75ed0a 100644
26892 --- a/arch/x86/kernel/pvclock.c
26893 +++ b/arch/x86/kernel/pvclock.c
26894 @@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26895 reset_hung_task_detector();
26896 }
26897
26898 -static atomic64_t last_value = ATOMIC64_INIT(0);
26899 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26900
26901 void pvclock_resume(void)
26902 {
26903 - atomic64_set(&last_value, 0);
26904 + atomic64_set_unchecked(&last_value, 0);
26905 }
26906
26907 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26908 @@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26909 * updating at the same time, and one of them could be slightly behind,
26910 * making the assumption that last_value always go forward fail to hold.
26911 */
26912 - last = atomic64_read(&last_value);
26913 + last = atomic64_read_unchecked(&last_value);
26914 do {
26915 if (ret < last)
26916 return last;
26917 - last = atomic64_cmpxchg(&last_value, last, ret);
26918 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26919 } while (unlikely(last != ret));
26920
26921 return ret;
26922 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26923 index 17962e6..47f55db 100644
26924 --- a/arch/x86/kernel/reboot.c
26925 +++ b/arch/x86/kernel/reboot.c
26926 @@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26927
26928 void __noreturn machine_real_restart(unsigned int type)
26929 {
26930 +
26931 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26932 + struct desc_struct *gdt;
26933 +#endif
26934 +
26935 local_irq_disable();
26936
26937 /*
26938 @@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
26939
26940 /* Jump to the identity-mapped low memory code */
26941 #ifdef CONFIG_X86_32
26942 - asm volatile("jmpl *%0" : :
26943 +
26944 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26945 + gdt = get_cpu_gdt_table(smp_processor_id());
26946 + pax_open_kernel();
26947 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26948 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26949 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26950 + loadsegment(ds, __KERNEL_DS);
26951 + loadsegment(es, __KERNEL_DS);
26952 + loadsegment(ss, __KERNEL_DS);
26953 +#endif
26954 +#ifdef CONFIG_PAX_KERNEXEC
26955 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26956 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26957 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26958 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26959 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26960 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26961 +#endif
26962 + pax_close_kernel();
26963 +#endif
26964 +
26965 + asm volatile("ljmpl *%0" : :
26966 "rm" (real_mode_header->machine_real_restart_asm),
26967 "a" (type));
26968 #else
26969 @@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26970 * This means that this function can never return, it can misbehave
26971 * by not rebooting properly and hanging.
26972 */
26973 -static void native_machine_emergency_restart(void)
26974 +static void __noreturn native_machine_emergency_restart(void)
26975 {
26976 int i;
26977 int attempt = 0;
26978 @@ -620,13 +647,13 @@ void native_machine_shutdown(void)
26979 #endif
26980 }
26981
26982 -static void __machine_emergency_restart(int emergency)
26983 +static void __noreturn __machine_emergency_restart(int emergency)
26984 {
26985 reboot_emergency = emergency;
26986 machine_ops.emergency_restart();
26987 }
26988
26989 -static void native_machine_restart(char *__unused)
26990 +static void __noreturn native_machine_restart(char *__unused)
26991 {
26992 pr_notice("machine restart\n");
26993
26994 @@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
26995 __machine_emergency_restart(0);
26996 }
26997
26998 -static void native_machine_halt(void)
26999 +static void __noreturn native_machine_halt(void)
27000 {
27001 /* Stop other cpus and apics */
27002 machine_shutdown();
27003 @@ -645,7 +672,7 @@ static void native_machine_halt(void)
27004 stop_this_cpu(NULL);
27005 }
27006
27007 -static void native_machine_power_off(void)
27008 +static void __noreturn native_machine_power_off(void)
27009 {
27010 if (pm_power_off) {
27011 if (!reboot_force)
27012 @@ -654,9 +681,10 @@ static void native_machine_power_off(void)
27013 }
27014 /* A fallback in case there is no PM info available */
27015 tboot_shutdown(TB_SHUTDOWN_HALT);
27016 + unreachable();
27017 }
27018
27019 -struct machine_ops machine_ops = {
27020 +struct machine_ops machine_ops __read_only = {
27021 .power_off = native_machine_power_off,
27022 .shutdown = native_machine_shutdown,
27023 .emergency_restart = native_machine_emergency_restart,
27024 diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27025 index c8e41e9..64049ef 100644
27026 --- a/arch/x86/kernel/reboot_fixups_32.c
27027 +++ b/arch/x86/kernel/reboot_fixups_32.c
27028 @@ -57,7 +57,7 @@ struct device_fixup {
27029 unsigned int vendor;
27030 unsigned int device;
27031 void (*reboot_fixup)(struct pci_dev *);
27032 -};
27033 +} __do_const;
27034
27035 /*
27036 * PCI ids solely used for fixups_table go here
27037 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27038 index 3fd2c69..a444264 100644
27039 --- a/arch/x86/kernel/relocate_kernel_64.S
27040 +++ b/arch/x86/kernel/relocate_kernel_64.S
27041 @@ -96,8 +96,7 @@ relocate_kernel:
27042
27043 /* jump to identity mapped page */
27044 addq $(identity_mapped - relocate_kernel), %r8
27045 - pushq %r8
27046 - ret
27047 + jmp *%r8
27048
27049 identity_mapped:
27050 /* set return address to 0 if not preserving context */
27051 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27052 index ab08aa2..6d74a3a 100644
27053 --- a/arch/x86/kernel/setup.c
27054 +++ b/arch/x86/kernel/setup.c
27055 @@ -110,6 +110,7 @@
27056 #include <asm/mce.h>
27057 #include <asm/alternative.h>
27058 #include <asm/prom.h>
27059 +#include <asm/boot.h>
27060
27061 /*
27062 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27063 @@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27064 #endif
27065
27066
27067 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27068 -__visible unsigned long mmu_cr4_features;
27069 +#ifdef CONFIG_X86_64
27070 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27071 +#elif defined(CONFIG_X86_PAE)
27072 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27073 #else
27074 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27075 +__visible unsigned long mmu_cr4_features __read_only;
27076 #endif
27077
27078 +void set_in_cr4(unsigned long mask)
27079 +{
27080 + unsigned long cr4 = read_cr4();
27081 +
27082 + if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27083 + return;
27084 +
27085 + pax_open_kernel();
27086 + mmu_cr4_features |= mask;
27087 + pax_close_kernel();
27088 +
27089 + if (trampoline_cr4_features)
27090 + *trampoline_cr4_features = mmu_cr4_features;
27091 + cr4 |= mask;
27092 + write_cr4(cr4);
27093 +}
27094 +EXPORT_SYMBOL(set_in_cr4);
27095 +
27096 +void clear_in_cr4(unsigned long mask)
27097 +{
27098 + unsigned long cr4 = read_cr4();
27099 +
27100 + if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27101 + return;
27102 +
27103 + pax_open_kernel();
27104 + mmu_cr4_features &= ~mask;
27105 + pax_close_kernel();
27106 +
27107 + if (trampoline_cr4_features)
27108 + *trampoline_cr4_features = mmu_cr4_features;
27109 + cr4 &= ~mask;
27110 + write_cr4(cr4);
27111 +}
27112 +EXPORT_SYMBOL(clear_in_cr4);
27113 +
27114 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27115 int bootloader_type, bootloader_version;
27116
27117 @@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27118 * area (640->1Mb) as ram even though it is not.
27119 * take them out.
27120 */
27121 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27122 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27123
27124 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27125 }
27126 @@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27127 /* called before trim_bios_range() to spare extra sanitize */
27128 static void __init e820_add_kernel_range(void)
27129 {
27130 - u64 start = __pa_symbol(_text);
27131 + u64 start = __pa_symbol(ktla_ktva(_text));
27132 u64 size = __pa_symbol(_end) - start;
27133
27134 /*
27135 @@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27136
27137 void __init setup_arch(char **cmdline_p)
27138 {
27139 +#ifdef CONFIG_X86_32
27140 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27141 +#else
27142 memblock_reserve(__pa_symbol(_text),
27143 (unsigned long)__bss_stop - (unsigned long)_text);
27144 +#endif
27145
27146 early_reserve_initrd();
27147
27148 @@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
27149
27150 if (!boot_params.hdr.root_flags)
27151 root_mountflags &= ~MS_RDONLY;
27152 - init_mm.start_code = (unsigned long) _text;
27153 - init_mm.end_code = (unsigned long) _etext;
27154 + init_mm.start_code = ktla_ktva((unsigned long) _text);
27155 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
27156 init_mm.end_data = (unsigned long) _edata;
27157 init_mm.brk = _brk_end;
27158
27159 - code_resource.start = __pa_symbol(_text);
27160 - code_resource.end = __pa_symbol(_etext)-1;
27161 - data_resource.start = __pa_symbol(_etext);
27162 + code_resource.start = __pa_symbol(ktla_ktva(_text));
27163 + code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27164 + data_resource.start = __pa_symbol(_sdata);
27165 data_resource.end = __pa_symbol(_edata)-1;
27166 bss_resource.start = __pa_symbol(__bss_start);
27167 bss_resource.end = __pa_symbol(__bss_stop)-1;
27168 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27169 index 5cdff03..80fa283 100644
27170 --- a/arch/x86/kernel/setup_percpu.c
27171 +++ b/arch/x86/kernel/setup_percpu.c
27172 @@ -21,19 +21,17 @@
27173 #include <asm/cpu.h>
27174 #include <asm/stackprotector.h>
27175
27176 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27177 +#ifdef CONFIG_SMP
27178 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27179 EXPORT_PER_CPU_SYMBOL(cpu_number);
27180 +#endif
27181
27182 -#ifdef CONFIG_X86_64
27183 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27184 -#else
27185 -#define BOOT_PERCPU_OFFSET 0
27186 -#endif
27187
27188 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27189 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27190
27191 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27192 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27193 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27194 };
27195 EXPORT_SYMBOL(__per_cpu_offset);
27196 @@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27197 {
27198 #ifdef CONFIG_NEED_MULTIPLE_NODES
27199 pg_data_t *last = NULL;
27200 - unsigned int cpu;
27201 + int cpu;
27202
27203 for_each_possible_cpu(cpu) {
27204 int node = early_cpu_to_node(cpu);
27205 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27206 {
27207 #ifdef CONFIG_X86_32
27208 struct desc_struct gdt;
27209 + unsigned long base = per_cpu_offset(cpu);
27210
27211 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27212 - 0x2 | DESCTYPE_S, 0x8);
27213 - gdt.s = 1;
27214 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27215 + 0x83 | DESCTYPE_S, 0xC);
27216 write_gdt_entry(get_cpu_gdt_table(cpu),
27217 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27218 #endif
27219 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27220 /* alrighty, percpu areas up and running */
27221 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27222 for_each_possible_cpu(cpu) {
27223 +#ifdef CONFIG_CC_STACKPROTECTOR
27224 +#ifdef CONFIG_X86_32
27225 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
27226 +#endif
27227 +#endif
27228 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27229 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27230 per_cpu(cpu_number, cpu) = cpu;
27231 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27232 */
27233 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27234 #endif
27235 +#ifdef CONFIG_CC_STACKPROTECTOR
27236 +#ifdef CONFIG_X86_32
27237 + if (!cpu)
27238 + per_cpu(stack_canary.canary, cpu) = canary;
27239 +#endif
27240 +#endif
27241 /*
27242 * Up to this point, the boot CPU has been using .init.data
27243 * area. Reload any changed state for the boot CPU.
27244 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27245 index ed37a76..39f936e 100644
27246 --- a/arch/x86/kernel/signal.c
27247 +++ b/arch/x86/kernel/signal.c
27248 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27249 * Align the stack pointer according to the i386 ABI,
27250 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27251 */
27252 - sp = ((sp + 4) & -16ul) - 4;
27253 + sp = ((sp - 12) & -16ul) - 4;
27254 #else /* !CONFIG_X86_32 */
27255 sp = round_down(sp, 16) - 8;
27256 #endif
27257 @@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27258 }
27259
27260 if (current->mm->context.vdso)
27261 - restorer = current->mm->context.vdso +
27262 - selected_vdso32->sym___kernel_sigreturn;
27263 + restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27264 else
27265 - restorer = &frame->retcode;
27266 + restorer = (void __user *)&frame->retcode;
27267 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27268 restorer = ksig->ka.sa.sa_restorer;
27269
27270 @@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27271 * reasons and because gdb uses it as a signature to notice
27272 * signal handler stack frames.
27273 */
27274 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27275 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27276
27277 if (err)
27278 return -EFAULT;
27279 @@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27280 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27281
27282 /* Set up to return from userspace. */
27283 - restorer = current->mm->context.vdso +
27284 - selected_vdso32->sym___kernel_rt_sigreturn;
27285 + if (current->mm->context.vdso)
27286 + restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27287 + else
27288 + restorer = (void __user *)&frame->retcode;
27289 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27290 restorer = ksig->ka.sa.sa_restorer;
27291 put_user_ex(restorer, &frame->pretcode);
27292 @@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27293 * reasons and because gdb uses it as a signature to notice
27294 * signal handler stack frames.
27295 */
27296 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27297 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27298 } put_user_catch(err);
27299
27300 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27301 @@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27302 {
27303 int usig = signr_convert(ksig->sig);
27304 sigset_t *set = sigmask_to_save();
27305 - compat_sigset_t *cset = (compat_sigset_t *) set;
27306 + sigset_t sigcopy;
27307 + compat_sigset_t *cset;
27308 +
27309 + sigcopy = *set;
27310 +
27311 + cset = (compat_sigset_t *) &sigcopy;
27312
27313 /* Set up the stack frame */
27314 if (is_ia32_frame()) {
27315 @@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27316 } else if (is_x32_frame()) {
27317 return x32_setup_rt_frame(ksig, cset, regs);
27318 } else {
27319 - return __setup_rt_frame(ksig->sig, ksig, set, regs);
27320 + return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27321 }
27322 }
27323
27324 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27325 index be8e1bd..a3d93fa 100644
27326 --- a/arch/x86/kernel/smp.c
27327 +++ b/arch/x86/kernel/smp.c
27328 @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27329
27330 __setup("nonmi_ipi", nonmi_ipi_setup);
27331
27332 -struct smp_ops smp_ops = {
27333 +struct smp_ops smp_ops __read_only = {
27334 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27335 .smp_prepare_cpus = native_smp_prepare_cpus,
27336 .smp_cpus_done = native_smp_cpus_done,
27337 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27338 index 668d8f2..84a9d54 100644
27339 --- a/arch/x86/kernel/smpboot.c
27340 +++ b/arch/x86/kernel/smpboot.c
27341 @@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27342
27343 enable_start_cpu0 = 0;
27344
27345 -#ifdef CONFIG_X86_32
27346 + /* otherwise gcc will move up smp_processor_id before the cpu_init */
27347 + barrier();
27348 +
27349 /* switch away from the initial page table */
27350 +#ifdef CONFIG_PAX_PER_CPU_PGD
27351 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27352 +#else
27353 load_cr3(swapper_pg_dir);
27354 +#endif
27355 __flush_tlb_all();
27356 -#endif
27357
27358 - /* otherwise gcc will move up smp_processor_id before the cpu_init */
27359 - barrier();
27360 /*
27361 * Check TSC synchronization with the BP:
27362 */
27363 @@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27364 alternatives_enable_smp();
27365
27366 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27367 - (THREAD_SIZE + task_stack_page(idle))) - 1);
27368 + (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27369 per_cpu(current_task, cpu) = idle;
27370 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27371
27372 #ifdef CONFIG_X86_32
27373 /* Stack for startup_32 can be just as for start_secondary onwards */
27374 @@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27375 clear_tsk_thread_flag(idle, TIF_FORK);
27376 initial_gs = per_cpu_offset(cpu);
27377 #endif
27378 - per_cpu(kernel_stack, cpu) =
27379 - (unsigned long)task_stack_page(idle) -
27380 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27381 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27382 + pax_open_kernel();
27383 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27384 + pax_close_kernel();
27385 initial_code = (unsigned long)start_secondary;
27386 stack_start = idle->thread.sp;
27387
27388 @@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27389 /* the FPU context is blank, nobody can own it */
27390 __cpu_disable_lazy_restore(cpu);
27391
27392 +#ifdef CONFIG_PAX_PER_CPU_PGD
27393 + clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27394 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27395 + KERNEL_PGD_PTRS);
27396 + clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27397 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27398 + KERNEL_PGD_PTRS);
27399 +#endif
27400 +
27401 err = do_boot_cpu(apicid, cpu, tidle);
27402 if (err) {
27403 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27404 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27405 index 9b4d51d..5d28b58 100644
27406 --- a/arch/x86/kernel/step.c
27407 +++ b/arch/x86/kernel/step.c
27408 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27409 struct desc_struct *desc;
27410 unsigned long base;
27411
27412 - seg &= ~7UL;
27413 + seg >>= 3;
27414
27415 mutex_lock(&child->mm->context.lock);
27416 - if (unlikely((seg >> 3) >= child->mm->context.size))
27417 + if (unlikely(seg >= child->mm->context.size))
27418 addr = -1L; /* bogus selector, access would fault */
27419 else {
27420 desc = child->mm->context.ldt + seg;
27421 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27422 addr += base;
27423 }
27424 mutex_unlock(&child->mm->context.lock);
27425 - }
27426 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27427 + addr = ktla_ktva(addr);
27428
27429 return addr;
27430 }
27431 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27432 unsigned char opcode[15];
27433 unsigned long addr = convert_ip_to_linear(child, regs);
27434
27435 + if (addr == -EINVAL)
27436 + return 0;
27437 +
27438 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27439 for (i = 0; i < copied; i++) {
27440 switch (opcode[i]) {
27441 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27442 new file mode 100644
27443 index 0000000..5877189
27444 --- /dev/null
27445 +++ b/arch/x86/kernel/sys_i386_32.c
27446 @@ -0,0 +1,189 @@
27447 +/*
27448 + * This file contains various random system calls that
27449 + * have a non-standard calling sequence on the Linux/i386
27450 + * platform.
27451 + */
27452 +
27453 +#include <linux/errno.h>
27454 +#include <linux/sched.h>
27455 +#include <linux/mm.h>
27456 +#include <linux/fs.h>
27457 +#include <linux/smp.h>
27458 +#include <linux/sem.h>
27459 +#include <linux/msg.h>
27460 +#include <linux/shm.h>
27461 +#include <linux/stat.h>
27462 +#include <linux/syscalls.h>
27463 +#include <linux/mman.h>
27464 +#include <linux/file.h>
27465 +#include <linux/utsname.h>
27466 +#include <linux/ipc.h>
27467 +#include <linux/elf.h>
27468 +
27469 +#include <linux/uaccess.h>
27470 +#include <linux/unistd.h>
27471 +
27472 +#include <asm/syscalls.h>
27473 +
27474 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27475 +{
27476 + unsigned long pax_task_size = TASK_SIZE;
27477 +
27478 +#ifdef CONFIG_PAX_SEGMEXEC
27479 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27480 + pax_task_size = SEGMEXEC_TASK_SIZE;
27481 +#endif
27482 +
27483 + if (flags & MAP_FIXED)
27484 + if (len > pax_task_size || addr > pax_task_size - len)
27485 + return -EINVAL;
27486 +
27487 + return 0;
27488 +}
27489 +
27490 +/*
27491 + * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27492 + */
27493 +static unsigned long get_align_mask(void)
27494 +{
27495 + if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27496 + return 0;
27497 +
27498 + if (!(current->flags & PF_RANDOMIZE))
27499 + return 0;
27500 +
27501 + return va_align.mask;
27502 +}
27503 +
27504 +unsigned long
27505 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
27506 + unsigned long len, unsigned long pgoff, unsigned long flags)
27507 +{
27508 + struct mm_struct *mm = current->mm;
27509 + struct vm_area_struct *vma;
27510 + unsigned long pax_task_size = TASK_SIZE;
27511 + struct vm_unmapped_area_info info;
27512 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27513 +
27514 +#ifdef CONFIG_PAX_SEGMEXEC
27515 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27516 + pax_task_size = SEGMEXEC_TASK_SIZE;
27517 +#endif
27518 +
27519 + pax_task_size -= PAGE_SIZE;
27520 +
27521 + if (len > pax_task_size)
27522 + return -ENOMEM;
27523 +
27524 + if (flags & MAP_FIXED)
27525 + return addr;
27526 +
27527 +#ifdef CONFIG_PAX_RANDMMAP
27528 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27529 +#endif
27530 +
27531 + if (addr) {
27532 + addr = PAGE_ALIGN(addr);
27533 + if (pax_task_size - len >= addr) {
27534 + vma = find_vma(mm, addr);
27535 + if (check_heap_stack_gap(vma, addr, len, offset))
27536 + return addr;
27537 + }
27538 + }
27539 +
27540 + info.flags = 0;
27541 + info.length = len;
27542 + info.align_mask = filp ? get_align_mask() : 0;
27543 + info.align_offset = pgoff << PAGE_SHIFT;
27544 + info.threadstack_offset = offset;
27545 +
27546 +#ifdef CONFIG_PAX_PAGEEXEC
27547 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27548 + info.low_limit = 0x00110000UL;
27549 + info.high_limit = mm->start_code;
27550 +
27551 +#ifdef CONFIG_PAX_RANDMMAP
27552 + if (mm->pax_flags & MF_PAX_RANDMMAP)
27553 + info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27554 +#endif
27555 +
27556 + if (info.low_limit < info.high_limit) {
27557 + addr = vm_unmapped_area(&info);
27558 + if (!IS_ERR_VALUE(addr))
27559 + return addr;
27560 + }
27561 + } else
27562 +#endif
27563 +
27564 + info.low_limit = mm->mmap_base;
27565 + info.high_limit = pax_task_size;
27566 +
27567 + return vm_unmapped_area(&info);
27568 +}
27569 +
27570 +unsigned long
27571 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27572 + const unsigned long len, const unsigned long pgoff,
27573 + const unsigned long flags)
27574 +{
27575 + struct vm_area_struct *vma;
27576 + struct mm_struct *mm = current->mm;
27577 + unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27578 + struct vm_unmapped_area_info info;
27579 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27580 +
27581 +#ifdef CONFIG_PAX_SEGMEXEC
27582 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27583 + pax_task_size = SEGMEXEC_TASK_SIZE;
27584 +#endif
27585 +
27586 + pax_task_size -= PAGE_SIZE;
27587 +
27588 + /* requested length too big for entire address space */
27589 + if (len > pax_task_size)
27590 + return -ENOMEM;
27591 +
27592 + if (flags & MAP_FIXED)
27593 + return addr;
27594 +
27595 +#ifdef CONFIG_PAX_PAGEEXEC
27596 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27597 + goto bottomup;
27598 +#endif
27599 +
27600 +#ifdef CONFIG_PAX_RANDMMAP
27601 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27602 +#endif
27603 +
27604 + /* requesting a specific address */
27605 + if (addr) {
27606 + addr = PAGE_ALIGN(addr);
27607 + if (pax_task_size - len >= addr) {
27608 + vma = find_vma(mm, addr);
27609 + if (check_heap_stack_gap(vma, addr, len, offset))
27610 + return addr;
27611 + }
27612 + }
27613 +
27614 + info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27615 + info.length = len;
27616 + info.low_limit = PAGE_SIZE;
27617 + info.high_limit = mm->mmap_base;
27618 + info.align_mask = filp ? get_align_mask() : 0;
27619 + info.align_offset = pgoff << PAGE_SHIFT;
27620 + info.threadstack_offset = offset;
27621 +
27622 + addr = vm_unmapped_area(&info);
27623 + if (!(addr & ~PAGE_MASK))
27624 + return addr;
27625 + VM_BUG_ON(addr != -ENOMEM);
27626 +
27627 +bottomup:
27628 + /*
27629 + * A failed mmap() very likely causes application failure,
27630 + * so fall back to the bottom-up function here. This scenario
27631 + * can happen with large stack limits and large mmap()
27632 + * allocations.
27633 + */
27634 + return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27635 +}
27636 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27637 index 30277e2..5664a29 100644
27638 --- a/arch/x86/kernel/sys_x86_64.c
27639 +++ b/arch/x86/kernel/sys_x86_64.c
27640 @@ -81,8 +81,8 @@ out:
27641 return error;
27642 }
27643
27644 -static void find_start_end(unsigned long flags, unsigned long *begin,
27645 - unsigned long *end)
27646 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
27647 + unsigned long *begin, unsigned long *end)
27648 {
27649 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27650 unsigned long new_begin;
27651 @@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27652 *begin = new_begin;
27653 }
27654 } else {
27655 - *begin = current->mm->mmap_legacy_base;
27656 + *begin = mm->mmap_legacy_base;
27657 *end = TASK_SIZE;
27658 }
27659 }
27660 @@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27661 struct vm_area_struct *vma;
27662 struct vm_unmapped_area_info info;
27663 unsigned long begin, end;
27664 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27665
27666 if (flags & MAP_FIXED)
27667 return addr;
27668
27669 - find_start_end(flags, &begin, &end);
27670 + find_start_end(mm, flags, &begin, &end);
27671
27672 if (len > end)
27673 return -ENOMEM;
27674
27675 +#ifdef CONFIG_PAX_RANDMMAP
27676 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27677 +#endif
27678 +
27679 if (addr) {
27680 addr = PAGE_ALIGN(addr);
27681 vma = find_vma(mm, addr);
27682 - if (end - len >= addr &&
27683 - (!vma || addr + len <= vma->vm_start))
27684 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27685 return addr;
27686 }
27687
27688 @@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27689 info.high_limit = end;
27690 info.align_mask = filp ? get_align_mask() : 0;
27691 info.align_offset = pgoff << PAGE_SHIFT;
27692 + info.threadstack_offset = offset;
27693 return vm_unmapped_area(&info);
27694 }
27695
27696 @@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27697 struct mm_struct *mm = current->mm;
27698 unsigned long addr = addr0;
27699 struct vm_unmapped_area_info info;
27700 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27701
27702 /* requested length too big for entire address space */
27703 if (len > TASK_SIZE)
27704 @@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27705 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27706 goto bottomup;
27707
27708 +#ifdef CONFIG_PAX_RANDMMAP
27709 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27710 +#endif
27711 +
27712 /* requesting a specific address */
27713 if (addr) {
27714 addr = PAGE_ALIGN(addr);
27715 vma = find_vma(mm, addr);
27716 - if (TASK_SIZE - len >= addr &&
27717 - (!vma || addr + len <= vma->vm_start))
27718 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27719 return addr;
27720 }
27721
27722 @@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27723 info.high_limit = mm->mmap_base;
27724 info.align_mask = filp ? get_align_mask() : 0;
27725 info.align_offset = pgoff << PAGE_SHIFT;
27726 + info.threadstack_offset = offset;
27727 addr = vm_unmapped_area(&info);
27728 if (!(addr & ~PAGE_MASK))
27729 return addr;
27730 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27731 index 91a4496..bb87552 100644
27732 --- a/arch/x86/kernel/tboot.c
27733 +++ b/arch/x86/kernel/tboot.c
27734 @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27735
27736 void tboot_shutdown(u32 shutdown_type)
27737 {
27738 - void (*shutdown)(void);
27739 + void (* __noreturn shutdown)(void);
27740
27741 if (!tboot_enabled())
27742 return;
27743 @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27744
27745 switch_to_tboot_pt();
27746
27747 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27748 + shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27749 shutdown();
27750
27751 /* should not reach here */
27752 @@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27753 return -ENODEV;
27754 }
27755
27756 -static atomic_t ap_wfs_count;
27757 +static atomic_unchecked_t ap_wfs_count;
27758
27759 static int tboot_wait_for_aps(int num_aps)
27760 {
27761 @@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27762 {
27763 switch (action) {
27764 case CPU_DYING:
27765 - atomic_inc(&ap_wfs_count);
27766 + atomic_inc_unchecked(&ap_wfs_count);
27767 if (num_online_cpus() == 1)
27768 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27769 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27770 return NOTIFY_BAD;
27771 break;
27772 }
27773 @@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27774
27775 tboot_create_trampoline();
27776
27777 - atomic_set(&ap_wfs_count, 0);
27778 + atomic_set_unchecked(&ap_wfs_count, 0);
27779 register_hotcpu_notifier(&tboot_cpu_notifier);
27780
27781 #ifdef CONFIG_DEBUG_FS
27782 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27783 index 0fa2960..91eabbe 100644
27784 --- a/arch/x86/kernel/time.c
27785 +++ b/arch/x86/kernel/time.c
27786 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27787 {
27788 unsigned long pc = instruction_pointer(regs);
27789
27790 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27791 + if (!user_mode(regs) && in_lock_functions(pc)) {
27792 #ifdef CONFIG_FRAME_POINTER
27793 - return *(unsigned long *)(regs->bp + sizeof(long));
27794 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27795 #else
27796 unsigned long *sp =
27797 (unsigned long *)kernel_stack_pointer(regs);
27798 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27799 * or above a saved flags. Eflags has bits 22-31 zero,
27800 * kernel addresses don't.
27801 */
27802 +
27803 +#ifdef CONFIG_PAX_KERNEXEC
27804 + return ktla_ktva(sp[0]);
27805 +#else
27806 if (sp[0] >> 22)
27807 return sp[0];
27808 if (sp[1] >> 22)
27809 return sp[1];
27810 #endif
27811 +
27812 +#endif
27813 }
27814 return pc;
27815 }
27816 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27817 index 4e942f3..d0f623f 100644
27818 --- a/arch/x86/kernel/tls.c
27819 +++ b/arch/x86/kernel/tls.c
27820 @@ -118,6 +118,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27821 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27822 return -EINVAL;
27823
27824 +#ifdef CONFIG_PAX_SEGMEXEC
27825 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27826 + return -EINVAL;
27827 +#endif
27828 +
27829 set_tls_desc(p, idx, &info, 1);
27830
27831 return 0;
27832 @@ -235,7 +240,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27833
27834 if (kbuf)
27835 info = kbuf;
27836 - else if (__copy_from_user(infobuf, ubuf, count))
27837 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27838 return -EFAULT;
27839 else
27840 info = infobuf;
27841 diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27842 index 1c113db..287b42e 100644
27843 --- a/arch/x86/kernel/tracepoint.c
27844 +++ b/arch/x86/kernel/tracepoint.c
27845 @@ -9,11 +9,11 @@
27846 #include <linux/atomic.h>
27847
27848 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27849 -struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27850 +const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27851 (unsigned long) trace_idt_table };
27852
27853 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27854 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27855 +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27856
27857 static int trace_irq_vector_refcount;
27858 static DEFINE_MUTEX(irq_vector_mutex);
27859 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27860 index 07ab8e9..99c8456 100644
27861 --- a/arch/x86/kernel/traps.c
27862 +++ b/arch/x86/kernel/traps.c
27863 @@ -67,7 +67,7 @@
27864 #include <asm/proto.h>
27865
27866 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27867 -gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27868 +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27869 #else
27870 #include <asm/processor-flags.h>
27871 #include <asm/setup.h>
27872 @@ -76,7 +76,7 @@ asmlinkage int system_call(void);
27873 #endif
27874
27875 /* Must be page-aligned because the real IDT is used in a fixmap. */
27876 -gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27877 +gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27878
27879 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27880 EXPORT_SYMBOL_GPL(used_vectors);
27881 @@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27882 }
27883
27884 static nokprobe_inline int
27885 -do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27886 +do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27887 struct pt_regs *regs, long error_code)
27888 {
27889 #ifdef CONFIG_X86_32
27890 - if (regs->flags & X86_VM_MASK) {
27891 + if (v8086_mode(regs)) {
27892 /*
27893 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27894 * On nmi (interrupt 2), do_trap should not be called.
27895 @@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27896 return -1;
27897 }
27898 #endif
27899 - if (!user_mode(regs)) {
27900 + if (!user_mode_novm(regs)) {
27901 if (!fixup_exception(regs)) {
27902 tsk->thread.error_code = error_code;
27903 tsk->thread.trap_nr = trapnr;
27904 +
27905 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27906 + if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27907 + str = "PAX: suspicious stack segment fault";
27908 +#endif
27909 +
27910 die(str, regs, error_code);
27911 }
27912 +
27913 +#ifdef CONFIG_PAX_REFCOUNT
27914 + if (trapnr == X86_TRAP_OF)
27915 + pax_report_refcount_overflow(regs);
27916 +#endif
27917 +
27918 return 0;
27919 }
27920
27921 @@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27922 }
27923
27924 static void
27925 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27926 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27927 long error_code, siginfo_t *info)
27928 {
27929 struct task_struct *tsk = current;
27930 @@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27931 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27932 printk_ratelimit()) {
27933 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27934 - tsk->comm, tsk->pid, str,
27935 + tsk->comm, task_pid_nr(tsk), str,
27936 regs->ip, regs->sp, error_code);
27937 print_vma_addr(" in ", regs->ip);
27938 pr_cont("\n");
27939 @@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27940 tsk->thread.error_code = error_code;
27941 tsk->thread.trap_nr = X86_TRAP_DF;
27942
27943 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27944 + if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27945 + die("grsec: kernel stack overflow detected", regs, error_code);
27946 +#endif
27947 +
27948 #ifdef CONFIG_DOUBLEFAULT
27949 df_debug(regs, error_code);
27950 #endif
27951 @@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27952 conditional_sti(regs);
27953
27954 #ifdef CONFIG_X86_32
27955 - if (regs->flags & X86_VM_MASK) {
27956 + if (v8086_mode(regs)) {
27957 local_irq_enable();
27958 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27959 goto exit;
27960 @@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27961 #endif
27962
27963 tsk = current;
27964 - if (!user_mode(regs)) {
27965 + if (!user_mode_novm(regs)) {
27966 if (fixup_exception(regs))
27967 goto exit;
27968
27969 tsk->thread.error_code = error_code;
27970 tsk->thread.trap_nr = X86_TRAP_GP;
27971 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27972 - X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27973 + X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27974 +
27975 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27976 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27977 + die("PAX: suspicious general protection fault", regs, error_code);
27978 + else
27979 +#endif
27980 +
27981 die("general protection fault", regs, error_code);
27982 + }
27983 goto exit;
27984 }
27985
27986 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27987 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27988 + struct mm_struct *mm = tsk->mm;
27989 + unsigned long limit;
27990 +
27991 + down_write(&mm->mmap_sem);
27992 + limit = mm->context.user_cs_limit;
27993 + if (limit < TASK_SIZE) {
27994 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27995 + up_write(&mm->mmap_sem);
27996 + return;
27997 + }
27998 + up_write(&mm->mmap_sem);
27999 + }
28000 +#endif
28001 +
28002 tsk->thread.error_code = error_code;
28003 tsk->thread.trap_nr = X86_TRAP_GP;
28004
28005 @@ -427,13 +468,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28006 container_of(task_pt_regs(current),
28007 struct bad_iret_stack, regs);
28008
28009 + if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28010 + new_stack = s;
28011 +
28012 /* Copy the IRET target to the new stack. */
28013 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28014
28015 /* Copy the remainder of the stack from the current stack. */
28016 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28017
28018 - BUG_ON(!user_mode_vm(&new_stack->regs));
28019 + BUG_ON(!user_mode(&new_stack->regs));
28020 return new_stack;
28021 }
28022 NOKPROBE_SYMBOL(fixup_bad_iret);
28023 @@ -519,7 +563,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28024 /* It's safe to allow irq's after DR6 has been saved */
28025 preempt_conditional_sti(regs);
28026
28027 - if (regs->flags & X86_VM_MASK) {
28028 + if (v8086_mode(regs)) {
28029 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28030 X86_TRAP_DB);
28031 preempt_conditional_cli(regs);
28032 @@ -534,7 +578,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28033 * We already checked v86 mode above, so we can check for kernel mode
28034 * by just checking the CPL of CS.
28035 */
28036 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
28037 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28038 tsk->thread.debugreg6 &= ~DR_STEP;
28039 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28040 regs->flags &= ~X86_EFLAGS_TF;
28041 @@ -567,7 +611,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28042 return;
28043 conditional_sti(regs);
28044
28045 - if (!user_mode_vm(regs))
28046 + if (!user_mode(regs))
28047 {
28048 if (!fixup_exception(regs)) {
28049 task->thread.error_code = error_code;
28050 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28051 index b7e50bb..f4a93ae 100644
28052 --- a/arch/x86/kernel/tsc.c
28053 +++ b/arch/x86/kernel/tsc.c
28054 @@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28055 */
28056 smp_wmb();
28057
28058 - ACCESS_ONCE(c2n->head) = data;
28059 + ACCESS_ONCE_RW(c2n->head) = data;
28060 }
28061
28062 /*
28063 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28064 index 5d1cbfe..2a21feb 100644
28065 --- a/arch/x86/kernel/uprobes.c
28066 +++ b/arch/x86/kernel/uprobes.c
28067 @@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28068 int ret = NOTIFY_DONE;
28069
28070 /* We are only interested in userspace traps */
28071 - if (regs && !user_mode_vm(regs))
28072 + if (regs && !user_mode(regs))
28073 return NOTIFY_DONE;
28074
28075 switch (val) {
28076 @@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28077
28078 if (nleft != rasize) {
28079 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28080 - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28081 + "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28082
28083 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28084 }
28085 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28086 index b9242ba..50c5edd 100644
28087 --- a/arch/x86/kernel/verify_cpu.S
28088 +++ b/arch/x86/kernel/verify_cpu.S
28089 @@ -20,6 +20,7 @@
28090 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28091 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28092 * arch/x86/kernel/head_32.S: processor startup
28093 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28094 *
28095 * verify_cpu, returns the status of longmode and SSE in register %eax.
28096 * 0: Success 1: Failure
28097 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28098 index e8edcf5..27f9344 100644
28099 --- a/arch/x86/kernel/vm86_32.c
28100 +++ b/arch/x86/kernel/vm86_32.c
28101 @@ -44,6 +44,7 @@
28102 #include <linux/ptrace.h>
28103 #include <linux/audit.h>
28104 #include <linux/stddef.h>
28105 +#include <linux/grsecurity.h>
28106
28107 #include <asm/uaccess.h>
28108 #include <asm/io.h>
28109 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28110 do_exit(SIGSEGV);
28111 }
28112
28113 - tss = &per_cpu(init_tss, get_cpu());
28114 + tss = init_tss + get_cpu();
28115 current->thread.sp0 = current->thread.saved_sp0;
28116 current->thread.sysenter_cs = __KERNEL_CS;
28117 load_sp0(tss, &current->thread);
28118 @@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28119
28120 if (tsk->thread.saved_sp0)
28121 return -EPERM;
28122 +
28123 +#ifdef CONFIG_GRKERNSEC_VM86
28124 + if (!capable(CAP_SYS_RAWIO)) {
28125 + gr_handle_vm86();
28126 + return -EPERM;
28127 + }
28128 +#endif
28129 +
28130 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28131 offsetof(struct kernel_vm86_struct, vm86plus) -
28132 sizeof(info.regs));
28133 @@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28134 int tmp;
28135 struct vm86plus_struct __user *v86;
28136
28137 +#ifdef CONFIG_GRKERNSEC_VM86
28138 + if (!capable(CAP_SYS_RAWIO)) {
28139 + gr_handle_vm86();
28140 + return -EPERM;
28141 + }
28142 +#endif
28143 +
28144 tsk = current;
28145 switch (cmd) {
28146 case VM86_REQUEST_IRQ:
28147 @@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28148 tsk->thread.saved_fs = info->regs32->fs;
28149 tsk->thread.saved_gs = get_user_gs(info->regs32);
28150
28151 - tss = &per_cpu(init_tss, get_cpu());
28152 + tss = init_tss + get_cpu();
28153 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28154 if (cpu_has_sep)
28155 tsk->thread.sysenter_cs = 0;
28156 @@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28157 goto cannot_handle;
28158 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28159 goto cannot_handle;
28160 - intr_ptr = (unsigned long __user *) (i << 2);
28161 + intr_ptr = (__force unsigned long __user *) (i << 2);
28162 if (get_user(segoffs, intr_ptr))
28163 goto cannot_handle;
28164 if ((segoffs >> 16) == BIOSSEG)
28165 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28166 index 49edf2d..c0d1362 100644
28167 --- a/arch/x86/kernel/vmlinux.lds.S
28168 +++ b/arch/x86/kernel/vmlinux.lds.S
28169 @@ -26,6 +26,13 @@
28170 #include <asm/page_types.h>
28171 #include <asm/cache.h>
28172 #include <asm/boot.h>
28173 +#include <asm/segment.h>
28174 +
28175 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28176 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28177 +#else
28178 +#define __KERNEL_TEXT_OFFSET 0
28179 +#endif
28180
28181 #undef i386 /* in case the preprocessor is a 32bit one */
28182
28183 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28184
28185 PHDRS {
28186 text PT_LOAD FLAGS(5); /* R_E */
28187 +#ifdef CONFIG_X86_32
28188 + module PT_LOAD FLAGS(5); /* R_E */
28189 +#endif
28190 +#ifdef CONFIG_XEN
28191 + rodata PT_LOAD FLAGS(5); /* R_E */
28192 +#else
28193 + rodata PT_LOAD FLAGS(4); /* R__ */
28194 +#endif
28195 data PT_LOAD FLAGS(6); /* RW_ */
28196 -#ifdef CONFIG_X86_64
28197 + init.begin PT_LOAD FLAGS(6); /* RW_ */
28198 #ifdef CONFIG_SMP
28199 percpu PT_LOAD FLAGS(6); /* RW_ */
28200 #endif
28201 + text.init PT_LOAD FLAGS(5); /* R_E */
28202 + text.exit PT_LOAD FLAGS(5); /* R_E */
28203 init PT_LOAD FLAGS(7); /* RWE */
28204 -#endif
28205 note PT_NOTE FLAGS(0); /* ___ */
28206 }
28207
28208 SECTIONS
28209 {
28210 #ifdef CONFIG_X86_32
28211 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28212 - phys_startup_32 = startup_32 - LOAD_OFFSET;
28213 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28214 #else
28215 - . = __START_KERNEL;
28216 - phys_startup_64 = startup_64 - LOAD_OFFSET;
28217 + . = __START_KERNEL;
28218 #endif
28219
28220 /* Text and read-only data */
28221 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
28222 - _text = .;
28223 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28224 /* bootstrapping code */
28225 +#ifdef CONFIG_X86_32
28226 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28227 +#else
28228 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28229 +#endif
28230 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28231 + _text = .;
28232 HEAD_TEXT
28233 . = ALIGN(8);
28234 _stext = .;
28235 @@ -104,13 +124,47 @@ SECTIONS
28236 IRQENTRY_TEXT
28237 *(.fixup)
28238 *(.gnu.warning)
28239 - /* End of text section */
28240 - _etext = .;
28241 } :text = 0x9090
28242
28243 - NOTES :text :note
28244 + . += __KERNEL_TEXT_OFFSET;
28245
28246 - EXCEPTION_TABLE(16) :text = 0x9090
28247 +#ifdef CONFIG_X86_32
28248 + . = ALIGN(PAGE_SIZE);
28249 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28250 +
28251 +#ifdef CONFIG_PAX_KERNEXEC
28252 + MODULES_EXEC_VADDR = .;
28253 + BYTE(0)
28254 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28255 + . = ALIGN(HPAGE_SIZE) - 1;
28256 + MODULES_EXEC_END = .;
28257 +#endif
28258 +
28259 + } :module
28260 +#endif
28261 +
28262 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28263 + /* End of text section */
28264 + BYTE(0)
28265 + _etext = . - __KERNEL_TEXT_OFFSET;
28266 + }
28267 +
28268 +#ifdef CONFIG_X86_32
28269 + . = ALIGN(PAGE_SIZE);
28270 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28271 + . = ALIGN(PAGE_SIZE);
28272 + *(.empty_zero_page)
28273 + *(.initial_pg_fixmap)
28274 + *(.initial_pg_pmd)
28275 + *(.initial_page_table)
28276 + *(.swapper_pg_dir)
28277 + } :rodata
28278 +#endif
28279 +
28280 + . = ALIGN(PAGE_SIZE);
28281 + NOTES :rodata :note
28282 +
28283 + EXCEPTION_TABLE(16) :rodata
28284
28285 #if defined(CONFIG_DEBUG_RODATA)
28286 /* .text should occupy whole number of pages */
28287 @@ -122,16 +176,20 @@ SECTIONS
28288
28289 /* Data */
28290 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28291 +
28292 +#ifdef CONFIG_PAX_KERNEXEC
28293 + . = ALIGN(HPAGE_SIZE);
28294 +#else
28295 + . = ALIGN(PAGE_SIZE);
28296 +#endif
28297 +
28298 /* Start of data section */
28299 _sdata = .;
28300
28301 /* init_task */
28302 INIT_TASK_DATA(THREAD_SIZE)
28303
28304 -#ifdef CONFIG_X86_32
28305 - /* 32 bit has nosave before _edata */
28306 NOSAVE_DATA
28307 -#endif
28308
28309 PAGE_ALIGNED_DATA(PAGE_SIZE)
28310
28311 @@ -174,12 +232,19 @@ SECTIONS
28312 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28313
28314 /* Init code and data - will be freed after init */
28315 - . = ALIGN(PAGE_SIZE);
28316 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28317 + BYTE(0)
28318 +
28319 +#ifdef CONFIG_PAX_KERNEXEC
28320 + . = ALIGN(HPAGE_SIZE);
28321 +#else
28322 + . = ALIGN(PAGE_SIZE);
28323 +#endif
28324 +
28325 __init_begin = .; /* paired with __init_end */
28326 - }
28327 + } :init.begin
28328
28329 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28330 +#ifdef CONFIG_SMP
28331 /*
28332 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28333 * output PHDR, so the next output section - .init.text - should
28334 @@ -188,12 +253,27 @@ SECTIONS
28335 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
28336 #endif
28337
28338 - INIT_TEXT_SECTION(PAGE_SIZE)
28339 -#ifdef CONFIG_X86_64
28340 - :init
28341 -#endif
28342 + . = ALIGN(PAGE_SIZE);
28343 + init_begin = .;
28344 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28345 + VMLINUX_SYMBOL(_sinittext) = .;
28346 + INIT_TEXT
28347 + VMLINUX_SYMBOL(_einittext) = .;
28348 + . = ALIGN(PAGE_SIZE);
28349 + } :text.init
28350
28351 - INIT_DATA_SECTION(16)
28352 + /*
28353 + * .exit.text is discard at runtime, not link time, to deal with
28354 + * references from .altinstructions and .eh_frame
28355 + */
28356 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28357 + EXIT_TEXT
28358 + . = ALIGN(16);
28359 + } :text.exit
28360 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28361 +
28362 + . = ALIGN(PAGE_SIZE);
28363 + INIT_DATA_SECTION(16) :init
28364
28365 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28366 __x86_cpu_dev_start = .;
28367 @@ -264,19 +344,12 @@ SECTIONS
28368 }
28369
28370 . = ALIGN(8);
28371 - /*
28372 - * .exit.text is discard at runtime, not link time, to deal with
28373 - * references from .altinstructions and .eh_frame
28374 - */
28375 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28376 - EXIT_TEXT
28377 - }
28378
28379 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28380 EXIT_DATA
28381 }
28382
28383 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28384 +#ifndef CONFIG_SMP
28385 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28386 #endif
28387
28388 @@ -295,16 +368,10 @@ SECTIONS
28389 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28390 __smp_locks = .;
28391 *(.smp_locks)
28392 - . = ALIGN(PAGE_SIZE);
28393 __smp_locks_end = .;
28394 + . = ALIGN(PAGE_SIZE);
28395 }
28396
28397 -#ifdef CONFIG_X86_64
28398 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28399 - NOSAVE_DATA
28400 - }
28401 -#endif
28402 -
28403 /* BSS */
28404 . = ALIGN(PAGE_SIZE);
28405 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28406 @@ -320,6 +387,7 @@ SECTIONS
28407 __brk_base = .;
28408 . += 64 * 1024; /* 64k alignment slop space */
28409 *(.brk_reservation) /* areas brk users have reserved */
28410 + . = ALIGN(HPAGE_SIZE);
28411 __brk_limit = .;
28412 }
28413
28414 @@ -346,13 +414,12 @@ SECTIONS
28415 * for the boot processor.
28416 */
28417 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28418 -INIT_PER_CPU(gdt_page);
28419 INIT_PER_CPU(irq_stack_union);
28420
28421 /*
28422 * Build-time check on the image size:
28423 */
28424 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28425 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28426 "kernel image bigger than KERNEL_IMAGE_SIZE");
28427
28428 #ifdef CONFIG_SMP
28429 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28430 index 957779f..74e405c 100644
28431 --- a/arch/x86/kernel/vsyscall_64.c
28432 +++ b/arch/x86/kernel/vsyscall_64.c
28433 @@ -54,15 +54,13 @@
28434
28435 DEFINE_VVAR(int, vgetcpu_mode);
28436
28437 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28438 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28439
28440 static int __init vsyscall_setup(char *str)
28441 {
28442 if (str) {
28443 if (!strcmp("emulate", str))
28444 vsyscall_mode = EMULATE;
28445 - else if (!strcmp("native", str))
28446 - vsyscall_mode = NATIVE;
28447 else if (!strcmp("none", str))
28448 vsyscall_mode = NONE;
28449 else
28450 @@ -279,8 +277,7 @@ do_ret:
28451 return true;
28452
28453 sigsegv:
28454 - force_sig(SIGSEGV, current);
28455 - return true;
28456 + do_group_exit(SIGKILL);
28457 }
28458
28459 /*
28460 @@ -331,10 +328,7 @@ void __init map_vsyscall(void)
28461 extern char __vsyscall_page;
28462 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28463
28464 - __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28465 - vsyscall_mode == NATIVE
28466 - ? PAGE_KERNEL_VSYSCALL
28467 - : PAGE_KERNEL_VVAR);
28468 + __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28469 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28470 (unsigned long)VSYSCALL_ADDR);
28471 }
28472 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28473 index 04068192..4d75aa6 100644
28474 --- a/arch/x86/kernel/x8664_ksyms_64.c
28475 +++ b/arch/x86/kernel/x8664_ksyms_64.c
28476 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28477 EXPORT_SYMBOL(copy_user_generic_unrolled);
28478 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28479 EXPORT_SYMBOL(__copy_user_nocache);
28480 -EXPORT_SYMBOL(_copy_from_user);
28481 -EXPORT_SYMBOL(_copy_to_user);
28482
28483 EXPORT_SYMBOL(copy_page);
28484 EXPORT_SYMBOL(clear_page);
28485 @@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28486 EXPORT_SYMBOL(___preempt_schedule_context);
28487 #endif
28488 #endif
28489 +
28490 +#ifdef CONFIG_PAX_PER_CPU_PGD
28491 +EXPORT_SYMBOL(cpu_pgd);
28492 +#endif
28493 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28494 index e48b674..a451dd9 100644
28495 --- a/arch/x86/kernel/x86_init.c
28496 +++ b/arch/x86/kernel/x86_init.c
28497 @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28498 static void default_nmi_init(void) { };
28499 static int default_i8042_detect(void) { return 1; };
28500
28501 -struct x86_platform_ops x86_platform = {
28502 +struct x86_platform_ops x86_platform __read_only = {
28503 .calibrate_tsc = native_calibrate_tsc,
28504 .get_wallclock = mach_get_cmos_time,
28505 .set_wallclock = mach_set_rtc_mmss,
28506 @@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28507 EXPORT_SYMBOL_GPL(x86_platform);
28508
28509 #if defined(CONFIG_PCI_MSI)
28510 -struct x86_msi_ops x86_msi = {
28511 +struct x86_msi_ops x86_msi __read_only = {
28512 .setup_msi_irqs = native_setup_msi_irqs,
28513 .compose_msi_msg = native_compose_msi_msg,
28514 .teardown_msi_irq = native_teardown_msi_irq,
28515 @@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28516 }
28517 #endif
28518
28519 -struct x86_io_apic_ops x86_io_apic_ops = {
28520 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28521 .init = native_io_apic_init_mappings,
28522 .read = native_io_apic_read,
28523 .write = native_io_apic_write,
28524 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28525 index 4c540c4..0b985b0 100644
28526 --- a/arch/x86/kernel/xsave.c
28527 +++ b/arch/x86/kernel/xsave.c
28528 @@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28529
28530 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28531 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28532 - err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28533 + err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28534
28535 if (!use_xsave())
28536 return err;
28537
28538 - err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28539 + err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28540
28541 /*
28542 * Read the xstate_bv which we copied (directly from the cpu or
28543 * from the state in task struct) to the user buffers.
28544 */
28545 - err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28546 + err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28547
28548 /*
28549 * For legacy compatible, we always set FP/SSE bits in the bit
28550 @@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28551 */
28552 xstate_bv |= XSTATE_FPSSE;
28553
28554 - err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28555 + err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28556
28557 return err;
28558 }
28559 @@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28560 {
28561 int err;
28562
28563 + buf = (struct xsave_struct __user *)____m(buf);
28564 if (use_xsave())
28565 err = xsave_user(buf);
28566 else if (use_fxsr())
28567 @@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28568 */
28569 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28570 {
28571 + buf = (void __user *)____m(buf);
28572 if (use_xsave()) {
28573 if ((unsigned long)buf % 64 || fx_only) {
28574 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28575 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28576 index 976e3a5..8bb998c 100644
28577 --- a/arch/x86/kvm/cpuid.c
28578 +++ b/arch/x86/kvm/cpuid.c
28579 @@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28580 struct kvm_cpuid2 *cpuid,
28581 struct kvm_cpuid_entry2 __user *entries)
28582 {
28583 - int r;
28584 + int r, i;
28585
28586 r = -E2BIG;
28587 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28588 goto out;
28589 r = -EFAULT;
28590 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28591 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28592 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28593 goto out;
28594 + for (i = 0; i < cpuid->nent; ++i) {
28595 + struct kvm_cpuid_entry2 cpuid_entry;
28596 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28597 + goto out;
28598 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
28599 + }
28600 vcpu->arch.cpuid_nent = cpuid->nent;
28601 kvm_apic_set_version(vcpu);
28602 kvm_x86_ops->cpuid_update(vcpu);
28603 @@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28604 struct kvm_cpuid2 *cpuid,
28605 struct kvm_cpuid_entry2 __user *entries)
28606 {
28607 - int r;
28608 + int r, i;
28609
28610 r = -E2BIG;
28611 if (cpuid->nent < vcpu->arch.cpuid_nent)
28612 goto out;
28613 r = -EFAULT;
28614 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28615 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28616 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28617 goto out;
28618 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28619 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28620 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28621 + goto out;
28622 + }
28623 return 0;
28624
28625 out:
28626 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28627 index 9f8a2fa..2df3c3f 100644
28628 --- a/arch/x86/kvm/emulate.c
28629 +++ b/arch/x86/kvm/emulate.c
28630 @@ -3519,7 +3519,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28631 int cr = ctxt->modrm_reg;
28632 u64 efer = 0;
28633
28634 - static u64 cr_reserved_bits[] = {
28635 + static const u64 cr_reserved_bits[] = {
28636 0xffffffff00000000ULL,
28637 0, 0, 0, /* CR3 checked later */
28638 CR4_RESERVED_BITS,
28639 @@ -3554,7 +3554,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28640
28641 ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
28642 if (efer & EFER_LMA)
28643 - rsvd = CR3_L_MODE_RESERVED_BITS;
28644 + rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
28645
28646 if (new_val & rsvd)
28647 return emulate_gp(ctxt, 0);
28648 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28649 index b8345dd..f225d71 100644
28650 --- a/arch/x86/kvm/lapic.c
28651 +++ b/arch/x86/kvm/lapic.c
28652 @@ -55,7 +55,7 @@
28653 #define APIC_BUS_CYCLE_NS 1
28654
28655 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28656 -#define apic_debug(fmt, arg...)
28657 +#define apic_debug(fmt, arg...) do {} while (0)
28658
28659 #define APIC_LVT_NUM 6
28660 /* 14 is the version for Xeon and Pentium 8.4.8*/
28661 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28662 index fd49c86..77e1aa0 100644
28663 --- a/arch/x86/kvm/paging_tmpl.h
28664 +++ b/arch/x86/kvm/paging_tmpl.h
28665 @@ -343,7 +343,7 @@ retry_walk:
28666 if (unlikely(kvm_is_error_hva(host_addr)))
28667 goto error;
28668
28669 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28670 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28671 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28672 goto error;
28673 walker->ptep_user[walker->level - 1] = ptep_user;
28674 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28675 index 7527cef..c63a838e 100644
28676 --- a/arch/x86/kvm/svm.c
28677 +++ b/arch/x86/kvm/svm.c
28678 @@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28679 int cpu = raw_smp_processor_id();
28680
28681 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28682 +
28683 + pax_open_kernel();
28684 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28685 + pax_close_kernel();
28686 +
28687 load_TR_desc();
28688 }
28689
28690 @@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28691 #endif
28692 #endif
28693
28694 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28695 + __set_fs(current_thread_info()->addr_limit);
28696 +#endif
28697 +
28698 reload_tss(vcpu);
28699
28700 local_irq_disable();
28701 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28702 index 3e556c6..08bbf7f 100644
28703 --- a/arch/x86/kvm/vmx.c
28704 +++ b/arch/x86/kvm/vmx.c
28705 @@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28706 #endif
28707 }
28708
28709 -static void vmcs_clear_bits(unsigned long field, u32 mask)
28710 +static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28711 {
28712 vmcs_writel(field, vmcs_readl(field) & ~mask);
28713 }
28714
28715 -static void vmcs_set_bits(unsigned long field, u32 mask)
28716 +static void vmcs_set_bits(unsigned long field, unsigned long mask)
28717 {
28718 vmcs_writel(field, vmcs_readl(field) | mask);
28719 }
28720 @@ -1631,7 +1631,11 @@ static void reload_tss(void)
28721 struct desc_struct *descs;
28722
28723 descs = (void *)gdt->address;
28724 +
28725 + pax_open_kernel();
28726 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28727 + pax_close_kernel();
28728 +
28729 load_TR_desc();
28730 }
28731
28732 @@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28733 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28734 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28735
28736 +#ifdef CONFIG_PAX_PER_CPU_PGD
28737 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28738 +#endif
28739 +
28740 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28741 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28742 vmx->loaded_vmcs->cpu = cpu;
28743 @@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28744 * reads and returns guest's timestamp counter "register"
28745 * guest_tsc = host_tsc + tsc_offset -- 21.3
28746 */
28747 -static u64 guest_read_tsc(void)
28748 +static u64 __intentional_overflow(-1) guest_read_tsc(void)
28749 {
28750 u64 host_tsc, tsc_offset;
28751
28752 @@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
28753 * page upon invalidation. No need to do anything if the
28754 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28755 */
28756 - kvm_x86_ops->set_apic_access_page_addr = NULL;
28757 + pax_open_kernel();
28758 + *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28759 + pax_close_kernel();
28760 }
28761
28762 - if (!cpu_has_vmx_tpr_shadow())
28763 - kvm_x86_ops->update_cr8_intercept = NULL;
28764 + if (!cpu_has_vmx_tpr_shadow()) {
28765 + pax_open_kernel();
28766 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28767 + pax_close_kernel();
28768 + }
28769
28770 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28771 kvm_disable_largepages();
28772 @@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
28773 if (!cpu_has_vmx_apicv())
28774 enable_apicv = 0;
28775
28776 + pax_open_kernel();
28777 if (enable_apicv)
28778 - kvm_x86_ops->update_cr8_intercept = NULL;
28779 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28780 else {
28781 - kvm_x86_ops->hwapic_irr_update = NULL;
28782 - kvm_x86_ops->deliver_posted_interrupt = NULL;
28783 - kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28784 + *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28785 + *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28786 + *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28787 }
28788 + pax_close_kernel();
28789
28790 if (nested)
28791 nested_vmx_setup_ctls_msrs();
28792 @@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28793 unsigned long cr4;
28794
28795 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28796 +
28797 +#ifndef CONFIG_PAX_PER_CPU_PGD
28798 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28799 +#endif
28800
28801 /* Save the most likely value for this task's CR4 in the VMCS. */
28802 cr4 = read_cr4();
28803 @@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28804 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28805 vmx->host_idt_base = dt.address;
28806
28807 - vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28808 + vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28809
28810 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28811 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28812 @@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28813 "jmp 2f \n\t"
28814 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28815 "2: "
28816 +
28817 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28818 + "ljmp %[cs],$3f\n\t"
28819 + "3: "
28820 +#endif
28821 +
28822 /* Save guest registers, load host registers, keep flags */
28823 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28824 "pop %0 \n\t"
28825 @@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28826 #endif
28827 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28828 [wordsize]"i"(sizeof(ulong))
28829 +
28830 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28831 + ,[cs]"i"(__KERNEL_CS)
28832 +#endif
28833 +
28834 : "cc", "memory"
28835 #ifdef CONFIG_X86_64
28836 , "rax", "rbx", "rdi", "rsi"
28837 @@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28838 if (debugctlmsr)
28839 update_debugctlmsr(debugctlmsr);
28840
28841 -#ifndef CONFIG_X86_64
28842 +#ifdef CONFIG_X86_32
28843 /*
28844 * The sysexit path does not restore ds/es, so we must set them to
28845 * a reasonable value ourselves.
28846 @@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28847 * may be executed in interrupt context, which saves and restore segments
28848 * around it, nullifying its effect.
28849 */
28850 - loadsegment(ds, __USER_DS);
28851 - loadsegment(es, __USER_DS);
28852 + loadsegment(ds, __KERNEL_DS);
28853 + loadsegment(es, __KERNEL_DS);
28854 + loadsegment(ss, __KERNEL_DS);
28855 +
28856 +#ifdef CONFIG_PAX_KERNEXEC
28857 + loadsegment(fs, __KERNEL_PERCPU);
28858 +#endif
28859 +
28860 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28861 + __set_fs(current_thread_info()->addr_limit);
28862 +#endif
28863 +
28864 #endif
28865
28866 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28867 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28868 index 0033df3..db6236d 100644
28869 --- a/arch/x86/kvm/x86.c
28870 +++ b/arch/x86/kvm/x86.c
28871 @@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
28872
28873 int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
28874 {
28875 + cr3 &= ~CR3_PCID_INVD;
28876 +
28877 if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
28878 kvm_mmu_sync_roots(vcpu);
28879 kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
28880 @@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28881 {
28882 struct kvm *kvm = vcpu->kvm;
28883 int lm = is_long_mode(vcpu);
28884 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28885 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28886 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28887 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28888 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28889 : kvm->arch.xen_hvm_config.blob_size_32;
28890 u32 page_num = data & ~PAGE_MASK;
28891 @@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28892 if (n < msr_list.nmsrs)
28893 goto out;
28894 r = -EFAULT;
28895 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28896 + goto out;
28897 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28898 num_msrs_to_save * sizeof(u32)))
28899 goto out;
28900 @@ -5670,7 +5674,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28901 };
28902 #endif
28903
28904 -int kvm_arch_init(void *opaque)
28905 +int kvm_arch_init(const void *opaque)
28906 {
28907 int r;
28908 struct kvm_x86_ops *ops = opaque;
28909 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28910 index aae9413..d11e829 100644
28911 --- a/arch/x86/lguest/boot.c
28912 +++ b/arch/x86/lguest/boot.c
28913 @@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28914 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28915 * Launcher to reboot us.
28916 */
28917 -static void lguest_restart(char *reason)
28918 +static __noreturn void lguest_restart(char *reason)
28919 {
28920 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28921 + BUG();
28922 }
28923
28924 /*G:050
28925 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28926 index 00933d5..3a64af9 100644
28927 --- a/arch/x86/lib/atomic64_386_32.S
28928 +++ b/arch/x86/lib/atomic64_386_32.S
28929 @@ -48,6 +48,10 @@ BEGIN(read)
28930 movl (v), %eax
28931 movl 4(v), %edx
28932 RET_ENDP
28933 +BEGIN(read_unchecked)
28934 + movl (v), %eax
28935 + movl 4(v), %edx
28936 +RET_ENDP
28937 #undef v
28938
28939 #define v %esi
28940 @@ -55,6 +59,10 @@ BEGIN(set)
28941 movl %ebx, (v)
28942 movl %ecx, 4(v)
28943 RET_ENDP
28944 +BEGIN(set_unchecked)
28945 + movl %ebx, (v)
28946 + movl %ecx, 4(v)
28947 +RET_ENDP
28948 #undef v
28949
28950 #define v %esi
28951 @@ -70,6 +78,20 @@ RET_ENDP
28952 BEGIN(add)
28953 addl %eax, (v)
28954 adcl %edx, 4(v)
28955 +
28956 +#ifdef CONFIG_PAX_REFCOUNT
28957 + jno 0f
28958 + subl %eax, (v)
28959 + sbbl %edx, 4(v)
28960 + int $4
28961 +0:
28962 + _ASM_EXTABLE(0b, 0b)
28963 +#endif
28964 +
28965 +RET_ENDP
28966 +BEGIN(add_unchecked)
28967 + addl %eax, (v)
28968 + adcl %edx, 4(v)
28969 RET_ENDP
28970 #undef v
28971
28972 @@ -77,6 +99,24 @@ RET_ENDP
28973 BEGIN(add_return)
28974 addl (v), %eax
28975 adcl 4(v), %edx
28976 +
28977 +#ifdef CONFIG_PAX_REFCOUNT
28978 + into
28979 +1234:
28980 + _ASM_EXTABLE(1234b, 2f)
28981 +#endif
28982 +
28983 + movl %eax, (v)
28984 + movl %edx, 4(v)
28985 +
28986 +#ifdef CONFIG_PAX_REFCOUNT
28987 +2:
28988 +#endif
28989 +
28990 +RET_ENDP
28991 +BEGIN(add_return_unchecked)
28992 + addl (v), %eax
28993 + adcl 4(v), %edx
28994 movl %eax, (v)
28995 movl %edx, 4(v)
28996 RET_ENDP
28997 @@ -86,6 +126,20 @@ RET_ENDP
28998 BEGIN(sub)
28999 subl %eax, (v)
29000 sbbl %edx, 4(v)
29001 +
29002 +#ifdef CONFIG_PAX_REFCOUNT
29003 + jno 0f
29004 + addl %eax, (v)
29005 + adcl %edx, 4(v)
29006 + int $4
29007 +0:
29008 + _ASM_EXTABLE(0b, 0b)
29009 +#endif
29010 +
29011 +RET_ENDP
29012 +BEGIN(sub_unchecked)
29013 + subl %eax, (v)
29014 + sbbl %edx, 4(v)
29015 RET_ENDP
29016 #undef v
29017
29018 @@ -96,6 +150,27 @@ BEGIN(sub_return)
29019 sbbl $0, %edx
29020 addl (v), %eax
29021 adcl 4(v), %edx
29022 +
29023 +#ifdef CONFIG_PAX_REFCOUNT
29024 + into
29025 +1234:
29026 + _ASM_EXTABLE(1234b, 2f)
29027 +#endif
29028 +
29029 + movl %eax, (v)
29030 + movl %edx, 4(v)
29031 +
29032 +#ifdef CONFIG_PAX_REFCOUNT
29033 +2:
29034 +#endif
29035 +
29036 +RET_ENDP
29037 +BEGIN(sub_return_unchecked)
29038 + negl %edx
29039 + negl %eax
29040 + sbbl $0, %edx
29041 + addl (v), %eax
29042 + adcl 4(v), %edx
29043 movl %eax, (v)
29044 movl %edx, 4(v)
29045 RET_ENDP
29046 @@ -105,6 +180,20 @@ RET_ENDP
29047 BEGIN(inc)
29048 addl $1, (v)
29049 adcl $0, 4(v)
29050 +
29051 +#ifdef CONFIG_PAX_REFCOUNT
29052 + jno 0f
29053 + subl $1, (v)
29054 + sbbl $0, 4(v)
29055 + int $4
29056 +0:
29057 + _ASM_EXTABLE(0b, 0b)
29058 +#endif
29059 +
29060 +RET_ENDP
29061 +BEGIN(inc_unchecked)
29062 + addl $1, (v)
29063 + adcl $0, 4(v)
29064 RET_ENDP
29065 #undef v
29066
29067 @@ -114,6 +203,26 @@ BEGIN(inc_return)
29068 movl 4(v), %edx
29069 addl $1, %eax
29070 adcl $0, %edx
29071 +
29072 +#ifdef CONFIG_PAX_REFCOUNT
29073 + into
29074 +1234:
29075 + _ASM_EXTABLE(1234b, 2f)
29076 +#endif
29077 +
29078 + movl %eax, (v)
29079 + movl %edx, 4(v)
29080 +
29081 +#ifdef CONFIG_PAX_REFCOUNT
29082 +2:
29083 +#endif
29084 +
29085 +RET_ENDP
29086 +BEGIN(inc_return_unchecked)
29087 + movl (v), %eax
29088 + movl 4(v), %edx
29089 + addl $1, %eax
29090 + adcl $0, %edx
29091 movl %eax, (v)
29092 movl %edx, 4(v)
29093 RET_ENDP
29094 @@ -123,6 +232,20 @@ RET_ENDP
29095 BEGIN(dec)
29096 subl $1, (v)
29097 sbbl $0, 4(v)
29098 +
29099 +#ifdef CONFIG_PAX_REFCOUNT
29100 + jno 0f
29101 + addl $1, (v)
29102 + adcl $0, 4(v)
29103 + int $4
29104 +0:
29105 + _ASM_EXTABLE(0b, 0b)
29106 +#endif
29107 +
29108 +RET_ENDP
29109 +BEGIN(dec_unchecked)
29110 + subl $1, (v)
29111 + sbbl $0, 4(v)
29112 RET_ENDP
29113 #undef v
29114
29115 @@ -132,6 +255,26 @@ BEGIN(dec_return)
29116 movl 4(v), %edx
29117 subl $1, %eax
29118 sbbl $0, %edx
29119 +
29120 +#ifdef CONFIG_PAX_REFCOUNT
29121 + into
29122 +1234:
29123 + _ASM_EXTABLE(1234b, 2f)
29124 +#endif
29125 +
29126 + movl %eax, (v)
29127 + movl %edx, 4(v)
29128 +
29129 +#ifdef CONFIG_PAX_REFCOUNT
29130 +2:
29131 +#endif
29132 +
29133 +RET_ENDP
29134 +BEGIN(dec_return_unchecked)
29135 + movl (v), %eax
29136 + movl 4(v), %edx
29137 + subl $1, %eax
29138 + sbbl $0, %edx
29139 movl %eax, (v)
29140 movl %edx, 4(v)
29141 RET_ENDP
29142 @@ -143,6 +286,13 @@ BEGIN(add_unless)
29143 adcl %edx, %edi
29144 addl (v), %eax
29145 adcl 4(v), %edx
29146 +
29147 +#ifdef CONFIG_PAX_REFCOUNT
29148 + into
29149 +1234:
29150 + _ASM_EXTABLE(1234b, 2f)
29151 +#endif
29152 +
29153 cmpl %eax, %ecx
29154 je 3f
29155 1:
29156 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29157 1:
29158 addl $1, %eax
29159 adcl $0, %edx
29160 +
29161 +#ifdef CONFIG_PAX_REFCOUNT
29162 + into
29163 +1234:
29164 + _ASM_EXTABLE(1234b, 2f)
29165 +#endif
29166 +
29167 movl %eax, (v)
29168 movl %edx, 4(v)
29169 movl $1, %eax
29170 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29171 movl 4(v), %edx
29172 subl $1, %eax
29173 sbbl $0, %edx
29174 +
29175 +#ifdef CONFIG_PAX_REFCOUNT
29176 + into
29177 +1234:
29178 + _ASM_EXTABLE(1234b, 1f)
29179 +#endif
29180 +
29181 js 1f
29182 movl %eax, (v)
29183 movl %edx, 4(v)
29184 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29185 index f5cc9eb..51fa319 100644
29186 --- a/arch/x86/lib/atomic64_cx8_32.S
29187 +++ b/arch/x86/lib/atomic64_cx8_32.S
29188 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29189 CFI_STARTPROC
29190
29191 read64 %ecx
29192 + pax_force_retaddr
29193 ret
29194 CFI_ENDPROC
29195 ENDPROC(atomic64_read_cx8)
29196
29197 +ENTRY(atomic64_read_unchecked_cx8)
29198 + CFI_STARTPROC
29199 +
29200 + read64 %ecx
29201 + pax_force_retaddr
29202 + ret
29203 + CFI_ENDPROC
29204 +ENDPROC(atomic64_read_unchecked_cx8)
29205 +
29206 ENTRY(atomic64_set_cx8)
29207 CFI_STARTPROC
29208
29209 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29210 cmpxchg8b (%esi)
29211 jne 1b
29212
29213 + pax_force_retaddr
29214 ret
29215 CFI_ENDPROC
29216 ENDPROC(atomic64_set_cx8)
29217
29218 +ENTRY(atomic64_set_unchecked_cx8)
29219 + CFI_STARTPROC
29220 +
29221 +1:
29222 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
29223 + * are atomic on 586 and newer */
29224 + cmpxchg8b (%esi)
29225 + jne 1b
29226 +
29227 + pax_force_retaddr
29228 + ret
29229 + CFI_ENDPROC
29230 +ENDPROC(atomic64_set_unchecked_cx8)
29231 +
29232 ENTRY(atomic64_xchg_cx8)
29233 CFI_STARTPROC
29234
29235 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29236 cmpxchg8b (%esi)
29237 jne 1b
29238
29239 + pax_force_retaddr
29240 ret
29241 CFI_ENDPROC
29242 ENDPROC(atomic64_xchg_cx8)
29243
29244 -.macro addsub_return func ins insc
29245 -ENTRY(atomic64_\func\()_return_cx8)
29246 +.macro addsub_return func ins insc unchecked=""
29247 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29248 CFI_STARTPROC
29249 SAVE ebp
29250 SAVE ebx
29251 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29252 movl %edx, %ecx
29253 \ins\()l %esi, %ebx
29254 \insc\()l %edi, %ecx
29255 +
29256 +.ifb \unchecked
29257 +#ifdef CONFIG_PAX_REFCOUNT
29258 + into
29259 +2:
29260 + _ASM_EXTABLE(2b, 3f)
29261 +#endif
29262 +.endif
29263 +
29264 LOCK_PREFIX
29265 cmpxchg8b (%ebp)
29266 jne 1b
29267 -
29268 -10:
29269 movl %ebx, %eax
29270 movl %ecx, %edx
29271 +
29272 +.ifb \unchecked
29273 +#ifdef CONFIG_PAX_REFCOUNT
29274 +3:
29275 +#endif
29276 +.endif
29277 +
29278 RESTORE edi
29279 RESTORE esi
29280 RESTORE ebx
29281 RESTORE ebp
29282 + pax_force_retaddr
29283 ret
29284 CFI_ENDPROC
29285 -ENDPROC(atomic64_\func\()_return_cx8)
29286 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29287 .endm
29288
29289 addsub_return add add adc
29290 addsub_return sub sub sbb
29291 +addsub_return add add adc _unchecked
29292 +addsub_return sub sub sbb _unchecked
29293
29294 -.macro incdec_return func ins insc
29295 -ENTRY(atomic64_\func\()_return_cx8)
29296 +.macro incdec_return func ins insc unchecked=""
29297 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29298 CFI_STARTPROC
29299 SAVE ebx
29300
29301 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29302 movl %edx, %ecx
29303 \ins\()l $1, %ebx
29304 \insc\()l $0, %ecx
29305 +
29306 +.ifb \unchecked
29307 +#ifdef CONFIG_PAX_REFCOUNT
29308 + into
29309 +2:
29310 + _ASM_EXTABLE(2b, 3f)
29311 +#endif
29312 +.endif
29313 +
29314 LOCK_PREFIX
29315 cmpxchg8b (%esi)
29316 jne 1b
29317
29318 -10:
29319 movl %ebx, %eax
29320 movl %ecx, %edx
29321 +
29322 +.ifb \unchecked
29323 +#ifdef CONFIG_PAX_REFCOUNT
29324 +3:
29325 +#endif
29326 +.endif
29327 +
29328 RESTORE ebx
29329 + pax_force_retaddr
29330 ret
29331 CFI_ENDPROC
29332 -ENDPROC(atomic64_\func\()_return_cx8)
29333 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29334 .endm
29335
29336 incdec_return inc add adc
29337 incdec_return dec sub sbb
29338 +incdec_return inc add adc _unchecked
29339 +incdec_return dec sub sbb _unchecked
29340
29341 ENTRY(atomic64_dec_if_positive_cx8)
29342 CFI_STARTPROC
29343 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29344 movl %edx, %ecx
29345 subl $1, %ebx
29346 sbb $0, %ecx
29347 +
29348 +#ifdef CONFIG_PAX_REFCOUNT
29349 + into
29350 +1234:
29351 + _ASM_EXTABLE(1234b, 2f)
29352 +#endif
29353 +
29354 js 2f
29355 LOCK_PREFIX
29356 cmpxchg8b (%esi)
29357 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29358 movl %ebx, %eax
29359 movl %ecx, %edx
29360 RESTORE ebx
29361 + pax_force_retaddr
29362 ret
29363 CFI_ENDPROC
29364 ENDPROC(atomic64_dec_if_positive_cx8)
29365 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29366 movl %edx, %ecx
29367 addl %ebp, %ebx
29368 adcl %edi, %ecx
29369 +
29370 +#ifdef CONFIG_PAX_REFCOUNT
29371 + into
29372 +1234:
29373 + _ASM_EXTABLE(1234b, 3f)
29374 +#endif
29375 +
29376 LOCK_PREFIX
29377 cmpxchg8b (%esi)
29378 jne 1b
29379 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29380 CFI_ADJUST_CFA_OFFSET -8
29381 RESTORE ebx
29382 RESTORE ebp
29383 + pax_force_retaddr
29384 ret
29385 4:
29386 cmpl %edx, 4(%esp)
29387 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29388 xorl %ecx, %ecx
29389 addl $1, %ebx
29390 adcl %edx, %ecx
29391 +
29392 +#ifdef CONFIG_PAX_REFCOUNT
29393 + into
29394 +1234:
29395 + _ASM_EXTABLE(1234b, 3f)
29396 +#endif
29397 +
29398 LOCK_PREFIX
29399 cmpxchg8b (%esi)
29400 jne 1b
29401 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29402 movl $1, %eax
29403 3:
29404 RESTORE ebx
29405 + pax_force_retaddr
29406 ret
29407 CFI_ENDPROC
29408 ENDPROC(atomic64_inc_not_zero_cx8)
29409 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29410 index e78b8eee..7e173a8 100644
29411 --- a/arch/x86/lib/checksum_32.S
29412 +++ b/arch/x86/lib/checksum_32.S
29413 @@ -29,7 +29,8 @@
29414 #include <asm/dwarf2.h>
29415 #include <asm/errno.h>
29416 #include <asm/asm.h>
29417 -
29418 +#include <asm/segment.h>
29419 +
29420 /*
29421 * computes a partial checksum, e.g. for TCP/UDP fragments
29422 */
29423 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29424
29425 #define ARGBASE 16
29426 #define FP 12
29427 -
29428 -ENTRY(csum_partial_copy_generic)
29429 +
29430 +ENTRY(csum_partial_copy_generic_to_user)
29431 CFI_STARTPROC
29432 +
29433 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29434 + pushl_cfi %gs
29435 + popl_cfi %es
29436 + jmp csum_partial_copy_generic
29437 +#endif
29438 +
29439 +ENTRY(csum_partial_copy_generic_from_user)
29440 +
29441 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29442 + pushl_cfi %gs
29443 + popl_cfi %ds
29444 +#endif
29445 +
29446 +ENTRY(csum_partial_copy_generic)
29447 subl $4,%esp
29448 CFI_ADJUST_CFA_OFFSET 4
29449 pushl_cfi %edi
29450 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29451 jmp 4f
29452 SRC(1: movw (%esi), %bx )
29453 addl $2, %esi
29454 -DST( movw %bx, (%edi) )
29455 +DST( movw %bx, %es:(%edi) )
29456 addl $2, %edi
29457 addw %bx, %ax
29458 adcl $0, %eax
29459 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29460 SRC(1: movl (%esi), %ebx )
29461 SRC( movl 4(%esi), %edx )
29462 adcl %ebx, %eax
29463 -DST( movl %ebx, (%edi) )
29464 +DST( movl %ebx, %es:(%edi) )
29465 adcl %edx, %eax
29466 -DST( movl %edx, 4(%edi) )
29467 +DST( movl %edx, %es:4(%edi) )
29468
29469 SRC( movl 8(%esi), %ebx )
29470 SRC( movl 12(%esi), %edx )
29471 adcl %ebx, %eax
29472 -DST( movl %ebx, 8(%edi) )
29473 +DST( movl %ebx, %es:8(%edi) )
29474 adcl %edx, %eax
29475 -DST( movl %edx, 12(%edi) )
29476 +DST( movl %edx, %es:12(%edi) )
29477
29478 SRC( movl 16(%esi), %ebx )
29479 SRC( movl 20(%esi), %edx )
29480 adcl %ebx, %eax
29481 -DST( movl %ebx, 16(%edi) )
29482 +DST( movl %ebx, %es:16(%edi) )
29483 adcl %edx, %eax
29484 -DST( movl %edx, 20(%edi) )
29485 +DST( movl %edx, %es:20(%edi) )
29486
29487 SRC( movl 24(%esi), %ebx )
29488 SRC( movl 28(%esi), %edx )
29489 adcl %ebx, %eax
29490 -DST( movl %ebx, 24(%edi) )
29491 +DST( movl %ebx, %es:24(%edi) )
29492 adcl %edx, %eax
29493 -DST( movl %edx, 28(%edi) )
29494 +DST( movl %edx, %es:28(%edi) )
29495
29496 lea 32(%esi), %esi
29497 lea 32(%edi), %edi
29498 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29499 shrl $2, %edx # This clears CF
29500 SRC(3: movl (%esi), %ebx )
29501 adcl %ebx, %eax
29502 -DST( movl %ebx, (%edi) )
29503 +DST( movl %ebx, %es:(%edi) )
29504 lea 4(%esi), %esi
29505 lea 4(%edi), %edi
29506 dec %edx
29507 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29508 jb 5f
29509 SRC( movw (%esi), %cx )
29510 leal 2(%esi), %esi
29511 -DST( movw %cx, (%edi) )
29512 +DST( movw %cx, %es:(%edi) )
29513 leal 2(%edi), %edi
29514 je 6f
29515 shll $16,%ecx
29516 SRC(5: movb (%esi), %cl )
29517 -DST( movb %cl, (%edi) )
29518 +DST( movb %cl, %es:(%edi) )
29519 6: addl %ecx, %eax
29520 adcl $0, %eax
29521 7:
29522 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29523
29524 6001:
29525 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29526 - movl $-EFAULT, (%ebx)
29527 + movl $-EFAULT, %ss:(%ebx)
29528
29529 # zero the complete destination - computing the rest
29530 # is too much work
29531 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29532
29533 6002:
29534 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29535 - movl $-EFAULT,(%ebx)
29536 + movl $-EFAULT,%ss:(%ebx)
29537 jmp 5000b
29538
29539 .previous
29540
29541 + pushl_cfi %ss
29542 + popl_cfi %ds
29543 + pushl_cfi %ss
29544 + popl_cfi %es
29545 popl_cfi %ebx
29546 CFI_RESTORE ebx
29547 popl_cfi %esi
29548 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29549 popl_cfi %ecx # equivalent to addl $4,%esp
29550 ret
29551 CFI_ENDPROC
29552 -ENDPROC(csum_partial_copy_generic)
29553 +ENDPROC(csum_partial_copy_generic_to_user)
29554
29555 #else
29556
29557 /* Version for PentiumII/PPro */
29558
29559 #define ROUND1(x) \
29560 + nop; nop; nop; \
29561 SRC(movl x(%esi), %ebx ) ; \
29562 addl %ebx, %eax ; \
29563 - DST(movl %ebx, x(%edi) ) ;
29564 + DST(movl %ebx, %es:x(%edi)) ;
29565
29566 #define ROUND(x) \
29567 + nop; nop; nop; \
29568 SRC(movl x(%esi), %ebx ) ; \
29569 adcl %ebx, %eax ; \
29570 - DST(movl %ebx, x(%edi) ) ;
29571 + DST(movl %ebx, %es:x(%edi)) ;
29572
29573 #define ARGBASE 12
29574 -
29575 -ENTRY(csum_partial_copy_generic)
29576 +
29577 +ENTRY(csum_partial_copy_generic_to_user)
29578 CFI_STARTPROC
29579 +
29580 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29581 + pushl_cfi %gs
29582 + popl_cfi %es
29583 + jmp csum_partial_copy_generic
29584 +#endif
29585 +
29586 +ENTRY(csum_partial_copy_generic_from_user)
29587 +
29588 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29589 + pushl_cfi %gs
29590 + popl_cfi %ds
29591 +#endif
29592 +
29593 +ENTRY(csum_partial_copy_generic)
29594 pushl_cfi %ebx
29595 CFI_REL_OFFSET ebx, 0
29596 pushl_cfi %edi
29597 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29598 subl %ebx, %edi
29599 lea -1(%esi),%edx
29600 andl $-32,%edx
29601 - lea 3f(%ebx,%ebx), %ebx
29602 + lea 3f(%ebx,%ebx,2), %ebx
29603 testl %esi, %esi
29604 jmp *%ebx
29605 1: addl $64,%esi
29606 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29607 jb 5f
29608 SRC( movw (%esi), %dx )
29609 leal 2(%esi), %esi
29610 -DST( movw %dx, (%edi) )
29611 +DST( movw %dx, %es:(%edi) )
29612 leal 2(%edi), %edi
29613 je 6f
29614 shll $16,%edx
29615 5:
29616 SRC( movb (%esi), %dl )
29617 -DST( movb %dl, (%edi) )
29618 +DST( movb %dl, %es:(%edi) )
29619 6: addl %edx, %eax
29620 adcl $0, %eax
29621 7:
29622 .section .fixup, "ax"
29623 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29624 - movl $-EFAULT, (%ebx)
29625 + movl $-EFAULT, %ss:(%ebx)
29626 # zero the complete destination (computing the rest is too much work)
29627 movl ARGBASE+8(%esp),%edi # dst
29628 movl ARGBASE+12(%esp),%ecx # len
29629 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29630 rep; stosb
29631 jmp 7b
29632 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29633 - movl $-EFAULT, (%ebx)
29634 + movl $-EFAULT, %ss:(%ebx)
29635 jmp 7b
29636 .previous
29637
29638 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29639 + pushl_cfi %ss
29640 + popl_cfi %ds
29641 + pushl_cfi %ss
29642 + popl_cfi %es
29643 +#endif
29644 +
29645 popl_cfi %esi
29646 CFI_RESTORE esi
29647 popl_cfi %edi
29648 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29649 CFI_RESTORE ebx
29650 ret
29651 CFI_ENDPROC
29652 -ENDPROC(csum_partial_copy_generic)
29653 +ENDPROC(csum_partial_copy_generic_to_user)
29654
29655 #undef ROUND
29656 #undef ROUND1
29657 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29658 index f2145cf..cea889d 100644
29659 --- a/arch/x86/lib/clear_page_64.S
29660 +++ b/arch/x86/lib/clear_page_64.S
29661 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29662 movl $4096/8,%ecx
29663 xorl %eax,%eax
29664 rep stosq
29665 + pax_force_retaddr
29666 ret
29667 CFI_ENDPROC
29668 ENDPROC(clear_page_c)
29669 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29670 movl $4096,%ecx
29671 xorl %eax,%eax
29672 rep stosb
29673 + pax_force_retaddr
29674 ret
29675 CFI_ENDPROC
29676 ENDPROC(clear_page_c_e)
29677 @@ -43,6 +45,7 @@ ENTRY(clear_page)
29678 leaq 64(%rdi),%rdi
29679 jnz .Lloop
29680 nop
29681 + pax_force_retaddr
29682 ret
29683 CFI_ENDPROC
29684 .Lclear_page_end:
29685 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
29686
29687 #include <asm/cpufeature.h>
29688
29689 - .section .altinstr_replacement,"ax"
29690 + .section .altinstr_replacement,"a"
29691 1: .byte 0xeb /* jmp <disp8> */
29692 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29693 2: .byte 0xeb /* jmp <disp8> */
29694 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29695 index 40a1725..5d12ac4 100644
29696 --- a/arch/x86/lib/cmpxchg16b_emu.S
29697 +++ b/arch/x86/lib/cmpxchg16b_emu.S
29698 @@ -8,6 +8,7 @@
29699 #include <linux/linkage.h>
29700 #include <asm/dwarf2.h>
29701 #include <asm/percpu.h>
29702 +#include <asm/alternative-asm.h>
29703
29704 .text
29705
29706 @@ -46,12 +47,14 @@ CFI_STARTPROC
29707 CFI_REMEMBER_STATE
29708 popfq_cfi
29709 mov $1, %al
29710 + pax_force_retaddr
29711 ret
29712
29713 CFI_RESTORE_STATE
29714 .Lnot_same:
29715 popfq_cfi
29716 xor %al,%al
29717 + pax_force_retaddr
29718 ret
29719
29720 CFI_ENDPROC
29721 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29722 index 176cca6..e0d658e 100644
29723 --- a/arch/x86/lib/copy_page_64.S
29724 +++ b/arch/x86/lib/copy_page_64.S
29725 @@ -9,6 +9,7 @@ copy_page_rep:
29726 CFI_STARTPROC
29727 movl $4096/8, %ecx
29728 rep movsq
29729 + pax_force_retaddr
29730 ret
29731 CFI_ENDPROC
29732 ENDPROC(copy_page_rep)
29733 @@ -24,8 +25,8 @@ ENTRY(copy_page)
29734 CFI_ADJUST_CFA_OFFSET 2*8
29735 movq %rbx, (%rsp)
29736 CFI_REL_OFFSET rbx, 0
29737 - movq %r12, 1*8(%rsp)
29738 - CFI_REL_OFFSET r12, 1*8
29739 + movq %r13, 1*8(%rsp)
29740 + CFI_REL_OFFSET r13, 1*8
29741
29742 movl $(4096/64)-5, %ecx
29743 .p2align 4
29744 @@ -38,7 +39,7 @@ ENTRY(copy_page)
29745 movq 0x8*4(%rsi), %r9
29746 movq 0x8*5(%rsi), %r10
29747 movq 0x8*6(%rsi), %r11
29748 - movq 0x8*7(%rsi), %r12
29749 + movq 0x8*7(%rsi), %r13
29750
29751 prefetcht0 5*64(%rsi)
29752
29753 @@ -49,7 +50,7 @@ ENTRY(copy_page)
29754 movq %r9, 0x8*4(%rdi)
29755 movq %r10, 0x8*5(%rdi)
29756 movq %r11, 0x8*6(%rdi)
29757 - movq %r12, 0x8*7(%rdi)
29758 + movq %r13, 0x8*7(%rdi)
29759
29760 leaq 64 (%rsi), %rsi
29761 leaq 64 (%rdi), %rdi
29762 @@ -68,7 +69,7 @@ ENTRY(copy_page)
29763 movq 0x8*4(%rsi), %r9
29764 movq 0x8*5(%rsi), %r10
29765 movq 0x8*6(%rsi), %r11
29766 - movq 0x8*7(%rsi), %r12
29767 + movq 0x8*7(%rsi), %r13
29768
29769 movq %rax, 0x8*0(%rdi)
29770 movq %rbx, 0x8*1(%rdi)
29771 @@ -77,7 +78,7 @@ ENTRY(copy_page)
29772 movq %r9, 0x8*4(%rdi)
29773 movq %r10, 0x8*5(%rdi)
29774 movq %r11, 0x8*6(%rdi)
29775 - movq %r12, 0x8*7(%rdi)
29776 + movq %r13, 0x8*7(%rdi)
29777
29778 leaq 64(%rdi), %rdi
29779 leaq 64(%rsi), %rsi
29780 @@ -85,10 +86,11 @@ ENTRY(copy_page)
29781
29782 movq (%rsp), %rbx
29783 CFI_RESTORE rbx
29784 - movq 1*8(%rsp), %r12
29785 - CFI_RESTORE r12
29786 + movq 1*8(%rsp), %r13
29787 + CFI_RESTORE r13
29788 addq $2*8, %rsp
29789 CFI_ADJUST_CFA_OFFSET -2*8
29790 + pax_force_retaddr
29791 ret
29792 .Lcopy_page_end:
29793 CFI_ENDPROC
29794 @@ -99,7 +101,7 @@ ENDPROC(copy_page)
29795
29796 #include <asm/cpufeature.h>
29797
29798 - .section .altinstr_replacement,"ax"
29799 + .section .altinstr_replacement,"a"
29800 1: .byte 0xeb /* jmp <disp8> */
29801 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29802 2:
29803 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29804 index dee945d..a84067b 100644
29805 --- a/arch/x86/lib/copy_user_64.S
29806 +++ b/arch/x86/lib/copy_user_64.S
29807 @@ -18,31 +18,7 @@
29808 #include <asm/alternative-asm.h>
29809 #include <asm/asm.h>
29810 #include <asm/smap.h>
29811 -
29812 -/*
29813 - * By placing feature2 after feature1 in altinstructions section, we logically
29814 - * implement:
29815 - * If CPU has feature2, jmp to alt2 is used
29816 - * else if CPU has feature1, jmp to alt1 is used
29817 - * else jmp to orig is used.
29818 - */
29819 - .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29820 -0:
29821 - .byte 0xe9 /* 32bit jump */
29822 - .long \orig-1f /* by default jump to orig */
29823 -1:
29824 - .section .altinstr_replacement,"ax"
29825 -2: .byte 0xe9 /* near jump with 32bit immediate */
29826 - .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29827 -3: .byte 0xe9 /* near jump with 32bit immediate */
29828 - .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29829 - .previous
29830 -
29831 - .section .altinstructions,"a"
29832 - altinstruction_entry 0b,2b,\feature1,5,5
29833 - altinstruction_entry 0b,3b,\feature2,5,5
29834 - .previous
29835 - .endm
29836 +#include <asm/pgtable.h>
29837
29838 .macro ALIGN_DESTINATION
29839 #ifdef FIX_ALIGNMENT
29840 @@ -70,52 +46,6 @@
29841 #endif
29842 .endm
29843
29844 -/* Standard copy_to_user with segment limit checking */
29845 -ENTRY(_copy_to_user)
29846 - CFI_STARTPROC
29847 - GET_THREAD_INFO(%rax)
29848 - movq %rdi,%rcx
29849 - addq %rdx,%rcx
29850 - jc bad_to_user
29851 - cmpq TI_addr_limit(%rax),%rcx
29852 - ja bad_to_user
29853 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29854 - copy_user_generic_unrolled,copy_user_generic_string, \
29855 - copy_user_enhanced_fast_string
29856 - CFI_ENDPROC
29857 -ENDPROC(_copy_to_user)
29858 -
29859 -/* Standard copy_from_user with segment limit checking */
29860 -ENTRY(_copy_from_user)
29861 - CFI_STARTPROC
29862 - GET_THREAD_INFO(%rax)
29863 - movq %rsi,%rcx
29864 - addq %rdx,%rcx
29865 - jc bad_from_user
29866 - cmpq TI_addr_limit(%rax),%rcx
29867 - ja bad_from_user
29868 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29869 - copy_user_generic_unrolled,copy_user_generic_string, \
29870 - copy_user_enhanced_fast_string
29871 - CFI_ENDPROC
29872 -ENDPROC(_copy_from_user)
29873 -
29874 - .section .fixup,"ax"
29875 - /* must zero dest */
29876 -ENTRY(bad_from_user)
29877 -bad_from_user:
29878 - CFI_STARTPROC
29879 - movl %edx,%ecx
29880 - xorl %eax,%eax
29881 - rep
29882 - stosb
29883 -bad_to_user:
29884 - movl %edx,%eax
29885 - ret
29886 - CFI_ENDPROC
29887 -ENDPROC(bad_from_user)
29888 - .previous
29889 -
29890 /*
29891 * copy_user_generic_unrolled - memory copy with exception handling.
29892 * This version is for CPUs like P4 that don't have efficient micro
29893 @@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29894 */
29895 ENTRY(copy_user_generic_unrolled)
29896 CFI_STARTPROC
29897 + ASM_PAX_OPEN_USERLAND
29898 ASM_STAC
29899 cmpl $8,%edx
29900 jb 20f /* less then 8 bytes, go to byte copy loop */
29901 @@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29902 jnz 21b
29903 23: xor %eax,%eax
29904 ASM_CLAC
29905 + ASM_PAX_CLOSE_USERLAND
29906 + pax_force_retaddr
29907 ret
29908
29909 .section .fixup,"ax"
29910 @@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29911 */
29912 ENTRY(copy_user_generic_string)
29913 CFI_STARTPROC
29914 + ASM_PAX_OPEN_USERLAND
29915 ASM_STAC
29916 cmpl $8,%edx
29917 jb 2f /* less than 8 bytes, go to byte copy loop */
29918 @@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29919 movsb
29920 xorl %eax,%eax
29921 ASM_CLAC
29922 + ASM_PAX_CLOSE_USERLAND
29923 + pax_force_retaddr
29924 ret
29925
29926 .section .fixup,"ax"
29927 @@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29928 */
29929 ENTRY(copy_user_enhanced_fast_string)
29930 CFI_STARTPROC
29931 + ASM_PAX_OPEN_USERLAND
29932 ASM_STAC
29933 movl %edx,%ecx
29934 1: rep
29935 movsb
29936 xorl %eax,%eax
29937 ASM_CLAC
29938 + ASM_PAX_CLOSE_USERLAND
29939 + pax_force_retaddr
29940 ret
29941
29942 .section .fixup,"ax"
29943 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29944 index 6a4f43c..c70fb52 100644
29945 --- a/arch/x86/lib/copy_user_nocache_64.S
29946 +++ b/arch/x86/lib/copy_user_nocache_64.S
29947 @@ -8,6 +8,7 @@
29948
29949 #include <linux/linkage.h>
29950 #include <asm/dwarf2.h>
29951 +#include <asm/alternative-asm.h>
29952
29953 #define FIX_ALIGNMENT 1
29954
29955 @@ -16,6 +17,7 @@
29956 #include <asm/thread_info.h>
29957 #include <asm/asm.h>
29958 #include <asm/smap.h>
29959 +#include <asm/pgtable.h>
29960
29961 .macro ALIGN_DESTINATION
29962 #ifdef FIX_ALIGNMENT
29963 @@ -49,6 +51,16 @@
29964 */
29965 ENTRY(__copy_user_nocache)
29966 CFI_STARTPROC
29967 +
29968 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29969 + mov pax_user_shadow_base,%rcx
29970 + cmp %rcx,%rsi
29971 + jae 1f
29972 + add %rcx,%rsi
29973 +1:
29974 +#endif
29975 +
29976 + ASM_PAX_OPEN_USERLAND
29977 ASM_STAC
29978 cmpl $8,%edx
29979 jb 20f /* less then 8 bytes, go to byte copy loop */
29980 @@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29981 jnz 21b
29982 23: xorl %eax,%eax
29983 ASM_CLAC
29984 + ASM_PAX_CLOSE_USERLAND
29985 sfence
29986 + pax_force_retaddr
29987 ret
29988
29989 .section .fixup,"ax"
29990 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29991 index 2419d5f..fe52d0e 100644
29992 --- a/arch/x86/lib/csum-copy_64.S
29993 +++ b/arch/x86/lib/csum-copy_64.S
29994 @@ -9,6 +9,7 @@
29995 #include <asm/dwarf2.h>
29996 #include <asm/errno.h>
29997 #include <asm/asm.h>
29998 +#include <asm/alternative-asm.h>
29999
30000 /*
30001 * Checksum copy with exception handling.
30002 @@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30003 CFI_ADJUST_CFA_OFFSET 7*8
30004 movq %rbx, 2*8(%rsp)
30005 CFI_REL_OFFSET rbx, 2*8
30006 - movq %r12, 3*8(%rsp)
30007 - CFI_REL_OFFSET r12, 3*8
30008 + movq %r15, 3*8(%rsp)
30009 + CFI_REL_OFFSET r15, 3*8
30010 movq %r14, 4*8(%rsp)
30011 CFI_REL_OFFSET r14, 4*8
30012 movq %r13, 5*8(%rsp)
30013 @@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30014 movl %edx, %ecx
30015
30016 xorl %r9d, %r9d
30017 - movq %rcx, %r12
30018 + movq %rcx, %r15
30019
30020 - shrq $6, %r12
30021 + shrq $6, %r15
30022 jz .Lhandle_tail /* < 64 */
30023
30024 clc
30025
30026 /* main loop. clear in 64 byte blocks */
30027 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30028 - /* r11: temp3, rdx: temp4, r12 loopcnt */
30029 + /* r11: temp3, rdx: temp4, r15 loopcnt */
30030 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30031 .p2align 4
30032 .Lloop:
30033 @@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30034 adcq %r14, %rax
30035 adcq %r13, %rax
30036
30037 - decl %r12d
30038 + decl %r15d
30039
30040 dest
30041 movq %rbx, (%rsi)
30042 @@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30043 .Lende:
30044 movq 2*8(%rsp), %rbx
30045 CFI_RESTORE rbx
30046 - movq 3*8(%rsp), %r12
30047 - CFI_RESTORE r12
30048 + movq 3*8(%rsp), %r15
30049 + CFI_RESTORE r15
30050 movq 4*8(%rsp), %r14
30051 CFI_RESTORE r14
30052 movq 5*8(%rsp), %r13
30053 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30054 CFI_RESTORE rbp
30055 addq $7*8, %rsp
30056 CFI_ADJUST_CFA_OFFSET -7*8
30057 + pax_force_retaddr
30058 ret
30059 CFI_RESTORE_STATE
30060
30061 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30062 index 1318f75..44c30fd 100644
30063 --- a/arch/x86/lib/csum-wrappers_64.c
30064 +++ b/arch/x86/lib/csum-wrappers_64.c
30065 @@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30066 len -= 2;
30067 }
30068 }
30069 + pax_open_userland();
30070 stac();
30071 - isum = csum_partial_copy_generic((__force const void *)src,
30072 + isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30073 dst, len, isum, errp, NULL);
30074 clac();
30075 + pax_close_userland();
30076 if (unlikely(*errp))
30077 goto out_err;
30078
30079 @@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30080 }
30081
30082 *errp = 0;
30083 + pax_open_userland();
30084 stac();
30085 - ret = csum_partial_copy_generic(src, (void __force *)dst,
30086 + ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30087 len, isum, NULL, errp);
30088 clac();
30089 + pax_close_userland();
30090 return ret;
30091 }
30092 EXPORT_SYMBOL(csum_partial_copy_to_user);
30093 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30094 index a451235..1daa956 100644
30095 --- a/arch/x86/lib/getuser.S
30096 +++ b/arch/x86/lib/getuser.S
30097 @@ -33,17 +33,40 @@
30098 #include <asm/thread_info.h>
30099 #include <asm/asm.h>
30100 #include <asm/smap.h>
30101 +#include <asm/segment.h>
30102 +#include <asm/pgtable.h>
30103 +#include <asm/alternative-asm.h>
30104 +
30105 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30106 +#define __copyuser_seg gs;
30107 +#else
30108 +#define __copyuser_seg
30109 +#endif
30110
30111 .text
30112 ENTRY(__get_user_1)
30113 CFI_STARTPROC
30114 +
30115 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30116 GET_THREAD_INFO(%_ASM_DX)
30117 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30118 jae bad_get_user
30119 ASM_STAC
30120 -1: movzbl (%_ASM_AX),%edx
30121 +
30122 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30123 + mov pax_user_shadow_base,%_ASM_DX
30124 + cmp %_ASM_DX,%_ASM_AX
30125 + jae 1234f
30126 + add %_ASM_DX,%_ASM_AX
30127 +1234:
30128 +#endif
30129 +
30130 +#endif
30131 +
30132 +1: __copyuser_seg movzbl (%_ASM_AX),%edx
30133 xor %eax,%eax
30134 ASM_CLAC
30135 + pax_force_retaddr
30136 ret
30137 CFI_ENDPROC
30138 ENDPROC(__get_user_1)
30139 @@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30140 ENTRY(__get_user_2)
30141 CFI_STARTPROC
30142 add $1,%_ASM_AX
30143 +
30144 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30145 jc bad_get_user
30146 GET_THREAD_INFO(%_ASM_DX)
30147 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30148 jae bad_get_user
30149 ASM_STAC
30150 -2: movzwl -1(%_ASM_AX),%edx
30151 +
30152 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30153 + mov pax_user_shadow_base,%_ASM_DX
30154 + cmp %_ASM_DX,%_ASM_AX
30155 + jae 1234f
30156 + add %_ASM_DX,%_ASM_AX
30157 +1234:
30158 +#endif
30159 +
30160 +#endif
30161 +
30162 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30163 xor %eax,%eax
30164 ASM_CLAC
30165 + pax_force_retaddr
30166 ret
30167 CFI_ENDPROC
30168 ENDPROC(__get_user_2)
30169 @@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30170 ENTRY(__get_user_4)
30171 CFI_STARTPROC
30172 add $3,%_ASM_AX
30173 +
30174 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30175 jc bad_get_user
30176 GET_THREAD_INFO(%_ASM_DX)
30177 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30178 jae bad_get_user
30179 ASM_STAC
30180 -3: movl -3(%_ASM_AX),%edx
30181 +
30182 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30183 + mov pax_user_shadow_base,%_ASM_DX
30184 + cmp %_ASM_DX,%_ASM_AX
30185 + jae 1234f
30186 + add %_ASM_DX,%_ASM_AX
30187 +1234:
30188 +#endif
30189 +
30190 +#endif
30191 +
30192 +3: __copyuser_seg movl -3(%_ASM_AX),%edx
30193 xor %eax,%eax
30194 ASM_CLAC
30195 + pax_force_retaddr
30196 ret
30197 CFI_ENDPROC
30198 ENDPROC(__get_user_4)
30199 @@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30200 GET_THREAD_INFO(%_ASM_DX)
30201 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30202 jae bad_get_user
30203 +
30204 +#ifdef CONFIG_PAX_MEMORY_UDEREF
30205 + mov pax_user_shadow_base,%_ASM_DX
30206 + cmp %_ASM_DX,%_ASM_AX
30207 + jae 1234f
30208 + add %_ASM_DX,%_ASM_AX
30209 +1234:
30210 +#endif
30211 +
30212 ASM_STAC
30213 4: movq -7(%_ASM_AX),%rdx
30214 xor %eax,%eax
30215 ASM_CLAC
30216 + pax_force_retaddr
30217 ret
30218 #else
30219 add $7,%_ASM_AX
30220 @@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30221 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30222 jae bad_get_user_8
30223 ASM_STAC
30224 -4: movl -7(%_ASM_AX),%edx
30225 -5: movl -3(%_ASM_AX),%ecx
30226 +4: __copyuser_seg movl -7(%_ASM_AX),%edx
30227 +5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30228 xor %eax,%eax
30229 ASM_CLAC
30230 + pax_force_retaddr
30231 ret
30232 #endif
30233 CFI_ENDPROC
30234 @@ -113,6 +175,7 @@ bad_get_user:
30235 xor %edx,%edx
30236 mov $(-EFAULT),%_ASM_AX
30237 ASM_CLAC
30238 + pax_force_retaddr
30239 ret
30240 CFI_ENDPROC
30241 END(bad_get_user)
30242 @@ -124,6 +187,7 @@ bad_get_user_8:
30243 xor %ecx,%ecx
30244 mov $(-EFAULT),%_ASM_AX
30245 ASM_CLAC
30246 + pax_force_retaddr
30247 ret
30248 CFI_ENDPROC
30249 END(bad_get_user_8)
30250 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30251 index 54fcffe..7be149e 100644
30252 --- a/arch/x86/lib/insn.c
30253 +++ b/arch/x86/lib/insn.c
30254 @@ -20,8 +20,10 @@
30255
30256 #ifdef __KERNEL__
30257 #include <linux/string.h>
30258 +#include <asm/pgtable_types.h>
30259 #else
30260 #include <string.h>
30261 +#define ktla_ktva(addr) addr
30262 #endif
30263 #include <asm/inat.h>
30264 #include <asm/insn.h>
30265 @@ -53,8 +55,8 @@
30266 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
30267 {
30268 memset(insn, 0, sizeof(*insn));
30269 - insn->kaddr = kaddr;
30270 - insn->next_byte = kaddr;
30271 + insn->kaddr = ktla_ktva(kaddr);
30272 + insn->next_byte = ktla_ktva(kaddr);
30273 insn->x86_64 = x86_64 ? 1 : 0;
30274 insn->opnd_bytes = 4;
30275 if (x86_64)
30276 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30277 index 05a95e7..326f2fa 100644
30278 --- a/arch/x86/lib/iomap_copy_64.S
30279 +++ b/arch/x86/lib/iomap_copy_64.S
30280 @@ -17,6 +17,7 @@
30281
30282 #include <linux/linkage.h>
30283 #include <asm/dwarf2.h>
30284 +#include <asm/alternative-asm.h>
30285
30286 /*
30287 * override generic version in lib/iomap_copy.c
30288 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30289 CFI_STARTPROC
30290 movl %edx,%ecx
30291 rep movsd
30292 + pax_force_retaddr
30293 ret
30294 CFI_ENDPROC
30295 ENDPROC(__iowrite32_copy)
30296 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30297 index 56313a3..0db417e 100644
30298 --- a/arch/x86/lib/memcpy_64.S
30299 +++ b/arch/x86/lib/memcpy_64.S
30300 @@ -24,7 +24,7 @@
30301 * This gets patched over the unrolled variant (below) via the
30302 * alternative instructions framework:
30303 */
30304 - .section .altinstr_replacement, "ax", @progbits
30305 + .section .altinstr_replacement, "a", @progbits
30306 .Lmemcpy_c:
30307 movq %rdi, %rax
30308 movq %rdx, %rcx
30309 @@ -33,6 +33,7 @@
30310 rep movsq
30311 movl %edx, %ecx
30312 rep movsb
30313 + pax_force_retaddr
30314 ret
30315 .Lmemcpy_e:
30316 .previous
30317 @@ -44,11 +45,12 @@
30318 * This gets patched over the unrolled variant (below) via the
30319 * alternative instructions framework:
30320 */
30321 - .section .altinstr_replacement, "ax", @progbits
30322 + .section .altinstr_replacement, "a", @progbits
30323 .Lmemcpy_c_e:
30324 movq %rdi, %rax
30325 movq %rdx, %rcx
30326 rep movsb
30327 + pax_force_retaddr
30328 ret
30329 .Lmemcpy_e_e:
30330 .previous
30331 @@ -136,6 +138,7 @@ ENTRY(memcpy)
30332 movq %r9, 1*8(%rdi)
30333 movq %r10, -2*8(%rdi, %rdx)
30334 movq %r11, -1*8(%rdi, %rdx)
30335 + pax_force_retaddr
30336 retq
30337 .p2align 4
30338 .Lless_16bytes:
30339 @@ -148,6 +151,7 @@ ENTRY(memcpy)
30340 movq -1*8(%rsi, %rdx), %r9
30341 movq %r8, 0*8(%rdi)
30342 movq %r9, -1*8(%rdi, %rdx)
30343 + pax_force_retaddr
30344 retq
30345 .p2align 4
30346 .Lless_8bytes:
30347 @@ -161,6 +165,7 @@ ENTRY(memcpy)
30348 movl -4(%rsi, %rdx), %r8d
30349 movl %ecx, (%rdi)
30350 movl %r8d, -4(%rdi, %rdx)
30351 + pax_force_retaddr
30352 retq
30353 .p2align 4
30354 .Lless_3bytes:
30355 @@ -179,6 +184,7 @@ ENTRY(memcpy)
30356 movb %cl, (%rdi)
30357
30358 .Lend:
30359 + pax_force_retaddr
30360 retq
30361 CFI_ENDPROC
30362 ENDPROC(memcpy)
30363 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30364 index 65268a6..dd1de11 100644
30365 --- a/arch/x86/lib/memmove_64.S
30366 +++ b/arch/x86/lib/memmove_64.S
30367 @@ -202,14 +202,16 @@ ENTRY(memmove)
30368 movb (%rsi), %r11b
30369 movb %r11b, (%rdi)
30370 13:
30371 + pax_force_retaddr
30372 retq
30373 CFI_ENDPROC
30374
30375 - .section .altinstr_replacement,"ax"
30376 + .section .altinstr_replacement,"a"
30377 .Lmemmove_begin_forward_efs:
30378 /* Forward moving data. */
30379 movq %rdx, %rcx
30380 rep movsb
30381 + pax_force_retaddr
30382 retq
30383 .Lmemmove_end_forward_efs:
30384 .previous
30385 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30386 index 2dcb380..2eb79fe 100644
30387 --- a/arch/x86/lib/memset_64.S
30388 +++ b/arch/x86/lib/memset_64.S
30389 @@ -16,7 +16,7 @@
30390 *
30391 * rax original destination
30392 */
30393 - .section .altinstr_replacement, "ax", @progbits
30394 + .section .altinstr_replacement, "a", @progbits
30395 .Lmemset_c:
30396 movq %rdi,%r9
30397 movq %rdx,%rcx
30398 @@ -30,6 +30,7 @@
30399 movl %edx,%ecx
30400 rep stosb
30401 movq %r9,%rax
30402 + pax_force_retaddr
30403 ret
30404 .Lmemset_e:
30405 .previous
30406 @@ -45,13 +46,14 @@
30407 *
30408 * rax original destination
30409 */
30410 - .section .altinstr_replacement, "ax", @progbits
30411 + .section .altinstr_replacement, "a", @progbits
30412 .Lmemset_c_e:
30413 movq %rdi,%r9
30414 movb %sil,%al
30415 movq %rdx,%rcx
30416 rep stosb
30417 movq %r9,%rax
30418 + pax_force_retaddr
30419 ret
30420 .Lmemset_e_e:
30421 .previous
30422 @@ -118,6 +120,7 @@ ENTRY(__memset)
30423
30424 .Lende:
30425 movq %r10,%rax
30426 + pax_force_retaddr
30427 ret
30428
30429 CFI_RESTORE_STATE
30430 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30431 index c9f2d9b..e7fd2c0 100644
30432 --- a/arch/x86/lib/mmx_32.c
30433 +++ b/arch/x86/lib/mmx_32.c
30434 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30435 {
30436 void *p;
30437 int i;
30438 + unsigned long cr0;
30439
30440 if (unlikely(in_interrupt()))
30441 return __memcpy(to, from, len);
30442 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30443 kernel_fpu_begin();
30444
30445 __asm__ __volatile__ (
30446 - "1: prefetch (%0)\n" /* This set is 28 bytes */
30447 - " prefetch 64(%0)\n"
30448 - " prefetch 128(%0)\n"
30449 - " prefetch 192(%0)\n"
30450 - " prefetch 256(%0)\n"
30451 + "1: prefetch (%1)\n" /* This set is 28 bytes */
30452 + " prefetch 64(%1)\n"
30453 + " prefetch 128(%1)\n"
30454 + " prefetch 192(%1)\n"
30455 + " prefetch 256(%1)\n"
30456 "2: \n"
30457 ".section .fixup, \"ax\"\n"
30458 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30459 + "3: \n"
30460 +
30461 +#ifdef CONFIG_PAX_KERNEXEC
30462 + " movl %%cr0, %0\n"
30463 + " movl %0, %%eax\n"
30464 + " andl $0xFFFEFFFF, %%eax\n"
30465 + " movl %%eax, %%cr0\n"
30466 +#endif
30467 +
30468 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30469 +
30470 +#ifdef CONFIG_PAX_KERNEXEC
30471 + " movl %0, %%cr0\n"
30472 +#endif
30473 +
30474 " jmp 2b\n"
30475 ".previous\n"
30476 _ASM_EXTABLE(1b, 3b)
30477 - : : "r" (from));
30478 + : "=&r" (cr0) : "r" (from) : "ax");
30479
30480 for ( ; i > 5; i--) {
30481 __asm__ __volatile__ (
30482 - "1: prefetch 320(%0)\n"
30483 - "2: movq (%0), %%mm0\n"
30484 - " movq 8(%0), %%mm1\n"
30485 - " movq 16(%0), %%mm2\n"
30486 - " movq 24(%0), %%mm3\n"
30487 - " movq %%mm0, (%1)\n"
30488 - " movq %%mm1, 8(%1)\n"
30489 - " movq %%mm2, 16(%1)\n"
30490 - " movq %%mm3, 24(%1)\n"
30491 - " movq 32(%0), %%mm0\n"
30492 - " movq 40(%0), %%mm1\n"
30493 - " movq 48(%0), %%mm2\n"
30494 - " movq 56(%0), %%mm3\n"
30495 - " movq %%mm0, 32(%1)\n"
30496 - " movq %%mm1, 40(%1)\n"
30497 - " movq %%mm2, 48(%1)\n"
30498 - " movq %%mm3, 56(%1)\n"
30499 + "1: prefetch 320(%1)\n"
30500 + "2: movq (%1), %%mm0\n"
30501 + " movq 8(%1), %%mm1\n"
30502 + " movq 16(%1), %%mm2\n"
30503 + " movq 24(%1), %%mm3\n"
30504 + " movq %%mm0, (%2)\n"
30505 + " movq %%mm1, 8(%2)\n"
30506 + " movq %%mm2, 16(%2)\n"
30507 + " movq %%mm3, 24(%2)\n"
30508 + " movq 32(%1), %%mm0\n"
30509 + " movq 40(%1), %%mm1\n"
30510 + " movq 48(%1), %%mm2\n"
30511 + " movq 56(%1), %%mm3\n"
30512 + " movq %%mm0, 32(%2)\n"
30513 + " movq %%mm1, 40(%2)\n"
30514 + " movq %%mm2, 48(%2)\n"
30515 + " movq %%mm3, 56(%2)\n"
30516 ".section .fixup, \"ax\"\n"
30517 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30518 + "3:\n"
30519 +
30520 +#ifdef CONFIG_PAX_KERNEXEC
30521 + " movl %%cr0, %0\n"
30522 + " movl %0, %%eax\n"
30523 + " andl $0xFFFEFFFF, %%eax\n"
30524 + " movl %%eax, %%cr0\n"
30525 +#endif
30526 +
30527 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30528 +
30529 +#ifdef CONFIG_PAX_KERNEXEC
30530 + " movl %0, %%cr0\n"
30531 +#endif
30532 +
30533 " jmp 2b\n"
30534 ".previous\n"
30535 _ASM_EXTABLE(1b, 3b)
30536 - : : "r" (from), "r" (to) : "memory");
30537 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30538
30539 from += 64;
30540 to += 64;
30541 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30542 static void fast_copy_page(void *to, void *from)
30543 {
30544 int i;
30545 + unsigned long cr0;
30546
30547 kernel_fpu_begin();
30548
30549 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30550 * but that is for later. -AV
30551 */
30552 __asm__ __volatile__(
30553 - "1: prefetch (%0)\n"
30554 - " prefetch 64(%0)\n"
30555 - " prefetch 128(%0)\n"
30556 - " prefetch 192(%0)\n"
30557 - " prefetch 256(%0)\n"
30558 + "1: prefetch (%1)\n"
30559 + " prefetch 64(%1)\n"
30560 + " prefetch 128(%1)\n"
30561 + " prefetch 192(%1)\n"
30562 + " prefetch 256(%1)\n"
30563 "2: \n"
30564 ".section .fixup, \"ax\"\n"
30565 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30566 + "3: \n"
30567 +
30568 +#ifdef CONFIG_PAX_KERNEXEC
30569 + " movl %%cr0, %0\n"
30570 + " movl %0, %%eax\n"
30571 + " andl $0xFFFEFFFF, %%eax\n"
30572 + " movl %%eax, %%cr0\n"
30573 +#endif
30574 +
30575 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30576 +
30577 +#ifdef CONFIG_PAX_KERNEXEC
30578 + " movl %0, %%cr0\n"
30579 +#endif
30580 +
30581 " jmp 2b\n"
30582 ".previous\n"
30583 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30584 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30585
30586 for (i = 0; i < (4096-320)/64; i++) {
30587 __asm__ __volatile__ (
30588 - "1: prefetch 320(%0)\n"
30589 - "2: movq (%0), %%mm0\n"
30590 - " movntq %%mm0, (%1)\n"
30591 - " movq 8(%0), %%mm1\n"
30592 - " movntq %%mm1, 8(%1)\n"
30593 - " movq 16(%0), %%mm2\n"
30594 - " movntq %%mm2, 16(%1)\n"
30595 - " movq 24(%0), %%mm3\n"
30596 - " movntq %%mm3, 24(%1)\n"
30597 - " movq 32(%0), %%mm4\n"
30598 - " movntq %%mm4, 32(%1)\n"
30599 - " movq 40(%0), %%mm5\n"
30600 - " movntq %%mm5, 40(%1)\n"
30601 - " movq 48(%0), %%mm6\n"
30602 - " movntq %%mm6, 48(%1)\n"
30603 - " movq 56(%0), %%mm7\n"
30604 - " movntq %%mm7, 56(%1)\n"
30605 + "1: prefetch 320(%1)\n"
30606 + "2: movq (%1), %%mm0\n"
30607 + " movntq %%mm0, (%2)\n"
30608 + " movq 8(%1), %%mm1\n"
30609 + " movntq %%mm1, 8(%2)\n"
30610 + " movq 16(%1), %%mm2\n"
30611 + " movntq %%mm2, 16(%2)\n"
30612 + " movq 24(%1), %%mm3\n"
30613 + " movntq %%mm3, 24(%2)\n"
30614 + " movq 32(%1), %%mm4\n"
30615 + " movntq %%mm4, 32(%2)\n"
30616 + " movq 40(%1), %%mm5\n"
30617 + " movntq %%mm5, 40(%2)\n"
30618 + " movq 48(%1), %%mm6\n"
30619 + " movntq %%mm6, 48(%2)\n"
30620 + " movq 56(%1), %%mm7\n"
30621 + " movntq %%mm7, 56(%2)\n"
30622 ".section .fixup, \"ax\"\n"
30623 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30624 + "3:\n"
30625 +
30626 +#ifdef CONFIG_PAX_KERNEXEC
30627 + " movl %%cr0, %0\n"
30628 + " movl %0, %%eax\n"
30629 + " andl $0xFFFEFFFF, %%eax\n"
30630 + " movl %%eax, %%cr0\n"
30631 +#endif
30632 +
30633 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30634 +
30635 +#ifdef CONFIG_PAX_KERNEXEC
30636 + " movl %0, %%cr0\n"
30637 +#endif
30638 +
30639 " jmp 2b\n"
30640 ".previous\n"
30641 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30642 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30643
30644 from += 64;
30645 to += 64;
30646 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30647 static void fast_copy_page(void *to, void *from)
30648 {
30649 int i;
30650 + unsigned long cr0;
30651
30652 kernel_fpu_begin();
30653
30654 __asm__ __volatile__ (
30655 - "1: prefetch (%0)\n"
30656 - " prefetch 64(%0)\n"
30657 - " prefetch 128(%0)\n"
30658 - " prefetch 192(%0)\n"
30659 - " prefetch 256(%0)\n"
30660 + "1: prefetch (%1)\n"
30661 + " prefetch 64(%1)\n"
30662 + " prefetch 128(%1)\n"
30663 + " prefetch 192(%1)\n"
30664 + " prefetch 256(%1)\n"
30665 "2: \n"
30666 ".section .fixup, \"ax\"\n"
30667 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30668 + "3: \n"
30669 +
30670 +#ifdef CONFIG_PAX_KERNEXEC
30671 + " movl %%cr0, %0\n"
30672 + " movl %0, %%eax\n"
30673 + " andl $0xFFFEFFFF, %%eax\n"
30674 + " movl %%eax, %%cr0\n"
30675 +#endif
30676 +
30677 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30678 +
30679 +#ifdef CONFIG_PAX_KERNEXEC
30680 + " movl %0, %%cr0\n"
30681 +#endif
30682 +
30683 " jmp 2b\n"
30684 ".previous\n"
30685 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30686 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30687
30688 for (i = 0; i < 4096/64; i++) {
30689 __asm__ __volatile__ (
30690 - "1: prefetch 320(%0)\n"
30691 - "2: movq (%0), %%mm0\n"
30692 - " movq 8(%0), %%mm1\n"
30693 - " movq 16(%0), %%mm2\n"
30694 - " movq 24(%0), %%mm3\n"
30695 - " movq %%mm0, (%1)\n"
30696 - " movq %%mm1, 8(%1)\n"
30697 - " movq %%mm2, 16(%1)\n"
30698 - " movq %%mm3, 24(%1)\n"
30699 - " movq 32(%0), %%mm0\n"
30700 - " movq 40(%0), %%mm1\n"
30701 - " movq 48(%0), %%mm2\n"
30702 - " movq 56(%0), %%mm3\n"
30703 - " movq %%mm0, 32(%1)\n"
30704 - " movq %%mm1, 40(%1)\n"
30705 - " movq %%mm2, 48(%1)\n"
30706 - " movq %%mm3, 56(%1)\n"
30707 + "1: prefetch 320(%1)\n"
30708 + "2: movq (%1), %%mm0\n"
30709 + " movq 8(%1), %%mm1\n"
30710 + " movq 16(%1), %%mm2\n"
30711 + " movq 24(%1), %%mm3\n"
30712 + " movq %%mm0, (%2)\n"
30713 + " movq %%mm1, 8(%2)\n"
30714 + " movq %%mm2, 16(%2)\n"
30715 + " movq %%mm3, 24(%2)\n"
30716 + " movq 32(%1), %%mm0\n"
30717 + " movq 40(%1), %%mm1\n"
30718 + " movq 48(%1), %%mm2\n"
30719 + " movq 56(%1), %%mm3\n"
30720 + " movq %%mm0, 32(%2)\n"
30721 + " movq %%mm1, 40(%2)\n"
30722 + " movq %%mm2, 48(%2)\n"
30723 + " movq %%mm3, 56(%2)\n"
30724 ".section .fixup, \"ax\"\n"
30725 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30726 + "3:\n"
30727 +
30728 +#ifdef CONFIG_PAX_KERNEXEC
30729 + " movl %%cr0, %0\n"
30730 + " movl %0, %%eax\n"
30731 + " andl $0xFFFEFFFF, %%eax\n"
30732 + " movl %%eax, %%cr0\n"
30733 +#endif
30734 +
30735 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30736 +
30737 +#ifdef CONFIG_PAX_KERNEXEC
30738 + " movl %0, %%cr0\n"
30739 +#endif
30740 +
30741 " jmp 2b\n"
30742 ".previous\n"
30743 _ASM_EXTABLE(1b, 3b)
30744 - : : "r" (from), "r" (to) : "memory");
30745 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30746
30747 from += 64;
30748 to += 64;
30749 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30750 index f6d13ee..d789440 100644
30751 --- a/arch/x86/lib/msr-reg.S
30752 +++ b/arch/x86/lib/msr-reg.S
30753 @@ -3,6 +3,7 @@
30754 #include <asm/dwarf2.h>
30755 #include <asm/asm.h>
30756 #include <asm/msr.h>
30757 +#include <asm/alternative-asm.h>
30758
30759 #ifdef CONFIG_X86_64
30760 /*
30761 @@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30762 movl %edi, 28(%r10)
30763 popq_cfi %rbp
30764 popq_cfi %rbx
30765 + pax_force_retaddr
30766 ret
30767 3:
30768 CFI_RESTORE_STATE
30769 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30770 index fc6ba17..d4d989d 100644
30771 --- a/arch/x86/lib/putuser.S
30772 +++ b/arch/x86/lib/putuser.S
30773 @@ -16,7 +16,9 @@
30774 #include <asm/errno.h>
30775 #include <asm/asm.h>
30776 #include <asm/smap.h>
30777 -
30778 +#include <asm/segment.h>
30779 +#include <asm/pgtable.h>
30780 +#include <asm/alternative-asm.h>
30781
30782 /*
30783 * __put_user_X
30784 @@ -30,57 +32,125 @@
30785 * as they get called from within inline assembly.
30786 */
30787
30788 -#define ENTER CFI_STARTPROC ; \
30789 - GET_THREAD_INFO(%_ASM_BX)
30790 -#define EXIT ASM_CLAC ; \
30791 - ret ; \
30792 +#define ENTER CFI_STARTPROC
30793 +#define EXIT ASM_CLAC ; \
30794 + pax_force_retaddr ; \
30795 + ret ; \
30796 CFI_ENDPROC
30797
30798 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30799 +#define _DEST %_ASM_CX,%_ASM_BX
30800 +#else
30801 +#define _DEST %_ASM_CX
30802 +#endif
30803 +
30804 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30805 +#define __copyuser_seg gs;
30806 +#else
30807 +#define __copyuser_seg
30808 +#endif
30809 +
30810 .text
30811 ENTRY(__put_user_1)
30812 ENTER
30813 +
30814 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30815 + GET_THREAD_INFO(%_ASM_BX)
30816 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30817 jae bad_put_user
30818 ASM_STAC
30819 -1: movb %al,(%_ASM_CX)
30820 +
30821 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30822 + mov pax_user_shadow_base,%_ASM_BX
30823 + cmp %_ASM_BX,%_ASM_CX
30824 + jb 1234f
30825 + xor %ebx,%ebx
30826 +1234:
30827 +#endif
30828 +
30829 +#endif
30830 +
30831 +1: __copyuser_seg movb %al,(_DEST)
30832 xor %eax,%eax
30833 EXIT
30834 ENDPROC(__put_user_1)
30835
30836 ENTRY(__put_user_2)
30837 ENTER
30838 +
30839 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30840 + GET_THREAD_INFO(%_ASM_BX)
30841 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30842 sub $1,%_ASM_BX
30843 cmp %_ASM_BX,%_ASM_CX
30844 jae bad_put_user
30845 ASM_STAC
30846 -2: movw %ax,(%_ASM_CX)
30847 +
30848 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30849 + mov pax_user_shadow_base,%_ASM_BX
30850 + cmp %_ASM_BX,%_ASM_CX
30851 + jb 1234f
30852 + xor %ebx,%ebx
30853 +1234:
30854 +#endif
30855 +
30856 +#endif
30857 +
30858 +2: __copyuser_seg movw %ax,(_DEST)
30859 xor %eax,%eax
30860 EXIT
30861 ENDPROC(__put_user_2)
30862
30863 ENTRY(__put_user_4)
30864 ENTER
30865 +
30866 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30867 + GET_THREAD_INFO(%_ASM_BX)
30868 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30869 sub $3,%_ASM_BX
30870 cmp %_ASM_BX,%_ASM_CX
30871 jae bad_put_user
30872 ASM_STAC
30873 -3: movl %eax,(%_ASM_CX)
30874 +
30875 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30876 + mov pax_user_shadow_base,%_ASM_BX
30877 + cmp %_ASM_BX,%_ASM_CX
30878 + jb 1234f
30879 + xor %ebx,%ebx
30880 +1234:
30881 +#endif
30882 +
30883 +#endif
30884 +
30885 +3: __copyuser_seg movl %eax,(_DEST)
30886 xor %eax,%eax
30887 EXIT
30888 ENDPROC(__put_user_4)
30889
30890 ENTRY(__put_user_8)
30891 ENTER
30892 +
30893 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30894 + GET_THREAD_INFO(%_ASM_BX)
30895 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30896 sub $7,%_ASM_BX
30897 cmp %_ASM_BX,%_ASM_CX
30898 jae bad_put_user
30899 ASM_STAC
30900 -4: mov %_ASM_AX,(%_ASM_CX)
30901 +
30902 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30903 + mov pax_user_shadow_base,%_ASM_BX
30904 + cmp %_ASM_BX,%_ASM_CX
30905 + jb 1234f
30906 + xor %ebx,%ebx
30907 +1234:
30908 +#endif
30909 +
30910 +#endif
30911 +
30912 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
30913 #ifdef CONFIG_X86_32
30914 -5: movl %edx,4(%_ASM_CX)
30915 +5: __copyuser_seg movl %edx,4(_DEST)
30916 #endif
30917 xor %eax,%eax
30918 EXIT
30919 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30920 index 5dff5f0..cadebf4 100644
30921 --- a/arch/x86/lib/rwsem.S
30922 +++ b/arch/x86/lib/rwsem.S
30923 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30924 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30925 CFI_RESTORE __ASM_REG(dx)
30926 restore_common_regs
30927 + pax_force_retaddr
30928 ret
30929 CFI_ENDPROC
30930 ENDPROC(call_rwsem_down_read_failed)
30931 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30932 movq %rax,%rdi
30933 call rwsem_down_write_failed
30934 restore_common_regs
30935 + pax_force_retaddr
30936 ret
30937 CFI_ENDPROC
30938 ENDPROC(call_rwsem_down_write_failed)
30939 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30940 movq %rax,%rdi
30941 call rwsem_wake
30942 restore_common_regs
30943 -1: ret
30944 +1: pax_force_retaddr
30945 + ret
30946 CFI_ENDPROC
30947 ENDPROC(call_rwsem_wake)
30948
30949 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30950 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30951 CFI_RESTORE __ASM_REG(dx)
30952 restore_common_regs
30953 + pax_force_retaddr
30954 ret
30955 CFI_ENDPROC
30956 ENDPROC(call_rwsem_downgrade_wake)
30957 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30958 index b30b5eb..2b57052 100644
30959 --- a/arch/x86/lib/thunk_64.S
30960 +++ b/arch/x86/lib/thunk_64.S
30961 @@ -9,6 +9,7 @@
30962 #include <asm/dwarf2.h>
30963 #include <asm/calling.h>
30964 #include <asm/asm.h>
30965 +#include <asm/alternative-asm.h>
30966
30967 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30968 .macro THUNK name, func, put_ret_addr_in_rdi=0
30969 @@ -16,11 +17,11 @@
30970 \name:
30971 CFI_STARTPROC
30972
30973 - /* this one pushes 9 elems, the next one would be %rIP */
30974 - SAVE_ARGS
30975 + /* this one pushes 15+1 elems, the next one would be %rIP */
30976 + SAVE_ARGS 8
30977
30978 .if \put_ret_addr_in_rdi
30979 - movq_cfi_restore 9*8, rdi
30980 + movq_cfi_restore RIP, rdi
30981 .endif
30982
30983 call \func
30984 @@ -47,9 +48,10 @@
30985
30986 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30987 CFI_STARTPROC
30988 - SAVE_ARGS
30989 + SAVE_ARGS 8
30990 restore:
30991 - RESTORE_ARGS
30992 + RESTORE_ARGS 1,8
30993 + pax_force_retaddr
30994 ret
30995 CFI_ENDPROC
30996 _ASM_NOKPROBE(restore)
30997 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
30998 index e2f5e21..4b22130 100644
30999 --- a/arch/x86/lib/usercopy_32.c
31000 +++ b/arch/x86/lib/usercopy_32.c
31001 @@ -42,11 +42,13 @@ do { \
31002 int __d0; \
31003 might_fault(); \
31004 __asm__ __volatile__( \
31005 + __COPYUSER_SET_ES \
31006 ASM_STAC "\n" \
31007 "0: rep; stosl\n" \
31008 " movl %2,%0\n" \
31009 "1: rep; stosb\n" \
31010 "2: " ASM_CLAC "\n" \
31011 + __COPYUSER_RESTORE_ES \
31012 ".section .fixup,\"ax\"\n" \
31013 "3: lea 0(%2,%0,4),%0\n" \
31014 " jmp 2b\n" \
31015 @@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31016
31017 #ifdef CONFIG_X86_INTEL_USERCOPY
31018 static unsigned long
31019 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
31020 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31021 {
31022 int d0, d1;
31023 __asm__ __volatile__(
31024 @@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31025 " .align 2,0x90\n"
31026 "3: movl 0(%4), %%eax\n"
31027 "4: movl 4(%4), %%edx\n"
31028 - "5: movl %%eax, 0(%3)\n"
31029 - "6: movl %%edx, 4(%3)\n"
31030 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31031 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31032 "7: movl 8(%4), %%eax\n"
31033 "8: movl 12(%4),%%edx\n"
31034 - "9: movl %%eax, 8(%3)\n"
31035 - "10: movl %%edx, 12(%3)\n"
31036 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31037 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31038 "11: movl 16(%4), %%eax\n"
31039 "12: movl 20(%4), %%edx\n"
31040 - "13: movl %%eax, 16(%3)\n"
31041 - "14: movl %%edx, 20(%3)\n"
31042 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31043 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31044 "15: movl 24(%4), %%eax\n"
31045 "16: movl 28(%4), %%edx\n"
31046 - "17: movl %%eax, 24(%3)\n"
31047 - "18: movl %%edx, 28(%3)\n"
31048 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31049 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31050 "19: movl 32(%4), %%eax\n"
31051 "20: movl 36(%4), %%edx\n"
31052 - "21: movl %%eax, 32(%3)\n"
31053 - "22: movl %%edx, 36(%3)\n"
31054 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31055 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31056 "23: movl 40(%4), %%eax\n"
31057 "24: movl 44(%4), %%edx\n"
31058 - "25: movl %%eax, 40(%3)\n"
31059 - "26: movl %%edx, 44(%3)\n"
31060 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31061 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31062 "27: movl 48(%4), %%eax\n"
31063 "28: movl 52(%4), %%edx\n"
31064 - "29: movl %%eax, 48(%3)\n"
31065 - "30: movl %%edx, 52(%3)\n"
31066 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31067 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31068 "31: movl 56(%4), %%eax\n"
31069 "32: movl 60(%4), %%edx\n"
31070 - "33: movl %%eax, 56(%3)\n"
31071 - "34: movl %%edx, 60(%3)\n"
31072 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31073 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31074 " addl $-64, %0\n"
31075 " addl $64, %4\n"
31076 " addl $64, %3\n"
31077 @@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31078 " shrl $2, %0\n"
31079 " andl $3, %%eax\n"
31080 " cld\n"
31081 + __COPYUSER_SET_ES
31082 "99: rep; movsl\n"
31083 "36: movl %%eax, %0\n"
31084 "37: rep; movsb\n"
31085 "100:\n"
31086 + __COPYUSER_RESTORE_ES
31087 + ".section .fixup,\"ax\"\n"
31088 + "101: lea 0(%%eax,%0,4),%0\n"
31089 + " jmp 100b\n"
31090 + ".previous\n"
31091 + _ASM_EXTABLE(1b,100b)
31092 + _ASM_EXTABLE(2b,100b)
31093 + _ASM_EXTABLE(3b,100b)
31094 + _ASM_EXTABLE(4b,100b)
31095 + _ASM_EXTABLE(5b,100b)
31096 + _ASM_EXTABLE(6b,100b)
31097 + _ASM_EXTABLE(7b,100b)
31098 + _ASM_EXTABLE(8b,100b)
31099 + _ASM_EXTABLE(9b,100b)
31100 + _ASM_EXTABLE(10b,100b)
31101 + _ASM_EXTABLE(11b,100b)
31102 + _ASM_EXTABLE(12b,100b)
31103 + _ASM_EXTABLE(13b,100b)
31104 + _ASM_EXTABLE(14b,100b)
31105 + _ASM_EXTABLE(15b,100b)
31106 + _ASM_EXTABLE(16b,100b)
31107 + _ASM_EXTABLE(17b,100b)
31108 + _ASM_EXTABLE(18b,100b)
31109 + _ASM_EXTABLE(19b,100b)
31110 + _ASM_EXTABLE(20b,100b)
31111 + _ASM_EXTABLE(21b,100b)
31112 + _ASM_EXTABLE(22b,100b)
31113 + _ASM_EXTABLE(23b,100b)
31114 + _ASM_EXTABLE(24b,100b)
31115 + _ASM_EXTABLE(25b,100b)
31116 + _ASM_EXTABLE(26b,100b)
31117 + _ASM_EXTABLE(27b,100b)
31118 + _ASM_EXTABLE(28b,100b)
31119 + _ASM_EXTABLE(29b,100b)
31120 + _ASM_EXTABLE(30b,100b)
31121 + _ASM_EXTABLE(31b,100b)
31122 + _ASM_EXTABLE(32b,100b)
31123 + _ASM_EXTABLE(33b,100b)
31124 + _ASM_EXTABLE(34b,100b)
31125 + _ASM_EXTABLE(35b,100b)
31126 + _ASM_EXTABLE(36b,100b)
31127 + _ASM_EXTABLE(37b,100b)
31128 + _ASM_EXTABLE(99b,101b)
31129 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
31130 + : "1"(to), "2"(from), "0"(size)
31131 + : "eax", "edx", "memory");
31132 + return size;
31133 +}
31134 +
31135 +static unsigned long
31136 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31137 +{
31138 + int d0, d1;
31139 + __asm__ __volatile__(
31140 + " .align 2,0x90\n"
31141 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31142 + " cmpl $67, %0\n"
31143 + " jbe 3f\n"
31144 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31145 + " .align 2,0x90\n"
31146 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31147 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31148 + "5: movl %%eax, 0(%3)\n"
31149 + "6: movl %%edx, 4(%3)\n"
31150 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31151 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31152 + "9: movl %%eax, 8(%3)\n"
31153 + "10: movl %%edx, 12(%3)\n"
31154 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31155 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31156 + "13: movl %%eax, 16(%3)\n"
31157 + "14: movl %%edx, 20(%3)\n"
31158 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31159 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31160 + "17: movl %%eax, 24(%3)\n"
31161 + "18: movl %%edx, 28(%3)\n"
31162 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31163 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31164 + "21: movl %%eax, 32(%3)\n"
31165 + "22: movl %%edx, 36(%3)\n"
31166 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31167 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31168 + "25: movl %%eax, 40(%3)\n"
31169 + "26: movl %%edx, 44(%3)\n"
31170 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31171 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31172 + "29: movl %%eax, 48(%3)\n"
31173 + "30: movl %%edx, 52(%3)\n"
31174 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31175 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31176 + "33: movl %%eax, 56(%3)\n"
31177 + "34: movl %%edx, 60(%3)\n"
31178 + " addl $-64, %0\n"
31179 + " addl $64, %4\n"
31180 + " addl $64, %3\n"
31181 + " cmpl $63, %0\n"
31182 + " ja 1b\n"
31183 + "35: movl %0, %%eax\n"
31184 + " shrl $2, %0\n"
31185 + " andl $3, %%eax\n"
31186 + " cld\n"
31187 + "99: rep; "__copyuser_seg" movsl\n"
31188 + "36: movl %%eax, %0\n"
31189 + "37: rep; "__copyuser_seg" movsb\n"
31190 + "100:\n"
31191 ".section .fixup,\"ax\"\n"
31192 "101: lea 0(%%eax,%0,4),%0\n"
31193 " jmp 100b\n"
31194 @@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31195 int d0, d1;
31196 __asm__ __volatile__(
31197 " .align 2,0x90\n"
31198 - "0: movl 32(%4), %%eax\n"
31199 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31200 " cmpl $67, %0\n"
31201 " jbe 2f\n"
31202 - "1: movl 64(%4), %%eax\n"
31203 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31204 " .align 2,0x90\n"
31205 - "2: movl 0(%4), %%eax\n"
31206 - "21: movl 4(%4), %%edx\n"
31207 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31208 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31209 " movl %%eax, 0(%3)\n"
31210 " movl %%edx, 4(%3)\n"
31211 - "3: movl 8(%4), %%eax\n"
31212 - "31: movl 12(%4),%%edx\n"
31213 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31214 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31215 " movl %%eax, 8(%3)\n"
31216 " movl %%edx, 12(%3)\n"
31217 - "4: movl 16(%4), %%eax\n"
31218 - "41: movl 20(%4), %%edx\n"
31219 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31220 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31221 " movl %%eax, 16(%3)\n"
31222 " movl %%edx, 20(%3)\n"
31223 - "10: movl 24(%4), %%eax\n"
31224 - "51: movl 28(%4), %%edx\n"
31225 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31226 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31227 " movl %%eax, 24(%3)\n"
31228 " movl %%edx, 28(%3)\n"
31229 - "11: movl 32(%4), %%eax\n"
31230 - "61: movl 36(%4), %%edx\n"
31231 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31232 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31233 " movl %%eax, 32(%3)\n"
31234 " movl %%edx, 36(%3)\n"
31235 - "12: movl 40(%4), %%eax\n"
31236 - "71: movl 44(%4), %%edx\n"
31237 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31238 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31239 " movl %%eax, 40(%3)\n"
31240 " movl %%edx, 44(%3)\n"
31241 - "13: movl 48(%4), %%eax\n"
31242 - "81: movl 52(%4), %%edx\n"
31243 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31244 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31245 " movl %%eax, 48(%3)\n"
31246 " movl %%edx, 52(%3)\n"
31247 - "14: movl 56(%4), %%eax\n"
31248 - "91: movl 60(%4), %%edx\n"
31249 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31250 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31251 " movl %%eax, 56(%3)\n"
31252 " movl %%edx, 60(%3)\n"
31253 " addl $-64, %0\n"
31254 @@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31255 " shrl $2, %0\n"
31256 " andl $3, %%eax\n"
31257 " cld\n"
31258 - "6: rep; movsl\n"
31259 + "6: rep; "__copyuser_seg" movsl\n"
31260 " movl %%eax,%0\n"
31261 - "7: rep; movsb\n"
31262 + "7: rep; "__copyuser_seg" movsb\n"
31263 "8:\n"
31264 ".section .fixup,\"ax\"\n"
31265 "9: lea 0(%%eax,%0,4),%0\n"
31266 @@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31267
31268 __asm__ __volatile__(
31269 " .align 2,0x90\n"
31270 - "0: movl 32(%4), %%eax\n"
31271 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31272 " cmpl $67, %0\n"
31273 " jbe 2f\n"
31274 - "1: movl 64(%4), %%eax\n"
31275 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31276 " .align 2,0x90\n"
31277 - "2: movl 0(%4), %%eax\n"
31278 - "21: movl 4(%4), %%edx\n"
31279 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31280 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31281 " movnti %%eax, 0(%3)\n"
31282 " movnti %%edx, 4(%3)\n"
31283 - "3: movl 8(%4), %%eax\n"
31284 - "31: movl 12(%4),%%edx\n"
31285 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31286 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31287 " movnti %%eax, 8(%3)\n"
31288 " movnti %%edx, 12(%3)\n"
31289 - "4: movl 16(%4), %%eax\n"
31290 - "41: movl 20(%4), %%edx\n"
31291 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31292 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31293 " movnti %%eax, 16(%3)\n"
31294 " movnti %%edx, 20(%3)\n"
31295 - "10: movl 24(%4), %%eax\n"
31296 - "51: movl 28(%4), %%edx\n"
31297 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31298 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31299 " movnti %%eax, 24(%3)\n"
31300 " movnti %%edx, 28(%3)\n"
31301 - "11: movl 32(%4), %%eax\n"
31302 - "61: movl 36(%4), %%edx\n"
31303 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31304 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31305 " movnti %%eax, 32(%3)\n"
31306 " movnti %%edx, 36(%3)\n"
31307 - "12: movl 40(%4), %%eax\n"
31308 - "71: movl 44(%4), %%edx\n"
31309 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31310 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31311 " movnti %%eax, 40(%3)\n"
31312 " movnti %%edx, 44(%3)\n"
31313 - "13: movl 48(%4), %%eax\n"
31314 - "81: movl 52(%4), %%edx\n"
31315 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31316 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31317 " movnti %%eax, 48(%3)\n"
31318 " movnti %%edx, 52(%3)\n"
31319 - "14: movl 56(%4), %%eax\n"
31320 - "91: movl 60(%4), %%edx\n"
31321 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31322 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31323 " movnti %%eax, 56(%3)\n"
31324 " movnti %%edx, 60(%3)\n"
31325 " addl $-64, %0\n"
31326 @@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31327 " shrl $2, %0\n"
31328 " andl $3, %%eax\n"
31329 " cld\n"
31330 - "6: rep; movsl\n"
31331 + "6: rep; "__copyuser_seg" movsl\n"
31332 " movl %%eax,%0\n"
31333 - "7: rep; movsb\n"
31334 + "7: rep; "__copyuser_seg" movsb\n"
31335 "8:\n"
31336 ".section .fixup,\"ax\"\n"
31337 "9: lea 0(%%eax,%0,4),%0\n"
31338 @@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31339
31340 __asm__ __volatile__(
31341 " .align 2,0x90\n"
31342 - "0: movl 32(%4), %%eax\n"
31343 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31344 " cmpl $67, %0\n"
31345 " jbe 2f\n"
31346 - "1: movl 64(%4), %%eax\n"
31347 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31348 " .align 2,0x90\n"
31349 - "2: movl 0(%4), %%eax\n"
31350 - "21: movl 4(%4), %%edx\n"
31351 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31352 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31353 " movnti %%eax, 0(%3)\n"
31354 " movnti %%edx, 4(%3)\n"
31355 - "3: movl 8(%4), %%eax\n"
31356 - "31: movl 12(%4),%%edx\n"
31357 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31358 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31359 " movnti %%eax, 8(%3)\n"
31360 " movnti %%edx, 12(%3)\n"
31361 - "4: movl 16(%4), %%eax\n"
31362 - "41: movl 20(%4), %%edx\n"
31363 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31364 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31365 " movnti %%eax, 16(%3)\n"
31366 " movnti %%edx, 20(%3)\n"
31367 - "10: movl 24(%4), %%eax\n"
31368 - "51: movl 28(%4), %%edx\n"
31369 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31370 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31371 " movnti %%eax, 24(%3)\n"
31372 " movnti %%edx, 28(%3)\n"
31373 - "11: movl 32(%4), %%eax\n"
31374 - "61: movl 36(%4), %%edx\n"
31375 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31376 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31377 " movnti %%eax, 32(%3)\n"
31378 " movnti %%edx, 36(%3)\n"
31379 - "12: movl 40(%4), %%eax\n"
31380 - "71: movl 44(%4), %%edx\n"
31381 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31382 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31383 " movnti %%eax, 40(%3)\n"
31384 " movnti %%edx, 44(%3)\n"
31385 - "13: movl 48(%4), %%eax\n"
31386 - "81: movl 52(%4), %%edx\n"
31387 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31388 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31389 " movnti %%eax, 48(%3)\n"
31390 " movnti %%edx, 52(%3)\n"
31391 - "14: movl 56(%4), %%eax\n"
31392 - "91: movl 60(%4), %%edx\n"
31393 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31394 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31395 " movnti %%eax, 56(%3)\n"
31396 " movnti %%edx, 60(%3)\n"
31397 " addl $-64, %0\n"
31398 @@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31399 " shrl $2, %0\n"
31400 " andl $3, %%eax\n"
31401 " cld\n"
31402 - "6: rep; movsl\n"
31403 + "6: rep; "__copyuser_seg" movsl\n"
31404 " movl %%eax,%0\n"
31405 - "7: rep; movsb\n"
31406 + "7: rep; "__copyuser_seg" movsb\n"
31407 "8:\n"
31408 ".section .fixup,\"ax\"\n"
31409 "9: lea 0(%%eax,%0,4),%0\n"
31410 @@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31411 */
31412 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31413 unsigned long size);
31414 -unsigned long __copy_user_intel(void __user *to, const void *from,
31415 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31416 + unsigned long size);
31417 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31418 unsigned long size);
31419 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31420 const void __user *from, unsigned long size);
31421 #endif /* CONFIG_X86_INTEL_USERCOPY */
31422
31423 /* Generic arbitrary sized copy. */
31424 -#define __copy_user(to, from, size) \
31425 +#define __copy_user(to, from, size, prefix, set, restore) \
31426 do { \
31427 int __d0, __d1, __d2; \
31428 __asm__ __volatile__( \
31429 + set \
31430 " cmp $7,%0\n" \
31431 " jbe 1f\n" \
31432 " movl %1,%0\n" \
31433 " negl %0\n" \
31434 " andl $7,%0\n" \
31435 " subl %0,%3\n" \
31436 - "4: rep; movsb\n" \
31437 + "4: rep; "prefix"movsb\n" \
31438 " movl %3,%0\n" \
31439 " shrl $2,%0\n" \
31440 " andl $3,%3\n" \
31441 " .align 2,0x90\n" \
31442 - "0: rep; movsl\n" \
31443 + "0: rep; "prefix"movsl\n" \
31444 " movl %3,%0\n" \
31445 - "1: rep; movsb\n" \
31446 + "1: rep; "prefix"movsb\n" \
31447 "2:\n" \
31448 + restore \
31449 ".section .fixup,\"ax\"\n" \
31450 "5: addl %3,%0\n" \
31451 " jmp 2b\n" \
31452 @@ -538,14 +650,14 @@ do { \
31453 " negl %0\n" \
31454 " andl $7,%0\n" \
31455 " subl %0,%3\n" \
31456 - "4: rep; movsb\n" \
31457 + "4: rep; "__copyuser_seg"movsb\n" \
31458 " movl %3,%0\n" \
31459 " shrl $2,%0\n" \
31460 " andl $3,%3\n" \
31461 " .align 2,0x90\n" \
31462 - "0: rep; movsl\n" \
31463 + "0: rep; "__copyuser_seg"movsl\n" \
31464 " movl %3,%0\n" \
31465 - "1: rep; movsb\n" \
31466 + "1: rep; "__copyuser_seg"movsb\n" \
31467 "2:\n" \
31468 ".section .fixup,\"ax\"\n" \
31469 "5: addl %3,%0\n" \
31470 @@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31471 {
31472 stac();
31473 if (movsl_is_ok(to, from, n))
31474 - __copy_user(to, from, n);
31475 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31476 else
31477 - n = __copy_user_intel(to, from, n);
31478 + n = __generic_copy_to_user_intel(to, from, n);
31479 clac();
31480 return n;
31481 }
31482 @@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31483 {
31484 stac();
31485 if (movsl_is_ok(to, from, n))
31486 - __copy_user(to, from, n);
31487 + __copy_user(to, from, n, __copyuser_seg, "", "");
31488 else
31489 - n = __copy_user_intel((void __user *)to,
31490 - (const void *)from, n);
31491 + n = __generic_copy_from_user_intel(to, from, n);
31492 clac();
31493 return n;
31494 }
31495 @@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31496 if (n > 64 && cpu_has_xmm2)
31497 n = __copy_user_intel_nocache(to, from, n);
31498 else
31499 - __copy_user(to, from, n);
31500 + __copy_user(to, from, n, __copyuser_seg, "", "");
31501 #else
31502 - __copy_user(to, from, n);
31503 + __copy_user(to, from, n, __copyuser_seg, "", "");
31504 #endif
31505 clac();
31506 return n;
31507 }
31508 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31509
31510 -/**
31511 - * copy_to_user: - Copy a block of data into user space.
31512 - * @to: Destination address, in user space.
31513 - * @from: Source address, in kernel space.
31514 - * @n: Number of bytes to copy.
31515 - *
31516 - * Context: User context only. This function may sleep.
31517 - *
31518 - * Copy data from kernel space to user space.
31519 - *
31520 - * Returns number of bytes that could not be copied.
31521 - * On success, this will be zero.
31522 - */
31523 -unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31524 +#ifdef CONFIG_PAX_MEMORY_UDEREF
31525 +void __set_fs(mm_segment_t x)
31526 {
31527 - if (access_ok(VERIFY_WRITE, to, n))
31528 - n = __copy_to_user(to, from, n);
31529 - return n;
31530 + switch (x.seg) {
31531 + case 0:
31532 + loadsegment(gs, 0);
31533 + break;
31534 + case TASK_SIZE_MAX:
31535 + loadsegment(gs, __USER_DS);
31536 + break;
31537 + case -1UL:
31538 + loadsegment(gs, __KERNEL_DS);
31539 + break;
31540 + default:
31541 + BUG();
31542 + }
31543 }
31544 -EXPORT_SYMBOL(_copy_to_user);
31545 +EXPORT_SYMBOL(__set_fs);
31546
31547 -/**
31548 - * copy_from_user: - Copy a block of data from user space.
31549 - * @to: Destination address, in kernel space.
31550 - * @from: Source address, in user space.
31551 - * @n: Number of bytes to copy.
31552 - *
31553 - * Context: User context only. This function may sleep.
31554 - *
31555 - * Copy data from user space to kernel space.
31556 - *
31557 - * Returns number of bytes that could not be copied.
31558 - * On success, this will be zero.
31559 - *
31560 - * If some data could not be copied, this function will pad the copied
31561 - * data to the requested size using zero bytes.
31562 - */
31563 -unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31564 +void set_fs(mm_segment_t x)
31565 {
31566 - if (access_ok(VERIFY_READ, from, n))
31567 - n = __copy_from_user(to, from, n);
31568 - else
31569 - memset(to, 0, n);
31570 - return n;
31571 + current_thread_info()->addr_limit = x;
31572 + __set_fs(x);
31573 }
31574 -EXPORT_SYMBOL(_copy_from_user);
31575 +EXPORT_SYMBOL(set_fs);
31576 +#endif
31577 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31578 index c905e89..01ab928 100644
31579 --- a/arch/x86/lib/usercopy_64.c
31580 +++ b/arch/x86/lib/usercopy_64.c
31581 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31582 might_fault();
31583 /* no memory constraint because it doesn't change any memory gcc knows
31584 about */
31585 + pax_open_userland();
31586 stac();
31587 asm volatile(
31588 " testq %[size8],%[size8]\n"
31589 @@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31590 _ASM_EXTABLE(0b,3b)
31591 _ASM_EXTABLE(1b,2b)
31592 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31593 - : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31594 + : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31595 [zero] "r" (0UL), [eight] "r" (8UL));
31596 clac();
31597 + pax_close_userland();
31598 return size;
31599 }
31600 EXPORT_SYMBOL(__clear_user);
31601 @@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31602 }
31603 EXPORT_SYMBOL(clear_user);
31604
31605 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31606 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31607 {
31608 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31609 - return copy_user_generic((__force void *)to, (__force void *)from, len);
31610 - }
31611 - return len;
31612 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31613 + return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31614 + return len;
31615 }
31616 EXPORT_SYMBOL(copy_in_user);
31617
31618 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31619 * it is not necessary to optimize tail handling.
31620 */
31621 __visible unsigned long
31622 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31623 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31624 {
31625 char c;
31626 unsigned zero_len;
31627
31628 + clac();
31629 + pax_close_userland();
31630 for (; len; --len, to++) {
31631 if (__get_user_nocheck(c, from++, sizeof(char)))
31632 break;
31633 @@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31634 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31635 if (__put_user_nocheck(c, to++, sizeof(char)))
31636 break;
31637 - clac();
31638 return len;
31639 }
31640 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31641 index 6a19ad9..1c48f9a 100644
31642 --- a/arch/x86/mm/Makefile
31643 +++ b/arch/x86/mm/Makefile
31644 @@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31645 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31646
31647 obj-$(CONFIG_MEMTEST) += memtest.o
31648 +
31649 +quote:="
31650 +obj-$(CONFIG_X86_64) += uderef_64.o
31651 +CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31652 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31653 index 903ec1e..c4166b2 100644
31654 --- a/arch/x86/mm/extable.c
31655 +++ b/arch/x86/mm/extable.c
31656 @@ -6,12 +6,24 @@
31657 static inline unsigned long
31658 ex_insn_addr(const struct exception_table_entry *x)
31659 {
31660 - return (unsigned long)&x->insn + x->insn;
31661 + unsigned long reloc = 0;
31662 +
31663 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31664 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31665 +#endif
31666 +
31667 + return (unsigned long)&x->insn + x->insn + reloc;
31668 }
31669 static inline unsigned long
31670 ex_fixup_addr(const struct exception_table_entry *x)
31671 {
31672 - return (unsigned long)&x->fixup + x->fixup;
31673 + unsigned long reloc = 0;
31674 +
31675 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31676 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31677 +#endif
31678 +
31679 + return (unsigned long)&x->fixup + x->fixup + reloc;
31680 }
31681
31682 int fixup_exception(struct pt_regs *regs)
31683 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31684 unsigned long new_ip;
31685
31686 #ifdef CONFIG_PNPBIOS
31687 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31688 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31689 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31690 extern u32 pnp_bios_is_utter_crap;
31691 pnp_bios_is_utter_crap = 1;
31692 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31693 i += 4;
31694 p->fixup -= i;
31695 i += 4;
31696 +
31697 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31698 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31699 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31700 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31701 +#endif
31702 +
31703 }
31704 }
31705
31706 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31707 index d973e61..fb868e9 100644
31708 --- a/arch/x86/mm/fault.c
31709 +++ b/arch/x86/mm/fault.c
31710 @@ -13,12 +13,19 @@
31711 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31712 #include <linux/prefetch.h> /* prefetchw */
31713 #include <linux/context_tracking.h> /* exception_enter(), ... */
31714 +#include <linux/unistd.h>
31715 +#include <linux/compiler.h>
31716
31717 #include <asm/traps.h> /* dotraplinkage, ... */
31718 #include <asm/pgalloc.h> /* pgd_*(), ... */
31719 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31720 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31721 #include <asm/vsyscall.h> /* emulate_vsyscall */
31722 +#include <asm/tlbflush.h>
31723 +
31724 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31725 +#include <asm/stacktrace.h>
31726 +#endif
31727
31728 #define CREATE_TRACE_POINTS
31729 #include <asm/trace/exceptions.h>
31730 @@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31731 int ret = 0;
31732
31733 /* kprobe_running() needs smp_processor_id() */
31734 - if (kprobes_built_in() && !user_mode_vm(regs)) {
31735 + if (kprobes_built_in() && !user_mode(regs)) {
31736 preempt_disable();
31737 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31738 ret = 1;
31739 @@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31740 return !instr_lo || (instr_lo>>1) == 1;
31741 case 0x00:
31742 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31743 - if (probe_kernel_address(instr, opcode))
31744 + if (user_mode(regs)) {
31745 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31746 + return 0;
31747 + } else if (probe_kernel_address(instr, opcode))
31748 return 0;
31749
31750 *prefetch = (instr_lo == 0xF) &&
31751 @@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31752 while (instr < max_instr) {
31753 unsigned char opcode;
31754
31755 - if (probe_kernel_address(instr, opcode))
31756 + if (user_mode(regs)) {
31757 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31758 + break;
31759 + } else if (probe_kernel_address(instr, opcode))
31760 break;
31761
31762 instr++;
31763 @@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31764 force_sig_info(si_signo, &info, tsk);
31765 }
31766
31767 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31768 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31769 +#endif
31770 +
31771 +#ifdef CONFIG_PAX_EMUTRAMP
31772 +static int pax_handle_fetch_fault(struct pt_regs *regs);
31773 +#endif
31774 +
31775 +#ifdef CONFIG_PAX_PAGEEXEC
31776 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31777 +{
31778 + pgd_t *pgd;
31779 + pud_t *pud;
31780 + pmd_t *pmd;
31781 +
31782 + pgd = pgd_offset(mm, address);
31783 + if (!pgd_present(*pgd))
31784 + return NULL;
31785 + pud = pud_offset(pgd, address);
31786 + if (!pud_present(*pud))
31787 + return NULL;
31788 + pmd = pmd_offset(pud, address);
31789 + if (!pmd_present(*pmd))
31790 + return NULL;
31791 + return pmd;
31792 +}
31793 +#endif
31794 +
31795 DEFINE_SPINLOCK(pgd_lock);
31796 LIST_HEAD(pgd_list);
31797
31798 @@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31799 for (address = VMALLOC_START & PMD_MASK;
31800 address >= TASK_SIZE && address < FIXADDR_TOP;
31801 address += PMD_SIZE) {
31802 +
31803 +#ifdef CONFIG_PAX_PER_CPU_PGD
31804 + unsigned long cpu;
31805 +#else
31806 struct page *page;
31807 +#endif
31808
31809 spin_lock(&pgd_lock);
31810 +
31811 +#ifdef CONFIG_PAX_PER_CPU_PGD
31812 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31813 + pgd_t *pgd = get_cpu_pgd(cpu, user);
31814 + pmd_t *ret;
31815 +
31816 + ret = vmalloc_sync_one(pgd, address);
31817 + if (!ret)
31818 + break;
31819 + pgd = get_cpu_pgd(cpu, kernel);
31820 +#else
31821 list_for_each_entry(page, &pgd_list, lru) {
31822 + pgd_t *pgd;
31823 spinlock_t *pgt_lock;
31824 pmd_t *ret;
31825
31826 @@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31827 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31828
31829 spin_lock(pgt_lock);
31830 - ret = vmalloc_sync_one(page_address(page), address);
31831 + pgd = page_address(page);
31832 +#endif
31833 +
31834 + ret = vmalloc_sync_one(pgd, address);
31835 +
31836 +#ifndef CONFIG_PAX_PER_CPU_PGD
31837 spin_unlock(pgt_lock);
31838 +#endif
31839
31840 if (!ret)
31841 break;
31842 @@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31843 * an interrupt in the middle of a task switch..
31844 */
31845 pgd_paddr = read_cr3();
31846 +
31847 +#ifdef CONFIG_PAX_PER_CPU_PGD
31848 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31849 + vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31850 +#endif
31851 +
31852 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31853 if (!pmd_k)
31854 return -1;
31855 @@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31856 * happen within a race in page table update. In the later
31857 * case just flush:
31858 */
31859 - pgd = pgd_offset(current->active_mm, address);
31860 +
31861 pgd_ref = pgd_offset_k(address);
31862 if (pgd_none(*pgd_ref))
31863 return -1;
31864
31865 +#ifdef CONFIG_PAX_PER_CPU_PGD
31866 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31867 + pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31868 + if (pgd_none(*pgd)) {
31869 + set_pgd(pgd, *pgd_ref);
31870 + arch_flush_lazy_mmu_mode();
31871 + } else {
31872 + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31873 + }
31874 + pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31875 +#else
31876 + pgd = pgd_offset(current->active_mm, address);
31877 +#endif
31878 +
31879 if (pgd_none(*pgd)) {
31880 set_pgd(pgd, *pgd_ref);
31881 arch_flush_lazy_mmu_mode();
31882 @@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31883 static int is_errata100(struct pt_regs *regs, unsigned long address)
31884 {
31885 #ifdef CONFIG_X86_64
31886 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31887 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31888 return 1;
31889 #endif
31890 return 0;
31891 @@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31892 }
31893
31894 static const char nx_warning[] = KERN_CRIT
31895 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31896 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31897 static const char smep_warning[] = KERN_CRIT
31898 -"unable to execute userspace code (SMEP?) (uid: %d)\n";
31899 +"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31900
31901 static void
31902 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31903 @@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31904 if (!oops_may_print())
31905 return;
31906
31907 - if (error_code & PF_INSTR) {
31908 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31909 unsigned int level;
31910 pgd_t *pgd;
31911 pte_t *pte;
31912 @@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31913 pte = lookup_address_in_pgd(pgd, address, &level);
31914
31915 if (pte && pte_present(*pte) && !pte_exec(*pte))
31916 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31917 + printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31918 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31919 (pgd_flags(*pgd) & _PAGE_USER) &&
31920 (read_cr4() & X86_CR4_SMEP))
31921 - printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31922 + printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31923 }
31924
31925 +#ifdef CONFIG_PAX_KERNEXEC
31926 + if (init_mm.start_code <= address && address < init_mm.end_code) {
31927 + if (current->signal->curr_ip)
31928 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31929 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
31930 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31931 + else
31932 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31933 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31934 + }
31935 +#endif
31936 +
31937 printk(KERN_ALERT "BUG: unable to handle kernel ");
31938 if (address < PAGE_SIZE)
31939 printk(KERN_CONT "NULL pointer dereference");
31940 @@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31941 return;
31942 }
31943 #endif
31944 +
31945 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31946 + if (pax_is_fetch_fault(regs, error_code, address)) {
31947 +
31948 +#ifdef CONFIG_PAX_EMUTRAMP
31949 + switch (pax_handle_fetch_fault(regs)) {
31950 + case 2:
31951 + return;
31952 + }
31953 +#endif
31954 +
31955 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31956 + do_group_exit(SIGKILL);
31957 + }
31958 +#endif
31959 +
31960 /* Kernel addresses are always protection faults: */
31961 if (address >= TASK_SIZE)
31962 error_code |= PF_PROT;
31963 @@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31964 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31965 printk(KERN_ERR
31966 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31967 - tsk->comm, tsk->pid, address);
31968 + tsk->comm, task_pid_nr(tsk), address);
31969 code = BUS_MCEERR_AR;
31970 }
31971 #endif
31972 @@ -921,6 +1033,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31973 return 1;
31974 }
31975
31976 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31977 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31978 +{
31979 + pte_t *pte;
31980 + pmd_t *pmd;
31981 + spinlock_t *ptl;
31982 + unsigned char pte_mask;
31983 +
31984 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31985 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
31986 + return 0;
31987 +
31988 + /* PaX: it's our fault, let's handle it if we can */
31989 +
31990 + /* PaX: take a look at read faults before acquiring any locks */
31991 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31992 + /* instruction fetch attempt from a protected page in user mode */
31993 + up_read(&mm->mmap_sem);
31994 +
31995 +#ifdef CONFIG_PAX_EMUTRAMP
31996 + switch (pax_handle_fetch_fault(regs)) {
31997 + case 2:
31998 + return 1;
31999 + }
32000 +#endif
32001 +
32002 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32003 + do_group_exit(SIGKILL);
32004 + }
32005 +
32006 + pmd = pax_get_pmd(mm, address);
32007 + if (unlikely(!pmd))
32008 + return 0;
32009 +
32010 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32011 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32012 + pte_unmap_unlock(pte, ptl);
32013 + return 0;
32014 + }
32015 +
32016 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32017 + /* write attempt to a protected page in user mode */
32018 + pte_unmap_unlock(pte, ptl);
32019 + return 0;
32020 + }
32021 +
32022 +#ifdef CONFIG_SMP
32023 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32024 +#else
32025 + if (likely(address > get_limit(regs->cs)))
32026 +#endif
32027 + {
32028 + set_pte(pte, pte_mkread(*pte));
32029 + __flush_tlb_one(address);
32030 + pte_unmap_unlock(pte, ptl);
32031 + up_read(&mm->mmap_sem);
32032 + return 1;
32033 + }
32034 +
32035 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32036 +
32037 + /*
32038 + * PaX: fill DTLB with user rights and retry
32039 + */
32040 + __asm__ __volatile__ (
32041 + "orb %2,(%1)\n"
32042 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32043 +/*
32044 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32045 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32046 + * page fault when examined during a TLB load attempt. this is true not only
32047 + * for PTEs holding a non-present entry but also present entries that will
32048 + * raise a page fault (such as those set up by PaX, or the copy-on-write
32049 + * mechanism). in effect it means that we do *not* need to flush the TLBs
32050 + * for our target pages since their PTEs are simply not in the TLBs at all.
32051 +
32052 + * the best thing in omitting it is that we gain around 15-20% speed in the
32053 + * fast path of the page fault handler and can get rid of tracing since we
32054 + * can no longer flush unintended entries.
32055 + */
32056 + "invlpg (%0)\n"
32057 +#endif
32058 + __copyuser_seg"testb $0,(%0)\n"
32059 + "xorb %3,(%1)\n"
32060 + :
32061 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32062 + : "memory", "cc");
32063 + pte_unmap_unlock(pte, ptl);
32064 + up_read(&mm->mmap_sem);
32065 + return 1;
32066 +}
32067 +#endif
32068 +
32069 /*
32070 * Handle a spurious fault caused by a stale TLB entry.
32071 *
32072 @@ -1006,6 +1211,9 @@ int show_unhandled_signals = 1;
32073 static inline int
32074 access_error(unsigned long error_code, struct vm_area_struct *vma)
32075 {
32076 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32077 + return 1;
32078 +
32079 if (error_code & PF_WRITE) {
32080 /* write, present and write, not present: */
32081 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32082 @@ -1040,7 +1248,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32083 if (error_code & PF_USER)
32084 return false;
32085
32086 - if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32087 + if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32088 return false;
32089
32090 return true;
32091 @@ -1068,6 +1276,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32092 tsk = current;
32093 mm = tsk->mm;
32094
32095 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32096 + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32097 + if (!search_exception_tables(regs->ip)) {
32098 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32099 + bad_area_nosemaphore(regs, error_code, address);
32100 + return;
32101 + }
32102 + if (address < pax_user_shadow_base) {
32103 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32104 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32105 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32106 + } else
32107 + address -= pax_user_shadow_base;
32108 + }
32109 +#endif
32110 +
32111 /*
32112 * Detect and handle instructions that would cause a page fault for
32113 * both a tracked kernel page and a userspace page.
32114 @@ -1145,7 +1369,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32115 * User-mode registers count as a user access even for any
32116 * potential system fault or CPU buglet:
32117 */
32118 - if (user_mode_vm(regs)) {
32119 + if (user_mode(regs)) {
32120 local_irq_enable();
32121 error_code |= PF_USER;
32122 flags |= FAULT_FLAG_USER;
32123 @@ -1192,6 +1416,11 @@ retry:
32124 might_sleep();
32125 }
32126
32127 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32128 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32129 + return;
32130 +#endif
32131 +
32132 vma = find_vma(mm, address);
32133 if (unlikely(!vma)) {
32134 bad_area(regs, error_code, address);
32135 @@ -1203,18 +1432,24 @@ retry:
32136 bad_area(regs, error_code, address);
32137 return;
32138 }
32139 - if (error_code & PF_USER) {
32140 - /*
32141 - * Accessing the stack below %sp is always a bug.
32142 - * The large cushion allows instructions like enter
32143 - * and pusha to work. ("enter $65535, $31" pushes
32144 - * 32 pointers and then decrements %sp by 65535.)
32145 - */
32146 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32147 - bad_area(regs, error_code, address);
32148 - return;
32149 - }
32150 + /*
32151 + * Accessing the stack below %sp is always a bug.
32152 + * The large cushion allows instructions like enter
32153 + * and pusha to work. ("enter $65535, $31" pushes
32154 + * 32 pointers and then decrements %sp by 65535.)
32155 + */
32156 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32157 + bad_area(regs, error_code, address);
32158 + return;
32159 }
32160 +
32161 +#ifdef CONFIG_PAX_SEGMEXEC
32162 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32163 + bad_area(regs, error_code, address);
32164 + return;
32165 + }
32166 +#endif
32167 +
32168 if (unlikely(expand_stack(vma, address))) {
32169 bad_area(regs, error_code, address);
32170 return;
32171 @@ -1331,3 +1566,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32172 }
32173 NOKPROBE_SYMBOL(trace_do_page_fault);
32174 #endif /* CONFIG_TRACING */
32175 +
32176 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32177 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32178 +{
32179 + struct mm_struct *mm = current->mm;
32180 + unsigned long ip = regs->ip;
32181 +
32182 + if (v8086_mode(regs))
32183 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32184 +
32185 +#ifdef CONFIG_PAX_PAGEEXEC
32186 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32187 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32188 + return true;
32189 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32190 + return true;
32191 + return false;
32192 + }
32193 +#endif
32194 +
32195 +#ifdef CONFIG_PAX_SEGMEXEC
32196 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32197 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32198 + return true;
32199 + return false;
32200 + }
32201 +#endif
32202 +
32203 + return false;
32204 +}
32205 +#endif
32206 +
32207 +#ifdef CONFIG_PAX_EMUTRAMP
32208 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32209 +{
32210 + int err;
32211 +
32212 + do { /* PaX: libffi trampoline emulation */
32213 + unsigned char mov, jmp;
32214 + unsigned int addr1, addr2;
32215 +
32216 +#ifdef CONFIG_X86_64
32217 + if ((regs->ip + 9) >> 32)
32218 + break;
32219 +#endif
32220 +
32221 + err = get_user(mov, (unsigned char __user *)regs->ip);
32222 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32223 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32224 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32225 +
32226 + if (err)
32227 + break;
32228 +
32229 + if (mov == 0xB8 && jmp == 0xE9) {
32230 + regs->ax = addr1;
32231 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32232 + return 2;
32233 + }
32234 + } while (0);
32235 +
32236 + do { /* PaX: gcc trampoline emulation #1 */
32237 + unsigned char mov1, mov2;
32238 + unsigned short jmp;
32239 + unsigned int addr1, addr2;
32240 +
32241 +#ifdef CONFIG_X86_64
32242 + if ((regs->ip + 11) >> 32)
32243 + break;
32244 +#endif
32245 +
32246 + err = get_user(mov1, (unsigned char __user *)regs->ip);
32247 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32248 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32249 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32250 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32251 +
32252 + if (err)
32253 + break;
32254 +
32255 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32256 + regs->cx = addr1;
32257 + regs->ax = addr2;
32258 + regs->ip = addr2;
32259 + return 2;
32260 + }
32261 + } while (0);
32262 +
32263 + do { /* PaX: gcc trampoline emulation #2 */
32264 + unsigned char mov, jmp;
32265 + unsigned int addr1, addr2;
32266 +
32267 +#ifdef CONFIG_X86_64
32268 + if ((regs->ip + 9) >> 32)
32269 + break;
32270 +#endif
32271 +
32272 + err = get_user(mov, (unsigned char __user *)regs->ip);
32273 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32274 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32275 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32276 +
32277 + if (err)
32278 + break;
32279 +
32280 + if (mov == 0xB9 && jmp == 0xE9) {
32281 + regs->cx = addr1;
32282 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32283 + return 2;
32284 + }
32285 + } while (0);
32286 +
32287 + return 1; /* PaX in action */
32288 +}
32289 +
32290 +#ifdef CONFIG_X86_64
32291 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32292 +{
32293 + int err;
32294 +
32295 + do { /* PaX: libffi trampoline emulation */
32296 + unsigned short mov1, mov2, jmp1;
32297 + unsigned char stcclc, jmp2;
32298 + unsigned long addr1, addr2;
32299 +
32300 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32301 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32302 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32303 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32304 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32305 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32306 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32307 +
32308 + if (err)
32309 + break;
32310 +
32311 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32312 + regs->r11 = addr1;
32313 + regs->r10 = addr2;
32314 + if (stcclc == 0xF8)
32315 + regs->flags &= ~X86_EFLAGS_CF;
32316 + else
32317 + regs->flags |= X86_EFLAGS_CF;
32318 + regs->ip = addr1;
32319 + return 2;
32320 + }
32321 + } while (0);
32322 +
32323 + do { /* PaX: gcc trampoline emulation #1 */
32324 + unsigned short mov1, mov2, jmp1;
32325 + unsigned char jmp2;
32326 + unsigned int addr1;
32327 + unsigned long addr2;
32328 +
32329 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32330 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32331 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32332 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32333 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32334 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32335 +
32336 + if (err)
32337 + break;
32338 +
32339 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32340 + regs->r11 = addr1;
32341 + regs->r10 = addr2;
32342 + regs->ip = addr1;
32343 + return 2;
32344 + }
32345 + } while (0);
32346 +
32347 + do { /* PaX: gcc trampoline emulation #2 */
32348 + unsigned short mov1, mov2, jmp1;
32349 + unsigned char jmp2;
32350 + unsigned long addr1, addr2;
32351 +
32352 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32353 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32354 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32355 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32356 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32357 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32358 +
32359 + if (err)
32360 + break;
32361 +
32362 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32363 + regs->r11 = addr1;
32364 + regs->r10 = addr2;
32365 + regs->ip = addr1;
32366 + return 2;
32367 + }
32368 + } while (0);
32369 +
32370 + return 1; /* PaX in action */
32371 +}
32372 +#endif
32373 +
32374 +/*
32375 + * PaX: decide what to do with offenders (regs->ip = fault address)
32376 + *
32377 + * returns 1 when task should be killed
32378 + * 2 when gcc trampoline was detected
32379 + */
32380 +static int pax_handle_fetch_fault(struct pt_regs *regs)
32381 +{
32382 + if (v8086_mode(regs))
32383 + return 1;
32384 +
32385 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32386 + return 1;
32387 +
32388 +#ifdef CONFIG_X86_32
32389 + return pax_handle_fetch_fault_32(regs);
32390 +#else
32391 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32392 + return pax_handle_fetch_fault_32(regs);
32393 + else
32394 + return pax_handle_fetch_fault_64(regs);
32395 +#endif
32396 +}
32397 +#endif
32398 +
32399 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32400 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32401 +{
32402 + long i;
32403 +
32404 + printk(KERN_ERR "PAX: bytes at PC: ");
32405 + for (i = 0; i < 20; i++) {
32406 + unsigned char c;
32407 + if (get_user(c, (unsigned char __force_user *)pc+i))
32408 + printk(KERN_CONT "?? ");
32409 + else
32410 + printk(KERN_CONT "%02x ", c);
32411 + }
32412 + printk("\n");
32413 +
32414 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32415 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
32416 + unsigned long c;
32417 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
32418 +#ifdef CONFIG_X86_32
32419 + printk(KERN_CONT "???????? ");
32420 +#else
32421 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32422 + printk(KERN_CONT "???????? ???????? ");
32423 + else
32424 + printk(KERN_CONT "???????????????? ");
32425 +#endif
32426 + } else {
32427 +#ifdef CONFIG_X86_64
32428 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32429 + printk(KERN_CONT "%08x ", (unsigned int)c);
32430 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32431 + } else
32432 +#endif
32433 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32434 + }
32435 + }
32436 + printk("\n");
32437 +}
32438 +#endif
32439 +
32440 +/**
32441 + * probe_kernel_write(): safely attempt to write to a location
32442 + * @dst: address to write to
32443 + * @src: pointer to the data that shall be written
32444 + * @size: size of the data chunk
32445 + *
32446 + * Safely write to address @dst from the buffer at @src. If a kernel fault
32447 + * happens, handle that and return -EFAULT.
32448 + */
32449 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32450 +{
32451 + long ret;
32452 + mm_segment_t old_fs = get_fs();
32453 +
32454 + set_fs(KERNEL_DS);
32455 + pagefault_disable();
32456 + pax_open_kernel();
32457 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32458 + pax_close_kernel();
32459 + pagefault_enable();
32460 + set_fs(old_fs);
32461 +
32462 + return ret ? -EFAULT : 0;
32463 +}
32464 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32465 index 207d9aef..69030980 100644
32466 --- a/arch/x86/mm/gup.c
32467 +++ b/arch/x86/mm/gup.c
32468 @@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32469 addr = start;
32470 len = (unsigned long) nr_pages << PAGE_SHIFT;
32471 end = start + len;
32472 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32473 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32474 (void __user *)start, len)))
32475 return 0;
32476
32477 @@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32478 goto slow_irqon;
32479 #endif
32480
32481 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32482 + (void __user *)start, len)))
32483 + return 0;
32484 +
32485 /*
32486 * XXX: batch / limit 'nr', to avoid large irq off latency
32487 * needs some instrumenting to determine the common sizes used by
32488 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32489 index 4500142..53a363c 100644
32490 --- a/arch/x86/mm/highmem_32.c
32491 +++ b/arch/x86/mm/highmem_32.c
32492 @@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32493 idx = type + KM_TYPE_NR*smp_processor_id();
32494 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32495 BUG_ON(!pte_none(*(kmap_pte-idx)));
32496 +
32497 + pax_open_kernel();
32498 set_pte(kmap_pte-idx, mk_pte(page, prot));
32499 + pax_close_kernel();
32500 +
32501 arch_flush_lazy_mmu_mode();
32502
32503 return (void *)vaddr;
32504 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32505 index 8b977eb..4732c33 100644
32506 --- a/arch/x86/mm/hugetlbpage.c
32507 +++ b/arch/x86/mm/hugetlbpage.c
32508 @@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32509 #ifdef CONFIG_HUGETLB_PAGE
32510 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32511 unsigned long addr, unsigned long len,
32512 - unsigned long pgoff, unsigned long flags)
32513 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32514 {
32515 struct hstate *h = hstate_file(file);
32516 struct vm_unmapped_area_info info;
32517 -
32518 +
32519 info.flags = 0;
32520 info.length = len;
32521 info.low_limit = current->mm->mmap_legacy_base;
32522 info.high_limit = TASK_SIZE;
32523 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32524 info.align_offset = 0;
32525 + info.threadstack_offset = offset;
32526 return vm_unmapped_area(&info);
32527 }
32528
32529 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32530 unsigned long addr0, unsigned long len,
32531 - unsigned long pgoff, unsigned long flags)
32532 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32533 {
32534 struct hstate *h = hstate_file(file);
32535 struct vm_unmapped_area_info info;
32536 @@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32537 info.high_limit = current->mm->mmap_base;
32538 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32539 info.align_offset = 0;
32540 + info.threadstack_offset = offset;
32541 addr = vm_unmapped_area(&info);
32542
32543 /*
32544 @@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32545 VM_BUG_ON(addr != -ENOMEM);
32546 info.flags = 0;
32547 info.low_limit = TASK_UNMAPPED_BASE;
32548 +
32549 +#ifdef CONFIG_PAX_RANDMMAP
32550 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32551 + info.low_limit += current->mm->delta_mmap;
32552 +#endif
32553 +
32554 info.high_limit = TASK_SIZE;
32555 addr = vm_unmapped_area(&info);
32556 }
32557 @@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32558 struct hstate *h = hstate_file(file);
32559 struct mm_struct *mm = current->mm;
32560 struct vm_area_struct *vma;
32561 + unsigned long pax_task_size = TASK_SIZE;
32562 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32563
32564 if (len & ~huge_page_mask(h))
32565 return -EINVAL;
32566 - if (len > TASK_SIZE)
32567 +
32568 +#ifdef CONFIG_PAX_SEGMEXEC
32569 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32570 + pax_task_size = SEGMEXEC_TASK_SIZE;
32571 +#endif
32572 +
32573 + pax_task_size -= PAGE_SIZE;
32574 +
32575 + if (len > pax_task_size)
32576 return -ENOMEM;
32577
32578 if (flags & MAP_FIXED) {
32579 @@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32580 return addr;
32581 }
32582
32583 +#ifdef CONFIG_PAX_RANDMMAP
32584 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32585 +#endif
32586 +
32587 if (addr) {
32588 addr = ALIGN(addr, huge_page_size(h));
32589 vma = find_vma(mm, addr);
32590 - if (TASK_SIZE - len >= addr &&
32591 - (!vma || addr + len <= vma->vm_start))
32592 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32593 return addr;
32594 }
32595 if (mm->get_unmapped_area == arch_get_unmapped_area)
32596 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32597 - pgoff, flags);
32598 + pgoff, flags, offset);
32599 else
32600 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32601 - pgoff, flags);
32602 + pgoff, flags, offset);
32603 }
32604 #endif /* CONFIG_HUGETLB_PAGE */
32605
32606 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32607 index 66dba36..f8082ec 100644
32608 --- a/arch/x86/mm/init.c
32609 +++ b/arch/x86/mm/init.c
32610 @@ -4,6 +4,7 @@
32611 #include <linux/swap.h>
32612 #include <linux/memblock.h>
32613 #include <linux/bootmem.h> /* for max_low_pfn */
32614 +#include <linux/tboot.h>
32615
32616 #include <asm/cacheflush.h>
32617 #include <asm/e820.h>
32618 @@ -17,6 +18,8 @@
32619 #include <asm/proto.h>
32620 #include <asm/dma.h> /* for MAX_DMA_PFN */
32621 #include <asm/microcode.h>
32622 +#include <asm/desc.h>
32623 +#include <asm/bios_ebda.h>
32624
32625 /*
32626 * We need to define the tracepoints somewhere, and tlb.c
32627 @@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
32628 early_ioremap_page_table_range_init();
32629 #endif
32630
32631 +#ifdef CONFIG_PAX_PER_CPU_PGD
32632 + clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32633 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32634 + KERNEL_PGD_PTRS);
32635 + clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32636 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32637 + KERNEL_PGD_PTRS);
32638 + load_cr3(get_cpu_pgd(0, kernel));
32639 +#else
32640 load_cr3(swapper_pg_dir);
32641 +#endif
32642 +
32643 __flush_tlb_all();
32644
32645 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32646 @@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
32647 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32648 * mmio resources as well as potential bios/acpi data regions.
32649 */
32650 +
32651 +#ifdef CONFIG_GRKERNSEC_KMEM
32652 +static unsigned int ebda_start __read_only;
32653 +static unsigned int ebda_end __read_only;
32654 +#endif
32655 +
32656 int devmem_is_allowed(unsigned long pagenr)
32657 {
32658 - if (pagenr < 256)
32659 +#ifdef CONFIG_GRKERNSEC_KMEM
32660 + /* allow BDA */
32661 + if (!pagenr)
32662 return 1;
32663 + /* allow EBDA */
32664 + if (pagenr >= ebda_start && pagenr < ebda_end)
32665 + return 1;
32666 + /* if tboot is in use, allow access to its hardcoded serial log range */
32667 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32668 + return 1;
32669 +#else
32670 + if (!pagenr)
32671 + return 1;
32672 +#ifdef CONFIG_VM86
32673 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32674 + return 1;
32675 +#endif
32676 +#endif
32677 +
32678 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32679 + return 1;
32680 +#ifdef CONFIG_GRKERNSEC_KMEM
32681 + /* throw out everything else below 1MB */
32682 + if (pagenr <= 256)
32683 + return 0;
32684 +#endif
32685 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32686 return 0;
32687 if (!page_is_ram(pagenr))
32688 @@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32689 #endif
32690 }
32691
32692 +#ifdef CONFIG_GRKERNSEC_KMEM
32693 +static inline void gr_init_ebda(void)
32694 +{
32695 + unsigned int ebda_addr;
32696 + unsigned int ebda_size = 0;
32697 +
32698 + ebda_addr = get_bios_ebda();
32699 + if (ebda_addr) {
32700 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32701 + ebda_size <<= 10;
32702 + }
32703 + if (ebda_addr && ebda_size) {
32704 + ebda_start = ebda_addr >> PAGE_SHIFT;
32705 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32706 + } else {
32707 + ebda_start = 0x9f000 >> PAGE_SHIFT;
32708 + ebda_end = 0xa0000 >> PAGE_SHIFT;
32709 + }
32710 +}
32711 +#else
32712 +static inline void gr_init_ebda(void) { }
32713 +#endif
32714 +
32715 void free_initmem(void)
32716 {
32717 +#ifdef CONFIG_PAX_KERNEXEC
32718 +#ifdef CONFIG_X86_32
32719 + /* PaX: limit KERNEL_CS to actual size */
32720 + unsigned long addr, limit;
32721 + struct desc_struct d;
32722 + int cpu;
32723 +#else
32724 + pgd_t *pgd;
32725 + pud_t *pud;
32726 + pmd_t *pmd;
32727 + unsigned long addr, end;
32728 +#endif
32729 +#endif
32730 +
32731 + gr_init_ebda();
32732 +
32733 +#ifdef CONFIG_PAX_KERNEXEC
32734 +#ifdef CONFIG_X86_32
32735 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32736 + limit = (limit - 1UL) >> PAGE_SHIFT;
32737 +
32738 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32739 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32740 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32741 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32742 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32743 + }
32744 +
32745 + /* PaX: make KERNEL_CS read-only */
32746 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32747 + if (!paravirt_enabled())
32748 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32749 +/*
32750 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32751 + pgd = pgd_offset_k(addr);
32752 + pud = pud_offset(pgd, addr);
32753 + pmd = pmd_offset(pud, addr);
32754 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32755 + }
32756 +*/
32757 +#ifdef CONFIG_X86_PAE
32758 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32759 +/*
32760 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32761 + pgd = pgd_offset_k(addr);
32762 + pud = pud_offset(pgd, addr);
32763 + pmd = pmd_offset(pud, addr);
32764 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32765 + }
32766 +*/
32767 +#endif
32768 +
32769 +#ifdef CONFIG_MODULES
32770 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32771 +#endif
32772 +
32773 +#else
32774 + /* PaX: make kernel code/rodata read-only, rest non-executable */
32775 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32776 + pgd = pgd_offset_k(addr);
32777 + pud = pud_offset(pgd, addr);
32778 + pmd = pmd_offset(pud, addr);
32779 + if (!pmd_present(*pmd))
32780 + continue;
32781 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32782 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32783 + else
32784 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32785 + }
32786 +
32787 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32788 + end = addr + KERNEL_IMAGE_SIZE;
32789 + for (; addr < end; addr += PMD_SIZE) {
32790 + pgd = pgd_offset_k(addr);
32791 + pud = pud_offset(pgd, addr);
32792 + pmd = pmd_offset(pud, addr);
32793 + if (!pmd_present(*pmd))
32794 + continue;
32795 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32796 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32797 + }
32798 +#endif
32799 +
32800 + flush_tlb_all();
32801 +#endif
32802 +
32803 free_init_pages("unused kernel",
32804 (unsigned long)(&__init_begin),
32805 (unsigned long)(&__init_end));
32806 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32807 index c8140e1..59257fc 100644
32808 --- a/arch/x86/mm/init_32.c
32809 +++ b/arch/x86/mm/init_32.c
32810 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32811 bool __read_mostly __vmalloc_start_set = false;
32812
32813 /*
32814 - * Creates a middle page table and puts a pointer to it in the
32815 - * given global directory entry. This only returns the gd entry
32816 - * in non-PAE compilation mode, since the middle layer is folded.
32817 - */
32818 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
32819 -{
32820 - pud_t *pud;
32821 - pmd_t *pmd_table;
32822 -
32823 -#ifdef CONFIG_X86_PAE
32824 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32825 - pmd_table = (pmd_t *)alloc_low_page();
32826 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32827 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32828 - pud = pud_offset(pgd, 0);
32829 - BUG_ON(pmd_table != pmd_offset(pud, 0));
32830 -
32831 - return pmd_table;
32832 - }
32833 -#endif
32834 - pud = pud_offset(pgd, 0);
32835 - pmd_table = pmd_offset(pud, 0);
32836 -
32837 - return pmd_table;
32838 -}
32839 -
32840 -/*
32841 * Create a page table and place a pointer to it in a middle page
32842 * directory entry:
32843 */
32844 @@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32845 pte_t *page_table = (pte_t *)alloc_low_page();
32846
32847 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32848 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32849 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32850 +#else
32851 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32852 +#endif
32853 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32854 }
32855
32856 return pte_offset_kernel(pmd, 0);
32857 }
32858
32859 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
32860 +{
32861 + pud_t *pud;
32862 + pmd_t *pmd_table;
32863 +
32864 + pud = pud_offset(pgd, 0);
32865 + pmd_table = pmd_offset(pud, 0);
32866 +
32867 + return pmd_table;
32868 +}
32869 +
32870 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32871 {
32872 int pgd_idx = pgd_index(vaddr);
32873 @@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32874 int pgd_idx, pmd_idx;
32875 unsigned long vaddr;
32876 pgd_t *pgd;
32877 + pud_t *pud;
32878 pmd_t *pmd;
32879 pte_t *pte = NULL;
32880 unsigned long count = page_table_range_init_count(start, end);
32881 @@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32882 pgd = pgd_base + pgd_idx;
32883
32884 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32885 - pmd = one_md_table_init(pgd);
32886 - pmd = pmd + pmd_index(vaddr);
32887 + pud = pud_offset(pgd, vaddr);
32888 + pmd = pmd_offset(pud, vaddr);
32889 +
32890 +#ifdef CONFIG_X86_PAE
32891 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32892 +#endif
32893 +
32894 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32895 pmd++, pmd_idx++) {
32896 pte = page_table_kmap_check(one_page_table_init(pmd),
32897 @@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32898 }
32899 }
32900
32901 -static inline int is_kernel_text(unsigned long addr)
32902 +static inline int is_kernel_text(unsigned long start, unsigned long end)
32903 {
32904 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32905 - return 1;
32906 - return 0;
32907 + if ((start >= ktla_ktva((unsigned long)_etext) ||
32908 + end <= ktla_ktva((unsigned long)_stext)) &&
32909 + (start >= ktla_ktva((unsigned long)_einittext) ||
32910 + end <= ktla_ktva((unsigned long)_sinittext)) &&
32911 +
32912 +#ifdef CONFIG_ACPI_SLEEP
32913 + (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32914 +#endif
32915 +
32916 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32917 + return 0;
32918 + return 1;
32919 }
32920
32921 /*
32922 @@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32923 unsigned long last_map_addr = end;
32924 unsigned long start_pfn, end_pfn;
32925 pgd_t *pgd_base = swapper_pg_dir;
32926 - int pgd_idx, pmd_idx, pte_ofs;
32927 + unsigned int pgd_idx, pmd_idx, pte_ofs;
32928 unsigned long pfn;
32929 pgd_t *pgd;
32930 + pud_t *pud;
32931 pmd_t *pmd;
32932 pte_t *pte;
32933 unsigned pages_2m, pages_4k;
32934 @@ -291,8 +295,13 @@ repeat:
32935 pfn = start_pfn;
32936 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32937 pgd = pgd_base + pgd_idx;
32938 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32939 - pmd = one_md_table_init(pgd);
32940 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32941 + pud = pud_offset(pgd, 0);
32942 + pmd = pmd_offset(pud, 0);
32943 +
32944 +#ifdef CONFIG_X86_PAE
32945 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32946 +#endif
32947
32948 if (pfn >= end_pfn)
32949 continue;
32950 @@ -304,14 +313,13 @@ repeat:
32951 #endif
32952 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32953 pmd++, pmd_idx++) {
32954 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32955 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32956
32957 /*
32958 * Map with big pages if possible, otherwise
32959 * create normal page tables:
32960 */
32961 if (use_pse) {
32962 - unsigned int addr2;
32963 pgprot_t prot = PAGE_KERNEL_LARGE;
32964 /*
32965 * first pass will use the same initial
32966 @@ -322,11 +330,7 @@ repeat:
32967 _PAGE_PSE);
32968
32969 pfn &= PMD_MASK >> PAGE_SHIFT;
32970 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32971 - PAGE_OFFSET + PAGE_SIZE-1;
32972 -
32973 - if (is_kernel_text(addr) ||
32974 - is_kernel_text(addr2))
32975 + if (is_kernel_text(address, address + PMD_SIZE))
32976 prot = PAGE_KERNEL_LARGE_EXEC;
32977
32978 pages_2m++;
32979 @@ -343,7 +347,7 @@ repeat:
32980 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32981 pte += pte_ofs;
32982 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32983 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32984 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32985 pgprot_t prot = PAGE_KERNEL;
32986 /*
32987 * first pass will use the same initial
32988 @@ -351,7 +355,7 @@ repeat:
32989 */
32990 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32991
32992 - if (is_kernel_text(addr))
32993 + if (is_kernel_text(address, address + PAGE_SIZE))
32994 prot = PAGE_KERNEL_EXEC;
32995
32996 pages_4k++;
32997 @@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
32998
32999 pud = pud_offset(pgd, va);
33000 pmd = pmd_offset(pud, va);
33001 - if (!pmd_present(*pmd))
33002 + if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33003 break;
33004
33005 /* should not be large page here */
33006 @@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33007
33008 static void __init pagetable_init(void)
33009 {
33010 - pgd_t *pgd_base = swapper_pg_dir;
33011 -
33012 - permanent_kmaps_init(pgd_base);
33013 + permanent_kmaps_init(swapper_pg_dir);
33014 }
33015
33016 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33017 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33018 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33019
33020 /* user-defined highmem size */
33021 @@ -787,10 +789,10 @@ void __init mem_init(void)
33022 ((unsigned long)&__init_end -
33023 (unsigned long)&__init_begin) >> 10,
33024
33025 - (unsigned long)&_etext, (unsigned long)&_edata,
33026 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33027 + (unsigned long)&_sdata, (unsigned long)&_edata,
33028 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33029
33030 - (unsigned long)&_text, (unsigned long)&_etext,
33031 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33032 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33033
33034 /*
33035 @@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33036 if (!kernel_set_to_readonly)
33037 return;
33038
33039 + start = ktla_ktva(start);
33040 pr_debug("Set kernel text: %lx - %lx for read write\n",
33041 start, start+size);
33042
33043 @@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33044 if (!kernel_set_to_readonly)
33045 return;
33046
33047 + start = ktla_ktva(start);
33048 pr_debug("Set kernel text: %lx - %lx for read only\n",
33049 start, start+size);
33050
33051 @@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33052 unsigned long start = PFN_ALIGN(_text);
33053 unsigned long size = PFN_ALIGN(_etext) - start;
33054
33055 + start = ktla_ktva(start);
33056 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33057 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33058 size >> 10);
33059 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33060 index 4e5dfec..6fd6dc5 100644
33061 --- a/arch/x86/mm/init_64.c
33062 +++ b/arch/x86/mm/init_64.c
33063 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33064 * around without checking the pgd every time.
33065 */
33066
33067 -pteval_t __supported_pte_mask __read_mostly = ~0;
33068 +pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33069 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33070
33071 int force_personality32;
33072 @@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33073
33074 for (address = start; address <= end; address += PGDIR_SIZE) {
33075 const pgd_t *pgd_ref = pgd_offset_k(address);
33076 +
33077 +#ifdef CONFIG_PAX_PER_CPU_PGD
33078 + unsigned long cpu;
33079 +#else
33080 struct page *page;
33081 +#endif
33082
33083 /*
33084 * When it is called after memory hot remove, pgd_none()
33085 @@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33086 continue;
33087
33088 spin_lock(&pgd_lock);
33089 +
33090 +#ifdef CONFIG_PAX_PER_CPU_PGD
33091 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33092 + pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33093 +
33094 + if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33095 + BUG_ON(pgd_page_vaddr(*pgd)
33096 + != pgd_page_vaddr(*pgd_ref));
33097 +
33098 + if (removed) {
33099 + if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33100 + pgd_clear(pgd);
33101 + } else {
33102 + if (pgd_none(*pgd))
33103 + set_pgd(pgd, *pgd_ref);
33104 + }
33105 +
33106 + pgd = pgd_offset_cpu(cpu, kernel, address);
33107 +#else
33108 list_for_each_entry(page, &pgd_list, lru) {
33109 pgd_t *pgd;
33110 spinlock_t *pgt_lock;
33111 @@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33112 /* the pgt_lock only for Xen */
33113 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33114 spin_lock(pgt_lock);
33115 +#endif
33116
33117 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33118 BUG_ON(pgd_page_vaddr(*pgd)
33119 @@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33120 set_pgd(pgd, *pgd_ref);
33121 }
33122
33123 +#ifndef CONFIG_PAX_PER_CPU_PGD
33124 spin_unlock(pgt_lock);
33125 +#endif
33126 +
33127 }
33128 spin_unlock(&pgd_lock);
33129 }
33130 @@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33131 {
33132 if (pgd_none(*pgd)) {
33133 pud_t *pud = (pud_t *)spp_getpage();
33134 - pgd_populate(&init_mm, pgd, pud);
33135 + pgd_populate_kernel(&init_mm, pgd, pud);
33136 if (pud != pud_offset(pgd, 0))
33137 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33138 pud, pud_offset(pgd, 0));
33139 @@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33140 {
33141 if (pud_none(*pud)) {
33142 pmd_t *pmd = (pmd_t *) spp_getpage();
33143 - pud_populate(&init_mm, pud, pmd);
33144 + pud_populate_kernel(&init_mm, pud, pmd);
33145 if (pmd != pmd_offset(pud, 0))
33146 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33147 pmd, pmd_offset(pud, 0));
33148 @@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33149 pmd = fill_pmd(pud, vaddr);
33150 pte = fill_pte(pmd, vaddr);
33151
33152 + pax_open_kernel();
33153 set_pte(pte, new_pte);
33154 + pax_close_kernel();
33155
33156 /*
33157 * It's enough to flush this one mapping.
33158 @@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33159 pgd = pgd_offset_k((unsigned long)__va(phys));
33160 if (pgd_none(*pgd)) {
33161 pud = (pud_t *) spp_getpage();
33162 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33163 - _PAGE_USER));
33164 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33165 }
33166 pud = pud_offset(pgd, (unsigned long)__va(phys));
33167 if (pud_none(*pud)) {
33168 pmd = (pmd_t *) spp_getpage();
33169 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33170 - _PAGE_USER));
33171 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33172 }
33173 pmd = pmd_offset(pud, phys);
33174 BUG_ON(!pmd_none(*pmd));
33175 @@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33176 prot);
33177
33178 spin_lock(&init_mm.page_table_lock);
33179 - pud_populate(&init_mm, pud, pmd);
33180 + pud_populate_kernel(&init_mm, pud, pmd);
33181 spin_unlock(&init_mm.page_table_lock);
33182 }
33183 __flush_tlb_all();
33184 @@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
33185 page_size_mask);
33186
33187 spin_lock(&init_mm.page_table_lock);
33188 - pgd_populate(&init_mm, pgd, pud);
33189 + pgd_populate_kernel(&init_mm, pgd, pud);
33190 spin_unlock(&init_mm.page_table_lock);
33191 pgd_changed = true;
33192 }
33193 @@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
33194 static struct vm_area_struct gate_vma = {
33195 .vm_start = VSYSCALL_ADDR,
33196 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
33197 - .vm_page_prot = PAGE_READONLY_EXEC,
33198 - .vm_flags = VM_READ | VM_EXEC,
33199 + .vm_page_prot = PAGE_READONLY,
33200 + .vm_flags = VM_READ,
33201 .vm_ops = &gate_vma_ops,
33202 };
33203
33204 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33205 index 7b179b49..6bd17777 100644
33206 --- a/arch/x86/mm/iomap_32.c
33207 +++ b/arch/x86/mm/iomap_32.c
33208 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33209 type = kmap_atomic_idx_push();
33210 idx = type + KM_TYPE_NR * smp_processor_id();
33211 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33212 +
33213 + pax_open_kernel();
33214 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33215 + pax_close_kernel();
33216 +
33217 arch_flush_lazy_mmu_mode();
33218
33219 return (void *)vaddr;
33220 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33221 index af78e50..0790b03 100644
33222 --- a/arch/x86/mm/ioremap.c
33223 +++ b/arch/x86/mm/ioremap.c
33224 @@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33225 unsigned long i;
33226
33227 for (i = 0; i < nr_pages; ++i)
33228 - if (pfn_valid(start_pfn + i) &&
33229 - !PageReserved(pfn_to_page(start_pfn + i)))
33230 + if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33231 + !PageReserved(pfn_to_page(start_pfn + i))))
33232 return 1;
33233
33234 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33235 @@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
33236 *
33237 * Caller must ensure there is only one unmapping for the same pointer.
33238 */
33239 -void iounmap(volatile void __iomem *addr)
33240 +void iounmap(const volatile void __iomem *addr)
33241 {
33242 struct vm_struct *p, *o;
33243
33244 @@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33245
33246 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33247 if (page_is_ram(start >> PAGE_SHIFT))
33248 +#ifdef CONFIG_HIGHMEM
33249 + if ((start >> PAGE_SHIFT) < max_low_pfn)
33250 +#endif
33251 return __va(phys);
33252
33253 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33254 @@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33255 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
33256 {
33257 if (page_is_ram(phys >> PAGE_SHIFT))
33258 +#ifdef CONFIG_HIGHMEM
33259 + if ((phys >> PAGE_SHIFT) < max_low_pfn)
33260 +#endif
33261 return;
33262
33263 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33264 return;
33265 }
33266
33267 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33268 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33269
33270 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33271 {
33272 @@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
33273 early_ioremap_setup();
33274
33275 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33276 - memset(bm_pte, 0, sizeof(bm_pte));
33277 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
33278 + pmd_populate_user(&init_mm, pmd, bm_pte);
33279
33280 /*
33281 * The boot-ioremap range spans multiple pmds, for which
33282 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33283 index b4f2e7e..96c9c3e 100644
33284 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
33285 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33286 @@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33287 * memory (e.g. tracked pages)? For now, we need this to avoid
33288 * invoking kmemcheck for PnP BIOS calls.
33289 */
33290 - if (regs->flags & X86_VM_MASK)
33291 + if (v8086_mode(regs))
33292 return false;
33293 - if (regs->cs != __KERNEL_CS)
33294 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33295 return false;
33296
33297 pte = kmemcheck_pte_lookup(address);
33298 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33299 index 919b912..9267313 100644
33300 --- a/arch/x86/mm/mmap.c
33301 +++ b/arch/x86/mm/mmap.c
33302 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
33303 * Leave an at least ~128 MB hole with possible stack randomization.
33304 */
33305 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33306 -#define MAX_GAP (TASK_SIZE/6*5)
33307 +#define MAX_GAP (pax_task_size/6*5)
33308
33309 static int mmap_is_legacy(void)
33310 {
33311 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33312 return rnd << PAGE_SHIFT;
33313 }
33314
33315 -static unsigned long mmap_base(void)
33316 +static unsigned long mmap_base(struct mm_struct *mm)
33317 {
33318 unsigned long gap = rlimit(RLIMIT_STACK);
33319 + unsigned long pax_task_size = TASK_SIZE;
33320 +
33321 +#ifdef CONFIG_PAX_SEGMEXEC
33322 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33323 + pax_task_size = SEGMEXEC_TASK_SIZE;
33324 +#endif
33325
33326 if (gap < MIN_GAP)
33327 gap = MIN_GAP;
33328 else if (gap > MAX_GAP)
33329 gap = MAX_GAP;
33330
33331 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33332 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33333 }
33334
33335 /*
33336 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33337 * does, but not when emulating X86_32
33338 */
33339 -static unsigned long mmap_legacy_base(void)
33340 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
33341 {
33342 - if (mmap_is_ia32())
33343 + if (mmap_is_ia32()) {
33344 +
33345 +#ifdef CONFIG_PAX_SEGMEXEC
33346 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33347 + return SEGMEXEC_TASK_UNMAPPED_BASE;
33348 + else
33349 +#endif
33350 +
33351 return TASK_UNMAPPED_BASE;
33352 - else
33353 + } else
33354 return TASK_UNMAPPED_BASE + mmap_rnd();
33355 }
33356
33357 @@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33358 */
33359 void arch_pick_mmap_layout(struct mm_struct *mm)
33360 {
33361 - mm->mmap_legacy_base = mmap_legacy_base();
33362 - mm->mmap_base = mmap_base();
33363 + mm->mmap_legacy_base = mmap_legacy_base(mm);
33364 + mm->mmap_base = mmap_base(mm);
33365 +
33366 +#ifdef CONFIG_PAX_RANDMMAP
33367 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
33368 + mm->mmap_legacy_base += mm->delta_mmap;
33369 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33370 + }
33371 +#endif
33372
33373 if (mmap_is_legacy()) {
33374 mm->mmap_base = mm->mmap_legacy_base;
33375 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33376 index 0057a7a..95c7edd 100644
33377 --- a/arch/x86/mm/mmio-mod.c
33378 +++ b/arch/x86/mm/mmio-mod.c
33379 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33380 break;
33381 default:
33382 {
33383 - unsigned char *ip = (unsigned char *)instptr;
33384 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33385 my_trace->opcode = MMIO_UNKNOWN_OP;
33386 my_trace->width = 0;
33387 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33388 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33389 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33390 void __iomem *addr)
33391 {
33392 - static atomic_t next_id;
33393 + static atomic_unchecked_t next_id;
33394 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33395 /* These are page-unaligned. */
33396 struct mmiotrace_map map = {
33397 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33398 .private = trace
33399 },
33400 .phys = offset,
33401 - .id = atomic_inc_return(&next_id)
33402 + .id = atomic_inc_return_unchecked(&next_id)
33403 };
33404 map.map_id = trace->id;
33405
33406 @@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33407 ioremap_trace_core(offset, size, addr);
33408 }
33409
33410 -static void iounmap_trace_core(volatile void __iomem *addr)
33411 +static void iounmap_trace_core(const volatile void __iomem *addr)
33412 {
33413 struct mmiotrace_map map = {
33414 .phys = 0,
33415 @@ -328,7 +328,7 @@ not_enabled:
33416 }
33417 }
33418
33419 -void mmiotrace_iounmap(volatile void __iomem *addr)
33420 +void mmiotrace_iounmap(const volatile void __iomem *addr)
33421 {
33422 might_sleep();
33423 if (is_enabled()) /* recheck and proper locking in *_core() */
33424 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33425 index 1a88370..3f598b5 100644
33426 --- a/arch/x86/mm/numa.c
33427 +++ b/arch/x86/mm/numa.c
33428 @@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33429 }
33430 }
33431
33432 -static int __init numa_register_memblks(struct numa_meminfo *mi)
33433 +static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33434 {
33435 unsigned long uninitialized_var(pfn_align);
33436 int i, nid;
33437 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33438 index 36de293..b820ddc 100644
33439 --- a/arch/x86/mm/pageattr.c
33440 +++ b/arch/x86/mm/pageattr.c
33441 @@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33442 */
33443 #ifdef CONFIG_PCI_BIOS
33444 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33445 - pgprot_val(forbidden) |= _PAGE_NX;
33446 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33447 #endif
33448
33449 /*
33450 @@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33451 * Does not cover __inittext since that is gone later on. On
33452 * 64bit we do not enforce !NX on the low mapping
33453 */
33454 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
33455 - pgprot_val(forbidden) |= _PAGE_NX;
33456 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33457 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33458
33459 +#ifdef CONFIG_DEBUG_RODATA
33460 /*
33461 * The .rodata section needs to be read-only. Using the pfn
33462 * catches all aliases.
33463 @@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33464 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33465 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33466 pgprot_val(forbidden) |= _PAGE_RW;
33467 +#endif
33468
33469 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33470 /*
33471 @@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33472 }
33473 #endif
33474
33475 +#ifdef CONFIG_PAX_KERNEXEC
33476 + if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33477 + pgprot_val(forbidden) |= _PAGE_RW;
33478 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33479 + }
33480 +#endif
33481 +
33482 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33483
33484 return prot;
33485 @@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33486 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33487 {
33488 /* change init_mm */
33489 + pax_open_kernel();
33490 set_pte_atomic(kpte, pte);
33491 +
33492 #ifdef CONFIG_X86_32
33493 if (!SHARED_KERNEL_PMD) {
33494 +
33495 +#ifdef CONFIG_PAX_PER_CPU_PGD
33496 + unsigned long cpu;
33497 +#else
33498 struct page *page;
33499 +#endif
33500
33501 +#ifdef CONFIG_PAX_PER_CPU_PGD
33502 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33503 + pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33504 +#else
33505 list_for_each_entry(page, &pgd_list, lru) {
33506 - pgd_t *pgd;
33507 + pgd_t *pgd = (pgd_t *)page_address(page);
33508 +#endif
33509 +
33510 pud_t *pud;
33511 pmd_t *pmd;
33512
33513 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
33514 + pgd += pgd_index(address);
33515 pud = pud_offset(pgd, address);
33516 pmd = pmd_offset(pud, address);
33517 set_pte_atomic((pte_t *)pmd, pte);
33518 }
33519 }
33520 #endif
33521 + pax_close_kernel();
33522 }
33523
33524 static int
33525 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33526 index 6574388..87e9bef 100644
33527 --- a/arch/x86/mm/pat.c
33528 +++ b/arch/x86/mm/pat.c
33529 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33530
33531 if (!entry) {
33532 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33533 - current->comm, current->pid, start, end - 1);
33534 + current->comm, task_pid_nr(current), start, end - 1);
33535 return -EINVAL;
33536 }
33537
33538 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33539
33540 while (cursor < to) {
33541 if (!devmem_is_allowed(pfn)) {
33542 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33543 - current->comm, from, to - 1);
33544 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33545 + current->comm, from, to - 1, cursor);
33546 return 0;
33547 }
33548 cursor += PAGE_SIZE;
33549 @@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33550 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33551 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33552 "for [mem %#010Lx-%#010Lx]\n",
33553 - current->comm, current->pid,
33554 + current->comm, task_pid_nr(current),
33555 cattr_name(flags),
33556 base, (unsigned long long)(base + size-1));
33557 return -EINVAL;
33558 @@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33559 flags = lookup_memtype(paddr);
33560 if (want_flags != flags) {
33561 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33562 - current->comm, current->pid,
33563 + current->comm, task_pid_nr(current),
33564 cattr_name(want_flags),
33565 (unsigned long long)paddr,
33566 (unsigned long long)(paddr + size - 1),
33567 @@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33568 free_memtype(paddr, paddr + size);
33569 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33570 " for [mem %#010Lx-%#010Lx], got %s\n",
33571 - current->comm, current->pid,
33572 + current->comm, task_pid_nr(current),
33573 cattr_name(want_flags),
33574 (unsigned long long)paddr,
33575 (unsigned long long)(paddr + size - 1),
33576 diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33577 index 415f6c4..d319983 100644
33578 --- a/arch/x86/mm/pat_rbtree.c
33579 +++ b/arch/x86/mm/pat_rbtree.c
33580 @@ -160,7 +160,7 @@ success:
33581
33582 failure:
33583 printk(KERN_INFO "%s:%d conflicting memory types "
33584 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33585 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33586 end, cattr_name(found_type), cattr_name(match->type));
33587 return -EBUSY;
33588 }
33589 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33590 index 9f0614d..92ae64a 100644
33591 --- a/arch/x86/mm/pf_in.c
33592 +++ b/arch/x86/mm/pf_in.c
33593 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33594 int i;
33595 enum reason_type rv = OTHERS;
33596
33597 - p = (unsigned char *)ins_addr;
33598 + p = (unsigned char *)ktla_ktva(ins_addr);
33599 p += skip_prefix(p, &prf);
33600 p += get_opcode(p, &opcode);
33601
33602 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33603 struct prefix_bits prf;
33604 int i;
33605
33606 - p = (unsigned char *)ins_addr;
33607 + p = (unsigned char *)ktla_ktva(ins_addr);
33608 p += skip_prefix(p, &prf);
33609 p += get_opcode(p, &opcode);
33610
33611 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33612 struct prefix_bits prf;
33613 int i;
33614
33615 - p = (unsigned char *)ins_addr;
33616 + p = (unsigned char *)ktla_ktva(ins_addr);
33617 p += skip_prefix(p, &prf);
33618 p += get_opcode(p, &opcode);
33619
33620 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33621 struct prefix_bits prf;
33622 int i;
33623
33624 - p = (unsigned char *)ins_addr;
33625 + p = (unsigned char *)ktla_ktva(ins_addr);
33626 p += skip_prefix(p, &prf);
33627 p += get_opcode(p, &opcode);
33628 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33629 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33630 struct prefix_bits prf;
33631 int i;
33632
33633 - p = (unsigned char *)ins_addr;
33634 + p = (unsigned char *)ktla_ktva(ins_addr);
33635 p += skip_prefix(p, &prf);
33636 p += get_opcode(p, &opcode);
33637 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33638 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33639 index 6fb6927..4fc13c0 100644
33640 --- a/arch/x86/mm/pgtable.c
33641 +++ b/arch/x86/mm/pgtable.c
33642 @@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33643 list_del(&page->lru);
33644 }
33645
33646 -#define UNSHARED_PTRS_PER_PGD \
33647 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33648 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33649 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33650
33651 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33652 +{
33653 + unsigned int count = USER_PGD_PTRS;
33654
33655 + if (!pax_user_shadow_base)
33656 + return;
33657 +
33658 + while (count--)
33659 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33660 +}
33661 +#endif
33662 +
33663 +#ifdef CONFIG_PAX_PER_CPU_PGD
33664 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33665 +{
33666 + unsigned int count = USER_PGD_PTRS;
33667 +
33668 + while (count--) {
33669 + pgd_t pgd;
33670 +
33671 +#ifdef CONFIG_X86_64
33672 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33673 +#else
33674 + pgd = *src++;
33675 +#endif
33676 +
33677 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33678 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33679 +#endif
33680 +
33681 + *dst++ = pgd;
33682 + }
33683 +
33684 +}
33685 +#endif
33686 +
33687 +#ifdef CONFIG_X86_64
33688 +#define pxd_t pud_t
33689 +#define pyd_t pgd_t
33690 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33691 +#define pgtable_pxd_page_ctor(page) true
33692 +#define pgtable_pxd_page_dtor(page)
33693 +#define pxd_free(mm, pud) pud_free((mm), (pud))
33694 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33695 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
33696 +#define PYD_SIZE PGDIR_SIZE
33697 +#else
33698 +#define pxd_t pmd_t
33699 +#define pyd_t pud_t
33700 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33701 +#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33702 +#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33703 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
33704 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33705 +#define pyd_offset(mm, address) pud_offset((mm), (address))
33706 +#define PYD_SIZE PUD_SIZE
33707 +#endif
33708 +
33709 +#ifdef CONFIG_PAX_PER_CPU_PGD
33710 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33711 +static inline void pgd_dtor(pgd_t *pgd) {}
33712 +#else
33713 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33714 {
33715 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33716 @@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33717 pgd_list_del(pgd);
33718 spin_unlock(&pgd_lock);
33719 }
33720 +#endif
33721
33722 /*
33723 * List of all pgd's needed for non-PAE so it can invalidate entries
33724 @@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33725 * -- nyc
33726 */
33727
33728 -#ifdef CONFIG_X86_PAE
33729 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33730 /*
33731 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33732 * updating the top-level pagetable entries to guarantee the
33733 @@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33734 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33735 * and initialize the kernel pmds here.
33736 */
33737 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33738 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33739
33740 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33741 {
33742 @@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33743 */
33744 flush_tlb_mm(mm);
33745 }
33746 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33747 +#define PREALLOCATED_PXDS USER_PGD_PTRS
33748 #else /* !CONFIG_X86_PAE */
33749
33750 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33751 -#define PREALLOCATED_PMDS 0
33752 +#define PREALLOCATED_PXDS 0
33753
33754 #endif /* CONFIG_X86_PAE */
33755
33756 -static void free_pmds(pmd_t *pmds[])
33757 +static void free_pxds(pxd_t *pxds[])
33758 {
33759 int i;
33760
33761 - for(i = 0; i < PREALLOCATED_PMDS; i++)
33762 - if (pmds[i]) {
33763 - pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33764 - free_page((unsigned long)pmds[i]);
33765 + for(i = 0; i < PREALLOCATED_PXDS; i++)
33766 + if (pxds[i]) {
33767 + pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33768 + free_page((unsigned long)pxds[i]);
33769 }
33770 }
33771
33772 -static int preallocate_pmds(pmd_t *pmds[])
33773 +static int preallocate_pxds(pxd_t *pxds[])
33774 {
33775 int i;
33776 bool failed = false;
33777
33778 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33779 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33780 - if (!pmd)
33781 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33782 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33783 + if (!pxd)
33784 failed = true;
33785 - if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33786 - free_page((unsigned long)pmd);
33787 - pmd = NULL;
33788 + if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33789 + free_page((unsigned long)pxd);
33790 + pxd = NULL;
33791 failed = true;
33792 }
33793 - pmds[i] = pmd;
33794 + pxds[i] = pxd;
33795 }
33796
33797 if (failed) {
33798 - free_pmds(pmds);
33799 + free_pxds(pxds);
33800 return -ENOMEM;
33801 }
33802
33803 @@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33804 * preallocate which never got a corresponding vma will need to be
33805 * freed manually.
33806 */
33807 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33808 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33809 {
33810 int i;
33811
33812 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33813 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33814 pgd_t pgd = pgdp[i];
33815
33816 if (pgd_val(pgd) != 0) {
33817 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33818 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33819
33820 - pgdp[i] = native_make_pgd(0);
33821 + set_pgd(pgdp + i, native_make_pgd(0));
33822
33823 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33824 - pmd_free(mm, pmd);
33825 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33826 + pxd_free(mm, pxd);
33827 }
33828 }
33829 }
33830
33831 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33832 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33833 {
33834 - pud_t *pud;
33835 + pyd_t *pyd;
33836 int i;
33837
33838 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33839 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33840 return;
33841
33842 - pud = pud_offset(pgd, 0);
33843 -
33844 - for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33845 - pmd_t *pmd = pmds[i];
33846 +#ifdef CONFIG_X86_64
33847 + pyd = pyd_offset(mm, 0L);
33848 +#else
33849 + pyd = pyd_offset(pgd, 0L);
33850 +#endif
33851
33852 + for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33853 + pxd_t *pxd = pxds[i];
33854 if (i >= KERNEL_PGD_BOUNDARY)
33855 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33856 - sizeof(pmd_t) * PTRS_PER_PMD);
33857 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33858 + sizeof(pxd_t) * PTRS_PER_PMD);
33859
33860 - pud_populate(mm, pud, pmd);
33861 + pyd_populate(mm, pyd, pxd);
33862 }
33863 }
33864
33865 pgd_t *pgd_alloc(struct mm_struct *mm)
33866 {
33867 pgd_t *pgd;
33868 - pmd_t *pmds[PREALLOCATED_PMDS];
33869 + pxd_t *pxds[PREALLOCATED_PXDS];
33870
33871 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33872
33873 @@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33874
33875 mm->pgd = pgd;
33876
33877 - if (preallocate_pmds(pmds) != 0)
33878 + if (preallocate_pxds(pxds) != 0)
33879 goto out_free_pgd;
33880
33881 if (paravirt_pgd_alloc(mm) != 0)
33882 - goto out_free_pmds;
33883 + goto out_free_pxds;
33884
33885 /*
33886 * Make sure that pre-populating the pmds is atomic with
33887 @@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33888 spin_lock(&pgd_lock);
33889
33890 pgd_ctor(mm, pgd);
33891 - pgd_prepopulate_pmd(mm, pgd, pmds);
33892 + pgd_prepopulate_pxd(mm, pgd, pxds);
33893
33894 spin_unlock(&pgd_lock);
33895
33896 return pgd;
33897
33898 -out_free_pmds:
33899 - free_pmds(pmds);
33900 +out_free_pxds:
33901 + free_pxds(pxds);
33902 out_free_pgd:
33903 free_page((unsigned long)pgd);
33904 out:
33905 @@ -313,7 +380,7 @@ out:
33906
33907 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33908 {
33909 - pgd_mop_up_pmds(mm, pgd);
33910 + pgd_mop_up_pxds(mm, pgd);
33911 pgd_dtor(pgd);
33912 paravirt_pgd_free(mm, pgd);
33913 free_page((unsigned long)pgd);
33914 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33915 index 75cc097..79a097f 100644
33916 --- a/arch/x86/mm/pgtable_32.c
33917 +++ b/arch/x86/mm/pgtable_32.c
33918 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33919 return;
33920 }
33921 pte = pte_offset_kernel(pmd, vaddr);
33922 +
33923 + pax_open_kernel();
33924 if (pte_val(pteval))
33925 set_pte_at(&init_mm, vaddr, pte, pteval);
33926 else
33927 pte_clear(&init_mm, vaddr, pte);
33928 + pax_close_kernel();
33929
33930 /*
33931 * It's enough to flush this one mapping.
33932 diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33933 index e666cbb..61788c45 100644
33934 --- a/arch/x86/mm/physaddr.c
33935 +++ b/arch/x86/mm/physaddr.c
33936 @@ -10,7 +10,7 @@
33937 #ifdef CONFIG_X86_64
33938
33939 #ifdef CONFIG_DEBUG_VIRTUAL
33940 -unsigned long __phys_addr(unsigned long x)
33941 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33942 {
33943 unsigned long y = x - __START_KERNEL_map;
33944
33945 @@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33946 #else
33947
33948 #ifdef CONFIG_DEBUG_VIRTUAL
33949 -unsigned long __phys_addr(unsigned long x)
33950 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33951 {
33952 unsigned long phys_addr = x - PAGE_OFFSET;
33953 /* VMALLOC_* aren't constants */
33954 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33955 index 90555bf..f5f1828 100644
33956 --- a/arch/x86/mm/setup_nx.c
33957 +++ b/arch/x86/mm/setup_nx.c
33958 @@ -5,8 +5,10 @@
33959 #include <asm/pgtable.h>
33960 #include <asm/proto.h>
33961
33962 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33963 static int disable_nx;
33964
33965 +#ifndef CONFIG_PAX_PAGEEXEC
33966 /*
33967 * noexec = on|off
33968 *
33969 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33970 return 0;
33971 }
33972 early_param("noexec", noexec_setup);
33973 +#endif
33974 +
33975 +#endif
33976
33977 void x86_configure_nx(void)
33978 {
33979 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33980 if (cpu_has_nx && !disable_nx)
33981 __supported_pte_mask |= _PAGE_NX;
33982 else
33983 +#endif
33984 __supported_pte_mask &= ~_PAGE_NX;
33985 }
33986
33987 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33988 index ee61c36..e6fedeb 100644
33989 --- a/arch/x86/mm/tlb.c
33990 +++ b/arch/x86/mm/tlb.c
33991 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
33992 BUG();
33993 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33994 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33995 +
33996 +#ifndef CONFIG_PAX_PER_CPU_PGD
33997 load_cr3(swapper_pg_dir);
33998 +#endif
33999 +
34000 /*
34001 * This gets called in the idle path where RCU
34002 * functions differently. Tracing normally
34003 diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34004 new file mode 100644
34005 index 0000000..dace51c
34006 --- /dev/null
34007 +++ b/arch/x86/mm/uderef_64.c
34008 @@ -0,0 +1,37 @@
34009 +#include <linux/mm.h>
34010 +#include <asm/pgtable.h>
34011 +#include <asm/uaccess.h>
34012 +
34013 +#ifdef CONFIG_PAX_MEMORY_UDEREF
34014 +/* PaX: due to the special call convention these functions must
34015 + * - remain leaf functions under all configurations,
34016 + * - never be called directly, only dereferenced from the wrappers.
34017 + */
34018 +void __pax_open_userland(void)
34019 +{
34020 + unsigned int cpu;
34021 +
34022 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
34023 + return;
34024 +
34025 + cpu = raw_get_cpu();
34026 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34027 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34028 + raw_put_cpu_no_resched();
34029 +}
34030 +EXPORT_SYMBOL(__pax_open_userland);
34031 +
34032 +void __pax_close_userland(void)
34033 +{
34034 + unsigned int cpu;
34035 +
34036 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
34037 + return;
34038 +
34039 + cpu = raw_get_cpu();
34040 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34041 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34042 + raw_put_cpu_no_resched();
34043 +}
34044 +EXPORT_SYMBOL(__pax_close_userland);
34045 +#endif
34046 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34047 index 6440221..f84b5c7 100644
34048 --- a/arch/x86/net/bpf_jit.S
34049 +++ b/arch/x86/net/bpf_jit.S
34050 @@ -9,6 +9,7 @@
34051 */
34052 #include <linux/linkage.h>
34053 #include <asm/dwarf2.h>
34054 +#include <asm/alternative-asm.h>
34055
34056 /*
34057 * Calling convention :
34058 @@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34059 jle bpf_slow_path_word
34060 mov (SKBDATA,%rsi),%eax
34061 bswap %eax /* ntohl() */
34062 + pax_force_retaddr
34063 ret
34064
34065 sk_load_half:
34066 @@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34067 jle bpf_slow_path_half
34068 movzwl (SKBDATA,%rsi),%eax
34069 rol $8,%ax # ntohs()
34070 + pax_force_retaddr
34071 ret
34072
34073 sk_load_byte:
34074 @@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34075 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34076 jle bpf_slow_path_byte
34077 movzbl (SKBDATA,%rsi),%eax
34078 + pax_force_retaddr
34079 ret
34080
34081 /* rsi contains offset and can be scratched */
34082 @@ -90,6 +94,7 @@ bpf_slow_path_word:
34083 js bpf_error
34084 mov - MAX_BPF_STACK + 32(%rbp),%eax
34085 bswap %eax
34086 + pax_force_retaddr
34087 ret
34088
34089 bpf_slow_path_half:
34090 @@ -98,12 +103,14 @@ bpf_slow_path_half:
34091 mov - MAX_BPF_STACK + 32(%rbp),%ax
34092 rol $8,%ax
34093 movzwl %ax,%eax
34094 + pax_force_retaddr
34095 ret
34096
34097 bpf_slow_path_byte:
34098 bpf_slow_path_common(1)
34099 js bpf_error
34100 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34101 + pax_force_retaddr
34102 ret
34103
34104 #define sk_negative_common(SIZE) \
34105 @@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34106 sk_negative_common(4)
34107 mov (%rax), %eax
34108 bswap %eax
34109 + pax_force_retaddr
34110 ret
34111
34112 bpf_slow_path_half_neg:
34113 @@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34114 mov (%rax),%ax
34115 rol $8,%ax
34116 movzwl %ax,%eax
34117 + pax_force_retaddr
34118 ret
34119
34120 bpf_slow_path_byte_neg:
34121 @@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34122 .globl sk_load_byte_negative_offset
34123 sk_negative_common(1)
34124 movzbl (%rax), %eax
34125 + pax_force_retaddr
34126 ret
34127
34128 bpf_error:
34129 @@ -156,4 +166,5 @@ bpf_error:
34130 mov - MAX_BPF_STACK + 16(%rbp),%r14
34131 mov - MAX_BPF_STACK + 24(%rbp),%r15
34132 leaveq
34133 + pax_force_retaddr
34134 ret
34135 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34136 index 3f62734..a57894f 100644
34137 --- a/arch/x86/net/bpf_jit_comp.c
34138 +++ b/arch/x86/net/bpf_jit_comp.c
34139 @@ -13,7 +13,11 @@
34140 #include <linux/if_vlan.h>
34141 #include <asm/cacheflush.h>
34142
34143 +#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34144 +int bpf_jit_enable __read_only;
34145 +#else
34146 int bpf_jit_enable __read_mostly;
34147 +#endif
34148
34149 /*
34150 * assembly code in arch/x86/net/bpf_jit.S
34151 @@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34152 static void jit_fill_hole(void *area, unsigned int size)
34153 {
34154 /* fill whole space with int3 instructions */
34155 + pax_open_kernel();
34156 memset(area, 0xcc, size);
34157 + pax_close_kernel();
34158 }
34159
34160 struct jit_context {
34161 @@ -894,7 +900,9 @@ common_load:
34162 pr_err("bpf_jit_compile fatal error\n");
34163 return -EFAULT;
34164 }
34165 + pax_open_kernel();
34166 memcpy(image + proglen, temp, ilen);
34167 + pax_close_kernel();
34168 }
34169 proglen += ilen;
34170 addrs[i] = proglen;
34171 @@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34172
34173 if (image) {
34174 bpf_flush_icache(header, image + proglen);
34175 - set_memory_ro((unsigned long)header, header->pages);
34176 prog->bpf_func = (void *)image;
34177 prog->jited = true;
34178 }
34179 @@ -979,12 +986,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34180 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34181 struct bpf_binary_header *header = (void *)addr;
34182
34183 - if (!fp->jited)
34184 - goto free_filter;
34185 + if (fp->jited)
34186 + bpf_jit_binary_free(header);
34187
34188 - set_memory_rw(addr, header->pages);
34189 - bpf_jit_binary_free(header);
34190 -
34191 -free_filter:
34192 bpf_prog_unlock_free(fp);
34193 }
34194 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34195 index 5d04be5..2beeaa2 100644
34196 --- a/arch/x86/oprofile/backtrace.c
34197 +++ b/arch/x86/oprofile/backtrace.c
34198 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34199 struct stack_frame_ia32 *fp;
34200 unsigned long bytes;
34201
34202 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34203 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34204 if (bytes != 0)
34205 return NULL;
34206
34207 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34208 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34209
34210 oprofile_add_trace(bufhead[0].return_address);
34211
34212 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34213 struct stack_frame bufhead[2];
34214 unsigned long bytes;
34215
34216 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34217 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34218 if (bytes != 0)
34219 return NULL;
34220
34221 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34222 {
34223 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34224
34225 - if (!user_mode_vm(regs)) {
34226 + if (!user_mode(regs)) {
34227 unsigned long stack = kernel_stack_pointer(regs);
34228 if (depth)
34229 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34230 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34231 index 1d2e639..f6ef82a 100644
34232 --- a/arch/x86/oprofile/nmi_int.c
34233 +++ b/arch/x86/oprofile/nmi_int.c
34234 @@ -23,6 +23,7 @@
34235 #include <asm/nmi.h>
34236 #include <asm/msr.h>
34237 #include <asm/apic.h>
34238 +#include <asm/pgtable.h>
34239
34240 #include "op_counter.h"
34241 #include "op_x86_model.h"
34242 @@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34243 if (ret)
34244 return ret;
34245
34246 - if (!model->num_virt_counters)
34247 - model->num_virt_counters = model->num_counters;
34248 + if (!model->num_virt_counters) {
34249 + pax_open_kernel();
34250 + *(unsigned int *)&model->num_virt_counters = model->num_counters;
34251 + pax_close_kernel();
34252 + }
34253
34254 mux_init(ops);
34255
34256 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34257 index 50d86c0..7985318 100644
34258 --- a/arch/x86/oprofile/op_model_amd.c
34259 +++ b/arch/x86/oprofile/op_model_amd.c
34260 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34261 num_counters = AMD64_NUM_COUNTERS;
34262 }
34263
34264 - op_amd_spec.num_counters = num_counters;
34265 - op_amd_spec.num_controls = num_counters;
34266 - op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34267 + pax_open_kernel();
34268 + *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34269 + *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34270 + *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34271 + pax_close_kernel();
34272
34273 return 0;
34274 }
34275 diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34276 index d90528e..0127e2b 100644
34277 --- a/arch/x86/oprofile/op_model_ppro.c
34278 +++ b/arch/x86/oprofile/op_model_ppro.c
34279 @@ -19,6 +19,7 @@
34280 #include <asm/msr.h>
34281 #include <asm/apic.h>
34282 #include <asm/nmi.h>
34283 +#include <asm/pgtable.h>
34284
34285 #include "op_x86_model.h"
34286 #include "op_counter.h"
34287 @@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34288
34289 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34290
34291 - op_arch_perfmon_spec.num_counters = num_counters;
34292 - op_arch_perfmon_spec.num_controls = num_counters;
34293 + pax_open_kernel();
34294 + *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34295 + *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34296 + pax_close_kernel();
34297 }
34298
34299 static int arch_perfmon_init(struct oprofile_operations *ignore)
34300 diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34301 index 71e8a67..6a313bb 100644
34302 --- a/arch/x86/oprofile/op_x86_model.h
34303 +++ b/arch/x86/oprofile/op_x86_model.h
34304 @@ -52,7 +52,7 @@ struct op_x86_model_spec {
34305 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34306 struct op_msrs const * const msrs);
34307 #endif
34308 -};
34309 +} __do_const;
34310
34311 struct op_counter_config;
34312
34313 diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34314 index b9958c3..24229ab 100644
34315 --- a/arch/x86/pci/intel_mid_pci.c
34316 +++ b/arch/x86/pci/intel_mid_pci.c
34317 @@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
34318 pci_mmcfg_late_init();
34319 pcibios_enable_irq = intel_mid_pci_irq_enable;
34320 pcibios_disable_irq = intel_mid_pci_irq_disable;
34321 - pci_root_ops = intel_mid_pci_ops;
34322 + memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34323 pci_soc_mode = 1;
34324 /* Continue with standard init */
34325 return 1;
34326 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34327 index eb500c2..eab9e70 100644
34328 --- a/arch/x86/pci/irq.c
34329 +++ b/arch/x86/pci/irq.c
34330 @@ -51,7 +51,7 @@ struct irq_router {
34331 struct irq_router_handler {
34332 u16 vendor;
34333 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34334 -};
34335 +} __do_const;
34336
34337 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34338 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34339 @@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34340 return 0;
34341 }
34342
34343 -static __initdata struct irq_router_handler pirq_routers[] = {
34344 +static __initconst const struct irq_router_handler pirq_routers[] = {
34345 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34346 { PCI_VENDOR_ID_AL, ali_router_probe },
34347 { PCI_VENDOR_ID_ITE, ite_router_probe },
34348 @@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34349 static void __init pirq_find_router(struct irq_router *r)
34350 {
34351 struct irq_routing_table *rt = pirq_table;
34352 - struct irq_router_handler *h;
34353 + const struct irq_router_handler *h;
34354
34355 #ifdef CONFIG_PCI_BIOS
34356 if (!rt->signature) {
34357 @@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34358 return 0;
34359 }
34360
34361 -static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34362 +static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34363 {
34364 .callback = fix_broken_hp_bios_irq9,
34365 .ident = "HP Pavilion N5400 Series Laptop",
34366 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34367 index 9b83b90..4112152 100644
34368 --- a/arch/x86/pci/pcbios.c
34369 +++ b/arch/x86/pci/pcbios.c
34370 @@ -79,7 +79,7 @@ union bios32 {
34371 static struct {
34372 unsigned long address;
34373 unsigned short segment;
34374 -} bios32_indirect __initdata = { 0, __KERNEL_CS };
34375 +} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34376
34377 /*
34378 * Returns the entry point for the given service, NULL on error
34379 @@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34380 unsigned long length; /* %ecx */
34381 unsigned long entry; /* %edx */
34382 unsigned long flags;
34383 + struct desc_struct d, *gdt;
34384
34385 local_irq_save(flags);
34386 - __asm__("lcall *(%%edi); cld"
34387 +
34388 + gdt = get_cpu_gdt_table(smp_processor_id());
34389 +
34390 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34391 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34392 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34393 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34394 +
34395 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34396 : "=a" (return_code),
34397 "=b" (address),
34398 "=c" (length),
34399 "=d" (entry)
34400 : "0" (service),
34401 "1" (0),
34402 - "D" (&bios32_indirect));
34403 + "D" (&bios32_indirect),
34404 + "r"(__PCIBIOS_DS)
34405 + : "memory");
34406 +
34407 + pax_open_kernel();
34408 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34409 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34410 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34411 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34412 + pax_close_kernel();
34413 +
34414 local_irq_restore(flags);
34415
34416 switch (return_code) {
34417 - case 0:
34418 - return address + entry;
34419 - case 0x80: /* Not present */
34420 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34421 - return 0;
34422 - default: /* Shouldn't happen */
34423 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34424 - service, return_code);
34425 + case 0: {
34426 + int cpu;
34427 + unsigned char flags;
34428 +
34429 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34430 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34431 + printk(KERN_WARNING "bios32_service: not valid\n");
34432 return 0;
34433 + }
34434 + address = address + PAGE_OFFSET;
34435 + length += 16UL; /* some BIOSs underreport this... */
34436 + flags = 4;
34437 + if (length >= 64*1024*1024) {
34438 + length >>= PAGE_SHIFT;
34439 + flags |= 8;
34440 + }
34441 +
34442 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34443 + gdt = get_cpu_gdt_table(cpu);
34444 + pack_descriptor(&d, address, length, 0x9b, flags);
34445 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34446 + pack_descriptor(&d, address, length, 0x93, flags);
34447 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34448 + }
34449 + return entry;
34450 + }
34451 + case 0x80: /* Not present */
34452 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34453 + return 0;
34454 + default: /* Shouldn't happen */
34455 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34456 + service, return_code);
34457 + return 0;
34458 }
34459 }
34460
34461 static struct {
34462 unsigned long address;
34463 unsigned short segment;
34464 -} pci_indirect = { 0, __KERNEL_CS };
34465 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34466
34467 -static int pci_bios_present;
34468 +static int pci_bios_present __read_only;
34469
34470 static int __init check_pcibios(void)
34471 {
34472 @@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34473 unsigned long flags, pcibios_entry;
34474
34475 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34476 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34477 + pci_indirect.address = pcibios_entry;
34478
34479 local_irq_save(flags);
34480 - __asm__(
34481 - "lcall *(%%edi); cld\n\t"
34482 + __asm__("movw %w6, %%ds\n\t"
34483 + "lcall *%%ss:(%%edi); cld\n\t"
34484 + "push %%ss\n\t"
34485 + "pop %%ds\n\t"
34486 "jc 1f\n\t"
34487 "xor %%ah, %%ah\n"
34488 "1:"
34489 @@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34490 "=b" (ebx),
34491 "=c" (ecx)
34492 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34493 - "D" (&pci_indirect)
34494 + "D" (&pci_indirect),
34495 + "r" (__PCIBIOS_DS)
34496 : "memory");
34497 local_irq_restore(flags);
34498
34499 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34500
34501 switch (len) {
34502 case 1:
34503 - __asm__("lcall *(%%esi); cld\n\t"
34504 + __asm__("movw %w6, %%ds\n\t"
34505 + "lcall *%%ss:(%%esi); cld\n\t"
34506 + "push %%ss\n\t"
34507 + "pop %%ds\n\t"
34508 "jc 1f\n\t"
34509 "xor %%ah, %%ah\n"
34510 "1:"
34511 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34512 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34513 "b" (bx),
34514 "D" ((long)reg),
34515 - "S" (&pci_indirect));
34516 + "S" (&pci_indirect),
34517 + "r" (__PCIBIOS_DS));
34518 /*
34519 * Zero-extend the result beyond 8 bits, do not trust the
34520 * BIOS having done it:
34521 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34522 *value &= 0xff;
34523 break;
34524 case 2:
34525 - __asm__("lcall *(%%esi); cld\n\t"
34526 + __asm__("movw %w6, %%ds\n\t"
34527 + "lcall *%%ss:(%%esi); cld\n\t"
34528 + "push %%ss\n\t"
34529 + "pop %%ds\n\t"
34530 "jc 1f\n\t"
34531 "xor %%ah, %%ah\n"
34532 "1:"
34533 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34534 : "1" (PCIBIOS_READ_CONFIG_WORD),
34535 "b" (bx),
34536 "D" ((long)reg),
34537 - "S" (&pci_indirect));
34538 + "S" (&pci_indirect),
34539 + "r" (__PCIBIOS_DS));
34540 /*
34541 * Zero-extend the result beyond 16 bits, do not trust the
34542 * BIOS having done it:
34543 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34544 *value &= 0xffff;
34545 break;
34546 case 4:
34547 - __asm__("lcall *(%%esi); cld\n\t"
34548 + __asm__("movw %w6, %%ds\n\t"
34549 + "lcall *%%ss:(%%esi); cld\n\t"
34550 + "push %%ss\n\t"
34551 + "pop %%ds\n\t"
34552 "jc 1f\n\t"
34553 "xor %%ah, %%ah\n"
34554 "1:"
34555 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34556 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34557 "b" (bx),
34558 "D" ((long)reg),
34559 - "S" (&pci_indirect));
34560 + "S" (&pci_indirect),
34561 + "r" (__PCIBIOS_DS));
34562 break;
34563 }
34564
34565 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34566
34567 switch (len) {
34568 case 1:
34569 - __asm__("lcall *(%%esi); cld\n\t"
34570 + __asm__("movw %w6, %%ds\n\t"
34571 + "lcall *%%ss:(%%esi); cld\n\t"
34572 + "push %%ss\n\t"
34573 + "pop %%ds\n\t"
34574 "jc 1f\n\t"
34575 "xor %%ah, %%ah\n"
34576 "1:"
34577 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34578 "c" (value),
34579 "b" (bx),
34580 "D" ((long)reg),
34581 - "S" (&pci_indirect));
34582 + "S" (&pci_indirect),
34583 + "r" (__PCIBIOS_DS));
34584 break;
34585 case 2:
34586 - __asm__("lcall *(%%esi); cld\n\t"
34587 + __asm__("movw %w6, %%ds\n\t"
34588 + "lcall *%%ss:(%%esi); cld\n\t"
34589 + "push %%ss\n\t"
34590 + "pop %%ds\n\t"
34591 "jc 1f\n\t"
34592 "xor %%ah, %%ah\n"
34593 "1:"
34594 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34595 "c" (value),
34596 "b" (bx),
34597 "D" ((long)reg),
34598 - "S" (&pci_indirect));
34599 + "S" (&pci_indirect),
34600 + "r" (__PCIBIOS_DS));
34601 break;
34602 case 4:
34603 - __asm__("lcall *(%%esi); cld\n\t"
34604 + __asm__("movw %w6, %%ds\n\t"
34605 + "lcall *%%ss:(%%esi); cld\n\t"
34606 + "push %%ss\n\t"
34607 + "pop %%ds\n\t"
34608 "jc 1f\n\t"
34609 "xor %%ah, %%ah\n"
34610 "1:"
34611 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34612 "c" (value),
34613 "b" (bx),
34614 "D" ((long)reg),
34615 - "S" (&pci_indirect));
34616 + "S" (&pci_indirect),
34617 + "r" (__PCIBIOS_DS));
34618 break;
34619 }
34620
34621 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34622
34623 DBG("PCI: Fetching IRQ routing table... ");
34624 __asm__("push %%es\n\t"
34625 + "movw %w8, %%ds\n\t"
34626 "push %%ds\n\t"
34627 "pop %%es\n\t"
34628 - "lcall *(%%esi); cld\n\t"
34629 + "lcall *%%ss:(%%esi); cld\n\t"
34630 "pop %%es\n\t"
34631 + "push %%ss\n\t"
34632 + "pop %%ds\n"
34633 "jc 1f\n\t"
34634 "xor %%ah, %%ah\n"
34635 "1:"
34636 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34637 "1" (0),
34638 "D" ((long) &opt),
34639 "S" (&pci_indirect),
34640 - "m" (opt)
34641 + "m" (opt),
34642 + "r" (__PCIBIOS_DS)
34643 : "memory");
34644 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34645 if (ret & 0xff00)
34646 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34647 {
34648 int ret;
34649
34650 - __asm__("lcall *(%%esi); cld\n\t"
34651 + __asm__("movw %w5, %%ds\n\t"
34652 + "lcall *%%ss:(%%esi); cld\n\t"
34653 + "push %%ss\n\t"
34654 + "pop %%ds\n"
34655 "jc 1f\n\t"
34656 "xor %%ah, %%ah\n"
34657 "1:"
34658 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34659 : "0" (PCIBIOS_SET_PCI_HW_INT),
34660 "b" ((dev->bus->number << 8) | dev->devfn),
34661 "c" ((irq << 8) | (pin + 10)),
34662 - "S" (&pci_indirect));
34663 + "S" (&pci_indirect),
34664 + "r" (__PCIBIOS_DS));
34665 return !(ret & 0xff00);
34666 }
34667 EXPORT_SYMBOL(pcibios_set_irq_routing);
34668 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34669 index 40e7cda..c7e6672 100644
34670 --- a/arch/x86/platform/efi/efi_32.c
34671 +++ b/arch/x86/platform/efi/efi_32.c
34672 @@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34673 {
34674 struct desc_ptr gdt_descr;
34675
34676 +#ifdef CONFIG_PAX_KERNEXEC
34677 + struct desc_struct d;
34678 +#endif
34679 +
34680 local_irq_save(efi_rt_eflags);
34681
34682 load_cr3(initial_page_table);
34683 __flush_tlb_all();
34684
34685 +#ifdef CONFIG_PAX_KERNEXEC
34686 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34687 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34688 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34689 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34690 +#endif
34691 +
34692 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34693 gdt_descr.size = GDT_SIZE - 1;
34694 load_gdt(&gdt_descr);
34695 @@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34696 {
34697 struct desc_ptr gdt_descr;
34698
34699 +#ifdef CONFIG_PAX_KERNEXEC
34700 + struct desc_struct d;
34701 +
34702 + memset(&d, 0, sizeof d);
34703 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34704 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34705 +#endif
34706 +
34707 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34708 gdt_descr.size = GDT_SIZE - 1;
34709 load_gdt(&gdt_descr);
34710
34711 +#ifdef CONFIG_PAX_PER_CPU_PGD
34712 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34713 +#else
34714 load_cr3(swapper_pg_dir);
34715 +#endif
34716 +
34717 __flush_tlb_all();
34718
34719 local_irq_restore(efi_rt_eflags);
34720 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34721 index 35aecb6..46177db 100644
34722 --- a/arch/x86/platform/efi/efi_64.c
34723 +++ b/arch/x86/platform/efi/efi_64.c
34724 @@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
34725 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34726 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34727 }
34728 +
34729 +#ifdef CONFIG_PAX_PER_CPU_PGD
34730 + load_cr3(swapper_pg_dir);
34731 +#endif
34732 +
34733 __flush_tlb_all();
34734 }
34735
34736 @@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34737 for (pgd = 0; pgd < n_pgds; pgd++)
34738 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34739 kfree(save_pgd);
34740 +
34741 +#ifdef CONFIG_PAX_PER_CPU_PGD
34742 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34743 +#endif
34744 +
34745 __flush_tlb_all();
34746 local_irq_restore(efi_flags);
34747 early_code_mapping_set_exec(0);
34748 @@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34749 unsigned npages;
34750 pgd_t *pgd;
34751
34752 - if (efi_enabled(EFI_OLD_MEMMAP))
34753 + if (efi_enabled(EFI_OLD_MEMMAP)) {
34754 + /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34755 + * able to execute the EFI services.
34756 + */
34757 + if (__supported_pte_mask & _PAGE_NX) {
34758 + unsigned long addr = (unsigned long) __va(0);
34759 + pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34760 +
34761 + pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34762 +#ifdef CONFIG_PAX_PER_CPU_PGD
34763 + set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34764 +#endif
34765 + set_pgd(pgd_offset_k(addr), pe);
34766 + }
34767 +
34768 return 0;
34769 + }
34770
34771 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34772 pgd = __va(efi_scratch.efi_pgt);
34773 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34774 index 040192b..7d3300f 100644
34775 --- a/arch/x86/platform/efi/efi_stub_32.S
34776 +++ b/arch/x86/platform/efi/efi_stub_32.S
34777 @@ -6,7 +6,9 @@
34778 */
34779
34780 #include <linux/linkage.h>
34781 +#include <linux/init.h>
34782 #include <asm/page_types.h>
34783 +#include <asm/segment.h>
34784
34785 /*
34786 * efi_call_phys(void *, ...) is a function with variable parameters.
34787 @@ -20,7 +22,7 @@
34788 * service functions will comply with gcc calling convention, too.
34789 */
34790
34791 -.text
34792 +__INIT
34793 ENTRY(efi_call_phys)
34794 /*
34795 * 0. The function can only be called in Linux kernel. So CS has been
34796 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34797 * The mapping of lower virtual memory has been created in prolog and
34798 * epilog.
34799 */
34800 - movl $1f, %edx
34801 - subl $__PAGE_OFFSET, %edx
34802 - jmp *%edx
34803 +#ifdef CONFIG_PAX_KERNEXEC
34804 + movl $(__KERNEXEC_EFI_DS), %edx
34805 + mov %edx, %ds
34806 + mov %edx, %es
34807 + mov %edx, %ss
34808 + addl $2f,(1f)
34809 + ljmp *(1f)
34810 +
34811 +__INITDATA
34812 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34813 +.previous
34814 +
34815 +2:
34816 + subl $2b,(1b)
34817 +#else
34818 + jmp 1f-__PAGE_OFFSET
34819 1:
34820 +#endif
34821
34822 /*
34823 * 2. Now on the top of stack is the return
34824 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34825 * parameter 2, ..., param n. To make things easy, we save the return
34826 * address of efi_call_phys in a global variable.
34827 */
34828 - popl %edx
34829 - movl %edx, saved_return_addr
34830 - /* get the function pointer into ECX*/
34831 - popl %ecx
34832 - movl %ecx, efi_rt_function_ptr
34833 - movl $2f, %edx
34834 - subl $__PAGE_OFFSET, %edx
34835 - pushl %edx
34836 + popl (saved_return_addr)
34837 + popl (efi_rt_function_ptr)
34838
34839 /*
34840 * 3. Clear PG bit in %CR0.
34841 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34842 /*
34843 * 5. Call the physical function.
34844 */
34845 - jmp *%ecx
34846 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
34847
34848 -2:
34849 /*
34850 * 6. After EFI runtime service returns, control will return to
34851 * following instruction. We'd better readjust stack pointer first.
34852 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34853 movl %cr0, %edx
34854 orl $0x80000000, %edx
34855 movl %edx, %cr0
34856 - jmp 1f
34857 -1:
34858 +
34859 /*
34860 * 8. Now restore the virtual mode from flat mode by
34861 * adding EIP with PAGE_OFFSET.
34862 */
34863 - movl $1f, %edx
34864 - jmp *%edx
34865 +#ifdef CONFIG_PAX_KERNEXEC
34866 + movl $(__KERNEL_DS), %edx
34867 + mov %edx, %ds
34868 + mov %edx, %es
34869 + mov %edx, %ss
34870 + ljmp $(__KERNEL_CS),$1f
34871 +#else
34872 + jmp 1f+__PAGE_OFFSET
34873 +#endif
34874 1:
34875
34876 /*
34877 * 9. Balance the stack. And because EAX contain the return value,
34878 * we'd better not clobber it.
34879 */
34880 - leal efi_rt_function_ptr, %edx
34881 - movl (%edx), %ecx
34882 - pushl %ecx
34883 + pushl (efi_rt_function_ptr)
34884
34885 /*
34886 - * 10. Push the saved return address onto the stack and return.
34887 + * 10. Return to the saved return address.
34888 */
34889 - leal saved_return_addr, %edx
34890 - movl (%edx), %ecx
34891 - pushl %ecx
34892 - ret
34893 + jmpl *(saved_return_addr)
34894 ENDPROC(efi_call_phys)
34895 .previous
34896
34897 -.data
34898 +__INITDATA
34899 saved_return_addr:
34900 .long 0
34901 efi_rt_function_ptr:
34902 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34903 index 5fcda72..cd4dc41 100644
34904 --- a/arch/x86/platform/efi/efi_stub_64.S
34905 +++ b/arch/x86/platform/efi/efi_stub_64.S
34906 @@ -11,6 +11,7 @@
34907 #include <asm/msr.h>
34908 #include <asm/processor-flags.h>
34909 #include <asm/page_types.h>
34910 +#include <asm/alternative-asm.h>
34911
34912 #define SAVE_XMM \
34913 mov %rsp, %rax; \
34914 @@ -88,6 +89,7 @@ ENTRY(efi_call)
34915 RESTORE_PGT
34916 addq $48, %rsp
34917 RESTORE_XMM
34918 + pax_force_retaddr 0, 1
34919 ret
34920 ENDPROC(efi_call)
34921
34922 @@ -245,8 +247,8 @@ efi_gdt64:
34923 .long 0 /* Filled out by user */
34924 .word 0
34925 .quad 0x0000000000000000 /* NULL descriptor */
34926 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
34927 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
34928 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
34929 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
34930 .quad 0x0080890000000000 /* TS descriptor */
34931 .quad 0x0000000000000000 /* TS continued */
34932 efi_gdt64_end:
34933 diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34934 index 1bbedc4..eb795b5 100644
34935 --- a/arch/x86/platform/intel-mid/intel-mid.c
34936 +++ b/arch/x86/platform/intel-mid/intel-mid.c
34937 @@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34938 {
34939 };
34940
34941 -static void intel_mid_reboot(void)
34942 +static void __noreturn intel_mid_reboot(void)
34943 {
34944 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34945 + BUG();
34946 }
34947
34948 static unsigned long __init intel_mid_calibrate_tsc(void)
34949 diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34950 index 3c1c386..59a68ed 100644
34951 --- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34952 +++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34953 @@ -13,6 +13,6 @@
34954 /* For every CPU addition a new get_<cpuname>_ops interface needs
34955 * to be added.
34956 */
34957 -extern void *get_penwell_ops(void);
34958 -extern void *get_cloverview_ops(void);
34959 -extern void *get_tangier_ops(void);
34960 +extern const void *get_penwell_ops(void);
34961 +extern const void *get_cloverview_ops(void);
34962 +extern const void *get_tangier_ops(void);
34963 diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
34964 index 23381d2..8ddc10e 100644
34965 --- a/arch/x86/platform/intel-mid/mfld.c
34966 +++ b/arch/x86/platform/intel-mid/mfld.c
34967 @@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
34968 pm_power_off = mfld_power_off;
34969 }
34970
34971 -void *get_penwell_ops(void)
34972 +const void *get_penwell_ops(void)
34973 {
34974 return &penwell_ops;
34975 }
34976
34977 -void *get_cloverview_ops(void)
34978 +const void *get_cloverview_ops(void)
34979 {
34980 return &penwell_ops;
34981 }
34982 diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
34983 index aaca917..66eadbc 100644
34984 --- a/arch/x86/platform/intel-mid/mrfl.c
34985 +++ b/arch/x86/platform/intel-mid/mrfl.c
34986 @@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
34987 .arch_setup = tangier_arch_setup,
34988 };
34989
34990 -void *get_tangier_ops(void)
34991 +const void *get_tangier_ops(void)
34992 {
34993 return &tangier_ops;
34994 }
34995 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34996 index d6ee929..3637cb5 100644
34997 --- a/arch/x86/platform/olpc/olpc_dt.c
34998 +++ b/arch/x86/platform/olpc/olpc_dt.c
34999 @@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35000 return res;
35001 }
35002
35003 -static struct of_pdt_ops prom_olpc_ops __initdata = {
35004 +static struct of_pdt_ops prom_olpc_ops __initconst = {
35005 .nextprop = olpc_dt_nextprop,
35006 .getproplen = olpc_dt_getproplen,
35007 .getproperty = olpc_dt_getproperty,
35008 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35009 index 6ec7910..ecdbb11 100644
35010 --- a/arch/x86/power/cpu.c
35011 +++ b/arch/x86/power/cpu.c
35012 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
35013 static void fix_processor_context(void)
35014 {
35015 int cpu = smp_processor_id();
35016 - struct tss_struct *t = &per_cpu(init_tss, cpu);
35017 -#ifdef CONFIG_X86_64
35018 - struct desc_struct *desc = get_cpu_gdt_table(cpu);
35019 - tss_desc tss;
35020 -#endif
35021 + struct tss_struct *t = init_tss + cpu;
35022 +
35023 set_tss_desc(cpu, t); /*
35024 * This just modifies memory; should not be
35025 * necessary. But... This is necessary, because
35026 @@ -150,10 +147,6 @@ static void fix_processor_context(void)
35027 */
35028
35029 #ifdef CONFIG_X86_64
35030 - memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35031 - tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35032 - write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35033 -
35034 syscall_init(); /* This sets MSR_*STAR and related */
35035 #endif
35036 load_TR_desc(); /* This does ltr */
35037 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35038 index bad628a..a102610 100644
35039 --- a/arch/x86/realmode/init.c
35040 +++ b/arch/x86/realmode/init.c
35041 @@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35042 __va(real_mode_header->trampoline_header);
35043
35044 #ifdef CONFIG_X86_32
35045 - trampoline_header->start = __pa_symbol(startup_32_smp);
35046 + trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35047 +
35048 +#ifdef CONFIG_PAX_KERNEXEC
35049 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35050 +#endif
35051 +
35052 + trampoline_header->boot_cs = __BOOT_CS;
35053 trampoline_header->gdt_limit = __BOOT_DS + 7;
35054 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35055 #else
35056 @@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35057 *trampoline_cr4_features = read_cr4();
35058
35059 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35060 - trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35061 + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35062 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35063 #endif
35064 }
35065 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35066 index 7c0d7be..d24dc88 100644
35067 --- a/arch/x86/realmode/rm/Makefile
35068 +++ b/arch/x86/realmode/rm/Makefile
35069 @@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35070
35071 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35072 -I$(srctree)/arch/x86/boot
35073 +ifdef CONSTIFY_PLUGIN
35074 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35075 +endif
35076 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35077 GCOV_PROFILE := n
35078 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35079 index a28221d..93c40f1 100644
35080 --- a/arch/x86/realmode/rm/header.S
35081 +++ b/arch/x86/realmode/rm/header.S
35082 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35083 #endif
35084 /* APM/BIOS reboot */
35085 .long pa_machine_real_restart_asm
35086 -#ifdef CONFIG_X86_64
35087 +#ifdef CONFIG_X86_32
35088 + .long __KERNEL_CS
35089 +#else
35090 .long __KERNEL32_CS
35091 #endif
35092 END(real_mode_header)
35093 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35094 index 48ddd76..c26749f 100644
35095 --- a/arch/x86/realmode/rm/trampoline_32.S
35096 +++ b/arch/x86/realmode/rm/trampoline_32.S
35097 @@ -24,6 +24,12 @@
35098 #include <asm/page_types.h>
35099 #include "realmode.h"
35100
35101 +#ifdef CONFIG_PAX_KERNEXEC
35102 +#define ta(X) (X)
35103 +#else
35104 +#define ta(X) (pa_ ## X)
35105 +#endif
35106 +
35107 .text
35108 .code16
35109
35110 @@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35111
35112 cli # We should be safe anyway
35113
35114 - movl tr_start, %eax # where we need to go
35115 -
35116 movl $0xA5A5A5A5, trampoline_status
35117 # write marker for master knows we're running
35118
35119 @@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35120 movw $1, %dx # protected mode (PE) bit
35121 lmsw %dx # into protected mode
35122
35123 - ljmpl $__BOOT_CS, $pa_startup_32
35124 + ljmpl *(trampoline_header)
35125
35126 .section ".text32","ax"
35127 .code32
35128 @@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35129 .balign 8
35130 GLOBAL(trampoline_header)
35131 tr_start: .space 4
35132 - tr_gdt_pad: .space 2
35133 + tr_boot_cs: .space 2
35134 tr_gdt: .space 6
35135 END(trampoline_header)
35136
35137 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35138 index dac7b20..72dbaca 100644
35139 --- a/arch/x86/realmode/rm/trampoline_64.S
35140 +++ b/arch/x86/realmode/rm/trampoline_64.S
35141 @@ -93,6 +93,7 @@ ENTRY(startup_32)
35142 movl %edx, %gs
35143
35144 movl pa_tr_cr4, %eax
35145 + andl $~X86_CR4_PCIDE, %eax
35146 movl %eax, %cr4 # Enable PAE mode
35147
35148 # Setup trampoline 4 level pagetables
35149 @@ -106,7 +107,7 @@ ENTRY(startup_32)
35150 wrmsr
35151
35152 # Enable paging and in turn activate Long Mode
35153 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35154 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
35155 movl %eax, %cr0
35156
35157 /*
35158 diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35159 index 9e7e147..25a4158 100644
35160 --- a/arch/x86/realmode/rm/wakeup_asm.S
35161 +++ b/arch/x86/realmode/rm/wakeup_asm.S
35162 @@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35163 lgdtl pmode_gdt
35164
35165 /* This really couldn't... */
35166 - movl pmode_entry, %eax
35167 movl pmode_cr0, %ecx
35168 movl %ecx, %cr0
35169 - ljmpl $__KERNEL_CS, $pa_startup_32
35170 - /* -> jmp *%eax in trampoline_32.S */
35171 +
35172 + ljmpl *pmode_entry
35173 #else
35174 jmp trampoline_start
35175 #endif
35176 diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35177 index 604a37e..e49702a 100644
35178 --- a/arch/x86/tools/Makefile
35179 +++ b/arch/x86/tools/Makefile
35180 @@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35181
35182 $(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
35183
35184 -HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35185 +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35186 hostprogs-y += relocs
35187 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35188 PHONY += relocs
35189 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35190 index a5efb21..97490e9 100644
35191 --- a/arch/x86/tools/relocs.c
35192 +++ b/arch/x86/tools/relocs.c
35193 @@ -1,5 +1,7 @@
35194 /* This is included from relocs_32/64.c */
35195
35196 +#include "../../../include/generated/autoconf.h"
35197 +
35198 #define ElfW(type) _ElfW(ELF_BITS, type)
35199 #define _ElfW(bits, type) __ElfW(bits, type)
35200 #define __ElfW(bits, type) Elf##bits##_##type
35201 @@ -11,6 +13,7 @@
35202 #define Elf_Sym ElfW(Sym)
35203
35204 static Elf_Ehdr ehdr;
35205 +static Elf_Phdr *phdr;
35206
35207 struct relocs {
35208 uint32_t *offset;
35209 @@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35210 }
35211 }
35212
35213 +static void read_phdrs(FILE *fp)
35214 +{
35215 + unsigned int i;
35216 +
35217 + phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35218 + if (!phdr) {
35219 + die("Unable to allocate %d program headers\n",
35220 + ehdr.e_phnum);
35221 + }
35222 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35223 + die("Seek to %d failed: %s\n",
35224 + ehdr.e_phoff, strerror(errno));
35225 + }
35226 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35227 + die("Cannot read ELF program headers: %s\n",
35228 + strerror(errno));
35229 + }
35230 + for(i = 0; i < ehdr.e_phnum; i++) {
35231 + phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35232 + phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35233 + phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35234 + phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35235 + phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35236 + phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35237 + phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35238 + phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35239 + }
35240 +
35241 +}
35242 +
35243 static void read_shdrs(FILE *fp)
35244 {
35245 - int i;
35246 + unsigned int i;
35247 Elf_Shdr shdr;
35248
35249 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35250 @@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35251
35252 static void read_strtabs(FILE *fp)
35253 {
35254 - int i;
35255 + unsigned int i;
35256 for (i = 0; i < ehdr.e_shnum; i++) {
35257 struct section *sec = &secs[i];
35258 if (sec->shdr.sh_type != SHT_STRTAB) {
35259 @@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35260
35261 static void read_symtabs(FILE *fp)
35262 {
35263 - int i,j;
35264 + unsigned int i,j;
35265 for (i = 0; i < ehdr.e_shnum; i++) {
35266 struct section *sec = &secs[i];
35267 if (sec->shdr.sh_type != SHT_SYMTAB) {
35268 @@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35269 }
35270
35271
35272 -static void read_relocs(FILE *fp)
35273 +static void read_relocs(FILE *fp, int use_real_mode)
35274 {
35275 - int i,j;
35276 + unsigned int i,j;
35277 + uint32_t base;
35278 +
35279 for (i = 0; i < ehdr.e_shnum; i++) {
35280 struct section *sec = &secs[i];
35281 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35282 @@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35283 die("Cannot read symbol table: %s\n",
35284 strerror(errno));
35285 }
35286 + base = 0;
35287 +
35288 +#ifdef CONFIG_X86_32
35289 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35290 + if (phdr[j].p_type != PT_LOAD )
35291 + continue;
35292 + 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)
35293 + continue;
35294 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35295 + break;
35296 + }
35297 +#endif
35298 +
35299 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35300 Elf_Rel *rel = &sec->reltab[j];
35301 - rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35302 + rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35303 rel->r_info = elf_xword_to_cpu(rel->r_info);
35304 #if (SHT_REL_TYPE == SHT_RELA)
35305 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35306 @@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35307
35308 static void print_absolute_symbols(void)
35309 {
35310 - int i;
35311 + unsigned int i;
35312 const char *format;
35313
35314 if (ELF_BITS == 64)
35315 @@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35316 for (i = 0; i < ehdr.e_shnum; i++) {
35317 struct section *sec = &secs[i];
35318 char *sym_strtab;
35319 - int j;
35320 + unsigned int j;
35321
35322 if (sec->shdr.sh_type != SHT_SYMTAB) {
35323 continue;
35324 @@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35325
35326 static void print_absolute_relocs(void)
35327 {
35328 - int i, printed = 0;
35329 + unsigned int i, printed = 0;
35330 const char *format;
35331
35332 if (ELF_BITS == 64)
35333 @@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35334 struct section *sec_applies, *sec_symtab;
35335 char *sym_strtab;
35336 Elf_Sym *sh_symtab;
35337 - int j;
35338 + unsigned int j;
35339 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35340 continue;
35341 }
35342 @@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35343 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35344 Elf_Sym *sym, const char *symname))
35345 {
35346 - int i;
35347 + unsigned int i;
35348 /* Walk through the relocations */
35349 for (i = 0; i < ehdr.e_shnum; i++) {
35350 char *sym_strtab;
35351 Elf_Sym *sh_symtab;
35352 struct section *sec_applies, *sec_symtab;
35353 - int j;
35354 + unsigned int j;
35355 struct section *sec = &secs[i];
35356
35357 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35358 @@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35359 {
35360 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35361 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35362 + char *sym_strtab = sec->link->link->strtab;
35363 +
35364 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35365 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35366 + return 0;
35367 +
35368 +#ifdef CONFIG_PAX_KERNEXEC
35369 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35370 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35371 + return 0;
35372 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35373 + return 0;
35374 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35375 + return 0;
35376 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35377 + return 0;
35378 +#endif
35379
35380 switch (r_type) {
35381 case R_386_NONE:
35382 @@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35383
35384 static void emit_relocs(int as_text, int use_real_mode)
35385 {
35386 - int i;
35387 + unsigned int i;
35388 int (*write_reloc)(uint32_t, FILE *) = write32;
35389 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35390 const char *symname);
35391 @@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35392 {
35393 regex_init(use_real_mode);
35394 read_ehdr(fp);
35395 + read_phdrs(fp);
35396 read_shdrs(fp);
35397 read_strtabs(fp);
35398 read_symtabs(fp);
35399 - read_relocs(fp);
35400 + read_relocs(fp, use_real_mode);
35401 if (ELF_BITS == 64)
35402 percpu_init();
35403 if (show_absolute_syms) {
35404 diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35405 index f40281e..92728c9 100644
35406 --- a/arch/x86/um/mem_32.c
35407 +++ b/arch/x86/um/mem_32.c
35408 @@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35409 gate_vma.vm_start = FIXADDR_USER_START;
35410 gate_vma.vm_end = FIXADDR_USER_END;
35411 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35412 - gate_vma.vm_page_prot = __P101;
35413 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35414
35415 return 0;
35416 }
35417 diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35418 index 80ffa5b..a33bd15 100644
35419 --- a/arch/x86/um/tls_32.c
35420 +++ b/arch/x86/um/tls_32.c
35421 @@ -260,7 +260,7 @@ out:
35422 if (unlikely(task == current &&
35423 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35424 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35425 - "without flushed TLS.", current->pid);
35426 + "without flushed TLS.", task_pid_nr(current));
35427 }
35428
35429 return 0;
35430 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35431 index 5a4affe..9e2d522 100644
35432 --- a/arch/x86/vdso/Makefile
35433 +++ b/arch/x86/vdso/Makefile
35434 @@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35435 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35436 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35437
35438 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35439 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35440 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35441 GCOV_PROFILE := n
35442
35443 diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35444 index 0224987..c7d65a5 100644
35445 --- a/arch/x86/vdso/vdso2c.h
35446 +++ b/arch/x86/vdso/vdso2c.h
35447 @@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35448 unsigned long load_size = -1; /* Work around bogus warning */
35449 unsigned long mapping_size;
35450 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35451 - int i;
35452 + unsigned int i;
35453 unsigned long j;
35454 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35455 *alt_sec = NULL;
35456 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35457 index e904c27..b9eaa03 100644
35458 --- a/arch/x86/vdso/vdso32-setup.c
35459 +++ b/arch/x86/vdso/vdso32-setup.c
35460 @@ -14,6 +14,7 @@
35461 #include <asm/cpufeature.h>
35462 #include <asm/processor.h>
35463 #include <asm/vdso.h>
35464 +#include <asm/mman.h>
35465
35466 #ifdef CONFIG_COMPAT_VDSO
35467 #define VDSO_DEFAULT 0
35468 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35469 index 970463b..da82d3e 100644
35470 --- a/arch/x86/vdso/vma.c
35471 +++ b/arch/x86/vdso/vma.c
35472 @@ -16,10 +16,9 @@
35473 #include <asm/vdso.h>
35474 #include <asm/page.h>
35475 #include <asm/hpet.h>
35476 +#include <asm/mman.h>
35477
35478 #if defined(CONFIG_X86_64)
35479 -unsigned int __read_mostly vdso64_enabled = 1;
35480 -
35481 extern unsigned short vdso_sync_cpuid;
35482 #endif
35483
35484 @@ -101,6 +100,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35485 .pages = no_pages,
35486 };
35487
35488 +#ifdef CONFIG_PAX_RANDMMAP
35489 + if (mm->pax_flags & MF_PAX_RANDMMAP)
35490 + calculate_addr = false;
35491 +#endif
35492 +
35493 if (calculate_addr) {
35494 addr = vdso_addr(current->mm->start_stack,
35495 image->size - image->sym_vvar_start);
35496 @@ -111,14 +115,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35497 down_write(&mm->mmap_sem);
35498
35499 addr = get_unmapped_area(NULL, addr,
35500 - image->size - image->sym_vvar_start, 0, 0);
35501 + image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35502 if (IS_ERR_VALUE(addr)) {
35503 ret = addr;
35504 goto up_fail;
35505 }
35506
35507 text_start = addr - image->sym_vvar_start;
35508 - current->mm->context.vdso = (void __user *)text_start;
35509 + mm->context.vdso = text_start;
35510
35511 /*
35512 * MAYWRITE to allow gdb to COW and set breakpoints
35513 @@ -163,15 +167,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35514 hpet_address >> PAGE_SHIFT,
35515 PAGE_SIZE,
35516 pgprot_noncached(PAGE_READONLY));
35517 -
35518 - if (ret)
35519 - goto up_fail;
35520 }
35521 #endif
35522
35523 up_fail:
35524 if (ret)
35525 - current->mm->context.vdso = NULL;
35526 + current->mm->context.vdso = 0;
35527
35528 up_write(&mm->mmap_sem);
35529 return ret;
35530 @@ -191,8 +192,8 @@ static int load_vdso32(void)
35531
35532 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35533 current_thread_info()->sysenter_return =
35534 - current->mm->context.vdso +
35535 - selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35536 + (void __force_user *)(current->mm->context.vdso +
35537 + selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35538
35539 return 0;
35540 }
35541 @@ -201,9 +202,6 @@ static int load_vdso32(void)
35542 #ifdef CONFIG_X86_64
35543 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35544 {
35545 - if (!vdso64_enabled)
35546 - return 0;
35547 -
35548 return map_vdso(&vdso_image_64, true);
35549 }
35550
35551 @@ -212,12 +210,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35552 int uses_interp)
35553 {
35554 #ifdef CONFIG_X86_X32_ABI
35555 - if (test_thread_flag(TIF_X32)) {
35556 - if (!vdso64_enabled)
35557 - return 0;
35558 -
35559 + if (test_thread_flag(TIF_X32))
35560 return map_vdso(&vdso_image_x32, true);
35561 - }
35562 #endif
35563
35564 return load_vdso32();
35565 @@ -229,12 +223,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35566 return load_vdso32();
35567 }
35568 #endif
35569 -
35570 -#ifdef CONFIG_X86_64
35571 -static __init int vdso_setup(char *s)
35572 -{
35573 - vdso64_enabled = simple_strtoul(s, NULL, 0);
35574 - return 0;
35575 -}
35576 -__setup("vdso=", vdso_setup);
35577 -#endif
35578 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35579 index e88fda8..76ce7ce 100644
35580 --- a/arch/x86/xen/Kconfig
35581 +++ b/arch/x86/xen/Kconfig
35582 @@ -9,6 +9,7 @@ config XEN
35583 select XEN_HAVE_PVMMU
35584 depends on X86_64 || (X86_32 && X86_PAE)
35585 depends on X86_TSC
35586 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35587 help
35588 This is the Linux Xen port. Enabling this will allow the
35589 kernel to boot in a paravirtualized environment under the
35590 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35591 index fac5e4f..5b5cf4f 100644
35592 --- a/arch/x86/xen/enlighten.c
35593 +++ b/arch/x86/xen/enlighten.c
35594 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35595
35596 struct shared_info xen_dummy_shared_info;
35597
35598 -void *xen_initial_gdt;
35599 -
35600 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35601 __read_mostly int xen_have_vector_callback;
35602 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35603 @@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35604 {
35605 unsigned long va = dtr->address;
35606 unsigned int size = dtr->size + 1;
35607 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35608 - unsigned long frames[pages];
35609 + unsigned long frames[65536 / PAGE_SIZE];
35610 int f;
35611
35612 /*
35613 @@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35614 {
35615 unsigned long va = dtr->address;
35616 unsigned int size = dtr->size + 1;
35617 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35618 - unsigned long frames[pages];
35619 + unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35620 int f;
35621
35622 /*
35623 @@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35624 * 8-byte entries, or 16 4k pages..
35625 */
35626
35627 - BUG_ON(size > 65536);
35628 + BUG_ON(size > GDT_SIZE);
35629 BUG_ON(va & ~PAGE_MASK);
35630
35631 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35632 @@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35633 return 0;
35634 }
35635
35636 -static void set_xen_basic_apic_ops(void)
35637 +static void __init set_xen_basic_apic_ops(void)
35638 {
35639 apic->read = xen_apic_read;
35640 apic->write = xen_apic_write;
35641 @@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35642 #endif
35643 };
35644
35645 -static void xen_reboot(int reason)
35646 +static __noreturn void xen_reboot(int reason)
35647 {
35648 struct sched_shutdown r = { .reason = reason };
35649
35650 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35651 - BUG();
35652 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35653 + BUG();
35654 }
35655
35656 -static void xen_restart(char *msg)
35657 +static __noreturn void xen_restart(char *msg)
35658 {
35659 xen_reboot(SHUTDOWN_reboot);
35660 }
35661
35662 -static void xen_emergency_restart(void)
35663 +static __noreturn void xen_emergency_restart(void)
35664 {
35665 xen_reboot(SHUTDOWN_reboot);
35666 }
35667
35668 -static void xen_machine_halt(void)
35669 +static __noreturn void xen_machine_halt(void)
35670 {
35671 xen_reboot(SHUTDOWN_poweroff);
35672 }
35673
35674 -static void xen_machine_power_off(void)
35675 +static __noreturn void xen_machine_power_off(void)
35676 {
35677 if (pm_power_off)
35678 pm_power_off();
35679 @@ -1573,7 +1569,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35680 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35681
35682 /* Work out if we support NX */
35683 - x86_configure_nx();
35684 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35685 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35686 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35687 + unsigned l, h;
35688 +
35689 + __supported_pte_mask |= _PAGE_NX;
35690 + rdmsr(MSR_EFER, l, h);
35691 + l |= EFER_NX;
35692 + wrmsr(MSR_EFER, l, h);
35693 + }
35694 +#endif
35695
35696 /* Get mfn list */
35697 xen_build_dynamic_phys_to_machine();
35698 @@ -1601,13 +1607,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35699
35700 machine_ops = xen_machine_ops;
35701
35702 - /*
35703 - * The only reliable way to retain the initial address of the
35704 - * percpu gdt_page is to remember it here, so we can go and
35705 - * mark it RW later, when the initial percpu area is freed.
35706 - */
35707 - xen_initial_gdt = &per_cpu(gdt_page, 0);
35708 -
35709 xen_smp_init();
35710
35711 #ifdef CONFIG_ACPI_NUMA
35712 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35713 index a8a1a3d..8216142 100644
35714 --- a/arch/x86/xen/mmu.c
35715 +++ b/arch/x86/xen/mmu.c
35716 @@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35717 return val;
35718 }
35719
35720 -static pteval_t pte_pfn_to_mfn(pteval_t val)
35721 +static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35722 {
35723 if (val & _PAGE_PRESENT) {
35724 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35725 @@ -1867,7 +1867,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35726 * L3_k[511] -> level2_fixmap_pgt */
35727 convert_pfn_mfn(level3_kernel_pgt);
35728
35729 + convert_pfn_mfn(level3_vmalloc_start_pgt);
35730 + convert_pfn_mfn(level3_vmalloc_end_pgt);
35731 + convert_pfn_mfn(level3_vmemmap_pgt);
35732 /* L3_k[511][506] -> level1_fixmap_pgt */
35733 + /* L3_k[511][507] -> level1_vsyscall_pgt */
35734 convert_pfn_mfn(level2_fixmap_pgt);
35735 }
35736 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35737 @@ -1892,11 +1896,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35738 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35739 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35740 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35741 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35742 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35743 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35744 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35745 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35746 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35747 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35748 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35749 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35750 + set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35751
35752 /* Pin down new L4 */
35753 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35754 @@ -2080,6 +2089,7 @@ static void __init xen_post_allocator_init(void)
35755 pv_mmu_ops.set_pud = xen_set_pud;
35756 #if PAGETABLE_LEVELS == 4
35757 pv_mmu_ops.set_pgd = xen_set_pgd;
35758 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35759 #endif
35760
35761 /* This will work as long as patching hasn't happened yet
35762 @@ -2158,6 +2168,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35763 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35764 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35765 .set_pgd = xen_set_pgd_hyper,
35766 + .set_pgd_batched = xen_set_pgd_hyper,
35767
35768 .alloc_pud = xen_alloc_pmd_init,
35769 .release_pud = xen_release_pmd_init,
35770 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35771 index 4c071ae..00e7049 100644
35772 --- a/arch/x86/xen/smp.c
35773 +++ b/arch/x86/xen/smp.c
35774 @@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35775
35776 if (xen_pv_domain()) {
35777 if (!xen_feature(XENFEAT_writable_page_tables))
35778 - /* We've switched to the "real" per-cpu gdt, so make
35779 - * sure the old memory can be recycled. */
35780 - make_lowmem_page_readwrite(xen_initial_gdt);
35781 -
35782 #ifdef CONFIG_X86_32
35783 /*
35784 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35785 * expects __USER_DS
35786 */
35787 - loadsegment(ds, __USER_DS);
35788 - loadsegment(es, __USER_DS);
35789 + loadsegment(ds, __KERNEL_DS);
35790 + loadsegment(es, __KERNEL_DS);
35791 #endif
35792
35793 xen_filter_cpu_maps();
35794 @@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35795 #ifdef CONFIG_X86_32
35796 /* Note: PVH is not yet supported on x86_32. */
35797 ctxt->user_regs.fs = __KERNEL_PERCPU;
35798 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35799 + savesegment(gs, ctxt->user_regs.gs);
35800 #endif
35801 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35802
35803 @@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35804 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35805 ctxt->flags = VGCF_IN_KERNEL;
35806 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35807 - ctxt->user_regs.ds = __USER_DS;
35808 - ctxt->user_regs.es = __USER_DS;
35809 + ctxt->user_regs.ds = __KERNEL_DS;
35810 + ctxt->user_regs.es = __KERNEL_DS;
35811 ctxt->user_regs.ss = __KERNEL_DS;
35812
35813 xen_copy_trap_info(ctxt->trap_ctxt);
35814 @@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35815 int rc;
35816
35817 per_cpu(current_task, cpu) = idle;
35818 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
35819 #ifdef CONFIG_X86_32
35820 irq_ctx_init(cpu);
35821 #else
35822 clear_tsk_thread_flag(idle, TIF_FORK);
35823 #endif
35824 - per_cpu(kernel_stack, cpu) =
35825 - (unsigned long)task_stack_page(idle) -
35826 - KERNEL_STACK_OFFSET + THREAD_SIZE;
35827 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35828
35829 xen_setup_runstate_info(cpu);
35830 xen_setup_timer(cpu);
35831 @@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35832
35833 void __init xen_smp_init(void)
35834 {
35835 - smp_ops = xen_smp_ops;
35836 + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35837 xen_fill_possible_map();
35838 }
35839
35840 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35841 index fd92a64..1f72641 100644
35842 --- a/arch/x86/xen/xen-asm_32.S
35843 +++ b/arch/x86/xen/xen-asm_32.S
35844 @@ -99,7 +99,7 @@ ENTRY(xen_iret)
35845 pushw %fs
35846 movl $(__KERNEL_PERCPU), %eax
35847 movl %eax, %fs
35848 - movl %fs:xen_vcpu, %eax
35849 + mov PER_CPU_VAR(xen_vcpu), %eax
35850 POP_FS
35851 #else
35852 movl %ss:xen_vcpu, %eax
35853 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35854 index 674b2225..f1f5dc1 100644
35855 --- a/arch/x86/xen/xen-head.S
35856 +++ b/arch/x86/xen/xen-head.S
35857 @@ -39,6 +39,17 @@ ENTRY(startup_xen)
35858 #ifdef CONFIG_X86_32
35859 mov %esi,xen_start_info
35860 mov $init_thread_union+THREAD_SIZE,%esp
35861 +#ifdef CONFIG_SMP
35862 + movl $cpu_gdt_table,%edi
35863 + movl $__per_cpu_load,%eax
35864 + movw %ax,__KERNEL_PERCPU + 2(%edi)
35865 + rorl $16,%eax
35866 + movb %al,__KERNEL_PERCPU + 4(%edi)
35867 + movb %ah,__KERNEL_PERCPU + 7(%edi)
35868 + movl $__per_cpu_end - 1,%eax
35869 + subl $__per_cpu_start,%eax
35870 + movw %ax,__KERNEL_PERCPU + 0(%edi)
35871 +#endif
35872 #else
35873 mov %rsi,xen_start_info
35874 mov $init_thread_union+THREAD_SIZE,%rsp
35875 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35876 index 28c7e0b..2acfec7 100644
35877 --- a/arch/x86/xen/xen-ops.h
35878 +++ b/arch/x86/xen/xen-ops.h
35879 @@ -10,8 +10,6 @@
35880 extern const char xen_hypervisor_callback[];
35881 extern const char xen_failsafe_callback[];
35882
35883 -extern void *xen_initial_gdt;
35884 -
35885 struct trap_info;
35886 void xen_copy_trap_info(struct trap_info *traps);
35887
35888 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35889 index 525bd3d..ef888b1 100644
35890 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
35891 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35892 @@ -119,9 +119,9 @@
35893 ----------------------------------------------------------------------*/
35894
35895 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35896 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35897 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35898 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35899 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35900
35901 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35902 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35903 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35904 index 2f33760..835e50a 100644
35905 --- a/arch/xtensa/variants/fsf/include/variant/core.h
35906 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
35907 @@ -11,6 +11,7 @@
35908 #ifndef _XTENSA_CORE_H
35909 #define _XTENSA_CORE_H
35910
35911 +#include <linux/const.h>
35912
35913 /****************************************************************************
35914 Parameters Useful for Any Code, USER or PRIVILEGED
35915 @@ -112,9 +113,9 @@
35916 ----------------------------------------------------------------------*/
35917
35918 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35919 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35920 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35921 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35922 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35923
35924 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35925 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35926 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35927 index af00795..2bb8105 100644
35928 --- a/arch/xtensa/variants/s6000/include/variant/core.h
35929 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
35930 @@ -11,6 +11,7 @@
35931 #ifndef _XTENSA_CORE_CONFIGURATION_H
35932 #define _XTENSA_CORE_CONFIGURATION_H
35933
35934 +#include <linux/const.h>
35935
35936 /****************************************************************************
35937 Parameters Useful for Any Code, USER or PRIVILEGED
35938 @@ -118,9 +119,9 @@
35939 ----------------------------------------------------------------------*/
35940
35941 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35942 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35943 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35944 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35945 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35946
35947 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35948 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35949 diff --git a/block/bio.c b/block/bio.c
35950 index 3e6e198..5c65199 100644
35951 --- a/block/bio.c
35952 +++ b/block/bio.c
35953 @@ -1163,7 +1163,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
35954 /*
35955 * Overflow, abort
35956 */
35957 - if (end < start)
35958 + if (end < start || end - start > INT_MAX - nr_pages)
35959 return ERR_PTR(-EINVAL);
35960
35961 nr_pages += end - start;
35962 @@ -1297,7 +1297,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
35963 /*
35964 * Overflow, abort
35965 */
35966 - if (end < start)
35967 + if (end < start || end - start > INT_MAX - nr_pages)
35968 return ERR_PTR(-EINVAL);
35969
35970 nr_pages += end - start;
35971 @@ -1559,7 +1559,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
35972 const int read = bio_data_dir(bio) == READ;
35973 struct bio_map_data *bmd = bio->bi_private;
35974 int i;
35975 - char *p = bmd->sgvecs[0].iov_base;
35976 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
35977
35978 bio_for_each_segment_all(bvec, bio, i) {
35979 char *addr = page_address(bvec->bv_page);
35980 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35981 index 0736729..2ec3b48 100644
35982 --- a/block/blk-iopoll.c
35983 +++ b/block/blk-iopoll.c
35984 @@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
35985 }
35986 EXPORT_SYMBOL(blk_iopoll_complete);
35987
35988 -static void blk_iopoll_softirq(struct softirq_action *h)
35989 +static __latent_entropy void blk_iopoll_softirq(void)
35990 {
35991 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
35992 int rearm = 0, budget = blk_iopoll_budget;
35993 diff --git a/block/blk-map.c b/block/blk-map.c
35994 index f890d43..97b0482 100644
35995 --- a/block/blk-map.c
35996 +++ b/block/blk-map.c
35997 @@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
35998 if (!len || !kbuf)
35999 return -EINVAL;
36000
36001 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36002 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36003 if (do_copy)
36004 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36005 else
36006 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36007 index 53b1737..08177d2e 100644
36008 --- a/block/blk-softirq.c
36009 +++ b/block/blk-softirq.c
36010 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36011 * Softirq action handler - move entries to local list and loop over them
36012 * while passing them to the queue registered handler.
36013 */
36014 -static void blk_done_softirq(struct softirq_action *h)
36015 +static __latent_entropy void blk_done_softirq(void)
36016 {
36017 struct list_head *cpu_list, local_list;
36018
36019 diff --git a/block/bsg.c b/block/bsg.c
36020 index 276e869..6fe4c61 100644
36021 --- a/block/bsg.c
36022 +++ b/block/bsg.c
36023 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36024 struct sg_io_v4 *hdr, struct bsg_device *bd,
36025 fmode_t has_write_perm)
36026 {
36027 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36028 + unsigned char *cmdptr;
36029 +
36030 if (hdr->request_len > BLK_MAX_CDB) {
36031 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36032 if (!rq->cmd)
36033 return -ENOMEM;
36034 - }
36035 + cmdptr = rq->cmd;
36036 + } else
36037 + cmdptr = tmpcmd;
36038
36039 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36040 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36041 hdr->request_len))
36042 return -EFAULT;
36043
36044 + if (cmdptr != rq->cmd)
36045 + memcpy(rq->cmd, cmdptr, hdr->request_len);
36046 +
36047 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36048 if (blk_verify_command(rq->cmd, has_write_perm))
36049 return -EPERM;
36050 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36051 index f678c73..f35aa18 100644
36052 --- a/block/compat_ioctl.c
36053 +++ b/block/compat_ioctl.c
36054 @@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36055 cgc = compat_alloc_user_space(sizeof(*cgc));
36056 cgc32 = compat_ptr(arg);
36057
36058 - if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36059 + if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36060 get_user(data, &cgc32->buffer) ||
36061 put_user(compat_ptr(data), &cgc->buffer) ||
36062 copy_in_user(&cgc->buflen, &cgc32->buflen,
36063 @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36064 err |= __get_user(f->spec1, &uf->spec1);
36065 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36066 err |= __get_user(name, &uf->name);
36067 - f->name = compat_ptr(name);
36068 + f->name = (void __force_kernel *)compat_ptr(name);
36069 if (err) {
36070 err = -EFAULT;
36071 goto out;
36072 diff --git a/block/genhd.c b/block/genhd.c
36073 index bd30606..bbc9b90 100644
36074 --- a/block/genhd.c
36075 +++ b/block/genhd.c
36076 @@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36077
36078 /*
36079 * Register device numbers dev..(dev+range-1)
36080 - * range must be nonzero
36081 + * Noop if @range is zero.
36082 * The hash chain is sorted on range, so that subranges can override.
36083 */
36084 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36085 struct kobject *(*probe)(dev_t, int *, void *),
36086 int (*lock)(dev_t, void *), void *data)
36087 {
36088 - kobj_map(bdev_map, devt, range, module, probe, lock, data);
36089 + if (range)
36090 + kobj_map(bdev_map, devt, range, module, probe, lock, data);
36091 }
36092
36093 EXPORT_SYMBOL(blk_register_region);
36094
36095 +/* undo blk_register_region(), noop if @range is zero */
36096 void blk_unregister_region(dev_t devt, unsigned long range)
36097 {
36098 - kobj_unmap(bdev_map, devt, range);
36099 + if (range)
36100 + kobj_unmap(bdev_map, devt, range);
36101 }
36102
36103 EXPORT_SYMBOL(blk_unregister_region);
36104 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36105 index 56d08fd..2e07090 100644
36106 --- a/block/partitions/efi.c
36107 +++ b/block/partitions/efi.c
36108 @@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36109 if (!gpt)
36110 return NULL;
36111
36112 + if (!le32_to_cpu(gpt->num_partition_entries))
36113 + return NULL;
36114 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36115 + if (!pte)
36116 + return NULL;
36117 +
36118 count = le32_to_cpu(gpt->num_partition_entries) *
36119 le32_to_cpu(gpt->sizeof_partition_entry);
36120 - if (!count)
36121 - return NULL;
36122 - pte = kmalloc(count, GFP_KERNEL);
36123 - if (!pte)
36124 - return NULL;
36125 -
36126 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36127 (u8 *) pte, count) < count) {
36128 kfree(pte);
36129 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36130 index b0c2a61..10bb6ec 100644
36131 --- a/block/scsi_ioctl.c
36132 +++ b/block/scsi_ioctl.c
36133 @@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36134 return put_user(0, p);
36135 }
36136
36137 -static int sg_get_timeout(struct request_queue *q)
36138 +static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36139 {
36140 return jiffies_to_clock_t(q->sg_timeout);
36141 }
36142 @@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36143 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36144 struct sg_io_hdr *hdr, fmode_t mode)
36145 {
36146 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36147 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36148 + unsigned char *cmdptr;
36149 +
36150 + if (rq->cmd != rq->__cmd)
36151 + cmdptr = rq->cmd;
36152 + else
36153 + cmdptr = tmpcmd;
36154 +
36155 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36156 return -EFAULT;
36157 +
36158 + if (cmdptr != rq->cmd)
36159 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36160 +
36161 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36162 return -EPERM;
36163
36164 @@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36165 int err;
36166 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36167 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36168 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36169 + unsigned char *cmdptr;
36170
36171 if (!sic)
36172 return -EINVAL;
36173 @@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36174 */
36175 err = -EFAULT;
36176 rq->cmd_len = cmdlen;
36177 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
36178 +
36179 + if (rq->cmd != rq->__cmd)
36180 + cmdptr = rq->cmd;
36181 + else
36182 + cmdptr = tmpcmd;
36183 +
36184 + if (copy_from_user(cmdptr, sic->data, cmdlen))
36185 goto error;
36186
36187 + if (rq->cmd != cmdptr)
36188 + memcpy(rq->cmd, cmdptr, cmdlen);
36189 +
36190 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36191 goto error;
36192
36193 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36194 index e592c90..c566114 100644
36195 --- a/crypto/cryptd.c
36196 +++ b/crypto/cryptd.c
36197 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36198
36199 struct cryptd_blkcipher_request_ctx {
36200 crypto_completion_t complete;
36201 -};
36202 +} __no_const;
36203
36204 struct cryptd_hash_ctx {
36205 struct crypto_shash *child;
36206 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36207
36208 struct cryptd_aead_request_ctx {
36209 crypto_completion_t complete;
36210 -};
36211 +} __no_const;
36212
36213 static void cryptd_queue_worker(struct work_struct *work);
36214
36215 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36216 index 309d345..1632720 100644
36217 --- a/crypto/pcrypt.c
36218 +++ b/crypto/pcrypt.c
36219 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36220 int ret;
36221
36222 pinst->kobj.kset = pcrypt_kset;
36223 - ret = kobject_add(&pinst->kobj, NULL, name);
36224 + ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36225 if (!ret)
36226 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36227
36228 diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36229 index 6921c7f..78e1af7 100644
36230 --- a/drivers/acpi/acpica/hwxfsleep.c
36231 +++ b/drivers/acpi/acpica/hwxfsleep.c
36232 @@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36233 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36234
36235 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36236 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36237 - acpi_hw_extended_sleep},
36238 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36239 - acpi_hw_extended_wake_prep},
36240 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36241 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36242 + .extended_function = acpi_hw_extended_sleep},
36243 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36244 + .extended_function = acpi_hw_extended_wake_prep},
36245 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36246 + .extended_function = acpi_hw_extended_wake}
36247 };
36248
36249 /*
36250 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36251 index 16129c7..8b675cd 100644
36252 --- a/drivers/acpi/apei/apei-internal.h
36253 +++ b/drivers/acpi/apei/apei-internal.h
36254 @@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36255 struct apei_exec_ins_type {
36256 u32 flags;
36257 apei_exec_ins_func_t run;
36258 -};
36259 +} __do_const;
36260
36261 struct apei_exec_context {
36262 u32 ip;
36263 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36264 index fc5f780..e5ac91a 100644
36265 --- a/drivers/acpi/apei/ghes.c
36266 +++ b/drivers/acpi/apei/ghes.c
36267 @@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36268 const struct acpi_hest_generic *generic,
36269 const struct acpi_hest_generic_status *estatus)
36270 {
36271 - static atomic_t seqno;
36272 + static atomic_unchecked_t seqno;
36273 unsigned int curr_seqno;
36274 char pfx_seq[64];
36275
36276 @@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36277 else
36278 pfx = KERN_ERR;
36279 }
36280 - curr_seqno = atomic_inc_return(&seqno);
36281 + curr_seqno = atomic_inc_return_unchecked(&seqno);
36282 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36283 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36284 pfx_seq, generic->header.source_id);
36285 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36286 index a83e3c6..c3d617f 100644
36287 --- a/drivers/acpi/bgrt.c
36288 +++ b/drivers/acpi/bgrt.c
36289 @@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36290 if (!bgrt_image)
36291 return -ENODEV;
36292
36293 - bin_attr_image.private = bgrt_image;
36294 - bin_attr_image.size = bgrt_image_size;
36295 + pax_open_kernel();
36296 + *(void **)&bin_attr_image.private = bgrt_image;
36297 + *(size_t *)&bin_attr_image.size = bgrt_image_size;
36298 + pax_close_kernel();
36299
36300 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36301 if (!bgrt_kobj)
36302 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36303 index 7556e7c..89a96bd 100644
36304 --- a/drivers/acpi/blacklist.c
36305 +++ b/drivers/acpi/blacklist.c
36306 @@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36307 u32 is_critical_error;
36308 };
36309
36310 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36311 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36312
36313 /*
36314 * POLICY: If *anything* doesn't work, put it on the blacklist.
36315 @@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36316 return 0;
36317 }
36318
36319 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36320 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36321 {
36322 .callback = dmi_disable_osi_vista,
36323 .ident = "Fujitsu Siemens",
36324 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36325 index c68e724..e863008 100644
36326 --- a/drivers/acpi/custom_method.c
36327 +++ b/drivers/acpi/custom_method.c
36328 @@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36329 struct acpi_table_header table;
36330 acpi_status status;
36331
36332 +#ifdef CONFIG_GRKERNSEC_KMEM
36333 + return -EPERM;
36334 +#endif
36335 +
36336 if (!(*ppos)) {
36337 /* parse the table header to get the table length */
36338 if (count <= sizeof(struct acpi_table_header))
36339 diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36340 index 7db1931..302dd5f 100644
36341 --- a/drivers/acpi/device_pm.c
36342 +++ b/drivers/acpi/device_pm.c
36343 @@ -1021,6 +1021,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36344
36345 #endif /* CONFIG_PM_SLEEP */
36346
36347 +static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36348 +
36349 static struct dev_pm_domain acpi_general_pm_domain = {
36350 .ops = {
36351 #ifdef CONFIG_PM_RUNTIME
36352 @@ -1039,6 +1041,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36353 .restore_early = acpi_subsys_resume_early,
36354 #endif
36355 },
36356 + .detach = acpi_dev_pm_detach
36357 };
36358
36359 /**
36360 @@ -1108,7 +1111,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36361 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36362 }
36363
36364 - dev->pm_domain->detach = acpi_dev_pm_detach;
36365 return 0;
36366 }
36367 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36368 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36369 index 17f9ec5..d9a455e 100644
36370 --- a/drivers/acpi/processor_idle.c
36371 +++ b/drivers/acpi/processor_idle.c
36372 @@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36373 {
36374 int i, count = CPUIDLE_DRIVER_STATE_START;
36375 struct acpi_processor_cx *cx;
36376 - struct cpuidle_state *state;
36377 + cpuidle_state_no_const *state;
36378 struct cpuidle_driver *drv = &acpi_idle_driver;
36379
36380 if (!pr->flags.power_setup_done)
36381 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36382 index 13e577c..cef11ee 100644
36383 --- a/drivers/acpi/sysfs.c
36384 +++ b/drivers/acpi/sysfs.c
36385 @@ -423,11 +423,11 @@ static u32 num_counters;
36386 static struct attribute **all_attrs;
36387 static u32 acpi_gpe_count;
36388
36389 -static struct attribute_group interrupt_stats_attr_group = {
36390 +static attribute_group_no_const interrupt_stats_attr_group = {
36391 .name = "interrupts",
36392 };
36393
36394 -static struct kobj_attribute *counter_attrs;
36395 +static kobj_attribute_no_const *counter_attrs;
36396
36397 static void delete_gpe_attr_array(void)
36398 {
36399 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36400 index 97683e4..655f6ba 100644
36401 --- a/drivers/ata/libahci.c
36402 +++ b/drivers/ata/libahci.c
36403 @@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36404 }
36405 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36406
36407 -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36408 +static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36409 struct ata_taskfile *tf, int is_cmd, u16 flags,
36410 unsigned long timeout_msec)
36411 {
36412 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36413 index c5ba15a..75ec7a8 100644
36414 --- a/drivers/ata/libata-core.c
36415 +++ b/drivers/ata/libata-core.c
36416 @@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36417 static void ata_dev_xfermask(struct ata_device *dev);
36418 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36419
36420 -atomic_t ata_print_id = ATOMIC_INIT(0);
36421 +atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36422
36423 struct ata_force_param {
36424 const char *name;
36425 @@ -4797,7 +4797,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36426 struct ata_port *ap;
36427 unsigned int tag;
36428
36429 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36430 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36431 ap = qc->ap;
36432
36433 qc->flags = 0;
36434 @@ -4813,7 +4813,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36435 struct ata_port *ap;
36436 struct ata_link *link;
36437
36438 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36439 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36440 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36441 ap = qc->ap;
36442 link = qc->dev->link;
36443 @@ -5917,6 +5917,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36444 return;
36445
36446 spin_lock(&lock);
36447 + pax_open_kernel();
36448
36449 for (cur = ops->inherits; cur; cur = cur->inherits) {
36450 void **inherit = (void **)cur;
36451 @@ -5930,8 +5931,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36452 if (IS_ERR(*pp))
36453 *pp = NULL;
36454
36455 - ops->inherits = NULL;
36456 + *(struct ata_port_operations **)&ops->inherits = NULL;
36457
36458 + pax_close_kernel();
36459 spin_unlock(&lock);
36460 }
36461
36462 @@ -6127,7 +6129,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36463
36464 /* give ports names and add SCSI hosts */
36465 for (i = 0; i < host->n_ports; i++) {
36466 - host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36467 + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36468 host->ports[i]->local_port_no = i + 1;
36469 }
36470
36471 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36472 index 0586f66..1a8f74a 100644
36473 --- a/drivers/ata/libata-scsi.c
36474 +++ b/drivers/ata/libata-scsi.c
36475 @@ -4151,7 +4151,7 @@ int ata_sas_port_init(struct ata_port *ap)
36476
36477 if (rc)
36478 return rc;
36479 - ap->print_id = atomic_inc_return(&ata_print_id);
36480 + ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36481 return 0;
36482 }
36483 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36484 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36485 index 5f4e0cc..ff2c347 100644
36486 --- a/drivers/ata/libata.h
36487 +++ b/drivers/ata/libata.h
36488 @@ -53,7 +53,7 @@ enum {
36489 ATA_DNXFER_QUIET = (1 << 31),
36490 };
36491
36492 -extern atomic_t ata_print_id;
36493 +extern atomic_unchecked_t ata_print_id;
36494 extern int atapi_passthru16;
36495 extern int libata_fua;
36496 extern int libata_noacpi;
36497 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36498 index 38216b9..4ec6aeb 100644
36499 --- a/drivers/ata/pata_arasan_cf.c
36500 +++ b/drivers/ata/pata_arasan_cf.c
36501 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36502 /* Handle platform specific quirks */
36503 if (quirk) {
36504 if (quirk & CF_BROKEN_PIO) {
36505 - ap->ops->set_piomode = NULL;
36506 + pax_open_kernel();
36507 + *(void **)&ap->ops->set_piomode = NULL;
36508 + pax_close_kernel();
36509 ap->pio_mask = 0;
36510 }
36511 if (quirk & CF_BROKEN_MWDMA)
36512 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36513 index f9b983a..887b9d8 100644
36514 --- a/drivers/atm/adummy.c
36515 +++ b/drivers/atm/adummy.c
36516 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36517 vcc->pop(vcc, skb);
36518 else
36519 dev_kfree_skb_any(skb);
36520 - atomic_inc(&vcc->stats->tx);
36521 + atomic_inc_unchecked(&vcc->stats->tx);
36522
36523 return 0;
36524 }
36525 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36526 index f1a9198..f466a4a 100644
36527 --- a/drivers/atm/ambassador.c
36528 +++ b/drivers/atm/ambassador.c
36529 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36530 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36531
36532 // VC layer stats
36533 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36534 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36535
36536 // free the descriptor
36537 kfree (tx_descr);
36538 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36539 dump_skb ("<<<", vc, skb);
36540
36541 // VC layer stats
36542 - atomic_inc(&atm_vcc->stats->rx);
36543 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36544 __net_timestamp(skb);
36545 // end of our responsibility
36546 atm_vcc->push (atm_vcc, skb);
36547 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36548 } else {
36549 PRINTK (KERN_INFO, "dropped over-size frame");
36550 // should we count this?
36551 - atomic_inc(&atm_vcc->stats->rx_drop);
36552 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36553 }
36554
36555 } else {
36556 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36557 }
36558
36559 if (check_area (skb->data, skb->len)) {
36560 - atomic_inc(&atm_vcc->stats->tx_err);
36561 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36562 return -ENOMEM; // ?
36563 }
36564
36565 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36566 index 480fa6f..947067c 100644
36567 --- a/drivers/atm/atmtcp.c
36568 +++ b/drivers/atm/atmtcp.c
36569 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36570 if (vcc->pop) vcc->pop(vcc,skb);
36571 else dev_kfree_skb(skb);
36572 if (dev_data) return 0;
36573 - atomic_inc(&vcc->stats->tx_err);
36574 + atomic_inc_unchecked(&vcc->stats->tx_err);
36575 return -ENOLINK;
36576 }
36577 size = skb->len+sizeof(struct atmtcp_hdr);
36578 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36579 if (!new_skb) {
36580 if (vcc->pop) vcc->pop(vcc,skb);
36581 else dev_kfree_skb(skb);
36582 - atomic_inc(&vcc->stats->tx_err);
36583 + atomic_inc_unchecked(&vcc->stats->tx_err);
36584 return -ENOBUFS;
36585 }
36586 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36587 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36588 if (vcc->pop) vcc->pop(vcc,skb);
36589 else dev_kfree_skb(skb);
36590 out_vcc->push(out_vcc,new_skb);
36591 - atomic_inc(&vcc->stats->tx);
36592 - atomic_inc(&out_vcc->stats->rx);
36593 + atomic_inc_unchecked(&vcc->stats->tx);
36594 + atomic_inc_unchecked(&out_vcc->stats->rx);
36595 return 0;
36596 }
36597
36598 @@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36599 read_unlock(&vcc_sklist_lock);
36600 if (!out_vcc) {
36601 result = -EUNATCH;
36602 - atomic_inc(&vcc->stats->tx_err);
36603 + atomic_inc_unchecked(&vcc->stats->tx_err);
36604 goto done;
36605 }
36606 skb_pull(skb,sizeof(struct atmtcp_hdr));
36607 @@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36608 __net_timestamp(new_skb);
36609 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36610 out_vcc->push(out_vcc,new_skb);
36611 - atomic_inc(&vcc->stats->tx);
36612 - atomic_inc(&out_vcc->stats->rx);
36613 + atomic_inc_unchecked(&vcc->stats->tx);
36614 + atomic_inc_unchecked(&out_vcc->stats->rx);
36615 done:
36616 if (vcc->pop) vcc->pop(vcc,skb);
36617 else dev_kfree_skb(skb);
36618 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36619 index d65975a..0b87e20 100644
36620 --- a/drivers/atm/eni.c
36621 +++ b/drivers/atm/eni.c
36622 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36623 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36624 vcc->dev->number);
36625 length = 0;
36626 - atomic_inc(&vcc->stats->rx_err);
36627 + atomic_inc_unchecked(&vcc->stats->rx_err);
36628 }
36629 else {
36630 length = ATM_CELL_SIZE-1; /* no HEC */
36631 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36632 size);
36633 }
36634 eff = length = 0;
36635 - atomic_inc(&vcc->stats->rx_err);
36636 + atomic_inc_unchecked(&vcc->stats->rx_err);
36637 }
36638 else {
36639 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36640 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36641 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36642 vcc->dev->number,vcc->vci,length,size << 2,descr);
36643 length = eff = 0;
36644 - atomic_inc(&vcc->stats->rx_err);
36645 + atomic_inc_unchecked(&vcc->stats->rx_err);
36646 }
36647 }
36648 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36649 @@ -767,7 +767,7 @@ rx_dequeued++;
36650 vcc->push(vcc,skb);
36651 pushed++;
36652 }
36653 - atomic_inc(&vcc->stats->rx);
36654 + atomic_inc_unchecked(&vcc->stats->rx);
36655 }
36656 wake_up(&eni_dev->rx_wait);
36657 }
36658 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36659 PCI_DMA_TODEVICE);
36660 if (vcc->pop) vcc->pop(vcc,skb);
36661 else dev_kfree_skb_irq(skb);
36662 - atomic_inc(&vcc->stats->tx);
36663 + atomic_inc_unchecked(&vcc->stats->tx);
36664 wake_up(&eni_dev->tx_wait);
36665 dma_complete++;
36666 }
36667 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36668 index 82f2ae0..f205c02 100644
36669 --- a/drivers/atm/firestream.c
36670 +++ b/drivers/atm/firestream.c
36671 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36672 }
36673 }
36674
36675 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36676 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36677
36678 fs_dprintk (FS_DEBUG_TXMEM, "i");
36679 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36680 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36681 #endif
36682 skb_put (skb, qe->p1 & 0xffff);
36683 ATM_SKB(skb)->vcc = atm_vcc;
36684 - atomic_inc(&atm_vcc->stats->rx);
36685 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36686 __net_timestamp(skb);
36687 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36688 atm_vcc->push (atm_vcc, skb);
36689 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36690 kfree (pe);
36691 }
36692 if (atm_vcc)
36693 - atomic_inc(&atm_vcc->stats->rx_drop);
36694 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36695 break;
36696 case 0x1f: /* Reassembly abort: no buffers. */
36697 /* Silently increment error counter. */
36698 if (atm_vcc)
36699 - atomic_inc(&atm_vcc->stats->rx_drop);
36700 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36701 break;
36702 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36703 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36704 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36705 index d4725fc..2d4ea65 100644
36706 --- a/drivers/atm/fore200e.c
36707 +++ b/drivers/atm/fore200e.c
36708 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36709 #endif
36710 /* check error condition */
36711 if (*entry->status & STATUS_ERROR)
36712 - atomic_inc(&vcc->stats->tx_err);
36713 + atomic_inc_unchecked(&vcc->stats->tx_err);
36714 else
36715 - atomic_inc(&vcc->stats->tx);
36716 + atomic_inc_unchecked(&vcc->stats->tx);
36717 }
36718 }
36719
36720 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36721 if (skb == NULL) {
36722 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36723
36724 - atomic_inc(&vcc->stats->rx_drop);
36725 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36726 return -ENOMEM;
36727 }
36728
36729 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36730
36731 dev_kfree_skb_any(skb);
36732
36733 - atomic_inc(&vcc->stats->rx_drop);
36734 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36735 return -ENOMEM;
36736 }
36737
36738 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36739
36740 vcc->push(vcc, skb);
36741 - atomic_inc(&vcc->stats->rx);
36742 + atomic_inc_unchecked(&vcc->stats->rx);
36743
36744 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36745
36746 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36747 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36748 fore200e->atm_dev->number,
36749 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36750 - atomic_inc(&vcc->stats->rx_err);
36751 + atomic_inc_unchecked(&vcc->stats->rx_err);
36752 }
36753 }
36754
36755 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36756 goto retry_here;
36757 }
36758
36759 - atomic_inc(&vcc->stats->tx_err);
36760 + atomic_inc_unchecked(&vcc->stats->tx_err);
36761
36762 fore200e->tx_sat++;
36763 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36764 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36765 index c39702b..785b73b 100644
36766 --- a/drivers/atm/he.c
36767 +++ b/drivers/atm/he.c
36768 @@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36769
36770 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36771 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36772 - atomic_inc(&vcc->stats->rx_drop);
36773 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36774 goto return_host_buffers;
36775 }
36776
36777 @@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36778 RBRQ_LEN_ERR(he_dev->rbrq_head)
36779 ? "LEN_ERR" : "",
36780 vcc->vpi, vcc->vci);
36781 - atomic_inc(&vcc->stats->rx_err);
36782 + atomic_inc_unchecked(&vcc->stats->rx_err);
36783 goto return_host_buffers;
36784 }
36785
36786 @@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36787 vcc->push(vcc, skb);
36788 spin_lock(&he_dev->global_lock);
36789
36790 - atomic_inc(&vcc->stats->rx);
36791 + atomic_inc_unchecked(&vcc->stats->rx);
36792
36793 return_host_buffers:
36794 ++pdus_assembled;
36795 @@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36796 tpd->vcc->pop(tpd->vcc, tpd->skb);
36797 else
36798 dev_kfree_skb_any(tpd->skb);
36799 - atomic_inc(&tpd->vcc->stats->tx_err);
36800 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36801 }
36802 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36803 return;
36804 @@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36805 vcc->pop(vcc, skb);
36806 else
36807 dev_kfree_skb_any(skb);
36808 - atomic_inc(&vcc->stats->tx_err);
36809 + atomic_inc_unchecked(&vcc->stats->tx_err);
36810 return -EINVAL;
36811 }
36812
36813 @@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36814 vcc->pop(vcc, skb);
36815 else
36816 dev_kfree_skb_any(skb);
36817 - atomic_inc(&vcc->stats->tx_err);
36818 + atomic_inc_unchecked(&vcc->stats->tx_err);
36819 return -EINVAL;
36820 }
36821 #endif
36822 @@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36823 vcc->pop(vcc, skb);
36824 else
36825 dev_kfree_skb_any(skb);
36826 - atomic_inc(&vcc->stats->tx_err);
36827 + atomic_inc_unchecked(&vcc->stats->tx_err);
36828 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36829 return -ENOMEM;
36830 }
36831 @@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36832 vcc->pop(vcc, skb);
36833 else
36834 dev_kfree_skb_any(skb);
36835 - atomic_inc(&vcc->stats->tx_err);
36836 + atomic_inc_unchecked(&vcc->stats->tx_err);
36837 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36838 return -ENOMEM;
36839 }
36840 @@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36841 __enqueue_tpd(he_dev, tpd, cid);
36842 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36843
36844 - atomic_inc(&vcc->stats->tx);
36845 + atomic_inc_unchecked(&vcc->stats->tx);
36846
36847 return 0;
36848 }
36849 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36850 index 1dc0519..1aadaf7 100644
36851 --- a/drivers/atm/horizon.c
36852 +++ b/drivers/atm/horizon.c
36853 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36854 {
36855 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36856 // VC layer stats
36857 - atomic_inc(&vcc->stats->rx);
36858 + atomic_inc_unchecked(&vcc->stats->rx);
36859 __net_timestamp(skb);
36860 // end of our responsibility
36861 vcc->push (vcc, skb);
36862 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36863 dev->tx_iovec = NULL;
36864
36865 // VC layer stats
36866 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36867 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36868
36869 // free the skb
36870 hrz_kfree_skb (skb);
36871 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36872 index 2b24ed0..b3d6acc 100644
36873 --- a/drivers/atm/idt77252.c
36874 +++ b/drivers/atm/idt77252.c
36875 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36876 else
36877 dev_kfree_skb(skb);
36878
36879 - atomic_inc(&vcc->stats->tx);
36880 + atomic_inc_unchecked(&vcc->stats->tx);
36881 }
36882
36883 atomic_dec(&scq->used);
36884 @@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36885 if ((sb = dev_alloc_skb(64)) == NULL) {
36886 printk("%s: Can't allocate buffers for aal0.\n",
36887 card->name);
36888 - atomic_add(i, &vcc->stats->rx_drop);
36889 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36890 break;
36891 }
36892 if (!atm_charge(vcc, sb->truesize)) {
36893 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36894 card->name);
36895 - atomic_add(i - 1, &vcc->stats->rx_drop);
36896 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36897 dev_kfree_skb(sb);
36898 break;
36899 }
36900 @@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36901 ATM_SKB(sb)->vcc = vcc;
36902 __net_timestamp(sb);
36903 vcc->push(vcc, sb);
36904 - atomic_inc(&vcc->stats->rx);
36905 + atomic_inc_unchecked(&vcc->stats->rx);
36906
36907 cell += ATM_CELL_PAYLOAD;
36908 }
36909 @@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36910 "(CDC: %08x)\n",
36911 card->name, len, rpp->len, readl(SAR_REG_CDC));
36912 recycle_rx_pool_skb(card, rpp);
36913 - atomic_inc(&vcc->stats->rx_err);
36914 + atomic_inc_unchecked(&vcc->stats->rx_err);
36915 return;
36916 }
36917 if (stat & SAR_RSQE_CRC) {
36918 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36919 recycle_rx_pool_skb(card, rpp);
36920 - atomic_inc(&vcc->stats->rx_err);
36921 + atomic_inc_unchecked(&vcc->stats->rx_err);
36922 return;
36923 }
36924 if (skb_queue_len(&rpp->queue) > 1) {
36925 @@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36926 RXPRINTK("%s: Can't alloc RX skb.\n",
36927 card->name);
36928 recycle_rx_pool_skb(card, rpp);
36929 - atomic_inc(&vcc->stats->rx_err);
36930 + atomic_inc_unchecked(&vcc->stats->rx_err);
36931 return;
36932 }
36933 if (!atm_charge(vcc, skb->truesize)) {
36934 @@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36935 __net_timestamp(skb);
36936
36937 vcc->push(vcc, skb);
36938 - atomic_inc(&vcc->stats->rx);
36939 + atomic_inc_unchecked(&vcc->stats->rx);
36940
36941 return;
36942 }
36943 @@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36944 __net_timestamp(skb);
36945
36946 vcc->push(vcc, skb);
36947 - atomic_inc(&vcc->stats->rx);
36948 + atomic_inc_unchecked(&vcc->stats->rx);
36949
36950 if (skb->truesize > SAR_FB_SIZE_3)
36951 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36952 @@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36953 if (vcc->qos.aal != ATM_AAL0) {
36954 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36955 card->name, vpi, vci);
36956 - atomic_inc(&vcc->stats->rx_drop);
36957 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36958 goto drop;
36959 }
36960
36961 if ((sb = dev_alloc_skb(64)) == NULL) {
36962 printk("%s: Can't allocate buffers for AAL0.\n",
36963 card->name);
36964 - atomic_inc(&vcc->stats->rx_err);
36965 + atomic_inc_unchecked(&vcc->stats->rx_err);
36966 goto drop;
36967 }
36968
36969 @@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36970 ATM_SKB(sb)->vcc = vcc;
36971 __net_timestamp(sb);
36972 vcc->push(vcc, sb);
36973 - atomic_inc(&vcc->stats->rx);
36974 + atomic_inc_unchecked(&vcc->stats->rx);
36975
36976 drop:
36977 skb_pull(queue, 64);
36978 @@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36979
36980 if (vc == NULL) {
36981 printk("%s: NULL connection in send().\n", card->name);
36982 - atomic_inc(&vcc->stats->tx_err);
36983 + atomic_inc_unchecked(&vcc->stats->tx_err);
36984 dev_kfree_skb(skb);
36985 return -EINVAL;
36986 }
36987 if (!test_bit(VCF_TX, &vc->flags)) {
36988 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
36989 - atomic_inc(&vcc->stats->tx_err);
36990 + atomic_inc_unchecked(&vcc->stats->tx_err);
36991 dev_kfree_skb(skb);
36992 return -EINVAL;
36993 }
36994 @@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36995 break;
36996 default:
36997 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
36998 - atomic_inc(&vcc->stats->tx_err);
36999 + atomic_inc_unchecked(&vcc->stats->tx_err);
37000 dev_kfree_skb(skb);
37001 return -EINVAL;
37002 }
37003
37004 if (skb_shinfo(skb)->nr_frags != 0) {
37005 printk("%s: No scatter-gather yet.\n", card->name);
37006 - atomic_inc(&vcc->stats->tx_err);
37007 + atomic_inc_unchecked(&vcc->stats->tx_err);
37008 dev_kfree_skb(skb);
37009 return -EINVAL;
37010 }
37011 @@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37012
37013 err = queue_skb(card, vc, skb, oam);
37014 if (err) {
37015 - atomic_inc(&vcc->stats->tx_err);
37016 + atomic_inc_unchecked(&vcc->stats->tx_err);
37017 dev_kfree_skb(skb);
37018 return err;
37019 }
37020 @@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37021 skb = dev_alloc_skb(64);
37022 if (!skb) {
37023 printk("%s: Out of memory in send_oam().\n", card->name);
37024 - atomic_inc(&vcc->stats->tx_err);
37025 + atomic_inc_unchecked(&vcc->stats->tx_err);
37026 return -ENOMEM;
37027 }
37028 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37029 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37030 index 4217f29..88f547a 100644
37031 --- a/drivers/atm/iphase.c
37032 +++ b/drivers/atm/iphase.c
37033 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37034 status = (u_short) (buf_desc_ptr->desc_mode);
37035 if (status & (RX_CER | RX_PTE | RX_OFL))
37036 {
37037 - atomic_inc(&vcc->stats->rx_err);
37038 + atomic_inc_unchecked(&vcc->stats->rx_err);
37039 IF_ERR(printk("IA: bad packet, dropping it");)
37040 if (status & RX_CER) {
37041 IF_ERR(printk(" cause: packet CRC error\n");)
37042 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37043 len = dma_addr - buf_addr;
37044 if (len > iadev->rx_buf_sz) {
37045 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37046 - atomic_inc(&vcc->stats->rx_err);
37047 + atomic_inc_unchecked(&vcc->stats->rx_err);
37048 goto out_free_desc;
37049 }
37050
37051 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37052 ia_vcc = INPH_IA_VCC(vcc);
37053 if (ia_vcc == NULL)
37054 {
37055 - atomic_inc(&vcc->stats->rx_err);
37056 + atomic_inc_unchecked(&vcc->stats->rx_err);
37057 atm_return(vcc, skb->truesize);
37058 dev_kfree_skb_any(skb);
37059 goto INCR_DLE;
37060 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37061 if ((length > iadev->rx_buf_sz) || (length >
37062 (skb->len - sizeof(struct cpcs_trailer))))
37063 {
37064 - atomic_inc(&vcc->stats->rx_err);
37065 + atomic_inc_unchecked(&vcc->stats->rx_err);
37066 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37067 length, skb->len);)
37068 atm_return(vcc, skb->truesize);
37069 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37070
37071 IF_RX(printk("rx_dle_intr: skb push");)
37072 vcc->push(vcc,skb);
37073 - atomic_inc(&vcc->stats->rx);
37074 + atomic_inc_unchecked(&vcc->stats->rx);
37075 iadev->rx_pkt_cnt++;
37076 }
37077 INCR_DLE:
37078 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37079 {
37080 struct k_sonet_stats *stats;
37081 stats = &PRIV(_ia_dev[board])->sonet_stats;
37082 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37083 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37084 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37085 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37086 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37087 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37088 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37089 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37090 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37091 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37092 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37093 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37094 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37095 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37096 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37097 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37098 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37099 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37100 }
37101 ia_cmds.status = 0;
37102 break;
37103 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37104 if ((desc == 0) || (desc > iadev->num_tx_desc))
37105 {
37106 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37107 - atomic_inc(&vcc->stats->tx);
37108 + atomic_inc_unchecked(&vcc->stats->tx);
37109 if (vcc->pop)
37110 vcc->pop(vcc, skb);
37111 else
37112 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37113 ATM_DESC(skb) = vcc->vci;
37114 skb_queue_tail(&iadev->tx_dma_q, skb);
37115
37116 - atomic_inc(&vcc->stats->tx);
37117 + atomic_inc_unchecked(&vcc->stats->tx);
37118 iadev->tx_pkt_cnt++;
37119 /* Increment transaction counter */
37120 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37121
37122 #if 0
37123 /* add flow control logic */
37124 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37125 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37126 if (iavcc->vc_desc_cnt > 10) {
37127 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37128 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37129 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37130 index 93eaf8d..b4ca7da 100644
37131 --- a/drivers/atm/lanai.c
37132 +++ b/drivers/atm/lanai.c
37133 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37134 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37135 lanai_endtx(lanai, lvcc);
37136 lanai_free_skb(lvcc->tx.atmvcc, skb);
37137 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37138 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37139 }
37140
37141 /* Try to fill the buffer - don't call unless there is backlog */
37142 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37143 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37144 __net_timestamp(skb);
37145 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37146 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37147 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37148 out:
37149 lvcc->rx.buf.ptr = end;
37150 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37151 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37152 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37153 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37154 lanai->stats.service_rxnotaal5++;
37155 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37156 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37157 return 0;
37158 }
37159 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37160 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37161 int bytes;
37162 read_unlock(&vcc_sklist_lock);
37163 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37164 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37165 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37166 lvcc->stats.x.aal5.service_trash++;
37167 bytes = (SERVICE_GET_END(s) * 16) -
37168 (((unsigned long) lvcc->rx.buf.ptr) -
37169 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37170 }
37171 if (s & SERVICE_STREAM) {
37172 read_unlock(&vcc_sklist_lock);
37173 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37174 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37175 lvcc->stats.x.aal5.service_stream++;
37176 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37177 "PDU on VCI %d!\n", lanai->number, vci);
37178 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37179 return 0;
37180 }
37181 DPRINTK("got rx crc error on vci %d\n", vci);
37182 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37183 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37184 lvcc->stats.x.aal5.service_rxcrc++;
37185 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37186 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37187 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37188 index 9988ac9..7c52585 100644
37189 --- a/drivers/atm/nicstar.c
37190 +++ b/drivers/atm/nicstar.c
37191 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37192 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37193 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37194 card->index);
37195 - atomic_inc(&vcc->stats->tx_err);
37196 + atomic_inc_unchecked(&vcc->stats->tx_err);
37197 dev_kfree_skb_any(skb);
37198 return -EINVAL;
37199 }
37200 @@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37201 if (!vc->tx) {
37202 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37203 card->index);
37204 - atomic_inc(&vcc->stats->tx_err);
37205 + atomic_inc_unchecked(&vcc->stats->tx_err);
37206 dev_kfree_skb_any(skb);
37207 return -EINVAL;
37208 }
37209 @@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37210 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37211 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37212 card->index);
37213 - atomic_inc(&vcc->stats->tx_err);
37214 + atomic_inc_unchecked(&vcc->stats->tx_err);
37215 dev_kfree_skb_any(skb);
37216 return -EINVAL;
37217 }
37218
37219 if (skb_shinfo(skb)->nr_frags != 0) {
37220 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37221 - atomic_inc(&vcc->stats->tx_err);
37222 + atomic_inc_unchecked(&vcc->stats->tx_err);
37223 dev_kfree_skb_any(skb);
37224 return -EINVAL;
37225 }
37226 @@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37227 }
37228
37229 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37230 - atomic_inc(&vcc->stats->tx_err);
37231 + atomic_inc_unchecked(&vcc->stats->tx_err);
37232 dev_kfree_skb_any(skb);
37233 return -EIO;
37234 }
37235 - atomic_inc(&vcc->stats->tx);
37236 + atomic_inc_unchecked(&vcc->stats->tx);
37237
37238 return 0;
37239 }
37240 @@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37241 printk
37242 ("nicstar%d: Can't allocate buffers for aal0.\n",
37243 card->index);
37244 - atomic_add(i, &vcc->stats->rx_drop);
37245 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
37246 break;
37247 }
37248 if (!atm_charge(vcc, sb->truesize)) {
37249 RXPRINTK
37250 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37251 card->index);
37252 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37253 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37254 dev_kfree_skb_any(sb);
37255 break;
37256 }
37257 @@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37258 ATM_SKB(sb)->vcc = vcc;
37259 __net_timestamp(sb);
37260 vcc->push(vcc, sb);
37261 - atomic_inc(&vcc->stats->rx);
37262 + atomic_inc_unchecked(&vcc->stats->rx);
37263 cell += ATM_CELL_PAYLOAD;
37264 }
37265
37266 @@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37267 if (iovb == NULL) {
37268 printk("nicstar%d: Out of iovec buffers.\n",
37269 card->index);
37270 - atomic_inc(&vcc->stats->rx_drop);
37271 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37272 recycle_rx_buf(card, skb);
37273 return;
37274 }
37275 @@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37276 small or large buffer itself. */
37277 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37278 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37279 - atomic_inc(&vcc->stats->rx_err);
37280 + atomic_inc_unchecked(&vcc->stats->rx_err);
37281 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37282 NS_MAX_IOVECS);
37283 NS_PRV_IOVCNT(iovb) = 0;
37284 @@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37285 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37286 card->index);
37287 which_list(card, skb);
37288 - atomic_inc(&vcc->stats->rx_err);
37289 + atomic_inc_unchecked(&vcc->stats->rx_err);
37290 recycle_rx_buf(card, skb);
37291 vc->rx_iov = NULL;
37292 recycle_iov_buf(card, iovb);
37293 @@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37294 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37295 card->index);
37296 which_list(card, skb);
37297 - atomic_inc(&vcc->stats->rx_err);
37298 + atomic_inc_unchecked(&vcc->stats->rx_err);
37299 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37300 NS_PRV_IOVCNT(iovb));
37301 vc->rx_iov = NULL;
37302 @@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37303 printk(" - PDU size mismatch.\n");
37304 else
37305 printk(".\n");
37306 - atomic_inc(&vcc->stats->rx_err);
37307 + atomic_inc_unchecked(&vcc->stats->rx_err);
37308 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37309 NS_PRV_IOVCNT(iovb));
37310 vc->rx_iov = NULL;
37311 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37312 /* skb points to a small buffer */
37313 if (!atm_charge(vcc, skb->truesize)) {
37314 push_rxbufs(card, skb);
37315 - atomic_inc(&vcc->stats->rx_drop);
37316 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37317 } else {
37318 skb_put(skb, len);
37319 dequeue_sm_buf(card, skb);
37320 @@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37321 ATM_SKB(skb)->vcc = vcc;
37322 __net_timestamp(skb);
37323 vcc->push(vcc, skb);
37324 - atomic_inc(&vcc->stats->rx);
37325 + atomic_inc_unchecked(&vcc->stats->rx);
37326 }
37327 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37328 struct sk_buff *sb;
37329 @@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37330 if (len <= NS_SMBUFSIZE) {
37331 if (!atm_charge(vcc, sb->truesize)) {
37332 push_rxbufs(card, sb);
37333 - atomic_inc(&vcc->stats->rx_drop);
37334 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37335 } else {
37336 skb_put(sb, len);
37337 dequeue_sm_buf(card, sb);
37338 @@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37339 ATM_SKB(sb)->vcc = vcc;
37340 __net_timestamp(sb);
37341 vcc->push(vcc, sb);
37342 - atomic_inc(&vcc->stats->rx);
37343 + atomic_inc_unchecked(&vcc->stats->rx);
37344 }
37345
37346 push_rxbufs(card, skb);
37347 @@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37348
37349 if (!atm_charge(vcc, skb->truesize)) {
37350 push_rxbufs(card, skb);
37351 - atomic_inc(&vcc->stats->rx_drop);
37352 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37353 } else {
37354 dequeue_lg_buf(card, skb);
37355 #ifdef NS_USE_DESTRUCTORS
37356 @@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37357 ATM_SKB(skb)->vcc = vcc;
37358 __net_timestamp(skb);
37359 vcc->push(vcc, skb);
37360 - atomic_inc(&vcc->stats->rx);
37361 + atomic_inc_unchecked(&vcc->stats->rx);
37362 }
37363
37364 push_rxbufs(card, sb);
37365 @@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37366 printk
37367 ("nicstar%d: Out of huge buffers.\n",
37368 card->index);
37369 - atomic_inc(&vcc->stats->rx_drop);
37370 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37371 recycle_iovec_rx_bufs(card,
37372 (struct iovec *)
37373 iovb->data,
37374 @@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37375 card->hbpool.count++;
37376 } else
37377 dev_kfree_skb_any(hb);
37378 - atomic_inc(&vcc->stats->rx_drop);
37379 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37380 } else {
37381 /* Copy the small buffer to the huge buffer */
37382 sb = (struct sk_buff *)iov->iov_base;
37383 @@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37384 #endif /* NS_USE_DESTRUCTORS */
37385 __net_timestamp(hb);
37386 vcc->push(vcc, hb);
37387 - atomic_inc(&vcc->stats->rx);
37388 + atomic_inc_unchecked(&vcc->stats->rx);
37389 }
37390 }
37391
37392 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37393 index 21b0bc6..b5f40ba 100644
37394 --- a/drivers/atm/solos-pci.c
37395 +++ b/drivers/atm/solos-pci.c
37396 @@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37397 }
37398 atm_charge(vcc, skb->truesize);
37399 vcc->push(vcc, skb);
37400 - atomic_inc(&vcc->stats->rx);
37401 + atomic_inc_unchecked(&vcc->stats->rx);
37402 break;
37403
37404 case PKT_STATUS:
37405 @@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37406 vcc = SKB_CB(oldskb)->vcc;
37407
37408 if (vcc) {
37409 - atomic_inc(&vcc->stats->tx);
37410 + atomic_inc_unchecked(&vcc->stats->tx);
37411 solos_pop(vcc, oldskb);
37412 } else {
37413 dev_kfree_skb_irq(oldskb);
37414 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37415 index 0215934..ce9f5b1 100644
37416 --- a/drivers/atm/suni.c
37417 +++ b/drivers/atm/suni.c
37418 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37419
37420
37421 #define ADD_LIMITED(s,v) \
37422 - atomic_add((v),&stats->s); \
37423 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37424 + atomic_add_unchecked((v),&stats->s); \
37425 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37426
37427
37428 static void suni_hz(unsigned long from_timer)
37429 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37430 index 5120a96..e2572bd 100644
37431 --- a/drivers/atm/uPD98402.c
37432 +++ b/drivers/atm/uPD98402.c
37433 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37434 struct sonet_stats tmp;
37435 int error = 0;
37436
37437 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37438 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37439 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37440 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37441 if (zero && !error) {
37442 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37443
37444
37445 #define ADD_LIMITED(s,v) \
37446 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37447 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37448 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37449 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37450 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37451 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37452
37453
37454 static void stat_event(struct atm_dev *dev)
37455 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37456 if (reason & uPD98402_INT_PFM) stat_event(dev);
37457 if (reason & uPD98402_INT_PCO) {
37458 (void) GET(PCOCR); /* clear interrupt cause */
37459 - atomic_add(GET(HECCT),
37460 + atomic_add_unchecked(GET(HECCT),
37461 &PRIV(dev)->sonet_stats.uncorr_hcs);
37462 }
37463 if ((reason & uPD98402_INT_RFO) &&
37464 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37465 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37466 uPD98402_INT_LOS),PIMR); /* enable them */
37467 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37468 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37469 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37470 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37471 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37472 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37473 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37474 return 0;
37475 }
37476
37477 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37478 index 969c3c2..9b72956 100644
37479 --- a/drivers/atm/zatm.c
37480 +++ b/drivers/atm/zatm.c
37481 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37482 }
37483 if (!size) {
37484 dev_kfree_skb_irq(skb);
37485 - if (vcc) atomic_inc(&vcc->stats->rx_err);
37486 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37487 continue;
37488 }
37489 if (!atm_charge(vcc,skb->truesize)) {
37490 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37491 skb->len = size;
37492 ATM_SKB(skb)->vcc = vcc;
37493 vcc->push(vcc,skb);
37494 - atomic_inc(&vcc->stats->rx);
37495 + atomic_inc_unchecked(&vcc->stats->rx);
37496 }
37497 zout(pos & 0xffff,MTA(mbx));
37498 #if 0 /* probably a stupid idea */
37499 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37500 skb_queue_head(&zatm_vcc->backlog,skb);
37501 break;
37502 }
37503 - atomic_inc(&vcc->stats->tx);
37504 + atomic_inc_unchecked(&vcc->stats->tx);
37505 wake_up(&zatm_vcc->tx_wait);
37506 }
37507
37508 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37509 index 83e910a..b224a73 100644
37510 --- a/drivers/base/bus.c
37511 +++ b/drivers/base/bus.c
37512 @@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37513 return -EINVAL;
37514
37515 mutex_lock(&subsys->p->mutex);
37516 - list_add_tail(&sif->node, &subsys->p->interfaces);
37517 + pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37518 if (sif->add_dev) {
37519 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37520 while ((dev = subsys_dev_iter_next(&iter)))
37521 @@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37522 subsys = sif->subsys;
37523
37524 mutex_lock(&subsys->p->mutex);
37525 - list_del_init(&sif->node);
37526 + pax_list_del_init((struct list_head *)&sif->node);
37527 if (sif->remove_dev) {
37528 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37529 while ((dev = subsys_dev_iter_next(&iter)))
37530 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37531 index 25798db..15f130e 100644
37532 --- a/drivers/base/devtmpfs.c
37533 +++ b/drivers/base/devtmpfs.c
37534 @@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37535 if (!thread)
37536 return 0;
37537
37538 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37539 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37540 if (err)
37541 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37542 else
37543 @@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37544 *err = sys_unshare(CLONE_NEWNS);
37545 if (*err)
37546 goto out;
37547 - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37548 + *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37549 if (*err)
37550 goto out;
37551 - sys_chdir("/.."); /* will traverse into overmounted root */
37552 - sys_chroot(".");
37553 + sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37554 + sys_chroot((char __force_user *)".");
37555 complete(&setup_done);
37556 while (1) {
37557 spin_lock(&req_lock);
37558 diff --git a/drivers/base/node.c b/drivers/base/node.c
37559 index 472168c..4af587e 100644
37560 --- a/drivers/base/node.c
37561 +++ b/drivers/base/node.c
37562 @@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37563 struct node_attr {
37564 struct device_attribute attr;
37565 enum node_states state;
37566 -};
37567 +} __do_const;
37568
37569 static ssize_t show_node_state(struct device *dev,
37570 struct device_attribute *attr, char *buf)
37571 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37572 index fb83d4a..4aa50ec 100644
37573 --- a/drivers/base/power/domain.c
37574 +++ b/drivers/base/power/domain.c
37575 @@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37576 {
37577 struct cpuidle_driver *cpuidle_drv;
37578 struct gpd_cpuidle_data *cpuidle_data;
37579 - struct cpuidle_state *idle_state;
37580 + cpuidle_state_no_const *idle_state;
37581 int ret = 0;
37582
37583 if (IS_ERR_OR_NULL(genpd) || state < 0)
37584 @@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37585 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37586 {
37587 struct gpd_cpuidle_data *cpuidle_data;
37588 - struct cpuidle_state *idle_state;
37589 + cpuidle_state_no_const *idle_state;
37590 int ret = 0;
37591
37592 if (IS_ERR_OR_NULL(genpd))
37593 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37594 index a9d26ed..74b8405 100644
37595 --- a/drivers/base/power/sysfs.c
37596 +++ b/drivers/base/power/sysfs.c
37597 @@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37598 return -EIO;
37599 }
37600 }
37601 - return sprintf(buf, p);
37602 + return sprintf(buf, "%s", p);
37603 }
37604
37605 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37606 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37607 index c2744b3..08fac19 100644
37608 --- a/drivers/base/power/wakeup.c
37609 +++ b/drivers/base/power/wakeup.c
37610 @@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37611 * They need to be modified together atomically, so it's better to use one
37612 * atomic variable to hold them both.
37613 */
37614 -static atomic_t combined_event_count = ATOMIC_INIT(0);
37615 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37616
37617 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37618 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37619
37620 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37621 {
37622 - unsigned int comb = atomic_read(&combined_event_count);
37623 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
37624
37625 *cnt = (comb >> IN_PROGRESS_BITS);
37626 *inpr = comb & MAX_IN_PROGRESS;
37627 @@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37628 ws->start_prevent_time = ws->last_time;
37629
37630 /* Increment the counter of events in progress. */
37631 - cec = atomic_inc_return(&combined_event_count);
37632 + cec = atomic_inc_return_unchecked(&combined_event_count);
37633
37634 trace_wakeup_source_activate(ws->name, cec);
37635 }
37636 @@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37637 * Increment the counter of registered wakeup events and decrement the
37638 * couter of wakeup events in progress simultaneously.
37639 */
37640 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37641 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37642 trace_wakeup_source_deactivate(ws->name, cec);
37643
37644 split_counters(&cnt, &inpr);
37645 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37646 index 8d98a32..61d3165 100644
37647 --- a/drivers/base/syscore.c
37648 +++ b/drivers/base/syscore.c
37649 @@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37650 void register_syscore_ops(struct syscore_ops *ops)
37651 {
37652 mutex_lock(&syscore_ops_lock);
37653 - list_add_tail(&ops->node, &syscore_ops_list);
37654 + pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37655 mutex_unlock(&syscore_ops_lock);
37656 }
37657 EXPORT_SYMBOL_GPL(register_syscore_ops);
37658 @@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37659 void unregister_syscore_ops(struct syscore_ops *ops)
37660 {
37661 mutex_lock(&syscore_ops_lock);
37662 - list_del(&ops->node);
37663 + pax_list_del((struct list_head *)&ops->node);
37664 mutex_unlock(&syscore_ops_lock);
37665 }
37666 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37667 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37668 index ff20f19..018f1da 100644
37669 --- a/drivers/block/cciss.c
37670 +++ b/drivers/block/cciss.c
37671 @@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37672 while (!list_empty(&h->reqQ)) {
37673 c = list_entry(h->reqQ.next, CommandList_struct, list);
37674 /* can't do anything if fifo is full */
37675 - if ((h->access.fifo_full(h))) {
37676 + if ((h->access->fifo_full(h))) {
37677 dev_warn(&h->pdev->dev, "fifo full\n");
37678 break;
37679 }
37680 @@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37681 h->Qdepth--;
37682
37683 /* Tell the controller execute command */
37684 - h->access.submit_command(h, c);
37685 + h->access->submit_command(h, c);
37686
37687 /* Put job onto the completed Q */
37688 addQ(&h->cmpQ, c);
37689 @@ -3444,17 +3444,17 @@ startio:
37690
37691 static inline unsigned long get_next_completion(ctlr_info_t *h)
37692 {
37693 - return h->access.command_completed(h);
37694 + return h->access->command_completed(h);
37695 }
37696
37697 static inline int interrupt_pending(ctlr_info_t *h)
37698 {
37699 - return h->access.intr_pending(h);
37700 + return h->access->intr_pending(h);
37701 }
37702
37703 static inline long interrupt_not_for_us(ctlr_info_t *h)
37704 {
37705 - return ((h->access.intr_pending(h) == 0) ||
37706 + return ((h->access->intr_pending(h) == 0) ||
37707 (h->interrupts_enabled == 0));
37708 }
37709
37710 @@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37711 u32 a;
37712
37713 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37714 - return h->access.command_completed(h);
37715 + return h->access->command_completed(h);
37716
37717 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37718 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37719 @@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37720 trans_support & CFGTBL_Trans_use_short_tags);
37721
37722 /* Change the access methods to the performant access methods */
37723 - h->access = SA5_performant_access;
37724 + h->access = &SA5_performant_access;
37725 h->transMethod = CFGTBL_Trans_Performant;
37726
37727 return;
37728 @@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37729 if (prod_index < 0)
37730 return -ENODEV;
37731 h->product_name = products[prod_index].product_name;
37732 - h->access = *(products[prod_index].access);
37733 + h->access = products[prod_index].access;
37734
37735 if (cciss_board_disabled(h)) {
37736 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37737 @@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37738 }
37739
37740 /* make sure the board interrupts are off */
37741 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37742 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37743 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37744 if (rc)
37745 goto clean2;
37746 @@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37747 * fake ones to scoop up any residual completions.
37748 */
37749 spin_lock_irqsave(&h->lock, flags);
37750 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37751 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37752 spin_unlock_irqrestore(&h->lock, flags);
37753 free_irq(h->intr[h->intr_mode], h);
37754 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37755 @@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37756 dev_info(&h->pdev->dev, "Board READY.\n");
37757 dev_info(&h->pdev->dev,
37758 "Waiting for stale completions to drain.\n");
37759 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37760 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37761 msleep(10000);
37762 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37763 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37764
37765 rc = controller_reset_failed(h->cfgtable);
37766 if (rc)
37767 @@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37768 cciss_scsi_setup(h);
37769
37770 /* Turn the interrupts on so we can service requests */
37771 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37772 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37773
37774 /* Get the firmware version */
37775 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37776 @@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37777 kfree(flush_buf);
37778 if (return_code != IO_OK)
37779 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37780 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37781 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37782 free_irq(h->intr[h->intr_mode], h);
37783 }
37784
37785 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37786 index 7fda30e..2f27946 100644
37787 --- a/drivers/block/cciss.h
37788 +++ b/drivers/block/cciss.h
37789 @@ -101,7 +101,7 @@ struct ctlr_info
37790 /* information about each logical volume */
37791 drive_info_struct *drv[CISS_MAX_LUN];
37792
37793 - struct access_method access;
37794 + struct access_method *access;
37795
37796 /* queue and queue Info */
37797 struct list_head reqQ;
37798 @@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37799 }
37800
37801 static struct access_method SA5_access = {
37802 - SA5_submit_command,
37803 - SA5_intr_mask,
37804 - SA5_fifo_full,
37805 - SA5_intr_pending,
37806 - SA5_completed,
37807 + .submit_command = SA5_submit_command,
37808 + .set_intr_mask = SA5_intr_mask,
37809 + .fifo_full = SA5_fifo_full,
37810 + .intr_pending = SA5_intr_pending,
37811 + .command_completed = SA5_completed,
37812 };
37813
37814 static struct access_method SA5B_access = {
37815 - SA5_submit_command,
37816 - SA5B_intr_mask,
37817 - SA5_fifo_full,
37818 - SA5B_intr_pending,
37819 - SA5_completed,
37820 + .submit_command = SA5_submit_command,
37821 + .set_intr_mask = SA5B_intr_mask,
37822 + .fifo_full = SA5_fifo_full,
37823 + .intr_pending = SA5B_intr_pending,
37824 + .command_completed = SA5_completed,
37825 };
37826
37827 static struct access_method SA5_performant_access = {
37828 - SA5_submit_command,
37829 - SA5_performant_intr_mask,
37830 - SA5_fifo_full,
37831 - SA5_performant_intr_pending,
37832 - SA5_performant_completed,
37833 + .submit_command = SA5_submit_command,
37834 + .set_intr_mask = SA5_performant_intr_mask,
37835 + .fifo_full = SA5_fifo_full,
37836 + .intr_pending = SA5_performant_intr_pending,
37837 + .command_completed = SA5_performant_completed,
37838 };
37839
37840 struct board_type {
37841 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37842 index 2b94403..fd6ad1f 100644
37843 --- a/drivers/block/cpqarray.c
37844 +++ b/drivers/block/cpqarray.c
37845 @@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37846 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37847 goto Enomem4;
37848 }
37849 - hba[i]->access.set_intr_mask(hba[i], 0);
37850 + hba[i]->access->set_intr_mask(hba[i], 0);
37851 if (request_irq(hba[i]->intr, do_ida_intr,
37852 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37853 {
37854 @@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37855 add_timer(&hba[i]->timer);
37856
37857 /* Enable IRQ now that spinlock and rate limit timer are set up */
37858 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37859 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37860
37861 for(j=0; j<NWD; j++) {
37862 struct gendisk *disk = ida_gendisk[i][j];
37863 @@ -694,7 +694,7 @@ DBGINFO(
37864 for(i=0; i<NR_PRODUCTS; i++) {
37865 if (board_id == products[i].board_id) {
37866 c->product_name = products[i].product_name;
37867 - c->access = *(products[i].access);
37868 + c->access = products[i].access;
37869 break;
37870 }
37871 }
37872 @@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37873 hba[ctlr]->intr = intr;
37874 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37875 hba[ctlr]->product_name = products[j].product_name;
37876 - hba[ctlr]->access = *(products[j].access);
37877 + hba[ctlr]->access = products[j].access;
37878 hba[ctlr]->ctlr = ctlr;
37879 hba[ctlr]->board_id = board_id;
37880 hba[ctlr]->pci_dev = NULL; /* not PCI */
37881 @@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37882
37883 while((c = h->reqQ) != NULL) {
37884 /* Can't do anything if we're busy */
37885 - if (h->access.fifo_full(h) == 0)
37886 + if (h->access->fifo_full(h) == 0)
37887 return;
37888
37889 /* Get the first entry from the request Q */
37890 @@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37891 h->Qdepth--;
37892
37893 /* Tell the controller to do our bidding */
37894 - h->access.submit_command(h, c);
37895 + h->access->submit_command(h, c);
37896
37897 /* Get onto the completion Q */
37898 addQ(&h->cmpQ, c);
37899 @@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37900 unsigned long flags;
37901 __u32 a,a1;
37902
37903 - istat = h->access.intr_pending(h);
37904 + istat = h->access->intr_pending(h);
37905 /* Is this interrupt for us? */
37906 if (istat == 0)
37907 return IRQ_NONE;
37908 @@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37909 */
37910 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37911 if (istat & FIFO_NOT_EMPTY) {
37912 - while((a = h->access.command_completed(h))) {
37913 + while((a = h->access->command_completed(h))) {
37914 a1 = a; a &= ~3;
37915 if ((c = h->cmpQ) == NULL)
37916 {
37917 @@ -1448,11 +1448,11 @@ static int sendcmd(
37918 /*
37919 * Disable interrupt
37920 */
37921 - info_p->access.set_intr_mask(info_p, 0);
37922 + info_p->access->set_intr_mask(info_p, 0);
37923 /* Make sure there is room in the command FIFO */
37924 /* Actually it should be completely empty at this time. */
37925 for (i = 200000; i > 0; i--) {
37926 - temp = info_p->access.fifo_full(info_p);
37927 + temp = info_p->access->fifo_full(info_p);
37928 if (temp != 0) {
37929 break;
37930 }
37931 @@ -1465,7 +1465,7 @@ DBG(
37932 /*
37933 * Send the cmd
37934 */
37935 - info_p->access.submit_command(info_p, c);
37936 + info_p->access->submit_command(info_p, c);
37937 complete = pollcomplete(ctlr);
37938
37939 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37940 @@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37941 * we check the new geometry. Then turn interrupts back on when
37942 * we're done.
37943 */
37944 - host->access.set_intr_mask(host, 0);
37945 + host->access->set_intr_mask(host, 0);
37946 getgeometry(ctlr);
37947 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37948 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37949
37950 for(i=0; i<NWD; i++) {
37951 struct gendisk *disk = ida_gendisk[ctlr][i];
37952 @@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37953 /* Wait (up to 2 seconds) for a command to complete */
37954
37955 for (i = 200000; i > 0; i--) {
37956 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
37957 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
37958 if (done == 0) {
37959 udelay(10); /* a short fixed delay */
37960 } else
37961 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37962 index be73e9d..7fbf140 100644
37963 --- a/drivers/block/cpqarray.h
37964 +++ b/drivers/block/cpqarray.h
37965 @@ -99,7 +99,7 @@ struct ctlr_info {
37966 drv_info_t drv[NWD];
37967 struct proc_dir_entry *proc;
37968
37969 - struct access_method access;
37970 + struct access_method *access;
37971
37972 cmdlist_t *reqQ;
37973 cmdlist_t *cmpQ;
37974 diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
37975 index 434c77d..6d3219a 100644
37976 --- a/drivers/block/drbd/drbd_bitmap.c
37977 +++ b/drivers/block/drbd/drbd_bitmap.c
37978 @@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
37979 submit_bio(rw, bio);
37980 /* this should not count as user activity and cause the
37981 * resync to throttle -- see drbd_rs_should_slow_down(). */
37982 - atomic_add(len >> 9, &device->rs_sect_ev);
37983 + atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
37984 }
37985 }
37986
37987 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
37988 index 9b22f8f..f2932af 100644
37989 --- a/drivers/block/drbd/drbd_int.h
37990 +++ b/drivers/block/drbd/drbd_int.h
37991 @@ -385,7 +385,7 @@ struct drbd_epoch {
37992 struct drbd_connection *connection;
37993 struct list_head list;
37994 unsigned int barrier_nr;
37995 - atomic_t epoch_size; /* increased on every request added. */
37996 + atomic_unchecked_t epoch_size; /* increased on every request added. */
37997 atomic_t active; /* increased on every req. added, and dec on every finished. */
37998 unsigned long flags;
37999 };
38000 @@ -946,7 +946,7 @@ struct drbd_device {
38001 unsigned int al_tr_number;
38002 int al_tr_cycle;
38003 wait_queue_head_t seq_wait;
38004 - atomic_t packet_seq;
38005 + atomic_unchecked_t packet_seq;
38006 unsigned int peer_seq;
38007 spinlock_t peer_seq_lock;
38008 unsigned long comm_bm_set; /* communicated number of set bits. */
38009 @@ -955,8 +955,8 @@ struct drbd_device {
38010 struct mutex own_state_mutex;
38011 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38012 char congestion_reason; /* Why we where congested... */
38013 - atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38014 - atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38015 + atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38016 + atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38017 int rs_last_sect_ev; /* counter to compare with */
38018 int rs_last_events; /* counter of read or write "events" (unit sectors)
38019 * on the lower level device when we last looked. */
38020 @@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
38021 char __user *uoptval;
38022 int err;
38023
38024 - uoptval = (char __user __force *)optval;
38025 + uoptval = (char __force_user *)optval;
38026
38027 set_fs(KERNEL_DS);
38028 if (level == SOL_SOCKET)
38029 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38030 index 973c185..05d8b1a 100644
38031 --- a/drivers/block/drbd/drbd_main.c
38032 +++ b/drivers/block/drbd/drbd_main.c
38033 @@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38034 p->sector = sector;
38035 p->block_id = block_id;
38036 p->blksize = blksize;
38037 - p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38038 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38039 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38040 }
38041
38042 @@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38043 return -EIO;
38044 p->sector = cpu_to_be64(req->i.sector);
38045 p->block_id = (unsigned long)req;
38046 - p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38047 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38048 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38049 if (device->state.conn >= C_SYNC_SOURCE &&
38050 device->state.conn <= C_PAUSED_SYNC_T)
38051 @@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38052 atomic_set(&device->unacked_cnt, 0);
38053 atomic_set(&device->local_cnt, 0);
38054 atomic_set(&device->pp_in_use_by_net, 0);
38055 - atomic_set(&device->rs_sect_in, 0);
38056 - atomic_set(&device->rs_sect_ev, 0);
38057 + atomic_set_unchecked(&device->rs_sect_in, 0);
38058 + atomic_set_unchecked(&device->rs_sect_ev, 0);
38059 atomic_set(&device->ap_in_flight, 0);
38060 atomic_set(&device->md_io.in_use, 0);
38061
38062 @@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
38063 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38064 struct drbd_resource *resource = connection->resource;
38065
38066 - if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38067 - drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38068 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38069 + drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38070 kfree(connection->current_epoch);
38071
38072 idr_destroy(&connection->peer_devices);
38073 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38074 index 1cd47df..57c53c0 100644
38075 --- a/drivers/block/drbd/drbd_nl.c
38076 +++ b/drivers/block/drbd/drbd_nl.c
38077 @@ -3645,13 +3645,13 @@ finish:
38078
38079 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38080 {
38081 - static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38082 + static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38083 struct sk_buff *msg;
38084 struct drbd_genlmsghdr *d_out;
38085 unsigned seq;
38086 int err = -ENOMEM;
38087
38088 - seq = atomic_inc_return(&drbd_genl_seq);
38089 + seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38090 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38091 if (!msg)
38092 goto failed;
38093 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38094 index 6960fb0..215d76b 100644
38095 --- a/drivers/block/drbd/drbd_receiver.c
38096 +++ b/drivers/block/drbd/drbd_receiver.c
38097 @@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38098 struct drbd_device *device = peer_device->device;
38099 int err;
38100
38101 - atomic_set(&device->packet_seq, 0);
38102 + atomic_set_unchecked(&device->packet_seq, 0);
38103 device->peer_seq = 0;
38104
38105 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38106 @@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38107 do {
38108 next_epoch = NULL;
38109
38110 - epoch_size = atomic_read(&epoch->epoch_size);
38111 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38112
38113 switch (ev & ~EV_CLEANUP) {
38114 case EV_PUT:
38115 @@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38116 rv = FE_DESTROYED;
38117 } else {
38118 epoch->flags = 0;
38119 - atomic_set(&epoch->epoch_size, 0);
38120 + atomic_set_unchecked(&epoch->epoch_size, 0);
38121 /* atomic_set(&epoch->active, 0); is already zero */
38122 if (rv == FE_STILL_LIVE)
38123 rv = FE_RECYCLED;
38124 @@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38125 conn_wait_active_ee_empty(connection);
38126 drbd_flush(connection);
38127
38128 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38129 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38130 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38131 if (epoch)
38132 break;
38133 @@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38134 }
38135
38136 epoch->flags = 0;
38137 - atomic_set(&epoch->epoch_size, 0);
38138 + atomic_set_unchecked(&epoch->epoch_size, 0);
38139 atomic_set(&epoch->active, 0);
38140
38141 spin_lock(&connection->epoch_lock);
38142 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38143 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38144 list_add(&epoch->list, &connection->current_epoch->list);
38145 connection->current_epoch = epoch;
38146 connection->epochs++;
38147 @@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38148 list_add_tail(&peer_req->w.list, &device->sync_ee);
38149 spin_unlock_irq(&device->resource->req_lock);
38150
38151 - atomic_add(pi->size >> 9, &device->rs_sect_ev);
38152 + atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38153 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38154 return 0;
38155
38156 @@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38157 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38158 }
38159
38160 - atomic_add(pi->size >> 9, &device->rs_sect_in);
38161 + atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38162
38163 return err;
38164 }
38165 @@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38166
38167 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38168 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38169 - atomic_inc(&connection->current_epoch->epoch_size);
38170 + atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38171 err2 = drbd_drain_block(peer_device, pi->size);
38172 if (!err)
38173 err = err2;
38174 @@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38175
38176 spin_lock(&connection->epoch_lock);
38177 peer_req->epoch = connection->current_epoch;
38178 - atomic_inc(&peer_req->epoch->epoch_size);
38179 + atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38180 atomic_inc(&peer_req->epoch->active);
38181 spin_unlock(&connection->epoch_lock);
38182
38183 @@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38184
38185 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38186 (int)part_stat_read(&disk->part0, sectors[1]) -
38187 - atomic_read(&device->rs_sect_ev);
38188 + atomic_read_unchecked(&device->rs_sect_ev);
38189
38190 if (atomic_read(&device->ap_actlog_cnt)
38191 || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
38192 @@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38193 device->use_csums = true;
38194 } else if (pi->cmd == P_OV_REPLY) {
38195 /* track progress, we may need to throttle */
38196 - atomic_add(size >> 9, &device->rs_sect_in);
38197 + atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38198 peer_req->w.cb = w_e_end_ov_reply;
38199 dec_rs_pending(device);
38200 /* drbd_rs_begin_io done when we sent this request,
38201 @@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38202 goto out_free_e;
38203
38204 submit_for_resync:
38205 - atomic_add(size >> 9, &device->rs_sect_ev);
38206 + atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38207
38208 submit:
38209 update_receiver_timing_details(connection, drbd_submit_peer_request);
38210 @@ -4564,7 +4564,7 @@ struct data_cmd {
38211 int expect_payload;
38212 size_t pkt_size;
38213 int (*fn)(struct drbd_connection *, struct packet_info *);
38214 -};
38215 +} __do_const;
38216
38217 static struct data_cmd drbd_cmd_handler[] = {
38218 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38219 @@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38220 if (!list_empty(&connection->current_epoch->list))
38221 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38222 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38223 - atomic_set(&connection->current_epoch->epoch_size, 0);
38224 + atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38225 connection->send.seen_any_write_yet = false;
38226
38227 drbd_info(connection, "Connection closed\n");
38228 @@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38229 put_ldev(device);
38230 }
38231 dec_rs_pending(device);
38232 - atomic_add(blksize >> 9, &device->rs_sect_in);
38233 + atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38234
38235 return 0;
38236 }
38237 @@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38238 struct asender_cmd {
38239 size_t pkt_size;
38240 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38241 -};
38242 +} __do_const;
38243
38244 static struct asender_cmd asender_tbl[] = {
38245 [P_PING] = { 0, got_Ping },
38246 diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38247 index d2d1f97..6a1188f 100644
38248 --- a/drivers/block/drbd/drbd_worker.c
38249 +++ b/drivers/block/drbd/drbd_worker.c
38250 @@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38251 list_add_tail(&peer_req->w.list, &device->read_ee);
38252 spin_unlock_irq(&device->resource->req_lock);
38253
38254 - atomic_add(size >> 9, &device->rs_sect_ev);
38255 + atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38256 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38257 return 0;
38258
38259 @@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38260 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38261 int number, mxb;
38262
38263 - sect_in = atomic_xchg(&device->rs_sect_in, 0);
38264 + sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38265 device->rs_in_flight -= sect_in;
38266
38267 rcu_read_lock();
38268 @@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38269 {
38270 struct fifo_buffer *plan;
38271
38272 - atomic_set(&device->rs_sect_in, 0);
38273 - atomic_set(&device->rs_sect_ev, 0);
38274 + atomic_set_unchecked(&device->rs_sect_in, 0);
38275 + atomic_set_unchecked(&device->rs_sect_ev, 0);
38276 device->rs_in_flight = 0;
38277
38278 /* Updating the RCU protected object in place is necessary since
38279 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38280 index 6cb1beb..bf490f7 100644
38281 --- a/drivers/block/loop.c
38282 +++ b/drivers/block/loop.c
38283 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38284
38285 file_start_write(file);
38286 set_fs(get_ds());
38287 - bw = file->f_op->write(file, buf, len, &pos);
38288 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38289 set_fs(old_fs);
38290 file_end_write(file);
38291 if (likely(bw == len))
38292 diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38293 index e2bb8af..44b8aef 100644
38294 --- a/drivers/block/nvme-core.c
38295 +++ b/drivers/block/nvme-core.c
38296 @@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
38297 static struct task_struct *nvme_thread;
38298 static struct workqueue_struct *nvme_workq;
38299 static wait_queue_head_t nvme_kthread_wait;
38300 -static struct notifier_block nvme_nb;
38301
38302 static void nvme_reset_failed_dev(struct work_struct *ws);
38303
38304 @@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
38305 .err_handler = &nvme_err_handler,
38306 };
38307
38308 +static struct notifier_block nvme_nb = {
38309 + .notifier_call = &nvme_cpu_notify,
38310 +};
38311 +
38312 static int __init nvme_init(void)
38313 {
38314 int result;
38315 @@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
38316 else if (result > 0)
38317 nvme_major = result;
38318
38319 - nvme_nb.notifier_call = &nvme_cpu_notify;
38320 result = register_hotcpu_notifier(&nvme_nb);
38321 if (result)
38322 goto unregister_blkdev;
38323 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38324 index 09e628da..7607aaa 100644
38325 --- a/drivers/block/pktcdvd.c
38326 +++ b/drivers/block/pktcdvd.c
38327 @@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38328
38329 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38330 {
38331 - return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38332 + return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38333 }
38334
38335 /*
38336 @@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38337 return -EROFS;
38338 }
38339 pd->settings.fp = ti.fp;
38340 - pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38341 + pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38342
38343 if (ti.nwa_v) {
38344 pd->nwa = be32_to_cpu(ti.next_writable);
38345 diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38346 index e5565fb..71be10b4 100644
38347 --- a/drivers/block/smart1,2.h
38348 +++ b/drivers/block/smart1,2.h
38349 @@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38350 }
38351
38352 static struct access_method smart4_access = {
38353 - smart4_submit_command,
38354 - smart4_intr_mask,
38355 - smart4_fifo_full,
38356 - smart4_intr_pending,
38357 - smart4_completed,
38358 + .submit_command = smart4_submit_command,
38359 + .set_intr_mask = smart4_intr_mask,
38360 + .fifo_full = smart4_fifo_full,
38361 + .intr_pending = smart4_intr_pending,
38362 + .command_completed = smart4_completed,
38363 };
38364
38365 /*
38366 @@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38367 }
38368
38369 static struct access_method smart2_access = {
38370 - smart2_submit_command,
38371 - smart2_intr_mask,
38372 - smart2_fifo_full,
38373 - smart2_intr_pending,
38374 - smart2_completed,
38375 + .submit_command = smart2_submit_command,
38376 + .set_intr_mask = smart2_intr_mask,
38377 + .fifo_full = smart2_fifo_full,
38378 + .intr_pending = smart2_intr_pending,
38379 + .command_completed = smart2_completed,
38380 };
38381
38382 /*
38383 @@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38384 }
38385
38386 static struct access_method smart2e_access = {
38387 - smart2e_submit_command,
38388 - smart2e_intr_mask,
38389 - smart2e_fifo_full,
38390 - smart2e_intr_pending,
38391 - smart2e_completed,
38392 + .submit_command = smart2e_submit_command,
38393 + .set_intr_mask = smart2e_intr_mask,
38394 + .fifo_full = smart2e_fifo_full,
38395 + .intr_pending = smart2e_intr_pending,
38396 + .command_completed = smart2e_completed,
38397 };
38398
38399 /*
38400 @@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38401 }
38402
38403 static struct access_method smart1_access = {
38404 - smart1_submit_command,
38405 - smart1_intr_mask,
38406 - smart1_fifo_full,
38407 - smart1_intr_pending,
38408 - smart1_completed,
38409 + .submit_command = smart1_submit_command,
38410 + .set_intr_mask = smart1_intr_mask,
38411 + .fifo_full = smart1_fifo_full,
38412 + .intr_pending = smart1_intr_pending,
38413 + .command_completed = smart1_completed,
38414 };
38415 diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38416 index f038dba..bb74c08 100644
38417 --- a/drivers/bluetooth/btwilink.c
38418 +++ b/drivers/bluetooth/btwilink.c
38419 @@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38420
38421 static int bt_ti_probe(struct platform_device *pdev)
38422 {
38423 - static struct ti_st *hst;
38424 + struct ti_st *hst;
38425 struct hci_dev *hdev;
38426 int err;
38427
38428 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38429 index 5d28a45..a538f90 100644
38430 --- a/drivers/cdrom/cdrom.c
38431 +++ b/drivers/cdrom/cdrom.c
38432 @@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38433 ENSURE(reset, CDC_RESET);
38434 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38435 cdi->mc_flags = 0;
38436 - cdo->n_minors = 0;
38437 cdi->options = CDO_USE_FFLAGS;
38438
38439 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38440 @@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38441 else
38442 cdi->cdda_method = CDDA_OLD;
38443
38444 - if (!cdo->generic_packet)
38445 - cdo->generic_packet = cdrom_dummy_generic_packet;
38446 + if (!cdo->generic_packet) {
38447 + pax_open_kernel();
38448 + *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38449 + pax_close_kernel();
38450 + }
38451
38452 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38453 mutex_lock(&cdrom_mutex);
38454 @@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38455 if (cdi->exit)
38456 cdi->exit(cdi);
38457
38458 - cdi->ops->n_minors--;
38459 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38460 }
38461
38462 @@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38463 */
38464 nr = nframes;
38465 do {
38466 - cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38467 + cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38468 if (cgc.buffer)
38469 break;
38470
38471 @@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38472 struct cdrom_device_info *cdi;
38473 int ret;
38474
38475 - ret = scnprintf(info + *pos, max_size - *pos, header);
38476 + ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38477 if (!ret)
38478 return 1;
38479
38480 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38481 index 584bc31..e64a12c 100644
38482 --- a/drivers/cdrom/gdrom.c
38483 +++ b/drivers/cdrom/gdrom.c
38484 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38485 .audio_ioctl = gdrom_audio_ioctl,
38486 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38487 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38488 - .n_minors = 1,
38489 };
38490
38491 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38492 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38493 index efefd12..4f1d494 100644
38494 --- a/drivers/char/Kconfig
38495 +++ b/drivers/char/Kconfig
38496 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38497
38498 config DEVKMEM
38499 bool "/dev/kmem virtual device support"
38500 - default y
38501 + default n
38502 + depends on !GRKERNSEC_KMEM
38503 help
38504 Say Y here if you want to support the /dev/kmem device. The
38505 /dev/kmem device is rarely used, but can be used for certain
38506 @@ -577,6 +578,7 @@ config DEVPORT
38507 bool
38508 depends on !M68K
38509 depends on ISA || PCI
38510 + depends on !GRKERNSEC_KMEM
38511 default y
38512
38513 source "drivers/s390/char/Kconfig"
38514 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38515 index a48e05b..6bac831 100644
38516 --- a/drivers/char/agp/compat_ioctl.c
38517 +++ b/drivers/char/agp/compat_ioctl.c
38518 @@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38519 return -ENOMEM;
38520 }
38521
38522 - if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38523 + if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38524 sizeof(*usegment) * ureserve.seg_count)) {
38525 kfree(usegment);
38526 kfree(ksegment);
38527 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38528 index 09f17eb..8531d2f 100644
38529 --- a/drivers/char/agp/frontend.c
38530 +++ b/drivers/char/agp/frontend.c
38531 @@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38532 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38533 return -EFAULT;
38534
38535 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38536 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38537 return -EFAULT;
38538
38539 client = agp_find_client_by_pid(reserve.pid);
38540 @@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38541 if (segment == NULL)
38542 return -ENOMEM;
38543
38544 - if (copy_from_user(segment, (void __user *) reserve.seg_list,
38545 + if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38546 sizeof(struct agp_segment) * reserve.seg_count)) {
38547 kfree(segment);
38548 return -EFAULT;
38549 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38550 index 4f94375..413694e 100644
38551 --- a/drivers/char/genrtc.c
38552 +++ b/drivers/char/genrtc.c
38553 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38554 switch (cmd) {
38555
38556 case RTC_PLL_GET:
38557 + memset(&pll, 0, sizeof(pll));
38558 if (get_rtc_pll(&pll))
38559 return -EINVAL;
38560 else
38561 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38562 index d5d4cd8..22d561d 100644
38563 --- a/drivers/char/hpet.c
38564 +++ b/drivers/char/hpet.c
38565 @@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38566 }
38567
38568 static int
38569 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38570 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38571 struct hpet_info *info)
38572 {
38573 struct hpet_timer __iomem *timer;
38574 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38575 index f816211..89eadea 100644
38576 --- a/drivers/char/ipmi/ipmi_msghandler.c
38577 +++ b/drivers/char/ipmi/ipmi_msghandler.c
38578 @@ -438,7 +438,7 @@ struct ipmi_smi {
38579 struct proc_dir_entry *proc_dir;
38580 char proc_dir_name[10];
38581
38582 - atomic_t stats[IPMI_NUM_STATS];
38583 + atomic_unchecked_t stats[IPMI_NUM_STATS];
38584
38585 /*
38586 * run_to_completion duplicate of smb_info, smi_info
38587 @@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38588 static DEFINE_MUTEX(smi_watchers_mutex);
38589
38590 #define ipmi_inc_stat(intf, stat) \
38591 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38592 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38593 #define ipmi_get_stat(intf, stat) \
38594 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38595 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38596
38597 static int is_lan_addr(struct ipmi_addr *addr)
38598 {
38599 @@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38600 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38601 init_waitqueue_head(&intf->waitq);
38602 for (i = 0; i < IPMI_NUM_STATS; i++)
38603 - atomic_set(&intf->stats[i], 0);
38604 + atomic_set_unchecked(&intf->stats[i], 0);
38605
38606 intf->proc_dir = NULL;
38607
38608 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38609 index 5c4e1f6..0ea58f9 100644
38610 --- a/drivers/char/ipmi/ipmi_si_intf.c
38611 +++ b/drivers/char/ipmi/ipmi_si_intf.c
38612 @@ -285,7 +285,7 @@ struct smi_info {
38613 unsigned char slave_addr;
38614
38615 /* Counters and things for the proc filesystem. */
38616 - atomic_t stats[SI_NUM_STATS];
38617 + atomic_unchecked_t stats[SI_NUM_STATS];
38618
38619 struct task_struct *thread;
38620
38621 @@ -294,9 +294,9 @@ struct smi_info {
38622 };
38623
38624 #define smi_inc_stat(smi, stat) \
38625 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38626 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38627 #define smi_get_stat(smi, stat) \
38628 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38629 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38630
38631 #define SI_MAX_PARMS 4
38632
38633 @@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
38634 atomic_set(&new_smi->req_events, 0);
38635 new_smi->run_to_completion = false;
38636 for (i = 0; i < SI_NUM_STATS; i++)
38637 - atomic_set(&new_smi->stats[i], 0);
38638 + atomic_set_unchecked(&new_smi->stats[i], 0);
38639
38640 new_smi->interrupt_disabled = true;
38641 atomic_set(&new_smi->stop_operation, 0);
38642 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38643 index 524b707..29d07c1 100644
38644 --- a/drivers/char/mem.c
38645 +++ b/drivers/char/mem.c
38646 @@ -18,6 +18,7 @@
38647 #include <linux/raw.h>
38648 #include <linux/tty.h>
38649 #include <linux/capability.h>
38650 +#include <linux/security.h>
38651 #include <linux/ptrace.h>
38652 #include <linux/device.h>
38653 #include <linux/highmem.h>
38654 @@ -36,6 +37,10 @@
38655
38656 #define DEVPORT_MINOR 4
38657
38658 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38659 +extern const struct file_operations grsec_fops;
38660 +#endif
38661 +
38662 static inline unsigned long size_inside_page(unsigned long start,
38663 unsigned long size)
38664 {
38665 @@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38666
38667 while (cursor < to) {
38668 if (!devmem_is_allowed(pfn)) {
38669 +#ifdef CONFIG_GRKERNSEC_KMEM
38670 + gr_handle_mem_readwrite(from, to);
38671 +#else
38672 printk(KERN_INFO
38673 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38674 current->comm, from, to);
38675 +#endif
38676 return 0;
38677 }
38678 cursor += PAGE_SIZE;
38679 @@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38680 }
38681 return 1;
38682 }
38683 +#elif defined(CONFIG_GRKERNSEC_KMEM)
38684 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38685 +{
38686 + return 0;
38687 +}
38688 #else
38689 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38690 {
38691 @@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38692
38693 while (count > 0) {
38694 unsigned long remaining;
38695 + char *temp;
38696
38697 sz = size_inside_page(p, count);
38698
38699 @@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38700 if (!ptr)
38701 return -EFAULT;
38702
38703 - remaining = copy_to_user(buf, ptr, sz);
38704 +#ifdef CONFIG_PAX_USERCOPY
38705 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38706 + if (!temp) {
38707 + unxlate_dev_mem_ptr(p, ptr);
38708 + return -ENOMEM;
38709 + }
38710 + memcpy(temp, ptr, sz);
38711 +#else
38712 + temp = ptr;
38713 +#endif
38714 +
38715 + remaining = copy_to_user(buf, temp, sz);
38716 +
38717 +#ifdef CONFIG_PAX_USERCOPY
38718 + kfree(temp);
38719 +#endif
38720 +
38721 unxlate_dev_mem_ptr(p, ptr);
38722 if (remaining)
38723 return -EFAULT;
38724 @@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38725 size_t count, loff_t *ppos)
38726 {
38727 unsigned long p = *ppos;
38728 - ssize_t low_count, read, sz;
38729 + ssize_t low_count, read, sz, err = 0;
38730 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38731 - int err = 0;
38732
38733 read = 0;
38734 if (p < (unsigned long) high_memory) {
38735 @@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38736 }
38737 #endif
38738 while (low_count > 0) {
38739 + char *temp;
38740 +
38741 sz = size_inside_page(p, low_count);
38742
38743 /*
38744 @@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38745 */
38746 kbuf = xlate_dev_kmem_ptr((char *)p);
38747
38748 - if (copy_to_user(buf, kbuf, sz))
38749 +#ifdef CONFIG_PAX_USERCOPY
38750 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38751 + if (!temp)
38752 + return -ENOMEM;
38753 + memcpy(temp, kbuf, sz);
38754 +#else
38755 + temp = kbuf;
38756 +#endif
38757 +
38758 + err = copy_to_user(buf, temp, sz);
38759 +
38760 +#ifdef CONFIG_PAX_USERCOPY
38761 + kfree(temp);
38762 +#endif
38763 +
38764 + if (err)
38765 return -EFAULT;
38766 buf += sz;
38767 p += sz;
38768 @@ -797,6 +844,9 @@ static const struct memdev {
38769 #ifdef CONFIG_PRINTK
38770 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38771 #endif
38772 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38773 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38774 +#endif
38775 };
38776
38777 static int memory_open(struct inode *inode, struct file *filp)
38778 @@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
38779 continue;
38780
38781 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38782 - NULL, devlist[minor].name);
38783 + NULL, "%s", devlist[minor].name);
38784 }
38785
38786 return tty_init();
38787 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38788 index 9df78e2..01ba9ae 100644
38789 --- a/drivers/char/nvram.c
38790 +++ b/drivers/char/nvram.c
38791 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38792
38793 spin_unlock_irq(&rtc_lock);
38794
38795 - if (copy_to_user(buf, contents, tmp - contents))
38796 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38797 return -EFAULT;
38798
38799 *ppos = i;
38800 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38801 index 0ea9986..e7b07e4 100644
38802 --- a/drivers/char/pcmcia/synclink_cs.c
38803 +++ b/drivers/char/pcmcia/synclink_cs.c
38804 @@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38805
38806 if (debug_level >= DEBUG_LEVEL_INFO)
38807 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38808 - __FILE__, __LINE__, info->device_name, port->count);
38809 + __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38810
38811 if (tty_port_close_start(port, tty, filp) == 0)
38812 goto cleanup;
38813 @@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38814 cleanup:
38815 if (debug_level >= DEBUG_LEVEL_INFO)
38816 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38817 - tty->driver->name, port->count);
38818 + tty->driver->name, atomic_read(&port->count));
38819 }
38820
38821 /* Wait until the transmitter is empty.
38822 @@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38823
38824 if (debug_level >= DEBUG_LEVEL_INFO)
38825 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38826 - __FILE__, __LINE__, tty->driver->name, port->count);
38827 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38828
38829 /* If port is closing, signal caller to try again */
38830 if (port->flags & ASYNC_CLOSING){
38831 @@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38832 goto cleanup;
38833 }
38834 spin_lock(&port->lock);
38835 - port->count++;
38836 + atomic_inc(&port->count);
38837 spin_unlock(&port->lock);
38838 spin_unlock_irqrestore(&info->netlock, flags);
38839
38840 - if (port->count == 1) {
38841 + if (atomic_read(&port->count) == 1) {
38842 /* 1st open on this device, init hardware */
38843 retval = startup(info, tty);
38844 if (retval < 0)
38845 @@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38846 unsigned short new_crctype;
38847
38848 /* return error if TTY interface open */
38849 - if (info->port.count)
38850 + if (atomic_read(&info->port.count))
38851 return -EBUSY;
38852
38853 switch (encoding)
38854 @@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38855
38856 /* arbitrate between network and tty opens */
38857 spin_lock_irqsave(&info->netlock, flags);
38858 - if (info->port.count != 0 || info->netcount != 0) {
38859 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38860 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38861 spin_unlock_irqrestore(&info->netlock, flags);
38862 return -EBUSY;
38863 @@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38864 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38865
38866 /* return error if TTY interface open */
38867 - if (info->port.count)
38868 + if (atomic_read(&info->port.count))
38869 return -EBUSY;
38870
38871 if (cmd != SIOCWANDEV)
38872 diff --git a/drivers/char/random.c b/drivers/char/random.c
38873 index 04645c0..560e350 100644
38874 --- a/drivers/char/random.c
38875 +++ b/drivers/char/random.c
38876 @@ -289,9 +289,6 @@
38877 /*
38878 * To allow fractional bits to be tracked, the entropy_count field is
38879 * denominated in units of 1/8th bits.
38880 - *
38881 - * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38882 - * credit_entropy_bits() needs to be 64 bits wide.
38883 */
38884 #define ENTROPY_SHIFT 3
38885 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38886 @@ -439,9 +436,9 @@ struct entropy_store {
38887 };
38888
38889 static void push_to_pool(struct work_struct *work);
38890 -static __u32 input_pool_data[INPUT_POOL_WORDS];
38891 -static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38892 -static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38893 +static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38894 +static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38895 +static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38896
38897 static struct entropy_store input_pool = {
38898 .poolinfo = &poolinfo_table[0],
38899 @@ -635,7 +632,7 @@ retry:
38900 /* The +2 corresponds to the /4 in the denominator */
38901
38902 do {
38903 - unsigned int anfrac = min(pnfrac, pool_size/2);
38904 + u64 anfrac = min(pnfrac, pool_size/2);
38905 unsigned int add =
38906 ((pool_size - entropy_count)*anfrac*3) >> s;
38907
38908 @@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38909
38910 extract_buf(r, tmp);
38911 i = min_t(int, nbytes, EXTRACT_SIZE);
38912 - if (copy_to_user(buf, tmp, i)) {
38913 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38914 ret = -EFAULT;
38915 break;
38916 }
38917 @@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
38918 static int proc_do_uuid(struct ctl_table *table, int write,
38919 void __user *buffer, size_t *lenp, loff_t *ppos)
38920 {
38921 - struct ctl_table fake_table;
38922 + ctl_table_no_const fake_table;
38923 unsigned char buf[64], tmp_uuid[16], *uuid;
38924
38925 uuid = table->data;
38926 @@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38927 static int proc_do_entropy(struct ctl_table *table, int write,
38928 void __user *buffer, size_t *lenp, loff_t *ppos)
38929 {
38930 - struct ctl_table fake_table;
38931 + ctl_table_no_const fake_table;
38932 int entropy_count;
38933
38934 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38935 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38936 index 7cc1fe22..b602d6b 100644
38937 --- a/drivers/char/sonypi.c
38938 +++ b/drivers/char/sonypi.c
38939 @@ -54,6 +54,7 @@
38940
38941 #include <asm/uaccess.h>
38942 #include <asm/io.h>
38943 +#include <asm/local.h>
38944
38945 #include <linux/sonypi.h>
38946
38947 @@ -490,7 +491,7 @@ static struct sonypi_device {
38948 spinlock_t fifo_lock;
38949 wait_queue_head_t fifo_proc_list;
38950 struct fasync_struct *fifo_async;
38951 - int open_count;
38952 + local_t open_count;
38953 int model;
38954 struct input_dev *input_jog_dev;
38955 struct input_dev *input_key_dev;
38956 @@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38957 static int sonypi_misc_release(struct inode *inode, struct file *file)
38958 {
38959 mutex_lock(&sonypi_device.lock);
38960 - sonypi_device.open_count--;
38961 + local_dec(&sonypi_device.open_count);
38962 mutex_unlock(&sonypi_device.lock);
38963 return 0;
38964 }
38965 @@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38966 {
38967 mutex_lock(&sonypi_device.lock);
38968 /* Flush input queue on first open */
38969 - if (!sonypi_device.open_count)
38970 + if (!local_read(&sonypi_device.open_count))
38971 kfifo_reset(&sonypi_device.fifo);
38972 - sonypi_device.open_count++;
38973 + local_inc(&sonypi_device.open_count);
38974 mutex_unlock(&sonypi_device.lock);
38975
38976 return 0;
38977 diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
38978 index 565a947..dcdc06e 100644
38979 --- a/drivers/char/tpm/tpm_acpi.c
38980 +++ b/drivers/char/tpm/tpm_acpi.c
38981 @@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
38982 virt = acpi_os_map_iomem(start, len);
38983 if (!virt) {
38984 kfree(log->bios_event_log);
38985 + log->bios_event_log = NULL;
38986 printk("%s: ERROR - Unable to map memory\n", __func__);
38987 return -EIO;
38988 }
38989
38990 - memcpy_fromio(log->bios_event_log, virt, len);
38991 + memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
38992
38993 acpi_os_unmap_iomem(virt, len);
38994 return 0;
38995 diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
38996 index 3a56a13..f8cbd25 100644
38997 --- a/drivers/char/tpm/tpm_eventlog.c
38998 +++ b/drivers/char/tpm/tpm_eventlog.c
38999 @@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39000 event = addr;
39001
39002 if ((event->event_type == 0 && event->event_size == 0) ||
39003 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39004 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39005 return NULL;
39006
39007 return addr;
39008 @@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39009 return NULL;
39010
39011 if ((event->event_type == 0 && event->event_size == 0) ||
39012 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39013 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39014 return NULL;
39015
39016 (*pos)++;
39017 @@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39018 int i;
39019
39020 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39021 - seq_putc(m, data[i]);
39022 + if (!seq_putc(m, data[i]))
39023 + return -EFAULT;
39024
39025 return 0;
39026 }
39027 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39028 index cf7a561..c319ce0 100644
39029 --- a/drivers/char/virtio_console.c
39030 +++ b/drivers/char/virtio_console.c
39031 @@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
39032 if (to_user) {
39033 ssize_t ret;
39034
39035 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39036 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39037 if (ret)
39038 return -EFAULT;
39039 } else {
39040 @@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39041 if (!port_has_data(port) && !port->host_connected)
39042 return 0;
39043
39044 - return fill_readbuf(port, ubuf, count, true);
39045 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39046 }
39047
39048 static int wait_port_writable(struct port *port, bool nonblock)
39049 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39050 index b9355da..9611f4e 100644
39051 --- a/drivers/clk/clk-composite.c
39052 +++ b/drivers/clk/clk-composite.c
39053 @@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39054 struct clk *clk;
39055 struct clk_init_data init;
39056 struct clk_composite *composite;
39057 - struct clk_ops *clk_composite_ops;
39058 + clk_ops_no_const *clk_composite_ops;
39059
39060 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39061 if (!composite) {
39062 diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39063 index dd3a78c..386d49c 100644
39064 --- a/drivers/clk/socfpga/clk-gate.c
39065 +++ b/drivers/clk/socfpga/clk-gate.c
39066 @@ -22,6 +22,7 @@
39067 #include <linux/mfd/syscon.h>
39068 #include <linux/of.h>
39069 #include <linux/regmap.h>
39070 +#include <asm/pgtable.h>
39071
39072 #include "clk.h"
39073
39074 @@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39075 return 0;
39076 }
39077
39078 -static struct clk_ops gateclk_ops = {
39079 +static clk_ops_no_const gateclk_ops __read_only = {
39080 .prepare = socfpga_clk_prepare,
39081 .recalc_rate = socfpga_clk_recalc_rate,
39082 .get_parent = socfpga_clk_get_parent,
39083 @@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39084 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39085 socfpga_clk->hw.bit_idx = clk_gate[1];
39086
39087 - gateclk_ops.enable = clk_gate_ops.enable;
39088 - gateclk_ops.disable = clk_gate_ops.disable;
39089 + pax_open_kernel();
39090 + *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39091 + *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39092 + pax_close_kernel();
39093 }
39094
39095 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39096 diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39097 index de6da95..c98278b 100644
39098 --- a/drivers/clk/socfpga/clk-pll.c
39099 +++ b/drivers/clk/socfpga/clk-pll.c
39100 @@ -21,6 +21,7 @@
39101 #include <linux/io.h>
39102 #include <linux/of.h>
39103 #include <linux/of_address.h>
39104 +#include <asm/pgtable.h>
39105
39106 #include "clk.h"
39107
39108 @@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39109 CLK_MGR_PLL_CLK_SRC_MASK;
39110 }
39111
39112 -static struct clk_ops clk_pll_ops = {
39113 +static clk_ops_no_const clk_pll_ops __read_only = {
39114 .recalc_rate = clk_pll_recalc_rate,
39115 .get_parent = clk_pll_get_parent,
39116 };
39117 @@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39118 pll_clk->hw.hw.init = &init;
39119
39120 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39121 - clk_pll_ops.enable = clk_gate_ops.enable;
39122 - clk_pll_ops.disable = clk_gate_ops.disable;
39123 + pax_open_kernel();
39124 + *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39125 + *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39126 + pax_close_kernel();
39127
39128 clk = clk_register(NULL, &pll_clk->hw.hw);
39129 if (WARN_ON(IS_ERR(clk))) {
39130 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39131 index b0c18ed..1713a80 100644
39132 --- a/drivers/cpufreq/acpi-cpufreq.c
39133 +++ b/drivers/cpufreq/acpi-cpufreq.c
39134 @@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39135 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39136 per_cpu(acfreq_data, cpu) = data;
39137
39138 - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39139 - acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39140 + if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39141 + pax_open_kernel();
39142 + *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39143 + pax_close_kernel();
39144 + }
39145
39146 result = acpi_processor_register_performance(data->acpi_data, cpu);
39147 if (result)
39148 @@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39149 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39150 break;
39151 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39152 - acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39153 + pax_open_kernel();
39154 + *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39155 + pax_close_kernel();
39156 break;
39157 default:
39158 break;
39159 @@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39160 if (!msrs)
39161 return;
39162
39163 - acpi_cpufreq_driver.boost_supported = true;
39164 - acpi_cpufreq_driver.boost_enabled = boost_state(0);
39165 + pax_open_kernel();
39166 + *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39167 + *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39168 + pax_close_kernel();
39169
39170 cpu_notifier_register_begin();
39171
39172 diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39173 index f657c57..31d97ae 100644
39174 --- a/drivers/cpufreq/cpufreq-dt.c
39175 +++ b/drivers/cpufreq/cpufreq-dt.c
39176 @@ -362,7 +362,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39177 if (!IS_ERR(cpu_reg))
39178 regulator_put(cpu_reg);
39179
39180 - dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39181 + pax_open_kernel();
39182 + *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39183 + pax_close_kernel();
39184
39185 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39186 if (ret)
39187 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39188 index 4473eba..a4c9dc2 100644
39189 --- a/drivers/cpufreq/cpufreq.c
39190 +++ b/drivers/cpufreq/cpufreq.c
39191 @@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39192 }
39193
39194 mutex_lock(&cpufreq_governor_mutex);
39195 - list_del(&governor->governor_list);
39196 + pax_list_del(&governor->governor_list);
39197 mutex_unlock(&cpufreq_governor_mutex);
39198 return;
39199 }
39200 @@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39201 return NOTIFY_OK;
39202 }
39203
39204 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
39205 +static struct notifier_block cpufreq_cpu_notifier = {
39206 .notifier_call = cpufreq_cpu_callback,
39207 };
39208
39209 @@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
39210 return 0;
39211
39212 write_lock_irqsave(&cpufreq_driver_lock, flags);
39213 - cpufreq_driver->boost_enabled = state;
39214 + pax_open_kernel();
39215 + *(bool *)&cpufreq_driver->boost_enabled = state;
39216 + pax_close_kernel();
39217 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39218
39219 ret = cpufreq_driver->set_boost(state);
39220 if (ret) {
39221 write_lock_irqsave(&cpufreq_driver_lock, flags);
39222 - cpufreq_driver->boost_enabled = !state;
39223 + pax_open_kernel();
39224 + *(bool *)&cpufreq_driver->boost_enabled = !state;
39225 + pax_close_kernel();
39226 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39227
39228 pr_err("%s: Cannot %s BOOST\n",
39229 @@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39230
39231 pr_debug("trying to register driver %s\n", driver_data->name);
39232
39233 - if (driver_data->setpolicy)
39234 - driver_data->flags |= CPUFREQ_CONST_LOOPS;
39235 + if (driver_data->setpolicy) {
39236 + pax_open_kernel();
39237 + *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39238 + pax_close_kernel();
39239 + }
39240
39241 write_lock_irqsave(&cpufreq_driver_lock, flags);
39242 if (cpufreq_driver) {
39243 @@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39244 * Check if driver provides function to enable boost -
39245 * if not, use cpufreq_boost_set_sw as default
39246 */
39247 - if (!cpufreq_driver->set_boost)
39248 - cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39249 + if (!cpufreq_driver->set_boost) {
39250 + pax_open_kernel();
39251 + *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39252 + pax_close_kernel();
39253 + }
39254
39255 ret = cpufreq_sysfs_create_file(&boost.attr);
39256 if (ret) {
39257 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39258 index 1b44496..b80ff5e 100644
39259 --- a/drivers/cpufreq/cpufreq_governor.c
39260 +++ b/drivers/cpufreq/cpufreq_governor.c
39261 @@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39262 struct dbs_data *dbs_data;
39263 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39264 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39265 - struct od_ops *od_ops = NULL;
39266 + const struct od_ops *od_ops = NULL;
39267 struct od_dbs_tuners *od_tuners = NULL;
39268 struct cs_dbs_tuners *cs_tuners = NULL;
39269 struct cpu_dbs_common_info *cpu_cdbs;
39270 @@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39271
39272 if ((cdata->governor == GOV_CONSERVATIVE) &&
39273 (!policy->governor->initialized)) {
39274 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39275 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39276
39277 cpufreq_register_notifier(cs_ops->notifier_block,
39278 CPUFREQ_TRANSITION_NOTIFIER);
39279 @@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39280
39281 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39282 (policy->governor->initialized == 1)) {
39283 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39284 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39285
39286 cpufreq_unregister_notifier(cs_ops->notifier_block,
39287 CPUFREQ_TRANSITION_NOTIFIER);
39288 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39289 index cc401d1..8197340 100644
39290 --- a/drivers/cpufreq/cpufreq_governor.h
39291 +++ b/drivers/cpufreq/cpufreq_governor.h
39292 @@ -212,7 +212,7 @@ struct common_dbs_data {
39293 void (*exit)(struct dbs_data *dbs_data);
39294
39295 /* Governor specific ops, see below */
39296 - void *gov_ops;
39297 + const void *gov_ops;
39298 };
39299
39300 /* Governor Per policy data */
39301 @@ -232,7 +232,7 @@ struct od_ops {
39302 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39303 unsigned int freq_next, unsigned int relation);
39304 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39305 -};
39306 +} __no_const;
39307
39308 struct cs_ops {
39309 struct notifier_block *notifier_block;
39310 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39311 index ad3f38f..8f086cd 100644
39312 --- a/drivers/cpufreq/cpufreq_ondemand.c
39313 +++ b/drivers/cpufreq/cpufreq_ondemand.c
39314 @@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39315
39316 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39317
39318 -static struct od_ops od_ops = {
39319 +static struct od_ops od_ops __read_only = {
39320 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39321 .powersave_bias_target = generic_powersave_bias_target,
39322 .freq_increase = dbs_freq_increase,
39323 @@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39324 (struct cpufreq_policy *, unsigned int, unsigned int),
39325 unsigned int powersave_bias)
39326 {
39327 - od_ops.powersave_bias_target = f;
39328 + pax_open_kernel();
39329 + *(void **)&od_ops.powersave_bias_target = f;
39330 + pax_close_kernel();
39331 od_set_powersave_bias(powersave_bias);
39332 }
39333 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39334
39335 void od_unregister_powersave_bias_handler(void)
39336 {
39337 - od_ops.powersave_bias_target = generic_powersave_bias_target;
39338 + pax_open_kernel();
39339 + *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39340 + pax_close_kernel();
39341 od_set_powersave_bias(0);
39342 }
39343 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39344 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39345 index 27bb6d3..4cf595c 100644
39346 --- a/drivers/cpufreq/intel_pstate.c
39347 +++ b/drivers/cpufreq/intel_pstate.c
39348 @@ -133,10 +133,10 @@ struct pstate_funcs {
39349 struct cpu_defaults {
39350 struct pstate_adjust_policy pid_policy;
39351 struct pstate_funcs funcs;
39352 -};
39353 +} __do_const;
39354
39355 static struct pstate_adjust_policy pid_params;
39356 -static struct pstate_funcs pstate_funcs;
39357 +static struct pstate_funcs *pstate_funcs;
39358
39359 struct perf_limits {
39360 int no_turbo;
39361 @@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39362
39363 cpu->pstate.current_pstate = pstate;
39364
39365 - pstate_funcs.set(cpu, pstate);
39366 + pstate_funcs->set(cpu, pstate);
39367 }
39368
39369 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39370 {
39371 - cpu->pstate.min_pstate = pstate_funcs.get_min();
39372 - cpu->pstate.max_pstate = pstate_funcs.get_max();
39373 - cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39374 - cpu->pstate.scaling = pstate_funcs.get_scaling();
39375 + cpu->pstate.min_pstate = pstate_funcs->get_min();
39376 + cpu->pstate.max_pstate = pstate_funcs->get_max();
39377 + cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39378 + cpu->pstate.scaling = pstate_funcs->get_scaling();
39379
39380 - if (pstate_funcs.get_vid)
39381 - pstate_funcs.get_vid(cpu);
39382 + if (pstate_funcs->get_vid)
39383 + pstate_funcs->get_vid(cpu);
39384 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39385 }
39386
39387 @@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
39388 rdmsrl(MSR_IA32_APERF, aperf);
39389 rdmsrl(MSR_IA32_MPERF, mperf);
39390
39391 - if (!pstate_funcs.get_max() ||
39392 - !pstate_funcs.get_min() ||
39393 - !pstate_funcs.get_turbo())
39394 + if (!pstate_funcs->get_max() ||
39395 + !pstate_funcs->get_min() ||
39396 + !pstate_funcs->get_turbo())
39397 return -ENODEV;
39398
39399 rdmsrl(MSR_IA32_APERF, tmp);
39400 @@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
39401 return 0;
39402 }
39403
39404 -static void copy_pid_params(struct pstate_adjust_policy *policy)
39405 +static void copy_pid_params(const struct pstate_adjust_policy *policy)
39406 {
39407 pid_params.sample_rate_ms = policy->sample_rate_ms;
39408 pid_params.p_gain_pct = policy->p_gain_pct;
39409 @@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39410
39411 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39412 {
39413 - pstate_funcs.get_max = funcs->get_max;
39414 - pstate_funcs.get_min = funcs->get_min;
39415 - pstate_funcs.get_turbo = funcs->get_turbo;
39416 - pstate_funcs.get_scaling = funcs->get_scaling;
39417 - pstate_funcs.set = funcs->set;
39418 - pstate_funcs.get_vid = funcs->get_vid;
39419 + pstate_funcs = funcs;
39420 }
39421
39422 #if IS_ENABLED(CONFIG_ACPI)
39423 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39424 index 529cfd9..0e28fff 100644
39425 --- a/drivers/cpufreq/p4-clockmod.c
39426 +++ b/drivers/cpufreq/p4-clockmod.c
39427 @@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39428 case 0x0F: /* Core Duo */
39429 case 0x16: /* Celeron Core */
39430 case 0x1C: /* Atom */
39431 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39432 + pax_open_kernel();
39433 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39434 + pax_close_kernel();
39435 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39436 case 0x0D: /* Pentium M (Dothan) */
39437 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39438 + pax_open_kernel();
39439 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39440 + pax_close_kernel();
39441 /* fall through */
39442 case 0x09: /* Pentium M (Banias) */
39443 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39444 @@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39445
39446 /* on P-4s, the TSC runs with constant frequency independent whether
39447 * throttling is active or not. */
39448 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39449 + pax_open_kernel();
39450 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39451 + pax_close_kernel();
39452
39453 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39454 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39455 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39456 index 9bb42ba..b01b4a2 100644
39457 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
39458 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39459 @@ -18,14 +18,12 @@
39460 #include <asm/head.h>
39461 #include <asm/timer.h>
39462
39463 -static struct cpufreq_driver *cpufreq_us3_driver;
39464 -
39465 struct us3_freq_percpu_info {
39466 struct cpufreq_frequency_table table[4];
39467 };
39468
39469 /* Indexed by cpu number. */
39470 -static struct us3_freq_percpu_info *us3_freq_table;
39471 +static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39472
39473 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39474 * in the Safari config register.
39475 @@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39476
39477 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39478 {
39479 - if (cpufreq_us3_driver)
39480 - us3_freq_target(policy, 0);
39481 + us3_freq_target(policy, 0);
39482
39483 return 0;
39484 }
39485
39486 +static int __init us3_freq_init(void);
39487 +static void __exit us3_freq_exit(void);
39488 +
39489 +static struct cpufreq_driver cpufreq_us3_driver = {
39490 + .init = us3_freq_cpu_init,
39491 + .verify = cpufreq_generic_frequency_table_verify,
39492 + .target_index = us3_freq_target,
39493 + .get = us3_freq_get,
39494 + .exit = us3_freq_cpu_exit,
39495 + .name = "UltraSPARC-III",
39496 +
39497 +};
39498 +
39499 static int __init us3_freq_init(void)
39500 {
39501 unsigned long manuf, impl, ver;
39502 - int ret;
39503
39504 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39505 return -ENODEV;
39506 @@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39507 (impl == CHEETAH_IMPL ||
39508 impl == CHEETAH_PLUS_IMPL ||
39509 impl == JAGUAR_IMPL ||
39510 - impl == PANTHER_IMPL)) {
39511 - struct cpufreq_driver *driver;
39512 -
39513 - ret = -ENOMEM;
39514 - driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39515 - if (!driver)
39516 - goto err_out;
39517 -
39518 - us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39519 - GFP_KERNEL);
39520 - if (!us3_freq_table)
39521 - goto err_out;
39522 -
39523 - driver->init = us3_freq_cpu_init;
39524 - driver->verify = cpufreq_generic_frequency_table_verify;
39525 - driver->target_index = us3_freq_target;
39526 - driver->get = us3_freq_get;
39527 - driver->exit = us3_freq_cpu_exit;
39528 - strcpy(driver->name, "UltraSPARC-III");
39529 -
39530 - cpufreq_us3_driver = driver;
39531 - ret = cpufreq_register_driver(driver);
39532 - if (ret)
39533 - goto err_out;
39534 -
39535 - return 0;
39536 -
39537 -err_out:
39538 - if (driver) {
39539 - kfree(driver);
39540 - cpufreq_us3_driver = NULL;
39541 - }
39542 - kfree(us3_freq_table);
39543 - us3_freq_table = NULL;
39544 - return ret;
39545 - }
39546 + impl == PANTHER_IMPL))
39547 + return cpufreq_register_driver(&cpufreq_us3_driver);
39548
39549 return -ENODEV;
39550 }
39551
39552 static void __exit us3_freq_exit(void)
39553 {
39554 - if (cpufreq_us3_driver) {
39555 - cpufreq_unregister_driver(cpufreq_us3_driver);
39556 - kfree(cpufreq_us3_driver);
39557 - cpufreq_us3_driver = NULL;
39558 - kfree(us3_freq_table);
39559 - us3_freq_table = NULL;
39560 - }
39561 + cpufreq_unregister_driver(&cpufreq_us3_driver);
39562 }
39563
39564 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39565 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39566 index 7d4a315..21bb886 100644
39567 --- a/drivers/cpufreq/speedstep-centrino.c
39568 +++ b/drivers/cpufreq/speedstep-centrino.c
39569 @@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39570 !cpu_has(cpu, X86_FEATURE_EST))
39571 return -ENODEV;
39572
39573 - if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39574 - centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39575 + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39576 + pax_open_kernel();
39577 + *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39578 + pax_close_kernel();
39579 + }
39580
39581 if (policy->cpu != 0)
39582 return -ENODEV;
39583 diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39584 index e431d11..d0b997e 100644
39585 --- a/drivers/cpuidle/driver.c
39586 +++ b/drivers/cpuidle/driver.c
39587 @@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39588
39589 static void poll_idle_init(struct cpuidle_driver *drv)
39590 {
39591 - struct cpuidle_state *state = &drv->states[0];
39592 + cpuidle_state_no_const *state = &drv->states[0];
39593
39594 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39595 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39596 diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39597 index fb9f511..213e6cc 100644
39598 --- a/drivers/cpuidle/governor.c
39599 +++ b/drivers/cpuidle/governor.c
39600 @@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39601 mutex_lock(&cpuidle_lock);
39602 if (__cpuidle_find_governor(gov->name) == NULL) {
39603 ret = 0;
39604 - list_add_tail(&gov->governor_list, &cpuidle_governors);
39605 + pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39606 if (!cpuidle_curr_governor ||
39607 cpuidle_curr_governor->rating < gov->rating)
39608 cpuidle_switch_governor(gov);
39609 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39610 index 97c5903..023ad23 100644
39611 --- a/drivers/cpuidle/sysfs.c
39612 +++ b/drivers/cpuidle/sysfs.c
39613 @@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39614 NULL
39615 };
39616
39617 -static struct attribute_group cpuidle_attr_group = {
39618 +static attribute_group_no_const cpuidle_attr_group = {
39619 .attrs = cpuidle_default_attrs,
39620 .name = "cpuidle",
39621 };
39622 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39623 index 8d2a772..33826c9 100644
39624 --- a/drivers/crypto/hifn_795x.c
39625 +++ b/drivers/crypto/hifn_795x.c
39626 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39627 MODULE_PARM_DESC(hifn_pll_ref,
39628 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39629
39630 -static atomic_t hifn_dev_number;
39631 +static atomic_unchecked_t hifn_dev_number;
39632
39633 #define ACRYPTO_OP_DECRYPT 0
39634 #define ACRYPTO_OP_ENCRYPT 1
39635 @@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39636 goto err_out_disable_pci_device;
39637
39638 snprintf(name, sizeof(name), "hifn%d",
39639 - atomic_inc_return(&hifn_dev_number)-1);
39640 + atomic_inc_return_unchecked(&hifn_dev_number)-1);
39641
39642 err = pci_request_regions(pdev, name);
39643 if (err)
39644 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39645 index 30b538d8..1610d75 100644
39646 --- a/drivers/devfreq/devfreq.c
39647 +++ b/drivers/devfreq/devfreq.c
39648 @@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39649 goto err_out;
39650 }
39651
39652 - list_add(&governor->node, &devfreq_governor_list);
39653 + pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39654
39655 list_for_each_entry(devfreq, &devfreq_list, node) {
39656 int ret = 0;
39657 @@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39658 }
39659 }
39660
39661 - list_del(&governor->node);
39662 + pax_list_del((struct list_head *)&governor->node);
39663 err_out:
39664 mutex_unlock(&devfreq_list_lock);
39665
39666 diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39667 index 42d4974..2714f36 100644
39668 --- a/drivers/dma/sh/shdma-base.c
39669 +++ b/drivers/dma/sh/shdma-base.c
39670 @@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39671 schan->slave_id = -EINVAL;
39672 }
39673
39674 - schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39675 - sdev->desc_size, GFP_KERNEL);
39676 + schan->desc = kcalloc(sdev->desc_size,
39677 + NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39678 if (!schan->desc) {
39679 ret = -ENOMEM;
39680 goto edescalloc;
39681 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39682 index 58eb857..d7e42c8 100644
39683 --- a/drivers/dma/sh/shdmac.c
39684 +++ b/drivers/dma/sh/shdmac.c
39685 @@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39686 return ret;
39687 }
39688
39689 -static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39690 +static struct notifier_block sh_dmae_nmi_notifier = {
39691 .notifier_call = sh_dmae_nmi_handler,
39692
39693 /* Run before NMI debug handler and KGDB */
39694 diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39695 index 592af5f..bb1d583 100644
39696 --- a/drivers/edac/edac_device.c
39697 +++ b/drivers/edac/edac_device.c
39698 @@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39699 */
39700 int edac_device_alloc_index(void)
39701 {
39702 - static atomic_t device_indexes = ATOMIC_INIT(0);
39703 + static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39704
39705 - return atomic_inc_return(&device_indexes) - 1;
39706 + return atomic_inc_return_unchecked(&device_indexes) - 1;
39707 }
39708 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39709
39710 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39711 index a6cd361..7bdbf53 100644
39712 --- a/drivers/edac/edac_mc_sysfs.c
39713 +++ b/drivers/edac/edac_mc_sysfs.c
39714 @@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39715 struct dev_ch_attribute {
39716 struct device_attribute attr;
39717 int channel;
39718 -};
39719 +} __do_const;
39720
39721 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39722 struct dev_ch_attribute dev_attr_legacy_##_name = \
39723 @@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39724 }
39725
39726 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39727 + pax_open_kernel();
39728 if (mci->get_sdram_scrub_rate) {
39729 - dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39730 - dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39731 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39732 + *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39733 }
39734 if (mci->set_sdram_scrub_rate) {
39735 - dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39736 - dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39737 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39738 + *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39739 }
39740 + pax_close_kernel();
39741 err = device_create_file(&mci->dev,
39742 &dev_attr_sdram_scrub_rate);
39743 if (err) {
39744 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39745 index 2cf44b4d..6dd2dc7 100644
39746 --- a/drivers/edac/edac_pci.c
39747 +++ b/drivers/edac/edac_pci.c
39748 @@ -29,7 +29,7 @@
39749
39750 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39751 static LIST_HEAD(edac_pci_list);
39752 -static atomic_t pci_indexes = ATOMIC_INIT(0);
39753 +static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39754
39755 /*
39756 * edac_pci_alloc_ctl_info
39757 @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39758 */
39759 int edac_pci_alloc_index(void)
39760 {
39761 - return atomic_inc_return(&pci_indexes) - 1;
39762 + return atomic_inc_return_unchecked(&pci_indexes) - 1;
39763 }
39764 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39765
39766 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39767 index e8658e4..22746d6 100644
39768 --- a/drivers/edac/edac_pci_sysfs.c
39769 +++ b/drivers/edac/edac_pci_sysfs.c
39770 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39771 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39772 static int edac_pci_poll_msec = 1000; /* one second workq period */
39773
39774 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
39775 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39776 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39777 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39778
39779 static struct kobject *edac_pci_top_main_kobj;
39780 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39781 @@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39782 void *value;
39783 ssize_t(*show) (void *, char *);
39784 ssize_t(*store) (void *, const char *, size_t);
39785 -};
39786 +} __do_const;
39787
39788 /* Set of show/store abstract level functions for PCI Parity object */
39789 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39790 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39791 edac_printk(KERN_CRIT, EDAC_PCI,
39792 "Signaled System Error on %s\n",
39793 pci_name(dev));
39794 - atomic_inc(&pci_nonparity_count);
39795 + atomic_inc_unchecked(&pci_nonparity_count);
39796 }
39797
39798 if (status & (PCI_STATUS_PARITY)) {
39799 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39800 "Master Data Parity Error on %s\n",
39801 pci_name(dev));
39802
39803 - atomic_inc(&pci_parity_count);
39804 + atomic_inc_unchecked(&pci_parity_count);
39805 }
39806
39807 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39808 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39809 "Detected Parity Error on %s\n",
39810 pci_name(dev));
39811
39812 - atomic_inc(&pci_parity_count);
39813 + atomic_inc_unchecked(&pci_parity_count);
39814 }
39815 }
39816
39817 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39818 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39819 "Signaled System Error on %s\n",
39820 pci_name(dev));
39821 - atomic_inc(&pci_nonparity_count);
39822 + atomic_inc_unchecked(&pci_nonparity_count);
39823 }
39824
39825 if (status & (PCI_STATUS_PARITY)) {
39826 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39827 "Master Data Parity Error on "
39828 "%s\n", pci_name(dev));
39829
39830 - atomic_inc(&pci_parity_count);
39831 + atomic_inc_unchecked(&pci_parity_count);
39832 }
39833
39834 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39835 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39836 "Detected Parity Error on %s\n",
39837 pci_name(dev));
39838
39839 - atomic_inc(&pci_parity_count);
39840 + atomic_inc_unchecked(&pci_parity_count);
39841 }
39842 }
39843 }
39844 @@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39845 if (!check_pci_errors)
39846 return;
39847
39848 - before_count = atomic_read(&pci_parity_count);
39849 + before_count = atomic_read_unchecked(&pci_parity_count);
39850
39851 /* scan all PCI devices looking for a Parity Error on devices and
39852 * bridges.
39853 @@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39854 /* Only if operator has selected panic on PCI Error */
39855 if (edac_pci_get_panic_on_pe()) {
39856 /* If the count is different 'after' from 'before' */
39857 - if (before_count != atomic_read(&pci_parity_count))
39858 + if (before_count != atomic_read_unchecked(&pci_parity_count))
39859 panic("EDAC: PCI Parity Error");
39860 }
39861 }
39862 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39863 index 51b7e3a..aa8a3e8 100644
39864 --- a/drivers/edac/mce_amd.h
39865 +++ b/drivers/edac/mce_amd.h
39866 @@ -77,7 +77,7 @@ struct amd_decoder_ops {
39867 bool (*mc0_mce)(u16, u8);
39868 bool (*mc1_mce)(u16, u8);
39869 bool (*mc2_mce)(u16, u8);
39870 -};
39871 +} __no_const;
39872
39873 void amd_report_gart_errors(bool);
39874 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39875 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39876 index 57ea7f4..af06b76 100644
39877 --- a/drivers/firewire/core-card.c
39878 +++ b/drivers/firewire/core-card.c
39879 @@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39880 const struct fw_card_driver *driver,
39881 struct device *device)
39882 {
39883 - static atomic_t index = ATOMIC_INIT(-1);
39884 + static atomic_unchecked_t index = ATOMIC_INIT(-1);
39885
39886 - card->index = atomic_inc_return(&index);
39887 + card->index = atomic_inc_return_unchecked(&index);
39888 card->driver = driver;
39889 card->device = device;
39890 card->current_tlabel = 0;
39891 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39892
39893 void fw_core_remove_card(struct fw_card *card)
39894 {
39895 - struct fw_card_driver dummy_driver = dummy_driver_template;
39896 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
39897
39898 card->driver->update_phy_reg(card, 4,
39899 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39900 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39901 index 2c6d5e1..a2cca6b 100644
39902 --- a/drivers/firewire/core-device.c
39903 +++ b/drivers/firewire/core-device.c
39904 @@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39905 struct config_rom_attribute {
39906 struct device_attribute attr;
39907 u32 key;
39908 -};
39909 +} __do_const;
39910
39911 static ssize_t show_immediate(struct device *dev,
39912 struct device_attribute *dattr, char *buf)
39913 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39914 index eb6935c..3cc2bfa 100644
39915 --- a/drivers/firewire/core-transaction.c
39916 +++ b/drivers/firewire/core-transaction.c
39917 @@ -38,6 +38,7 @@
39918 #include <linux/timer.h>
39919 #include <linux/types.h>
39920 #include <linux/workqueue.h>
39921 +#include <linux/sched.h>
39922
39923 #include <asm/byteorder.h>
39924
39925 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39926 index e1480ff6..1a429bd 100644
39927 --- a/drivers/firewire/core.h
39928 +++ b/drivers/firewire/core.h
39929 @@ -111,6 +111,7 @@ struct fw_card_driver {
39930
39931 int (*stop_iso)(struct fw_iso_context *ctx);
39932 };
39933 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39934
39935 void fw_card_initialize(struct fw_card *card,
39936 const struct fw_card_driver *driver, struct device *device);
39937 diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39938 index a66a321..f6caf20 100644
39939 --- a/drivers/firewire/ohci.c
39940 +++ b/drivers/firewire/ohci.c
39941 @@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
39942 be32_to_cpu(ohci->next_header));
39943 }
39944
39945 +#ifndef CONFIG_GRKERNSEC
39946 if (param_remote_dma) {
39947 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39948 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39949 }
39950 +#endif
39951
39952 spin_unlock_irq(&ohci->lock);
39953
39954 @@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39955 unsigned long flags;
39956 int n, ret = 0;
39957
39958 +#ifndef CONFIG_GRKERNSEC
39959 if (param_remote_dma)
39960 return 0;
39961 +#endif
39962
39963 /*
39964 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39965 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39966 index 94a58a0..f5eba42 100644
39967 --- a/drivers/firmware/dmi-id.c
39968 +++ b/drivers/firmware/dmi-id.c
39969 @@ -16,7 +16,7 @@
39970 struct dmi_device_attribute{
39971 struct device_attribute dev_attr;
39972 int field;
39973 -};
39974 +} __do_const;
39975 #define to_dmi_dev_attr(_dev_attr) \
39976 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
39977
39978 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
39979 index 17afc51..0ef90cd 100644
39980 --- a/drivers/firmware/dmi_scan.c
39981 +++ b/drivers/firmware/dmi_scan.c
39982 @@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
39983 if (buf == NULL)
39984 return -1;
39985
39986 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
39987 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
39988
39989 dmi_unmap(buf);
39990 return 0;
39991 diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
39992 index 5b53d61..72cee96 100644
39993 --- a/drivers/firmware/efi/cper.c
39994 +++ b/drivers/firmware/efi/cper.c
39995 @@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
39996 */
39997 u64 cper_next_record_id(void)
39998 {
39999 - static atomic64_t seq;
40000 + static atomic64_unchecked_t seq;
40001
40002 - if (!atomic64_read(&seq))
40003 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
40004 + if (!atomic64_read_unchecked(&seq))
40005 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40006
40007 - return atomic64_inc_return(&seq);
40008 + return atomic64_inc_return_unchecked(&seq);
40009 }
40010 EXPORT_SYMBOL_GPL(cper_next_record_id);
40011
40012 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40013 index 8590099..d83627a 100644
40014 --- a/drivers/firmware/efi/efi.c
40015 +++ b/drivers/firmware/efi/efi.c
40016 @@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
40017 };
40018
40019 static struct efivars generic_efivars;
40020 -static struct efivar_operations generic_ops;
40021 +static efivar_operations_no_const generic_ops __read_only;
40022
40023 static int generic_ops_register(void)
40024 {
40025 - generic_ops.get_variable = efi.get_variable;
40026 - generic_ops.set_variable = efi.set_variable;
40027 - generic_ops.get_next_variable = efi.get_next_variable;
40028 - generic_ops.query_variable_store = efi_query_variable_store;
40029 + pax_open_kernel();
40030 + *(void **)&generic_ops.get_variable = efi.get_variable;
40031 + *(void **)&generic_ops.set_variable = efi.set_variable;
40032 + *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40033 + *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40034 + pax_close_kernel();
40035
40036 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40037 }
40038 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40039 index f256ecd..387dcb1 100644
40040 --- a/drivers/firmware/efi/efivars.c
40041 +++ b/drivers/firmware/efi/efivars.c
40042 @@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40043 static int
40044 create_efivars_bin_attributes(void)
40045 {
40046 - struct bin_attribute *attr;
40047 + bin_attribute_no_const *attr;
40048 int error;
40049
40050 /* new_var */
40051 diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40052 index 2f569aa..c95f4fb 100644
40053 --- a/drivers/firmware/google/memconsole.c
40054 +++ b/drivers/firmware/google/memconsole.c
40055 @@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40056 if (!found_memconsole())
40057 return -ENODEV;
40058
40059 - memconsole_bin_attr.size = memconsole_length;
40060 + pax_open_kernel();
40061 + *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40062 + pax_close_kernel();
40063 +
40064 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40065 }
40066
40067 diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40068 index fe49ec3..1ade794 100644
40069 --- a/drivers/gpio/gpio-em.c
40070 +++ b/drivers/gpio/gpio-em.c
40071 @@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40072 struct em_gio_priv *p;
40073 struct resource *io[2], *irq[2];
40074 struct gpio_chip *gpio_chip;
40075 - struct irq_chip *irq_chip;
40076 + irq_chip_no_const *irq_chip;
40077 const char *name = dev_name(&pdev->dev);
40078 int ret;
40079
40080 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40081 index 3784e81..73637b5 100644
40082 --- a/drivers/gpio/gpio-ich.c
40083 +++ b/drivers/gpio/gpio-ich.c
40084 @@ -94,7 +94,7 @@ struct ichx_desc {
40085 * this option allows driver caching written output values
40086 */
40087 bool use_outlvl_cache;
40088 -};
40089 +} __do_const;
40090
40091 static struct {
40092 spinlock_t lock;
40093 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40094 index bf6c094..6573caf 100644
40095 --- a/drivers/gpio/gpio-rcar.c
40096 +++ b/drivers/gpio/gpio-rcar.c
40097 @@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40098 struct gpio_rcar_priv *p;
40099 struct resource *io, *irq;
40100 struct gpio_chip *gpio_chip;
40101 - struct irq_chip *irq_chip;
40102 + irq_chip_no_const *irq_chip;
40103 struct device *dev = &pdev->dev;
40104 const char *name = dev_name(dev);
40105 int ret;
40106 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40107 index dbf28fa..04dad4e 100644
40108 --- a/drivers/gpio/gpio-vr41xx.c
40109 +++ b/drivers/gpio/gpio-vr41xx.c
40110 @@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40111 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40112 maskl, pendl, maskh, pendh);
40113
40114 - atomic_inc(&irq_err_count);
40115 + atomic_inc_unchecked(&irq_err_count);
40116
40117 return -EINVAL;
40118 }
40119 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40120 index e8e98ca..10f416e 100644
40121 --- a/drivers/gpio/gpiolib.c
40122 +++ b/drivers/gpio/gpiolib.c
40123 @@ -537,8 +537,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40124 }
40125
40126 if (gpiochip->irqchip) {
40127 - gpiochip->irqchip->irq_request_resources = NULL;
40128 - gpiochip->irqchip->irq_release_resources = NULL;
40129 + pax_open_kernel();
40130 + *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40131 + *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40132 + pax_close_kernel();
40133 gpiochip->irqchip = NULL;
40134 }
40135 }
40136 @@ -604,8 +606,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40137 gpiochip->irqchip = NULL;
40138 return -EINVAL;
40139 }
40140 - irqchip->irq_request_resources = gpiochip_irq_reqres;
40141 - irqchip->irq_release_resources = gpiochip_irq_relres;
40142 +
40143 + pax_open_kernel();
40144 + *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40145 + *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40146 + pax_close_kernel();
40147
40148 /*
40149 * Prepare the mapping since the irqchip shall be orthogonal to
40150 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40151 index e79c8d3..a9370bc 100644
40152 --- a/drivers/gpu/drm/drm_crtc.c
40153 +++ b/drivers/gpu/drm/drm_crtc.c
40154 @@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40155 goto done;
40156 }
40157
40158 - if (copy_to_user(&enum_ptr[copied].name,
40159 + if (copy_to_user(enum_ptr[copied].name,
40160 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40161 ret = -EFAULT;
40162 goto done;
40163 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40164 index bc3da32..7289357 100644
40165 --- a/drivers/gpu/drm/drm_drv.c
40166 +++ b/drivers/gpu/drm/drm_drv.c
40167 @@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
40168
40169 drm_device_set_unplugged(dev);
40170
40171 - if (dev->open_count == 0) {
40172 + if (local_read(&dev->open_count) == 0) {
40173 drm_put_dev(dev);
40174 }
40175 mutex_unlock(&drm_global_mutex);
40176 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40177 index ed7bc68..0d536af 100644
40178 --- a/drivers/gpu/drm/drm_fops.c
40179 +++ b/drivers/gpu/drm/drm_fops.c
40180 @@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40181 return PTR_ERR(minor);
40182
40183 dev = minor->dev;
40184 - if (!dev->open_count++)
40185 + if (local_inc_return(&dev->open_count) == 1)
40186 need_setup = 1;
40187
40188 /* share address_space across all char-devs of a single device */
40189 @@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40190 return 0;
40191
40192 err_undo:
40193 - dev->open_count--;
40194 + local_dec(&dev->open_count);
40195 drm_minor_release(minor);
40196 return retcode;
40197 }
40198 @@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40199
40200 mutex_lock(&drm_global_mutex);
40201
40202 - DRM_DEBUG("open_count = %d\n", dev->open_count);
40203 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40204
40205 mutex_lock(&dev->struct_mutex);
40206 list_del(&file_priv->lhead);
40207 @@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40208 * Begin inline drm_release
40209 */
40210
40211 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40212 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40213 task_pid_nr(current),
40214 (long)old_encode_dev(file_priv->minor->kdev->devt),
40215 - dev->open_count);
40216 + local_read(&dev->open_count));
40217
40218 /* Release any auth tokens that might point to this file_priv,
40219 (do that under the drm_global_mutex) */
40220 @@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40221 * End inline drm_release
40222 */
40223
40224 - if (!--dev->open_count) {
40225 + if (local_dec_and_test(&dev->open_count)) {
40226 retcode = drm_lastclose(dev);
40227 if (drm_device_is_unplugged(dev))
40228 drm_put_dev(dev);
40229 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40230 index 3d2e91c..d31c4c9 100644
40231 --- a/drivers/gpu/drm/drm_global.c
40232 +++ b/drivers/gpu/drm/drm_global.c
40233 @@ -36,7 +36,7 @@
40234 struct drm_global_item {
40235 struct mutex mutex;
40236 void *object;
40237 - int refcount;
40238 + atomic_t refcount;
40239 };
40240
40241 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40242 @@ -49,7 +49,7 @@ void drm_global_init(void)
40243 struct drm_global_item *item = &glob[i];
40244 mutex_init(&item->mutex);
40245 item->object = NULL;
40246 - item->refcount = 0;
40247 + atomic_set(&item->refcount, 0);
40248 }
40249 }
40250
40251 @@ -59,7 +59,7 @@ void drm_global_release(void)
40252 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40253 struct drm_global_item *item = &glob[i];
40254 BUG_ON(item->object != NULL);
40255 - BUG_ON(item->refcount != 0);
40256 + BUG_ON(atomic_read(&item->refcount) != 0);
40257 }
40258 }
40259
40260 @@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40261 struct drm_global_item *item = &glob[ref->global_type];
40262
40263 mutex_lock(&item->mutex);
40264 - if (item->refcount == 0) {
40265 + if (atomic_read(&item->refcount) == 0) {
40266 item->object = kzalloc(ref->size, GFP_KERNEL);
40267 if (unlikely(item->object == NULL)) {
40268 ret = -ENOMEM;
40269 @@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40270 goto out_err;
40271
40272 }
40273 - ++item->refcount;
40274 + atomic_inc(&item->refcount);
40275 ref->object = item->object;
40276 mutex_unlock(&item->mutex);
40277 return 0;
40278 @@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40279 struct drm_global_item *item = &glob[ref->global_type];
40280
40281 mutex_lock(&item->mutex);
40282 - BUG_ON(item->refcount == 0);
40283 + BUG_ON(atomic_read(&item->refcount) == 0);
40284 BUG_ON(ref->object != item->object);
40285 - if (--item->refcount == 0) {
40286 + if (atomic_dec_and_test(&item->refcount)) {
40287 ref->release(ref);
40288 item->object = NULL;
40289 }
40290 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40291 index 51efebd..2b70935 100644
40292 --- a/drivers/gpu/drm/drm_info.c
40293 +++ b/drivers/gpu/drm/drm_info.c
40294 @@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40295 struct drm_local_map *map;
40296 struct drm_map_list *r_list;
40297
40298 - /* Hardcoded from _DRM_FRAME_BUFFER,
40299 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40300 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40301 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40302 + static const char * const types[] = {
40303 + [_DRM_FRAME_BUFFER] = "FB",
40304 + [_DRM_REGISTERS] = "REG",
40305 + [_DRM_SHM] = "SHM",
40306 + [_DRM_AGP] = "AGP",
40307 + [_DRM_SCATTER_GATHER] = "SG",
40308 + [_DRM_CONSISTENT] = "PCI"};
40309 const char *type;
40310 int i;
40311
40312 @@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40313 map = r_list->map;
40314 if (!map)
40315 continue;
40316 - if (map->type < 0 || map->type > 5)
40317 + if (map->type >= ARRAY_SIZE(types))
40318 type = "??";
40319 else
40320 type = types[map->type];
40321 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40322 index 2f4c4343..dd12cd2 100644
40323 --- a/drivers/gpu/drm/drm_ioc32.c
40324 +++ b/drivers/gpu/drm/drm_ioc32.c
40325 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40326 request = compat_alloc_user_space(nbytes);
40327 if (!access_ok(VERIFY_WRITE, request, nbytes))
40328 return -EFAULT;
40329 - list = (struct drm_buf_desc *) (request + 1);
40330 + list = (struct drm_buf_desc __user *) (request + 1);
40331
40332 if (__put_user(count, &request->count)
40333 || __put_user(list, &request->list))
40334 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40335 request = compat_alloc_user_space(nbytes);
40336 if (!access_ok(VERIFY_WRITE, request, nbytes))
40337 return -EFAULT;
40338 - list = (struct drm_buf_pub *) (request + 1);
40339 + list = (struct drm_buf_pub __user *) (request + 1);
40340
40341 if (__put_user(count, &request->count)
40342 || __put_user(list, &request->list))
40343 @@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40344 return 0;
40345 }
40346
40347 -drm_ioctl_compat_t *drm_compat_ioctls[] = {
40348 +drm_ioctl_compat_t drm_compat_ioctls[] = {
40349 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40350 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40351 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40352 @@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40353 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40354 {
40355 unsigned int nr = DRM_IOCTL_NR(cmd);
40356 - drm_ioctl_compat_t *fn;
40357 int ret;
40358
40359 /* Assume that ioctls without an explicit compat routine will just
40360 @@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40361 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40362 return drm_ioctl(filp, cmd, arg);
40363
40364 - fn = drm_compat_ioctls[nr];
40365 -
40366 - if (fn != NULL)
40367 - ret = (*fn) (filp, cmd, arg);
40368 + if (drm_compat_ioctls[nr] != NULL)
40369 + ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40370 else
40371 ret = drm_ioctl(filp, cmd, arg);
40372
40373 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40374 index 00587a1..57a65ca 100644
40375 --- a/drivers/gpu/drm/drm_ioctl.c
40376 +++ b/drivers/gpu/drm/drm_ioctl.c
40377 @@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40378 struct drm_file *file_priv = filp->private_data;
40379 struct drm_device *dev;
40380 const struct drm_ioctl_desc *ioctl = NULL;
40381 - drm_ioctl_t *func;
40382 + drm_ioctl_no_const_t func;
40383 unsigned int nr = DRM_IOCTL_NR(cmd);
40384 int retcode = -EINVAL;
40385 char stack_kdata[128];
40386 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40387 index 93ec5dc..82acbaf 100644
40388 --- a/drivers/gpu/drm/i810/i810_drv.h
40389 +++ b/drivers/gpu/drm/i810/i810_drv.h
40390 @@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40391 int page_flipping;
40392
40393 wait_queue_head_t irq_queue;
40394 - atomic_t irq_received;
40395 - atomic_t irq_emitted;
40396 + atomic_unchecked_t irq_received;
40397 + atomic_unchecked_t irq_emitted;
40398
40399 int front_offset;
40400 } drm_i810_private_t;
40401 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40402 index 318ade9..1f5de55 100644
40403 --- a/drivers/gpu/drm/i915/i915_dma.c
40404 +++ b/drivers/gpu/drm/i915/i915_dma.c
40405 @@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40406 * locking inversion with the driver load path. And the access here is
40407 * completely racy anyway. So don't bother with locking for now.
40408 */
40409 - return dev->open_count == 0;
40410 + return local_read(&dev->open_count) == 0;
40411 }
40412
40413 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40414 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40415 index 1a0611b..dd1fbfc 100644
40416 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40417 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40418 @@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40419 static int
40420 validate_exec_list(struct drm_device *dev,
40421 struct drm_i915_gem_exec_object2 *exec,
40422 - int count)
40423 + unsigned int count)
40424 {
40425 unsigned relocs_total = 0;
40426 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40427 unsigned invalid_flags;
40428 - int i;
40429 + unsigned int i;
40430
40431 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40432 if (USES_FULL_PPGTT(dev))
40433 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40434 index 2e0613e..a8b94d9 100644
40435 --- a/drivers/gpu/drm/i915/i915_ioc32.c
40436 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
40437 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40438 (unsigned long)request);
40439 }
40440
40441 -static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40442 +static drm_ioctl_compat_t i915_compat_ioctls[] = {
40443 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40444 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40445 [DRM_I915_GETPARAM] = compat_i915_getparam,
40446 @@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40447 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40448 {
40449 unsigned int nr = DRM_IOCTL_NR(cmd);
40450 - drm_ioctl_compat_t *fn = NULL;
40451 int ret;
40452
40453 if (nr < DRM_COMMAND_BASE)
40454 return drm_compat_ioctl(filp, cmd, arg);
40455
40456 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40457 - fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40458 -
40459 - if (fn != NULL)
40460 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40461 + drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40462 ret = (*fn) (filp, cmd, arg);
40463 - else
40464 + } else
40465 ret = drm_ioctl(filp, cmd, arg);
40466
40467 return ret;
40468 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40469 index 9cb5c95..9228666 100644
40470 --- a/drivers/gpu/drm/i915/intel_display.c
40471 +++ b/drivers/gpu/drm/i915/intel_display.c
40472 @@ -12811,13 +12811,13 @@ struct intel_quirk {
40473 int subsystem_vendor;
40474 int subsystem_device;
40475 void (*hook)(struct drm_device *dev);
40476 -};
40477 +} __do_const;
40478
40479 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40480 struct intel_dmi_quirk {
40481 void (*hook)(struct drm_device *dev);
40482 const struct dmi_system_id (*dmi_id_list)[];
40483 -};
40484 +} __do_const;
40485
40486 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40487 {
40488 @@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40489 return 1;
40490 }
40491
40492 -static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40493 +static const struct dmi_system_id intel_dmi_quirks_table[] = {
40494 {
40495 - .dmi_id_list = &(const struct dmi_system_id[]) {
40496 - {
40497 - .callback = intel_dmi_reverse_brightness,
40498 - .ident = "NCR Corporation",
40499 - .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40500 - DMI_MATCH(DMI_PRODUCT_NAME, ""),
40501 - },
40502 - },
40503 - { } /* terminating entry */
40504 + .callback = intel_dmi_reverse_brightness,
40505 + .ident = "NCR Corporation",
40506 + .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40507 + DMI_MATCH(DMI_PRODUCT_NAME, ""),
40508 },
40509 + },
40510 + { } /* terminating entry */
40511 +};
40512 +
40513 +static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40514 + {
40515 + .dmi_id_list = &intel_dmi_quirks_table,
40516 .hook = quirk_invert_brightness,
40517 },
40518 };
40519 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40520 index b4a2014..219ab78 100644
40521 --- a/drivers/gpu/drm/mga/mga_drv.h
40522 +++ b/drivers/gpu/drm/mga/mga_drv.h
40523 @@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40524 u32 clear_cmd;
40525 u32 maccess;
40526
40527 - atomic_t vbl_received; /**< Number of vblanks received. */
40528 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40529 wait_queue_head_t fence_queue;
40530 - atomic_t last_fence_retired;
40531 + atomic_unchecked_t last_fence_retired;
40532 u32 next_fence_to_post;
40533
40534 unsigned int fb_cpp;
40535 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40536 index 729bfd5..ead8823 100644
40537 --- a/drivers/gpu/drm/mga/mga_ioc32.c
40538 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
40539 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40540 return 0;
40541 }
40542
40543 -drm_ioctl_compat_t *mga_compat_ioctls[] = {
40544 +drm_ioctl_compat_t mga_compat_ioctls[] = {
40545 [DRM_MGA_INIT] = compat_mga_init,
40546 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40547 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40548 @@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40549 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40550 {
40551 unsigned int nr = DRM_IOCTL_NR(cmd);
40552 - drm_ioctl_compat_t *fn = NULL;
40553 int ret;
40554
40555 if (nr < DRM_COMMAND_BASE)
40556 return drm_compat_ioctl(filp, cmd, arg);
40557
40558 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40559 - fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40560 -
40561 - if (fn != NULL)
40562 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
40563 + drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40564 ret = (*fn) (filp, cmd, arg);
40565 - else
40566 + } else
40567 ret = drm_ioctl(filp, cmd, arg);
40568
40569 return ret;
40570 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40571 index 1b071b8..de8601a 100644
40572 --- a/drivers/gpu/drm/mga/mga_irq.c
40573 +++ b/drivers/gpu/drm/mga/mga_irq.c
40574 @@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40575 if (crtc != 0)
40576 return 0;
40577
40578 - return atomic_read(&dev_priv->vbl_received);
40579 + return atomic_read_unchecked(&dev_priv->vbl_received);
40580 }
40581
40582
40583 @@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40584 /* VBLANK interrupt */
40585 if (status & MGA_VLINEPEN) {
40586 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40587 - atomic_inc(&dev_priv->vbl_received);
40588 + atomic_inc_unchecked(&dev_priv->vbl_received);
40589 drm_handle_vblank(dev, 0);
40590 handled = 1;
40591 }
40592 @@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40593 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40594 MGA_WRITE(MGA_PRIMEND, prim_end);
40595
40596 - atomic_inc(&dev_priv->last_fence_retired);
40597 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
40598 wake_up(&dev_priv->fence_queue);
40599 handled = 1;
40600 }
40601 @@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40602 * using fences.
40603 */
40604 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40605 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40606 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40607 - *sequence) <= (1 << 23)));
40608
40609 *sequence = cur_fence;
40610 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40611 index dae2c96..324dbe4 100644
40612 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40613 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40614 @@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40615 struct bit_table {
40616 const char id;
40617 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40618 -};
40619 +} __no_const;
40620
40621 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40622
40623 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40624 index 8ae36f2..1147a30 100644
40625 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40626 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40627 @@ -121,7 +121,6 @@ struct nouveau_drm {
40628 struct drm_global_reference mem_global_ref;
40629 struct ttm_bo_global_ref bo_global_ref;
40630 struct ttm_bo_device bdev;
40631 - atomic_t validate_sequence;
40632 int (*move)(struct nouveau_channel *,
40633 struct ttm_buffer_object *,
40634 struct ttm_mem_reg *, struct ttm_mem_reg *);
40635 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40636 index 462679a..88e32a7 100644
40637 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40638 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40639 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40640 unsigned long arg)
40641 {
40642 unsigned int nr = DRM_IOCTL_NR(cmd);
40643 - drm_ioctl_compat_t *fn = NULL;
40644 + drm_ioctl_compat_t fn = NULL;
40645 int ret;
40646
40647 if (nr < DRM_COMMAND_BASE)
40648 diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40649 index 753a6de..dd66b98 100644
40650 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40651 +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40652 @@ -126,11 +126,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40653 }
40654
40655 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40656 - nouveau_vram_manager_init,
40657 - nouveau_vram_manager_fini,
40658 - nouveau_vram_manager_new,
40659 - nouveau_vram_manager_del,
40660 - nouveau_vram_manager_debug
40661 + .init = nouveau_vram_manager_init,
40662 + .takedown = nouveau_vram_manager_fini,
40663 + .get_node = nouveau_vram_manager_new,
40664 + .put_node = nouveau_vram_manager_del,
40665 + .debug = nouveau_vram_manager_debug
40666 };
40667
40668 static int
40669 @@ -194,11 +194,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40670 }
40671
40672 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40673 - nouveau_gart_manager_init,
40674 - nouveau_gart_manager_fini,
40675 - nouveau_gart_manager_new,
40676 - nouveau_gart_manager_del,
40677 - nouveau_gart_manager_debug
40678 + .init = nouveau_gart_manager_init,
40679 + .takedown = nouveau_gart_manager_fini,
40680 + .get_node = nouveau_gart_manager_new,
40681 + .put_node = nouveau_gart_manager_del,
40682 + .debug = nouveau_gart_manager_debug
40683 };
40684
40685 /*XXX*/
40686 @@ -267,11 +267,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40687 }
40688
40689 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40690 - nv04_gart_manager_init,
40691 - nv04_gart_manager_fini,
40692 - nv04_gart_manager_new,
40693 - nv04_gart_manager_del,
40694 - nv04_gart_manager_debug
40695 + .init = nv04_gart_manager_init,
40696 + .takedown = nv04_gart_manager_fini,
40697 + .get_node = nv04_gart_manager_new,
40698 + .put_node = nv04_gart_manager_del,
40699 + .debug = nv04_gart_manager_debug
40700 };
40701
40702 int
40703 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40704 index c7592ec..dd45ebc 100644
40705 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40706 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40707 @@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40708 * locking inversion with the driver load path. And the access here is
40709 * completely racy anyway. So don't bother with locking for now.
40710 */
40711 - return dev->open_count == 0;
40712 + return local_read(&dev->open_count) == 0;
40713 }
40714
40715 static const struct vga_switcheroo_client_ops
40716 diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40717 index 9782364..89bd954 100644
40718 --- a/drivers/gpu/drm/qxl/qxl_cmd.c
40719 +++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40720 @@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40721 int ret;
40722
40723 mutex_lock(&qdev->async_io_mutex);
40724 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40725 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40726 if (qdev->last_sent_io_cmd > irq_num) {
40727 if (intr)
40728 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40729 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40730 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40731 else
40732 ret = wait_event_timeout(qdev->io_cmd_event,
40733 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40734 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40735 /* 0 is timeout, just bail the "hw" has gone away */
40736 if (ret <= 0)
40737 goto out;
40738 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40739 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40740 }
40741 outb(val, addr);
40742 qdev->last_sent_io_cmd = irq_num + 1;
40743 if (intr)
40744 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40745 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40746 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40747 else
40748 ret = wait_event_timeout(qdev->io_cmd_event,
40749 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40750 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40751 out:
40752 if (ret > 0)
40753 ret = 0;
40754 diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40755 index 6911b8c..89d6867 100644
40756 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40757 +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40758 @@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40759 struct drm_info_node *node = (struct drm_info_node *) m->private;
40760 struct qxl_device *qdev = node->minor->dev->dev_private;
40761
40762 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40763 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40764 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40765 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40766 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40767 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40768 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40769 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40770 seq_printf(m, "%d\n", qdev->irq_received_error);
40771 return 0;
40772 }
40773 diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40774 index 7c6cafe..460f542 100644
40775 --- a/drivers/gpu/drm/qxl/qxl_drv.h
40776 +++ b/drivers/gpu/drm/qxl/qxl_drv.h
40777 @@ -290,10 +290,10 @@ struct qxl_device {
40778 unsigned int last_sent_io_cmd;
40779
40780 /* interrupt handling */
40781 - atomic_t irq_received;
40782 - atomic_t irq_received_display;
40783 - atomic_t irq_received_cursor;
40784 - atomic_t irq_received_io_cmd;
40785 + atomic_unchecked_t irq_received;
40786 + atomic_unchecked_t irq_received_display;
40787 + atomic_unchecked_t irq_received_cursor;
40788 + atomic_unchecked_t irq_received_io_cmd;
40789 unsigned irq_received_error;
40790 wait_queue_head_t display_event;
40791 wait_queue_head_t cursor_event;
40792 diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40793 index b110883..dd06418 100644
40794 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40795 +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40796 @@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40797
40798 /* TODO copy slow path code from i915 */
40799 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40800 - 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);
40801 + 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);
40802
40803 {
40804 struct qxl_drawable *draw = fb_cmd;
40805 @@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40806 struct drm_qxl_reloc reloc;
40807
40808 if (copy_from_user(&reloc,
40809 - &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40810 + &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40811 sizeof(reloc))) {
40812 ret = -EFAULT;
40813 goto out_free_bos;
40814 @@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40815
40816 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40817
40818 - struct drm_qxl_command *commands =
40819 - (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40820 + struct drm_qxl_command __user *commands =
40821 + (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40822
40823 - if (copy_from_user(&user_cmd, &commands[cmd_num],
40824 + if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40825 sizeof(user_cmd)))
40826 return -EFAULT;
40827
40828 diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40829 index 0bf1e20..42a7310 100644
40830 --- a/drivers/gpu/drm/qxl/qxl_irq.c
40831 +++ b/drivers/gpu/drm/qxl/qxl_irq.c
40832 @@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40833 if (!pending)
40834 return IRQ_NONE;
40835
40836 - atomic_inc(&qdev->irq_received);
40837 + atomic_inc_unchecked(&qdev->irq_received);
40838
40839 if (pending & QXL_INTERRUPT_DISPLAY) {
40840 - atomic_inc(&qdev->irq_received_display);
40841 + atomic_inc_unchecked(&qdev->irq_received_display);
40842 wake_up_all(&qdev->display_event);
40843 qxl_queue_garbage_collect(qdev, false);
40844 }
40845 if (pending & QXL_INTERRUPT_CURSOR) {
40846 - atomic_inc(&qdev->irq_received_cursor);
40847 + atomic_inc_unchecked(&qdev->irq_received_cursor);
40848 wake_up_all(&qdev->cursor_event);
40849 }
40850 if (pending & QXL_INTERRUPT_IO_CMD) {
40851 - atomic_inc(&qdev->irq_received_io_cmd);
40852 + atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40853 wake_up_all(&qdev->io_cmd_event);
40854 }
40855 if (pending & QXL_INTERRUPT_ERROR) {
40856 @@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40857 init_waitqueue_head(&qdev->io_cmd_event);
40858 INIT_WORK(&qdev->client_monitors_config_work,
40859 qxl_client_monitors_config_work_func);
40860 - atomic_set(&qdev->irq_received, 0);
40861 - atomic_set(&qdev->irq_received_display, 0);
40862 - atomic_set(&qdev->irq_received_cursor, 0);
40863 - atomic_set(&qdev->irq_received_io_cmd, 0);
40864 + atomic_set_unchecked(&qdev->irq_received, 0);
40865 + atomic_set_unchecked(&qdev->irq_received_display, 0);
40866 + atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40867 + atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40868 qdev->irq_received_error = 0;
40869 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
40870 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40871 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40872 index 0cbc4c9..0e46686 100644
40873 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
40874 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40875 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40876 }
40877 }
40878
40879 -static struct vm_operations_struct qxl_ttm_vm_ops;
40880 +static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40881 static const struct vm_operations_struct *ttm_vm_ops;
40882
40883 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40884 @@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40885 return r;
40886 if (unlikely(ttm_vm_ops == NULL)) {
40887 ttm_vm_ops = vma->vm_ops;
40888 + pax_open_kernel();
40889 qxl_ttm_vm_ops = *ttm_vm_ops;
40890 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40891 + pax_close_kernel();
40892 }
40893 vma->vm_ops = &qxl_ttm_vm_ops;
40894 return 0;
40895 @@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40896 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40897 {
40898 #if defined(CONFIG_DEBUG_FS)
40899 - static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40900 - static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40901 - unsigned i;
40902 + static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40903 + {
40904 + .name = "qxl_mem_mm",
40905 + .show = &qxl_mm_dump_table,
40906 + },
40907 + {
40908 + .name = "qxl_surf_mm",
40909 + .show = &qxl_mm_dump_table,
40910 + }
40911 + };
40912
40913 - for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40914 - if (i == 0)
40915 - sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40916 - else
40917 - sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40918 - qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40919 - qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40920 - qxl_mem_types_list[i].driver_features = 0;
40921 - if (i == 0)
40922 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40923 - else
40924 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40925 + pax_open_kernel();
40926 + *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40927 + *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40928 + pax_close_kernel();
40929
40930 - }
40931 - return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40932 + return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40933 #else
40934 return 0;
40935 #endif
40936 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
40937 index 2c45ac9..5d740f8 100644
40938 --- a/drivers/gpu/drm/r128/r128_cce.c
40939 +++ b/drivers/gpu/drm/r128/r128_cce.c
40940 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
40941
40942 /* GH: Simple idle check.
40943 */
40944 - atomic_set(&dev_priv->idle_count, 0);
40945 + atomic_set_unchecked(&dev_priv->idle_count, 0);
40946
40947 /* We don't support anything other than bus-mastering ring mode,
40948 * but the ring can be in either AGP or PCI space for the ring
40949 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
40950 index 723e5d6..102dbaf 100644
40951 --- a/drivers/gpu/drm/r128/r128_drv.h
40952 +++ b/drivers/gpu/drm/r128/r128_drv.h
40953 @@ -93,14 +93,14 @@ typedef struct drm_r128_private {
40954 int is_pci;
40955 unsigned long cce_buffers_offset;
40956
40957 - atomic_t idle_count;
40958 + atomic_unchecked_t idle_count;
40959
40960 int page_flipping;
40961 int current_page;
40962 u32 crtc_offset;
40963 u32 crtc_offset_cntl;
40964
40965 - atomic_t vbl_received;
40966 + atomic_unchecked_t vbl_received;
40967
40968 u32 color_fmt;
40969 unsigned int front_offset;
40970 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
40971 index 663f38c..c689495 100644
40972 --- a/drivers/gpu/drm/r128/r128_ioc32.c
40973 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
40974 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
40975 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
40976 }
40977
40978 -drm_ioctl_compat_t *r128_compat_ioctls[] = {
40979 +drm_ioctl_compat_t r128_compat_ioctls[] = {
40980 [DRM_R128_INIT] = compat_r128_init,
40981 [DRM_R128_DEPTH] = compat_r128_depth,
40982 [DRM_R128_STIPPLE] = compat_r128_stipple,
40983 @@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
40984 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40985 {
40986 unsigned int nr = DRM_IOCTL_NR(cmd);
40987 - drm_ioctl_compat_t *fn = NULL;
40988 int ret;
40989
40990 if (nr < DRM_COMMAND_BASE)
40991 return drm_compat_ioctl(filp, cmd, arg);
40992
40993 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
40994 - fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40995 -
40996 - if (fn != NULL)
40997 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
40998 + drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40999 ret = (*fn) (filp, cmd, arg);
41000 - else
41001 + } else
41002 ret = drm_ioctl(filp, cmd, arg);
41003
41004 return ret;
41005 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41006 index c2ae496..30b5993 100644
41007 --- a/drivers/gpu/drm/r128/r128_irq.c
41008 +++ b/drivers/gpu/drm/r128/r128_irq.c
41009 @@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41010 if (crtc != 0)
41011 return 0;
41012
41013 - return atomic_read(&dev_priv->vbl_received);
41014 + return atomic_read_unchecked(&dev_priv->vbl_received);
41015 }
41016
41017 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41018 @@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41019 /* VBLANK interrupt */
41020 if (status & R128_CRTC_VBLANK_INT) {
41021 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41022 - atomic_inc(&dev_priv->vbl_received);
41023 + atomic_inc_unchecked(&dev_priv->vbl_received);
41024 drm_handle_vblank(dev, 0);
41025 return IRQ_HANDLED;
41026 }
41027 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41028 index 575e986..66e62ca 100644
41029 --- a/drivers/gpu/drm/r128/r128_state.c
41030 +++ b/drivers/gpu/drm/r128/r128_state.c
41031 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41032
41033 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41034 {
41035 - if (atomic_read(&dev_priv->idle_count) == 0)
41036 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41037 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41038 else
41039 - atomic_set(&dev_priv->idle_count, 0);
41040 + atomic_set_unchecked(&dev_priv->idle_count, 0);
41041 }
41042
41043 #endif
41044 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41045 index 4a85bb6..aaea819 100644
41046 --- a/drivers/gpu/drm/radeon/mkregtable.c
41047 +++ b/drivers/gpu/drm/radeon/mkregtable.c
41048 @@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41049 regex_t mask_rex;
41050 regmatch_t match[4];
41051 char buf[1024];
41052 - size_t end;
41053 + long end;
41054 int len;
41055 int done = 0;
41056 int r;
41057 unsigned o;
41058 struct offset *offset;
41059 char last_reg_s[10];
41060 - int last_reg;
41061 + unsigned long last_reg;
41062
41063 if (regcomp
41064 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41065 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41066 index 995a8b1..b7cb898 100644
41067 --- a/drivers/gpu/drm/radeon/radeon_device.c
41068 +++ b/drivers/gpu/drm/radeon/radeon_device.c
41069 @@ -1214,7 +1214,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41070 * locking inversion with the driver load path. And the access here is
41071 * completely racy anyway. So don't bother with locking for now.
41072 */
41073 - return dev->open_count == 0;
41074 + return local_read(&dev->open_count) == 0;
41075 }
41076
41077 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41078 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41079 index 46bd393..6ae4719 100644
41080 --- a/drivers/gpu/drm/radeon/radeon_drv.h
41081 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
41082 @@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41083
41084 /* SW interrupt */
41085 wait_queue_head_t swi_queue;
41086 - atomic_t swi_emitted;
41087 + atomic_unchecked_t swi_emitted;
41088 int vblank_crtc;
41089 uint32_t irq_enable_reg;
41090 uint32_t r500_disp_irq_reg;
41091 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41092 index 0b98ea1..0881827 100644
41093 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41094 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41095 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41096 request = compat_alloc_user_space(sizeof(*request));
41097 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41098 || __put_user(req32.param, &request->param)
41099 - || __put_user((void __user *)(unsigned long)req32.value,
41100 + || __put_user((unsigned long)req32.value,
41101 &request->value))
41102 return -EFAULT;
41103
41104 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41105 #define compat_radeon_cp_setparam NULL
41106 #endif /* X86_64 || IA64 */
41107
41108 -static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41109 +static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41110 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41111 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41112 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41113 @@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41114 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41115 {
41116 unsigned int nr = DRM_IOCTL_NR(cmd);
41117 - drm_ioctl_compat_t *fn = NULL;
41118 int ret;
41119
41120 if (nr < DRM_COMMAND_BASE)
41121 return drm_compat_ioctl(filp, cmd, arg);
41122
41123 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41124 - fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41125 -
41126 - if (fn != NULL)
41127 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41128 + drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41129 ret = (*fn) (filp, cmd, arg);
41130 - else
41131 + } else
41132 ret = drm_ioctl(filp, cmd, arg);
41133
41134 return ret;
41135 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41136 index 244b19b..c19226d 100644
41137 --- a/drivers/gpu/drm/radeon/radeon_irq.c
41138 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
41139 @@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41140 unsigned int ret;
41141 RING_LOCALS;
41142
41143 - atomic_inc(&dev_priv->swi_emitted);
41144 - ret = atomic_read(&dev_priv->swi_emitted);
41145 + atomic_inc_unchecked(&dev_priv->swi_emitted);
41146 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41147
41148 BEGIN_RING(4);
41149 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41150 @@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41151 drm_radeon_private_t *dev_priv =
41152 (drm_radeon_private_t *) dev->dev_private;
41153
41154 - atomic_set(&dev_priv->swi_emitted, 0);
41155 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41156 init_waitqueue_head(&dev_priv->swi_queue);
41157
41158 dev->max_vblank_count = 0x001fffff;
41159 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41160 index 535403e..5dd655b 100644
41161 --- a/drivers/gpu/drm/radeon/radeon_state.c
41162 +++ b/drivers/gpu/drm/radeon/radeon_state.c
41163 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41164 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41165 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41166
41167 - if (copy_from_user(&depth_boxes, clear->depth_boxes,
41168 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41169 sarea_priv->nbox * sizeof(depth_boxes[0])))
41170 return -EFAULT;
41171
41172 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41173 {
41174 drm_radeon_private_t *dev_priv = dev->dev_private;
41175 drm_radeon_getparam_t *param = data;
41176 - int value;
41177 + int value = 0;
41178
41179 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41180
41181 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41182 index 8624979..65e5243 100644
41183 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
41184 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41185 @@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41186 man->size = size >> PAGE_SHIFT;
41187 }
41188
41189 -static struct vm_operations_struct radeon_ttm_vm_ops;
41190 +static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41191 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41192
41193 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41194 @@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41195 }
41196 if (unlikely(ttm_vm_ops == NULL)) {
41197 ttm_vm_ops = vma->vm_ops;
41198 + pax_open_kernel();
41199 radeon_ttm_vm_ops = *ttm_vm_ops;
41200 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41201 + pax_close_kernel();
41202 }
41203 vma->vm_ops = &radeon_ttm_vm_ops;
41204 return 0;
41205 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41206 index 054a79f..30d9ac4 100644
41207 --- a/drivers/gpu/drm/tegra/dc.c
41208 +++ b/drivers/gpu/drm/tegra/dc.c
41209 @@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41210 }
41211
41212 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41213 - dc->debugfs_files[i].data = dc;
41214 + *(void **)&dc->debugfs_files[i].data = dc;
41215
41216 err = drm_debugfs_create_files(dc->debugfs_files,
41217 ARRAY_SIZE(debugfs_files),
41218 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41219 index f787445..2df2c65 100644
41220 --- a/drivers/gpu/drm/tegra/dsi.c
41221 +++ b/drivers/gpu/drm/tegra/dsi.c
41222 @@ -41,7 +41,7 @@ struct tegra_dsi {
41223 struct clk *clk_lp;
41224 struct clk *clk;
41225
41226 - struct drm_info_list *debugfs_files;
41227 + drm_info_list_no_const *debugfs_files;
41228 struct drm_minor *minor;
41229 struct dentry *debugfs;
41230
41231 diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41232 index ffe2654..03c7b1c 100644
41233 --- a/drivers/gpu/drm/tegra/hdmi.c
41234 +++ b/drivers/gpu/drm/tegra/hdmi.c
41235 @@ -60,7 +60,7 @@ struct tegra_hdmi {
41236 bool stereo;
41237 bool dvi;
41238
41239 - struct drm_info_list *debugfs_files;
41240 + drm_info_list_no_const *debugfs_files;
41241 struct drm_minor *minor;
41242 struct dentry *debugfs;
41243 };
41244 diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41245 index 964387f..4eafc00 100644
41246 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41247 +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41248 @@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41249 }
41250
41251 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41252 - ttm_bo_man_init,
41253 - ttm_bo_man_takedown,
41254 - ttm_bo_man_get_node,
41255 - ttm_bo_man_put_node,
41256 - ttm_bo_man_debug
41257 + .init = ttm_bo_man_init,
41258 + .takedown = ttm_bo_man_takedown,
41259 + .get_node = ttm_bo_man_get_node,
41260 + .put_node = ttm_bo_man_put_node,
41261 + .debug = ttm_bo_man_debug
41262 };
41263 EXPORT_SYMBOL(ttm_bo_manager_func);
41264 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41265 index a1803fb..c53f6b0 100644
41266 --- a/drivers/gpu/drm/ttm/ttm_memory.c
41267 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
41268 @@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41269 zone->glob = glob;
41270 glob->zone_kernel = zone;
41271 ret = kobject_init_and_add(
41272 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41273 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41274 if (unlikely(ret != 0)) {
41275 kobject_put(&zone->kobj);
41276 return ret;
41277 @@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41278 zone->glob = glob;
41279 glob->zone_dma32 = zone;
41280 ret = kobject_init_and_add(
41281 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41282 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41283 if (unlikely(ret != 0)) {
41284 kobject_put(&zone->kobj);
41285 return ret;
41286 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41287 index 09874d6..d6da1de 100644
41288 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41289 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41290 @@ -54,7 +54,7 @@
41291
41292 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41293 #define SMALL_ALLOCATION 16
41294 -#define FREE_ALL_PAGES (~0U)
41295 +#define FREE_ALL_PAGES (~0UL)
41296 /* times are in msecs */
41297 #define PAGE_FREE_INTERVAL 1000
41298
41299 @@ -299,14 +299,13 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41300 * @free_all: If set to true will free all pages in pool
41301 * @gfp: GFP flags.
41302 **/
41303 -static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41304 +static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41305 gfp_t gfp)
41306 {
41307 unsigned long irq_flags;
41308 struct page *p;
41309 struct page **pages_to_free;
41310 - unsigned freed_pages = 0,
41311 - npages_to_free = nr_free;
41312 + unsigned long freed_pages = 0, npages_to_free = nr_free;
41313
41314 if (NUM_PAGES_TO_ALLOC < nr_free)
41315 npages_to_free = NUM_PAGES_TO_ALLOC;
41316 @@ -366,7 +365,8 @@ restart:
41317 __list_del(&p->lru, &pool->list);
41318
41319 ttm_pool_update_free_locked(pool, freed_pages);
41320 - nr_free -= freed_pages;
41321 + if (likely(nr_free != FREE_ALL_PAGES))
41322 + nr_free -= freed_pages;
41323 }
41324
41325 spin_unlock_irqrestore(&pool->lock, irq_flags);
41326 @@ -395,7 +395,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41327 unsigned i;
41328 unsigned pool_offset;
41329 struct ttm_page_pool *pool;
41330 - int shrink_pages = sc->nr_to_scan;
41331 + unsigned long shrink_pages = sc->nr_to_scan;
41332 unsigned long freed = 0;
41333
41334 if (!mutex_trylock(&lock))
41335 @@ -403,7 +403,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41336 pool_offset = ++start_pool % NUM_POOLS;
41337 /* select start pool in round robin fashion */
41338 for (i = 0; i < NUM_POOLS; ++i) {
41339 - unsigned nr_free = shrink_pages;
41340 + unsigned long nr_free = shrink_pages;
41341 if (shrink_pages == 0)
41342 break;
41343 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41344 @@ -669,7 +669,7 @@ out:
41345 }
41346
41347 /* Put all pages in pages list to correct pool to wait for reuse */
41348 -static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41349 +static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41350 enum ttm_caching_state cstate)
41351 {
41352 unsigned long irq_flags;
41353 @@ -724,7 +724,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41354 struct list_head plist;
41355 struct page *p = NULL;
41356 gfp_t gfp_flags = GFP_USER;
41357 - unsigned count;
41358 + unsigned long count;
41359 int r;
41360
41361 /* set zero flag for page allocation if required */
41362 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41363 index c96db43..c367557 100644
41364 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41365 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41366 @@ -56,7 +56,7 @@
41367
41368 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41369 #define SMALL_ALLOCATION 4
41370 -#define FREE_ALL_PAGES (~0U)
41371 +#define FREE_ALL_PAGES (~0UL)
41372 /* times are in msecs */
41373 #define IS_UNDEFINED (0)
41374 #define IS_WC (1<<1)
41375 @@ -413,15 +413,14 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41376 * @nr_free: If set to true will free all pages in pool
41377 * @gfp: GFP flags.
41378 **/
41379 -static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41380 +static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41381 gfp_t gfp)
41382 {
41383 unsigned long irq_flags;
41384 struct dma_page *dma_p, *tmp;
41385 struct page **pages_to_free;
41386 struct list_head d_pages;
41387 - unsigned freed_pages = 0,
41388 - npages_to_free = nr_free;
41389 + unsigned long freed_pages = 0, npages_to_free = nr_free;
41390
41391 if (NUM_PAGES_TO_ALLOC < nr_free)
41392 npages_to_free = NUM_PAGES_TO_ALLOC;
41393 @@ -494,7 +493,8 @@ restart:
41394 /* remove range of pages from the pool */
41395 if (freed_pages) {
41396 ttm_pool_update_free_locked(pool, freed_pages);
41397 - nr_free -= freed_pages;
41398 + if (likely(nr_free != FREE_ALL_PAGES))
41399 + nr_free -= freed_pages;
41400 }
41401
41402 spin_unlock_irqrestore(&pool->lock, irq_flags);
41403 @@ -929,7 +929,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41404 struct dma_page *d_page, *next;
41405 enum pool_type type;
41406 bool is_cached = false;
41407 - unsigned count = 0, i, npages = 0;
41408 + unsigned long count = 0, i, npages = 0;
41409 unsigned long irq_flags;
41410
41411 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41412 @@ -1007,7 +1007,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41413 static unsigned start_pool;
41414 unsigned idx = 0;
41415 unsigned pool_offset;
41416 - unsigned shrink_pages = sc->nr_to_scan;
41417 + unsigned long shrink_pages = sc->nr_to_scan;
41418 struct device_pools *p;
41419 unsigned long freed = 0;
41420
41421 @@ -1020,7 +1020,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41422 goto out;
41423 pool_offset = ++start_pool % _manager->npools;
41424 list_for_each_entry(p, &_manager->pools, pools) {
41425 - unsigned nr_free;
41426 + unsigned long nr_free;
41427
41428 if (!p->dev)
41429 continue;
41430 @@ -1034,7 +1034,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41431 sc->gfp_mask);
41432 freed += nr_free - shrink_pages;
41433
41434 - pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41435 + pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41436 p->pool->dev_name, p->pool->name, current->pid,
41437 nr_free, shrink_pages);
41438 }
41439 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41440 index 8cbcb45..a4d9cf7 100644
41441 --- a/drivers/gpu/drm/udl/udl_fb.c
41442 +++ b/drivers/gpu/drm/udl/udl_fb.c
41443 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41444 fb_deferred_io_cleanup(info);
41445 kfree(info->fbdefio);
41446 info->fbdefio = NULL;
41447 - info->fbops->fb_mmap = udl_fb_mmap;
41448 }
41449
41450 pr_warn("released /dev/fb%d user=%d count=%d\n",
41451 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41452 index ef8c500..01030c8 100644
41453 --- a/drivers/gpu/drm/via/via_drv.h
41454 +++ b/drivers/gpu/drm/via/via_drv.h
41455 @@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41456 typedef uint32_t maskarray_t[5];
41457
41458 typedef struct drm_via_irq {
41459 - atomic_t irq_received;
41460 + atomic_unchecked_t irq_received;
41461 uint32_t pending_mask;
41462 uint32_t enable_mask;
41463 wait_queue_head_t irq_queue;
41464 @@ -77,7 +77,7 @@ typedef struct drm_via_private {
41465 struct timeval last_vblank;
41466 int last_vblank_valid;
41467 unsigned usec_per_vblank;
41468 - atomic_t vbl_received;
41469 + atomic_unchecked_t vbl_received;
41470 drm_via_state_t hc_state;
41471 char pci_buf[VIA_PCI_BUF_SIZE];
41472 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41473 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41474 index 1319433..a993b0c 100644
41475 --- a/drivers/gpu/drm/via/via_irq.c
41476 +++ b/drivers/gpu/drm/via/via_irq.c
41477 @@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41478 if (crtc != 0)
41479 return 0;
41480
41481 - return atomic_read(&dev_priv->vbl_received);
41482 + return atomic_read_unchecked(&dev_priv->vbl_received);
41483 }
41484
41485 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41486 @@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41487
41488 status = VIA_READ(VIA_REG_INTERRUPT);
41489 if (status & VIA_IRQ_VBLANK_PENDING) {
41490 - atomic_inc(&dev_priv->vbl_received);
41491 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41492 + atomic_inc_unchecked(&dev_priv->vbl_received);
41493 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41494 do_gettimeofday(&cur_vblank);
41495 if (dev_priv->last_vblank_valid) {
41496 dev_priv->usec_per_vblank =
41497 @@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41498 dev_priv->last_vblank = cur_vblank;
41499 dev_priv->last_vblank_valid = 1;
41500 }
41501 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41502 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41503 DRM_DEBUG("US per vblank is: %u\n",
41504 dev_priv->usec_per_vblank);
41505 }
41506 @@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41507
41508 for (i = 0; i < dev_priv->num_irqs; ++i) {
41509 if (status & cur_irq->pending_mask) {
41510 - atomic_inc(&cur_irq->irq_received);
41511 + atomic_inc_unchecked(&cur_irq->irq_received);
41512 wake_up(&cur_irq->irq_queue);
41513 handled = 1;
41514 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41515 @@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41516 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41517 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41518 masks[irq][4]));
41519 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41520 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41521 } else {
41522 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41523 (((cur_irq_sequence =
41524 - atomic_read(&cur_irq->irq_received)) -
41525 + atomic_read_unchecked(&cur_irq->irq_received)) -
41526 *sequence) <= (1 << 23)));
41527 }
41528 *sequence = cur_irq_sequence;
41529 @@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41530 }
41531
41532 for (i = 0; i < dev_priv->num_irqs; ++i) {
41533 - atomic_set(&cur_irq->irq_received, 0);
41534 + atomic_set_unchecked(&cur_irq->irq_received, 0);
41535 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41536 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41537 init_waitqueue_head(&cur_irq->irq_queue);
41538 @@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41539 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41540 case VIA_IRQ_RELATIVE:
41541 irqwait->request.sequence +=
41542 - atomic_read(&cur_irq->irq_received);
41543 + atomic_read_unchecked(&cur_irq->irq_received);
41544 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41545 case VIA_IRQ_ABSOLUTE:
41546 break;
41547 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41548 index 4ee799b..69fc0d1 100644
41549 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41550 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41551 @@ -446,7 +446,7 @@ struct vmw_private {
41552 * Fencing and IRQs.
41553 */
41554
41555 - atomic_t marker_seq;
41556 + atomic_unchecked_t marker_seq;
41557 wait_queue_head_t fence_queue;
41558 wait_queue_head_t fifo_queue;
41559 int fence_queue_waiters; /* Protected by hw_mutex */
41560 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41561 index 09e10ae..cb76c60 100644
41562 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41563 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41564 @@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41565 (unsigned int) min,
41566 (unsigned int) fifo->capabilities);
41567
41568 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41569 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41570 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41571 vmw_marker_queue_init(&fifo->marker_queue);
41572 return vmw_fifo_send_fence(dev_priv, &dummy);
41573 @@ -378,7 +378,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41574 if (reserveable)
41575 iowrite32(bytes, fifo_mem +
41576 SVGA_FIFO_RESERVED);
41577 - return fifo_mem + (next_cmd >> 2);
41578 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41579 } else {
41580 need_bounce = true;
41581 }
41582 @@ -498,7 +498,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41583
41584 fm = vmw_fifo_reserve(dev_priv, bytes);
41585 if (unlikely(fm == NULL)) {
41586 - *seqno = atomic_read(&dev_priv->marker_seq);
41587 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41588 ret = -ENOMEM;
41589 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41590 false, 3*HZ);
41591 @@ -506,7 +506,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41592 }
41593
41594 do {
41595 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41596 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41597 } while (*seqno == 0);
41598
41599 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41600 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41601 index 170b61b..fec7348 100644
41602 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41603 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41604 @@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41605 }
41606
41607 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41608 - vmw_gmrid_man_init,
41609 - vmw_gmrid_man_takedown,
41610 - vmw_gmrid_man_get_node,
41611 - vmw_gmrid_man_put_node,
41612 - vmw_gmrid_man_debug
41613 + .init = vmw_gmrid_man_init,
41614 + .takedown = vmw_gmrid_man_takedown,
41615 + .get_node = vmw_gmrid_man_get_node,
41616 + .put_node = vmw_gmrid_man_put_node,
41617 + .debug = vmw_gmrid_man_debug
41618 };
41619 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41620 index 37881ec..319065d 100644
41621 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41622 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41623 @@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41624 int ret;
41625
41626 num_clips = arg->num_clips;
41627 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41628 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41629
41630 if (unlikely(num_clips == 0))
41631 return 0;
41632 @@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41633 int ret;
41634
41635 num_clips = arg->num_clips;
41636 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41637 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41638
41639 if (unlikely(num_clips == 0))
41640 return 0;
41641 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41642 index 0c42376..6febe77 100644
41643 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41644 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41645 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41646 * emitted. Then the fence is stale and signaled.
41647 */
41648
41649 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41650 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41651 > VMW_FENCE_WRAP);
41652
41653 return ret;
41654 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41655
41656 if (fifo_idle)
41657 down_read(&fifo_state->rwsem);
41658 - signal_seq = atomic_read(&dev_priv->marker_seq);
41659 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41660 ret = 0;
41661
41662 for (;;) {
41663 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41664 index efd1ffd..0ae13ca 100644
41665 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41666 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41667 @@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41668 while (!vmw_lag_lt(queue, us)) {
41669 spin_lock(&queue->lock);
41670 if (list_empty(&queue->head))
41671 - seqno = atomic_read(&dev_priv->marker_seq);
41672 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41673 else {
41674 marker = list_first_entry(&queue->head,
41675 struct vmw_marker, head);
41676 diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41677 index 37ac7b5..d52a5c9 100644
41678 --- a/drivers/gpu/vga/vga_switcheroo.c
41679 +++ b/drivers/gpu/vga/vga_switcheroo.c
41680 @@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41681
41682 /* this version is for the case where the power switch is separate
41683 to the device being powered down. */
41684 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41685 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41686 {
41687 /* copy over all the bus versions */
41688 if (dev->bus && dev->bus->pm) {
41689 @@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41690 return ret;
41691 }
41692
41693 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41694 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41695 {
41696 /* copy over all the bus versions */
41697 if (dev->bus && dev->bus->pm) {
41698 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41699 index 3402033..50b562c 100644
41700 --- a/drivers/hid/hid-core.c
41701 +++ b/drivers/hid/hid-core.c
41702 @@ -2506,7 +2506,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41703
41704 int hid_add_device(struct hid_device *hdev)
41705 {
41706 - static atomic_t id = ATOMIC_INIT(0);
41707 + static atomic_unchecked_t id = ATOMIC_INIT(0);
41708 int ret;
41709
41710 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41711 @@ -2548,7 +2548,7 @@ int hid_add_device(struct hid_device *hdev)
41712 /* XXX hack, any other cleaner solution after the driver core
41713 * is converted to allow more than 20 bytes as the device name? */
41714 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41715 - hdev->vendor, hdev->product, atomic_inc_return(&id));
41716 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41717
41718 hid_debug_register(hdev, dev_name(&hdev->dev));
41719 ret = device_add(&hdev->dev);
41720 diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
41721 index 71f5692..147d3da 100644
41722 --- a/drivers/hid/hid-logitech-dj.c
41723 +++ b/drivers/hid/hid-logitech-dj.c
41724 @@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
41725 * device (via hid_input_report() ) and return 1 so hid-core does not do
41726 * anything else with it.
41727 */
41728 + if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
41729 + (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
41730 + dev_err(&hdev->dev, "%s: invalid device index:%d\n",
41731 + __func__, dj_report->device_index);
41732 + return false;
41733 + }
41734
41735 /* case 1) */
41736 if (data[0] != REPORT_ID_DJ_SHORT)
41737 diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
41738 index bc4269e..b6e6102 100644
41739 --- a/drivers/hid/hid-sony.c
41740 +++ b/drivers/hid/hid-sony.c
41741 @@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
41742 __u8 buf[36];
41743 };
41744
41745 +#define DS4_REPORT_0x02_SIZE 37
41746 +#define DS4_REPORT_0x05_SIZE 32
41747 +#define DS4_REPORT_0x11_SIZE 78
41748 +#define DS4_REPORT_0x81_SIZE 7
41749 +#define SIXAXIS_REPORT_0xF2_SIZE 18
41750 +
41751 static spinlock_t sony_dev_list_lock;
41752 static LIST_HEAD(sony_device_list);
41753 static DEFINE_IDA(sony_device_id_allocator);
41754 @@ -811,6 +817,7 @@ struct sony_sc {
41755 struct work_struct state_worker;
41756 struct power_supply battery;
41757 int device_id;
41758 + __u8 *output_report_dmabuf;
41759
41760 #ifdef CONFIG_SONY_FF
41761 __u8 left;
41762 @@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
41763
41764 static int sixaxis_set_operational_bt(struct hid_device *hdev)
41765 {
41766 - unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41767 - return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
41768 + static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41769 + __u8 *buf;
41770 + int ret;
41771 +
41772 + buf = kmemdup(report, sizeof(report), GFP_KERNEL);
41773 + if (!buf)
41774 + return -ENOMEM;
41775 +
41776 + ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
41777 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
41778 +
41779 + kfree(buf);
41780 +
41781 + return ret;
41782 }
41783
41784 /*
41785 @@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
41786 */
41787 static int dualshock4_set_operational_bt(struct hid_device *hdev)
41788 {
41789 - __u8 buf[37] = { 0 };
41790 + __u8 *buf;
41791 + int ret;
41792
41793 - return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
41794 + buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
41795 + if (!buf)
41796 + return -ENOMEM;
41797 +
41798 + ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
41799 HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41800 +
41801 + kfree(buf);
41802 +
41803 + return ret;
41804 }
41805
41806 static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
41807 @@ -1471,9 +1498,7 @@ error_leds:
41808
41809 static void sixaxis_state_worker(struct work_struct *work)
41810 {
41811 - struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41812 - int n;
41813 - union sixaxis_output_report_01 report = {
41814 + static const union sixaxis_output_report_01 default_report = {
41815 .buf = {
41816 0x01,
41817 0x00, 0xff, 0x00, 0xff, 0x00,
41818 @@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
41819 0x00, 0x00, 0x00, 0x00, 0x00
41820 }
41821 };
41822 + struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41823 + struct sixaxis_output_report *report =
41824 + (struct sixaxis_output_report *)sc->output_report_dmabuf;
41825 + int n;
41826 +
41827 + /* Initialize the report with default values */
41828 + memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
41829
41830 #ifdef CONFIG_SONY_FF
41831 - report.data.rumble.right_motor_on = sc->right ? 1 : 0;
41832 - report.data.rumble.left_motor_force = sc->left;
41833 + report->rumble.right_motor_on = sc->right ? 1 : 0;
41834 + report->rumble.left_motor_force = sc->left;
41835 #endif
41836
41837 - report.data.leds_bitmap |= sc->led_state[0] << 1;
41838 - report.data.leds_bitmap |= sc->led_state[1] << 2;
41839 - report.data.leds_bitmap |= sc->led_state[2] << 3;
41840 - report.data.leds_bitmap |= sc->led_state[3] << 4;
41841 + report->leds_bitmap |= sc->led_state[0] << 1;
41842 + report->leds_bitmap |= sc->led_state[1] << 2;
41843 + report->leds_bitmap |= sc->led_state[2] << 3;
41844 + report->leds_bitmap |= sc->led_state[3] << 4;
41845
41846 /* Set flag for all leds off, required for 3rd party INTEC controller */
41847 - if ((report.data.leds_bitmap & 0x1E) == 0)
41848 - report.data.leds_bitmap |= 0x20;
41849 + if ((report->leds_bitmap & 0x1E) == 0)
41850 + report->leds_bitmap |= 0x20;
41851
41852 /*
41853 * The LEDs in the report are indexed in reverse order to their
41854 @@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
41855 */
41856 for (n = 0; n < 4; n++) {
41857 if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
41858 - report.data.led[3 - n].duty_off = sc->led_delay_off[n];
41859 - report.data.led[3 - n].duty_on = sc->led_delay_on[n];
41860 + report->led[3 - n].duty_off = sc->led_delay_off[n];
41861 + report->led[3 - n].duty_on = sc->led_delay_on[n];
41862 }
41863 }
41864
41865 - hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
41866 - sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41867 + hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
41868 + sizeof(struct sixaxis_output_report),
41869 + HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41870 }
41871
41872 static void dualshock4_state_worker(struct work_struct *work)
41873 {
41874 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41875 struct hid_device *hdev = sc->hdev;
41876 + __u8 *buf = sc->output_report_dmabuf;
41877 int offset;
41878
41879 - __u8 buf[78] = { 0 };
41880 -
41881 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41882 + memset(buf, 0, DS4_REPORT_0x05_SIZE);
41883 buf[0] = 0x05;
41884 buf[1] = 0xFF;
41885 offset = 4;
41886 } else {
41887 + memset(buf, 0, DS4_REPORT_0x11_SIZE);
41888 buf[0] = 0x11;
41889 buf[1] = 0xB0;
41890 buf[3] = 0x0F;
41891 @@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
41892 buf[offset++] = sc->led_delay_off[3];
41893
41894 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41895 - hid_hw_output_report(hdev, buf, 32);
41896 + hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
41897 else
41898 - hid_hw_raw_request(hdev, 0x11, buf, 78,
41899 + hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
41900 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41901 }
41902
41903 +static int sony_allocate_output_report(struct sony_sc *sc)
41904 +{
41905 + if (sc->quirks & SIXAXIS_CONTROLLER)
41906 + sc->output_report_dmabuf =
41907 + kmalloc(sizeof(union sixaxis_output_report_01),
41908 + GFP_KERNEL);
41909 + else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
41910 + sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
41911 + GFP_KERNEL);
41912 + else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41913 + sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
41914 + GFP_KERNEL);
41915 + else
41916 + return 0;
41917 +
41918 + if (!sc->output_report_dmabuf)
41919 + return -ENOMEM;
41920 +
41921 + return 0;
41922 +}
41923 +
41924 #ifdef CONFIG_SONY_FF
41925 static int sony_play_effect(struct input_dev *dev, void *data,
41926 struct ff_effect *effect)
41927 @@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
41928
41929 static int sony_check_add(struct sony_sc *sc)
41930 {
41931 + __u8 *buf = NULL;
41932 int n, ret;
41933
41934 if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
41935 @@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
41936 return 0;
41937 }
41938 } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41939 - __u8 buf[7];
41940 + buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
41941 + if (!buf)
41942 + return -ENOMEM;
41943
41944 /*
41945 * The MAC address of a DS4 controller connected via USB can be
41946 * retrieved with feature report 0x81. The address begins at
41947 * offset 1.
41948 */
41949 - ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
41950 - HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41951 + ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
41952 + DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
41953 + HID_REQ_GET_REPORT);
41954
41955 - if (ret != 7) {
41956 + if (ret != DS4_REPORT_0x81_SIZE) {
41957 hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
41958 - return ret < 0 ? ret : -EINVAL;
41959 + ret = ret < 0 ? ret : -EINVAL;
41960 + goto out_free;
41961 }
41962
41963 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
41964 } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
41965 - __u8 buf[18];
41966 + buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
41967 + if (!buf)
41968 + return -ENOMEM;
41969
41970 /*
41971 * The MAC address of a Sixaxis controller connected via USB can
41972 * be retrieved with feature report 0xf2. The address begins at
41973 * offset 4.
41974 */
41975 - ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
41976 - HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41977 + ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
41978 + SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
41979 + HID_REQ_GET_REPORT);
41980
41981 - if (ret != 18) {
41982 + if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
41983 hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
41984 - return ret < 0 ? ret : -EINVAL;
41985 + ret = ret < 0 ? ret : -EINVAL;
41986 + goto out_free;
41987 }
41988
41989 /*
41990 @@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
41991 return 0;
41992 }
41993
41994 - return sony_check_add_dev_list(sc);
41995 + ret = sony_check_add_dev_list(sc);
41996 +
41997 +out_free:
41998 +
41999 + kfree(buf);
42000 +
42001 + return ret;
42002 }
42003
42004 static int sony_set_device_id(struct sony_sc *sc)
42005 @@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
42006 return ret;
42007 }
42008
42009 + ret = sony_allocate_output_report(sc);
42010 + if (ret < 0) {
42011 + hid_err(hdev, "failed to allocate the output report buffer\n");
42012 + goto err_stop;
42013 + }
42014 +
42015 ret = sony_set_device_id(sc);
42016 if (ret < 0) {
42017 hid_err(hdev, "failed to allocate the device id\n");
42018 @@ -1984,6 +2060,7 @@ err_stop:
42019 if (sc->quirks & SONY_BATTERY_SUPPORT)
42020 sony_battery_remove(sc);
42021 sony_cancel_work_sync(sc);
42022 + kfree(sc->output_report_dmabuf);
42023 sony_remove_dev_list(sc);
42024 sony_release_device_id(sc);
42025 hid_hw_stop(hdev);
42026 @@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
42027
42028 sony_cancel_work_sync(sc);
42029
42030 + kfree(sc->output_report_dmabuf);
42031 +
42032 sony_remove_dev_list(sc);
42033
42034 sony_release_device_id(sc);
42035 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42036 index c13fb5b..55a3802 100644
42037 --- a/drivers/hid/hid-wiimote-debug.c
42038 +++ b/drivers/hid/hid-wiimote-debug.c
42039 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42040 else if (size == 0)
42041 return -EIO;
42042
42043 - if (copy_to_user(u, buf, size))
42044 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
42045 return -EFAULT;
42046
42047 *off += size;
42048 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42049 index 433f72a..2926005 100644
42050 --- a/drivers/hv/channel.c
42051 +++ b/drivers/hv/channel.c
42052 @@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42053 unsigned long flags;
42054 int ret = 0;
42055
42056 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42057 - atomic_inc(&vmbus_connection.next_gpadl_handle);
42058 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42059 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42060
42061 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42062 if (ret)
42063 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42064 index 3e4235c..877d0e5 100644
42065 --- a/drivers/hv/hv.c
42066 +++ b/drivers/hv/hv.c
42067 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42068 u64 output_address = (output) ? virt_to_phys(output) : 0;
42069 u32 output_address_hi = output_address >> 32;
42070 u32 output_address_lo = output_address & 0xFFFFFFFF;
42071 - void *hypercall_page = hv_context.hypercall_page;
42072 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42073
42074 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42075 "=a"(hv_status_lo) : "d" (control_hi),
42076 @@ -156,7 +156,7 @@ int hv_init(void)
42077 /* See if the hypercall page is already set */
42078 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42079
42080 - virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42081 + virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42082
42083 if (!virtaddr)
42084 goto cleanup;
42085 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42086 index 5e90c5d..d8fcefb 100644
42087 --- a/drivers/hv/hv_balloon.c
42088 +++ b/drivers/hv/hv_balloon.c
42089 @@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42090
42091 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42092 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42093 -static atomic_t trans_id = ATOMIC_INIT(0);
42094 +static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42095
42096 static int dm_ring_size = (5 * PAGE_SIZE);
42097
42098 @@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42099 pr_info("Memory hot add failed\n");
42100
42101 dm->state = DM_INITIALIZED;
42102 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
42103 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42104 vmbus_sendpacket(dm->dev->channel, &resp,
42105 sizeof(struct dm_hot_add_response),
42106 (unsigned long)NULL,
42107 @@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42108 memset(&status, 0, sizeof(struct dm_status));
42109 status.hdr.type = DM_STATUS_REPORT;
42110 status.hdr.size = sizeof(struct dm_status);
42111 - status.hdr.trans_id = atomic_inc_return(&trans_id);
42112 + status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42113
42114 /*
42115 * The host expects the guest to report free memory.
42116 @@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42117 * send the status. This can happen if we were interrupted
42118 * after we picked our transaction ID.
42119 */
42120 - if (status.hdr.trans_id != atomic_read(&trans_id))
42121 + if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42122 return;
42123
42124 /*
42125 @@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
42126 */
42127
42128 do {
42129 - bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42130 + bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42131 ret = vmbus_sendpacket(dm_device.dev->channel,
42132 bl_resp,
42133 bl_resp->hdr.size,
42134 @@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42135
42136 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42137 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42138 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
42139 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42140 resp.hdr.size = sizeof(struct dm_unballoon_response);
42141
42142 vmbus_sendpacket(dm_device.dev->channel, &resp,
42143 @@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42144 memset(&version_req, 0, sizeof(struct dm_version_request));
42145 version_req.hdr.type = DM_VERSION_REQUEST;
42146 version_req.hdr.size = sizeof(struct dm_version_request);
42147 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42148 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42149 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42150 version_req.is_last_attempt = 1;
42151
42152 @@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
42153 memset(&version_req, 0, sizeof(struct dm_version_request));
42154 version_req.hdr.type = DM_VERSION_REQUEST;
42155 version_req.hdr.size = sizeof(struct dm_version_request);
42156 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42157 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42158 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42159 version_req.is_last_attempt = 0;
42160
42161 @@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
42162 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42163 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42164 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42165 - cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42166 + cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42167
42168 cap_msg.caps.cap_bits.balloon = 1;
42169 cap_msg.caps.cap_bits.hot_add = 1;
42170 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42171 index c386d8d..d6004c4 100644
42172 --- a/drivers/hv/hyperv_vmbus.h
42173 +++ b/drivers/hv/hyperv_vmbus.h
42174 @@ -611,7 +611,7 @@ enum vmbus_connect_state {
42175 struct vmbus_connection {
42176 enum vmbus_connect_state conn_state;
42177
42178 - atomic_t next_gpadl_handle;
42179 + atomic_unchecked_t next_gpadl_handle;
42180
42181 /*
42182 * Represents channel interrupts. Each bit position represents a
42183 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42184 index 4d6b269..2e23b86 100644
42185 --- a/drivers/hv/vmbus_drv.c
42186 +++ b/drivers/hv/vmbus_drv.c
42187 @@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42188 {
42189 int ret = 0;
42190
42191 - static atomic_t device_num = ATOMIC_INIT(0);
42192 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42193
42194 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42195 - atomic_inc_return(&device_num));
42196 + atomic_inc_return_unchecked(&device_num));
42197
42198 child_device_obj->device.bus = &hv_bus;
42199 child_device_obj->device.parent = &hv_acpi_dev->dev;
42200 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42201 index 579bdf9..75118b5 100644
42202 --- a/drivers/hwmon/acpi_power_meter.c
42203 +++ b/drivers/hwmon/acpi_power_meter.c
42204 @@ -116,7 +116,7 @@ struct sensor_template {
42205 struct device_attribute *devattr,
42206 const char *buf, size_t count);
42207 int index;
42208 -};
42209 +} __do_const;
42210
42211 /* Averaging interval */
42212 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42213 @@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42214 struct sensor_template *attrs)
42215 {
42216 struct device *dev = &resource->acpi_dev->dev;
42217 - struct sensor_device_attribute *sensors =
42218 + sensor_device_attribute_no_const *sensors =
42219 &resource->sensors[resource->num_sensors];
42220 int res = 0;
42221
42222 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42223 index 3288f13..71cfb4e 100644
42224 --- a/drivers/hwmon/applesmc.c
42225 +++ b/drivers/hwmon/applesmc.c
42226 @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42227 {
42228 struct applesmc_node_group *grp;
42229 struct applesmc_dev_attr *node;
42230 - struct attribute *attr;
42231 + attribute_no_const *attr;
42232 int ret, i;
42233
42234 for (grp = groups; grp->format; grp++) {
42235 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42236 index cccef87..06ce8ec 100644
42237 --- a/drivers/hwmon/asus_atk0110.c
42238 +++ b/drivers/hwmon/asus_atk0110.c
42239 @@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42240 struct atk_sensor_data {
42241 struct list_head list;
42242 struct atk_data *data;
42243 - struct device_attribute label_attr;
42244 - struct device_attribute input_attr;
42245 - struct device_attribute limit1_attr;
42246 - struct device_attribute limit2_attr;
42247 + device_attribute_no_const label_attr;
42248 + device_attribute_no_const input_attr;
42249 + device_attribute_no_const limit1_attr;
42250 + device_attribute_no_const limit2_attr;
42251 char label_attr_name[ATTR_NAME_SIZE];
42252 char input_attr_name[ATTR_NAME_SIZE];
42253 char limit1_attr_name[ATTR_NAME_SIZE];
42254 @@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42255 static struct device_attribute atk_name_attr =
42256 __ATTR(name, 0444, atk_name_show, NULL);
42257
42258 -static void atk_init_attribute(struct device_attribute *attr, char *name,
42259 +static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42260 sysfs_show_func show)
42261 {
42262 sysfs_attr_init(&attr->attr);
42263 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42264 index d76f0b7..55ae976 100644
42265 --- a/drivers/hwmon/coretemp.c
42266 +++ b/drivers/hwmon/coretemp.c
42267 @@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42268 return NOTIFY_OK;
42269 }
42270
42271 -static struct notifier_block coretemp_cpu_notifier __refdata = {
42272 +static struct notifier_block coretemp_cpu_notifier = {
42273 .notifier_call = coretemp_cpu_callback,
42274 };
42275
42276 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42277 index 7a8a6fb..015c1fd 100644
42278 --- a/drivers/hwmon/ibmaem.c
42279 +++ b/drivers/hwmon/ibmaem.c
42280 @@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42281 struct aem_rw_sensor_template *rw)
42282 {
42283 struct device *dev = &data->pdev->dev;
42284 - struct sensor_device_attribute *sensors = data->sensors;
42285 + sensor_device_attribute_no_const *sensors = data->sensors;
42286 int err;
42287
42288 /* Set up read-only sensors */
42289 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42290 index 14c82da..09b25d7 100644
42291 --- a/drivers/hwmon/iio_hwmon.c
42292 +++ b/drivers/hwmon/iio_hwmon.c
42293 @@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42294 {
42295 struct device *dev = &pdev->dev;
42296 struct iio_hwmon_state *st;
42297 - struct sensor_device_attribute *a;
42298 + sensor_device_attribute_no_const *a;
42299 int ret, i;
42300 int in_i = 1, temp_i = 1, curr_i = 1;
42301 enum iio_chan_type type;
42302 diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42303 index 7710f46..427a28d 100644
42304 --- a/drivers/hwmon/nct6683.c
42305 +++ b/drivers/hwmon/nct6683.c
42306 @@ -397,11 +397,11 @@ static struct attribute_group *
42307 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42308 int repeat)
42309 {
42310 - struct sensor_device_attribute_2 *a2;
42311 - struct sensor_device_attribute *a;
42312 + sensor_device_attribute_2_no_const *a2;
42313 + sensor_device_attribute_no_const *a;
42314 struct sensor_device_template **t;
42315 struct sensor_device_attr_u *su;
42316 - struct attribute_group *group;
42317 + attribute_group_no_const *group;
42318 struct attribute **attrs;
42319 int i, j, count;
42320
42321 diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42322 index 504cbdd..35d6f25 100644
42323 --- a/drivers/hwmon/nct6775.c
42324 +++ b/drivers/hwmon/nct6775.c
42325 @@ -943,10 +943,10 @@ static struct attribute_group *
42326 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42327 int repeat)
42328 {
42329 - struct attribute_group *group;
42330 + attribute_group_no_const *group;
42331 struct sensor_device_attr_u *su;
42332 - struct sensor_device_attribute *a;
42333 - struct sensor_device_attribute_2 *a2;
42334 + sensor_device_attribute_no_const *a;
42335 + sensor_device_attribute_2_no_const *a2;
42336 struct attribute **attrs;
42337 struct sensor_device_template **t;
42338 int i, count;
42339 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42340 index 291d11f..3f0dbbd 100644
42341 --- a/drivers/hwmon/pmbus/pmbus_core.c
42342 +++ b/drivers/hwmon/pmbus/pmbus_core.c
42343 @@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42344 return 0;
42345 }
42346
42347 -static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42348 +static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42349 const char *name,
42350 umode_t mode,
42351 ssize_t (*show)(struct device *dev,
42352 @@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42353 dev_attr->store = store;
42354 }
42355
42356 -static void pmbus_attr_init(struct sensor_device_attribute *a,
42357 +static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42358 const char *name,
42359 umode_t mode,
42360 ssize_t (*show)(struct device *dev,
42361 @@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42362 u16 reg, u8 mask)
42363 {
42364 struct pmbus_boolean *boolean;
42365 - struct sensor_device_attribute *a;
42366 + sensor_device_attribute_no_const *a;
42367
42368 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42369 if (!boolean)
42370 @@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42371 bool update, bool readonly)
42372 {
42373 struct pmbus_sensor *sensor;
42374 - struct device_attribute *a;
42375 + device_attribute_no_const *a;
42376
42377 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42378 if (!sensor)
42379 @@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42380 const char *lstring, int index)
42381 {
42382 struct pmbus_label *label;
42383 - struct device_attribute *a;
42384 + device_attribute_no_const *a;
42385
42386 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42387 if (!label)
42388 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42389 index 97cd45a..ac54d8b 100644
42390 --- a/drivers/hwmon/sht15.c
42391 +++ b/drivers/hwmon/sht15.c
42392 @@ -169,7 +169,7 @@ struct sht15_data {
42393 int supply_uv;
42394 bool supply_uv_valid;
42395 struct work_struct update_supply_work;
42396 - atomic_t interrupt_handled;
42397 + atomic_unchecked_t interrupt_handled;
42398 };
42399
42400 /**
42401 @@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42402 ret = gpio_direction_input(data->pdata->gpio_data);
42403 if (ret)
42404 return ret;
42405 - atomic_set(&data->interrupt_handled, 0);
42406 + atomic_set_unchecked(&data->interrupt_handled, 0);
42407
42408 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42409 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42410 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42411 /* Only relevant if the interrupt hasn't occurred. */
42412 - if (!atomic_read(&data->interrupt_handled))
42413 + if (!atomic_read_unchecked(&data->interrupt_handled))
42414 schedule_work(&data->read_work);
42415 }
42416 ret = wait_event_timeout(data->wait_queue,
42417 @@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42418
42419 /* First disable the interrupt */
42420 disable_irq_nosync(irq);
42421 - atomic_inc(&data->interrupt_handled);
42422 + atomic_inc_unchecked(&data->interrupt_handled);
42423 /* Then schedule a reading work struct */
42424 if (data->state != SHT15_READING_NOTHING)
42425 schedule_work(&data->read_work);
42426 @@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42427 * If not, then start the interrupt again - care here as could
42428 * have gone low in meantime so verify it hasn't!
42429 */
42430 - atomic_set(&data->interrupt_handled, 0);
42431 + atomic_set_unchecked(&data->interrupt_handled, 0);
42432 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42433 /* If still not occurred or another handler was scheduled */
42434 if (gpio_get_value(data->pdata->gpio_data)
42435 - || atomic_read(&data->interrupt_handled))
42436 + || atomic_read_unchecked(&data->interrupt_handled))
42437 return;
42438 }
42439
42440 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42441 index 8df43c5..b07b91d 100644
42442 --- a/drivers/hwmon/via-cputemp.c
42443 +++ b/drivers/hwmon/via-cputemp.c
42444 @@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42445 return NOTIFY_OK;
42446 }
42447
42448 -static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42449 +static struct notifier_block via_cputemp_cpu_notifier = {
42450 .notifier_call = via_cputemp_cpu_callback,
42451 };
42452
42453 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42454 index 65e3240..e6c511d 100644
42455 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
42456 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42457 @@ -39,7 +39,7 @@
42458 extern struct i2c_adapter amd756_smbus;
42459
42460 static struct i2c_adapter *s4882_adapter;
42461 -static struct i2c_algorithm *s4882_algo;
42462 +static i2c_algorithm_no_const *s4882_algo;
42463
42464 /* Wrapper access functions for multiplexed SMBus */
42465 static DEFINE_MUTEX(amd756_lock);
42466 diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42467 index b19a310..d6eece0 100644
42468 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
42469 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42470 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42471 /* usb layer */
42472
42473 /* Send command to device, and get response. */
42474 -static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42475 +static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42476 {
42477 int ret = 0;
42478 int actual;
42479 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42480 index 88eda09..cf40434 100644
42481 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42482 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42483 @@ -37,7 +37,7 @@
42484 extern struct i2c_adapter *nforce2_smbus;
42485
42486 static struct i2c_adapter *s4985_adapter;
42487 -static struct i2c_algorithm *s4985_algo;
42488 +static i2c_algorithm_no_const *s4985_algo;
42489
42490 /* Wrapper access functions for multiplexed SMBus */
42491 static DEFINE_MUTEX(nforce2_lock);
42492 diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42493 index 71c7a39..71dd3e0 100644
42494 --- a/drivers/i2c/i2c-dev.c
42495 +++ b/drivers/i2c/i2c-dev.c
42496 @@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42497 break;
42498 }
42499
42500 - data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42501 + data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42502 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42503 if (IS_ERR(rdwr_pa[i].buf)) {
42504 res = PTR_ERR(rdwr_pa[i].buf);
42505 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42506 index 0b510ba..4fbb5085 100644
42507 --- a/drivers/ide/ide-cd.c
42508 +++ b/drivers/ide/ide-cd.c
42509 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42510 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42511 if ((unsigned long)buf & alignment
42512 || blk_rq_bytes(rq) & q->dma_pad_mask
42513 - || object_is_on_stack(buf))
42514 + || object_starts_on_stack(buf))
42515 drive->dma = 0;
42516 }
42517 }
42518 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42519 index af3e76d..96dfe5e 100644
42520 --- a/drivers/iio/industrialio-core.c
42521 +++ b/drivers/iio/industrialio-core.c
42522 @@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42523 }
42524
42525 static
42526 -int __iio_device_attr_init(struct device_attribute *dev_attr,
42527 +int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42528 const char *postfix,
42529 struct iio_chan_spec const *chan,
42530 ssize_t (*readfunc)(struct device *dev,
42531 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42532 index e28a494..f7c2671 100644
42533 --- a/drivers/infiniband/core/cm.c
42534 +++ b/drivers/infiniband/core/cm.c
42535 @@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42536
42537 struct cm_counter_group {
42538 struct kobject obj;
42539 - atomic_long_t counter[CM_ATTR_COUNT];
42540 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42541 };
42542
42543 struct cm_counter_attribute {
42544 @@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42545 struct ib_mad_send_buf *msg = NULL;
42546 int ret;
42547
42548 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42549 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42550 counter[CM_REQ_COUNTER]);
42551
42552 /* Quick state check to discard duplicate REQs. */
42553 @@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42554 if (!cm_id_priv)
42555 return;
42556
42557 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42558 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42559 counter[CM_REP_COUNTER]);
42560 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42561 if (ret)
42562 @@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42563 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42564 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42565 spin_unlock_irq(&cm_id_priv->lock);
42566 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42567 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42568 counter[CM_RTU_COUNTER]);
42569 goto out;
42570 }
42571 @@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42572 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42573 dreq_msg->local_comm_id);
42574 if (!cm_id_priv) {
42575 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42576 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42577 counter[CM_DREQ_COUNTER]);
42578 cm_issue_drep(work->port, work->mad_recv_wc);
42579 return -EINVAL;
42580 @@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42581 case IB_CM_MRA_REP_RCVD:
42582 break;
42583 case IB_CM_TIMEWAIT:
42584 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42585 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42586 counter[CM_DREQ_COUNTER]);
42587 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42588 goto unlock;
42589 @@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42590 cm_free_msg(msg);
42591 goto deref;
42592 case IB_CM_DREQ_RCVD:
42593 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42594 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42595 counter[CM_DREQ_COUNTER]);
42596 goto unlock;
42597 default:
42598 @@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42599 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42600 cm_id_priv->msg, timeout)) {
42601 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42602 - atomic_long_inc(&work->port->
42603 + atomic_long_inc_unchecked(&work->port->
42604 counter_group[CM_RECV_DUPLICATES].
42605 counter[CM_MRA_COUNTER]);
42606 goto out;
42607 @@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42608 break;
42609 case IB_CM_MRA_REQ_RCVD:
42610 case IB_CM_MRA_REP_RCVD:
42611 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42612 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42613 counter[CM_MRA_COUNTER]);
42614 /* fall through */
42615 default:
42616 @@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42617 case IB_CM_LAP_IDLE:
42618 break;
42619 case IB_CM_MRA_LAP_SENT:
42620 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42621 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42622 counter[CM_LAP_COUNTER]);
42623 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42624 goto unlock;
42625 @@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42626 cm_free_msg(msg);
42627 goto deref;
42628 case IB_CM_LAP_RCVD:
42629 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42630 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42631 counter[CM_LAP_COUNTER]);
42632 goto unlock;
42633 default:
42634 @@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42635 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42636 if (cur_cm_id_priv) {
42637 spin_unlock_irq(&cm.lock);
42638 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42639 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42640 counter[CM_SIDR_REQ_COUNTER]);
42641 goto out; /* Duplicate message. */
42642 }
42643 @@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42644 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42645 msg->retries = 1;
42646
42647 - atomic_long_add(1 + msg->retries,
42648 + atomic_long_add_unchecked(1 + msg->retries,
42649 &port->counter_group[CM_XMIT].counter[attr_index]);
42650 if (msg->retries)
42651 - atomic_long_add(msg->retries,
42652 + atomic_long_add_unchecked(msg->retries,
42653 &port->counter_group[CM_XMIT_RETRIES].
42654 counter[attr_index]);
42655
42656 @@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42657 }
42658
42659 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42660 - atomic_long_inc(&port->counter_group[CM_RECV].
42661 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42662 counter[attr_id - CM_ATTR_ID_OFFSET]);
42663
42664 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42665 @@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42666 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42667
42668 return sprintf(buf, "%ld\n",
42669 - atomic_long_read(&group->counter[cm_attr->index]));
42670 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42671 }
42672
42673 static const struct sysfs_ops cm_counter_ops = {
42674 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42675 index 9f5ad7c..588cd84 100644
42676 --- a/drivers/infiniband/core/fmr_pool.c
42677 +++ b/drivers/infiniband/core/fmr_pool.c
42678 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
42679
42680 struct task_struct *thread;
42681
42682 - atomic_t req_ser;
42683 - atomic_t flush_ser;
42684 + atomic_unchecked_t req_ser;
42685 + atomic_unchecked_t flush_ser;
42686
42687 wait_queue_head_t force_wait;
42688 };
42689 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42690 struct ib_fmr_pool *pool = pool_ptr;
42691
42692 do {
42693 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42694 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42695 ib_fmr_batch_release(pool);
42696
42697 - atomic_inc(&pool->flush_ser);
42698 + atomic_inc_unchecked(&pool->flush_ser);
42699 wake_up_interruptible(&pool->force_wait);
42700
42701 if (pool->flush_function)
42702 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42703 }
42704
42705 set_current_state(TASK_INTERRUPTIBLE);
42706 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42707 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42708 !kthread_should_stop())
42709 schedule();
42710 __set_current_state(TASK_RUNNING);
42711 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42712 pool->dirty_watermark = params->dirty_watermark;
42713 pool->dirty_len = 0;
42714 spin_lock_init(&pool->pool_lock);
42715 - atomic_set(&pool->req_ser, 0);
42716 - atomic_set(&pool->flush_ser, 0);
42717 + atomic_set_unchecked(&pool->req_ser, 0);
42718 + atomic_set_unchecked(&pool->flush_ser, 0);
42719 init_waitqueue_head(&pool->force_wait);
42720
42721 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42722 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42723 }
42724 spin_unlock_irq(&pool->pool_lock);
42725
42726 - serial = atomic_inc_return(&pool->req_ser);
42727 + serial = atomic_inc_return_unchecked(&pool->req_ser);
42728 wake_up_process(pool->thread);
42729
42730 if (wait_event_interruptible(pool->force_wait,
42731 - atomic_read(&pool->flush_ser) - serial >= 0))
42732 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42733 return -EINTR;
42734
42735 return 0;
42736 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42737 } else {
42738 list_add_tail(&fmr->list, &pool->dirty_list);
42739 if (++pool->dirty_len >= pool->dirty_watermark) {
42740 - atomic_inc(&pool->req_ser);
42741 + atomic_inc_unchecked(&pool->req_ser);
42742 wake_up_process(pool->thread);
42743 }
42744 }
42745 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42746 index ec7a298..8742e59 100644
42747 --- a/drivers/infiniband/hw/cxgb4/mem.c
42748 +++ b/drivers/infiniband/hw/cxgb4/mem.c
42749 @@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42750 int err;
42751 struct fw_ri_tpte tpt;
42752 u32 stag_idx;
42753 - static atomic_t key;
42754 + static atomic_unchecked_t key;
42755
42756 if (c4iw_fatal_error(rdev))
42757 return -EIO;
42758 @@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42759 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42760 rdev->stats.stag.max = rdev->stats.stag.cur;
42761 mutex_unlock(&rdev->stats.lock);
42762 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42763 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42764 }
42765 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42766 __func__, stag_state, type, pdid, stag_idx);
42767 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42768 index 79b3dbc..96e5fcc 100644
42769 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
42770 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42771 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42772 struct ib_atomic_eth *ateth;
42773 struct ipath_ack_entry *e;
42774 u64 vaddr;
42775 - atomic64_t *maddr;
42776 + atomic64_unchecked_t *maddr;
42777 u64 sdata;
42778 u32 rkey;
42779 u8 next;
42780 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42781 IB_ACCESS_REMOTE_ATOMIC)))
42782 goto nack_acc_unlck;
42783 /* Perform atomic OP and save result. */
42784 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42785 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42786 sdata = be64_to_cpu(ateth->swap_data);
42787 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42788 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42789 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42790 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42791 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42792 be64_to_cpu(ateth->compare_data),
42793 sdata);
42794 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42795 index 1f95bba..9530f87 100644
42796 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42797 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42798 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42799 unsigned long flags;
42800 struct ib_wc wc;
42801 u64 sdata;
42802 - atomic64_t *maddr;
42803 + atomic64_unchecked_t *maddr;
42804 enum ib_wc_status send_status;
42805
42806 /*
42807 @@ -382,11 +382,11 @@ again:
42808 IB_ACCESS_REMOTE_ATOMIC)))
42809 goto acc_err;
42810 /* Perform atomic OP and save result. */
42811 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42812 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42813 sdata = wqe->wr.wr.atomic.compare_add;
42814 *(u64 *) sqp->s_sge.sge.vaddr =
42815 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42816 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42817 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42818 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42819 sdata, wqe->wr.wr.atomic.swap);
42820 goto send_comp;
42821 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42822 index 82a7dd8..8fb6ba6 100644
42823 --- a/drivers/infiniband/hw/mlx4/mad.c
42824 +++ b/drivers/infiniband/hw/mlx4/mad.c
42825 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42826
42827 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42828 {
42829 - return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42830 + return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42831 cpu_to_be64(0xff00000000000000LL);
42832 }
42833
42834 diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42835 index ed327e6..ca1739e0 100644
42836 --- a/drivers/infiniband/hw/mlx4/mcg.c
42837 +++ b/drivers/infiniband/hw/mlx4/mcg.c
42838 @@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42839 {
42840 char name[20];
42841
42842 - atomic_set(&ctx->tid, 0);
42843 + atomic_set_unchecked(&ctx->tid, 0);
42844 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42845 ctx->mcg_wq = create_singlethread_workqueue(name);
42846 if (!ctx->mcg_wq)
42847 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42848 index 6eb743f..a7b0f6d 100644
42849 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42850 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42851 @@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
42852 struct list_head mcg_mgid0_list;
42853 struct workqueue_struct *mcg_wq;
42854 struct mlx4_ib_demux_pv_ctx **tun;
42855 - atomic_t tid;
42856 + atomic_unchecked_t tid;
42857 int flushing; /* flushing the work queue */
42858 };
42859
42860 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42861 index 9d3e5c1..6f166df 100644
42862 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42863 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42864 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42865 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42866 }
42867
42868 -int mthca_QUERY_FW(struct mthca_dev *dev)
42869 +int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42870 {
42871 struct mthca_mailbox *mailbox;
42872 u32 *outbox;
42873 @@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42874 CMD_TIME_CLASS_B);
42875 }
42876
42877 -int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42878 +int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42879 int num_mtt)
42880 {
42881 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42882 @@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42883 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42884 }
42885
42886 -int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42887 +int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42888 int eq_num)
42889 {
42890 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42891 @@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42892 CMD_TIME_CLASS_B);
42893 }
42894
42895 -int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42896 +int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42897 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42898 void *in_mad, void *response_mad)
42899 {
42900 diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42901 index ded76c1..0cf0a08 100644
42902 --- a/drivers/infiniband/hw/mthca/mthca_main.c
42903 +++ b/drivers/infiniband/hw/mthca/mthca_main.c
42904 @@ -692,7 +692,7 @@ err_close:
42905 return err;
42906 }
42907
42908 -static int mthca_setup_hca(struct mthca_dev *dev)
42909 +static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42910 {
42911 int err;
42912
42913 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42914 index ed9a989..6aa5dc2 100644
42915 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
42916 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42917 @@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42918 * through the bitmaps)
42919 */
42920
42921 -static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42922 +static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42923 {
42924 int o;
42925 int m;
42926 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42927 return key;
42928 }
42929
42930 -int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42931 +int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42932 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42933 {
42934 struct mthca_mailbox *mailbox;
42935 @@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
42936 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
42937 }
42938
42939 -int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42940 +int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42941 u64 *buffer_list, int buffer_size_shift,
42942 int list_len, u64 iova, u64 total_size,
42943 u32 access, struct mthca_mr *mr)
42944 diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
42945 index 415f8e1..e34214e 100644
42946 --- a/drivers/infiniband/hw/mthca/mthca_provider.c
42947 +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
42948 @@ -764,7 +764,7 @@ unlock:
42949 return 0;
42950 }
42951
42952 -static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42953 +static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42954 {
42955 struct mthca_dev *dev = to_mdev(ibcq->device);
42956 struct mthca_cq *cq = to_mcq(ibcq);
42957 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
42958 index 3b2a6dc..bce26ff 100644
42959 --- a/drivers/infiniband/hw/nes/nes.c
42960 +++ b/drivers/infiniband/hw/nes/nes.c
42961 @@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
42962 LIST_HEAD(nes_adapter_list);
42963 static LIST_HEAD(nes_dev_list);
42964
42965 -atomic_t qps_destroyed;
42966 +atomic_unchecked_t qps_destroyed;
42967
42968 static unsigned int ee_flsh_adapter;
42969 static unsigned int sysfs_nonidx_addr;
42970 @@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
42971 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
42972 struct nes_adapter *nesadapter = nesdev->nesadapter;
42973
42974 - atomic_inc(&qps_destroyed);
42975 + atomic_inc_unchecked(&qps_destroyed);
42976
42977 /* Free the control structures */
42978
42979 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
42980 index bd9d132..70d84f4 100644
42981 --- a/drivers/infiniband/hw/nes/nes.h
42982 +++ b/drivers/infiniband/hw/nes/nes.h
42983 @@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
42984 extern unsigned int wqm_quanta;
42985 extern struct list_head nes_adapter_list;
42986
42987 -extern atomic_t cm_connects;
42988 -extern atomic_t cm_accepts;
42989 -extern atomic_t cm_disconnects;
42990 -extern atomic_t cm_closes;
42991 -extern atomic_t cm_connecteds;
42992 -extern atomic_t cm_connect_reqs;
42993 -extern atomic_t cm_rejects;
42994 -extern atomic_t mod_qp_timouts;
42995 -extern atomic_t qps_created;
42996 -extern atomic_t qps_destroyed;
42997 -extern atomic_t sw_qps_destroyed;
42998 +extern atomic_unchecked_t cm_connects;
42999 +extern atomic_unchecked_t cm_accepts;
43000 +extern atomic_unchecked_t cm_disconnects;
43001 +extern atomic_unchecked_t cm_closes;
43002 +extern atomic_unchecked_t cm_connecteds;
43003 +extern atomic_unchecked_t cm_connect_reqs;
43004 +extern atomic_unchecked_t cm_rejects;
43005 +extern atomic_unchecked_t mod_qp_timouts;
43006 +extern atomic_unchecked_t qps_created;
43007 +extern atomic_unchecked_t qps_destroyed;
43008 +extern atomic_unchecked_t sw_qps_destroyed;
43009 extern u32 mh_detected;
43010 extern u32 mh_pauses_sent;
43011 extern u32 cm_packets_sent;
43012 @@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43013 extern u32 cm_packets_received;
43014 extern u32 cm_packets_dropped;
43015 extern u32 cm_packets_retrans;
43016 -extern atomic_t cm_listens_created;
43017 -extern atomic_t cm_listens_destroyed;
43018 +extern atomic_unchecked_t cm_listens_created;
43019 +extern atomic_unchecked_t cm_listens_destroyed;
43020 extern u32 cm_backlog_drops;
43021 -extern atomic_t cm_loopbacks;
43022 -extern atomic_t cm_nodes_created;
43023 -extern atomic_t cm_nodes_destroyed;
43024 -extern atomic_t cm_accel_dropped_pkts;
43025 -extern atomic_t cm_resets_recvd;
43026 -extern atomic_t pau_qps_created;
43027 -extern atomic_t pau_qps_destroyed;
43028 +extern atomic_unchecked_t cm_loopbacks;
43029 +extern atomic_unchecked_t cm_nodes_created;
43030 +extern atomic_unchecked_t cm_nodes_destroyed;
43031 +extern atomic_unchecked_t cm_accel_dropped_pkts;
43032 +extern atomic_unchecked_t cm_resets_recvd;
43033 +extern atomic_unchecked_t pau_qps_created;
43034 +extern atomic_unchecked_t pau_qps_destroyed;
43035
43036 extern u32 int_mod_timer_init;
43037 extern u32 int_mod_cq_depth_256;
43038 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43039 index 6f09a72..cf4399d 100644
43040 --- a/drivers/infiniband/hw/nes/nes_cm.c
43041 +++ b/drivers/infiniband/hw/nes/nes_cm.c
43042 @@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43043 u32 cm_packets_retrans;
43044 u32 cm_packets_created;
43045 u32 cm_packets_received;
43046 -atomic_t cm_listens_created;
43047 -atomic_t cm_listens_destroyed;
43048 +atomic_unchecked_t cm_listens_created;
43049 +atomic_unchecked_t cm_listens_destroyed;
43050 u32 cm_backlog_drops;
43051 -atomic_t cm_loopbacks;
43052 -atomic_t cm_nodes_created;
43053 -atomic_t cm_nodes_destroyed;
43054 -atomic_t cm_accel_dropped_pkts;
43055 -atomic_t cm_resets_recvd;
43056 +atomic_unchecked_t cm_loopbacks;
43057 +atomic_unchecked_t cm_nodes_created;
43058 +atomic_unchecked_t cm_nodes_destroyed;
43059 +atomic_unchecked_t cm_accel_dropped_pkts;
43060 +atomic_unchecked_t cm_resets_recvd;
43061
43062 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43063 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43064 @@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43065 /* instance of function pointers for client API */
43066 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43067 static struct nes_cm_ops nes_cm_api = {
43068 - mini_cm_accelerated,
43069 - mini_cm_listen,
43070 - mini_cm_del_listen,
43071 - mini_cm_connect,
43072 - mini_cm_close,
43073 - mini_cm_accept,
43074 - mini_cm_reject,
43075 - mini_cm_recv_pkt,
43076 - mini_cm_dealloc_core,
43077 - mini_cm_get,
43078 - mini_cm_set
43079 + .accelerated = mini_cm_accelerated,
43080 + .listen = mini_cm_listen,
43081 + .stop_listener = mini_cm_del_listen,
43082 + .connect = mini_cm_connect,
43083 + .close = mini_cm_close,
43084 + .accept = mini_cm_accept,
43085 + .reject = mini_cm_reject,
43086 + .recv_pkt = mini_cm_recv_pkt,
43087 + .destroy_cm_core = mini_cm_dealloc_core,
43088 + .get = mini_cm_get,
43089 + .set = mini_cm_set
43090 };
43091
43092 static struct nes_cm_core *g_cm_core;
43093
43094 -atomic_t cm_connects;
43095 -atomic_t cm_accepts;
43096 -atomic_t cm_disconnects;
43097 -atomic_t cm_closes;
43098 -atomic_t cm_connecteds;
43099 -atomic_t cm_connect_reqs;
43100 -atomic_t cm_rejects;
43101 +atomic_unchecked_t cm_connects;
43102 +atomic_unchecked_t cm_accepts;
43103 +atomic_unchecked_t cm_disconnects;
43104 +atomic_unchecked_t cm_closes;
43105 +atomic_unchecked_t cm_connecteds;
43106 +atomic_unchecked_t cm_connect_reqs;
43107 +atomic_unchecked_t cm_rejects;
43108
43109 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43110 {
43111 @@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43112 kfree(listener);
43113 listener = NULL;
43114 ret = 0;
43115 - atomic_inc(&cm_listens_destroyed);
43116 + atomic_inc_unchecked(&cm_listens_destroyed);
43117 } else {
43118 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43119 }
43120 @@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43121 cm_node->rem_mac);
43122
43123 add_hte_node(cm_core, cm_node);
43124 - atomic_inc(&cm_nodes_created);
43125 + atomic_inc_unchecked(&cm_nodes_created);
43126
43127 return cm_node;
43128 }
43129 @@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43130 }
43131
43132 atomic_dec(&cm_core->node_cnt);
43133 - atomic_inc(&cm_nodes_destroyed);
43134 + atomic_inc_unchecked(&cm_nodes_destroyed);
43135 nesqp = cm_node->nesqp;
43136 if (nesqp) {
43137 nesqp->cm_node = NULL;
43138 @@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43139
43140 static void drop_packet(struct sk_buff *skb)
43141 {
43142 - atomic_inc(&cm_accel_dropped_pkts);
43143 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
43144 dev_kfree_skb_any(skb);
43145 }
43146
43147 @@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43148 {
43149
43150 int reset = 0; /* whether to send reset in case of err.. */
43151 - atomic_inc(&cm_resets_recvd);
43152 + atomic_inc_unchecked(&cm_resets_recvd);
43153 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43154 " refcnt=%d\n", cm_node, cm_node->state,
43155 atomic_read(&cm_node->ref_count));
43156 @@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43157 rem_ref_cm_node(cm_node->cm_core, cm_node);
43158 return NULL;
43159 }
43160 - atomic_inc(&cm_loopbacks);
43161 + atomic_inc_unchecked(&cm_loopbacks);
43162 loopbackremotenode->loopbackpartner = cm_node;
43163 loopbackremotenode->tcp_cntxt.rcv_wscale =
43164 NES_CM_DEFAULT_RCV_WND_SCALE;
43165 @@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43166 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43167 else {
43168 rem_ref_cm_node(cm_core, cm_node);
43169 - atomic_inc(&cm_accel_dropped_pkts);
43170 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
43171 dev_kfree_skb_any(skb);
43172 }
43173 break;
43174 @@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43175
43176 if ((cm_id) && (cm_id->event_handler)) {
43177 if (issue_disconn) {
43178 - atomic_inc(&cm_disconnects);
43179 + atomic_inc_unchecked(&cm_disconnects);
43180 cm_event.event = IW_CM_EVENT_DISCONNECT;
43181 cm_event.status = disconn_status;
43182 cm_event.local_addr = cm_id->local_addr;
43183 @@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43184 }
43185
43186 if (issue_close) {
43187 - atomic_inc(&cm_closes);
43188 + atomic_inc_unchecked(&cm_closes);
43189 nes_disconnect(nesqp, 1);
43190
43191 cm_id->provider_data = nesqp;
43192 @@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43193
43194 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43195 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43196 - atomic_inc(&cm_accepts);
43197 + atomic_inc_unchecked(&cm_accepts);
43198
43199 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43200 netdev_refcnt_read(nesvnic->netdev));
43201 @@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43202 struct nes_cm_core *cm_core;
43203 u8 *start_buff;
43204
43205 - atomic_inc(&cm_rejects);
43206 + atomic_inc_unchecked(&cm_rejects);
43207 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43208 loopback = cm_node->loopbackpartner;
43209 cm_core = cm_node->cm_core;
43210 @@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43211 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43212 ntohs(laddr->sin_port));
43213
43214 - atomic_inc(&cm_connects);
43215 + atomic_inc_unchecked(&cm_connects);
43216 nesqp->active_conn = 1;
43217
43218 /* cache the cm_id in the qp */
43219 @@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43220 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43221 return err;
43222 }
43223 - atomic_inc(&cm_listens_created);
43224 + atomic_inc_unchecked(&cm_listens_created);
43225 }
43226
43227 cm_id->add_ref(cm_id);
43228 @@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43229
43230 if (nesqp->destroyed)
43231 return;
43232 - atomic_inc(&cm_connecteds);
43233 + atomic_inc_unchecked(&cm_connecteds);
43234 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43235 " local port 0x%04X. jiffies = %lu.\n",
43236 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43237 @@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43238
43239 cm_id->add_ref(cm_id);
43240 ret = cm_id->event_handler(cm_id, &cm_event);
43241 - atomic_inc(&cm_closes);
43242 + atomic_inc_unchecked(&cm_closes);
43243 cm_event.event = IW_CM_EVENT_CLOSE;
43244 cm_event.status = 0;
43245 cm_event.provider_data = cm_id->provider_data;
43246 @@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43247 return;
43248 cm_id = cm_node->cm_id;
43249
43250 - atomic_inc(&cm_connect_reqs);
43251 + atomic_inc_unchecked(&cm_connect_reqs);
43252 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43253 cm_node, cm_id, jiffies);
43254
43255 @@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43256 return;
43257 cm_id = cm_node->cm_id;
43258
43259 - atomic_inc(&cm_connect_reqs);
43260 + atomic_inc_unchecked(&cm_connect_reqs);
43261 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43262 cm_node, cm_id, jiffies);
43263
43264 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43265 index 4166452..fc952c3 100644
43266 --- a/drivers/infiniband/hw/nes/nes_mgt.c
43267 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
43268 @@ -40,8 +40,8 @@
43269 #include "nes.h"
43270 #include "nes_mgt.h"
43271
43272 -atomic_t pau_qps_created;
43273 -atomic_t pau_qps_destroyed;
43274 +atomic_unchecked_t pau_qps_created;
43275 +atomic_unchecked_t pau_qps_destroyed;
43276
43277 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43278 {
43279 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43280 {
43281 struct sk_buff *skb;
43282 unsigned long flags;
43283 - atomic_inc(&pau_qps_destroyed);
43284 + atomic_inc_unchecked(&pau_qps_destroyed);
43285
43286 /* Free packets that have not yet been forwarded */
43287 /* Lock is acquired by skb_dequeue when removing the skb */
43288 @@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43289 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43290 skb_queue_head_init(&nesqp->pau_list);
43291 spin_lock_init(&nesqp->pau_lock);
43292 - atomic_inc(&pau_qps_created);
43293 + atomic_inc_unchecked(&pau_qps_created);
43294 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43295 }
43296
43297 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43298 index 49eb511..a774366 100644
43299 --- a/drivers/infiniband/hw/nes/nes_nic.c
43300 +++ b/drivers/infiniband/hw/nes/nes_nic.c
43301 @@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43302 target_stat_values[++index] = mh_detected;
43303 target_stat_values[++index] = mh_pauses_sent;
43304 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43305 - target_stat_values[++index] = atomic_read(&cm_connects);
43306 - target_stat_values[++index] = atomic_read(&cm_accepts);
43307 - target_stat_values[++index] = atomic_read(&cm_disconnects);
43308 - target_stat_values[++index] = atomic_read(&cm_connecteds);
43309 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43310 - target_stat_values[++index] = atomic_read(&cm_rejects);
43311 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43312 - target_stat_values[++index] = atomic_read(&qps_created);
43313 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43314 - target_stat_values[++index] = atomic_read(&qps_destroyed);
43315 - target_stat_values[++index] = atomic_read(&cm_closes);
43316 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43317 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43318 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43319 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43320 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43321 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43322 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43323 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43324 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43325 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43326 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43327 target_stat_values[++index] = cm_packets_sent;
43328 target_stat_values[++index] = cm_packets_bounced;
43329 target_stat_values[++index] = cm_packets_created;
43330 target_stat_values[++index] = cm_packets_received;
43331 target_stat_values[++index] = cm_packets_dropped;
43332 target_stat_values[++index] = cm_packets_retrans;
43333 - target_stat_values[++index] = atomic_read(&cm_listens_created);
43334 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43335 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43336 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43337 target_stat_values[++index] = cm_backlog_drops;
43338 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
43339 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
43340 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43341 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43342 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43343 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43344 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43345 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43346 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43347 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43348 target_stat_values[++index] = nesadapter->free_4kpbl;
43349 target_stat_values[++index] = nesadapter->free_256pbl;
43350 target_stat_values[++index] = int_mod_timer_init;
43351 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43352 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43353 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43354 - target_stat_values[++index] = atomic_read(&pau_qps_created);
43355 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43356 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43357 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43358 }
43359
43360 /**
43361 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43362 index fef067c..6a25ccd 100644
43363 --- a/drivers/infiniband/hw/nes/nes_verbs.c
43364 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
43365 @@ -46,9 +46,9 @@
43366
43367 #include <rdma/ib_umem.h>
43368
43369 -atomic_t mod_qp_timouts;
43370 -atomic_t qps_created;
43371 -atomic_t sw_qps_destroyed;
43372 +atomic_unchecked_t mod_qp_timouts;
43373 +atomic_unchecked_t qps_created;
43374 +atomic_unchecked_t sw_qps_destroyed;
43375
43376 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43377
43378 @@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43379 if (init_attr->create_flags)
43380 return ERR_PTR(-EINVAL);
43381
43382 - atomic_inc(&qps_created);
43383 + atomic_inc_unchecked(&qps_created);
43384 switch (init_attr->qp_type) {
43385 case IB_QPT_RC:
43386 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43387 @@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43388 struct iw_cm_event cm_event;
43389 int ret = 0;
43390
43391 - atomic_inc(&sw_qps_destroyed);
43392 + atomic_inc_unchecked(&sw_qps_destroyed);
43393 nesqp->destroyed = 1;
43394
43395 /* Blow away the connection if it exists. */
43396 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43397 index c00ae09..04e91be 100644
43398 --- a/drivers/infiniband/hw/qib/qib.h
43399 +++ b/drivers/infiniband/hw/qib/qib.h
43400 @@ -52,6 +52,7 @@
43401 #include <linux/kref.h>
43402 #include <linux/sched.h>
43403 #include <linux/kthread.h>
43404 +#include <linux/slab.h>
43405
43406 #include "qib_common.h"
43407 #include "qib_verbs.h"
43408 diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43409 index cdc7df4..a2fdfdb 100644
43410 --- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43411 +++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43412 @@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43413 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43414 }
43415
43416 -static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43417 +static struct rtnl_link_ops ipoib_link_ops = {
43418 .kind = "ipoib",
43419 .maxtype = IFLA_IPOIB_MAX,
43420 .policy = ipoib_policy,
43421 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43422 index e29c04e..adbf68c 100644
43423 --- a/drivers/input/gameport/gameport.c
43424 +++ b/drivers/input/gameport/gameport.c
43425 @@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43426 */
43427 static void gameport_init_port(struct gameport *gameport)
43428 {
43429 - static atomic_t gameport_no = ATOMIC_INIT(0);
43430 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
43431
43432 __module_get(THIS_MODULE);
43433
43434 mutex_init(&gameport->drv_mutex);
43435 device_initialize(&gameport->dev);
43436 dev_set_name(&gameport->dev, "gameport%lu",
43437 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
43438 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
43439 gameport->dev.bus = &gameport_bus;
43440 gameport->dev.release = gameport_release_port;
43441 if (gameport->parent)
43442 diff --git a/drivers/input/input.c b/drivers/input/input.c
43443 index 0f175f5..4c481c0 100644
43444 --- a/drivers/input/input.c
43445 +++ b/drivers/input/input.c
43446 @@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43447 */
43448 struct input_dev *input_allocate_device(void)
43449 {
43450 - static atomic_t input_no = ATOMIC_INIT(0);
43451 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
43452 struct input_dev *dev;
43453
43454 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43455 @@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43456 INIT_LIST_HEAD(&dev->node);
43457
43458 dev_set_name(&dev->dev, "input%lu",
43459 - (unsigned long) atomic_inc_return(&input_no) - 1);
43460 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
43461
43462 __module_get(THIS_MODULE);
43463 }
43464 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43465 index 4a95b22..874c182 100644
43466 --- a/drivers/input/joystick/sidewinder.c
43467 +++ b/drivers/input/joystick/sidewinder.c
43468 @@ -30,6 +30,7 @@
43469 #include <linux/kernel.h>
43470 #include <linux/module.h>
43471 #include <linux/slab.h>
43472 +#include <linux/sched.h>
43473 #include <linux/input.h>
43474 #include <linux/gameport.h>
43475 #include <linux/jiffies.h>
43476 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43477 index fc55f0d..11e2aa6 100644
43478 --- a/drivers/input/joystick/xpad.c
43479 +++ b/drivers/input/joystick/xpad.c
43480 @@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43481
43482 static int xpad_led_probe(struct usb_xpad *xpad)
43483 {
43484 - static atomic_t led_seq = ATOMIC_INIT(0);
43485 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
43486 long led_no;
43487 struct xpad_led *led;
43488 struct led_classdev *led_cdev;
43489 @@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43490 if (!led)
43491 return -ENOMEM;
43492
43493 - led_no = (long)atomic_inc_return(&led_seq) - 1;
43494 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
43495
43496 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
43497 led->xpad = xpad;
43498 diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43499 index afed8e2..3aa8a18 100644
43500 --- a/drivers/input/misc/ims-pcu.c
43501 +++ b/drivers/input/misc/ims-pcu.c
43502 @@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43503
43504 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43505 {
43506 - static atomic_t device_no = ATOMIC_INIT(0);
43507 + static atomic_unchecked_t device_no = ATOMIC_INIT(0);
43508
43509 const struct ims_pcu_device_info *info;
43510 int error;
43511 @@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43512 }
43513
43514 /* Device appears to be operable, complete initialization */
43515 - pcu->device_no = atomic_inc_return(&device_no) - 1;
43516 + pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
43517
43518 /*
43519 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43520 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43521 index f4cf664..3204fda 100644
43522 --- a/drivers/input/mouse/psmouse.h
43523 +++ b/drivers/input/mouse/psmouse.h
43524 @@ -117,7 +117,7 @@ struct psmouse_attribute {
43525 ssize_t (*set)(struct psmouse *psmouse, void *data,
43526 const char *buf, size_t count);
43527 bool protect;
43528 -};
43529 +} __do_const;
43530 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43531
43532 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43533 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43534 index b604564..3f14ae4 100644
43535 --- a/drivers/input/mousedev.c
43536 +++ b/drivers/input/mousedev.c
43537 @@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43538
43539 spin_unlock_irq(&client->packet_lock);
43540
43541 - if (copy_to_user(buffer, data, count))
43542 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
43543 return -EFAULT;
43544
43545 return count;
43546 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43547 index d399b8b..4913ede 100644
43548 --- a/drivers/input/serio/serio.c
43549 +++ b/drivers/input/serio/serio.c
43550 @@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43551 */
43552 static void serio_init_port(struct serio *serio)
43553 {
43554 - static atomic_t serio_no = ATOMIC_INIT(0);
43555 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
43556
43557 __module_get(THIS_MODULE);
43558
43559 @@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43560 mutex_init(&serio->drv_mutex);
43561 device_initialize(&serio->dev);
43562 dev_set_name(&serio->dev, "serio%lu",
43563 - (unsigned long)atomic_inc_return(&serio_no) - 1);
43564 + (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
43565 serio->dev.bus = &serio_bus;
43566 serio->dev.release = serio_release_port;
43567 serio->dev.groups = serio_device_attr_groups;
43568 diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43569 index c9a02fe..0debc75 100644
43570 --- a/drivers/input/serio/serio_raw.c
43571 +++ b/drivers/input/serio/serio_raw.c
43572 @@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43573
43574 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43575 {
43576 - static atomic_t serio_raw_no = ATOMIC_INIT(0);
43577 + static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43578 struct serio_raw *serio_raw;
43579 int err;
43580
43581 @@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43582 }
43583
43584 snprintf(serio_raw->name, sizeof(serio_raw->name),
43585 - "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43586 + "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43587 kref_init(&serio_raw->kref);
43588 INIT_LIST_HEAD(&serio_raw->client_list);
43589 init_waitqueue_head(&serio_raw->wait);
43590 diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43591 index 505a9ad..356734c 100644
43592 --- a/drivers/iommu/amd_iommu.c
43593 +++ b/drivers/iommu/amd_iommu.c
43594 @@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43595
43596 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43597 {
43598 + phys_addr_t physaddr;
43599 WARN_ON(address & 0x7ULL);
43600
43601 memset(cmd, 0, sizeof(*cmd));
43602 - cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43603 - cmd->data[1] = upper_32_bits(__pa(address));
43604 +
43605 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43606 + if (object_starts_on_stack((void *)address)) {
43607 + void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43608 + physaddr = __pa((u64)adjbuf);
43609 + } else
43610 +#endif
43611 + physaddr = __pa(address);
43612 +
43613 + cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43614 + cmd->data[1] = upper_32_bits(physaddr);
43615 cmd->data[2] = 1;
43616 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43617 }
43618 diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43619 index 60558f7..5a02369 100644
43620 --- a/drivers/iommu/arm-smmu.c
43621 +++ b/drivers/iommu/arm-smmu.c
43622 @@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43623 cfg->irptndx = cfg->cbndx;
43624 }
43625
43626 - ACCESS_ONCE(smmu_domain->smmu) = smmu;
43627 + ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43628 arm_smmu_init_context_bank(smmu_domain);
43629 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43630
43631 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43632 index ed8b048..7fbcc01 100644
43633 --- a/drivers/iommu/iommu.c
43634 +++ b/drivers/iommu/iommu.c
43635 @@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43636 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43637 {
43638 int err;
43639 - struct notifier_block *nb;
43640 + notifier_block_no_const *nb;
43641 struct iommu_callback_data cb = {
43642 .ops = ops,
43643 };
43644 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43645 index 74a1767..5a359e8 100644
43646 --- a/drivers/iommu/irq_remapping.c
43647 +++ b/drivers/iommu/irq_remapping.c
43648 @@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43649 void panic_if_irq_remap(const char *msg)
43650 {
43651 if (irq_remapping_enabled)
43652 - panic(msg);
43653 + panic("%s", msg);
43654 }
43655
43656 static void ir_ack_apic_edge(struct irq_data *data)
43657 @@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43658
43659 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43660 {
43661 - chip->irq_print_chip = ir_print_prefix;
43662 - chip->irq_ack = ir_ack_apic_edge;
43663 - chip->irq_eoi = ir_ack_apic_level;
43664 - chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43665 + pax_open_kernel();
43666 + *(void **)&chip->irq_print_chip = ir_print_prefix;
43667 + *(void **)&chip->irq_ack = ir_ack_apic_edge;
43668 + *(void **)&chip->irq_eoi = ir_ack_apic_level;
43669 + *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43670 + pax_close_kernel();
43671 }
43672
43673 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43674 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43675 index 38493ff..001538b 100644
43676 --- a/drivers/irqchip/irq-gic.c
43677 +++ b/drivers/irqchip/irq-gic.c
43678 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43679 * Supported arch specific GIC irq extension.
43680 * Default make them NULL.
43681 */
43682 -struct irq_chip gic_arch_extn = {
43683 +irq_chip_no_const gic_arch_extn = {
43684 .irq_eoi = NULL,
43685 .irq_mask = NULL,
43686 .irq_unmask = NULL,
43687 @@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43688 chained_irq_exit(chip, desc);
43689 }
43690
43691 -static struct irq_chip gic_chip = {
43692 +static irq_chip_no_const gic_chip __read_only = {
43693 .name = "GIC",
43694 .irq_mask = gic_mask_irq,
43695 .irq_unmask = gic_unmask_irq,
43696 diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43697 index 8777065..a4a9967 100644
43698 --- a/drivers/irqchip/irq-renesas-irqc.c
43699 +++ b/drivers/irqchip/irq-renesas-irqc.c
43700 @@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43701 struct irqc_priv *p;
43702 struct resource *io;
43703 struct resource *irq;
43704 - struct irq_chip *irq_chip;
43705 + irq_chip_no_const *irq_chip;
43706 const char *name = dev_name(&pdev->dev);
43707 int ret;
43708 int k;
43709 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43710 index 6a2df32..dc962f1 100644
43711 --- a/drivers/isdn/capi/capi.c
43712 +++ b/drivers/isdn/capi/capi.c
43713 @@ -81,8 +81,8 @@ struct capiminor {
43714
43715 struct capi20_appl *ap;
43716 u32 ncci;
43717 - atomic_t datahandle;
43718 - atomic_t msgid;
43719 + atomic_unchecked_t datahandle;
43720 + atomic_unchecked_t msgid;
43721
43722 struct tty_port port;
43723 int ttyinstop;
43724 @@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43725 capimsg_setu16(s, 2, mp->ap->applid);
43726 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43727 capimsg_setu8 (s, 5, CAPI_RESP);
43728 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43729 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43730 capimsg_setu32(s, 8, mp->ncci);
43731 capimsg_setu16(s, 12, datahandle);
43732 }
43733 @@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43734 mp->outbytes -= len;
43735 spin_unlock_bh(&mp->outlock);
43736
43737 - datahandle = atomic_inc_return(&mp->datahandle);
43738 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43739 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43740 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43741 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43742 capimsg_setu16(skb->data, 2, mp->ap->applid);
43743 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43744 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43745 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43746 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43747 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43748 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43749 capimsg_setu16(skb->data, 16, len); /* Data length */
43750 diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43751 index aecec6d..11e13c5 100644
43752 --- a/drivers/isdn/gigaset/bas-gigaset.c
43753 +++ b/drivers/isdn/gigaset/bas-gigaset.c
43754 @@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43755
43756
43757 static const struct gigaset_ops gigops = {
43758 - gigaset_write_cmd,
43759 - gigaset_write_room,
43760 - gigaset_chars_in_buffer,
43761 - gigaset_brkchars,
43762 - gigaset_init_bchannel,
43763 - gigaset_close_bchannel,
43764 - gigaset_initbcshw,
43765 - gigaset_freebcshw,
43766 - gigaset_reinitbcshw,
43767 - gigaset_initcshw,
43768 - gigaset_freecshw,
43769 - gigaset_set_modem_ctrl,
43770 - gigaset_baud_rate,
43771 - gigaset_set_line_ctrl,
43772 - gigaset_isoc_send_skb,
43773 - gigaset_isoc_input,
43774 + .write_cmd = gigaset_write_cmd,
43775 + .write_room = gigaset_write_room,
43776 + .chars_in_buffer = gigaset_chars_in_buffer,
43777 + .brkchars = gigaset_brkchars,
43778 + .init_bchannel = gigaset_init_bchannel,
43779 + .close_bchannel = gigaset_close_bchannel,
43780 + .initbcshw = gigaset_initbcshw,
43781 + .freebcshw = gigaset_freebcshw,
43782 + .reinitbcshw = gigaset_reinitbcshw,
43783 + .initcshw = gigaset_initcshw,
43784 + .freecshw = gigaset_freecshw,
43785 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43786 + .baud_rate = gigaset_baud_rate,
43787 + .set_line_ctrl = gigaset_set_line_ctrl,
43788 + .send_skb = gigaset_isoc_send_skb,
43789 + .handle_input = gigaset_isoc_input,
43790 };
43791
43792 /* bas_gigaset_init
43793 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43794 index 600c79b..3752bab 100644
43795 --- a/drivers/isdn/gigaset/interface.c
43796 +++ b/drivers/isdn/gigaset/interface.c
43797 @@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43798 }
43799 tty->driver_data = cs;
43800
43801 - ++cs->port.count;
43802 + atomic_inc(&cs->port.count);
43803
43804 - if (cs->port.count == 1) {
43805 + if (atomic_read(&cs->port.count) == 1) {
43806 tty_port_tty_set(&cs->port, tty);
43807 cs->port.low_latency = 1;
43808 }
43809 @@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43810
43811 if (!cs->connected)
43812 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43813 - else if (!cs->port.count)
43814 + else if (!atomic_read(&cs->port.count))
43815 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43816 - else if (!--cs->port.count)
43817 + else if (!atomic_dec_return(&cs->port.count))
43818 tty_port_tty_set(&cs->port, NULL);
43819
43820 mutex_unlock(&cs->mutex);
43821 diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43822 index 8c91fd5..14f13ce 100644
43823 --- a/drivers/isdn/gigaset/ser-gigaset.c
43824 +++ b/drivers/isdn/gigaset/ser-gigaset.c
43825 @@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43826 }
43827
43828 static const struct gigaset_ops ops = {
43829 - gigaset_write_cmd,
43830 - gigaset_write_room,
43831 - gigaset_chars_in_buffer,
43832 - gigaset_brkchars,
43833 - gigaset_init_bchannel,
43834 - gigaset_close_bchannel,
43835 - gigaset_initbcshw,
43836 - gigaset_freebcshw,
43837 - gigaset_reinitbcshw,
43838 - gigaset_initcshw,
43839 - gigaset_freecshw,
43840 - gigaset_set_modem_ctrl,
43841 - gigaset_baud_rate,
43842 - gigaset_set_line_ctrl,
43843 - gigaset_m10x_send_skb, /* asyncdata.c */
43844 - gigaset_m10x_input, /* asyncdata.c */
43845 + .write_cmd = gigaset_write_cmd,
43846 + .write_room = gigaset_write_room,
43847 + .chars_in_buffer = gigaset_chars_in_buffer,
43848 + .brkchars = gigaset_brkchars,
43849 + .init_bchannel = gigaset_init_bchannel,
43850 + .close_bchannel = gigaset_close_bchannel,
43851 + .initbcshw = gigaset_initbcshw,
43852 + .freebcshw = gigaset_freebcshw,
43853 + .reinitbcshw = gigaset_reinitbcshw,
43854 + .initcshw = gigaset_initcshw,
43855 + .freecshw = gigaset_freecshw,
43856 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43857 + .baud_rate = gigaset_baud_rate,
43858 + .set_line_ctrl = gigaset_set_line_ctrl,
43859 + .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43860 + .handle_input = gigaset_m10x_input, /* asyncdata.c */
43861 };
43862
43863
43864 diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43865 index a8e652d..edadaa4 100644
43866 --- a/drivers/isdn/gigaset/usb-gigaset.c
43867 +++ b/drivers/isdn/gigaset/usb-gigaset.c
43868 @@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43869 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43870 memcpy(cs->hw.usb->bchars, buf, 6);
43871 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43872 - 0, 0, &buf, 6, 2000);
43873 + 0, 0, buf, 6, 2000);
43874 }
43875
43876 static void gigaset_freebcshw(struct bc_state *bcs)
43877 @@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43878 }
43879
43880 static const struct gigaset_ops ops = {
43881 - gigaset_write_cmd,
43882 - gigaset_write_room,
43883 - gigaset_chars_in_buffer,
43884 - gigaset_brkchars,
43885 - gigaset_init_bchannel,
43886 - gigaset_close_bchannel,
43887 - gigaset_initbcshw,
43888 - gigaset_freebcshw,
43889 - gigaset_reinitbcshw,
43890 - gigaset_initcshw,
43891 - gigaset_freecshw,
43892 - gigaset_set_modem_ctrl,
43893 - gigaset_baud_rate,
43894 - gigaset_set_line_ctrl,
43895 - gigaset_m10x_send_skb,
43896 - gigaset_m10x_input,
43897 + .write_cmd = gigaset_write_cmd,
43898 + .write_room = gigaset_write_room,
43899 + .chars_in_buffer = gigaset_chars_in_buffer,
43900 + .brkchars = gigaset_brkchars,
43901 + .init_bchannel = gigaset_init_bchannel,
43902 + .close_bchannel = gigaset_close_bchannel,
43903 + .initbcshw = gigaset_initbcshw,
43904 + .freebcshw = gigaset_freebcshw,
43905 + .reinitbcshw = gigaset_reinitbcshw,
43906 + .initcshw = gigaset_initcshw,
43907 + .freecshw = gigaset_freecshw,
43908 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43909 + .baud_rate = gigaset_baud_rate,
43910 + .set_line_ctrl = gigaset_set_line_ctrl,
43911 + .send_skb = gigaset_m10x_send_skb,
43912 + .handle_input = gigaset_m10x_input,
43913 };
43914
43915 /*
43916 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43917 index 4d9b195..455075c 100644
43918 --- a/drivers/isdn/hardware/avm/b1.c
43919 +++ b/drivers/isdn/hardware/avm/b1.c
43920 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43921 }
43922 if (left) {
43923 if (t4file->user) {
43924 - if (copy_from_user(buf, dp, left))
43925 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43926 return -EFAULT;
43927 } else {
43928 memcpy(buf, dp, left);
43929 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
43930 }
43931 if (left) {
43932 if (config->user) {
43933 - if (copy_from_user(buf, dp, left))
43934 + if (left > sizeof buf || copy_from_user(buf, dp, left))
43935 return -EFAULT;
43936 } else {
43937 memcpy(buf, dp, left);
43938 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
43939 index 9b856e1..fa03c92 100644
43940 --- a/drivers/isdn/i4l/isdn_common.c
43941 +++ b/drivers/isdn/i4l/isdn_common.c
43942 @@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
43943 } else
43944 return -EINVAL;
43945 case IIOCDBGVAR:
43946 + if (!capable(CAP_SYS_RAWIO))
43947 + return -EPERM;
43948 if (arg) {
43949 if (copy_to_user(argp, &dev, sizeof(ulong)))
43950 return -EFAULT;
43951 diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
43952 index 91d5730..336523e 100644
43953 --- a/drivers/isdn/i4l/isdn_concap.c
43954 +++ b/drivers/isdn/i4l/isdn_concap.c
43955 @@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
43956 }
43957
43958 struct concap_device_ops isdn_concap_reliable_dl_dops = {
43959 - &isdn_concap_dl_data_req,
43960 - &isdn_concap_dl_connect_req,
43961 - &isdn_concap_dl_disconn_req
43962 + .data_req = &isdn_concap_dl_data_req,
43963 + .connect_req = &isdn_concap_dl_connect_req,
43964 + .disconn_req = &isdn_concap_dl_disconn_req
43965 };
43966
43967 /* The following should better go into a dedicated source file such that
43968 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
43969 index bc91261..2ef7e36 100644
43970 --- a/drivers/isdn/i4l/isdn_tty.c
43971 +++ b/drivers/isdn/i4l/isdn_tty.c
43972 @@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
43973
43974 #ifdef ISDN_DEBUG_MODEM_OPEN
43975 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
43976 - port->count);
43977 + atomic_read(&port->count));
43978 #endif
43979 - port->count++;
43980 + atomic_inc(&port->count);
43981 port->tty = tty;
43982 /*
43983 * Start up serial port
43984 @@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43985 #endif
43986 return;
43987 }
43988 - if ((tty->count == 1) && (port->count != 1)) {
43989 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
43990 /*
43991 * Uh, oh. tty->count is 1, which means that the tty
43992 * structure will be freed. Info->count should always
43993 @@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43994 * serial port won't be shutdown.
43995 */
43996 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
43997 - "info->count is %d\n", port->count);
43998 - port->count = 1;
43999 + "info->count is %d\n", atomic_read(&port->count));
44000 + atomic_set(&port->count, 1);
44001 }
44002 - if (--port->count < 0) {
44003 + if (atomic_dec_return(&port->count) < 0) {
44004 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44005 - info->line, port->count);
44006 - port->count = 0;
44007 + info->line, atomic_read(&port->count));
44008 + atomic_set(&port->count, 0);
44009 }
44010 - if (port->count) {
44011 + if (atomic_read(&port->count)) {
44012 #ifdef ISDN_DEBUG_MODEM_OPEN
44013 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44014 #endif
44015 @@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44016 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44017 return;
44018 isdn_tty_shutdown(info);
44019 - port->count = 0;
44020 + atomic_set(&port->count, 0);
44021 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44022 port->tty = NULL;
44023 wake_up_interruptible(&port->open_wait);
44024 @@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44025 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44026 modem_info *info = &dev->mdm.info[i];
44027
44028 - if (info->port.count == 0)
44029 + if (atomic_read(&info->port.count) == 0)
44030 continue;
44031 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44032 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44033 diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44034 index e2d4e58..40cd045 100644
44035 --- a/drivers/isdn/i4l/isdn_x25iface.c
44036 +++ b/drivers/isdn/i4l/isdn_x25iface.c
44037 @@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44038
44039
44040 static struct concap_proto_ops ix25_pops = {
44041 - &isdn_x25iface_proto_new,
44042 - &isdn_x25iface_proto_del,
44043 - &isdn_x25iface_proto_restart,
44044 - &isdn_x25iface_proto_close,
44045 - &isdn_x25iface_xmit,
44046 - &isdn_x25iface_receive,
44047 - &isdn_x25iface_connect_ind,
44048 - &isdn_x25iface_disconn_ind
44049 + .proto_new = &isdn_x25iface_proto_new,
44050 + .proto_del = &isdn_x25iface_proto_del,
44051 + .restart = &isdn_x25iface_proto_restart,
44052 + .close = &isdn_x25iface_proto_close,
44053 + .encap_and_xmit = &isdn_x25iface_xmit,
44054 + .data_ind = &isdn_x25iface_receive,
44055 + .connect_ind = &isdn_x25iface_connect_ind,
44056 + .disconn_ind = &isdn_x25iface_disconn_ind
44057 };
44058
44059 /* error message helper function */
44060 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44061 index 6a7447c..cae33fe 100644
44062 --- a/drivers/isdn/icn/icn.c
44063 +++ b/drivers/isdn/icn/icn.c
44064 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44065 if (count > len)
44066 count = len;
44067 if (user) {
44068 - if (copy_from_user(msg, buf, count))
44069 + if (count > sizeof msg || copy_from_user(msg, buf, count))
44070 return -EFAULT;
44071 } else
44072 memcpy(msg, buf, count);
44073 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44074 index 87f7dff..7300125 100644
44075 --- a/drivers/isdn/mISDN/dsp_cmx.c
44076 +++ b/drivers/isdn/mISDN/dsp_cmx.c
44077 @@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44078 static u16 dsp_count; /* last sample count */
44079 static int dsp_count_valid; /* if we have last sample count */
44080
44081 -void
44082 +void __intentional_overflow(-1)
44083 dsp_cmx_send(void *arg)
44084 {
44085 struct dsp_conf *conf;
44086 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44087 index f58a354..fbae176 100644
44088 --- a/drivers/leds/leds-clevo-mail.c
44089 +++ b/drivers/leds/leds-clevo-mail.c
44090 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44091 * detected as working, but in reality it is not) as low as
44092 * possible.
44093 */
44094 -static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44095 +static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44096 {
44097 .callback = clevo_mail_led_dmi_callback,
44098 .ident = "Clevo D410J",
44099 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44100 index 046cb70..6b20d39 100644
44101 --- a/drivers/leds/leds-ss4200.c
44102 +++ b/drivers/leds/leds-ss4200.c
44103 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44104 * detected as working, but in reality it is not) as low as
44105 * possible.
44106 */
44107 -static struct dmi_system_id nas_led_whitelist[] __initdata = {
44108 +static struct dmi_system_id nas_led_whitelist[] __initconst = {
44109 {
44110 .callback = ss4200_led_dmi_callback,
44111 .ident = "Intel SS4200-E",
44112 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44113 index 6590558..a74c5dd 100644
44114 --- a/drivers/lguest/core.c
44115 +++ b/drivers/lguest/core.c
44116 @@ -96,9 +96,17 @@ static __init int map_switcher(void)
44117 * The end address needs +1 because __get_vm_area allocates an
44118 * extra guard page, so we need space for that.
44119 */
44120 +
44121 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44122 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44123 + VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44124 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44125 +#else
44126 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44127 VM_ALLOC, switcher_addr, switcher_addr
44128 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44129 +#endif
44130 +
44131 if (!switcher_vma) {
44132 err = -ENOMEM;
44133 printk("lguest: could not map switcher pages high\n");
44134 @@ -121,7 +129,7 @@ static __init int map_switcher(void)
44135 * Now the Switcher is mapped at the right address, we can't fail!
44136 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44137 */
44138 - memcpy(switcher_vma->addr, start_switcher_text,
44139 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44140 end_switcher_text - start_switcher_text);
44141
44142 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44143 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44144 index e8b55c3..3514c37 100644
44145 --- a/drivers/lguest/page_tables.c
44146 +++ b/drivers/lguest/page_tables.c
44147 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44148 /*:*/
44149
44150 #ifdef CONFIG_X86_PAE
44151 -static void release_pmd(pmd_t *spmd)
44152 +static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44153 {
44154 /* If the entry's not present, there's nothing to release. */
44155 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44156 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44157 index 922a1ac..9dd0c2a 100644
44158 --- a/drivers/lguest/x86/core.c
44159 +++ b/drivers/lguest/x86/core.c
44160 @@ -59,7 +59,7 @@ static struct {
44161 /* Offset from where switcher.S was compiled to where we've copied it */
44162 static unsigned long switcher_offset(void)
44163 {
44164 - return switcher_addr - (unsigned long)start_switcher_text;
44165 + return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44166 }
44167
44168 /* This cpu's struct lguest_pages (after the Switcher text page) */
44169 @@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44170 * These copies are pretty cheap, so we do them unconditionally: */
44171 /* Save the current Host top-level page directory.
44172 */
44173 +
44174 +#ifdef CONFIG_PAX_PER_CPU_PGD
44175 + pages->state.host_cr3 = read_cr3();
44176 +#else
44177 pages->state.host_cr3 = __pa(current->mm->pgd);
44178 +#endif
44179 +
44180 /*
44181 * Set up the Guest's page tables to see this CPU's pages (and no
44182 * other CPU's pages).
44183 @@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44184 * compiled-in switcher code and the high-mapped copy we just made.
44185 */
44186 for (i = 0; i < IDT_ENTRIES; i++)
44187 - default_idt_entries[i] += switcher_offset();
44188 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44189
44190 /*
44191 * Set up the Switcher's per-cpu areas.
44192 @@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44193 * it will be undisturbed when we switch. To change %cs and jump we
44194 * need this structure to feed to Intel's "lcall" instruction.
44195 */
44196 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44197 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44198 lguest_entry.segment = LGUEST_CS;
44199
44200 /*
44201 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44202 index 40634b0..4f5855e 100644
44203 --- a/drivers/lguest/x86/switcher_32.S
44204 +++ b/drivers/lguest/x86/switcher_32.S
44205 @@ -87,6 +87,7 @@
44206 #include <asm/page.h>
44207 #include <asm/segment.h>
44208 #include <asm/lguest.h>
44209 +#include <asm/processor-flags.h>
44210
44211 // We mark the start of the code to copy
44212 // It's placed in .text tho it's never run here
44213 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44214 // Changes type when we load it: damn Intel!
44215 // For after we switch over our page tables
44216 // That entry will be read-only: we'd crash.
44217 +
44218 +#ifdef CONFIG_PAX_KERNEXEC
44219 + mov %cr0, %edx
44220 + xor $X86_CR0_WP, %edx
44221 + mov %edx, %cr0
44222 +#endif
44223 +
44224 movl $(GDT_ENTRY_TSS*8), %edx
44225 ltr %dx
44226
44227 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44228 // Let's clear it again for our return.
44229 // The GDT descriptor of the Host
44230 // Points to the table after two "size" bytes
44231 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44232 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44233 // Clear "used" from type field (byte 5, bit 2)
44234 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44235 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44236 +
44237 +#ifdef CONFIG_PAX_KERNEXEC
44238 + mov %cr0, %eax
44239 + xor $X86_CR0_WP, %eax
44240 + mov %eax, %cr0
44241 +#endif
44242
44243 // Once our page table's switched, the Guest is live!
44244 // The Host fades as we run this final step.
44245 @@ -295,13 +309,12 @@ deliver_to_host:
44246 // I consulted gcc, and it gave
44247 // These instructions, which I gladly credit:
44248 leal (%edx,%ebx,8), %eax
44249 - movzwl (%eax),%edx
44250 - movl 4(%eax), %eax
44251 - xorw %ax, %ax
44252 - orl %eax, %edx
44253 + movl 4(%eax), %edx
44254 + movw (%eax), %dx
44255 // Now the address of the handler's in %edx
44256 // We call it now: its "iret" drops us home.
44257 - jmp *%edx
44258 + ljmp $__KERNEL_CS, $1f
44259 +1: jmp *%edx
44260
44261 // Every interrupt can come to us here
44262 // But we must truly tell each apart.
44263 diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44264 index a08e3ee..df8ade2 100644
44265 --- a/drivers/md/bcache/closure.h
44266 +++ b/drivers/md/bcache/closure.h
44267 @@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44268 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44269 struct workqueue_struct *wq)
44270 {
44271 - BUG_ON(object_is_on_stack(cl));
44272 + BUG_ON(object_starts_on_stack(cl));
44273 closure_set_ip(cl);
44274 cl->fn = fn;
44275 cl->wq = wq;
44276 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44277 index da3604e..7789cb4c 100644
44278 --- a/drivers/md/bitmap.c
44279 +++ b/drivers/md/bitmap.c
44280 @@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44281 chunk_kb ? "KB" : "B");
44282 if (bitmap->storage.file) {
44283 seq_printf(seq, ", file: ");
44284 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44285 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44286 }
44287
44288 seq_printf(seq, "\n");
44289 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44290 index 0be9381..114262b 100644
44291 --- a/drivers/md/dm-ioctl.c
44292 +++ b/drivers/md/dm-ioctl.c
44293 @@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44294 cmd == DM_LIST_VERSIONS_CMD)
44295 return 0;
44296
44297 - if ((cmd == DM_DEV_CREATE_CMD)) {
44298 + if (cmd == DM_DEV_CREATE_CMD) {
44299 if (!*param->name) {
44300 DMWARN("name not supplied when creating device");
44301 return -EINVAL;
44302 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44303 index 7dfdb5c..4caada6 100644
44304 --- a/drivers/md/dm-raid1.c
44305 +++ b/drivers/md/dm-raid1.c
44306 @@ -40,7 +40,7 @@ enum dm_raid1_error {
44307
44308 struct mirror {
44309 struct mirror_set *ms;
44310 - atomic_t error_count;
44311 + atomic_unchecked_t error_count;
44312 unsigned long error_type;
44313 struct dm_dev *dev;
44314 sector_t offset;
44315 @@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44316 struct mirror *m;
44317
44318 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44319 - if (!atomic_read(&m->error_count))
44320 + if (!atomic_read_unchecked(&m->error_count))
44321 return m;
44322
44323 return NULL;
44324 @@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44325 * simple way to tell if a device has encountered
44326 * errors.
44327 */
44328 - atomic_inc(&m->error_count);
44329 + atomic_inc_unchecked(&m->error_count);
44330
44331 if (test_and_set_bit(error_type, &m->error_type))
44332 return;
44333 @@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44334 struct mirror *m = get_default_mirror(ms);
44335
44336 do {
44337 - if (likely(!atomic_read(&m->error_count)))
44338 + if (likely(!atomic_read_unchecked(&m->error_count)))
44339 return m;
44340
44341 if (m-- == ms->mirror)
44342 @@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44343 {
44344 struct mirror *default_mirror = get_default_mirror(m->ms);
44345
44346 - return !atomic_read(&default_mirror->error_count);
44347 + return !atomic_read_unchecked(&default_mirror->error_count);
44348 }
44349
44350 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44351 @@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44352 */
44353 if (likely(region_in_sync(ms, region, 1)))
44354 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44355 - else if (m && atomic_read(&m->error_count))
44356 + else if (m && atomic_read_unchecked(&m->error_count))
44357 m = NULL;
44358
44359 if (likely(m))
44360 @@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44361 }
44362
44363 ms->mirror[mirror].ms = ms;
44364 - atomic_set(&(ms->mirror[mirror].error_count), 0);
44365 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44366 ms->mirror[mirror].error_type = 0;
44367 ms->mirror[mirror].offset = offset;
44368
44369 @@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
44370 */
44371 static char device_status_char(struct mirror *m)
44372 {
44373 - if (!atomic_read(&(m->error_count)))
44374 + if (!atomic_read_unchecked(&(m->error_count)))
44375 return 'A';
44376
44377 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44378 diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44379 index 87f86c7..a1a4100 100644
44380 --- a/drivers/md/dm-stats.c
44381 +++ b/drivers/md/dm-stats.c
44382 @@ -382,7 +382,7 @@ do_sync_free:
44383 synchronize_rcu_expedited();
44384 dm_stat_free(&s->rcu_head);
44385 } else {
44386 - ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44387 + ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44388 call_rcu(&s->rcu_head, dm_stat_free);
44389 }
44390 return 0;
44391 @@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44392 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44393 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44394 ));
44395 - ACCESS_ONCE(last->last_sector) = end_sector;
44396 - ACCESS_ONCE(last->last_rw) = bi_rw;
44397 + ACCESS_ONCE_RW(last->last_sector) = end_sector;
44398 + ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44399 }
44400
44401 rcu_read_lock();
44402 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44403 index f8b37d4..5c5cafd 100644
44404 --- a/drivers/md/dm-stripe.c
44405 +++ b/drivers/md/dm-stripe.c
44406 @@ -21,7 +21,7 @@ struct stripe {
44407 struct dm_dev *dev;
44408 sector_t physical_start;
44409
44410 - atomic_t error_count;
44411 + atomic_unchecked_t error_count;
44412 };
44413
44414 struct stripe_c {
44415 @@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44416 kfree(sc);
44417 return r;
44418 }
44419 - atomic_set(&(sc->stripe[i].error_count), 0);
44420 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44421 }
44422
44423 ti->private = sc;
44424 @@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44425 DMEMIT("%d ", sc->stripes);
44426 for (i = 0; i < sc->stripes; i++) {
44427 DMEMIT("%s ", sc->stripe[i].dev->name);
44428 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44429 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44430 'D' : 'A';
44431 }
44432 buffer[i] = '\0';
44433 @@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44434 */
44435 for (i = 0; i < sc->stripes; i++)
44436 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44437 - atomic_inc(&(sc->stripe[i].error_count));
44438 - if (atomic_read(&(sc->stripe[i].error_count)) <
44439 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
44440 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44441 DM_IO_ERROR_THRESHOLD)
44442 schedule_work(&sc->trigger_event);
44443 }
44444 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44445 index b2bd1eb..38f7a44 100644
44446 --- a/drivers/md/dm-table.c
44447 +++ b/drivers/md/dm-table.c
44448 @@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44449 if (!dev_size)
44450 return 0;
44451
44452 - if ((start >= dev_size) || (start + len > dev_size)) {
44453 + if ((start >= dev_size) || (len > dev_size - start)) {
44454 DMWARN("%s: %s too small for target: "
44455 "start=%llu, len=%llu, dev_size=%llu",
44456 dm_device_name(ti->table->md), bdevname(bdev, b),
44457 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44458 index e9d33ad..dae9880d 100644
44459 --- a/drivers/md/dm-thin-metadata.c
44460 +++ b/drivers/md/dm-thin-metadata.c
44461 @@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44462 {
44463 pmd->info.tm = pmd->tm;
44464 pmd->info.levels = 2;
44465 - pmd->info.value_type.context = pmd->data_sm;
44466 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44467 pmd->info.value_type.size = sizeof(__le64);
44468 pmd->info.value_type.inc = data_block_inc;
44469 pmd->info.value_type.dec = data_block_dec;
44470 @@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44471
44472 pmd->bl_info.tm = pmd->tm;
44473 pmd->bl_info.levels = 1;
44474 - pmd->bl_info.value_type.context = pmd->data_sm;
44475 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44476 pmd->bl_info.value_type.size = sizeof(__le64);
44477 pmd->bl_info.value_type.inc = data_block_inc;
44478 pmd->bl_info.value_type.dec = data_block_dec;
44479 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44480 index 58f3927..bfbad3e 100644
44481 --- a/drivers/md/dm.c
44482 +++ b/drivers/md/dm.c
44483 @@ -183,9 +183,9 @@ struct mapped_device {
44484 /*
44485 * Event handling.
44486 */
44487 - atomic_t event_nr;
44488 + atomic_unchecked_t event_nr;
44489 wait_queue_head_t eventq;
44490 - atomic_t uevent_seq;
44491 + atomic_unchecked_t uevent_seq;
44492 struct list_head uevent_list;
44493 spinlock_t uevent_lock; /* Protect access to uevent_list */
44494
44495 @@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
44496 spin_lock_init(&md->deferred_lock);
44497 atomic_set(&md->holders, 1);
44498 atomic_set(&md->open_count, 0);
44499 - atomic_set(&md->event_nr, 0);
44500 - atomic_set(&md->uevent_seq, 0);
44501 + atomic_set_unchecked(&md->event_nr, 0);
44502 + atomic_set_unchecked(&md->uevent_seq, 0);
44503 INIT_LIST_HEAD(&md->uevent_list);
44504 INIT_LIST_HEAD(&md->table_devices);
44505 spin_lock_init(&md->uevent_lock);
44506 @@ -2228,7 +2228,7 @@ static void event_callback(void *context)
44507
44508 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44509
44510 - atomic_inc(&md->event_nr);
44511 + atomic_inc_unchecked(&md->event_nr);
44512 wake_up(&md->eventq);
44513 }
44514
44515 @@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44516
44517 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44518 {
44519 - return atomic_add_return(1, &md->uevent_seq);
44520 + return atomic_add_return_unchecked(1, &md->uevent_seq);
44521 }
44522
44523 uint32_t dm_get_event_nr(struct mapped_device *md)
44524 {
44525 - return atomic_read(&md->event_nr);
44526 + return atomic_read_unchecked(&md->event_nr);
44527 }
44528
44529 int dm_wait_event(struct mapped_device *md, int event_nr)
44530 {
44531 return wait_event_interruptible(md->eventq,
44532 - (event_nr != atomic_read(&md->event_nr)));
44533 + (event_nr != atomic_read_unchecked(&md->event_nr)));
44534 }
44535
44536 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44537 diff --git a/drivers/md/md.c b/drivers/md/md.c
44538 index 9233c71..ed5243a 100644
44539 --- a/drivers/md/md.c
44540 +++ b/drivers/md/md.c
44541 @@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44542 * start build, activate spare
44543 */
44544 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44545 -static atomic_t md_event_count;
44546 +static atomic_unchecked_t md_event_count;
44547 void md_new_event(struct mddev *mddev)
44548 {
44549 - atomic_inc(&md_event_count);
44550 + atomic_inc_unchecked(&md_event_count);
44551 wake_up(&md_event_waiters);
44552 }
44553 EXPORT_SYMBOL_GPL(md_new_event);
44554 @@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44555 */
44556 static void md_new_event_inintr(struct mddev *mddev)
44557 {
44558 - atomic_inc(&md_event_count);
44559 + atomic_inc_unchecked(&md_event_count);
44560 wake_up(&md_event_waiters);
44561 }
44562
44563 @@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44564 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44565 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44566 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44567 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44568 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44569
44570 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44571 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44572 @@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44573 else
44574 sb->resync_offset = cpu_to_le64(0);
44575
44576 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44577 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44578
44579 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44580 sb->size = cpu_to_le64(mddev->dev_sectors);
44581 @@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44582 static ssize_t
44583 errors_show(struct md_rdev *rdev, char *page)
44584 {
44585 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44586 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44587 }
44588
44589 static ssize_t
44590 @@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44591 char *e;
44592 unsigned long n = simple_strtoul(buf, &e, 10);
44593 if (*buf && (*e == 0 || *e == '\n')) {
44594 - atomic_set(&rdev->corrected_errors, n);
44595 + atomic_set_unchecked(&rdev->corrected_errors, n);
44596 return len;
44597 }
44598 return -EINVAL;
44599 @@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
44600 rdev->sb_loaded = 0;
44601 rdev->bb_page = NULL;
44602 atomic_set(&rdev->nr_pending, 0);
44603 - atomic_set(&rdev->read_errors, 0);
44604 - atomic_set(&rdev->corrected_errors, 0);
44605 + atomic_set_unchecked(&rdev->read_errors, 0);
44606 + atomic_set_unchecked(&rdev->corrected_errors, 0);
44607
44608 INIT_LIST_HEAD(&rdev->same_set);
44609 init_waitqueue_head(&rdev->blocked_wait);
44610 @@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44611
44612 spin_unlock(&pers_lock);
44613 seq_printf(seq, "\n");
44614 - seq->poll_event = atomic_read(&md_event_count);
44615 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44616 return 0;
44617 }
44618 if (v == (void*)2) {
44619 @@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44620 return error;
44621
44622 seq = file->private_data;
44623 - seq->poll_event = atomic_read(&md_event_count);
44624 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44625 return error;
44626 }
44627
44628 @@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44629 /* always allow read */
44630 mask = POLLIN | POLLRDNORM;
44631
44632 - if (seq->poll_event != atomic_read(&md_event_count))
44633 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44634 mask |= POLLERR | POLLPRI;
44635 return mask;
44636 }
44637 @@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44638 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44639 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44640 (int)part_stat_read(&disk->part0, sectors[1]) -
44641 - atomic_read(&disk->sync_io);
44642 + atomic_read_unchecked(&disk->sync_io);
44643 /* sync IO will cause sync_io to increase before the disk_stats
44644 * as sync_io is counted when a request starts, and
44645 * disk_stats is counted when it completes.
44646 diff --git a/drivers/md/md.h b/drivers/md/md.h
44647 index 03cec5b..0a658c1 100644
44648 --- a/drivers/md/md.h
44649 +++ b/drivers/md/md.h
44650 @@ -94,13 +94,13 @@ struct md_rdev {
44651 * only maintained for arrays that
44652 * support hot removal
44653 */
44654 - atomic_t read_errors; /* number of consecutive read errors that
44655 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
44656 * we have tried to ignore.
44657 */
44658 struct timespec last_read_error; /* monotonic time since our
44659 * last read error
44660 */
44661 - atomic_t corrected_errors; /* number of corrected read errors,
44662 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44663 * for reporting to userspace and storing
44664 * in superblock.
44665 */
44666 @@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44667
44668 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44669 {
44670 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44671 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44672 }
44673
44674 struct md_personality
44675 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44676 index f4e22bc..8f83114 100644
44677 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
44678 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44679 @@ -681,7 +681,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44680 * Flick into a mode where all blocks get allocated in the new area.
44681 */
44682 smm->begin = old_len;
44683 - memcpy(sm, &bootstrap_ops, sizeof(*sm));
44684 + memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44685
44686 /*
44687 * Extend.
44688 @@ -712,7 +712,7 @@ out:
44689 /*
44690 * Switch back to normal behaviour.
44691 */
44692 - memcpy(sm, &ops, sizeof(*sm));
44693 + memcpy((void *)sm, &ops, sizeof(*sm));
44694 return r;
44695 }
44696
44697 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44698 index 3e6d115..ffecdeb 100644
44699 --- a/drivers/md/persistent-data/dm-space-map.h
44700 +++ b/drivers/md/persistent-data/dm-space-map.h
44701 @@ -71,6 +71,7 @@ struct dm_space_map {
44702 dm_sm_threshold_fn fn,
44703 void *context);
44704 };
44705 +typedef struct dm_space_map __no_const dm_space_map_no_const;
44706
44707 /*----------------------------------------------------------------*/
44708
44709 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44710 index 40b35be..a327e11 100644
44711 --- a/drivers/md/raid1.c
44712 +++ b/drivers/md/raid1.c
44713 @@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44714 if (r1_sync_page_io(rdev, sect, s,
44715 bio->bi_io_vec[idx].bv_page,
44716 READ) != 0)
44717 - atomic_add(s, &rdev->corrected_errors);
44718 + atomic_add_unchecked(s, &rdev->corrected_errors);
44719 }
44720 sectors -= s;
44721 sect += s;
44722 @@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44723 !test_bit(Faulty, &rdev->flags)) {
44724 if (r1_sync_page_io(rdev, sect, s,
44725 conf->tmppage, READ)) {
44726 - atomic_add(s, &rdev->corrected_errors);
44727 + atomic_add_unchecked(s, &rdev->corrected_errors);
44728 printk(KERN_INFO
44729 "md/raid1:%s: read error corrected "
44730 "(%d sectors at %llu on %s)\n",
44731 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44732 index 32e282f..5cec803 100644
44733 --- a/drivers/md/raid10.c
44734 +++ b/drivers/md/raid10.c
44735 @@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44736 /* The write handler will notice the lack of
44737 * R10BIO_Uptodate and record any errors etc
44738 */
44739 - atomic_add(r10_bio->sectors,
44740 + atomic_add_unchecked(r10_bio->sectors,
44741 &conf->mirrors[d].rdev->corrected_errors);
44742
44743 /* for reconstruct, we always reschedule after a read.
44744 @@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44745 {
44746 struct timespec cur_time_mon;
44747 unsigned long hours_since_last;
44748 - unsigned int read_errors = atomic_read(&rdev->read_errors);
44749 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44750
44751 ktime_get_ts(&cur_time_mon);
44752
44753 @@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44754 * overflowing the shift of read_errors by hours_since_last.
44755 */
44756 if (hours_since_last >= 8 * sizeof(read_errors))
44757 - atomic_set(&rdev->read_errors, 0);
44758 + atomic_set_unchecked(&rdev->read_errors, 0);
44759 else
44760 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44761 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44762 }
44763
44764 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44765 @@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44766 return;
44767
44768 check_decay_read_errors(mddev, rdev);
44769 - atomic_inc(&rdev->read_errors);
44770 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
44771 + atomic_inc_unchecked(&rdev->read_errors);
44772 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44773 char b[BDEVNAME_SIZE];
44774 bdevname(rdev->bdev, b);
44775
44776 @@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44777 "md/raid10:%s: %s: Raid device exceeded "
44778 "read_error threshold [cur %d:max %d]\n",
44779 mdname(mddev), b,
44780 - atomic_read(&rdev->read_errors), max_read_errors);
44781 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44782 printk(KERN_NOTICE
44783 "md/raid10:%s: %s: Failing raid device\n",
44784 mdname(mddev), b);
44785 @@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44786 sect +
44787 choose_data_offset(r10_bio, rdev)),
44788 bdevname(rdev->bdev, b));
44789 - atomic_add(s, &rdev->corrected_errors);
44790 + atomic_add_unchecked(s, &rdev->corrected_errors);
44791 }
44792
44793 rdev_dec_pending(rdev, mddev);
44794 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44795 index 9c66e59..42a8eac 100644
44796 --- a/drivers/md/raid5.c
44797 +++ b/drivers/md/raid5.c
44798 @@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44799 return 1;
44800 }
44801
44802 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44803 +static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44804 +#endif
44805 +
44806 static int grow_stripes(struct r5conf *conf, int num)
44807 {
44808 struct kmem_cache *sc;
44809 @@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44810 "raid%d-%s", conf->level, mdname(conf->mddev));
44811 else
44812 sprintf(conf->cache_name[0],
44813 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44814 + "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44815 +#else
44816 "raid%d-%p", conf->level, conf->mddev);
44817 +#endif
44818 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44819
44820 conf->active_name = 0;
44821 @@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44822 mdname(conf->mddev), STRIPE_SECTORS,
44823 (unsigned long long)s,
44824 bdevname(rdev->bdev, b));
44825 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44826 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44827 clear_bit(R5_ReadError, &sh->dev[i].flags);
44828 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44829 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44830 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44831
44832 - if (atomic_read(&rdev->read_errors))
44833 - atomic_set(&rdev->read_errors, 0);
44834 + if (atomic_read_unchecked(&rdev->read_errors))
44835 + atomic_set_unchecked(&rdev->read_errors, 0);
44836 } else {
44837 const char *bdn = bdevname(rdev->bdev, b);
44838 int retry = 0;
44839 int set_bad = 0;
44840
44841 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44842 - atomic_inc(&rdev->read_errors);
44843 + atomic_inc_unchecked(&rdev->read_errors);
44844 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44845 printk_ratelimited(
44846 KERN_WARNING
44847 @@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44848 mdname(conf->mddev),
44849 (unsigned long long)s,
44850 bdn);
44851 - } else if (atomic_read(&rdev->read_errors)
44852 + } else if (atomic_read_unchecked(&rdev->read_errors)
44853 > conf->max_nr_stripes)
44854 printk(KERN_WARNING
44855 "md/raid:%s: Too many read errors, failing device %s.\n",
44856 diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44857 index 983db75..ef9248c 100644
44858 --- a/drivers/media/dvb-core/dvbdev.c
44859 +++ b/drivers/media/dvb-core/dvbdev.c
44860 @@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44861 const struct dvb_device *template, void *priv, int type)
44862 {
44863 struct dvb_device *dvbdev;
44864 - struct file_operations *dvbdevfops;
44865 + file_operations_no_const *dvbdevfops;
44866 struct device *clsdev;
44867 int minor;
44868 int id;
44869 diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44870 index 6ad22b6..6e90e2a 100644
44871 --- a/drivers/media/dvb-frontends/af9033.h
44872 +++ b/drivers/media/dvb-frontends/af9033.h
44873 @@ -96,6 +96,6 @@ struct af9033_ops {
44874 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44875 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44876 int onoff);
44877 -};
44878 +} __no_const;
44879
44880 #endif /* AF9033_H */
44881 diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44882 index 9b6c3bb..baeb5c7 100644
44883 --- a/drivers/media/dvb-frontends/dib3000.h
44884 +++ b/drivers/media/dvb-frontends/dib3000.h
44885 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44886 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44887 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44888 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44889 -};
44890 +} __no_const;
44891
44892 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44893 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44894 diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
44895 index 1fea0e9..321ce8f 100644
44896 --- a/drivers/media/dvb-frontends/dib7000p.h
44897 +++ b/drivers/media/dvb-frontends/dib7000p.h
44898 @@ -64,7 +64,7 @@ struct dib7000p_ops {
44899 int (*get_adc_power)(struct dvb_frontend *fe);
44900 int (*slave_reset)(struct dvb_frontend *fe);
44901 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
44902 -};
44903 +} __no_const;
44904
44905 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
44906 void *dib7000p_attach(struct dib7000p_ops *ops);
44907 diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
44908 index 84cc103..5780c54 100644
44909 --- a/drivers/media/dvb-frontends/dib8000.h
44910 +++ b/drivers/media/dvb-frontends/dib8000.h
44911 @@ -61,7 +61,7 @@ struct dib8000_ops {
44912 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
44913 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
44914 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
44915 -};
44916 +} __no_const;
44917
44918 #if IS_ENABLED(CONFIG_DVB_DIB8000)
44919 void *dib8000_attach(struct dib8000_ops *ops);
44920 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44921 index ce27e6d..b70435a 100644
44922 --- a/drivers/media/pci/cx88/cx88-video.c
44923 +++ b/drivers/media/pci/cx88/cx88-video.c
44924 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44925
44926 /* ------------------------------------------------------------------ */
44927
44928 -static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44929 -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44930 -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44931 +static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44932 +static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44933 +static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44934
44935 module_param_array(video_nr, int, NULL, 0444);
44936 module_param_array(vbi_nr, int, NULL, 0444);
44937 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
44938 index 802642d..5534900 100644
44939 --- a/drivers/media/pci/ivtv/ivtv-driver.c
44940 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
44941 @@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
44942 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
44943
44944 /* ivtv instance counter */
44945 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
44946 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
44947
44948 /* Parameter declarations */
44949 static int cardtype[IVTV_MAX_CARDS];
44950 diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
44951 index 8cbe6b4..ea3601c 100644
44952 --- a/drivers/media/pci/solo6x10/solo6x10-core.c
44953 +++ b/drivers/media/pci/solo6x10/solo6x10-core.c
44954 @@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
44955
44956 static int solo_sysfs_init(struct solo_dev *solo_dev)
44957 {
44958 - struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
44959 + bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
44960 struct device *dev = &solo_dev->dev;
44961 const char *driver;
44962 int i;
44963 diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
44964 index c7141f2..5301fec 100644
44965 --- a/drivers/media/pci/solo6x10/solo6x10-g723.c
44966 +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
44967 @@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
44968
44969 int solo_g723_init(struct solo_dev *solo_dev)
44970 {
44971 - static struct snd_device_ops ops = { NULL };
44972 + static struct snd_device_ops ops = { };
44973 struct snd_card *card;
44974 struct snd_kcontrol_new kctl;
44975 char name[32];
44976 diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
44977 index 8c84846..27b4f83 100644
44978 --- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
44979 +++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
44980 @@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
44981
44982 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
44983 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
44984 - p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
44985 + p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
44986 if (p2m_id < 0)
44987 p2m_id = -p2m_id;
44988 }
44989 diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
44990 index 72017b7..dd37ae6 100644
44991 --- a/drivers/media/pci/solo6x10/solo6x10.h
44992 +++ b/drivers/media/pci/solo6x10/solo6x10.h
44993 @@ -219,7 +219,7 @@ struct solo_dev {
44994
44995 /* P2M DMA Engine */
44996 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
44997 - atomic_t p2m_count;
44998 + atomic_unchecked_t p2m_count;
44999 int p2m_jiffies;
45000 unsigned int p2m_timeouts;
45001
45002 diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45003 index 63f0b64..a017c1c 100644
45004 --- a/drivers/media/pci/tw68/tw68-core.c
45005 +++ b/drivers/media/pci/tw68/tw68-core.c
45006 @@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45007 module_param_array(card, int, NULL, 0444);
45008 MODULE_PARM_DESC(card, "card type");
45009
45010 -static atomic_t tw68_instance = ATOMIC_INIT(0);
45011 +static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45012
45013 /* ------------------------------------------------------------------ */
45014
45015 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45016 index 64ab6fb..ef4a8b9 100644
45017 --- a/drivers/media/platform/omap/omap_vout.c
45018 +++ b/drivers/media/platform/omap/omap_vout.c
45019 @@ -63,7 +63,6 @@ enum omap_vout_channels {
45020 OMAP_VIDEO2,
45021 };
45022
45023 -static struct videobuf_queue_ops video_vbq_ops;
45024 /* Variables configurable through module params*/
45025 static u32 video1_numbuffers = 3;
45026 static u32 video2_numbuffers = 3;
45027 @@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45028 {
45029 struct videobuf_queue *q;
45030 struct omap_vout_device *vout = NULL;
45031 + static struct videobuf_queue_ops video_vbq_ops = {
45032 + .buf_setup = omap_vout_buffer_setup,
45033 + .buf_prepare = omap_vout_buffer_prepare,
45034 + .buf_release = omap_vout_buffer_release,
45035 + .buf_queue = omap_vout_buffer_queue,
45036 + };
45037
45038 vout = video_drvdata(file);
45039 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45040 @@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45041 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45042
45043 q = &vout->vbq;
45044 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45045 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45046 - video_vbq_ops.buf_release = omap_vout_buffer_release;
45047 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45048 spin_lock_init(&vout->vbq_lock);
45049
45050 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45051 diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45052 index fb2acc5..a2fcbdc4 100644
45053 --- a/drivers/media/platform/s5p-tv/mixer.h
45054 +++ b/drivers/media/platform/s5p-tv/mixer.h
45055 @@ -156,7 +156,7 @@ struct mxr_layer {
45056 /** layer index (unique identifier) */
45057 int idx;
45058 /** callbacks for layer methods */
45059 - struct mxr_layer_ops ops;
45060 + struct mxr_layer_ops *ops;
45061 /** format array */
45062 const struct mxr_format **fmt_array;
45063 /** size of format array */
45064 diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45065 index 74344c7..a39e70e 100644
45066 --- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45067 +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45068 @@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45069 {
45070 struct mxr_layer *layer;
45071 int ret;
45072 - struct mxr_layer_ops ops = {
45073 + static struct mxr_layer_ops ops = {
45074 .release = mxr_graph_layer_release,
45075 .buffer_set = mxr_graph_buffer_set,
45076 .stream_set = mxr_graph_stream_set,
45077 diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45078 index b713403..53cb5ad 100644
45079 --- a/drivers/media/platform/s5p-tv/mixer_reg.c
45080 +++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45081 @@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45082 layer->update_buf = next;
45083 }
45084
45085 - layer->ops.buffer_set(layer, layer->update_buf);
45086 + layer->ops->buffer_set(layer, layer->update_buf);
45087
45088 if (done && done != layer->shadow_buf)
45089 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45090 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45091 index b4d2696..91df48e 100644
45092 --- a/drivers/media/platform/s5p-tv/mixer_video.c
45093 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
45094 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45095 layer->geo.src.height = layer->geo.src.full_height;
45096
45097 mxr_geometry_dump(mdev, &layer->geo);
45098 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45099 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45100 mxr_geometry_dump(mdev, &layer->geo);
45101 }
45102
45103 @@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45104 layer->geo.dst.full_width = mbus_fmt.width;
45105 layer->geo.dst.full_height = mbus_fmt.height;
45106 layer->geo.dst.field = mbus_fmt.field;
45107 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45108 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45109
45110 mxr_geometry_dump(mdev, &layer->geo);
45111 }
45112 @@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45113 /* set source size to highest accepted value */
45114 geo->src.full_width = max(geo->dst.full_width, pix->width);
45115 geo->src.full_height = max(geo->dst.full_height, pix->height);
45116 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45117 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45118 mxr_geometry_dump(mdev, &layer->geo);
45119 /* set cropping to total visible screen */
45120 geo->src.width = pix->width;
45121 @@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45122 geo->src.x_offset = 0;
45123 geo->src.y_offset = 0;
45124 /* assure consistency of geometry */
45125 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45126 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45127 mxr_geometry_dump(mdev, &layer->geo);
45128 /* set full size to lowest possible value */
45129 geo->src.full_width = 0;
45130 geo->src.full_height = 0;
45131 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45132 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45133 mxr_geometry_dump(mdev, &layer->geo);
45134
45135 /* returning results */
45136 @@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45137 target->width = s->r.width;
45138 target->height = s->r.height;
45139
45140 - layer->ops.fix_geometry(layer, stage, s->flags);
45141 + layer->ops->fix_geometry(layer, stage, s->flags);
45142
45143 /* retrieve update selection rectangle */
45144 res.left = target->x_offset;
45145 @@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45146 mxr_output_get(mdev);
45147
45148 mxr_layer_update_output(layer);
45149 - layer->ops.format_set(layer);
45150 + layer->ops->format_set(layer);
45151 /* enabling layer in hardware */
45152 spin_lock_irqsave(&layer->enq_slock, flags);
45153 layer->state = MXR_LAYER_STREAMING;
45154 spin_unlock_irqrestore(&layer->enq_slock, flags);
45155
45156 - layer->ops.stream_set(layer, MXR_ENABLE);
45157 + layer->ops->stream_set(layer, MXR_ENABLE);
45158 mxr_streamer_get(mdev);
45159
45160 return 0;
45161 @@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45162 spin_unlock_irqrestore(&layer->enq_slock, flags);
45163
45164 /* disabling layer in hardware */
45165 - layer->ops.stream_set(layer, MXR_DISABLE);
45166 + layer->ops->stream_set(layer, MXR_DISABLE);
45167 /* remove one streamer */
45168 mxr_streamer_put(mdev);
45169 /* allow changes in output configuration */
45170 @@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45171
45172 void mxr_layer_release(struct mxr_layer *layer)
45173 {
45174 - if (layer->ops.release)
45175 - layer->ops.release(layer);
45176 + if (layer->ops->release)
45177 + layer->ops->release(layer);
45178 }
45179
45180 void mxr_base_layer_release(struct mxr_layer *layer)
45181 @@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45182
45183 layer->mdev = mdev;
45184 layer->idx = idx;
45185 - layer->ops = *ops;
45186 + layer->ops = ops;
45187
45188 spin_lock_init(&layer->enq_slock);
45189 INIT_LIST_HEAD(&layer->enq_list);
45190 diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45191 index c9388c4..ce71ece 100644
45192 --- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45193 +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45194 @@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45195 {
45196 struct mxr_layer *layer;
45197 int ret;
45198 - struct mxr_layer_ops ops = {
45199 + static struct mxr_layer_ops ops = {
45200 .release = mxr_vp_layer_release,
45201 .buffer_set = mxr_vp_buffer_set,
45202 .stream_set = mxr_vp_stream_set,
45203 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45204 index 82affae..42833ec 100644
45205 --- a/drivers/media/radio/radio-cadet.c
45206 +++ b/drivers/media/radio/radio-cadet.c
45207 @@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45208 unsigned char readbuf[RDS_BUFFER];
45209 int i = 0;
45210
45211 + if (count > RDS_BUFFER)
45212 + return -EFAULT;
45213 mutex_lock(&dev->lock);
45214 if (dev->rdsstat == 0)
45215 cadet_start_rds(dev);
45216 @@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45217 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45218 mutex_unlock(&dev->lock);
45219
45220 - if (i && copy_to_user(data, readbuf, i))
45221 - return -EFAULT;
45222 + if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45223 + i = -EFAULT;
45224 +
45225 return i;
45226 }
45227
45228 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45229 index 5236035..c622c74 100644
45230 --- a/drivers/media/radio/radio-maxiradio.c
45231 +++ b/drivers/media/radio/radio-maxiradio.c
45232 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45233 /* TEA5757 pin mappings */
45234 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45235
45236 -static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45237 +static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45238
45239 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45240 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45241 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45242 index 050b3bb..79f62b9 100644
45243 --- a/drivers/media/radio/radio-shark.c
45244 +++ b/drivers/media/radio/radio-shark.c
45245 @@ -79,7 +79,7 @@ struct shark_device {
45246 u32 last_val;
45247 };
45248
45249 -static atomic_t shark_instance = ATOMIC_INIT(0);
45250 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45251
45252 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45253 {
45254 diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45255 index 8654e0d..0608a64 100644
45256 --- a/drivers/media/radio/radio-shark2.c
45257 +++ b/drivers/media/radio/radio-shark2.c
45258 @@ -74,7 +74,7 @@ struct shark_device {
45259 u8 *transfer_buffer;
45260 };
45261
45262 -static atomic_t shark_instance = ATOMIC_INIT(0);
45263 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45264
45265 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45266 {
45267 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45268 index 633022b..7f10754 100644
45269 --- a/drivers/media/radio/radio-si476x.c
45270 +++ b/drivers/media/radio/radio-si476x.c
45271 @@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45272 struct si476x_radio *radio;
45273 struct v4l2_ctrl *ctrl;
45274
45275 - static atomic_t instance = ATOMIC_INIT(0);
45276 + static atomic_unchecked_t instance = ATOMIC_INIT(0);
45277
45278 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45279 if (!radio)
45280 diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45281 index 9fd1527..8927230 100644
45282 --- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45283 +++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45284 @@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45285
45286 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45287 {
45288 - char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45289 - char result[64];
45290 - return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45291 - sizeof(result), 0);
45292 + char *buf;
45293 + char *result;
45294 + int retval;
45295 +
45296 + buf = kmalloc(2, GFP_KERNEL);
45297 + if (buf == NULL)
45298 + return -ENOMEM;
45299 + result = kmalloc(64, GFP_KERNEL);
45300 + if (result == NULL) {
45301 + kfree(buf);
45302 + return -ENOMEM;
45303 + }
45304 +
45305 + buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45306 + buf[1] = enable ? 1 : 0;
45307 +
45308 + retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45309 +
45310 + kfree(buf);
45311 + kfree(result);
45312 + return retval;
45313 }
45314
45315 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45316 {
45317 - char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45318 - char state[3];
45319 - return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45320 + char *buf;
45321 + char *state;
45322 + int retval;
45323 +
45324 + buf = kmalloc(2, GFP_KERNEL);
45325 + if (buf == NULL)
45326 + return -ENOMEM;
45327 + state = kmalloc(3, GFP_KERNEL);
45328 + if (state == NULL) {
45329 + kfree(buf);
45330 + return -ENOMEM;
45331 + }
45332 +
45333 + buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45334 + buf[1] = enable ? 1 : 0;
45335 +
45336 + retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45337 +
45338 + kfree(buf);
45339 + kfree(state);
45340 + return retval;
45341 }
45342
45343 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45344 {
45345 - char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45346 - char state[3];
45347 + char *query;
45348 + char *state;
45349 int ret;
45350 + query = kmalloc(1, GFP_KERNEL);
45351 + if (query == NULL)
45352 + return -ENOMEM;
45353 + state = kmalloc(3, GFP_KERNEL);
45354 + if (state == NULL) {
45355 + kfree(query);
45356 + return -ENOMEM;
45357 + }
45358 +
45359 + query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45360
45361 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45362
45363 - ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45364 - sizeof(state), 0);
45365 + ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45366 if (ret < 0) {
45367 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45368 "state info\n");
45369 @@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45370
45371 /* Copy this pointer as we are gonna need it in the release phase */
45372 cinergyt2_usb_device = adap->dev;
45373 -
45374 + kfree(query);
45375 + kfree(state);
45376 return 0;
45377 }
45378
45379 @@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45380 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45381 {
45382 struct cinergyt2_state *st = d->priv;
45383 - u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45384 + u8 *key, *cmd;
45385 int i;
45386
45387 + cmd = kmalloc(1, GFP_KERNEL);
45388 + if (cmd == NULL)
45389 + return -EINVAL;
45390 + key = kzalloc(5, GFP_KERNEL);
45391 + if (key == NULL) {
45392 + kfree(cmd);
45393 + return -EINVAL;
45394 + }
45395 +
45396 + cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45397 +
45398 *state = REMOTE_NO_KEY_PRESSED;
45399
45400 - dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45401 + dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45402 if (key[4] == 0xff) {
45403 /* key repeat */
45404 st->rc_counter++;
45405 @@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45406 *event = d->last_event;
45407 deb_rc("repeat key, event %x\n",
45408 *event);
45409 - return 0;
45410 + goto out;
45411 }
45412 }
45413 deb_rc("repeated key (non repeatable)\n");
45414 }
45415 - return 0;
45416 + goto out;
45417 }
45418
45419 /* hack to pass checksum on the custom field */
45420 @@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45421
45422 deb_rc("key: %*ph\n", 5, key);
45423 }
45424 +out:
45425 + kfree(cmd);
45426 + kfree(key);
45427 return 0;
45428 }
45429
45430 diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45431 index c890fe4..f9b2ae6 100644
45432 --- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45433 +++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45434 @@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45435 fe_status_t *status)
45436 {
45437 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45438 - struct dvbt_get_status_msg result;
45439 - u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45440 + struct dvbt_get_status_msg *result;
45441 + u8 *cmd;
45442 int ret;
45443
45444 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45445 - sizeof(result), 0);
45446 + cmd = kmalloc(1, GFP_KERNEL);
45447 + if (cmd == NULL)
45448 + return -ENOMEM;
45449 + result = kmalloc(sizeof(*result), GFP_KERNEL);
45450 + if (result == NULL) {
45451 + kfree(cmd);
45452 + return -ENOMEM;
45453 + }
45454 +
45455 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45456 +
45457 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45458 + sizeof(*result), 0);
45459 if (ret < 0)
45460 - return ret;
45461 + goto out;
45462
45463 *status = 0;
45464
45465 - if (0xffff - le16_to_cpu(result.gain) > 30)
45466 + if (0xffff - le16_to_cpu(result->gain) > 30)
45467 *status |= FE_HAS_SIGNAL;
45468 - if (result.lock_bits & (1 << 6))
45469 + if (result->lock_bits & (1 << 6))
45470 *status |= FE_HAS_LOCK;
45471 - if (result.lock_bits & (1 << 5))
45472 + if (result->lock_bits & (1 << 5))
45473 *status |= FE_HAS_SYNC;
45474 - if (result.lock_bits & (1 << 4))
45475 + if (result->lock_bits & (1 << 4))
45476 *status |= FE_HAS_CARRIER;
45477 - if (result.lock_bits & (1 << 1))
45478 + if (result->lock_bits & (1 << 1))
45479 *status |= FE_HAS_VITERBI;
45480
45481 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45482 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45483 *status &= ~FE_HAS_LOCK;
45484
45485 - return 0;
45486 +out:
45487 + kfree(cmd);
45488 + kfree(result);
45489 + return ret;
45490 }
45491
45492 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45493 {
45494 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45495 - struct dvbt_get_status_msg status;
45496 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45497 + struct dvbt_get_status_msg *status;
45498 + char *cmd;
45499 int ret;
45500
45501 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45502 - sizeof(status), 0);
45503 + cmd = kmalloc(1, GFP_KERNEL);
45504 + if (cmd == NULL)
45505 + return -ENOMEM;
45506 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45507 + if (status == NULL) {
45508 + kfree(cmd);
45509 + return -ENOMEM;
45510 + }
45511 +
45512 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45513 +
45514 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45515 + sizeof(*status), 0);
45516 if (ret < 0)
45517 - return ret;
45518 + goto out;
45519
45520 - *ber = le32_to_cpu(status.viterbi_error_rate);
45521 + *ber = le32_to_cpu(status->viterbi_error_rate);
45522 +out:
45523 + kfree(cmd);
45524 + kfree(status);
45525 return 0;
45526 }
45527
45528 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45529 {
45530 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45531 - struct dvbt_get_status_msg status;
45532 - u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45533 + struct dvbt_get_status_msg *status;
45534 + u8 *cmd;
45535 int ret;
45536
45537 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45538 - sizeof(status), 0);
45539 + cmd = kmalloc(1, GFP_KERNEL);
45540 + if (cmd == NULL)
45541 + return -ENOMEM;
45542 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45543 + if (status == NULL) {
45544 + kfree(cmd);
45545 + return -ENOMEM;
45546 + }
45547 +
45548 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45549 +
45550 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45551 + sizeof(*status), 0);
45552 if (ret < 0) {
45553 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45554 ret);
45555 - return ret;
45556 + goto out;
45557 }
45558 - *unc = le32_to_cpu(status.uncorrected_block_count);
45559 - return 0;
45560 + *unc = le32_to_cpu(status->uncorrected_block_count);
45561 +
45562 +out:
45563 + kfree(cmd);
45564 + kfree(status);
45565 + return ret;
45566 }
45567
45568 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45569 u16 *strength)
45570 {
45571 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45572 - struct dvbt_get_status_msg status;
45573 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45574 + struct dvbt_get_status_msg *status;
45575 + char *cmd;
45576 int ret;
45577
45578 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45579 - sizeof(status), 0);
45580 + cmd = kmalloc(1, GFP_KERNEL);
45581 + if (cmd == NULL)
45582 + return -ENOMEM;
45583 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45584 + if (status == NULL) {
45585 + kfree(cmd);
45586 + return -ENOMEM;
45587 + }
45588 +
45589 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45590 +
45591 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45592 + sizeof(*status), 0);
45593 if (ret < 0) {
45594 err("cinergyt2_fe_read_signal_strength() Failed!"
45595 " (Error=%d)\n", ret);
45596 - return ret;
45597 + goto out;
45598 }
45599 - *strength = (0xffff - le16_to_cpu(status.gain));
45600 + *strength = (0xffff - le16_to_cpu(status->gain));
45601 +
45602 +out:
45603 + kfree(cmd);
45604 + kfree(status);
45605 return 0;
45606 }
45607
45608 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45609 {
45610 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45611 - struct dvbt_get_status_msg status;
45612 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45613 + struct dvbt_get_status_msg *status;
45614 + char *cmd;
45615 int ret;
45616
45617 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45618 - sizeof(status), 0);
45619 + cmd = kmalloc(1, GFP_KERNEL);
45620 + if (cmd == NULL)
45621 + return -ENOMEM;
45622 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45623 + if (status == NULL) {
45624 + kfree(cmd);
45625 + return -ENOMEM;
45626 + }
45627 +
45628 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45629 +
45630 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45631 + sizeof(*status), 0);
45632 if (ret < 0) {
45633 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45634 - return ret;
45635 + goto out;
45636 }
45637 - *snr = (status.snr << 8) | status.snr;
45638 - return 0;
45639 + *snr = (status->snr << 8) | status->snr;
45640 +
45641 +out:
45642 + kfree(cmd);
45643 + kfree(status);
45644 + return ret;
45645 }
45646
45647 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45648 @@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45649 {
45650 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45651 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45652 - struct dvbt_set_parameters_msg param;
45653 - char result[2];
45654 + struct dvbt_set_parameters_msg *param;
45655 + char *result;
45656 int err;
45657
45658 - param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45659 - param.tps = cpu_to_le16(compute_tps(fep));
45660 - param.freq = cpu_to_le32(fep->frequency / 1000);
45661 - param.flags = 0;
45662 + result = kmalloc(2, GFP_KERNEL);
45663 + if (result == NULL)
45664 + return -ENOMEM;
45665 + param = kmalloc(sizeof(*param), GFP_KERNEL);
45666 + if (param == NULL) {
45667 + kfree(result);
45668 + return -ENOMEM;
45669 + }
45670 +
45671 + param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45672 + param->tps = cpu_to_le16(compute_tps(fep));
45673 + param->freq = cpu_to_le32(fep->frequency / 1000);
45674 + param->flags = 0;
45675
45676 switch (fep->bandwidth_hz) {
45677 default:
45678 case 8000000:
45679 - param.bandwidth = 8;
45680 + param->bandwidth = 8;
45681 break;
45682 case 7000000:
45683 - param.bandwidth = 7;
45684 + param->bandwidth = 7;
45685 break;
45686 case 6000000:
45687 - param.bandwidth = 6;
45688 + param->bandwidth = 6;
45689 break;
45690 }
45691
45692 err = dvb_usb_generic_rw(state->d,
45693 - (char *)&param, sizeof(param),
45694 - result, sizeof(result), 0);
45695 + (char *)param, sizeof(*param),
45696 + result, 2, 0);
45697 if (err < 0)
45698 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45699
45700 - return (err < 0) ? err : 0;
45701 + kfree(result);
45702 + kfree(param);
45703 + return err;
45704 }
45705
45706 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45707 diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45708 index 733a7ff..f8b52e3 100644
45709 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45710 +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45711 @@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45712
45713 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45714 {
45715 - struct hexline hx;
45716 - u8 reset;
45717 + struct hexline *hx;
45718 + u8 *reset;
45719 int ret,pos=0;
45720
45721 + reset = kmalloc(1, GFP_KERNEL);
45722 + if (reset == NULL)
45723 + return -ENOMEM;
45724 +
45725 + hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45726 + if (hx == NULL) {
45727 + kfree(reset);
45728 + return -ENOMEM;
45729 + }
45730 +
45731 /* stop the CPU */
45732 - reset = 1;
45733 - if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45734 + reset[0] = 1;
45735 + if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45736 err("could not stop the USB controller CPU.");
45737
45738 - while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45739 - deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45740 - ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45741 + while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45742 + deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45743 + ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45744
45745 - if (ret != hx.len) {
45746 + if (ret != hx->len) {
45747 err("error while transferring firmware "
45748 "(transferred size: %d, block size: %d)",
45749 - ret,hx.len);
45750 + ret,hx->len);
45751 ret = -EINVAL;
45752 break;
45753 }
45754 }
45755 if (ret < 0) {
45756 err("firmware download failed at %d with %d",pos,ret);
45757 + kfree(reset);
45758 + kfree(hx);
45759 return ret;
45760 }
45761
45762 if (ret == 0) {
45763 /* restart the CPU */
45764 - reset = 0;
45765 - if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45766 + reset[0] = 0;
45767 + if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
45768 err("could not restart the USB controller CPU.");
45769 ret = -EINVAL;
45770 }
45771 } else
45772 ret = -EIO;
45773
45774 + kfree(reset);
45775 + kfree(hx);
45776 +
45777 return ret;
45778 }
45779 EXPORT_SYMBOL(usb_cypress_load_firmware);
45780 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
45781 index 1a3df10..57997a5 100644
45782 --- a/drivers/media/usb/dvb-usb/dw2102.c
45783 +++ b/drivers/media/usb/dvb-usb/dw2102.c
45784 @@ -118,7 +118,7 @@ struct su3000_state {
45785
45786 struct s6x0_state {
45787 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
45788 -};
45789 +} __no_const;
45790
45791 /* debug */
45792 static int dvb_usb_dw2102_debug;
45793 diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
45794 index 6b0b8b6b..4038398 100644
45795 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c
45796 +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
45797 @@ -87,8 +87,11 @@ struct technisat_usb2_state {
45798 static int technisat_usb2_i2c_access(struct usb_device *udev,
45799 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
45800 {
45801 - u8 b[64];
45802 - int ret, actual_length;
45803 + u8 *b = kmalloc(64, GFP_KERNEL);
45804 + int ret, actual_length, error = 0;
45805 +
45806 + if (b == NULL)
45807 + return -ENOMEM;
45808
45809 deb_i2c("i2c-access: %02x, tx: ", device_addr);
45810 debug_dump(tx, txlen, deb_i2c);
45811 @@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45812
45813 if (ret < 0) {
45814 err("i2c-error: out failed %02x = %d", device_addr, ret);
45815 - return -ENODEV;
45816 + error = -ENODEV;
45817 + goto out;
45818 }
45819
45820 ret = usb_bulk_msg(udev,
45821 @@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45822 b, 64, &actual_length, 1000);
45823 if (ret < 0) {
45824 err("i2c-error: in failed %02x = %d", device_addr, ret);
45825 - return -ENODEV;
45826 + error = -ENODEV;
45827 + goto out;
45828 }
45829
45830 if (b[0] != I2C_STATUS_OK) {
45831 @@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45832 /* handle tuner-i2c-nak */
45833 if (!(b[0] == I2C_STATUS_NAK &&
45834 device_addr == 0x60
45835 - /* && device_is_technisat_usb2 */))
45836 - return -ENODEV;
45837 + /* && device_is_technisat_usb2 */)) {
45838 + error = -ENODEV;
45839 + goto out;
45840 + }
45841 }
45842
45843 deb_i2c("status: %d, ", b[0]);
45844 @@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45845
45846 deb_i2c("\n");
45847
45848 - return 0;
45849 +out:
45850 + kfree(b);
45851 + return error;
45852 }
45853
45854 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
45855 @@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45856 {
45857 int ret;
45858
45859 - u8 led[8] = {
45860 - red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45861 - 0
45862 - };
45863 + u8 *led = kzalloc(8, GFP_KERNEL);
45864 +
45865 + if (led == NULL)
45866 + return -ENOMEM;
45867
45868 if (disable_led_control && state != TECH_LED_OFF)
45869 return 0;
45870
45871 + led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
45872 +
45873 switch (state) {
45874 case TECH_LED_ON:
45875 led[1] = 0x82;
45876 @@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45877 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45878 USB_TYPE_VENDOR | USB_DIR_OUT,
45879 0, 0,
45880 - led, sizeof(led), 500);
45881 + led, 8, 500);
45882
45883 mutex_unlock(&d->i2c_mutex);
45884 +
45885 + kfree(led);
45886 +
45887 return ret;
45888 }
45889
45890 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
45891 {
45892 int ret;
45893 - u8 b = 0;
45894 + u8 *b = kzalloc(1, GFP_KERNEL);
45895 +
45896 + if (b == NULL)
45897 + return -ENOMEM;
45898
45899 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
45900 return -EAGAIN;
45901 @@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
45902 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
45903 USB_TYPE_VENDOR | USB_DIR_OUT,
45904 (red << 8) | green, 0,
45905 - &b, 1, 500);
45906 + b, 1, 500);
45907
45908 mutex_unlock(&d->i2c_mutex);
45909
45910 + kfree(b);
45911 +
45912 return ret;
45913 }
45914
45915 @@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45916 struct dvb_usb_device_description **desc, int *cold)
45917 {
45918 int ret;
45919 - u8 version[3];
45920 + u8 *version = kmalloc(3, GFP_KERNEL);
45921
45922 /* first select the interface */
45923 if (usb_set_interface(udev, 0, 1) != 0)
45924 @@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45925
45926 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
45927
45928 + if (version == NULL)
45929 + return 0;
45930 +
45931 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
45932 GET_VERSION_INFO_VENDOR_REQUEST,
45933 USB_TYPE_VENDOR | USB_DIR_IN,
45934 0, 0,
45935 - version, sizeof(version), 500);
45936 + version, 3, 500);
45937
45938 if (ret < 0)
45939 *cold = 1;
45940 @@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45941 *cold = 0;
45942 }
45943
45944 + kfree(version);
45945 +
45946 return 0;
45947 }
45948
45949 @@ -591,10 +615,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
45950
45951 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
45952 {
45953 - u8 buf[62], *b;
45954 + u8 *buf, *b;
45955 int ret;
45956 struct ir_raw_event ev;
45957
45958 + buf = kmalloc(62, GFP_KERNEL);
45959 +
45960 + if (buf == NULL)
45961 + return -ENOMEM;
45962 +
45963 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
45964 buf[1] = 0x08;
45965 buf[2] = 0x8f;
45966 @@ -617,16 +646,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
45967 GET_IR_DATA_VENDOR_REQUEST,
45968 USB_TYPE_VENDOR | USB_DIR_IN,
45969 0x8080, 0,
45970 - buf, sizeof(buf), 500);
45971 + buf, 62, 500);
45972
45973 unlock:
45974 mutex_unlock(&d->i2c_mutex);
45975
45976 - if (ret < 0)
45977 + if (ret < 0) {
45978 + kfree(buf);
45979 return ret;
45980 + }
45981
45982 - if (ret == 1)
45983 + if (ret == 1) {
45984 + kfree(buf);
45985 return 0; /* no key pressed */
45986 + }
45987
45988 /* decoding */
45989 b = buf+1;
45990 @@ -653,6 +686,8 @@ unlock:
45991
45992 ir_raw_event_handle(d->rc_dev);
45993
45994 + kfree(buf);
45995 +
45996 return 1;
45997 }
45998
45999 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46000 index e502a5f..2a27f40 100644
46001 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46002 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46003 @@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46004 * by passing a very big num_planes value */
46005 uplane = compat_alloc_user_space(num_planes *
46006 sizeof(struct v4l2_plane));
46007 - kp->m.planes = (__force struct v4l2_plane *)uplane;
46008 + kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46009
46010 while (--num_planes >= 0) {
46011 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46012 @@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46013 if (num_planes == 0)
46014 return 0;
46015
46016 - uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46017 + uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46018 if (get_user(p, &up->m.planes))
46019 return -EFAULT;
46020 uplane32 = compat_ptr(p);
46021 @@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46022 get_user(kp->flags, &up->flags) ||
46023 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46024 return -EFAULT;
46025 - kp->base = (__force void *)compat_ptr(tmp);
46026 + kp->base = (__force_kernel void *)compat_ptr(tmp);
46027 return 0;
46028 }
46029
46030 @@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46031 n * sizeof(struct v4l2_ext_control32)))
46032 return -EFAULT;
46033 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46034 - kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46035 + kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46036 while (--n >= 0) {
46037 u32 id;
46038
46039 @@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46040 {
46041 struct v4l2_ext_control32 __user *ucontrols;
46042 struct v4l2_ext_control __user *kcontrols =
46043 - (__force struct v4l2_ext_control __user *)kp->controls;
46044 + (struct v4l2_ext_control __force_user *)kp->controls;
46045 int n = kp->count;
46046 compat_caddr_t p;
46047
46048 @@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46049 get_user(tmp, &up->edid) ||
46050 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46051 return -EFAULT;
46052 - kp->edid = (__force u8 *)compat_ptr(tmp);
46053 + kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46054 return 0;
46055 }
46056
46057 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46058 index 015f92a..59e311e 100644
46059 --- a/drivers/media/v4l2-core/v4l2-device.c
46060 +++ b/drivers/media/v4l2-core/v4l2-device.c
46061 @@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46062 EXPORT_SYMBOL_GPL(v4l2_device_put);
46063
46064 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46065 - atomic_t *instance)
46066 + atomic_unchecked_t *instance)
46067 {
46068 - int num = atomic_inc_return(instance) - 1;
46069 + int num = atomic_inc_return_unchecked(instance) - 1;
46070 int len = strlen(basename);
46071
46072 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46073 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46074 index 9ccb19a..d131468 100644
46075 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
46076 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46077 @@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
46078 struct file *file, void *fh, void *p);
46079 } u;
46080 void (*debug)(const void *arg, bool write_only);
46081 -};
46082 +} __do_const;
46083 +typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46084
46085 /* This control needs a priority check */
46086 #define INFO_FL_PRIO (1 << 0)
46087 @@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
46088 struct video_device *vfd = video_devdata(file);
46089 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46090 bool write_only = false;
46091 - struct v4l2_ioctl_info default_info;
46092 + v4l2_ioctl_info_no_const default_info;
46093 const struct v4l2_ioctl_info *info;
46094 void *fh = file->private_data;
46095 struct v4l2_fh *vfh = NULL;
46096 @@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46097 ret = -EINVAL;
46098 break;
46099 }
46100 - *user_ptr = (void __user *)buf->m.planes;
46101 + *user_ptr = (void __force_user *)buf->m.planes;
46102 *kernel_ptr = (void **)&buf->m.planes;
46103 *array_size = sizeof(struct v4l2_plane) * buf->length;
46104 ret = 1;
46105 @@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46106 ret = -EINVAL;
46107 break;
46108 }
46109 - *user_ptr = (void __user *)edid->edid;
46110 + *user_ptr = (void __force_user *)edid->edid;
46111 *kernel_ptr = (void **)&edid->edid;
46112 *array_size = edid->blocks * 128;
46113 ret = 1;
46114 @@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46115 ret = -EINVAL;
46116 break;
46117 }
46118 - *user_ptr = (void __user *)ctrls->controls;
46119 + *user_ptr = (void __force_user *)ctrls->controls;
46120 *kernel_ptr = (void **)&ctrls->controls;
46121 *array_size = sizeof(struct v4l2_ext_control)
46122 * ctrls->count;
46123 @@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46124 }
46125
46126 if (has_array_args) {
46127 - *kernel_ptr = (void __force *)user_ptr;
46128 + *kernel_ptr = (void __force_kernel *)user_ptr;
46129 if (copy_to_user(user_ptr, mbuf, array_size))
46130 err = -EFAULT;
46131 goto out_array_args;
46132 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46133 index 187f836..679544b 100644
46134 --- a/drivers/message/fusion/mptbase.c
46135 +++ b/drivers/message/fusion/mptbase.c
46136 @@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46137 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46138 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46139
46140 +#ifdef CONFIG_GRKERNSEC_HIDESYM
46141 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46142 +#else
46143 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46144 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46145 +#endif
46146 +
46147 /*
46148 * Rounding UP to nearest 4-kB boundary here...
46149 */
46150 @@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46151 ioc->facts.GlobalCredits);
46152
46153 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46154 +#ifdef CONFIG_GRKERNSEC_HIDESYM
46155 + NULL, NULL);
46156 +#else
46157 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46158 +#endif
46159 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46160 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46161 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46162 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46163 index 0707fa2..70ca794 100644
46164 --- a/drivers/message/fusion/mptsas.c
46165 +++ b/drivers/message/fusion/mptsas.c
46166 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46167 return 0;
46168 }
46169
46170 +static inline void
46171 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46172 +{
46173 + if (phy_info->port_details) {
46174 + phy_info->port_details->rphy = rphy;
46175 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46176 + ioc->name, rphy));
46177 + }
46178 +
46179 + if (rphy) {
46180 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46181 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46182 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46183 + ioc->name, rphy, rphy->dev.release));
46184 + }
46185 +}
46186 +
46187 /* no mutex */
46188 static void
46189 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46190 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46191 return NULL;
46192 }
46193
46194 -static inline void
46195 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46196 -{
46197 - if (phy_info->port_details) {
46198 - phy_info->port_details->rphy = rphy;
46199 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46200 - ioc->name, rphy));
46201 - }
46202 -
46203 - if (rphy) {
46204 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46205 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46206 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46207 - ioc->name, rphy, rphy->dev.release));
46208 - }
46209 -}
46210 -
46211 static inline struct sas_port *
46212 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46213 {
46214 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46215 index b7d87cd..3fb36da 100644
46216 --- a/drivers/message/i2o/i2o_proc.c
46217 +++ b/drivers/message/i2o/i2o_proc.c
46218 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46219 "Array Controller Device"
46220 };
46221
46222 -static char *chtostr(char *tmp, u8 *chars, int n)
46223 -{
46224 - tmp[0] = 0;
46225 - return strncat(tmp, (char *)chars, n);
46226 -}
46227 -
46228 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46229 char *group)
46230 {
46231 @@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46232 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46233 {
46234 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46235 - static u32 work32[5];
46236 - static u8 *work8 = (u8 *) work32;
46237 - static u16 *work16 = (u16 *) work32;
46238 + u32 work32[5];
46239 + u8 *work8 = (u8 *) work32;
46240 + u16 *work16 = (u16 *) work32;
46241 int token;
46242 u32 hwcap;
46243
46244 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46245 } *result;
46246
46247 i2o_exec_execute_ddm_table ddm_table;
46248 - char tmp[28 + 1];
46249
46250 result = kmalloc(sizeof(*result), GFP_KERNEL);
46251 if (!result)
46252 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46253
46254 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46255 seq_printf(seq, "%-#8x", ddm_table.module_id);
46256 - seq_printf(seq, "%-29s",
46257 - chtostr(tmp, ddm_table.module_name_version, 28));
46258 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46259 seq_printf(seq, "%9d ", ddm_table.data_size);
46260 seq_printf(seq, "%8d", ddm_table.code_size);
46261
46262 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46263
46264 i2o_driver_result_table *result;
46265 i2o_driver_store_table *dst;
46266 - char tmp[28 + 1];
46267
46268 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46269 if (result == NULL)
46270 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46271
46272 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46273 seq_printf(seq, "%-#8x", dst->module_id);
46274 - seq_printf(seq, "%-29s",
46275 - chtostr(tmp, dst->module_name_version, 28));
46276 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46277 + seq_printf(seq, "%-.28s", dst->module_name_version);
46278 + seq_printf(seq, "%-.8s", dst->date);
46279 seq_printf(seq, "%8d ", dst->module_size);
46280 seq_printf(seq, "%8d ", dst->mpb_size);
46281 seq_printf(seq, "0x%04x", dst->module_flags);
46282 @@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46283 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46284 {
46285 struct i2o_device *d = (struct i2o_device *)seq->private;
46286 - static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46287 + u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46288 // == (allow) 512d bytes (max)
46289 - static u16 *work16 = (u16 *) work32;
46290 + u16 *work16 = (u16 *) work32;
46291 int token;
46292 - char tmp[16 + 1];
46293
46294 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46295
46296 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46297 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46298 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46299 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46300 - seq_printf(seq, "Vendor info : %s\n",
46301 - chtostr(tmp, (u8 *) (work32 + 2), 16));
46302 - seq_printf(seq, "Product info : %s\n",
46303 - chtostr(tmp, (u8 *) (work32 + 6), 16));
46304 - seq_printf(seq, "Description : %s\n",
46305 - chtostr(tmp, (u8 *) (work32 + 10), 16));
46306 - seq_printf(seq, "Product rev. : %s\n",
46307 - chtostr(tmp, (u8 *) (work32 + 14), 8));
46308 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46309 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46310 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46311 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46312
46313 seq_printf(seq, "Serial number : ");
46314 print_serial_number(seq, (u8 *) (work32 + 16),
46315 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46316 u8 pad[256]; // allow up to 256 byte (max) serial number
46317 } result;
46318
46319 - char tmp[24 + 1];
46320 -
46321 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46322
46323 if (token < 0) {
46324 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46325 }
46326
46327 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46328 - seq_printf(seq, "Module name : %s\n",
46329 - chtostr(tmp, result.module_name, 24));
46330 - seq_printf(seq, "Module revision : %s\n",
46331 - chtostr(tmp, result.module_rev, 8));
46332 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
46333 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46334
46335 seq_printf(seq, "Serial number : ");
46336 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46337 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46338 u8 instance_number[4];
46339 } result;
46340
46341 - char tmp[64 + 1];
46342 -
46343 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46344
46345 if (token < 0) {
46346 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46347 return 0;
46348 }
46349
46350 - seq_printf(seq, "Device name : %s\n",
46351 - chtostr(tmp, result.device_name, 64));
46352 - seq_printf(seq, "Service name : %s\n",
46353 - chtostr(tmp, result.service_name, 64));
46354 - seq_printf(seq, "Physical name : %s\n",
46355 - chtostr(tmp, result.physical_location, 64));
46356 - seq_printf(seq, "Instance number : %s\n",
46357 - chtostr(tmp, result.instance_number, 4));
46358 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
46359 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
46360 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46361 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46362
46363 return 0;
46364 }
46365 @@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46366 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46367 {
46368 struct i2o_device *d = (struct i2o_device *)seq->private;
46369 - static u32 work32[12];
46370 - static u16 *work16 = (u16 *) work32;
46371 - static u8 *work8 = (u8 *) work32;
46372 + u32 work32[12];
46373 + u16 *work16 = (u16 *) work32;
46374 + u8 *work8 = (u8 *) work32;
46375 int token;
46376
46377 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46378 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46379 index 92752fb..a7494f6 100644
46380 --- a/drivers/message/i2o/iop.c
46381 +++ b/drivers/message/i2o/iop.c
46382 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46383
46384 spin_lock_irqsave(&c->context_list_lock, flags);
46385
46386 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46387 - atomic_inc(&c->context_list_counter);
46388 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46389 + atomic_inc_unchecked(&c->context_list_counter);
46390
46391 - entry->context = atomic_read(&c->context_list_counter);
46392 + entry->context = atomic_read_unchecked(&c->context_list_counter);
46393
46394 list_add(&entry->list, &c->context_list);
46395
46396 @@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46397
46398 #if BITS_PER_LONG == 64
46399 spin_lock_init(&c->context_list_lock);
46400 - atomic_set(&c->context_list_counter, 0);
46401 + atomic_set_unchecked(&c->context_list_counter, 0);
46402 INIT_LIST_HEAD(&c->context_list);
46403 #endif
46404
46405 diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46406 index b2c7e3b..85aa4764 100644
46407 --- a/drivers/mfd/ab8500-debugfs.c
46408 +++ b/drivers/mfd/ab8500-debugfs.c
46409 @@ -100,7 +100,7 @@ static int irq_last;
46410 static u32 *irq_count;
46411 static int num_irqs;
46412
46413 -static struct device_attribute **dev_attr;
46414 +static device_attribute_no_const **dev_attr;
46415 static char **event_name;
46416
46417 static u8 avg_sample = SAMPLE_16;
46418 diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46419 index c880c89..45a7c68 100644
46420 --- a/drivers/mfd/max8925-i2c.c
46421 +++ b/drivers/mfd/max8925-i2c.c
46422 @@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46423 const struct i2c_device_id *id)
46424 {
46425 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46426 - static struct max8925_chip *chip;
46427 + struct max8925_chip *chip;
46428 struct device_node *node = client->dev.of_node;
46429
46430 if (node && !pdata) {
46431 diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46432 index 7612d89..70549c2 100644
46433 --- a/drivers/mfd/tps65910.c
46434 +++ b/drivers/mfd/tps65910.c
46435 @@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46436 struct tps65910_platform_data *pdata)
46437 {
46438 int ret = 0;
46439 - static struct regmap_irq_chip *tps6591x_irqs_chip;
46440 + struct regmap_irq_chip *tps6591x_irqs_chip;
46441
46442 if (!irq) {
46443 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46444 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46445 index 1b772ef..01e77d33 100644
46446 --- a/drivers/mfd/twl4030-irq.c
46447 +++ b/drivers/mfd/twl4030-irq.c
46448 @@ -34,6 +34,7 @@
46449 #include <linux/of.h>
46450 #include <linux/irqdomain.h>
46451 #include <linux/i2c/twl.h>
46452 +#include <asm/pgtable.h>
46453
46454 #include "twl-core.h"
46455
46456 @@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46457 * Install an irq handler for each of the SIH modules;
46458 * clone dummy irq_chip since PIH can't *do* anything
46459 */
46460 - twl4030_irq_chip = dummy_irq_chip;
46461 - twl4030_irq_chip.name = "twl4030";
46462 + pax_open_kernel();
46463 + memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46464 + *(const char **)&twl4030_irq_chip.name = "twl4030";
46465
46466 - twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46467 + *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46468 + pax_close_kernel();
46469
46470 for (i = irq_base; i < irq_end; i++) {
46471 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46472 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46473 index 464419b..64bae8d 100644
46474 --- a/drivers/misc/c2port/core.c
46475 +++ b/drivers/misc/c2port/core.c
46476 @@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46477 goto error_idr_alloc;
46478 c2dev->id = ret;
46479
46480 - bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46481 + pax_open_kernel();
46482 + *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46483 + pax_close_kernel();
46484
46485 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46486 "c2port%d", c2dev->id);
46487 diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46488 index 3f2b625..945e179 100644
46489 --- a/drivers/misc/eeprom/sunxi_sid.c
46490 +++ b/drivers/misc/eeprom/sunxi_sid.c
46491 @@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46492
46493 platform_set_drvdata(pdev, sid_data);
46494
46495 - sid_bin_attr.size = sid_data->keysize;
46496 + pax_open_kernel();
46497 + *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46498 + pax_close_kernel();
46499 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46500 return -ENODEV;
46501
46502 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46503 index 36f5d52..32311c3 100644
46504 --- a/drivers/misc/kgdbts.c
46505 +++ b/drivers/misc/kgdbts.c
46506 @@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46507 char before[BREAK_INSTR_SIZE];
46508 char after[BREAK_INSTR_SIZE];
46509
46510 - probe_kernel_read(before, (char *)kgdbts_break_test,
46511 + probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46512 BREAK_INSTR_SIZE);
46513 init_simple_test();
46514 ts.tst = plant_and_detach_test;
46515 @@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46516 /* Activate test with initial breakpoint */
46517 if (!is_early)
46518 kgdb_breakpoint();
46519 - probe_kernel_read(after, (char *)kgdbts_break_test,
46520 + probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46521 BREAK_INSTR_SIZE);
46522 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46523 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46524 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46525 index 3ef4627..8d00486 100644
46526 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
46527 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46528 @@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46529 * the lid is closed. This leads to interrupts as soon as a little move
46530 * is done.
46531 */
46532 - atomic_inc(&lis3->count);
46533 + atomic_inc_unchecked(&lis3->count);
46534
46535 wake_up_interruptible(&lis3->misc_wait);
46536 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46537 @@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46538 if (lis3->pm_dev)
46539 pm_runtime_get_sync(lis3->pm_dev);
46540
46541 - atomic_set(&lis3->count, 0);
46542 + atomic_set_unchecked(&lis3->count, 0);
46543 return 0;
46544 }
46545
46546 @@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46547 add_wait_queue(&lis3->misc_wait, &wait);
46548 while (true) {
46549 set_current_state(TASK_INTERRUPTIBLE);
46550 - data = atomic_xchg(&lis3->count, 0);
46551 + data = atomic_xchg_unchecked(&lis3->count, 0);
46552 if (data)
46553 break;
46554
46555 @@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46556 struct lis3lv02d, miscdev);
46557
46558 poll_wait(file, &lis3->misc_wait, wait);
46559 - if (atomic_read(&lis3->count))
46560 + if (atomic_read_unchecked(&lis3->count))
46561 return POLLIN | POLLRDNORM;
46562 return 0;
46563 }
46564 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46565 index c439c82..1f20f57 100644
46566 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
46567 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46568 @@ -297,7 +297,7 @@ struct lis3lv02d {
46569 struct input_polled_dev *idev; /* input device */
46570 struct platform_device *pdev; /* platform device */
46571 struct regulator_bulk_data regulators[2];
46572 - atomic_t count; /* interrupt count after last read */
46573 + atomic_unchecked_t count; /* interrupt count after last read */
46574 union axis_conversion ac; /* hw -> logical axis */
46575 int mapped_btns[3];
46576
46577 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46578 index 2f30bad..c4c13d0 100644
46579 --- a/drivers/misc/sgi-gru/gruhandles.c
46580 +++ b/drivers/misc/sgi-gru/gruhandles.c
46581 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46582 unsigned long nsec;
46583
46584 nsec = CLKS2NSEC(clks);
46585 - atomic_long_inc(&mcs_op_statistics[op].count);
46586 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
46587 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46588 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46589 if (mcs_op_statistics[op].max < nsec)
46590 mcs_op_statistics[op].max = nsec;
46591 }
46592 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46593 index 4f76359..cdfcb2e 100644
46594 --- a/drivers/misc/sgi-gru/gruprocfs.c
46595 +++ b/drivers/misc/sgi-gru/gruprocfs.c
46596 @@ -32,9 +32,9 @@
46597
46598 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46599
46600 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46601 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46602 {
46603 - unsigned long val = atomic_long_read(v);
46604 + unsigned long val = atomic_long_read_unchecked(v);
46605
46606 seq_printf(s, "%16lu %s\n", val, id);
46607 }
46608 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46609
46610 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46611 for (op = 0; op < mcsop_last; op++) {
46612 - count = atomic_long_read(&mcs_op_statistics[op].count);
46613 - total = atomic_long_read(&mcs_op_statistics[op].total);
46614 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46615 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46616 max = mcs_op_statistics[op].max;
46617 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46618 count ? total / count : 0, max);
46619 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46620 index 5c3ce24..4915ccb 100644
46621 --- a/drivers/misc/sgi-gru/grutables.h
46622 +++ b/drivers/misc/sgi-gru/grutables.h
46623 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46624 * GRU statistics.
46625 */
46626 struct gru_stats_s {
46627 - atomic_long_t vdata_alloc;
46628 - atomic_long_t vdata_free;
46629 - atomic_long_t gts_alloc;
46630 - atomic_long_t gts_free;
46631 - atomic_long_t gms_alloc;
46632 - atomic_long_t gms_free;
46633 - atomic_long_t gts_double_allocate;
46634 - atomic_long_t assign_context;
46635 - atomic_long_t assign_context_failed;
46636 - atomic_long_t free_context;
46637 - atomic_long_t load_user_context;
46638 - atomic_long_t load_kernel_context;
46639 - atomic_long_t lock_kernel_context;
46640 - atomic_long_t unlock_kernel_context;
46641 - atomic_long_t steal_user_context;
46642 - atomic_long_t steal_kernel_context;
46643 - atomic_long_t steal_context_failed;
46644 - atomic_long_t nopfn;
46645 - atomic_long_t asid_new;
46646 - atomic_long_t asid_next;
46647 - atomic_long_t asid_wrap;
46648 - atomic_long_t asid_reuse;
46649 - atomic_long_t intr;
46650 - atomic_long_t intr_cbr;
46651 - atomic_long_t intr_tfh;
46652 - atomic_long_t intr_spurious;
46653 - atomic_long_t intr_mm_lock_failed;
46654 - atomic_long_t call_os;
46655 - atomic_long_t call_os_wait_queue;
46656 - atomic_long_t user_flush_tlb;
46657 - atomic_long_t user_unload_context;
46658 - atomic_long_t user_exception;
46659 - atomic_long_t set_context_option;
46660 - atomic_long_t check_context_retarget_intr;
46661 - atomic_long_t check_context_unload;
46662 - atomic_long_t tlb_dropin;
46663 - atomic_long_t tlb_preload_page;
46664 - atomic_long_t tlb_dropin_fail_no_asid;
46665 - atomic_long_t tlb_dropin_fail_upm;
46666 - atomic_long_t tlb_dropin_fail_invalid;
46667 - atomic_long_t tlb_dropin_fail_range_active;
46668 - atomic_long_t tlb_dropin_fail_idle;
46669 - atomic_long_t tlb_dropin_fail_fmm;
46670 - atomic_long_t tlb_dropin_fail_no_exception;
46671 - atomic_long_t tfh_stale_on_fault;
46672 - atomic_long_t mmu_invalidate_range;
46673 - atomic_long_t mmu_invalidate_page;
46674 - atomic_long_t flush_tlb;
46675 - atomic_long_t flush_tlb_gru;
46676 - atomic_long_t flush_tlb_gru_tgh;
46677 - atomic_long_t flush_tlb_gru_zero_asid;
46678 + atomic_long_unchecked_t vdata_alloc;
46679 + atomic_long_unchecked_t vdata_free;
46680 + atomic_long_unchecked_t gts_alloc;
46681 + atomic_long_unchecked_t gts_free;
46682 + atomic_long_unchecked_t gms_alloc;
46683 + atomic_long_unchecked_t gms_free;
46684 + atomic_long_unchecked_t gts_double_allocate;
46685 + atomic_long_unchecked_t assign_context;
46686 + atomic_long_unchecked_t assign_context_failed;
46687 + atomic_long_unchecked_t free_context;
46688 + atomic_long_unchecked_t load_user_context;
46689 + atomic_long_unchecked_t load_kernel_context;
46690 + atomic_long_unchecked_t lock_kernel_context;
46691 + atomic_long_unchecked_t unlock_kernel_context;
46692 + atomic_long_unchecked_t steal_user_context;
46693 + atomic_long_unchecked_t steal_kernel_context;
46694 + atomic_long_unchecked_t steal_context_failed;
46695 + atomic_long_unchecked_t nopfn;
46696 + atomic_long_unchecked_t asid_new;
46697 + atomic_long_unchecked_t asid_next;
46698 + atomic_long_unchecked_t asid_wrap;
46699 + atomic_long_unchecked_t asid_reuse;
46700 + atomic_long_unchecked_t intr;
46701 + atomic_long_unchecked_t intr_cbr;
46702 + atomic_long_unchecked_t intr_tfh;
46703 + atomic_long_unchecked_t intr_spurious;
46704 + atomic_long_unchecked_t intr_mm_lock_failed;
46705 + atomic_long_unchecked_t call_os;
46706 + atomic_long_unchecked_t call_os_wait_queue;
46707 + atomic_long_unchecked_t user_flush_tlb;
46708 + atomic_long_unchecked_t user_unload_context;
46709 + atomic_long_unchecked_t user_exception;
46710 + atomic_long_unchecked_t set_context_option;
46711 + atomic_long_unchecked_t check_context_retarget_intr;
46712 + atomic_long_unchecked_t check_context_unload;
46713 + atomic_long_unchecked_t tlb_dropin;
46714 + atomic_long_unchecked_t tlb_preload_page;
46715 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
46716 + atomic_long_unchecked_t tlb_dropin_fail_upm;
46717 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
46718 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
46719 + atomic_long_unchecked_t tlb_dropin_fail_idle;
46720 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
46721 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
46722 + atomic_long_unchecked_t tfh_stale_on_fault;
46723 + atomic_long_unchecked_t mmu_invalidate_range;
46724 + atomic_long_unchecked_t mmu_invalidate_page;
46725 + atomic_long_unchecked_t flush_tlb;
46726 + atomic_long_unchecked_t flush_tlb_gru;
46727 + atomic_long_unchecked_t flush_tlb_gru_tgh;
46728 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
46729
46730 - atomic_long_t copy_gpa;
46731 - atomic_long_t read_gpa;
46732 + atomic_long_unchecked_t copy_gpa;
46733 + atomic_long_unchecked_t read_gpa;
46734
46735 - atomic_long_t mesq_receive;
46736 - atomic_long_t mesq_receive_none;
46737 - atomic_long_t mesq_send;
46738 - atomic_long_t mesq_send_failed;
46739 - atomic_long_t mesq_noop;
46740 - atomic_long_t mesq_send_unexpected_error;
46741 - atomic_long_t mesq_send_lb_overflow;
46742 - atomic_long_t mesq_send_qlimit_reached;
46743 - atomic_long_t mesq_send_amo_nacked;
46744 - atomic_long_t mesq_send_put_nacked;
46745 - atomic_long_t mesq_page_overflow;
46746 - atomic_long_t mesq_qf_locked;
46747 - atomic_long_t mesq_qf_noop_not_full;
46748 - atomic_long_t mesq_qf_switch_head_failed;
46749 - atomic_long_t mesq_qf_unexpected_error;
46750 - atomic_long_t mesq_noop_unexpected_error;
46751 - atomic_long_t mesq_noop_lb_overflow;
46752 - atomic_long_t mesq_noop_qlimit_reached;
46753 - atomic_long_t mesq_noop_amo_nacked;
46754 - atomic_long_t mesq_noop_put_nacked;
46755 - atomic_long_t mesq_noop_page_overflow;
46756 + atomic_long_unchecked_t mesq_receive;
46757 + atomic_long_unchecked_t mesq_receive_none;
46758 + atomic_long_unchecked_t mesq_send;
46759 + atomic_long_unchecked_t mesq_send_failed;
46760 + atomic_long_unchecked_t mesq_noop;
46761 + atomic_long_unchecked_t mesq_send_unexpected_error;
46762 + atomic_long_unchecked_t mesq_send_lb_overflow;
46763 + atomic_long_unchecked_t mesq_send_qlimit_reached;
46764 + atomic_long_unchecked_t mesq_send_amo_nacked;
46765 + atomic_long_unchecked_t mesq_send_put_nacked;
46766 + atomic_long_unchecked_t mesq_page_overflow;
46767 + atomic_long_unchecked_t mesq_qf_locked;
46768 + atomic_long_unchecked_t mesq_qf_noop_not_full;
46769 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
46770 + atomic_long_unchecked_t mesq_qf_unexpected_error;
46771 + atomic_long_unchecked_t mesq_noop_unexpected_error;
46772 + atomic_long_unchecked_t mesq_noop_lb_overflow;
46773 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
46774 + atomic_long_unchecked_t mesq_noop_amo_nacked;
46775 + atomic_long_unchecked_t mesq_noop_put_nacked;
46776 + atomic_long_unchecked_t mesq_noop_page_overflow;
46777
46778 };
46779
46780 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
46781 tghop_invalidate, mcsop_last};
46782
46783 struct mcs_op_statistic {
46784 - atomic_long_t count;
46785 - atomic_long_t total;
46786 + atomic_long_unchecked_t count;
46787 + atomic_long_unchecked_t total;
46788 unsigned long max;
46789 };
46790
46791 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
46792
46793 #define STAT(id) do { \
46794 if (gru_options & OPT_STATS) \
46795 - atomic_long_inc(&gru_stats.id); \
46796 + atomic_long_inc_unchecked(&gru_stats.id); \
46797 } while (0)
46798
46799 #ifdef CONFIG_SGI_GRU_DEBUG
46800 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
46801 index c862cd4..0d176fe 100644
46802 --- a/drivers/misc/sgi-xp/xp.h
46803 +++ b/drivers/misc/sgi-xp/xp.h
46804 @@ -288,7 +288,7 @@ struct xpc_interface {
46805 xpc_notify_func, void *);
46806 void (*received) (short, int, void *);
46807 enum xp_retval (*partid_to_nasids) (short, void *);
46808 -};
46809 +} __no_const;
46810
46811 extern struct xpc_interface xpc_interface;
46812
46813 diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
46814 index 01be66d..e3a0c7e 100644
46815 --- a/drivers/misc/sgi-xp/xp_main.c
46816 +++ b/drivers/misc/sgi-xp/xp_main.c
46817 @@ -78,13 +78,13 @@ xpc_notloaded(void)
46818 }
46819
46820 struct xpc_interface xpc_interface = {
46821 - (void (*)(int))xpc_notloaded,
46822 - (void (*)(int))xpc_notloaded,
46823 - (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46824 - (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46825 + .connect = (void (*)(int))xpc_notloaded,
46826 + .disconnect = (void (*)(int))xpc_notloaded,
46827 + .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46828 + .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46829 void *))xpc_notloaded,
46830 - (void (*)(short, int, void *))xpc_notloaded,
46831 - (enum xp_retval(*)(short, void *))xpc_notloaded
46832 + .received = (void (*)(short, int, void *))xpc_notloaded,
46833 + .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
46834 };
46835 EXPORT_SYMBOL_GPL(xpc_interface);
46836
46837 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
46838 index b94d5f7..7f494c5 100644
46839 --- a/drivers/misc/sgi-xp/xpc.h
46840 +++ b/drivers/misc/sgi-xp/xpc.h
46841 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
46842 void (*received_payload) (struct xpc_channel *, void *);
46843 void (*notify_senders_of_disconnect) (struct xpc_channel *);
46844 };
46845 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
46846
46847 /* struct xpc_partition act_state values (for XPC HB) */
46848
46849 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
46850 /* found in xpc_main.c */
46851 extern struct device *xpc_part;
46852 extern struct device *xpc_chan;
46853 -extern struct xpc_arch_operations xpc_arch_ops;
46854 +extern xpc_arch_operations_no_const xpc_arch_ops;
46855 extern int xpc_disengage_timelimit;
46856 extern int xpc_disengage_timedout;
46857 extern int xpc_activate_IRQ_rcvd;
46858 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
46859 index 82dc574..8539ab2 100644
46860 --- a/drivers/misc/sgi-xp/xpc_main.c
46861 +++ b/drivers/misc/sgi-xp/xpc_main.c
46862 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
46863 .notifier_call = xpc_system_die,
46864 };
46865
46866 -struct xpc_arch_operations xpc_arch_ops;
46867 +xpc_arch_operations_no_const xpc_arch_ops;
46868
46869 /*
46870 * Timer function to enforce the timelimit on the partition disengage.
46871 @@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
46872
46873 if (((die_args->trapnr == X86_TRAP_MF) ||
46874 (die_args->trapnr == X86_TRAP_XF)) &&
46875 - !user_mode_vm(die_args->regs))
46876 + !user_mode(die_args->regs))
46877 xpc_die_deactivate();
46878
46879 break;
46880 diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
46881 index a11451f..9e1bbad 100644
46882 --- a/drivers/mmc/card/block.c
46883 +++ b/drivers/mmc/card/block.c
46884 @@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
46885 if (idata->ic.postsleep_min_us)
46886 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
46887
46888 - if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
46889 + if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
46890 err = -EFAULT;
46891 goto cmd_rel_host;
46892 }
46893 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
46894 index 7911e05..d0f9dda 100644
46895 --- a/drivers/mmc/core/mmc_ops.c
46896 +++ b/drivers/mmc/core/mmc_ops.c
46897 @@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
46898 void *data_buf;
46899 int is_on_stack;
46900
46901 - is_on_stack = object_is_on_stack(buf);
46902 + is_on_stack = object_starts_on_stack(buf);
46903 if (is_on_stack) {
46904 /*
46905 * dma onto stack is unsafe/nonportable, but callers to this
46906 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
46907 index 01b99e8..5c325e3 100644
46908 --- a/drivers/mmc/host/dw_mmc.h
46909 +++ b/drivers/mmc/host/dw_mmc.h
46910 @@ -265,5 +265,5 @@ struct dw_mci_drv_data {
46911 int (*parse_dt)(struct dw_mci *host);
46912 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
46913 struct dw_mci_tuning_data *tuning_data);
46914 -};
46915 +} __do_const;
46916 #endif /* _DW_MMC_H_ */
46917 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
46918 index 43af791..86f4c48 100644
46919 --- a/drivers/mmc/host/mmci.c
46920 +++ b/drivers/mmc/host/mmci.c
46921 @@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
46922 mmc->caps |= MMC_CAP_CMD23;
46923
46924 if (variant->busy_detect) {
46925 - mmci_ops.card_busy = mmci_card_busy;
46926 + pax_open_kernel();
46927 + *(void **)&mmci_ops.card_busy = mmci_card_busy;
46928 + pax_close_kernel();
46929 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
46930 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
46931 mmc->max_busy_timeout = 0;
46932 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
46933 index 9c2b9cb..cebb09a 100644
46934 --- a/drivers/mmc/host/omap_hsmmc.c
46935 +++ b/drivers/mmc/host/omap_hsmmc.c
46936 @@ -2113,7 +2113,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
46937
46938 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
46939 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
46940 - omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
46941 + pax_open_kernel();
46942 + *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
46943 + pax_close_kernel();
46944 }
46945
46946 pm_runtime_enable(host->dev);
46947 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
46948 index 587ee0e..b3bbcab 100644
46949 --- a/drivers/mmc/host/sdhci-esdhc-imx.c
46950 +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
46951 @@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
46952 host->mmc->caps |= MMC_CAP_1_8V_DDR;
46953 }
46954
46955 - if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
46956 - sdhci_esdhc_ops.platform_execute_tuning =
46957 + if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
46958 + pax_open_kernel();
46959 + *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
46960 esdhc_executing_tuning;
46961 + pax_close_kernel();
46962 + }
46963
46964 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
46965 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
46966 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
46967 index 0ce6eb1..8dcce1b 100644
46968 --- a/drivers/mmc/host/sdhci-s3c.c
46969 +++ b/drivers/mmc/host/sdhci-s3c.c
46970 @@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
46971 * we can use overriding functions instead of default.
46972 */
46973 if (sc->no_divider) {
46974 - sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
46975 - sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
46976 - sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
46977 + pax_open_kernel();
46978 + *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
46979 + *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
46980 + *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
46981 + pax_close_kernel();
46982 }
46983
46984 /* It supports additional host capabilities if needed */
46985 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
46986 index 423666b..81ff5eb 100644
46987 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
46988 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
46989 @@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
46990 size_t totlen = 0, thislen;
46991 int ret = 0;
46992 size_t buflen = 0;
46993 - static char *buffer;
46994 + char *buffer;
46995
46996 if (!ECCBUF_SIZE) {
46997 /* We should fall back to a general writev implementation.
46998 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
46999 index b3b7ca1..5dd4634 100644
47000 --- a/drivers/mtd/nand/denali.c
47001 +++ b/drivers/mtd/nand/denali.c
47002 @@ -24,6 +24,7 @@
47003 #include <linux/slab.h>
47004 #include <linux/mtd/mtd.h>
47005 #include <linux/module.h>
47006 +#include <linux/slab.h>
47007
47008 #include "denali.h"
47009
47010 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47011 index 959cb9b..8520fe5 100644
47012 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47013 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47014 @@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47015
47016 /* first try to map the upper buffer directly */
47017 if (virt_addr_valid(this->upper_buf) &&
47018 - !object_is_on_stack(this->upper_buf)) {
47019 + !object_starts_on_stack(this->upper_buf)) {
47020 sg_init_one(sgl, this->upper_buf, this->upper_len);
47021 ret = dma_map_sg(this->dev, sgl, 1, dr);
47022 if (ret == 0)
47023 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47024 index 51b9d6a..52af9a7 100644
47025 --- a/drivers/mtd/nftlmount.c
47026 +++ b/drivers/mtd/nftlmount.c
47027 @@ -24,6 +24,7 @@
47028 #include <asm/errno.h>
47029 #include <linux/delay.h>
47030 #include <linux/slab.h>
47031 +#include <linux/sched.h>
47032 #include <linux/mtd/mtd.h>
47033 #include <linux/mtd/nand.h>
47034 #include <linux/mtd/nftl.h>
47035 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47036 index c23184a..4115c41 100644
47037 --- a/drivers/mtd/sm_ftl.c
47038 +++ b/drivers/mtd/sm_ftl.c
47039 @@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47040 #define SM_CIS_VENDOR_OFFSET 0x59
47041 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47042 {
47043 - struct attribute_group *attr_group;
47044 + attribute_group_no_const *attr_group;
47045 struct attribute **attributes;
47046 struct sm_sysfs_attribute *vendor_attribute;
47047 char *vendor;
47048 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
47049 index a5115fb..81b03f6 100644
47050 --- a/drivers/net/bonding/bond_main.c
47051 +++ b/drivers/net/bonding/bond_main.c
47052 @@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
47053 bond_dev_queue_xmit(bond, skb, slave->dev);
47054 } else {
47055 dev_kfree_skb_any(skb);
47056 - atomic_long_inc(&dev->tx_dropped);
47057 + atomic_long_inc_unchecked(&dev->tx_dropped);
47058 }
47059
47060 return NETDEV_TX_OK;
47061 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47062 index 45f09a6..f154f8d 100644
47063 --- a/drivers/net/bonding/bond_netlink.c
47064 +++ b/drivers/net/bonding/bond_netlink.c
47065 @@ -585,7 +585,7 @@ nla_put_failure:
47066 return -EMSGSIZE;
47067 }
47068
47069 -struct rtnl_link_ops bond_link_ops __read_mostly = {
47070 +struct rtnl_link_ops bond_link_ops = {
47071 .kind = "bond",
47072 .priv_size = sizeof(struct bonding),
47073 .setup = bond_setup,
47074 diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47075 index 5e40a8b..126bfda 100644
47076 --- a/drivers/net/caif/caif_hsi.c
47077 +++ b/drivers/net/caif/caif_hsi.c
47078 @@ -1445,7 +1445,7 @@ err:
47079 return -ENODEV;
47080 }
47081
47082 -static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47083 +static struct rtnl_link_ops caif_hsi_link_ops = {
47084 .kind = "cfhsi",
47085 .priv_size = sizeof(struct cfhsi),
47086 .setup = cfhsi_setup,
47087 diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47088 index 98d73aa..63ef9da 100644
47089 --- a/drivers/net/can/Kconfig
47090 +++ b/drivers/net/can/Kconfig
47091 @@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47092
47093 config CAN_FLEXCAN
47094 tristate "Support for Freescale FLEXCAN based chips"
47095 - depends on ARM || PPC
47096 + depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47097 ---help---
47098 Say Y here if you want to support for Freescale FlexCAN.
47099
47100 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47101 index 2cfe501..477d4b5 100644
47102 --- a/drivers/net/can/dev.c
47103 +++ b/drivers/net/can/dev.c
47104 @@ -868,7 +868,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47105 return -EOPNOTSUPP;
47106 }
47107
47108 -static struct rtnl_link_ops can_link_ops __read_mostly = {
47109 +static struct rtnl_link_ops can_link_ops = {
47110 .kind = "can",
47111 .maxtype = IFLA_CAN_MAX,
47112 .policy = can_policy,
47113 diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47114 index 4e94057..32032ff 100644
47115 --- a/drivers/net/can/vcan.c
47116 +++ b/drivers/net/can/vcan.c
47117 @@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
47118 dev->destructor = free_netdev;
47119 }
47120
47121 -static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47122 +static struct rtnl_link_ops vcan_link_ops = {
47123 .kind = "vcan",
47124 .setup = vcan_setup,
47125 };
47126 diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47127 index ff435fb..d408b1f 100644
47128 --- a/drivers/net/dummy.c
47129 +++ b/drivers/net/dummy.c
47130 @@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47131 return 0;
47132 }
47133
47134 -static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47135 +static struct rtnl_link_ops dummy_link_ops = {
47136 .kind = "dummy",
47137 .setup = dummy_setup,
47138 .validate = dummy_validate,
47139 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47140 index 1d162cc..b546a75 100644
47141 --- a/drivers/net/ethernet/8390/ax88796.c
47142 +++ b/drivers/net/ethernet/8390/ax88796.c
47143 @@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47144 if (ax->plat->reg_offsets)
47145 ei_local->reg_offset = ax->plat->reg_offsets;
47146 else {
47147 + resource_size_t _mem_size = mem_size;
47148 + do_div(_mem_size, 0x18);
47149 ei_local->reg_offset = ax->reg_offsets;
47150 for (ret = 0; ret < 0x18; ret++)
47151 - ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47152 + ax->reg_offsets[ret] = _mem_size * ret;
47153 }
47154
47155 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47156 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47157 index 4efc435..4ab9e14 100644
47158 --- a/drivers/net/ethernet/altera/altera_tse_main.c
47159 +++ b/drivers/net/ethernet/altera/altera_tse_main.c
47160 @@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
47161 return 0;
47162 }
47163
47164 -static struct net_device_ops altera_tse_netdev_ops = {
47165 +static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47166 .ndo_open = tse_open,
47167 .ndo_stop = tse_shutdown,
47168 .ndo_start_xmit = tse_start_xmit,
47169 @@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47170 ndev->netdev_ops = &altera_tse_netdev_ops;
47171 altera_tse_set_ethtool_ops(ndev);
47172
47173 + pax_open_kernel();
47174 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47175
47176 if (priv->hash_filter)
47177 altera_tse_netdev_ops.ndo_set_rx_mode =
47178 tse_set_rx_mode_hashfilter;
47179 + pax_close_kernel();
47180
47181 /* Scatter/gather IO is not supported,
47182 * so it is turned off
47183 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47184 index caade30..3e257d9 100644
47185 --- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47186 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47187 @@ -1072,14 +1072,14 @@ do { \
47188 * operations, everything works on mask values.
47189 */
47190 #define XMDIO_READ(_pdata, _mmd, _reg) \
47191 - ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47192 + ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47193 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47194
47195 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47196 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47197
47198 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47199 - ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47200 + ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47201 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47202
47203 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47204 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47205 index 8a50b01..39c1ad0 100644
47206 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47207 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47208 @@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47209
47210 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47211
47212 - pdata->hw_if.config_dcb_tc(pdata);
47213 + pdata->hw_if->config_dcb_tc(pdata);
47214
47215 return 0;
47216 }
47217 @@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47218
47219 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47220
47221 - pdata->hw_if.config_dcb_pfc(pdata);
47222 + pdata->hw_if->config_dcb_pfc(pdata);
47223
47224 return 0;
47225 }
47226 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47227 index 6fc5da0..61ac2cb 100644
47228 --- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47229 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47230 @@ -235,7 +235,7 @@ err_ring:
47231
47232 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47233 {
47234 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47235 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47236 struct xgbe_channel *channel;
47237 struct xgbe_ring *ring;
47238 struct xgbe_ring_data *rdata;
47239 @@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47240
47241 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47242 {
47243 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47244 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47245 struct xgbe_channel *channel;
47246 struct xgbe_ring *ring;
47247 struct xgbe_ring_desc *rdesc;
47248 @@ -505,7 +505,7 @@ err_out:
47249 static void xgbe_realloc_skb(struct xgbe_channel *channel)
47250 {
47251 struct xgbe_prv_data *pdata = channel->pdata;
47252 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47253 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47254 struct xgbe_ring *ring = channel->rx_ring;
47255 struct xgbe_ring_data *rdata;
47256 struct sk_buff *skb = NULL;
47257 @@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
47258 DBGPR("<--xgbe_realloc_skb\n");
47259 }
47260
47261 -void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47262 -{
47263 - DBGPR("-->xgbe_init_function_ptrs_desc\n");
47264 -
47265 - desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47266 - desc_if->free_ring_resources = xgbe_free_ring_resources;
47267 - desc_if->map_tx_skb = xgbe_map_tx_skb;
47268 - desc_if->realloc_skb = xgbe_realloc_skb;
47269 - desc_if->unmap_skb = xgbe_unmap_skb;
47270 - desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47271 - desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47272 -
47273 - DBGPR("<--xgbe_init_function_ptrs_desc\n");
47274 -}
47275 +const struct xgbe_desc_if default_xgbe_desc_if = {
47276 + .alloc_ring_resources = xgbe_alloc_ring_resources,
47277 + .free_ring_resources = xgbe_free_ring_resources,
47278 + .map_tx_skb = xgbe_map_tx_skb,
47279 + .realloc_skb = xgbe_realloc_skb,
47280 + .unmap_skb = xgbe_unmap_skb,
47281 + .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47282 + .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47283 +};
47284 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47285 index 9da3a03..022f15c 100644
47286 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47287 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47288 @@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47289
47290 static int xgbe_init(struct xgbe_prv_data *pdata)
47291 {
47292 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47293 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47294 int ret;
47295
47296 DBGPR("-->xgbe_init\n");
47297 @@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47298 return 0;
47299 }
47300
47301 -void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47302 -{
47303 - DBGPR("-->xgbe_init_function_ptrs\n");
47304 -
47305 - hw_if->tx_complete = xgbe_tx_complete;
47306 -
47307 - hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47308 - hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47309 - hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47310 - hw_if->set_mac_address = xgbe_set_mac_address;
47311 -
47312 - hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47313 - hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47314 -
47315 - hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47316 - hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47317 - hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47318 - hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47319 - hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47320 -
47321 - hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47322 - hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47323 -
47324 - hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47325 - hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47326 - hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47327 -
47328 - hw_if->enable_tx = xgbe_enable_tx;
47329 - hw_if->disable_tx = xgbe_disable_tx;
47330 - hw_if->enable_rx = xgbe_enable_rx;
47331 - hw_if->disable_rx = xgbe_disable_rx;
47332 -
47333 - hw_if->powerup_tx = xgbe_powerup_tx;
47334 - hw_if->powerdown_tx = xgbe_powerdown_tx;
47335 - hw_if->powerup_rx = xgbe_powerup_rx;
47336 - hw_if->powerdown_rx = xgbe_powerdown_rx;
47337 -
47338 - hw_if->pre_xmit = xgbe_pre_xmit;
47339 - hw_if->dev_read = xgbe_dev_read;
47340 - hw_if->enable_int = xgbe_enable_int;
47341 - hw_if->disable_int = xgbe_disable_int;
47342 - hw_if->init = xgbe_init;
47343 - hw_if->exit = xgbe_exit;
47344 +const struct xgbe_hw_if default_xgbe_hw_if = {
47345 + .tx_complete = xgbe_tx_complete,
47346 +
47347 + .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47348 + .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47349 + .add_mac_addresses = xgbe_add_mac_addresses,
47350 + .set_mac_address = xgbe_set_mac_address,
47351 +
47352 + .enable_rx_csum = xgbe_enable_rx_csum,
47353 + .disable_rx_csum = xgbe_disable_rx_csum,
47354 +
47355 + .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47356 + .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47357 + .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47358 + .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47359 + .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47360 +
47361 + .read_mmd_regs = xgbe_read_mmd_regs,
47362 + .write_mmd_regs = xgbe_write_mmd_regs,
47363 +
47364 + .set_gmii_speed = xgbe_set_gmii_speed,
47365 + .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47366 + .set_xgmii_speed = xgbe_set_xgmii_speed,
47367 +
47368 + .enable_tx = xgbe_enable_tx,
47369 + .disable_tx = xgbe_disable_tx,
47370 + .enable_rx = xgbe_enable_rx,
47371 + .disable_rx = xgbe_disable_rx,
47372 +
47373 + .powerup_tx = xgbe_powerup_tx,
47374 + .powerdown_tx = xgbe_powerdown_tx,
47375 + .powerup_rx = xgbe_powerup_rx,
47376 + .powerdown_rx = xgbe_powerdown_rx,
47377 +
47378 + .pre_xmit = xgbe_pre_xmit,
47379 + .dev_read = xgbe_dev_read,
47380 + .enable_int = xgbe_enable_int,
47381 + .disable_int = xgbe_disable_int,
47382 + .init = xgbe_init,
47383 + .exit = xgbe_exit,
47384
47385 /* Descriptor related Sequences have to be initialized here */
47386 - hw_if->tx_desc_init = xgbe_tx_desc_init;
47387 - hw_if->rx_desc_init = xgbe_rx_desc_init;
47388 - hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47389 - hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47390 - hw_if->is_last_desc = xgbe_is_last_desc;
47391 - hw_if->is_context_desc = xgbe_is_context_desc;
47392 + .tx_desc_init = xgbe_tx_desc_init,
47393 + .rx_desc_init = xgbe_rx_desc_init,
47394 + .tx_desc_reset = xgbe_tx_desc_reset,
47395 + .rx_desc_reset = xgbe_rx_desc_reset,
47396 + .is_last_desc = xgbe_is_last_desc,
47397 + .is_context_desc = xgbe_is_context_desc,
47398
47399 /* For FLOW ctrl */
47400 - hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47401 - hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47402 + .config_tx_flow_control = xgbe_config_tx_flow_control,
47403 + .config_rx_flow_control = xgbe_config_rx_flow_control,
47404
47405 /* For RX coalescing */
47406 - hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47407 - hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47408 - hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47409 - hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47410 + .config_rx_coalesce = xgbe_config_rx_coalesce,
47411 + .config_tx_coalesce = xgbe_config_tx_coalesce,
47412 + .usec_to_riwt = xgbe_usec_to_riwt,
47413 + .riwt_to_usec = xgbe_riwt_to_usec,
47414
47415 /* For RX and TX threshold config */
47416 - hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47417 - hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47418 + .config_rx_threshold = xgbe_config_rx_threshold,
47419 + .config_tx_threshold = xgbe_config_tx_threshold,
47420
47421 /* For RX and TX Store and Forward Mode config */
47422 - hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47423 - hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47424 + .config_rsf_mode = xgbe_config_rsf_mode,
47425 + .config_tsf_mode = xgbe_config_tsf_mode,
47426
47427 /* For TX DMA Operating on Second Frame config */
47428 - hw_if->config_osp_mode = xgbe_config_osp_mode;
47429 + .config_osp_mode = xgbe_config_osp_mode,
47430
47431 /* For RX and TX PBL config */
47432 - hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47433 - hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47434 - hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47435 - hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47436 - hw_if->config_pblx8 = xgbe_config_pblx8;
47437 + .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47438 + .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47439 + .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47440 + .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47441 + .config_pblx8 = xgbe_config_pblx8,
47442
47443 /* For MMC statistics support */
47444 - hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47445 - hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47446 - hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47447 + .tx_mmc_int = xgbe_tx_mmc_int,
47448 + .rx_mmc_int = xgbe_rx_mmc_int,
47449 + .read_mmc_stats = xgbe_read_mmc_stats,
47450
47451 /* For PTP config */
47452 - hw_if->config_tstamp = xgbe_config_tstamp;
47453 - hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47454 - hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47455 - hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47456 - hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47457 + .config_tstamp = xgbe_config_tstamp,
47458 + .update_tstamp_addend = xgbe_update_tstamp_addend,
47459 + .set_tstamp_time = xgbe_set_tstamp_time,
47460 + .get_tstamp_time = xgbe_get_tstamp_time,
47461 + .get_tx_tstamp = xgbe_get_tx_tstamp,
47462
47463 /* For Data Center Bridging config */
47464 - hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47465 - hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47466 -
47467 - DBGPR("<--xgbe_init_function_ptrs\n");
47468 -}
47469 + .config_dcb_tc = xgbe_config_dcb_tc,
47470 + .config_dcb_pfc = xgbe_config_dcb_pfc,
47471 +};
47472 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47473 index 2349ea9..a83a677 100644
47474 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47475 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47476 @@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47477
47478 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47479 {
47480 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47481 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47482 struct xgbe_channel *channel;
47483 enum xgbe_int int_id;
47484 unsigned int i;
47485 @@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47486
47487 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47488 {
47489 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47490 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47491 struct xgbe_channel *channel;
47492 enum xgbe_int int_id;
47493 unsigned int i;
47494 @@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47495 static irqreturn_t xgbe_isr(int irq, void *data)
47496 {
47497 struct xgbe_prv_data *pdata = data;
47498 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47499 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47500 struct xgbe_channel *channel;
47501 unsigned int dma_isr, dma_ch_isr;
47502 unsigned int mac_isr, mac_tssr;
47503 @@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47504
47505 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47506 {
47507 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47508 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47509
47510 DBGPR("-->xgbe_init_tx_coalesce\n");
47511
47512 @@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47513
47514 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47515 {
47516 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47517 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47518
47519 DBGPR("-->xgbe_init_rx_coalesce\n");
47520
47521 @@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47522
47523 static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47524 {
47525 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47526 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47527 struct xgbe_channel *channel;
47528 struct xgbe_ring *ring;
47529 struct xgbe_ring_data *rdata;
47530 @@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47531
47532 static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47533 {
47534 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47535 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47536 struct xgbe_channel *channel;
47537 struct xgbe_ring *ring;
47538 struct xgbe_ring_data *rdata;
47539 @@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47540 static void xgbe_adjust_link(struct net_device *netdev)
47541 {
47542 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47543 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47544 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47545 struct phy_device *phydev = pdata->phydev;
47546 int new_state = 0;
47547
47548 @@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47549 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47550 {
47551 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47552 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47553 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47554 unsigned long flags;
47555
47556 DBGPR("-->xgbe_powerdown\n");
47557 @@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47558 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47559 {
47560 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47561 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47562 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47563 unsigned long flags;
47564
47565 DBGPR("-->xgbe_powerup\n");
47566 @@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47567
47568 static int xgbe_start(struct xgbe_prv_data *pdata)
47569 {
47570 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47571 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47572 struct net_device *netdev = pdata->netdev;
47573
47574 DBGPR("-->xgbe_start\n");
47575 @@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47576
47577 static void xgbe_stop(struct xgbe_prv_data *pdata)
47578 {
47579 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47580 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47581 struct net_device *netdev = pdata->netdev;
47582
47583 DBGPR("-->xgbe_stop\n");
47584 @@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47585
47586 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47587 {
47588 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47589 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47590
47591 DBGPR("-->xgbe_restart_dev\n");
47592
47593 @@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47594 return -ERANGE;
47595 }
47596
47597 - pdata->hw_if.config_tstamp(pdata, mac_tscr);
47598 + pdata->hw_if->config_tstamp(pdata, mac_tscr);
47599
47600 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47601
47602 @@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47603 static int xgbe_open(struct net_device *netdev)
47604 {
47605 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47606 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47607 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47608 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47609 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47610 int ret;
47611
47612 DBGPR("-->xgbe_open\n");
47613 @@ -1170,8 +1170,8 @@ err_phy_init:
47614 static int xgbe_close(struct net_device *netdev)
47615 {
47616 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47617 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47618 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47619 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47620 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47621
47622 DBGPR("-->xgbe_close\n");
47623
47624 @@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
47625 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47626 {
47627 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47628 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47629 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47630 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47631 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47632 struct xgbe_channel *channel;
47633 struct xgbe_ring *ring;
47634 struct xgbe_packet_data *packet;
47635 @@ -1275,7 +1275,7 @@ tx_netdev_return:
47636 static void xgbe_set_rx_mode(struct net_device *netdev)
47637 {
47638 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47639 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47640 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47641 unsigned int pr_mode, am_mode;
47642
47643 DBGPR("-->xgbe_set_rx_mode\n");
47644 @@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47645 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47646 {
47647 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47648 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47649 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47650 struct sockaddr *saddr = addr;
47651
47652 DBGPR("-->xgbe_set_mac_address\n");
47653 @@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47654
47655 DBGPR("-->%s\n", __func__);
47656
47657 - pdata->hw_if.read_mmc_stats(pdata);
47658 + pdata->hw_if->read_mmc_stats(pdata);
47659
47660 s->rx_packets = pstats->rxframecount_gb;
47661 s->rx_bytes = pstats->rxoctetcount_gb;
47662 @@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47663 u16 vid)
47664 {
47665 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47666 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47667 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47668
47669 DBGPR("-->%s\n", __func__);
47670
47671 @@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47672 u16 vid)
47673 {
47674 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47675 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47676 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47677
47678 DBGPR("-->%s\n", __func__);
47679
47680 @@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
47681 netdev_features_t features)
47682 {
47683 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47684 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47685 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47686 netdev_features_t rxcsum, rxvlan, rxvlan_filter;
47687
47688 rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
47689 @@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47690 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47691 {
47692 struct xgbe_prv_data *pdata = channel->pdata;
47693 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47694 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47695 struct xgbe_ring *ring = channel->rx_ring;
47696 struct xgbe_ring_data *rdata;
47697
47698 @@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
47699 static int xgbe_tx_poll(struct xgbe_channel *channel)
47700 {
47701 struct xgbe_prv_data *pdata = channel->pdata;
47702 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47703 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47704 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47705 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47706 struct xgbe_ring *ring = channel->tx_ring;
47707 struct xgbe_ring_data *rdata;
47708 struct xgbe_ring_desc *rdesc;
47709 @@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
47710 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47711 {
47712 struct xgbe_prv_data *pdata = channel->pdata;
47713 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47714 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47715 struct xgbe_ring *ring = channel->rx_ring;
47716 struct xgbe_ring_data *rdata;
47717 struct xgbe_packet_data *packet;
47718 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47719 index 49508ec..2617cca 100644
47720 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47721 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47722 @@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
47723
47724 DBGPR("-->%s\n", __func__);
47725
47726 - pdata->hw_if.read_mmc_stats(pdata);
47727 + pdata->hw_if->read_mmc_stats(pdata);
47728 for (i = 0; i < XGBE_STATS_COUNT; i++) {
47729 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
47730 *data++ = *(u64 *)stat;
47731 @@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
47732 struct ethtool_coalesce *ec)
47733 {
47734 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47735 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47736 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47737 unsigned int riwt;
47738
47739 DBGPR("-->xgbe_get_coalesce\n");
47740 @@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
47741 struct ethtool_coalesce *ec)
47742 {
47743 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47744 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47745 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47746 unsigned int rx_frames, rx_riwt, rx_usecs;
47747 unsigned int tx_frames, tx_usecs;
47748
47749 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47750 index f5a8fa0..0bb58ff 100644
47751 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47752 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47753 @@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
47754 DBGPR("<--xgbe_default_config\n");
47755 }
47756
47757 -static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
47758 -{
47759 - xgbe_init_function_ptrs_dev(&pdata->hw_if);
47760 - xgbe_init_function_ptrs_desc(&pdata->desc_if);
47761 -}
47762 -
47763 static int xgbe_probe(struct platform_device *pdev)
47764 {
47765 struct xgbe_prv_data *pdata;
47766 @@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
47767 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
47768
47769 /* Set all the function pointers */
47770 - xgbe_init_all_fptrs(pdata);
47771 - hw_if = &pdata->hw_if;
47772 - desc_if = &pdata->desc_if;
47773 + hw_if = pdata->hw_if = &default_xgbe_hw_if;
47774 + desc_if = pdata->desc_if = &default_xgbe_desc_if;
47775
47776 /* Issue software reset to device */
47777 hw_if->exit(pdata);
47778 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47779 index 363b210..b241389 100644
47780 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47781 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47782 @@ -126,7 +126,7 @@
47783 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
47784 {
47785 struct xgbe_prv_data *pdata = mii->priv;
47786 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47787 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47788 int mmd_data;
47789
47790 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
47791 @@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
47792 u16 mmd_val)
47793 {
47794 struct xgbe_prv_data *pdata = mii->priv;
47795 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47796 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47797 int mmd_data = mmd_val;
47798
47799 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
47800 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47801 index a1bf9d1c..84adcab 100644
47802 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47803 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47804 @@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
47805 tstamp_cc);
47806 u64 nsec;
47807
47808 - nsec = pdata->hw_if.get_tstamp_time(pdata);
47809 + nsec = pdata->hw_if->get_tstamp_time(pdata);
47810
47811 return nsec;
47812 }
47813 @@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
47814
47815 spin_lock_irqsave(&pdata->tstamp_lock, flags);
47816
47817 - pdata->hw_if.update_tstamp_addend(pdata, addend);
47818 + pdata->hw_if->update_tstamp_addend(pdata, addend);
47819
47820 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
47821
47822 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
47823 index 789957d..d7d0245 100644
47824 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h
47825 +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
47826 @@ -583,8 +583,8 @@ struct xgbe_prv_data {
47827
47828 int irq_number;
47829
47830 - struct xgbe_hw_if hw_if;
47831 - struct xgbe_desc_if desc_if;
47832 + const struct xgbe_hw_if *hw_if;
47833 + const struct xgbe_desc_if *desc_if;
47834
47835 /* AXI DMA settings */
47836 unsigned int axdomain;
47837 @@ -697,6 +697,9 @@ struct xgbe_prv_data {
47838 #endif
47839 };
47840
47841 +extern const struct xgbe_hw_if default_xgbe_hw_if;
47842 +extern const struct xgbe_desc_if default_xgbe_desc_if;
47843 +
47844 /* Function prototypes*/
47845
47846 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
47847 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47848 index adcacda..fa6e0ae 100644
47849 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47850 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47851 @@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
47852 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
47853 {
47854 /* RX_MODE controlling object */
47855 - bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
47856 + bnx2x_init_rx_mode_obj(bp);
47857
47858 /* multicast configuration controlling object */
47859 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
47860 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47861 index 7bc2924..2112002 100644
47862 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47863 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47864 @@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
47865 return rc;
47866 }
47867
47868 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47869 - struct bnx2x_rx_mode_obj *o)
47870 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
47871 {
47872 if (CHIP_IS_E1x(bp)) {
47873 - o->wait_comp = bnx2x_empty_rx_mode_wait;
47874 - o->config_rx_mode = bnx2x_set_rx_mode_e1x;
47875 + bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
47876 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
47877 } else {
47878 - o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
47879 - o->config_rx_mode = bnx2x_set_rx_mode_e2;
47880 + bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
47881 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
47882 }
47883 }
47884
47885 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47886 index e97275f..52e28bc 100644
47887 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47888 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47889 @@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
47890
47891 /********************* RX MODE ****************/
47892
47893 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47894 - struct bnx2x_rx_mode_obj *o);
47895 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
47896
47897 /**
47898 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
47899 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
47900 index 31c9f82..e65e986 100644
47901 --- a/drivers/net/ethernet/broadcom/tg3.h
47902 +++ b/drivers/net/ethernet/broadcom/tg3.h
47903 @@ -150,6 +150,7 @@
47904 #define CHIPREV_ID_5750_A0 0x4000
47905 #define CHIPREV_ID_5750_A1 0x4001
47906 #define CHIPREV_ID_5750_A3 0x4003
47907 +#define CHIPREV_ID_5750_C1 0x4201
47908 #define CHIPREV_ID_5750_C2 0x4202
47909 #define CHIPREV_ID_5752_A0_HW 0x5000
47910 #define CHIPREV_ID_5752_A0 0x6000
47911 diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
47912 index 903466e..b285864 100644
47913 --- a/drivers/net/ethernet/brocade/bna/bna_enet.c
47914 +++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
47915 @@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
47916 }
47917
47918 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
47919 - bna_cb_ioceth_enable,
47920 - bna_cb_ioceth_disable,
47921 - bna_cb_ioceth_hbfail,
47922 - bna_cb_ioceth_reset
47923 + .enable_cbfn = bna_cb_ioceth_enable,
47924 + .disable_cbfn = bna_cb_ioceth_disable,
47925 + .hbfail_cbfn = bna_cb_ioceth_hbfail,
47926 + .reset_cbfn = bna_cb_ioceth_reset
47927 };
47928
47929 static void bna_attr_init(struct bna_ioceth *ioceth)
47930 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47931 index 8cffcdf..aadf043 100644
47932 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47933 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47934 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
47935 */
47936 struct l2t_skb_cb {
47937 arp_failure_handler_func arp_failure_handler;
47938 -};
47939 +} __no_const;
47940
47941 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
47942
47943 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47944 index 279873c..11e1921 100644
47945 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47946 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47947 @@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
47948
47949 int i;
47950 struct adapter *ap = netdev2adap(dev);
47951 - static const unsigned int *reg_ranges;
47952 + const unsigned int *reg_ranges;
47953 int arr_size = 0, buf_size = 0;
47954
47955 if (is_t4(ap->params.chip)) {
47956 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
47957 index cf8b6ff..274271e 100644
47958 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
47959 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
47960 @@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
47961 for (i=0; i<ETH_ALEN; i++) {
47962 tmp.addr[i] = dev->dev_addr[i];
47963 }
47964 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
47965 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
47966 break;
47967
47968 case DE4X5_SET_HWADDR: /* Set the hardware address */
47969 @@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
47970 spin_lock_irqsave(&lp->lock, flags);
47971 memcpy(&statbuf, &lp->pktStats, ioc->len);
47972 spin_unlock_irqrestore(&lp->lock, flags);
47973 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
47974 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
47975 return -EFAULT;
47976 break;
47977 }
47978 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
47979 index 597c463..5cc1a7f 100644
47980 --- a/drivers/net/ethernet/emulex/benet/be_main.c
47981 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
47982 @@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
47983
47984 if (wrapped)
47985 newacc += 65536;
47986 - ACCESS_ONCE(*acc) = newacc;
47987 + ACCESS_ONCE_RW(*acc) = newacc;
47988 }
47989
47990 static void populate_erx_stats(struct be_adapter *adapter,
47991 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
47992 index c77fa4a..7fd42fc 100644
47993 --- a/drivers/net/ethernet/faraday/ftgmac100.c
47994 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
47995 @@ -30,6 +30,8 @@
47996 #include <linux/netdevice.h>
47997 #include <linux/phy.h>
47998 #include <linux/platform_device.h>
47999 +#include <linux/interrupt.h>
48000 +#include <linux/irqreturn.h>
48001 #include <net/ip.h>
48002
48003 #include "ftgmac100.h"
48004 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48005 index 4ff1adc..0ea6bf4 100644
48006 --- a/drivers/net/ethernet/faraday/ftmac100.c
48007 +++ b/drivers/net/ethernet/faraday/ftmac100.c
48008 @@ -31,6 +31,8 @@
48009 #include <linux/module.h>
48010 #include <linux/netdevice.h>
48011 #include <linux/platform_device.h>
48012 +#include <linux/interrupt.h>
48013 +#include <linux/irqreturn.h>
48014
48015 #include "ftmac100.h"
48016
48017 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48018 index 537b621..07f87ce 100644
48019 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48020 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48021 @@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48022 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48023
48024 /* Update the base adjustement value. */
48025 - ACCESS_ONCE(pf->ptp_base_adj) = incval;
48026 + ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48027 smp_mb(); /* Force the above update. */
48028 }
48029
48030 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48031 index 5fd4b52..87aa34b 100644
48032 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48033 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48034 @@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48035 }
48036
48037 /* update the base incval used to calculate frequency adjustment */
48038 - ACCESS_ONCE(adapter->base_incval) = incval;
48039 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
48040 smp_mb();
48041
48042 /* need lock to prevent incorrect read while modifying cyclecounter */
48043 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48044 index 454d9fe..59f0f0b 100644
48045 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48046 +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48047 @@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48048 wmb();
48049
48050 /* we want to dirty this cache line once */
48051 - ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48052 - ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48053 + ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48054 + ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48055
48056 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48057
48058 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48059 index 2bbd01f..e8baa64 100644
48060 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48061 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48062 @@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48063 struct __vxge_hw_fifo *fifo;
48064 struct vxge_hw_fifo_config *config;
48065 u32 txdl_size, txdl_per_memblock;
48066 - struct vxge_hw_mempool_cbs fifo_mp_callback;
48067 + static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48068 + .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48069 + };
48070 +
48071 struct __vxge_hw_virtualpath *vpath;
48072
48073 if ((vp == NULL) || (attr == NULL)) {
48074 @@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48075 goto exit;
48076 }
48077
48078 - fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48079 -
48080 fifo->mempool =
48081 __vxge_hw_mempool_create(vpath->hldev,
48082 fifo->config->memblock_size,
48083 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48084 index 2bb48d5..d1a865d 100644
48085 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48086 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48087 @@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48088 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48089 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48090 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48091 - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48092 + pax_open_kernel();
48093 + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48094 + pax_close_kernel();
48095 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48096 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48097 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48098 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48099 index be7d7a6..a8983f8 100644
48100 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48101 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48102 @@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48103 case QLCNIC_NON_PRIV_FUNC:
48104 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48105 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48106 - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48107 + pax_open_kernel();
48108 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48109 + pax_close_kernel();
48110 break;
48111 case QLCNIC_PRIV_FUNC:
48112 ahw->op_mode = QLCNIC_PRIV_FUNC;
48113 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48114 - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48115 + pax_open_kernel();
48116 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48117 + pax_close_kernel();
48118 break;
48119 case QLCNIC_MGMT_FUNC:
48120 ahw->op_mode = QLCNIC_MGMT_FUNC;
48121 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48122 - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48123 + pax_open_kernel();
48124 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48125 + pax_close_kernel();
48126 break;
48127 default:
48128 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48129 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48130 index c9f57fb..208bdc1 100644
48131 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48132 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48133 @@ -1285,7 +1285,7 @@ flash_temp:
48134 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48135 {
48136 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48137 - static const struct qlcnic_dump_operations *fw_dump_ops;
48138 + const struct qlcnic_dump_operations *fw_dump_ops;
48139 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48140 u32 entry_offset, dump, no_entries, buf_offset = 0;
48141 int i, k, ops_cnt, ops_index, dump_size = 0;
48142 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48143 index cf154f7..c948d1b 100644
48144 --- a/drivers/net/ethernet/realtek/r8169.c
48145 +++ b/drivers/net/ethernet/realtek/r8169.c
48146 @@ -788,22 +788,22 @@ struct rtl8169_private {
48147 struct mdio_ops {
48148 void (*write)(struct rtl8169_private *, int, int);
48149 int (*read)(struct rtl8169_private *, int);
48150 - } mdio_ops;
48151 + } __no_const mdio_ops;
48152
48153 struct pll_power_ops {
48154 void (*down)(struct rtl8169_private *);
48155 void (*up)(struct rtl8169_private *);
48156 - } pll_power_ops;
48157 + } __no_const pll_power_ops;
48158
48159 struct jumbo_ops {
48160 void (*enable)(struct rtl8169_private *);
48161 void (*disable)(struct rtl8169_private *);
48162 - } jumbo_ops;
48163 + } __no_const jumbo_ops;
48164
48165 struct csi_ops {
48166 void (*write)(struct rtl8169_private *, int, int);
48167 u32 (*read)(struct rtl8169_private *, int);
48168 - } csi_ops;
48169 + } __no_const csi_ops;
48170
48171 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48172 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48173 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48174 index 6b861e3..204ac86 100644
48175 --- a/drivers/net/ethernet/sfc/ptp.c
48176 +++ b/drivers/net/ethernet/sfc/ptp.c
48177 @@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48178 ptp->start.dma_addr);
48179
48180 /* Clear flag that signals MC ready */
48181 - ACCESS_ONCE(*start) = 0;
48182 + ACCESS_ONCE_RW(*start) = 0;
48183 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48184 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48185 EFX_BUG_ON_PARANOID(rc);
48186 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48187 index 08c483b..2c4a553 100644
48188 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48189 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48190 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48191
48192 writel(value, ioaddr + MMC_CNTRL);
48193
48194 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48195 - MMC_CNTRL, value);
48196 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48197 +// MMC_CNTRL, value);
48198 }
48199
48200 /* To mask all all interrupts.*/
48201 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48202 index 2f48f79..8ae1a1a 100644
48203 --- a/drivers/net/hyperv/hyperv_net.h
48204 +++ b/drivers/net/hyperv/hyperv_net.h
48205 @@ -171,7 +171,7 @@ struct rndis_device {
48206 enum rndis_device_state state;
48207 bool link_state;
48208 bool link_change;
48209 - atomic_t new_req_id;
48210 + atomic_unchecked_t new_req_id;
48211
48212 spinlock_t request_lock;
48213 struct list_head req_list;
48214 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48215 index 2b86f0b..ecc996f 100644
48216 --- a/drivers/net/hyperv/rndis_filter.c
48217 +++ b/drivers/net/hyperv/rndis_filter.c
48218 @@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48219 * template
48220 */
48221 set = &rndis_msg->msg.set_req;
48222 - set->req_id = atomic_inc_return(&dev->new_req_id);
48223 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48224
48225 /* Add to the request list */
48226 spin_lock_irqsave(&dev->request_lock, flags);
48227 @@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48228
48229 /* Setup the rndis set */
48230 halt = &request->request_msg.msg.halt_req;
48231 - halt->req_id = atomic_inc_return(&dev->new_req_id);
48232 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48233
48234 /* Ignore return since this msg is optional. */
48235 rndis_filter_send_request(dev, request);
48236 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
48237 index 6cbc56a..5f7e6c8 100644
48238 --- a/drivers/net/ieee802154/fakehard.c
48239 +++ b/drivers/net/ieee802154/fakehard.c
48240 @@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
48241 phy->transmit_power = 0xbf;
48242
48243 dev->netdev_ops = &fake_ops;
48244 - dev->ml_priv = &fake_mlme;
48245 + dev->ml_priv = (void *)&fake_mlme;
48246
48247 priv = netdev_priv(dev);
48248 priv->phy = phy;
48249 diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48250 index 34f846b..4a0d5b1 100644
48251 --- a/drivers/net/ifb.c
48252 +++ b/drivers/net/ifb.c
48253 @@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48254 return 0;
48255 }
48256
48257 -static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48258 +static struct rtnl_link_ops ifb_link_ops = {
48259 .kind = "ifb",
48260 .priv_size = sizeof(struct ifb_private),
48261 .setup = ifb_setup,
48262 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48263 index bfb0b6e..5c396ce 100644
48264 --- a/drivers/net/macvlan.c
48265 +++ b/drivers/net/macvlan.c
48266 @@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48267 free_nskb:
48268 kfree_skb(nskb);
48269 err:
48270 - atomic_long_inc(&skb->dev->rx_dropped);
48271 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48272 }
48273
48274 static void macvlan_flush_sources(struct macvlan_port *port,
48275 @@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48276 int macvlan_link_register(struct rtnl_link_ops *ops)
48277 {
48278 /* common fields */
48279 - ops->priv_size = sizeof(struct macvlan_dev);
48280 - ops->validate = macvlan_validate;
48281 - ops->maxtype = IFLA_MACVLAN_MAX;
48282 - ops->policy = macvlan_policy;
48283 - ops->changelink = macvlan_changelink;
48284 - ops->get_size = macvlan_get_size;
48285 - ops->fill_info = macvlan_fill_info;
48286 + pax_open_kernel();
48287 + *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48288 + *(void **)&ops->validate = macvlan_validate;
48289 + *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48290 + *(const void **)&ops->policy = macvlan_policy;
48291 + *(void **)&ops->changelink = macvlan_changelink;
48292 + *(void **)&ops->get_size = macvlan_get_size;
48293 + *(void **)&ops->fill_info = macvlan_fill_info;
48294 + pax_close_kernel();
48295
48296 return rtnl_link_register(ops);
48297 };
48298 @@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48299 return NOTIFY_DONE;
48300 }
48301
48302 -static struct notifier_block macvlan_notifier_block __read_mostly = {
48303 +static struct notifier_block macvlan_notifier_block = {
48304 .notifier_call = macvlan_device_event,
48305 };
48306
48307 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48308 index 880cc09..6a68ba6 100644
48309 --- a/drivers/net/macvtap.c
48310 +++ b/drivers/net/macvtap.c
48311 @@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
48312 dev->tx_queue_len = TUN_READQ_SIZE;
48313 }
48314
48315 -static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48316 +static struct rtnl_link_ops macvtap_link_ops = {
48317 .kind = "macvtap",
48318 .setup = macvtap_setup,
48319 .newlink = macvtap_newlink,
48320 @@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48321 }
48322
48323 ret = 0;
48324 - if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48325 + if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48326 put_user(q->flags, &ifr->ifr_flags))
48327 ret = -EFAULT;
48328 macvtap_put_vlan(vlan);
48329 @@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48330 return NOTIFY_DONE;
48331 }
48332
48333 -static struct notifier_block macvtap_notifier_block __read_mostly = {
48334 +static struct notifier_block macvtap_notifier_block = {
48335 .notifier_call = macvtap_device_event,
48336 };
48337
48338 diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48339 index 34924df..a747360 100644
48340 --- a/drivers/net/nlmon.c
48341 +++ b/drivers/net/nlmon.c
48342 @@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48343 return 0;
48344 }
48345
48346 -static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48347 +static struct rtnl_link_ops nlmon_link_ops = {
48348 .kind = "nlmon",
48349 .priv_size = sizeof(struct nlmon),
48350 .setup = nlmon_setup,
48351 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48352 index 794a473..9fd437b 100644
48353 --- a/drivers/net/ppp/ppp_generic.c
48354 +++ b/drivers/net/ppp/ppp_generic.c
48355 @@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48356 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48357 struct ppp_stats stats;
48358 struct ppp_comp_stats cstats;
48359 - char *vers;
48360
48361 switch (cmd) {
48362 case SIOCGPPPSTATS:
48363 @@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48364 break;
48365
48366 case SIOCGPPPVER:
48367 - vers = PPP_VERSION;
48368 - if (copy_to_user(addr, vers, strlen(vers) + 1))
48369 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48370 break;
48371 err = 0;
48372 break;
48373 diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48374 index 079f7ad..b2a2bfa7 100644
48375 --- a/drivers/net/slip/slhc.c
48376 +++ b/drivers/net/slip/slhc.c
48377 @@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48378 register struct tcphdr *thp;
48379 register struct iphdr *ip;
48380 register struct cstate *cs;
48381 - int len, hdrlen;
48382 + long len, hdrlen;
48383 unsigned char *cp = icp;
48384
48385 /* We've got a compressed packet; read the change byte */
48386 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48387 index 2368395..bf6fe96 100644
48388 --- a/drivers/net/team/team.c
48389 +++ b/drivers/net/team/team.c
48390 @@ -2090,7 +2090,7 @@ static unsigned int team_get_num_rx_queues(void)
48391 return TEAM_DEFAULT_NUM_RX_QUEUES;
48392 }
48393
48394 -static struct rtnl_link_ops team_link_ops __read_mostly = {
48395 +static struct rtnl_link_ops team_link_ops = {
48396 .kind = DRV_NAME,
48397 .priv_size = sizeof(struct team),
48398 .setup = team_setup,
48399 @@ -2880,7 +2880,7 @@ static int team_device_event(struct notifier_block *unused,
48400 return NOTIFY_DONE;
48401 }
48402
48403 -static struct notifier_block team_notifier_block __read_mostly = {
48404 +static struct notifier_block team_notifier_block = {
48405 .notifier_call = team_device_event,
48406 };
48407
48408 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48409 index 9dd3746..74f191e 100644
48410 --- a/drivers/net/tun.c
48411 +++ b/drivers/net/tun.c
48412 @@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48413 return -EINVAL;
48414 }
48415
48416 -static struct rtnl_link_ops tun_link_ops __read_mostly = {
48417 +static struct rtnl_link_ops tun_link_ops = {
48418 .kind = DRV_NAME,
48419 .priv_size = sizeof(struct tun_struct),
48420 .setup = tun_setup,
48421 @@ -1868,7 +1868,7 @@ unlock:
48422 }
48423
48424 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48425 - unsigned long arg, int ifreq_len)
48426 + unsigned long arg, size_t ifreq_len)
48427 {
48428 struct tun_file *tfile = file->private_data;
48429 struct tun_struct *tun;
48430 @@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48431 unsigned int ifindex;
48432 int ret;
48433
48434 + if (ifreq_len > sizeof ifr)
48435 + return -EFAULT;
48436 +
48437 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48438 if (copy_from_user(&ifr, argp, ifreq_len))
48439 return -EFAULT;
48440 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48441 index babda7d..e40c90a 100644
48442 --- a/drivers/net/usb/hso.c
48443 +++ b/drivers/net/usb/hso.c
48444 @@ -71,7 +71,7 @@
48445 #include <asm/byteorder.h>
48446 #include <linux/serial_core.h>
48447 #include <linux/serial.h>
48448 -
48449 +#include <asm/local.h>
48450
48451 #define MOD_AUTHOR "Option Wireless"
48452 #define MOD_DESCRIPTION "USB High Speed Option driver"
48453 @@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48454 struct urb *urb;
48455
48456 urb = serial->rx_urb[0];
48457 - if (serial->port.count > 0) {
48458 + if (atomic_read(&serial->port.count) > 0) {
48459 count = put_rxbuf_data(urb, serial);
48460 if (count == -1)
48461 return;
48462 @@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48463 DUMP1(urb->transfer_buffer, urb->actual_length);
48464
48465 /* Anyone listening? */
48466 - if (serial->port.count == 0)
48467 + if (atomic_read(&serial->port.count) == 0)
48468 return;
48469
48470 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48471 @@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48472 tty_port_tty_set(&serial->port, tty);
48473
48474 /* check for port already opened, if not set the termios */
48475 - serial->port.count++;
48476 - if (serial->port.count == 1) {
48477 + if (atomic_inc_return(&serial->port.count) == 1) {
48478 serial->rx_state = RX_IDLE;
48479 /* Force default termio settings */
48480 _hso_serial_set_termios(tty, NULL);
48481 @@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48482 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48483 if (result) {
48484 hso_stop_serial_device(serial->parent);
48485 - serial->port.count--;
48486 + atomic_dec(&serial->port.count);
48487 kref_put(&serial->parent->ref, hso_serial_ref_free);
48488 }
48489 } else {
48490 @@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48491
48492 /* reset the rts and dtr */
48493 /* do the actual close */
48494 - serial->port.count--;
48495 + atomic_dec(&serial->port.count);
48496
48497 - if (serial->port.count <= 0) {
48498 - serial->port.count = 0;
48499 + if (atomic_read(&serial->port.count) <= 0) {
48500 + atomic_set(&serial->port.count, 0);
48501 tty_port_tty_set(&serial->port, NULL);
48502 if (!usb_gone)
48503 hso_stop_serial_device(serial->parent);
48504 @@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48505
48506 /* the actual setup */
48507 spin_lock_irqsave(&serial->serial_lock, flags);
48508 - if (serial->port.count)
48509 + if (atomic_read(&serial->port.count))
48510 _hso_serial_set_termios(tty, old);
48511 else
48512 tty->termios = *old;
48513 @@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48514 D1("Pending read interrupt on port %d\n", i);
48515 spin_lock(&serial->serial_lock);
48516 if (serial->rx_state == RX_IDLE &&
48517 - serial->port.count > 0) {
48518 + atomic_read(&serial->port.count) > 0) {
48519 /* Setup and send a ctrl req read on
48520 * port i */
48521 if (!serial->rx_urb_filled[0]) {
48522 @@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
48523 /* Start all serial ports */
48524 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48525 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48526 - if (dev2ser(serial_table[i])->port.count) {
48527 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48528 result =
48529 hso_start_serial_device(serial_table[i], GFP_NOIO);
48530 hso_kick_transmit(dev2ser(serial_table[i]));
48531 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48532 index c6554c7..7e2ebd7 100644
48533 --- a/drivers/net/usb/r8152.c
48534 +++ b/drivers/net/usb/r8152.c
48535 @@ -577,7 +577,7 @@ struct r8152 {
48536 void (*unload)(struct r8152 *);
48537 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48538 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48539 - } rtl_ops;
48540 + } __no_const rtl_ops;
48541
48542 int intr_interval;
48543 u32 saved_wolopts;
48544 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48545 index a2515887..6d13233 100644
48546 --- a/drivers/net/usb/sierra_net.c
48547 +++ b/drivers/net/usb/sierra_net.c
48548 @@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48549 /* atomic counter partially included in MAC address to make sure 2 devices
48550 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48551 */
48552 -static atomic_t iface_counter = ATOMIC_INIT(0);
48553 +static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48554
48555 /*
48556 * SYNC Timer Delay definition used to set the expiry time
48557 @@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48558 dev->net->netdev_ops = &sierra_net_device_ops;
48559
48560 /* change MAC addr to include, ifacenum, and to be unique */
48561 - dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48562 + dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48563 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48564
48565 /* we will have to manufacture ethernet headers, prepare template */
48566 diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48567 index b0bc8ea..3af931b5 100644
48568 --- a/drivers/net/virtio_net.c
48569 +++ b/drivers/net/virtio_net.c
48570 @@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48571 #define RECEIVE_AVG_WEIGHT 64
48572
48573 /* Minimum alignment for mergeable packet buffers. */
48574 -#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48575 +#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48576
48577 #define VIRTNET_DRIVER_VERSION "1.0.0"
48578
48579 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48580 index 42b2d6a5..2a2cb41 100644
48581 --- a/drivers/net/vxlan.c
48582 +++ b/drivers/net/vxlan.c
48583 @@ -2695,7 +2695,7 @@ nla_put_failure:
48584 return -EMSGSIZE;
48585 }
48586
48587 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48588 +static struct rtnl_link_ops vxlan_link_ops = {
48589 .kind = "vxlan",
48590 .maxtype = IFLA_VXLAN_MAX,
48591 .policy = vxlan_policy,
48592 @@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48593 return NOTIFY_DONE;
48594 }
48595
48596 -static struct notifier_block vxlan_notifier_block __read_mostly = {
48597 +static struct notifier_block vxlan_notifier_block = {
48598 .notifier_call = vxlan_lowerdev_event,
48599 };
48600
48601 diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48602 index 5920c99..ff2e4a5 100644
48603 --- a/drivers/net/wan/lmc/lmc_media.c
48604 +++ b/drivers/net/wan/lmc/lmc_media.c
48605 @@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48606 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48607
48608 lmc_media_t lmc_ds3_media = {
48609 - lmc_ds3_init, /* special media init stuff */
48610 - lmc_ds3_default, /* reset to default state */
48611 - lmc_ds3_set_status, /* reset status to state provided */
48612 - lmc_dummy_set_1, /* set clock source */
48613 - lmc_dummy_set2_1, /* set line speed */
48614 - lmc_ds3_set_100ft, /* set cable length */
48615 - lmc_ds3_set_scram, /* set scrambler */
48616 - lmc_ds3_get_link_status, /* get link status */
48617 - lmc_dummy_set_1, /* set link status */
48618 - lmc_ds3_set_crc_length, /* set CRC length */
48619 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48620 - lmc_ds3_watchdog
48621 + .init = lmc_ds3_init, /* special media init stuff */
48622 + .defaults = lmc_ds3_default, /* reset to default state */
48623 + .set_status = lmc_ds3_set_status, /* reset status to state provided */
48624 + .set_clock_source = lmc_dummy_set_1, /* set clock source */
48625 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48626 + .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48627 + .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48628 + .get_link_status = lmc_ds3_get_link_status, /* get link status */
48629 + .set_link_status = lmc_dummy_set_1, /* set link status */
48630 + .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48631 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48632 + .watchdog = lmc_ds3_watchdog
48633 };
48634
48635 lmc_media_t lmc_hssi_media = {
48636 - lmc_hssi_init, /* special media init stuff */
48637 - lmc_hssi_default, /* reset to default state */
48638 - lmc_hssi_set_status, /* reset status to state provided */
48639 - lmc_hssi_set_clock, /* set clock source */
48640 - lmc_dummy_set2_1, /* set line speed */
48641 - lmc_dummy_set_1, /* set cable length */
48642 - lmc_dummy_set_1, /* set scrambler */
48643 - lmc_hssi_get_link_status, /* get link status */
48644 - lmc_hssi_set_link_status, /* set link status */
48645 - lmc_hssi_set_crc_length, /* set CRC length */
48646 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48647 - lmc_hssi_watchdog
48648 + .init = lmc_hssi_init, /* special media init stuff */
48649 + .defaults = lmc_hssi_default, /* reset to default state */
48650 + .set_status = lmc_hssi_set_status, /* reset status to state provided */
48651 + .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48652 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48653 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48654 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48655 + .get_link_status = lmc_hssi_get_link_status, /* get link status */
48656 + .set_link_status = lmc_hssi_set_link_status, /* set link status */
48657 + .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48658 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48659 + .watchdog = lmc_hssi_watchdog
48660 };
48661
48662 -lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48663 - lmc_ssi_default, /* reset to default state */
48664 - lmc_ssi_set_status, /* reset status to state provided */
48665 - lmc_ssi_set_clock, /* set clock source */
48666 - lmc_ssi_set_speed, /* set line speed */
48667 - lmc_dummy_set_1, /* set cable length */
48668 - lmc_dummy_set_1, /* set scrambler */
48669 - lmc_ssi_get_link_status, /* get link status */
48670 - lmc_ssi_set_link_status, /* set link status */
48671 - lmc_ssi_set_crc_length, /* set CRC length */
48672 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48673 - lmc_ssi_watchdog
48674 +lmc_media_t lmc_ssi_media = {
48675 + .init = lmc_ssi_init, /* special media init stuff */
48676 + .defaults = lmc_ssi_default, /* reset to default state */
48677 + .set_status = lmc_ssi_set_status, /* reset status to state provided */
48678 + .set_clock_source = lmc_ssi_set_clock, /* set clock source */
48679 + .set_speed = lmc_ssi_set_speed, /* set line speed */
48680 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48681 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48682 + .get_link_status = lmc_ssi_get_link_status, /* get link status */
48683 + .set_link_status = lmc_ssi_set_link_status, /* set link status */
48684 + .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
48685 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48686 + .watchdog = lmc_ssi_watchdog
48687 };
48688
48689 lmc_media_t lmc_t1_media = {
48690 - lmc_t1_init, /* special media init stuff */
48691 - lmc_t1_default, /* reset to default state */
48692 - lmc_t1_set_status, /* reset status to state provided */
48693 - lmc_t1_set_clock, /* set clock source */
48694 - lmc_dummy_set2_1, /* set line speed */
48695 - lmc_dummy_set_1, /* set cable length */
48696 - lmc_dummy_set_1, /* set scrambler */
48697 - lmc_t1_get_link_status, /* get link status */
48698 - lmc_dummy_set_1, /* set link status */
48699 - lmc_t1_set_crc_length, /* set CRC length */
48700 - lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48701 - lmc_t1_watchdog
48702 + .init = lmc_t1_init, /* special media init stuff */
48703 + .defaults = lmc_t1_default, /* reset to default state */
48704 + .set_status = lmc_t1_set_status, /* reset status to state provided */
48705 + .set_clock_source = lmc_t1_set_clock, /* set clock source */
48706 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48707 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48708 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48709 + .get_link_status = lmc_t1_get_link_status, /* get link status */
48710 + .set_link_status = lmc_dummy_set_1, /* set link status */
48711 + .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
48712 + .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48713 + .watchdog = lmc_t1_watchdog
48714 };
48715
48716 static void
48717 diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
48718 index feacc3b..5bac0de 100644
48719 --- a/drivers/net/wan/z85230.c
48720 +++ b/drivers/net/wan/z85230.c
48721 @@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
48722
48723 struct z8530_irqhandler z8530_sync =
48724 {
48725 - z8530_rx,
48726 - z8530_tx,
48727 - z8530_status
48728 + .rx = z8530_rx,
48729 + .tx = z8530_tx,
48730 + .status = z8530_status
48731 };
48732
48733 EXPORT_SYMBOL(z8530_sync);
48734 @@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
48735 }
48736
48737 static struct z8530_irqhandler z8530_dma_sync = {
48738 - z8530_dma_rx,
48739 - z8530_dma_tx,
48740 - z8530_dma_status
48741 + .rx = z8530_dma_rx,
48742 + .tx = z8530_dma_tx,
48743 + .status = z8530_dma_status
48744 };
48745
48746 static struct z8530_irqhandler z8530_txdma_sync = {
48747 - z8530_rx,
48748 - z8530_dma_tx,
48749 - z8530_dma_status
48750 + .rx = z8530_rx,
48751 + .tx = z8530_dma_tx,
48752 + .status = z8530_dma_status
48753 };
48754
48755 /**
48756 @@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
48757
48758 struct z8530_irqhandler z8530_nop=
48759 {
48760 - z8530_rx_clear,
48761 - z8530_tx_clear,
48762 - z8530_status_clear
48763 + .rx = z8530_rx_clear,
48764 + .tx = z8530_tx_clear,
48765 + .status = z8530_status_clear
48766 };
48767
48768
48769 diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
48770 index 0b60295..b8bfa5b 100644
48771 --- a/drivers/net/wimax/i2400m/rx.c
48772 +++ b/drivers/net/wimax/i2400m/rx.c
48773 @@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
48774 if (i2400m->rx_roq == NULL)
48775 goto error_roq_alloc;
48776
48777 - rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
48778 + rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
48779 GFP_KERNEL);
48780 if (rd == NULL) {
48781 result = -ENOMEM;
48782 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
48783 index e71a2ce..2268d61 100644
48784 --- a/drivers/net/wireless/airo.c
48785 +++ b/drivers/net/wireless/airo.c
48786 @@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
48787 struct airo_info *ai = dev->ml_priv;
48788 int ridcode;
48789 int enabled;
48790 - static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48791 + int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48792 unsigned char *iobuf;
48793
48794 /* Only super-user can write RIDs */
48795 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
48796 index da92bfa..5a9001a 100644
48797 --- a/drivers/net/wireless/at76c50x-usb.c
48798 +++ b/drivers/net/wireless/at76c50x-usb.c
48799 @@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
48800 }
48801
48802 /* Convert timeout from the DFU status to jiffies */
48803 -static inline unsigned long at76_get_timeout(struct dfu_status *s)
48804 +static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
48805 {
48806 return msecs_to_jiffies((s->poll_timeout[2] << 16)
48807 | (s->poll_timeout[1] << 8)
48808 diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
48809 index 676bd4e..0b807a3 100644
48810 --- a/drivers/net/wireless/ath/ath10k/htc.c
48811 +++ b/drivers/net/wireless/ath/ath10k/htc.c
48812 @@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
48813 /* registered target arrival callback from the HIF layer */
48814 int ath10k_htc_init(struct ath10k *ar)
48815 {
48816 - struct ath10k_hif_cb htc_callbacks;
48817 + static struct ath10k_hif_cb htc_callbacks = {
48818 + .rx_completion = ath10k_htc_rx_completion_handler,
48819 + .tx_completion = ath10k_htc_tx_completion_handler,
48820 + };
48821 struct ath10k_htc_ep *ep = NULL;
48822 struct ath10k_htc *htc = &ar->htc;
48823
48824 @@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
48825 ath10k_htc_reset_endpoint_states(htc);
48826
48827 /* setup HIF layer callbacks */
48828 - htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
48829 - htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
48830 htc->ar = ar;
48831
48832 /* Get HIF default pipe for HTC message exchange */
48833 diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
48834 index 527179c..a890150 100644
48835 --- a/drivers/net/wireless/ath/ath10k/htc.h
48836 +++ b/drivers/net/wireless/ath/ath10k/htc.h
48837 @@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
48838
48839 struct ath10k_htc_ops {
48840 void (*target_send_suspend_complete)(struct ath10k *ar);
48841 -};
48842 +} __no_const;
48843
48844 struct ath10k_htc_ep_ops {
48845 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
48846 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
48847 void (*ep_tx_credits)(struct ath10k *);
48848 -};
48849 +} __no_const;
48850
48851 /* service connection information */
48852 struct ath10k_htc_svc_conn_req {
48853 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48854 index 2a93519..7052786 100644
48855 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48856 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48857 @@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48858 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
48859 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
48860
48861 - ACCESS_ONCE(ads->ds_link) = i->link;
48862 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
48863 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
48864 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
48865
48866 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
48867 ctl6 = SM(i->keytype, AR_EncrType);
48868 @@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48869
48870 if ((i->is_first || i->is_last) &&
48871 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
48872 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
48873 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
48874 | set11nTries(i->rates, 1)
48875 | set11nTries(i->rates, 2)
48876 | set11nTries(i->rates, 3)
48877 | (i->dur_update ? AR_DurUpdateEna : 0)
48878 | SM(0, AR_BurstDur);
48879
48880 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
48881 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
48882 | set11nRate(i->rates, 1)
48883 | set11nRate(i->rates, 2)
48884 | set11nRate(i->rates, 3);
48885 } else {
48886 - ACCESS_ONCE(ads->ds_ctl2) = 0;
48887 - ACCESS_ONCE(ads->ds_ctl3) = 0;
48888 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
48889 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
48890 }
48891
48892 if (!i->is_first) {
48893 - ACCESS_ONCE(ads->ds_ctl0) = 0;
48894 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48895 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48896 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
48897 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48898 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48899 return;
48900 }
48901
48902 @@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48903 break;
48904 }
48905
48906 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48907 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48908 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
48909 | SM(i->txpower, AR_XmitPower0)
48910 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
48911 @@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48912 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
48913 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
48914
48915 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48916 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48917 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48918 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48919
48920 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
48921 return;
48922
48923 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48924 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48925 | set11nPktDurRTSCTS(i->rates, 1);
48926
48927 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48928 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48929 | set11nPktDurRTSCTS(i->rates, 3);
48930
48931 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
48932 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
48933 | set11nRateFlags(i->rates, 1)
48934 | set11nRateFlags(i->rates, 2)
48935 | set11nRateFlags(i->rates, 3)
48936 | SM(i->rtscts_rate, AR_RTSCTSRate);
48937
48938 - ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
48939 - ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
48940 - ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
48941 + ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
48942 + ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
48943 + ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
48944 }
48945
48946 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
48947 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48948 index 057b165..98ae88f 100644
48949 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48950 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48951 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48952 (i->qcu << AR_TxQcuNum_S) | desc_len;
48953
48954 checksum += val;
48955 - ACCESS_ONCE(ads->info) = val;
48956 + ACCESS_ONCE_RW(ads->info) = val;
48957
48958 checksum += i->link;
48959 - ACCESS_ONCE(ads->link) = i->link;
48960 + ACCESS_ONCE_RW(ads->link) = i->link;
48961
48962 checksum += i->buf_addr[0];
48963 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
48964 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
48965 checksum += i->buf_addr[1];
48966 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
48967 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
48968 checksum += i->buf_addr[2];
48969 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
48970 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
48971 checksum += i->buf_addr[3];
48972 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
48973 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
48974
48975 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
48976 - ACCESS_ONCE(ads->ctl3) = val;
48977 + ACCESS_ONCE_RW(ads->ctl3) = val;
48978 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
48979 - ACCESS_ONCE(ads->ctl5) = val;
48980 + ACCESS_ONCE_RW(ads->ctl5) = val;
48981 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
48982 - ACCESS_ONCE(ads->ctl7) = val;
48983 + ACCESS_ONCE_RW(ads->ctl7) = val;
48984 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
48985 - ACCESS_ONCE(ads->ctl9) = val;
48986 + ACCESS_ONCE_RW(ads->ctl9) = val;
48987
48988 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
48989 - ACCESS_ONCE(ads->ctl10) = checksum;
48990 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
48991
48992 if (i->is_first || i->is_last) {
48993 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
48994 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
48995 | set11nTries(i->rates, 1)
48996 | set11nTries(i->rates, 2)
48997 | set11nTries(i->rates, 3)
48998 | (i->dur_update ? AR_DurUpdateEna : 0)
48999 | SM(0, AR_BurstDur);
49000
49001 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49002 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49003 | set11nRate(i->rates, 1)
49004 | set11nRate(i->rates, 2)
49005 | set11nRate(i->rates, 3);
49006 } else {
49007 - ACCESS_ONCE(ads->ctl13) = 0;
49008 - ACCESS_ONCE(ads->ctl14) = 0;
49009 + ACCESS_ONCE_RW(ads->ctl13) = 0;
49010 + ACCESS_ONCE_RW(ads->ctl14) = 0;
49011 }
49012
49013 ads->ctl20 = 0;
49014 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49015
49016 ctl17 = SM(i->keytype, AR_EncrType);
49017 if (!i->is_first) {
49018 - ACCESS_ONCE(ads->ctl11) = 0;
49019 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49020 - ACCESS_ONCE(ads->ctl15) = 0;
49021 - ACCESS_ONCE(ads->ctl16) = 0;
49022 - ACCESS_ONCE(ads->ctl17) = ctl17;
49023 - ACCESS_ONCE(ads->ctl18) = 0;
49024 - ACCESS_ONCE(ads->ctl19) = 0;
49025 + ACCESS_ONCE_RW(ads->ctl11) = 0;
49026 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49027 + ACCESS_ONCE_RW(ads->ctl15) = 0;
49028 + ACCESS_ONCE_RW(ads->ctl16) = 0;
49029 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49030 + ACCESS_ONCE_RW(ads->ctl18) = 0;
49031 + ACCESS_ONCE_RW(ads->ctl19) = 0;
49032 return;
49033 }
49034
49035 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49036 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49037 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49038 | SM(i->txpower, AR_XmitPower0)
49039 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49040 @@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49041 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49042 ctl12 |= SM(val, AR_PAPRDChainMask);
49043
49044 - ACCESS_ONCE(ads->ctl12) = ctl12;
49045 - ACCESS_ONCE(ads->ctl17) = ctl17;
49046 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49047 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49048
49049 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49050 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49051 | set11nPktDurRTSCTS(i->rates, 1);
49052
49053 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49054 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49055 | set11nPktDurRTSCTS(i->rates, 3);
49056
49057 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49058 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49059 | set11nRateFlags(i->rates, 1)
49060 | set11nRateFlags(i->rates, 2)
49061 | set11nRateFlags(i->rates, 3)
49062 | SM(i->rtscts_rate, AR_RTSCTSRate);
49063
49064 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49065 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49066
49067 - ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49068 - ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49069 - ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49070 + ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49071 + ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49072 + ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49073 }
49074
49075 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49076 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49077 index 975074f..e9440da 100644
49078 --- a/drivers/net/wireless/ath/ath9k/hw.h
49079 +++ b/drivers/net/wireless/ath/ath9k/hw.h
49080 @@ -630,7 +630,7 @@ struct ath_hw_private_ops {
49081
49082 /* ANI */
49083 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49084 -};
49085 +} __no_const;
49086
49087 /**
49088 * struct ath_spec_scan - parameters for Atheros spectral scan
49089 @@ -708,7 +708,7 @@ struct ath_hw_ops {
49090 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49091 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49092 #endif
49093 -};
49094 +} __no_const;
49095
49096 struct ath_nf_limits {
49097 s16 max;
49098 diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49099 index 4f18a6b..b07d92f 100644
49100 --- a/drivers/net/wireless/ath/ath9k/main.c
49101 +++ b/drivers/net/wireless/ath/ath9k/main.c
49102 @@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
49103 if (!ath9k_is_chanctx_enabled())
49104 return;
49105
49106 - ath9k_ops.hw_scan = ath9k_hw_scan;
49107 - ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49108 - ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49109 - ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49110 - ath9k_ops.add_chanctx = ath9k_add_chanctx;
49111 - ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49112 - ath9k_ops.change_chanctx = ath9k_change_chanctx;
49113 - ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49114 - ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49115 - ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49116 + pax_open_kernel();
49117 + *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49118 + *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49119 + *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49120 + *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49121 + *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49122 + *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49123 + *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49124 + *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49125 + *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49126 + *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49127 + pax_close_kernel();
49128 }
49129
49130 #endif
49131 diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49132 index 058a9f2..d5cb1ba 100644
49133 --- a/drivers/net/wireless/b43/phy_lp.c
49134 +++ b/drivers/net/wireless/b43/phy_lp.c
49135 @@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49136 {
49137 struct ssb_bus *bus = dev->dev->sdev->bus;
49138
49139 - static const struct b206x_channel *chandata = NULL;
49140 + const struct b206x_channel *chandata = NULL;
49141 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49142 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49143 u16 old_comm15, scale;
49144 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49145 index dc1d20c..f7a4f06 100644
49146 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
49147 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49148 @@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49149 */
49150 if (il3945_mod_params.disable_hw_scan) {
49151 D_INFO("Disabling hw_scan\n");
49152 - il3945_mac_ops.hw_scan = NULL;
49153 + pax_open_kernel();
49154 + *(void **)&il3945_mac_ops.hw_scan = NULL;
49155 + pax_close_kernel();
49156 }
49157
49158 D_INFO("*** LOAD DRIVER ***\n");
49159 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49160 index 0ffb6ff..c0b7f0e 100644
49161 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49162 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49163 @@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49164 {
49165 struct iwl_priv *priv = file->private_data;
49166 char buf[64];
49167 - int buf_size;
49168 + size_t buf_size;
49169 u32 offset, len;
49170
49171 memset(buf, 0, sizeof(buf));
49172 @@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49173 struct iwl_priv *priv = file->private_data;
49174
49175 char buf[8];
49176 - int buf_size;
49177 + size_t buf_size;
49178 u32 reset_flag;
49179
49180 memset(buf, 0, sizeof(buf));
49181 @@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49182 {
49183 struct iwl_priv *priv = file->private_data;
49184 char buf[8];
49185 - int buf_size;
49186 + size_t buf_size;
49187 int ht40;
49188
49189 memset(buf, 0, sizeof(buf));
49190 @@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49191 {
49192 struct iwl_priv *priv = file->private_data;
49193 char buf[8];
49194 - int buf_size;
49195 + size_t buf_size;
49196 int value;
49197
49198 memset(buf, 0, sizeof(buf));
49199 @@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49200 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49201 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49202
49203 -static const char *fmt_value = " %-30s %10u\n";
49204 -static const char *fmt_hex = " %-30s 0x%02X\n";
49205 -static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49206 -static const char *fmt_header =
49207 +static const char fmt_value[] = " %-30s %10u\n";
49208 +static const char fmt_hex[] = " %-30s 0x%02X\n";
49209 +static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49210 +static const char fmt_header[] =
49211 "%-32s current cumulative delta max\n";
49212
49213 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49214 @@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49215 {
49216 struct iwl_priv *priv = file->private_data;
49217 char buf[8];
49218 - int buf_size;
49219 + size_t buf_size;
49220 int clear;
49221
49222 memset(buf, 0, sizeof(buf));
49223 @@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49224 {
49225 struct iwl_priv *priv = file->private_data;
49226 char buf[8];
49227 - int buf_size;
49228 + size_t buf_size;
49229 int trace;
49230
49231 memset(buf, 0, sizeof(buf));
49232 @@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49233 {
49234 struct iwl_priv *priv = file->private_data;
49235 char buf[8];
49236 - int buf_size;
49237 + size_t buf_size;
49238 int missed;
49239
49240 memset(buf, 0, sizeof(buf));
49241 @@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49242
49243 struct iwl_priv *priv = file->private_data;
49244 char buf[8];
49245 - int buf_size;
49246 + size_t buf_size;
49247 int plcp;
49248
49249 memset(buf, 0, sizeof(buf));
49250 @@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49251
49252 struct iwl_priv *priv = file->private_data;
49253 char buf[8];
49254 - int buf_size;
49255 + size_t buf_size;
49256 int flush;
49257
49258 memset(buf, 0, sizeof(buf));
49259 @@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49260
49261 struct iwl_priv *priv = file->private_data;
49262 char buf[8];
49263 - int buf_size;
49264 + size_t buf_size;
49265 int rts;
49266
49267 if (!priv->cfg->ht_params)
49268 @@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49269 {
49270 struct iwl_priv *priv = file->private_data;
49271 char buf[8];
49272 - int buf_size;
49273 + size_t buf_size;
49274
49275 memset(buf, 0, sizeof(buf));
49276 buf_size = min(count, sizeof(buf) - 1);
49277 @@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49278 struct iwl_priv *priv = file->private_data;
49279 u32 event_log_flag;
49280 char buf[8];
49281 - int buf_size;
49282 + size_t buf_size;
49283
49284 /* check that the interface is up */
49285 if (!iwl_is_ready(priv))
49286 @@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49287 struct iwl_priv *priv = file->private_data;
49288 char buf[8];
49289 u32 calib_disabled;
49290 - int buf_size;
49291 + size_t buf_size;
49292
49293 memset(buf, 0, sizeof(buf));
49294 buf_size = min(count, sizeof(buf) - 1);
49295 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49296 index dd2f3f8..fb1ae88 100644
49297 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49298 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49299 @@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49300 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49301
49302 char buf[8];
49303 - int buf_size;
49304 + size_t buf_size;
49305 u32 reset_flag;
49306
49307 memset(buf, 0, sizeof(buf));
49308 @@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49309 {
49310 struct iwl_trans *trans = file->private_data;
49311 char buf[8];
49312 - int buf_size;
49313 + size_t buf_size;
49314 int csr;
49315
49316 memset(buf, 0, sizeof(buf));
49317 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49318 index c9ad4cf..49a2fa0 100644
49319 --- a/drivers/net/wireless/mac80211_hwsim.c
49320 +++ b/drivers/net/wireless/mac80211_hwsim.c
49321 @@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
49322 if (channels < 1)
49323 return -EINVAL;
49324
49325 - mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49326 - mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49327 - mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49328 - mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49329 - mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49330 - mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49331 - mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49332 - mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49333 - mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49334 - mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49335 - mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49336 - mac80211_hwsim_assign_vif_chanctx;
49337 - mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49338 - mac80211_hwsim_unassign_vif_chanctx;
49339 + pax_open_kernel();
49340 + memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49341 + *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49342 + *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49343 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49344 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49345 + *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49346 + *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49347 + *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49348 + *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49349 + *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49350 + *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49351 + *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49352 + pax_close_kernel();
49353
49354 spin_lock_init(&hwsim_radio_lock);
49355 INIT_LIST_HEAD(&hwsim_radios);
49356 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49357 index 1a4facd..a2ecbbd 100644
49358 --- a/drivers/net/wireless/rndis_wlan.c
49359 +++ b/drivers/net/wireless/rndis_wlan.c
49360 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49361
49362 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49363
49364 - if (rts_threshold < 0 || rts_threshold > 2347)
49365 + if (rts_threshold > 2347)
49366 rts_threshold = 2347;
49367
49368 tmp = cpu_to_le32(rts_threshold);
49369 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49370 index d13f25c..2573994 100644
49371 --- a/drivers/net/wireless/rt2x00/rt2x00.h
49372 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
49373 @@ -375,7 +375,7 @@ struct rt2x00_intf {
49374 * for hardware which doesn't support hardware
49375 * sequence counting.
49376 */
49377 - atomic_t seqno;
49378 + atomic_unchecked_t seqno;
49379 };
49380
49381 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49382 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49383 index 66ff364..3ce34f7 100644
49384 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49385 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49386 @@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49387 * sequence counter given by mac80211.
49388 */
49389 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49390 - seqno = atomic_add_return(0x10, &intf->seqno);
49391 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49392 else
49393 - seqno = atomic_read(&intf->seqno);
49394 + seqno = atomic_read_unchecked(&intf->seqno);
49395
49396 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49397 hdr->seq_ctrl |= cpu_to_le16(seqno);
49398 diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49399 index b661f896..ddf7d2b 100644
49400 --- a/drivers/net/wireless/ti/wl1251/sdio.c
49401 +++ b/drivers/net/wireless/ti/wl1251/sdio.c
49402 @@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49403
49404 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49405
49406 - wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49407 - wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49408 + pax_open_kernel();
49409 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49410 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49411 + pax_close_kernel();
49412
49413 wl1251_info("using dedicated interrupt line");
49414 } else {
49415 - wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49416 - wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49417 + pax_open_kernel();
49418 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49419 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49420 + pax_close_kernel();
49421
49422 wl1251_info("using SDIO interrupt");
49423 }
49424 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49425 index 0bccf12..3d95068 100644
49426 --- a/drivers/net/wireless/ti/wl12xx/main.c
49427 +++ b/drivers/net/wireless/ti/wl12xx/main.c
49428 @@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49429 sizeof(wl->conf.mem));
49430
49431 /* read data preparation is only needed by wl127x */
49432 - wl->ops->prepare_read = wl127x_prepare_read;
49433 + pax_open_kernel();
49434 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49435 + pax_close_kernel();
49436
49437 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49438 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49439 @@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49440 sizeof(wl->conf.mem));
49441
49442 /* read data preparation is only needed by wl127x */
49443 - wl->ops->prepare_read = wl127x_prepare_read;
49444 + pax_open_kernel();
49445 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49446 + pax_close_kernel();
49447
49448 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49449 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49450 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49451 index 7af1936..128bb35 100644
49452 --- a/drivers/net/wireless/ti/wl18xx/main.c
49453 +++ b/drivers/net/wireless/ti/wl18xx/main.c
49454 @@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49455 }
49456
49457 if (!checksum_param) {
49458 - wl18xx_ops.set_rx_csum = NULL;
49459 - wl18xx_ops.init_vif = NULL;
49460 + pax_open_kernel();
49461 + *(void **)&wl18xx_ops.set_rx_csum = NULL;
49462 + *(void **)&wl18xx_ops.init_vif = NULL;
49463 + pax_close_kernel();
49464 }
49465
49466 /* Enable 11a Band only if we have 5G antennas */
49467 diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49468 index a912dc0..a8225ba 100644
49469 --- a/drivers/net/wireless/zd1211rw/zd_usb.c
49470 +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49471 @@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49472 {
49473 struct zd_usb *usb = urb->context;
49474 struct zd_usb_interrupt *intr = &usb->intr;
49475 - int len;
49476 + unsigned int len;
49477 u16 int_num;
49478
49479 ZD_ASSERT(in_interrupt());
49480 diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49481 index 683671a..4519fc2 100644
49482 --- a/drivers/nfc/nfcwilink.c
49483 +++ b/drivers/nfc/nfcwilink.c
49484 @@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49485
49486 static int nfcwilink_probe(struct platform_device *pdev)
49487 {
49488 - static struct nfcwilink *drv;
49489 + struct nfcwilink *drv;
49490 int rc;
49491 __u32 protocols;
49492
49493 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49494 index d93b2b6..ae50401 100644
49495 --- a/drivers/oprofile/buffer_sync.c
49496 +++ b/drivers/oprofile/buffer_sync.c
49497 @@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49498 if (cookie == NO_COOKIE)
49499 offset = pc;
49500 if (cookie == INVALID_COOKIE) {
49501 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49502 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49503 offset = pc;
49504 }
49505 if (cookie != last_cookie) {
49506 @@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49507 /* add userspace sample */
49508
49509 if (!mm) {
49510 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
49511 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49512 return 0;
49513 }
49514
49515 cookie = lookup_dcookie(mm, s->eip, &offset);
49516
49517 if (cookie == INVALID_COOKIE) {
49518 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49519 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49520 return 0;
49521 }
49522
49523 @@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49524 /* ignore backtraces if failed to add a sample */
49525 if (state == sb_bt_start) {
49526 state = sb_bt_ignore;
49527 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49528 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49529 }
49530 }
49531 release_mm(mm);
49532 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49533 index c0cc4e7..44d4e54 100644
49534 --- a/drivers/oprofile/event_buffer.c
49535 +++ b/drivers/oprofile/event_buffer.c
49536 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49537 }
49538
49539 if (buffer_pos == buffer_size) {
49540 - atomic_inc(&oprofile_stats.event_lost_overflow);
49541 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49542 return;
49543 }
49544
49545 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49546 index ed2c3ec..deda85a 100644
49547 --- a/drivers/oprofile/oprof.c
49548 +++ b/drivers/oprofile/oprof.c
49549 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49550 if (oprofile_ops.switch_events())
49551 return;
49552
49553 - atomic_inc(&oprofile_stats.multiplex_counter);
49554 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49555 start_switch_worker();
49556 }
49557
49558 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49559 index ee2cfce..7f8f699 100644
49560 --- a/drivers/oprofile/oprofile_files.c
49561 +++ b/drivers/oprofile/oprofile_files.c
49562 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49563
49564 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49565
49566 -static ssize_t timeout_read(struct file *file, char __user *buf,
49567 +static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49568 size_t count, loff_t *offset)
49569 {
49570 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49571 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49572 index 59659ce..6c860a0 100644
49573 --- a/drivers/oprofile/oprofile_stats.c
49574 +++ b/drivers/oprofile/oprofile_stats.c
49575 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49576 cpu_buf->sample_invalid_eip = 0;
49577 }
49578
49579 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49580 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49581 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
49582 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49583 - atomic_set(&oprofile_stats.multiplex_counter, 0);
49584 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49585 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49586 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49587 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49588 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49589 }
49590
49591
49592 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49593 index 1fc622b..8c48fc3 100644
49594 --- a/drivers/oprofile/oprofile_stats.h
49595 +++ b/drivers/oprofile/oprofile_stats.h
49596 @@ -13,11 +13,11 @@
49597 #include <linux/atomic.h>
49598
49599 struct oprofile_stat_struct {
49600 - atomic_t sample_lost_no_mm;
49601 - atomic_t sample_lost_no_mapping;
49602 - atomic_t bt_lost_no_mapping;
49603 - atomic_t event_lost_overflow;
49604 - atomic_t multiplex_counter;
49605 + atomic_unchecked_t sample_lost_no_mm;
49606 + atomic_unchecked_t sample_lost_no_mapping;
49607 + atomic_unchecked_t bt_lost_no_mapping;
49608 + atomic_unchecked_t event_lost_overflow;
49609 + atomic_unchecked_t multiplex_counter;
49610 };
49611
49612 extern struct oprofile_stat_struct oprofile_stats;
49613 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49614 index 3f49345..c750d0b 100644
49615 --- a/drivers/oprofile/oprofilefs.c
49616 +++ b/drivers/oprofile/oprofilefs.c
49617 @@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49618
49619 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49620 {
49621 - atomic_t *val = file->private_data;
49622 - return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49623 + atomic_unchecked_t *val = file->private_data;
49624 + return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49625 }
49626
49627
49628 @@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49629
49630
49631 int oprofilefs_create_ro_atomic(struct dentry *root,
49632 - char const *name, atomic_t *val)
49633 + char const *name, atomic_unchecked_t *val)
49634 {
49635 return __oprofilefs_create_file(root, name,
49636 &atomic_ro_fops, 0444, val);
49637 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49638 index bdef916..88c7dee 100644
49639 --- a/drivers/oprofile/timer_int.c
49640 +++ b/drivers/oprofile/timer_int.c
49641 @@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
49642 return NOTIFY_OK;
49643 }
49644
49645 -static struct notifier_block __refdata oprofile_cpu_notifier = {
49646 +static struct notifier_block oprofile_cpu_notifier = {
49647 .notifier_call = oprofile_cpu_notify,
49648 };
49649
49650 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
49651 index 3b47080..6cd05dd 100644
49652 --- a/drivers/parport/procfs.c
49653 +++ b/drivers/parport/procfs.c
49654 @@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
49655
49656 *ppos += len;
49657
49658 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
49659 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
49660 }
49661
49662 #ifdef CONFIG_PARPORT_1284
49663 @@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
49664
49665 *ppos += len;
49666
49667 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
49668 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
49669 }
49670 #endif /* IEEE1284.3 support. */
49671
49672 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
49673 index 6ca2399..68d866b 100644
49674 --- a/drivers/pci/hotplug/acpiphp_ibm.c
49675 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
49676 @@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
49677 goto init_cleanup;
49678 }
49679
49680 - ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49681 + pax_open_kernel();
49682 + *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49683 + pax_close_kernel();
49684 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
49685
49686 return retval;
49687 diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
49688 index 66b7bbe..26bee78 100644
49689 --- a/drivers/pci/hotplug/cpcihp_generic.c
49690 +++ b/drivers/pci/hotplug/cpcihp_generic.c
49691 @@ -73,7 +73,6 @@ static u16 port;
49692 static unsigned int enum_bit;
49693 static u8 enum_mask;
49694
49695 -static struct cpci_hp_controller_ops generic_hpc_ops;
49696 static struct cpci_hp_controller generic_hpc;
49697
49698 static int __init validate_parameters(void)
49699 @@ -139,6 +138,10 @@ static int query_enum(void)
49700 return ((value & enum_mask) == enum_mask);
49701 }
49702
49703 +static struct cpci_hp_controller_ops generic_hpc_ops = {
49704 + .query_enum = query_enum,
49705 +};
49706 +
49707 static int __init cpcihp_generic_init(void)
49708 {
49709 int status;
49710 @@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
49711 pci_dev_put(dev);
49712
49713 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
49714 - generic_hpc_ops.query_enum = query_enum;
49715 generic_hpc.ops = &generic_hpc_ops;
49716
49717 status = cpci_hp_register_controller(&generic_hpc);
49718 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
49719 index 7ecf34e..effed62 100644
49720 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
49721 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
49722 @@ -59,7 +59,6 @@
49723 /* local variables */
49724 static bool debug;
49725 static bool poll;
49726 -static struct cpci_hp_controller_ops zt5550_hpc_ops;
49727 static struct cpci_hp_controller zt5550_hpc;
49728
49729 /* Primary cPCI bus bridge device */
49730 @@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
49731 return 0;
49732 }
49733
49734 +static struct cpci_hp_controller_ops zt5550_hpc_ops = {
49735 + .query_enum = zt5550_hc_query_enum,
49736 +};
49737 +
49738 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
49739 {
49740 int status;
49741 @@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
49742 dbg("returned from zt5550_hc_config");
49743
49744 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
49745 - zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
49746 zt5550_hpc.ops = &zt5550_hpc_ops;
49747 if (!poll) {
49748 zt5550_hpc.irq = hc_dev->irq;
49749 zt5550_hpc.irq_flags = IRQF_SHARED;
49750 zt5550_hpc.dev_id = hc_dev;
49751
49752 - zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49753 - zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49754 - zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49755 + pax_open_kernel();
49756 + *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49757 + *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49758 + *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49759 + pax_open_kernel();
49760 } else {
49761 info("using ENUM# polling mode");
49762 }
49763 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
49764 index 1e08ff8c..3cd145f 100644
49765 --- a/drivers/pci/hotplug/cpqphp_nvram.c
49766 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
49767 @@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
49768
49769 void compaq_nvram_init (void __iomem *rom_start)
49770 {
49771 +#ifndef CONFIG_PAX_KERNEXEC
49772 if (rom_start)
49773 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
49774 +#endif
49775
49776 dbg("int15 entry = %p\n", compaq_int15_entry_point);
49777
49778 diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
49779 index 56d8486..f26113f 100644
49780 --- a/drivers/pci/hotplug/pci_hotplug_core.c
49781 +++ b/drivers/pci/hotplug/pci_hotplug_core.c
49782 @@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
49783 return -EINVAL;
49784 }
49785
49786 - slot->ops->owner = owner;
49787 - slot->ops->mod_name = mod_name;
49788 + pax_open_kernel();
49789 + *(struct module **)&slot->ops->owner = owner;
49790 + *(const char **)&slot->ops->mod_name = mod_name;
49791 + pax_close_kernel();
49792
49793 mutex_lock(&pci_hp_mutex);
49794 /*
49795 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
49796 index 07aa722..84514b4 100644
49797 --- a/drivers/pci/hotplug/pciehp_core.c
49798 +++ b/drivers/pci/hotplug/pciehp_core.c
49799 @@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
49800 struct slot *slot = ctrl->slot;
49801 struct hotplug_slot *hotplug = NULL;
49802 struct hotplug_slot_info *info = NULL;
49803 - struct hotplug_slot_ops *ops = NULL;
49804 + hotplug_slot_ops_no_const *ops = NULL;
49805 char name[SLOT_NAME_SIZE];
49806 int retval = -ENOMEM;
49807
49808 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
49809 index 084587d..4a8f9df 100644
49810 --- a/drivers/pci/msi.c
49811 +++ b/drivers/pci/msi.c
49812 @@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
49813 {
49814 struct attribute **msi_attrs;
49815 struct attribute *msi_attr;
49816 - struct device_attribute *msi_dev_attr;
49817 - struct attribute_group *msi_irq_group;
49818 + device_attribute_no_const *msi_dev_attr;
49819 + attribute_group_no_const *msi_irq_group;
49820 const struct attribute_group **msi_irq_groups;
49821 struct msi_desc *entry;
49822 int ret = -ENOMEM;
49823 @@ -549,7 +549,7 @@ error_attrs:
49824 count = 0;
49825 msi_attr = msi_attrs[count];
49826 while (msi_attr) {
49827 - msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
49828 + msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
49829 kfree(msi_attr->name);
49830 kfree(msi_dev_attr);
49831 ++count;
49832 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
49833 index 2c6643f..3a6d8e0 100644
49834 --- a/drivers/pci/pci-sysfs.c
49835 +++ b/drivers/pci/pci-sysfs.c
49836 @@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
49837 {
49838 /* allocate attribute structure, piggyback attribute name */
49839 int name_len = write_combine ? 13 : 10;
49840 - struct bin_attribute *res_attr;
49841 + bin_attribute_no_const *res_attr;
49842 int retval;
49843
49844 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
49845 @@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
49846 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
49847 {
49848 int retval;
49849 - struct bin_attribute *attr;
49850 + bin_attribute_no_const *attr;
49851
49852 /* If the device has VPD, try to expose it in sysfs. */
49853 if (dev->vpd) {
49854 @@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
49855 {
49856 int retval;
49857 int rom_size = 0;
49858 - struct bin_attribute *attr;
49859 + bin_attribute_no_const *attr;
49860
49861 if (!sysfs_initialized)
49862 return -EACCES;
49863 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
49864 index 4a3902d..7f1fc42 100644
49865 --- a/drivers/pci/pci.h
49866 +++ b/drivers/pci/pci.h
49867 @@ -93,7 +93,7 @@ struct pci_vpd_ops {
49868 struct pci_vpd {
49869 unsigned int len;
49870 const struct pci_vpd_ops *ops;
49871 - struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
49872 + bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
49873 };
49874
49875 int pci_vpd_pci22_init(struct pci_dev *dev);
49876 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
49877 index e1e7026..d28dd33 100644
49878 --- a/drivers/pci/pcie/aspm.c
49879 +++ b/drivers/pci/pcie/aspm.c
49880 @@ -27,9 +27,9 @@
49881 #define MODULE_PARAM_PREFIX "pcie_aspm."
49882
49883 /* Note: those are not register definitions */
49884 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
49885 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
49886 -#define ASPM_STATE_L1 (4) /* L1 state */
49887 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
49888 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
49889 +#define ASPM_STATE_L1 (4U) /* L1 state */
49890 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
49891 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
49892
49893 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
49894 index c8ca98c..b1bc005 100644
49895 --- a/drivers/pci/probe.c
49896 +++ b/drivers/pci/probe.c
49897 @@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
49898 struct pci_bus_region region, inverted_region;
49899 bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
49900
49901 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
49902 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
49903
49904 /* No printks while decoding is disabled! */
49905 if (!dev->mmio_always_on) {
49906 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
49907 index 3f155e7..0f4b1f0 100644
49908 --- a/drivers/pci/proc.c
49909 +++ b/drivers/pci/proc.c
49910 @@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
49911 static int __init pci_proc_init(void)
49912 {
49913 struct pci_dev *dev = NULL;
49914 +
49915 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
49916 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49917 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
49918 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49919 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49920 +#endif
49921 +#else
49922 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
49923 +#endif
49924 proc_create("devices", 0, proc_bus_pci_dir,
49925 &proc_bus_pci_dev_operations);
49926 proc_initialized = 1;
49927 diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
49928 index d866db8..c827d1f 100644
49929 --- a/drivers/platform/chrome/chromeos_laptop.c
49930 +++ b/drivers/platform/chrome/chromeos_laptop.c
49931 @@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
49932 .callback = chromeos_laptop_dmi_matched, \
49933 .driver_data = (void *)&board_
49934
49935 -static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
49936 +static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
49937 {
49938 .ident = "Samsung Series 5 550",
49939 .matches = {
49940 diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
49941 index c5af23b..3d62d5e 100644
49942 --- a/drivers/platform/x86/alienware-wmi.c
49943 +++ b/drivers/platform/x86/alienware-wmi.c
49944 @@ -150,7 +150,7 @@ struct wmax_led_args {
49945 } __packed;
49946
49947 static struct platform_device *platform_device;
49948 -static struct device_attribute *zone_dev_attrs;
49949 +static device_attribute_no_const *zone_dev_attrs;
49950 static struct attribute **zone_attrs;
49951 static struct platform_zone *zone_data;
49952
49953 @@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
49954 }
49955 };
49956
49957 -static struct attribute_group zone_attribute_group = {
49958 +static attribute_group_no_const zone_attribute_group = {
49959 .name = "rgb_zones",
49960 };
49961
49962 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
49963 index 21fc932..ee9394a 100644
49964 --- a/drivers/platform/x86/asus-wmi.c
49965 +++ b/drivers/platform/x86/asus-wmi.c
49966 @@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
49967 int err;
49968 u32 retval = -1;
49969
49970 +#ifdef CONFIG_GRKERNSEC_KMEM
49971 + return -EPERM;
49972 +#endif
49973 +
49974 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
49975
49976 if (err < 0)
49977 @@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
49978 int err;
49979 u32 retval = -1;
49980
49981 +#ifdef CONFIG_GRKERNSEC_KMEM
49982 + return -EPERM;
49983 +#endif
49984 +
49985 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
49986 &retval);
49987
49988 @@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
49989 union acpi_object *obj;
49990 acpi_status status;
49991
49992 +#ifdef CONFIG_GRKERNSEC_KMEM
49993 + return -EPERM;
49994 +#endif
49995 +
49996 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
49997 1, asus->debug.method_id,
49998 &input, &output);
49999 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50000 index 62f8030..c7f2a45 100644
50001 --- a/drivers/platform/x86/msi-laptop.c
50002 +++ b/drivers/platform/x86/msi-laptop.c
50003 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50004
50005 if (!quirks->ec_read_only) {
50006 /* allow userland write sysfs file */
50007 - dev_attr_bluetooth.store = store_bluetooth;
50008 - dev_attr_wlan.store = store_wlan;
50009 - dev_attr_threeg.store = store_threeg;
50010 - dev_attr_bluetooth.attr.mode |= S_IWUSR;
50011 - dev_attr_wlan.attr.mode |= S_IWUSR;
50012 - dev_attr_threeg.attr.mode |= S_IWUSR;
50013 + pax_open_kernel();
50014 + *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50015 + *(void **)&dev_attr_wlan.store = store_wlan;
50016 + *(void **)&dev_attr_threeg.store = store_threeg;
50017 + *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50018 + *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50019 + *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50020 + pax_close_kernel();
50021 }
50022
50023 /* disable hardware control by fn key */
50024 diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50025 index 70222f2..8c8ce66 100644
50026 --- a/drivers/platform/x86/msi-wmi.c
50027 +++ b/drivers/platform/x86/msi-wmi.c
50028 @@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50029 static void msi_wmi_notify(u32 value, void *context)
50030 {
50031 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50032 - static struct key_entry *key;
50033 + struct key_entry *key;
50034 union acpi_object *obj;
50035 acpi_status status;
50036
50037 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50038 index 26ad9ff..7c52909 100644
50039 --- a/drivers/platform/x86/sony-laptop.c
50040 +++ b/drivers/platform/x86/sony-laptop.c
50041 @@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50042 }
50043
50044 /* High speed charging function */
50045 -static struct device_attribute *hsc_handle;
50046 +static device_attribute_no_const *hsc_handle;
50047
50048 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50049 struct device_attribute *attr,
50050 @@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50051 }
50052
50053 /* low battery function */
50054 -static struct device_attribute *lowbatt_handle;
50055 +static device_attribute_no_const *lowbatt_handle;
50056
50057 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50058 struct device_attribute *attr,
50059 @@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50060 }
50061
50062 /* fan speed function */
50063 -static struct device_attribute *fan_handle, *hsf_handle;
50064 +static device_attribute_no_const *fan_handle, *hsf_handle;
50065
50066 static ssize_t sony_nc_hsfan_store(struct device *dev,
50067 struct device_attribute *attr,
50068 @@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50069 }
50070
50071 /* USB charge function */
50072 -static struct device_attribute *uc_handle;
50073 +static device_attribute_no_const *uc_handle;
50074
50075 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50076 struct device_attribute *attr,
50077 @@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50078 }
50079
50080 /* Panel ID function */
50081 -static struct device_attribute *panel_handle;
50082 +static device_attribute_no_const *panel_handle;
50083
50084 static ssize_t sony_nc_panelid_show(struct device *dev,
50085 struct device_attribute *attr, char *buffer)
50086 @@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50087 }
50088
50089 /* smart connect function */
50090 -static struct device_attribute *sc_handle;
50091 +static device_attribute_no_const *sc_handle;
50092
50093 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50094 struct device_attribute *attr,
50095 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50096 index cf0f893..5955997 100644
50097 --- a/drivers/platform/x86/thinkpad_acpi.c
50098 +++ b/drivers/platform/x86/thinkpad_acpi.c
50099 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
50100 return 0;
50101 }
50102
50103 -void static hotkey_mask_warn_incomplete_mask(void)
50104 +static void hotkey_mask_warn_incomplete_mask(void)
50105 {
50106 /* log only what the user can fix... */
50107 const u32 wantedmask = hotkey_driver_mask &
50108 @@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50109 && !tp_features.bright_unkfw)
50110 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50111 }
50112 +}
50113
50114 #undef TPACPI_COMPARE_KEY
50115 #undef TPACPI_MAY_SEND_KEY
50116 -}
50117
50118 /*
50119 * Polling driver
50120 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50121 index 438d4c7..ca8a2fb 100644
50122 --- a/drivers/pnp/pnpbios/bioscalls.c
50123 +++ b/drivers/pnp/pnpbios/bioscalls.c
50124 @@ -59,7 +59,7 @@ do { \
50125 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50126 } while(0)
50127
50128 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50129 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50130 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50131
50132 /*
50133 @@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50134
50135 cpu = get_cpu();
50136 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50137 +
50138 + pax_open_kernel();
50139 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50140 + pax_close_kernel();
50141
50142 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50143 spin_lock_irqsave(&pnp_bios_lock, flags);
50144 @@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50145 :"memory");
50146 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50147
50148 + pax_open_kernel();
50149 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50150 + pax_close_kernel();
50151 +
50152 put_cpu();
50153
50154 /* If we get here and this is set then the PnP BIOS faulted on us. */
50155 @@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50156 return status;
50157 }
50158
50159 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
50160 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50161 {
50162 int i;
50163
50164 @@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50165 pnp_bios_callpoint.offset = header->fields.pm16offset;
50166 pnp_bios_callpoint.segment = PNP_CS16;
50167
50168 + pax_open_kernel();
50169 +
50170 for_each_possible_cpu(i) {
50171 struct desc_struct *gdt = get_cpu_gdt_table(i);
50172 if (!gdt)
50173 @@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50174 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50175 (unsigned long)__va(header->fields.pm16dseg));
50176 }
50177 +
50178 + pax_close_kernel();
50179 }
50180 diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50181 index 0c52e2a..3421ab7 100644
50182 --- a/drivers/power/pda_power.c
50183 +++ b/drivers/power/pda_power.c
50184 @@ -37,7 +37,11 @@ static int polling;
50185
50186 #if IS_ENABLED(CONFIG_USB_PHY)
50187 static struct usb_phy *transceiver;
50188 -static struct notifier_block otg_nb;
50189 +static int otg_handle_notification(struct notifier_block *nb,
50190 + unsigned long event, void *unused);
50191 +static struct notifier_block otg_nb = {
50192 + .notifier_call = otg_handle_notification
50193 +};
50194 #endif
50195
50196 static struct regulator *ac_draw;
50197 @@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50198
50199 #if IS_ENABLED(CONFIG_USB_PHY)
50200 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50201 - otg_nb.notifier_call = otg_handle_notification;
50202 ret = usb_register_notifier(transceiver, &otg_nb);
50203 if (ret) {
50204 dev_err(dev, "failure to register otg notifier\n");
50205 diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50206 index cc439fd..8fa30df 100644
50207 --- a/drivers/power/power_supply.h
50208 +++ b/drivers/power/power_supply.h
50209 @@ -16,12 +16,12 @@ struct power_supply;
50210
50211 #ifdef CONFIG_SYSFS
50212
50213 -extern void power_supply_init_attrs(struct device_type *dev_type);
50214 +extern void power_supply_init_attrs(void);
50215 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50216
50217 #else
50218
50219 -static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50220 +static inline void power_supply_init_attrs(void) {}
50221 #define power_supply_uevent NULL
50222
50223 #endif /* CONFIG_SYSFS */
50224 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50225 index 694e8cd..9f03483 100644
50226 --- a/drivers/power/power_supply_core.c
50227 +++ b/drivers/power/power_supply_core.c
50228 @@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50229 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50230 EXPORT_SYMBOL_GPL(power_supply_notifier);
50231
50232 -static struct device_type power_supply_dev_type;
50233 +extern const struct attribute_group *power_supply_attr_groups[];
50234 +static struct device_type power_supply_dev_type = {
50235 + .groups = power_supply_attr_groups,
50236 +};
50237
50238 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50239 struct power_supply *supply)
50240 @@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50241 return PTR_ERR(power_supply_class);
50242
50243 power_supply_class->dev_uevent = power_supply_uevent;
50244 - power_supply_init_attrs(&power_supply_dev_type);
50245 + power_supply_init_attrs();
50246
50247 return 0;
50248 }
50249 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50250 index 62653f5..d0bb485 100644
50251 --- a/drivers/power/power_supply_sysfs.c
50252 +++ b/drivers/power/power_supply_sysfs.c
50253 @@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50254 .is_visible = power_supply_attr_is_visible,
50255 };
50256
50257 -static const struct attribute_group *power_supply_attr_groups[] = {
50258 +const struct attribute_group *power_supply_attr_groups[] = {
50259 &power_supply_attr_group,
50260 NULL,
50261 };
50262
50263 -void power_supply_init_attrs(struct device_type *dev_type)
50264 +void power_supply_init_attrs(void)
50265 {
50266 int i;
50267
50268 - dev_type->groups = power_supply_attr_groups;
50269 -
50270 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50271 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50272 }
50273 diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50274 index 84419af..268ede8 100644
50275 --- a/drivers/powercap/powercap_sys.c
50276 +++ b/drivers/powercap/powercap_sys.c
50277 @@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50278 struct device_attribute name_attr;
50279 };
50280
50281 +static ssize_t show_constraint_name(struct device *dev,
50282 + struct device_attribute *dev_attr,
50283 + char *buf);
50284 +
50285 static struct powercap_constraint_attr
50286 - constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50287 + constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50288 + [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50289 + .power_limit_attr = {
50290 + .attr = {
50291 + .name = NULL,
50292 + .mode = S_IWUSR | S_IRUGO
50293 + },
50294 + .show = show_constraint_power_limit_uw,
50295 + .store = store_constraint_power_limit_uw
50296 + },
50297 +
50298 + .time_window_attr = {
50299 + .attr = {
50300 + .name = NULL,
50301 + .mode = S_IWUSR | S_IRUGO
50302 + },
50303 + .show = show_constraint_time_window_us,
50304 + .store = store_constraint_time_window_us
50305 + },
50306 +
50307 + .max_power_attr = {
50308 + .attr = {
50309 + .name = NULL,
50310 + .mode = S_IRUGO
50311 + },
50312 + .show = show_constraint_max_power_uw,
50313 + .store = NULL
50314 + },
50315 +
50316 + .min_power_attr = {
50317 + .attr = {
50318 + .name = NULL,
50319 + .mode = S_IRUGO
50320 + },
50321 + .show = show_constraint_min_power_uw,
50322 + .store = NULL
50323 + },
50324 +
50325 + .max_time_window_attr = {
50326 + .attr = {
50327 + .name = NULL,
50328 + .mode = S_IRUGO
50329 + },
50330 + .show = show_constraint_max_time_window_us,
50331 + .store = NULL
50332 + },
50333 +
50334 + .min_time_window_attr = {
50335 + .attr = {
50336 + .name = NULL,
50337 + .mode = S_IRUGO
50338 + },
50339 + .show = show_constraint_min_time_window_us,
50340 + .store = NULL
50341 + },
50342 +
50343 + .name_attr = {
50344 + .attr = {
50345 + .name = NULL,
50346 + .mode = S_IRUGO
50347 + },
50348 + .show = show_constraint_name,
50349 + .store = NULL
50350 + }
50351 + }
50352 +};
50353
50354 /* A list of powercap control_types */
50355 static LIST_HEAD(powercap_cntrl_list);
50356 @@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50357 }
50358
50359 static int create_constraint_attribute(int id, const char *name,
50360 - int mode,
50361 - struct device_attribute *dev_attr,
50362 - ssize_t (*show)(struct device *,
50363 - struct device_attribute *, char *),
50364 - ssize_t (*store)(struct device *,
50365 - struct device_attribute *,
50366 - const char *, size_t)
50367 - )
50368 + struct device_attribute *dev_attr)
50369 {
50370 + name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50371
50372 - dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50373 - id, name);
50374 - if (!dev_attr->attr.name)
50375 + if (!name)
50376 return -ENOMEM;
50377 - dev_attr->attr.mode = mode;
50378 - dev_attr->show = show;
50379 - dev_attr->store = store;
50380 +
50381 + pax_open_kernel();
50382 + *(const char **)&dev_attr->attr.name = name;
50383 + pax_close_kernel();
50384
50385 return 0;
50386 }
50387 @@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50388
50389 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50390 ret = create_constraint_attribute(i, "power_limit_uw",
50391 - S_IWUSR | S_IRUGO,
50392 - &constraint_attrs[i].power_limit_attr,
50393 - show_constraint_power_limit_uw,
50394 - store_constraint_power_limit_uw);
50395 + &constraint_attrs[i].power_limit_attr);
50396 if (ret)
50397 goto err_alloc;
50398 ret = create_constraint_attribute(i, "time_window_us",
50399 - S_IWUSR | S_IRUGO,
50400 - &constraint_attrs[i].time_window_attr,
50401 - show_constraint_time_window_us,
50402 - store_constraint_time_window_us);
50403 + &constraint_attrs[i].time_window_attr);
50404 if (ret)
50405 goto err_alloc;
50406 - ret = create_constraint_attribute(i, "name", S_IRUGO,
50407 - &constraint_attrs[i].name_attr,
50408 - show_constraint_name,
50409 - NULL);
50410 + ret = create_constraint_attribute(i, "name",
50411 + &constraint_attrs[i].name_attr);
50412 if (ret)
50413 goto err_alloc;
50414 - ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50415 - &constraint_attrs[i].max_power_attr,
50416 - show_constraint_max_power_uw,
50417 - NULL);
50418 + ret = create_constraint_attribute(i, "max_power_uw",
50419 + &constraint_attrs[i].max_power_attr);
50420 if (ret)
50421 goto err_alloc;
50422 - ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50423 - &constraint_attrs[i].min_power_attr,
50424 - show_constraint_min_power_uw,
50425 - NULL);
50426 + ret = create_constraint_attribute(i, "min_power_uw",
50427 + &constraint_attrs[i].min_power_attr);
50428 if (ret)
50429 goto err_alloc;
50430 ret = create_constraint_attribute(i, "max_time_window_us",
50431 - S_IRUGO,
50432 - &constraint_attrs[i].max_time_window_attr,
50433 - show_constraint_max_time_window_us,
50434 - NULL);
50435 + &constraint_attrs[i].max_time_window_attr);
50436 if (ret)
50437 goto err_alloc;
50438 ret = create_constraint_attribute(i, "min_time_window_us",
50439 - S_IRUGO,
50440 - &constraint_attrs[i].min_time_window_attr,
50441 - show_constraint_min_time_window_us,
50442 - NULL);
50443 + &constraint_attrs[i].min_time_window_attr);
50444 if (ret)
50445 goto err_alloc;
50446
50447 @@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50448 power_zone->zone_dev_attrs[count++] =
50449 &dev_attr_max_energy_range_uj.attr;
50450 if (power_zone->ops->get_energy_uj) {
50451 + pax_open_kernel();
50452 if (power_zone->ops->reset_energy_uj)
50453 - dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50454 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50455 else
50456 - dev_attr_energy_uj.attr.mode = S_IRUGO;
50457 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50458 + pax_close_kernel();
50459 power_zone->zone_dev_attrs[count++] =
50460 &dev_attr_energy_uj.attr;
50461 }
50462 diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50463 index 9c5d414..c7900ce 100644
50464 --- a/drivers/ptp/ptp_private.h
50465 +++ b/drivers/ptp/ptp_private.h
50466 @@ -51,7 +51,7 @@ struct ptp_clock {
50467 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50468 wait_queue_head_t tsev_wq;
50469 int defunct; /* tells readers to go away when clock is being removed */
50470 - struct device_attribute *pin_dev_attr;
50471 + device_attribute_no_const *pin_dev_attr;
50472 struct attribute **pin_attr;
50473 struct attribute_group pin_attr_group;
50474 };
50475 diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50476 index 302e626..12579af 100644
50477 --- a/drivers/ptp/ptp_sysfs.c
50478 +++ b/drivers/ptp/ptp_sysfs.c
50479 @@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50480 goto no_pin_attr;
50481
50482 for (i = 0; i < n_pins; i++) {
50483 - struct device_attribute *da = &ptp->pin_dev_attr[i];
50484 + device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50485 sysfs_attr_init(&da->attr);
50486 da->attr.name = info->pin_config[i].name;
50487 da->attr.mode = 0644;
50488 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50489 index cd87c0c..715ecbe 100644
50490 --- a/drivers/regulator/core.c
50491 +++ b/drivers/regulator/core.c
50492 @@ -3567,7 +3567,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50493 {
50494 const struct regulation_constraints *constraints = NULL;
50495 const struct regulator_init_data *init_data;
50496 - static atomic_t regulator_no = ATOMIC_INIT(0);
50497 + static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50498 struct regulator_dev *rdev;
50499 struct device *dev;
50500 int ret, i;
50501 @@ -3641,7 +3641,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50502 rdev->dev.class = &regulator_class;
50503 rdev->dev.parent = dev;
50504 dev_set_name(&rdev->dev, "regulator.%d",
50505 - atomic_inc_return(&regulator_no) - 1);
50506 + atomic_inc_return_unchecked(&regulator_no) - 1);
50507 ret = device_register(&rdev->dev);
50508 if (ret != 0) {
50509 put_device(&rdev->dev);
50510 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
50511 index 7eee2ca..4024513 100644
50512 --- a/drivers/regulator/max8660.c
50513 +++ b/drivers/regulator/max8660.c
50514 @@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
50515 max8660->shadow_regs[MAX8660_OVER1] = 5;
50516 } else {
50517 /* Otherwise devices can be toggled via software */
50518 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
50519 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
50520 + pax_open_kernel();
50521 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
50522 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
50523 + pax_close_kernel();
50524 }
50525
50526 /*
50527 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
50528 index dbedf17..18ff6b7 100644
50529 --- a/drivers/regulator/max8973-regulator.c
50530 +++ b/drivers/regulator/max8973-regulator.c
50531 @@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
50532 if (!pdata || !pdata->enable_ext_control) {
50533 max->desc.enable_reg = MAX8973_VOUT;
50534 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
50535 - max->ops.enable = regulator_enable_regmap;
50536 - max->ops.disable = regulator_disable_regmap;
50537 - max->ops.is_enabled = regulator_is_enabled_regmap;
50538 + pax_open_kernel();
50539 + *(void **)&max->ops.enable = regulator_enable_regmap;
50540 + *(void **)&max->ops.disable = regulator_disable_regmap;
50541 + *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
50542 + pax_close_kernel();
50543 }
50544
50545 if (pdata) {
50546 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
50547 index 793b662..85f74cd 100644
50548 --- a/drivers/regulator/mc13892-regulator.c
50549 +++ b/drivers/regulator/mc13892-regulator.c
50550 @@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
50551 mc13xxx_unlock(mc13892);
50552
50553 /* update mc13892_vcam ops */
50554 + pax_open_kernel();
50555 memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
50556 sizeof(struct regulator_ops));
50557 - mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50558 - mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50559 + *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50560 + *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50561 + pax_close_kernel();
50562 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
50563
50564 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
50565 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
50566 index 5b2e761..c8c8a4a 100644
50567 --- a/drivers/rtc/rtc-cmos.c
50568 +++ b/drivers/rtc/rtc-cmos.c
50569 @@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
50570 hpet_rtc_timer_init();
50571
50572 /* export at least the first block of NVRAM */
50573 - nvram.size = address_space - NVRAM_OFFSET;
50574 + pax_open_kernel();
50575 + *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
50576 + pax_close_kernel();
50577 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
50578 if (retval < 0) {
50579 dev_dbg(dev, "can't create nvram file? %d\n", retval);
50580 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
50581 index d049393..bb20be0 100644
50582 --- a/drivers/rtc/rtc-dev.c
50583 +++ b/drivers/rtc/rtc-dev.c
50584 @@ -16,6 +16,7 @@
50585 #include <linux/module.h>
50586 #include <linux/rtc.h>
50587 #include <linux/sched.h>
50588 +#include <linux/grsecurity.h>
50589 #include "rtc-core.h"
50590
50591 static dev_t rtc_devt;
50592 @@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
50593 if (copy_from_user(&tm, uarg, sizeof(tm)))
50594 return -EFAULT;
50595
50596 + gr_log_timechange();
50597 +
50598 return rtc_set_time(rtc, &tm);
50599
50600 case RTC_PIE_ON:
50601 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
50602 index bb43cf7..ee4d274 100644
50603 --- a/drivers/rtc/rtc-ds1307.c
50604 +++ b/drivers/rtc/rtc-ds1307.c
50605 @@ -107,7 +107,7 @@ struct ds1307 {
50606 u8 offset; /* register's offset */
50607 u8 regs[11];
50608 u16 nvram_offset;
50609 - struct bin_attribute *nvram;
50610 + bin_attribute_no_const *nvram;
50611 enum ds_type type;
50612 unsigned long flags;
50613 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
50614 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
50615 index 11880c1..b823aa4 100644
50616 --- a/drivers/rtc/rtc-m48t59.c
50617 +++ b/drivers/rtc/rtc-m48t59.c
50618 @@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
50619 if (IS_ERR(m48t59->rtc))
50620 return PTR_ERR(m48t59->rtc);
50621
50622 - m48t59_nvram_attr.size = pdata->offset;
50623 + pax_open_kernel();
50624 + *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
50625 + pax_close_kernel();
50626
50627 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
50628 if (ret)
50629 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
50630 index e693af6..2e525b6 100644
50631 --- a/drivers/scsi/bfa/bfa_fcpim.h
50632 +++ b/drivers/scsi/bfa/bfa_fcpim.h
50633 @@ -36,7 +36,7 @@ struct bfa_iotag_s {
50634
50635 struct bfa_itn_s {
50636 bfa_isr_func_t isr;
50637 -};
50638 +} __no_const;
50639
50640 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
50641 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
50642 diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
50643 index 0f19455..ef7adb5 100644
50644 --- a/drivers/scsi/bfa/bfa_fcs.c
50645 +++ b/drivers/scsi/bfa/bfa_fcs.c
50646 @@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
50647 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
50648
50649 static struct bfa_fcs_mod_s fcs_modules[] = {
50650 - { bfa_fcs_port_attach, NULL, NULL },
50651 - { bfa_fcs_uf_attach, NULL, NULL },
50652 - { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
50653 - bfa_fcs_fabric_modexit },
50654 + {
50655 + .attach = bfa_fcs_port_attach,
50656 + .modinit = NULL,
50657 + .modexit = NULL
50658 + },
50659 + {
50660 + .attach = bfa_fcs_uf_attach,
50661 + .modinit = NULL,
50662 + .modexit = NULL
50663 + },
50664 + {
50665 + .attach = bfa_fcs_fabric_attach,
50666 + .modinit = bfa_fcs_fabric_modinit,
50667 + .modexit = bfa_fcs_fabric_modexit
50668 + },
50669 };
50670
50671 /*
50672 diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
50673 index ff75ef8..2dfe00a 100644
50674 --- a/drivers/scsi/bfa/bfa_fcs_lport.c
50675 +++ b/drivers/scsi/bfa/bfa_fcs_lport.c
50676 @@ -89,15 +89,26 @@ static struct {
50677 void (*offline) (struct bfa_fcs_lport_s *port);
50678 } __port_action[] = {
50679 {
50680 - bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
50681 - bfa_fcs_lport_unknown_offline}, {
50682 - bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
50683 - bfa_fcs_lport_fab_offline}, {
50684 - bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
50685 - bfa_fcs_lport_n2n_offline}, {
50686 - bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
50687 - bfa_fcs_lport_loop_offline},
50688 - };
50689 + .init = bfa_fcs_lport_unknown_init,
50690 + .online = bfa_fcs_lport_unknown_online,
50691 + .offline = bfa_fcs_lport_unknown_offline
50692 + },
50693 + {
50694 + .init = bfa_fcs_lport_fab_init,
50695 + .online = bfa_fcs_lport_fab_online,
50696 + .offline = bfa_fcs_lport_fab_offline
50697 + },
50698 + {
50699 + .init = bfa_fcs_lport_n2n_init,
50700 + .online = bfa_fcs_lport_n2n_online,
50701 + .offline = bfa_fcs_lport_n2n_offline
50702 + },
50703 + {
50704 + .init = bfa_fcs_lport_loop_init,
50705 + .online = bfa_fcs_lport_loop_online,
50706 + .offline = bfa_fcs_lport_loop_offline
50707 + },
50708 +};
50709
50710 /*
50711 * fcs_port_sm FCS logical port state machine
50712 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
50713 index a38aafa0..fe8f03b 100644
50714 --- a/drivers/scsi/bfa/bfa_ioc.h
50715 +++ b/drivers/scsi/bfa/bfa_ioc.h
50716 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
50717 bfa_ioc_disable_cbfn_t disable_cbfn;
50718 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
50719 bfa_ioc_reset_cbfn_t reset_cbfn;
50720 -};
50721 +} __no_const;
50722
50723 /*
50724 * IOC event notification mechanism.
50725 @@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
50726 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
50727 enum bfi_ioc_state fwstate);
50728 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
50729 -};
50730 +} __no_const;
50731
50732 /*
50733 * Queue element to wait for room in request queue. FIFO order is
50734 diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
50735 index a14c784..6de6790 100644
50736 --- a/drivers/scsi/bfa/bfa_modules.h
50737 +++ b/drivers/scsi/bfa/bfa_modules.h
50738 @@ -78,12 +78,12 @@ enum {
50739 \
50740 extern struct bfa_module_s hal_mod_ ## __mod; \
50741 struct bfa_module_s hal_mod_ ## __mod = { \
50742 - bfa_ ## __mod ## _meminfo, \
50743 - bfa_ ## __mod ## _attach, \
50744 - bfa_ ## __mod ## _detach, \
50745 - bfa_ ## __mod ## _start, \
50746 - bfa_ ## __mod ## _stop, \
50747 - bfa_ ## __mod ## _iocdisable, \
50748 + .meminfo = bfa_ ## __mod ## _meminfo, \
50749 + .attach = bfa_ ## __mod ## _attach, \
50750 + .detach = bfa_ ## __mod ## _detach, \
50751 + .start = bfa_ ## __mod ## _start, \
50752 + .stop = bfa_ ## __mod ## _stop, \
50753 + .iocdisable = bfa_ ## __mod ## _iocdisable, \
50754 }
50755
50756 #define BFA_CACHELINE_SZ (256)
50757 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
50758 index 045c4e1..13de803 100644
50759 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
50760 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
50761 @@ -33,8 +33,8 @@
50762 */
50763 #include "libfcoe.h"
50764
50765 -static atomic_t ctlr_num;
50766 -static atomic_t fcf_num;
50767 +static atomic_unchecked_t ctlr_num;
50768 +static atomic_unchecked_t fcf_num;
50769
50770 /*
50771 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
50772 @@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
50773 if (!ctlr)
50774 goto out;
50775
50776 - ctlr->id = atomic_inc_return(&ctlr_num) - 1;
50777 + ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
50778 ctlr->f = f;
50779 ctlr->mode = FIP_CONN_TYPE_FABRIC;
50780 INIT_LIST_HEAD(&ctlr->fcfs);
50781 @@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
50782 fcf->dev.parent = &ctlr->dev;
50783 fcf->dev.bus = &fcoe_bus_type;
50784 fcf->dev.type = &fcoe_fcf_device_type;
50785 - fcf->id = atomic_inc_return(&fcf_num) - 1;
50786 + fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
50787 fcf->state = FCOE_FCF_STATE_UNKNOWN;
50788
50789 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
50790 @@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
50791 {
50792 int error;
50793
50794 - atomic_set(&ctlr_num, 0);
50795 - atomic_set(&fcf_num, 0);
50796 + atomic_set_unchecked(&ctlr_num, 0);
50797 + atomic_set_unchecked(&fcf_num, 0);
50798
50799 error = bus_register(&fcoe_bus_type);
50800 if (error)
50801 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
50802 index 6de80e3..a11e0ac 100644
50803 --- a/drivers/scsi/hosts.c
50804 +++ b/drivers/scsi/hosts.c
50805 @@ -42,7 +42,7 @@
50806 #include "scsi_logging.h"
50807
50808
50809 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50810 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50811
50812
50813 static void scsi_host_cls_release(struct device *dev)
50814 @@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
50815 * subtract one because we increment first then return, but we need to
50816 * know what the next host number was before increment
50817 */
50818 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
50819 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
50820 shost->dma_channel = 0xff;
50821
50822 /* These three are default values which can be overridden */
50823 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
50824 index cef5d49..01e280e 100644
50825 --- a/drivers/scsi/hpsa.c
50826 +++ b/drivers/scsi/hpsa.c
50827 @@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
50828 unsigned long flags;
50829
50830 if (h->transMethod & CFGTBL_Trans_io_accel1)
50831 - return h->access.command_completed(h, q);
50832 + return h->access->command_completed(h, q);
50833
50834 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
50835 - return h->access.command_completed(h, q);
50836 + return h->access->command_completed(h, q);
50837
50838 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
50839 a = rq->head[rq->current_entry];
50840 @@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50841 while (!list_empty(&h->reqQ)) {
50842 c = list_entry(h->reqQ.next, struct CommandList, list);
50843 /* can't do anything if fifo is full */
50844 - if ((h->access.fifo_full(h))) {
50845 + if ((h->access->fifo_full(h))) {
50846 h->fifo_recently_full = 1;
50847 dev_warn(&h->pdev->dev, "fifo full\n");
50848 break;
50849 @@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50850
50851 /* Tell the controller execute command */
50852 spin_unlock_irqrestore(&h->lock, *flags);
50853 - h->access.submit_command(h, c);
50854 + h->access->submit_command(h, c);
50855 spin_lock_irqsave(&h->lock, *flags);
50856 }
50857 }
50858 @@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
50859
50860 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
50861 {
50862 - return h->access.command_completed(h, q);
50863 + return h->access->command_completed(h, q);
50864 }
50865
50866 static inline bool interrupt_pending(struct ctlr_info *h)
50867 {
50868 - return h->access.intr_pending(h);
50869 + return h->access->intr_pending(h);
50870 }
50871
50872 static inline long interrupt_not_for_us(struct ctlr_info *h)
50873 {
50874 - return (h->access.intr_pending(h) == 0) ||
50875 + return (h->access->intr_pending(h) == 0) ||
50876 (h->interrupts_enabled == 0);
50877 }
50878
50879 @@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
50880 if (prod_index < 0)
50881 return -ENODEV;
50882 h->product_name = products[prod_index].product_name;
50883 - h->access = *(products[prod_index].access);
50884 + h->access = products[prod_index].access;
50885
50886 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
50887 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
50888 @@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
50889 unsigned long flags;
50890 u32 lockup_detected;
50891
50892 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50893 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50894 spin_lock_irqsave(&h->lock, flags);
50895 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
50896 if (!lockup_detected) {
50897 @@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
50898 }
50899
50900 /* make sure the board interrupts are off */
50901 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50902 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50903
50904 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
50905 goto clean2;
50906 @@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
50907 * fake ones to scoop up any residual completions.
50908 */
50909 spin_lock_irqsave(&h->lock, flags);
50910 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50911 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50912 spin_unlock_irqrestore(&h->lock, flags);
50913 free_irqs(h);
50914 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
50915 @@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
50916 dev_info(&h->pdev->dev, "Board READY.\n");
50917 dev_info(&h->pdev->dev,
50918 "Waiting for stale completions to drain.\n");
50919 - h->access.set_intr_mask(h, HPSA_INTR_ON);
50920 + h->access->set_intr_mask(h, HPSA_INTR_ON);
50921 msleep(10000);
50922 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50923 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50924
50925 rc = controller_reset_failed(h->cfgtable);
50926 if (rc)
50927 @@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
50928 h->drv_req_rescan = 0;
50929
50930 /* Turn the interrupts on so we can service requests */
50931 - h->access.set_intr_mask(h, HPSA_INTR_ON);
50932 + h->access->set_intr_mask(h, HPSA_INTR_ON);
50933
50934 hpsa_hba_inquiry(h);
50935 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
50936 @@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
50937 * To write all data in the battery backed cache to disks
50938 */
50939 hpsa_flush_cache(h);
50940 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
50941 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
50942 hpsa_free_irqs_and_disable_msix(h);
50943 }
50944
50945 @@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50946 CFGTBL_Trans_enable_directed_msix |
50947 (trans_support & (CFGTBL_Trans_io_accel1 |
50948 CFGTBL_Trans_io_accel2));
50949 - struct access_method access = SA5_performant_access;
50950 + struct access_method *access = &SA5_performant_access;
50951
50952 /* This is a bit complicated. There are 8 registers on
50953 * the controller which we write to to tell it 8 different
50954 @@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50955 * perform the superfluous readl() after each command submission.
50956 */
50957 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
50958 - access = SA5_performant_access_no_read;
50959 + access = &SA5_performant_access_no_read;
50960
50961 /* Controller spec: zero out this buffer. */
50962 for (i = 0; i < h->nreply_queues; i++)
50963 @@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50964 * enable outbound interrupt coalescing in accelerator mode;
50965 */
50966 if (trans_support & CFGTBL_Trans_io_accel1) {
50967 - access = SA5_ioaccel_mode1_access;
50968 + access = &SA5_ioaccel_mode1_access;
50969 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
50970 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
50971 } else {
50972 if (trans_support & CFGTBL_Trans_io_accel2) {
50973 - access = SA5_ioaccel_mode2_access;
50974 + access = &SA5_ioaccel_mode2_access;
50975 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
50976 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
50977 }
50978 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
50979 index 24472ce..8782caf 100644
50980 --- a/drivers/scsi/hpsa.h
50981 +++ b/drivers/scsi/hpsa.h
50982 @@ -127,7 +127,7 @@ struct ctlr_info {
50983 unsigned int msix_vector;
50984 unsigned int msi_vector;
50985 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
50986 - struct access_method access;
50987 + struct access_method *access;
50988 char hba_mode_enabled;
50989
50990 /* queue and queue Info */
50991 @@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
50992 }
50993
50994 static struct access_method SA5_access = {
50995 - SA5_submit_command,
50996 - SA5_intr_mask,
50997 - SA5_fifo_full,
50998 - SA5_intr_pending,
50999 - SA5_completed,
51000 + .submit_command = SA5_submit_command,
51001 + .set_intr_mask = SA5_intr_mask,
51002 + .fifo_full = SA5_fifo_full,
51003 + .intr_pending = SA5_intr_pending,
51004 + .command_completed = SA5_completed,
51005 };
51006
51007 static struct access_method SA5_ioaccel_mode1_access = {
51008 - SA5_submit_command,
51009 - SA5_performant_intr_mask,
51010 - SA5_fifo_full,
51011 - SA5_ioaccel_mode1_intr_pending,
51012 - SA5_ioaccel_mode1_completed,
51013 + .submit_command = SA5_submit_command,
51014 + .set_intr_mask = SA5_performant_intr_mask,
51015 + .fifo_full = SA5_fifo_full,
51016 + .intr_pending = SA5_ioaccel_mode1_intr_pending,
51017 + .command_completed = SA5_ioaccel_mode1_completed,
51018 };
51019
51020 static struct access_method SA5_ioaccel_mode2_access = {
51021 - SA5_submit_command_ioaccel2,
51022 - SA5_performant_intr_mask,
51023 - SA5_fifo_full,
51024 - SA5_performant_intr_pending,
51025 - SA5_performant_completed,
51026 + .submit_command = SA5_submit_command_ioaccel2,
51027 + .set_intr_mask = SA5_performant_intr_mask,
51028 + .fifo_full = SA5_fifo_full,
51029 + .intr_pending = SA5_performant_intr_pending,
51030 + .command_completed = SA5_performant_completed,
51031 };
51032
51033 static struct access_method SA5_performant_access = {
51034 - SA5_submit_command,
51035 - SA5_performant_intr_mask,
51036 - SA5_fifo_full,
51037 - SA5_performant_intr_pending,
51038 - SA5_performant_completed,
51039 + .submit_command = SA5_submit_command,
51040 + .set_intr_mask = SA5_performant_intr_mask,
51041 + .fifo_full = SA5_fifo_full,
51042 + .intr_pending = SA5_performant_intr_pending,
51043 + .command_completed = SA5_performant_completed,
51044 };
51045
51046 static struct access_method SA5_performant_access_no_read = {
51047 - SA5_submit_command_no_read,
51048 - SA5_performant_intr_mask,
51049 - SA5_fifo_full,
51050 - SA5_performant_intr_pending,
51051 - SA5_performant_completed,
51052 + .submit_command = SA5_submit_command_no_read,
51053 + .set_intr_mask = SA5_performant_intr_mask,
51054 + .fifo_full = SA5_fifo_full,
51055 + .intr_pending = SA5_performant_intr_pending,
51056 + .command_completed = SA5_performant_completed,
51057 };
51058
51059 struct board_type {
51060 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51061 index 1b3a094..068e683 100644
51062 --- a/drivers/scsi/libfc/fc_exch.c
51063 +++ b/drivers/scsi/libfc/fc_exch.c
51064 @@ -101,12 +101,12 @@ struct fc_exch_mgr {
51065 u16 pool_max_index;
51066
51067 struct {
51068 - atomic_t no_free_exch;
51069 - atomic_t no_free_exch_xid;
51070 - atomic_t xid_not_found;
51071 - atomic_t xid_busy;
51072 - atomic_t seq_not_found;
51073 - atomic_t non_bls_resp;
51074 + atomic_unchecked_t no_free_exch;
51075 + atomic_unchecked_t no_free_exch_xid;
51076 + atomic_unchecked_t xid_not_found;
51077 + atomic_unchecked_t xid_busy;
51078 + atomic_unchecked_t seq_not_found;
51079 + atomic_unchecked_t non_bls_resp;
51080 } stats;
51081 };
51082
51083 @@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51084 /* allocate memory for exchange */
51085 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51086 if (!ep) {
51087 - atomic_inc(&mp->stats.no_free_exch);
51088 + atomic_inc_unchecked(&mp->stats.no_free_exch);
51089 goto out;
51090 }
51091 memset(ep, 0, sizeof(*ep));
51092 @@ -874,7 +874,7 @@ out:
51093 return ep;
51094 err:
51095 spin_unlock_bh(&pool->lock);
51096 - atomic_inc(&mp->stats.no_free_exch_xid);
51097 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51098 mempool_free(ep, mp->ep_pool);
51099 return NULL;
51100 }
51101 @@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51102 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51103 ep = fc_exch_find(mp, xid);
51104 if (!ep) {
51105 - atomic_inc(&mp->stats.xid_not_found);
51106 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51107 reject = FC_RJT_OX_ID;
51108 goto out;
51109 }
51110 @@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51111 ep = fc_exch_find(mp, xid);
51112 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51113 if (ep) {
51114 - atomic_inc(&mp->stats.xid_busy);
51115 + atomic_inc_unchecked(&mp->stats.xid_busy);
51116 reject = FC_RJT_RX_ID;
51117 goto rel;
51118 }
51119 @@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51120 }
51121 xid = ep->xid; /* get our XID */
51122 } else if (!ep) {
51123 - atomic_inc(&mp->stats.xid_not_found);
51124 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51125 reject = FC_RJT_RX_ID; /* XID not found */
51126 goto out;
51127 }
51128 @@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51129 } else {
51130 sp = &ep->seq;
51131 if (sp->id != fh->fh_seq_id) {
51132 - atomic_inc(&mp->stats.seq_not_found);
51133 + atomic_inc_unchecked(&mp->stats.seq_not_found);
51134 if (f_ctl & FC_FC_END_SEQ) {
51135 /*
51136 * Update sequence_id based on incoming last
51137 @@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51138
51139 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51140 if (!ep) {
51141 - atomic_inc(&mp->stats.xid_not_found);
51142 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51143 goto out;
51144 }
51145 if (ep->esb_stat & ESB_ST_COMPLETE) {
51146 - atomic_inc(&mp->stats.xid_not_found);
51147 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51148 goto rel;
51149 }
51150 if (ep->rxid == FC_XID_UNKNOWN)
51151 ep->rxid = ntohs(fh->fh_rx_id);
51152 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51153 - atomic_inc(&mp->stats.xid_not_found);
51154 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51155 goto rel;
51156 }
51157 if (ep->did != ntoh24(fh->fh_s_id) &&
51158 ep->did != FC_FID_FLOGI) {
51159 - atomic_inc(&mp->stats.xid_not_found);
51160 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51161 goto rel;
51162 }
51163 sof = fr_sof(fp);
51164 @@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51165 sp->ssb_stat |= SSB_ST_RESP;
51166 sp->id = fh->fh_seq_id;
51167 } else if (sp->id != fh->fh_seq_id) {
51168 - atomic_inc(&mp->stats.seq_not_found);
51169 + atomic_inc_unchecked(&mp->stats.seq_not_found);
51170 goto rel;
51171 }
51172
51173 @@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51174 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51175
51176 if (!sp)
51177 - atomic_inc(&mp->stats.xid_not_found);
51178 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51179 else
51180 - atomic_inc(&mp->stats.non_bls_resp);
51181 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
51182
51183 fc_frame_free(fp);
51184 }
51185 @@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51186
51187 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51188 mp = ema->mp;
51189 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51190 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51191 st->fc_no_free_exch_xid +=
51192 - atomic_read(&mp->stats.no_free_exch_xid);
51193 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51194 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51195 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51196 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51197 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51198 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51199 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51200 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51201 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51202 }
51203 }
51204 EXPORT_SYMBOL(fc_exch_update_stats);
51205 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51206 index 766098a..1c6c971 100644
51207 --- a/drivers/scsi/libsas/sas_ata.c
51208 +++ b/drivers/scsi/libsas/sas_ata.c
51209 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
51210 .postreset = ata_std_postreset,
51211 .error_handler = ata_std_error_handler,
51212 .post_internal_cmd = sas_ata_post_internal,
51213 - .qc_defer = ata_std_qc_defer,
51214 + .qc_defer = ata_std_qc_defer,
51215 .qc_prep = ata_noop_qc_prep,
51216 .qc_issue = sas_ata_qc_issue,
51217 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51218 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51219 index 434e903..5a4a79b 100644
51220 --- a/drivers/scsi/lpfc/lpfc.h
51221 +++ b/drivers/scsi/lpfc/lpfc.h
51222 @@ -430,7 +430,7 @@ struct lpfc_vport {
51223 struct dentry *debug_nodelist;
51224 struct dentry *vport_debugfs_root;
51225 struct lpfc_debugfs_trc *disc_trc;
51226 - atomic_t disc_trc_cnt;
51227 + atomic_unchecked_t disc_trc_cnt;
51228 #endif
51229 uint8_t stat_data_enabled;
51230 uint8_t stat_data_blocked;
51231 @@ -880,8 +880,8 @@ struct lpfc_hba {
51232 struct timer_list fabric_block_timer;
51233 unsigned long bit_flags;
51234 #define FABRIC_COMANDS_BLOCKED 0
51235 - atomic_t num_rsrc_err;
51236 - atomic_t num_cmd_success;
51237 + atomic_unchecked_t num_rsrc_err;
51238 + atomic_unchecked_t num_cmd_success;
51239 unsigned long last_rsrc_error_time;
51240 unsigned long last_ramp_down_time;
51241 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51242 @@ -916,7 +916,7 @@ struct lpfc_hba {
51243
51244 struct dentry *debug_slow_ring_trc;
51245 struct lpfc_debugfs_trc *slow_ring_trc;
51246 - atomic_t slow_ring_trc_cnt;
51247 + atomic_unchecked_t slow_ring_trc_cnt;
51248 /* iDiag debugfs sub-directory */
51249 struct dentry *idiag_root;
51250 struct dentry *idiag_pci_cfg;
51251 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51252 index 786a2af..562c6a2 100644
51253 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
51254 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51255 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51256
51257 #include <linux/debugfs.h>
51258
51259 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51260 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51261 static unsigned long lpfc_debugfs_start_time = 0L;
51262
51263 /* iDiag */
51264 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51265 lpfc_debugfs_enable = 0;
51266
51267 len = 0;
51268 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51269 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51270 (lpfc_debugfs_max_disc_trc - 1);
51271 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51272 dtp = vport->disc_trc + i;
51273 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51274 lpfc_debugfs_enable = 0;
51275
51276 len = 0;
51277 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51278 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51279 (lpfc_debugfs_max_slow_ring_trc - 1);
51280 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51281 dtp = phba->slow_ring_trc + i;
51282 @@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51283 !vport || !vport->disc_trc)
51284 return;
51285
51286 - index = atomic_inc_return(&vport->disc_trc_cnt) &
51287 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51288 (lpfc_debugfs_max_disc_trc - 1);
51289 dtp = vport->disc_trc + index;
51290 dtp->fmt = fmt;
51291 dtp->data1 = data1;
51292 dtp->data2 = data2;
51293 dtp->data3 = data3;
51294 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51295 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51296 dtp->jif = jiffies;
51297 #endif
51298 return;
51299 @@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51300 !phba || !phba->slow_ring_trc)
51301 return;
51302
51303 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51304 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51305 (lpfc_debugfs_max_slow_ring_trc - 1);
51306 dtp = phba->slow_ring_trc + index;
51307 dtp->fmt = fmt;
51308 dtp->data1 = data1;
51309 dtp->data2 = data2;
51310 dtp->data3 = data3;
51311 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51312 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51313 dtp->jif = jiffies;
51314 #endif
51315 return;
51316 @@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51317 "slow_ring buffer\n");
51318 goto debug_failed;
51319 }
51320 - atomic_set(&phba->slow_ring_trc_cnt, 0);
51321 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51322 memset(phba->slow_ring_trc, 0,
51323 (sizeof(struct lpfc_debugfs_trc) *
51324 lpfc_debugfs_max_slow_ring_trc));
51325 @@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51326 "buffer\n");
51327 goto debug_failed;
51328 }
51329 - atomic_set(&vport->disc_trc_cnt, 0);
51330 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51331
51332 snprintf(name, sizeof(name), "discovery_trace");
51333 vport->debug_disc_trc =
51334 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51335 index 0b2c53a..aec2b45 100644
51336 --- a/drivers/scsi/lpfc/lpfc_init.c
51337 +++ b/drivers/scsi/lpfc/lpfc_init.c
51338 @@ -11290,8 +11290,10 @@ lpfc_init(void)
51339 "misc_register returned with status %d", error);
51340
51341 if (lpfc_enable_npiv) {
51342 - lpfc_transport_functions.vport_create = lpfc_vport_create;
51343 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51344 + pax_open_kernel();
51345 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51346 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51347 + pax_close_kernel();
51348 }
51349 lpfc_transport_template =
51350 fc_attach_transport(&lpfc_transport_functions);
51351 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51352 index b99399f..d29dc75 100644
51353 --- a/drivers/scsi/lpfc/lpfc_scsi.c
51354 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
51355 @@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51356 unsigned long expires;
51357
51358 spin_lock_irqsave(&phba->hbalock, flags);
51359 - atomic_inc(&phba->num_rsrc_err);
51360 + atomic_inc_unchecked(&phba->num_rsrc_err);
51361 phba->last_rsrc_error_time = jiffies;
51362
51363 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51364 @@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51365 unsigned long num_rsrc_err, num_cmd_success;
51366 int i;
51367
51368 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51369 - num_cmd_success = atomic_read(&phba->num_cmd_success);
51370 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51371 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51372
51373 /*
51374 * The error and success command counters are global per
51375 @@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51376 }
51377 }
51378 lpfc_destroy_vport_work_array(phba, vports);
51379 - atomic_set(&phba->num_rsrc_err, 0);
51380 - atomic_set(&phba->num_cmd_success, 0);
51381 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
51382 + atomic_set_unchecked(&phba->num_cmd_success, 0);
51383 }
51384
51385 /**
51386 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51387 index c80ed04..e674f01 100644
51388 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51389 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51390 @@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
51391 {
51392 struct scsi_device *sdev = to_scsi_device(dev);
51393 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51394 - static struct _raid_device *raid_device;
51395 + struct _raid_device *raid_device;
51396 unsigned long flags;
51397 Mpi2RaidVolPage0_t vol_pg0;
51398 Mpi2ConfigReply_t mpi_reply;
51399 @@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
51400 {
51401 struct scsi_device *sdev = to_scsi_device(dev);
51402 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51403 - static struct _raid_device *raid_device;
51404 + struct _raid_device *raid_device;
51405 unsigned long flags;
51406 Mpi2RaidVolPage0_t vol_pg0;
51407 Mpi2ConfigReply_t mpi_reply;
51408 @@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51409 Mpi2EventDataIrOperationStatus_t *event_data =
51410 (Mpi2EventDataIrOperationStatus_t *)
51411 fw_event->event_data;
51412 - static struct _raid_device *raid_device;
51413 + struct _raid_device *raid_device;
51414 unsigned long flags;
51415 u16 handle;
51416
51417 @@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51418 u64 sas_address;
51419 struct _sas_device *sas_device;
51420 struct _sas_node *expander_device;
51421 - static struct _raid_device *raid_device;
51422 + struct _raid_device *raid_device;
51423 u8 retry_count;
51424 unsigned long flags;
51425
51426 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51427 index bcb64eb..f08cf71 100644
51428 --- a/drivers/scsi/pmcraid.c
51429 +++ b/drivers/scsi/pmcraid.c
51430 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51431 res->scsi_dev = scsi_dev;
51432 scsi_dev->hostdata = res;
51433 res->change_detected = 0;
51434 - atomic_set(&res->read_failures, 0);
51435 - atomic_set(&res->write_failures, 0);
51436 + atomic_set_unchecked(&res->read_failures, 0);
51437 + atomic_set_unchecked(&res->write_failures, 0);
51438 rc = 0;
51439 }
51440 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51441 @@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51442
51443 /* If this was a SCSI read/write command keep count of errors */
51444 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51445 - atomic_inc(&res->read_failures);
51446 + atomic_inc_unchecked(&res->read_failures);
51447 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51448 - atomic_inc(&res->write_failures);
51449 + atomic_inc_unchecked(&res->write_failures);
51450
51451 if (!RES_IS_GSCSI(res->cfg_entry) &&
51452 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51453 @@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
51454 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51455 * hrrq_id assigned here in queuecommand
51456 */
51457 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51458 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51459 pinstance->num_hrrq;
51460 cmd->cmd_done = pmcraid_io_done;
51461
51462 @@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
51463 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51464 * hrrq_id assigned here in queuecommand
51465 */
51466 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51467 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51468 pinstance->num_hrrq;
51469
51470 if (request_size) {
51471 @@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51472
51473 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51474 /* add resources only after host is added into system */
51475 - if (!atomic_read(&pinstance->expose_resources))
51476 + if (!atomic_read_unchecked(&pinstance->expose_resources))
51477 return;
51478
51479 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51480 @@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51481 init_waitqueue_head(&pinstance->reset_wait_q);
51482
51483 atomic_set(&pinstance->outstanding_cmds, 0);
51484 - atomic_set(&pinstance->last_message_id, 0);
51485 - atomic_set(&pinstance->expose_resources, 0);
51486 + atomic_set_unchecked(&pinstance->last_message_id, 0);
51487 + atomic_set_unchecked(&pinstance->expose_resources, 0);
51488
51489 INIT_LIST_HEAD(&pinstance->free_res_q);
51490 INIT_LIST_HEAD(&pinstance->used_res_q);
51491 @@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51492 /* Schedule worker thread to handle CCN and take care of adding and
51493 * removing devices to OS
51494 */
51495 - atomic_set(&pinstance->expose_resources, 1);
51496 + atomic_set_unchecked(&pinstance->expose_resources, 1);
51497 schedule_work(&pinstance->worker_q);
51498 return rc;
51499
51500 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51501 index e1d150f..6c6df44 100644
51502 --- a/drivers/scsi/pmcraid.h
51503 +++ b/drivers/scsi/pmcraid.h
51504 @@ -748,7 +748,7 @@ struct pmcraid_instance {
51505 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
51506
51507 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
51508 - atomic_t last_message_id;
51509 + atomic_unchecked_t last_message_id;
51510
51511 /* configuration table */
51512 struct pmcraid_config_table *cfg_table;
51513 @@ -777,7 +777,7 @@ struct pmcraid_instance {
51514 atomic_t outstanding_cmds;
51515
51516 /* should add/delete resources to mid-layer now ?*/
51517 - atomic_t expose_resources;
51518 + atomic_unchecked_t expose_resources;
51519
51520
51521
51522 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
51523 struct pmcraid_config_table_entry_ext cfg_entry_ext;
51524 };
51525 struct scsi_device *scsi_dev; /* Link scsi_device structure */
51526 - atomic_t read_failures; /* count of failed READ commands */
51527 - atomic_t write_failures; /* count of failed WRITE commands */
51528 + atomic_unchecked_t read_failures; /* count of failed READ commands */
51529 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
51530
51531 /* To indicate add/delete/modify during CCN */
51532 u8 change_detected;
51533 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
51534 index 82b92c4..3178171 100644
51535 --- a/drivers/scsi/qla2xxx/qla_attr.c
51536 +++ b/drivers/scsi/qla2xxx/qla_attr.c
51537 @@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
51538 return 0;
51539 }
51540
51541 -struct fc_function_template qla2xxx_transport_functions = {
51542 +fc_function_template_no_const qla2xxx_transport_functions = {
51543
51544 .show_host_node_name = 1,
51545 .show_host_port_name = 1,
51546 @@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
51547 .bsg_timeout = qla24xx_bsg_timeout,
51548 };
51549
51550 -struct fc_function_template qla2xxx_transport_vport_functions = {
51551 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
51552
51553 .show_host_node_name = 1,
51554 .show_host_port_name = 1,
51555 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
51556 index b1865a7..a7723d3 100644
51557 --- a/drivers/scsi/qla2xxx/qla_gbl.h
51558 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
51559 @@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
51560 struct device_attribute;
51561 extern struct device_attribute *qla2x00_host_attrs[];
51562 struct fc_function_template;
51563 -extern struct fc_function_template qla2xxx_transport_functions;
51564 -extern struct fc_function_template qla2xxx_transport_vport_functions;
51565 +extern fc_function_template_no_const qla2xxx_transport_functions;
51566 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
51567 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
51568 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
51569 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
51570 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
51571 index db3dbd9..2492392 100644
51572 --- a/drivers/scsi/qla2xxx/qla_os.c
51573 +++ b/drivers/scsi/qla2xxx/qla_os.c
51574 @@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
51575 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
51576 /* Ok, a 64bit DMA mask is applicable. */
51577 ha->flags.enable_64bit_addressing = 1;
51578 - ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51579 - ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51580 + pax_open_kernel();
51581 + *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51582 + *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51583 + pax_close_kernel();
51584 return;
51585 }
51586 }
51587 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
51588 index 8f6d0fb..1b21097 100644
51589 --- a/drivers/scsi/qla4xxx/ql4_def.h
51590 +++ b/drivers/scsi/qla4xxx/ql4_def.h
51591 @@ -305,7 +305,7 @@ struct ddb_entry {
51592 * (4000 only) */
51593 atomic_t relogin_timer; /* Max Time to wait for
51594 * relogin to complete */
51595 - atomic_t relogin_retry_count; /* Num of times relogin has been
51596 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
51597 * retried */
51598 uint32_t default_time2wait; /* Default Min time between
51599 * relogins (+aens) */
51600 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
51601 index 199fcf7..3c3a918 100644
51602 --- a/drivers/scsi/qla4xxx/ql4_os.c
51603 +++ b/drivers/scsi/qla4xxx/ql4_os.c
51604 @@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
51605 */
51606 if (!iscsi_is_session_online(cls_sess)) {
51607 /* Reset retry relogin timer */
51608 - atomic_inc(&ddb_entry->relogin_retry_count);
51609 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
51610 DEBUG2(ql4_printk(KERN_INFO, ha,
51611 "%s: index[%d] relogin timed out-retrying"
51612 " relogin (%d), retry (%d)\n", __func__,
51613 ddb_entry->fw_ddb_index,
51614 - atomic_read(&ddb_entry->relogin_retry_count),
51615 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
51616 ddb_entry->default_time2wait + 4));
51617 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
51618 atomic_set(&ddb_entry->retry_relogin_timer,
51619 @@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
51620
51621 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
51622 atomic_set(&ddb_entry->relogin_timer, 0);
51623 - atomic_set(&ddb_entry->relogin_retry_count, 0);
51624 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
51625 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
51626 ddb_entry->default_relogin_timeout =
51627 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
51628 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
51629 index 79c77b4..ef6ec0b 100644
51630 --- a/drivers/scsi/scsi.c
51631 +++ b/drivers/scsi/scsi.c
51632 @@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
51633 struct Scsi_Host *host = cmd->device->host;
51634 int rtn = 0;
51635
51636 - atomic_inc(&cmd->device->iorequest_cnt);
51637 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51638
51639 /* check if the device is still usable */
51640 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
51641 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
51642 index 50a6e1a..de5252e 100644
51643 --- a/drivers/scsi/scsi_lib.c
51644 +++ b/drivers/scsi/scsi_lib.c
51645 @@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
51646 shost = sdev->host;
51647 scsi_init_cmd_errh(cmd);
51648 cmd->result = DID_NO_CONNECT << 16;
51649 - atomic_inc(&cmd->device->iorequest_cnt);
51650 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51651
51652 /*
51653 * SCSI request completion path will do scsi_device_unbusy(),
51654 @@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
51655
51656 INIT_LIST_HEAD(&cmd->eh_entry);
51657
51658 - atomic_inc(&cmd->device->iodone_cnt);
51659 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
51660 if (cmd->result)
51661 - atomic_inc(&cmd->device->ioerr_cnt);
51662 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
51663
51664 disposition = scsi_decide_disposition(cmd);
51665 if (disposition != SUCCESS &&
51666 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
51667 index f4cb7b3..dfa79c4 100644
51668 --- a/drivers/scsi/scsi_sysfs.c
51669 +++ b/drivers/scsi/scsi_sysfs.c
51670 @@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
51671 char *buf) \
51672 { \
51673 struct scsi_device *sdev = to_scsi_device(dev); \
51674 - unsigned long long count = atomic_read(&sdev->field); \
51675 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
51676 return snprintf(buf, 20, "0x%llx\n", count); \
51677 } \
51678 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
51679 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
51680 index 5d6f348..18778a6b 100644
51681 --- a/drivers/scsi/scsi_transport_fc.c
51682 +++ b/drivers/scsi/scsi_transport_fc.c
51683 @@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
51684 * Netlink Infrastructure
51685 */
51686
51687 -static atomic_t fc_event_seq;
51688 +static atomic_unchecked_t fc_event_seq;
51689
51690 /**
51691 * fc_get_event_number - Obtain the next sequential FC event number
51692 @@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
51693 u32
51694 fc_get_event_number(void)
51695 {
51696 - return atomic_add_return(1, &fc_event_seq);
51697 + return atomic_add_return_unchecked(1, &fc_event_seq);
51698 }
51699 EXPORT_SYMBOL(fc_get_event_number);
51700
51701 @@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
51702 {
51703 int error;
51704
51705 - atomic_set(&fc_event_seq, 0);
51706 + atomic_set_unchecked(&fc_event_seq, 0);
51707
51708 error = transport_class_register(&fc_host_class);
51709 if (error)
51710 @@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
51711 char *cp;
51712
51713 *val = simple_strtoul(buf, &cp, 0);
51714 - if ((*cp && (*cp != '\n')) || (*val < 0))
51715 + if (*cp && (*cp != '\n'))
51716 return -EINVAL;
51717 /*
51718 * Check for overflow; dev_loss_tmo is u32
51719 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
51720 index 67d43e3..8cee73c 100644
51721 --- a/drivers/scsi/scsi_transport_iscsi.c
51722 +++ b/drivers/scsi/scsi_transport_iscsi.c
51723 @@ -79,7 +79,7 @@ struct iscsi_internal {
51724 struct transport_container session_cont;
51725 };
51726
51727 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
51728 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
51729 static struct workqueue_struct *iscsi_eh_timer_workq;
51730
51731 static DEFINE_IDA(iscsi_sess_ida);
51732 @@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
51733 int err;
51734
51735 ihost = shost->shost_data;
51736 - session->sid = atomic_add_return(1, &iscsi_session_nr);
51737 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
51738
51739 if (target_id == ISCSI_MAX_TARGET) {
51740 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
51741 @@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
51742 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
51743 ISCSI_TRANSPORT_VERSION);
51744
51745 - atomic_set(&iscsi_session_nr, 0);
51746 + atomic_set_unchecked(&iscsi_session_nr, 0);
51747
51748 err = class_register(&iscsi_transport_class);
51749 if (err)
51750 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
51751 index ae45bd9..c32a586 100644
51752 --- a/drivers/scsi/scsi_transport_srp.c
51753 +++ b/drivers/scsi/scsi_transport_srp.c
51754 @@ -35,7 +35,7 @@
51755 #include "scsi_priv.h"
51756
51757 struct srp_host_attrs {
51758 - atomic_t next_port_id;
51759 + atomic_unchecked_t next_port_id;
51760 };
51761 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
51762
51763 @@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
51764 struct Scsi_Host *shost = dev_to_shost(dev);
51765 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
51766
51767 - atomic_set(&srp_host->next_port_id, 0);
51768 + atomic_set_unchecked(&srp_host->next_port_id, 0);
51769 return 0;
51770 }
51771
51772 @@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
51773 rport_fast_io_fail_timedout);
51774 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
51775
51776 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
51777 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
51778 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
51779
51780 transport_setup_device(&rport->dev);
51781 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
51782 index cfba74c..415f09b 100644
51783 --- a/drivers/scsi/sd.c
51784 +++ b/drivers/scsi/sd.c
51785 @@ -3022,7 +3022,7 @@ static int sd_probe(struct device *dev)
51786 sdkp->disk = gd;
51787 sdkp->index = index;
51788 atomic_set(&sdkp->openers, 0);
51789 - atomic_set(&sdkp->device->ioerr_cnt, 0);
51790 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
51791
51792 if (!sdp->request_queue->rq_timeout) {
51793 if (sdp->type != TYPE_MOD)
51794 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
51795 index 6035444..c82edd4 100644
51796 --- a/drivers/scsi/sg.c
51797 +++ b/drivers/scsi/sg.c
51798 @@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
51799 sdp->disk->disk_name,
51800 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
51801 NULL,
51802 - (char *)arg);
51803 + (char __user *)arg);
51804 case BLKTRACESTART:
51805 return blk_trace_startstop(sdp->device->request_queue, 1);
51806 case BLKTRACESTOP:
51807 diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
51808 index 11a5043..e36f04c 100644
51809 --- a/drivers/soc/tegra/fuse/fuse-tegra.c
51810 +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
51811 @@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
51812 return i;
51813 }
51814
51815 -static struct bin_attribute fuse_bin_attr = {
51816 +static bin_attribute_no_const fuse_bin_attr = {
51817 .attr = { .name = "fuse", .mode = S_IRUGO, },
51818 .read = fuse_read,
51819 };
51820 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
51821 index 50f20f2..6bd81e0 100644
51822 --- a/drivers/spi/spi.c
51823 +++ b/drivers/spi/spi.c
51824 @@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
51825 EXPORT_SYMBOL_GPL(spi_bus_unlock);
51826
51827 /* portable code must never pass more than 32 bytes */
51828 -#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
51829 +#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
51830
51831 static u8 *buf;
51832
51833 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
51834 index b41429f..2de5373 100644
51835 --- a/drivers/staging/android/timed_output.c
51836 +++ b/drivers/staging/android/timed_output.c
51837 @@ -25,7 +25,7 @@
51838 #include "timed_output.h"
51839
51840 static struct class *timed_output_class;
51841 -static atomic_t device_count;
51842 +static atomic_unchecked_t device_count;
51843
51844 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
51845 char *buf)
51846 @@ -65,7 +65,7 @@ static int create_timed_output_class(void)
51847 timed_output_class = class_create(THIS_MODULE, "timed_output");
51848 if (IS_ERR(timed_output_class))
51849 return PTR_ERR(timed_output_class);
51850 - atomic_set(&device_count, 0);
51851 + atomic_set_unchecked(&device_count, 0);
51852 timed_output_class->dev_groups = timed_output_groups;
51853 }
51854
51855 @@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
51856 if (ret < 0)
51857 return ret;
51858
51859 - tdev->index = atomic_inc_return(&device_count);
51860 + tdev->index = atomic_inc_return_unchecked(&device_count);
51861 tdev->dev = device_create(timed_output_class, NULL,
51862 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
51863 if (IS_ERR(tdev->dev))
51864 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
51865 index 001348c..cfaac8a 100644
51866 --- a/drivers/staging/gdm724x/gdm_tty.c
51867 +++ b/drivers/staging/gdm724x/gdm_tty.c
51868 @@ -44,7 +44,7 @@
51869 #define gdm_tty_send_control(n, r, v, d, l) (\
51870 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
51871
51872 -#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
51873 +#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
51874
51875 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
51876 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
51877 diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
51878 index 9cb222e..8766f26 100644
51879 --- a/drivers/staging/imx-drm/imx-drm-core.c
51880 +++ b/drivers/staging/imx-drm/imx-drm-core.c
51881 @@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
51882 if (imxdrm->pipes >= MAX_CRTC)
51883 return -EINVAL;
51884
51885 - if (imxdrm->drm->open_count)
51886 + if (local_read(&imxdrm->drm->open_count))
51887 return -EBUSY;
51888
51889 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
51890 diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
51891 index 503b2d7..c918745 100644
51892 --- a/drivers/staging/line6/driver.c
51893 +++ b/drivers/staging/line6/driver.c
51894 @@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51895 {
51896 struct usb_device *usbdev = line6->usbdev;
51897 int ret;
51898 - unsigned char len;
51899 + unsigned char *plen;
51900
51901 /* query the serial number: */
51902 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
51903 @@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51904 return ret;
51905 }
51906
51907 + plen = kmalloc(1, GFP_KERNEL);
51908 + if (plen == NULL)
51909 + return -ENOMEM;
51910 +
51911 /* Wait for data length. We'll get 0xff until length arrives. */
51912 do {
51913 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51914 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
51915 USB_DIR_IN,
51916 - 0x0012, 0x0000, &len, 1,
51917 + 0x0012, 0x0000, plen, 1,
51918 LINE6_TIMEOUT * HZ);
51919 if (ret < 0) {
51920 dev_err(line6->ifcdev,
51921 "receive length failed (error %d)\n", ret);
51922 + kfree(plen);
51923 return ret;
51924 }
51925 - } while (len == 0xff);
51926 + } while (*plen == 0xff);
51927
51928 - if (len != datalen) {
51929 + if (*plen != datalen) {
51930 /* should be equal or something went wrong */
51931 dev_err(line6->ifcdev,
51932 "length mismatch (expected %d, got %d)\n",
51933 - (int)datalen, (int)len);
51934 + (int)datalen, (int)*plen);
51935 + kfree(plen);
51936 return -EINVAL;
51937 }
51938 + kfree(plen);
51939
51940 /* receive the result: */
51941 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51942 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
51943 index a94f336..6a1924d 100644
51944 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
51945 +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
51946 @@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
51947 return 0;
51948 }
51949
51950 -sfw_test_client_ops_t brw_test_client;
51951 -void brw_init_test_client(void)
51952 -{
51953 - brw_test_client.tso_init = brw_client_init;
51954 - brw_test_client.tso_fini = brw_client_fini;
51955 - brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
51956 - brw_test_client.tso_done_rpc = brw_client_done_rpc;
51957 +sfw_test_client_ops_t brw_test_client = {
51958 + .tso_init = brw_client_init,
51959 + .tso_fini = brw_client_fini,
51960 + .tso_prep_rpc = brw_client_prep_rpc,
51961 + .tso_done_rpc = brw_client_done_rpc,
51962 };
51963
51964 srpc_service_t brw_test_service;
51965 diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
51966 index df04ab7..1deb1ac 100644
51967 --- a/drivers/staging/lustre/lnet/selftest/framework.c
51968 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
51969 @@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
51970
51971 extern sfw_test_client_ops_t ping_test_client;
51972 extern srpc_service_t ping_test_service;
51973 -extern void ping_init_test_client(void);
51974 extern void ping_init_test_service(void);
51975
51976 extern sfw_test_client_ops_t brw_test_client;
51977 extern srpc_service_t brw_test_service;
51978 -extern void brw_init_test_client(void);
51979 extern void brw_init_test_service(void);
51980
51981
51982 @@ -1681,12 +1679,10 @@ sfw_startup (void)
51983 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
51984 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
51985
51986 - brw_init_test_client();
51987 brw_init_test_service();
51988 rc = sfw_register_test(&brw_test_service, &brw_test_client);
51989 LASSERT (rc == 0);
51990
51991 - ping_init_test_client();
51992 ping_init_test_service();
51993 rc = sfw_register_test(&ping_test_service, &ping_test_client);
51994 LASSERT (rc == 0);
51995 diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
51996 index 750cac4..e4d751f 100644
51997 --- a/drivers/staging/lustre/lnet/selftest/ping_test.c
51998 +++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
51999 @@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52000 return 0;
52001 }
52002
52003 -sfw_test_client_ops_t ping_test_client;
52004 -void ping_init_test_client(void)
52005 -{
52006 - ping_test_client.tso_init = ping_client_init;
52007 - ping_test_client.tso_fini = ping_client_fini;
52008 - ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52009 - ping_test_client.tso_done_rpc = ping_client_done_rpc;
52010 -}
52011 +sfw_test_client_ops_t ping_test_client = {
52012 + .tso_init = ping_client_init,
52013 + .tso_fini = ping_client_fini,
52014 + .tso_prep_rpc = ping_client_prep_rpc,
52015 + .tso_done_rpc = ping_client_done_rpc,
52016 +};
52017
52018 srpc_service_t ping_test_service;
52019 void ping_init_test_service(void)
52020 diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52021 index 14ac46f..eca2c16 100644
52022 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52023 +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52024 @@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52025 ldlm_completion_callback lcs_completion;
52026 ldlm_blocking_callback lcs_blocking;
52027 ldlm_glimpse_callback lcs_glimpse;
52028 -};
52029 +} __no_const;
52030
52031 /* ldlm_lockd.c */
52032 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52033 diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52034 index 2a88b80..62e7e5f 100644
52035 --- a/drivers/staging/lustre/lustre/include/obd.h
52036 +++ b/drivers/staging/lustre/lustre/include/obd.h
52037 @@ -1362,7 +1362,7 @@ struct md_ops {
52038 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52039 * wrapper function in include/linux/obd_class.h.
52040 */
52041 -};
52042 +} __no_const;
52043
52044 struct lsm_operations {
52045 void (*lsm_free)(struct lov_stripe_md *);
52046 diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52047 index b798daa..b28ca8f 100644
52048 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52049 +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52050 @@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52051 int added = (mode == LCK_NL);
52052 int overlaps = 0;
52053 int splitted = 0;
52054 - const struct ldlm_callback_suite null_cbs = { NULL };
52055 + const struct ldlm_callback_suite null_cbs = { };
52056
52057 CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52058 *flags, new->l_policy_data.l_flock.owner,
52059 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52060 index bbe2c68..c6b4275 100644
52061 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52062 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52063 @@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52064 void __user *buffer, size_t *lenp, loff_t *ppos)
52065 {
52066 int rc, max_delay_cs;
52067 - struct ctl_table dummy = *table;
52068 + ctl_table_no_const dummy = *table;
52069 long d;
52070
52071 dummy.data = &max_delay_cs;
52072 @@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52073 void __user *buffer, size_t *lenp, loff_t *ppos)
52074 {
52075 int rc, min_delay_cs;
52076 - struct ctl_table dummy = *table;
52077 + ctl_table_no_const dummy = *table;
52078 long d;
52079
52080 dummy.data = &min_delay_cs;
52081 @@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52082 void __user *buffer, size_t *lenp, loff_t *ppos)
52083 {
52084 int rc, backoff;
52085 - struct ctl_table dummy = *table;
52086 + ctl_table_no_const dummy = *table;
52087
52088 dummy.data = &backoff;
52089 dummy.proc_handler = &proc_dointvec;
52090 diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52091 index 2c4fc74..b04ca79 100644
52092 --- a/drivers/staging/lustre/lustre/libcfs/module.c
52093 +++ b/drivers/staging/lustre/lustre/libcfs/module.c
52094 @@ -315,11 +315,11 @@ out:
52095
52096
52097 struct cfs_psdev_ops libcfs_psdev_ops = {
52098 - libcfs_psdev_open,
52099 - libcfs_psdev_release,
52100 - NULL,
52101 - NULL,
52102 - libcfs_ioctl
52103 + .p_open = libcfs_psdev_open,
52104 + .p_close = libcfs_psdev_release,
52105 + .p_read = NULL,
52106 + .p_write = NULL,
52107 + .p_ioctl = libcfs_ioctl
52108 };
52109
52110 extern int insert_proc(void);
52111 diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
52112 index b0bb709..0117c96 100644
52113 --- a/drivers/staging/lustre/lustre/llite/dir.c
52114 +++ b/drivers/staging/lustre/lustre/llite/dir.c
52115 @@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
52116 int mode;
52117 int err;
52118
52119 - mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
52120 + mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
52121 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
52122 strlen(filename), mode, LUSTRE_OPC_MKDIR,
52123 lump);
52124 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52125 index b2b6c3c..302e4e4 100644
52126 --- a/drivers/staging/octeon/ethernet-rx.c
52127 +++ b/drivers/staging/octeon/ethernet-rx.c
52128 @@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52129 /* Increment RX stats for virtual ports */
52130 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52131 #ifdef CONFIG_64BIT
52132 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
52133 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
52134 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
52135 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
52136 #else
52137 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
52138 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
52139 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
52140 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
52141 #endif
52142 }
52143 netif_receive_skb(skb);
52144 @@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52145 dev->name);
52146 */
52147 #ifdef CONFIG_64BIT
52148 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
52149 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52150 #else
52151 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
52152 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
52153 #endif
52154 dev_kfree_skb_irq(skb);
52155 }
52156 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52157 index 8f9e3fb..d283fb9 100644
52158 --- a/drivers/staging/octeon/ethernet.c
52159 +++ b/drivers/staging/octeon/ethernet.c
52160 @@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52161 * since the RX tasklet also increments it.
52162 */
52163 #ifdef CONFIG_64BIT
52164 - atomic64_add(rx_status.dropped_packets,
52165 - (atomic64_t *)&priv->stats.rx_dropped);
52166 + atomic64_add_unchecked(rx_status.dropped_packets,
52167 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52168 #else
52169 - atomic_add(rx_status.dropped_packets,
52170 - (atomic_t *)&priv->stats.rx_dropped);
52171 + atomic_add_unchecked(rx_status.dropped_packets,
52172 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
52173 #endif
52174 }
52175
52176 diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52177 index 9191993..30e9817 100644
52178 --- a/drivers/staging/rtl8188eu/include/hal_intf.h
52179 +++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52180 @@ -225,7 +225,7 @@ struct hal_ops {
52181
52182 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52183 void (*hal_reset_security_engine)(struct adapter *adapter);
52184 -};
52185 +} __no_const;
52186
52187 enum rt_eeprom_type {
52188 EEPROM_93C46,
52189 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52190 index 070cc03..6806e37 100644
52191 --- a/drivers/staging/rtl8712/rtl871x_io.h
52192 +++ b/drivers/staging/rtl8712/rtl871x_io.h
52193 @@ -108,7 +108,7 @@ struct _io_ops {
52194 u8 *pmem);
52195 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52196 u8 *pmem);
52197 -};
52198 +} __no_const;
52199
52200 struct io_req {
52201 struct list_head list;
52202 diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52203 index 2bf2e2f..84421c9 100644
52204 --- a/drivers/staging/unisys/visorchipset/visorchipset.h
52205 +++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52206 @@ -228,7 +228,7 @@ typedef struct {
52207 void (*device_resume)(ulong busNo, ulong devNo);
52208 int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
52209 ulong *maxSize);
52210 -} VISORCHIPSET_BUSDEV_NOTIFIERS;
52211 +} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
52212
52213 /* These functions live inside visorchipset, and will be called to indicate
52214 * responses to specific events (by code outside of visorchipset).
52215 @@ -243,7 +243,7 @@ typedef struct {
52216 void (*device_destroy)(ulong busNo, ulong devNo, int response);
52217 void (*device_pause)(ulong busNo, ulong devNo, int response);
52218 void (*device_resume)(ulong busNo, ulong devNo, int response);
52219 -} VISORCHIPSET_BUSDEV_RESPONDERS;
52220 +} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
52221
52222 /** Register functions (in the bus driver) to get called by visorchipset
52223 * whenever a bus or device appears for which this service partition is
52224 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
52225 index ae0dade..803d53a 100644
52226 --- a/drivers/staging/vt6655/hostap.c
52227 +++ b/drivers/staging/vt6655/hostap.c
52228 @@ -65,14 +65,13 @@
52229 *
52230 */
52231
52232 +static net_device_ops_no_const apdev_netdev_ops;
52233 +
52234 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52235 {
52236 struct vnt_private *apdev_priv;
52237 struct net_device *dev = pDevice->dev;
52238 int ret;
52239 - const struct net_device_ops apdev_netdev_ops = {
52240 - .ndo_start_xmit = pDevice->tx_80211,
52241 - };
52242
52243 pr_debug("%s: Enabling hostapd mode\n", dev->name);
52244
52245 @@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52246 *apdev_priv = *pDevice;
52247 eth_hw_addr_inherit(pDevice->apdev, dev);
52248
52249 + /* only half broken now */
52250 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
52251 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
52252
52253 pDevice->apdev->type = ARPHRD_IEEE80211;
52254 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52255 index e7e9372..161f530 100644
52256 --- a/drivers/target/sbp/sbp_target.c
52257 +++ b/drivers/target/sbp/sbp_target.c
52258 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52259
52260 #define SESSION_MAINTENANCE_INTERVAL HZ
52261
52262 -static atomic_t login_id = ATOMIC_INIT(0);
52263 +static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52264
52265 static void session_maintenance_work(struct work_struct *);
52266 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52267 @@ -444,7 +444,7 @@ static void sbp_management_request_login(
52268 login->lun = se_lun;
52269 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52270 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52271 - login->login_id = atomic_inc_return(&login_id);
52272 + login->login_id = atomic_inc_return_unchecked(&login_id);
52273
52274 login->tgt_agt = sbp_target_agent_register(login);
52275 if (IS_ERR(login->tgt_agt)) {
52276 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52277 index c45f9e9..00e85f0 100644
52278 --- a/drivers/target/target_core_device.c
52279 +++ b/drivers/target/target_core_device.c
52280 @@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52281 spin_lock_init(&dev->se_tmr_lock);
52282 spin_lock_init(&dev->qf_cmd_lock);
52283 sema_init(&dev->caw_sem, 1);
52284 - atomic_set(&dev->dev_ordered_id, 0);
52285 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
52286 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52287 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52288 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52289 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52290 index be877bf..7be9cd4 100644
52291 --- a/drivers/target/target_core_transport.c
52292 +++ b/drivers/target/target_core_transport.c
52293 @@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52294 * Used to determine when ORDERED commands should go from
52295 * Dormant to Active status.
52296 */
52297 - cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52298 + cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52299 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52300 cmd->se_ordered_id, cmd->sam_task_attr,
52301 dev->transport->name);
52302 diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52303 index edc1cce..769e4cb 100644
52304 --- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52305 +++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52306 @@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52307 platform_set_drvdata(pdev, priv);
52308
52309 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52310 - int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52311 - int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52312 + pax_open_kernel();
52313 + *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52314 + *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52315 + pax_close_kernel();
52316 }
52317 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52318 priv, &int3400_thermal_ops,
52319 diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52320 index 62143ba..ae21165 100644
52321 --- a/drivers/thermal/of-thermal.c
52322 +++ b/drivers/thermal/of-thermal.c
52323 @@ -30,6 +30,7 @@
52324 #include <linux/err.h>
52325 #include <linux/export.h>
52326 #include <linux/string.h>
52327 +#include <linux/mm.h>
52328
52329 #include "thermal_core.h"
52330
52331 @@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52332 tz->get_trend = get_trend;
52333 tz->sensor_data = data;
52334
52335 - tzd->ops->get_temp = of_thermal_get_temp;
52336 - tzd->ops->get_trend = of_thermal_get_trend;
52337 + pax_open_kernel();
52338 + *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52339 + *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52340 + pax_close_kernel();
52341 mutex_unlock(&tzd->lock);
52342
52343 return tzd;
52344 @@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52345 return;
52346
52347 mutex_lock(&tzd->lock);
52348 - tzd->ops->get_temp = NULL;
52349 - tzd->ops->get_trend = NULL;
52350 + pax_open_kernel();
52351 + *(void **)&tzd->ops->get_temp = NULL;
52352 + *(void **)&tzd->ops->get_trend = NULL;
52353 + pax_close_kernel();
52354
52355 tz->get_temp = NULL;
52356 tz->get_trend = NULL;
52357 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52358 index fd66f57..48e6376 100644
52359 --- a/drivers/tty/cyclades.c
52360 +++ b/drivers/tty/cyclades.c
52361 @@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52362 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52363 info->port.count);
52364 #endif
52365 - info->port.count++;
52366 + atomic_inc(&info->port.count);
52367 #ifdef CY_DEBUG_COUNT
52368 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52369 - current->pid, info->port.count);
52370 + current->pid, atomic_read(&info->port.count));
52371 #endif
52372
52373 /*
52374 @@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52375 for (j = 0; j < cy_card[i].nports; j++) {
52376 info = &cy_card[i].ports[j];
52377
52378 - if (info->port.count) {
52379 + if (atomic_read(&info->port.count)) {
52380 /* XXX is the ldisc num worth this? */
52381 struct tty_struct *tty;
52382 struct tty_ldisc *ld;
52383 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52384 index 4fcec1d..5a036f7 100644
52385 --- a/drivers/tty/hvc/hvc_console.c
52386 +++ b/drivers/tty/hvc/hvc_console.c
52387 @@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52388
52389 spin_lock_irqsave(&hp->port.lock, flags);
52390 /* Check and then increment for fast path open. */
52391 - if (hp->port.count++ > 0) {
52392 + if (atomic_inc_return(&hp->port.count) > 1) {
52393 spin_unlock_irqrestore(&hp->port.lock, flags);
52394 hvc_kick();
52395 return 0;
52396 @@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52397
52398 spin_lock_irqsave(&hp->port.lock, flags);
52399
52400 - if (--hp->port.count == 0) {
52401 + if (atomic_dec_return(&hp->port.count) == 0) {
52402 spin_unlock_irqrestore(&hp->port.lock, flags);
52403 /* We are done with the tty pointer now. */
52404 tty_port_tty_set(&hp->port, NULL);
52405 @@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52406 */
52407 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52408 } else {
52409 - if (hp->port.count < 0)
52410 + if (atomic_read(&hp->port.count) < 0)
52411 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52412 - hp->vtermno, hp->port.count);
52413 + hp->vtermno, atomic_read(&hp->port.count));
52414 spin_unlock_irqrestore(&hp->port.lock, flags);
52415 }
52416 }
52417 @@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52418 * open->hangup case this can be called after the final close so prevent
52419 * that from happening for now.
52420 */
52421 - if (hp->port.count <= 0) {
52422 + if (atomic_read(&hp->port.count) <= 0) {
52423 spin_unlock_irqrestore(&hp->port.lock, flags);
52424 return;
52425 }
52426
52427 - hp->port.count = 0;
52428 + atomic_set(&hp->port.count, 0);
52429 spin_unlock_irqrestore(&hp->port.lock, flags);
52430 tty_port_tty_set(&hp->port, NULL);
52431
52432 @@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
52433 return -EPIPE;
52434
52435 /* FIXME what's this (unprotected) check for? */
52436 - if (hp->port.count <= 0)
52437 + if (atomic_read(&hp->port.count) <= 0)
52438 return -EIO;
52439
52440 spin_lock_irqsave(&hp->lock, flags);
52441 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
52442 index 81e939e..95ead10 100644
52443 --- a/drivers/tty/hvc/hvcs.c
52444 +++ b/drivers/tty/hvc/hvcs.c
52445 @@ -83,6 +83,7 @@
52446 #include <asm/hvcserver.h>
52447 #include <asm/uaccess.h>
52448 #include <asm/vio.h>
52449 +#include <asm/local.h>
52450
52451 /*
52452 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
52453 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
52454
52455 spin_lock_irqsave(&hvcsd->lock, flags);
52456
52457 - if (hvcsd->port.count > 0) {
52458 + if (atomic_read(&hvcsd->port.count) > 0) {
52459 spin_unlock_irqrestore(&hvcsd->lock, flags);
52460 printk(KERN_INFO "HVCS: vterm state unchanged. "
52461 "The hvcs device node is still in use.\n");
52462 @@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
52463 }
52464 }
52465
52466 - hvcsd->port.count = 0;
52467 + atomic_set(&hvcsd->port.count, 0);
52468 hvcsd->port.tty = tty;
52469 tty->driver_data = hvcsd;
52470
52471 @@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
52472 unsigned long flags;
52473
52474 spin_lock_irqsave(&hvcsd->lock, flags);
52475 - hvcsd->port.count++;
52476 + atomic_inc(&hvcsd->port.count);
52477 hvcsd->todo_mask |= HVCS_SCHED_READ;
52478 spin_unlock_irqrestore(&hvcsd->lock, flags);
52479
52480 @@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52481 hvcsd = tty->driver_data;
52482
52483 spin_lock_irqsave(&hvcsd->lock, flags);
52484 - if (--hvcsd->port.count == 0) {
52485 + if (atomic_dec_and_test(&hvcsd->port.count)) {
52486
52487 vio_disable_interrupts(hvcsd->vdev);
52488
52489 @@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52490
52491 free_irq(irq, hvcsd);
52492 return;
52493 - } else if (hvcsd->port.count < 0) {
52494 + } else if (atomic_read(&hvcsd->port.count) < 0) {
52495 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
52496 " is missmanaged.\n",
52497 - hvcsd->vdev->unit_address, hvcsd->port.count);
52498 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
52499 }
52500
52501 spin_unlock_irqrestore(&hvcsd->lock, flags);
52502 @@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52503
52504 spin_lock_irqsave(&hvcsd->lock, flags);
52505 /* Preserve this so that we know how many kref refs to put */
52506 - temp_open_count = hvcsd->port.count;
52507 + temp_open_count = atomic_read(&hvcsd->port.count);
52508
52509 /*
52510 * Don't kref put inside the spinlock because the destruction
52511 @@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52512 tty->driver_data = NULL;
52513 hvcsd->port.tty = NULL;
52514
52515 - hvcsd->port.count = 0;
52516 + atomic_set(&hvcsd->port.count, 0);
52517
52518 /* This will drop any buffered data on the floor which is OK in a hangup
52519 * scenario. */
52520 @@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
52521 * the middle of a write operation? This is a crummy place to do this
52522 * but we want to keep it all in the spinlock.
52523 */
52524 - if (hvcsd->port.count <= 0) {
52525 + if (atomic_read(&hvcsd->port.count) <= 0) {
52526 spin_unlock_irqrestore(&hvcsd->lock, flags);
52527 return -ENODEV;
52528 }
52529 @@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
52530 {
52531 struct hvcs_struct *hvcsd = tty->driver_data;
52532
52533 - if (!hvcsd || hvcsd->port.count <= 0)
52534 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
52535 return 0;
52536
52537 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
52538 diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
52539 index 4190199..06d5bfa 100644
52540 --- a/drivers/tty/hvc/hvsi.c
52541 +++ b/drivers/tty/hvc/hvsi.c
52542 @@ -85,7 +85,7 @@ struct hvsi_struct {
52543 int n_outbuf;
52544 uint32_t vtermno;
52545 uint32_t virq;
52546 - atomic_t seqno; /* HVSI packet sequence number */
52547 + atomic_unchecked_t seqno; /* HVSI packet sequence number */
52548 uint16_t mctrl;
52549 uint8_t state; /* HVSI protocol state */
52550 uint8_t flags;
52551 @@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
52552
52553 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
52554 packet.hdr.len = sizeof(struct hvsi_query_response);
52555 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52556 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52557 packet.verb = VSV_SEND_VERSION_NUMBER;
52558 packet.u.version = HVSI_VERSION;
52559 packet.query_seqno = query_seqno+1;
52560 @@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
52561
52562 packet.hdr.type = VS_QUERY_PACKET_HEADER;
52563 packet.hdr.len = sizeof(struct hvsi_query);
52564 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52565 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52566 packet.verb = verb;
52567
52568 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
52569 @@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
52570 int wrote;
52571
52572 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
52573 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52574 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52575 packet.hdr.len = sizeof(struct hvsi_control);
52576 packet.verb = VSV_SET_MODEM_CTL;
52577 packet.mask = HVSI_TSDTR;
52578 @@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
52579 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
52580
52581 packet.hdr.type = VS_DATA_PACKET_HEADER;
52582 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52583 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52584 packet.hdr.len = count + sizeof(struct hvsi_header);
52585 memcpy(&packet.data, buf, count);
52586
52587 @@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
52588 struct hvsi_control packet __ALIGNED__;
52589
52590 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
52591 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52592 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52593 packet.hdr.len = 6;
52594 packet.verb = VSV_CLOSE_PROTOCOL;
52595
52596 @@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
52597
52598 tty_port_tty_set(&hp->port, tty);
52599 spin_lock_irqsave(&hp->lock, flags);
52600 - hp->port.count++;
52601 + atomic_inc(&hp->port.count);
52602 atomic_set(&hp->seqno, 0);
52603 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
52604 spin_unlock_irqrestore(&hp->lock, flags);
52605 @@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52606
52607 spin_lock_irqsave(&hp->lock, flags);
52608
52609 - if (--hp->port.count == 0) {
52610 + if (atomic_dec_return(&hp->port.count) == 0) {
52611 tty_port_tty_set(&hp->port, NULL);
52612 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
52613
52614 @@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52615
52616 spin_lock_irqsave(&hp->lock, flags);
52617 }
52618 - } else if (hp->port.count < 0)
52619 + } else if (atomic_read(&hp->port.count) < 0)
52620 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
52621 - hp - hvsi_ports, hp->port.count);
52622 + hp - hvsi_ports, atomic_read(&hp->port.count));
52623
52624 spin_unlock_irqrestore(&hp->lock, flags);
52625 }
52626 @@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
52627 tty_port_tty_set(&hp->port, NULL);
52628
52629 spin_lock_irqsave(&hp->lock, flags);
52630 - hp->port.count = 0;
52631 + atomic_set(&hp->port.count, 0);
52632 hp->n_outbuf = 0;
52633 spin_unlock_irqrestore(&hp->lock, flags);
52634 }
52635 diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
52636 index 7ae6c29..05c6dba 100644
52637 --- a/drivers/tty/hvc/hvsi_lib.c
52638 +++ b/drivers/tty/hvc/hvsi_lib.c
52639 @@ -8,7 +8,7 @@
52640
52641 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
52642 {
52643 - packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
52644 + packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
52645
52646 /* Assumes that always succeeds, works in practice */
52647 return pv->put_chars(pv->termno, (char *)packet, packet->len);
52648 @@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
52649
52650 /* Reset state */
52651 pv->established = 0;
52652 - atomic_set(&pv->seqno, 0);
52653 + atomic_set_unchecked(&pv->seqno, 0);
52654
52655 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
52656
52657 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
52658 index 345cebb..d5a1e9e 100644
52659 --- a/drivers/tty/ipwireless/tty.c
52660 +++ b/drivers/tty/ipwireless/tty.c
52661 @@ -28,6 +28,7 @@
52662 #include <linux/tty_driver.h>
52663 #include <linux/tty_flip.h>
52664 #include <linux/uaccess.h>
52665 +#include <asm/local.h>
52666
52667 #include "tty.h"
52668 #include "network.h"
52669 @@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52670 return -ENODEV;
52671
52672 mutex_lock(&tty->ipw_tty_mutex);
52673 - if (tty->port.count == 0)
52674 + if (atomic_read(&tty->port.count) == 0)
52675 tty->tx_bytes_queued = 0;
52676
52677 - tty->port.count++;
52678 + atomic_inc(&tty->port.count);
52679
52680 tty->port.tty = linux_tty;
52681 linux_tty->driver_data = tty;
52682 @@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52683
52684 static void do_ipw_close(struct ipw_tty *tty)
52685 {
52686 - tty->port.count--;
52687 -
52688 - if (tty->port.count == 0) {
52689 + if (atomic_dec_return(&tty->port.count) == 0) {
52690 struct tty_struct *linux_tty = tty->port.tty;
52691
52692 if (linux_tty != NULL) {
52693 @@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
52694 return;
52695
52696 mutex_lock(&tty->ipw_tty_mutex);
52697 - if (tty->port.count == 0) {
52698 + if (atomic_read(&tty->port.count) == 0) {
52699 mutex_unlock(&tty->ipw_tty_mutex);
52700 return;
52701 }
52702 @@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
52703
52704 mutex_lock(&tty->ipw_tty_mutex);
52705
52706 - if (!tty->port.count) {
52707 + if (!atomic_read(&tty->port.count)) {
52708 mutex_unlock(&tty->ipw_tty_mutex);
52709 return;
52710 }
52711 @@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
52712 return -ENODEV;
52713
52714 mutex_lock(&tty->ipw_tty_mutex);
52715 - if (!tty->port.count) {
52716 + if (!atomic_read(&tty->port.count)) {
52717 mutex_unlock(&tty->ipw_tty_mutex);
52718 return -EINVAL;
52719 }
52720 @@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
52721 if (!tty)
52722 return -ENODEV;
52723
52724 - if (!tty->port.count)
52725 + if (!atomic_read(&tty->port.count))
52726 return -EINVAL;
52727
52728 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
52729 @@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
52730 if (!tty)
52731 return 0;
52732
52733 - if (!tty->port.count)
52734 + if (!atomic_read(&tty->port.count))
52735 return 0;
52736
52737 return tty->tx_bytes_queued;
52738 @@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
52739 if (!tty)
52740 return -ENODEV;
52741
52742 - if (!tty->port.count)
52743 + if (!atomic_read(&tty->port.count))
52744 return -EINVAL;
52745
52746 return get_control_lines(tty);
52747 @@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
52748 if (!tty)
52749 return -ENODEV;
52750
52751 - if (!tty->port.count)
52752 + if (!atomic_read(&tty->port.count))
52753 return -EINVAL;
52754
52755 return set_control_lines(tty, set, clear);
52756 @@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
52757 if (!tty)
52758 return -ENODEV;
52759
52760 - if (!tty->port.count)
52761 + if (!atomic_read(&tty->port.count))
52762 return -EINVAL;
52763
52764 /* FIXME: Exactly how is the tty object locked here .. */
52765 @@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
52766 * are gone */
52767 mutex_lock(&ttyj->ipw_tty_mutex);
52768 }
52769 - while (ttyj->port.count)
52770 + while (atomic_read(&ttyj->port.count))
52771 do_ipw_close(ttyj);
52772 ipwireless_disassociate_network_ttys(network,
52773 ttyj->channel_idx);
52774 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
52775 index 14c54e0..1efd4f2 100644
52776 --- a/drivers/tty/moxa.c
52777 +++ b/drivers/tty/moxa.c
52778 @@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
52779 }
52780
52781 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
52782 - ch->port.count++;
52783 + atomic_inc(&ch->port.count);
52784 tty->driver_data = ch;
52785 tty_port_tty_set(&ch->port, tty);
52786 mutex_lock(&ch->port.mutex);
52787 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
52788 index c434376..114ce13 100644
52789 --- a/drivers/tty/n_gsm.c
52790 +++ b/drivers/tty/n_gsm.c
52791 @@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
52792 spin_lock_init(&dlci->lock);
52793 mutex_init(&dlci->mutex);
52794 dlci->fifo = &dlci->_fifo;
52795 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
52796 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
52797 kfree(dlci);
52798 return NULL;
52799 }
52800 @@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
52801 struct gsm_dlci *dlci = tty->driver_data;
52802 struct tty_port *port = &dlci->port;
52803
52804 - port->count++;
52805 + atomic_inc(&port->count);
52806 tty_port_tty_set(port, tty);
52807
52808 dlci->modem_rx = 0;
52809 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
52810 index 2e900a9..576d216 100644
52811 --- a/drivers/tty/n_tty.c
52812 +++ b/drivers/tty/n_tty.c
52813 @@ -115,7 +115,7 @@ struct n_tty_data {
52814 int minimum_to_wake;
52815
52816 /* consumer-published */
52817 - size_t read_tail;
52818 + size_t read_tail __intentional_overflow(-1);
52819 size_t line_start;
52820
52821 /* protected by output lock */
52822 @@ -2522,6 +2522,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
52823 {
52824 *ops = tty_ldisc_N_TTY;
52825 ops->owner = NULL;
52826 - ops->refcount = ops->flags = 0;
52827 + atomic_set(&ops->refcount, 0);
52828 + ops->flags = 0;
52829 }
52830 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
52831 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
52832 index 7c4447a..70fbc1e 100644
52833 --- a/drivers/tty/pty.c
52834 +++ b/drivers/tty/pty.c
52835 @@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
52836 panic("Couldn't register Unix98 pts driver");
52837
52838 /* Now create the /dev/ptmx special device */
52839 + pax_open_kernel();
52840 tty_default_fops(&ptmx_fops);
52841 - ptmx_fops.open = ptmx_open;
52842 + *(void **)&ptmx_fops.open = ptmx_open;
52843 + pax_close_kernel();
52844
52845 cdev_init(&ptmx_cdev, &ptmx_fops);
52846 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
52847 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
52848 index 383c4c7..d408e21 100644
52849 --- a/drivers/tty/rocket.c
52850 +++ b/drivers/tty/rocket.c
52851 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52852 tty->driver_data = info;
52853 tty_port_tty_set(port, tty);
52854
52855 - if (port->count++ == 0) {
52856 + if (atomic_inc_return(&port->count) == 1) {
52857 atomic_inc(&rp_num_ports_open);
52858
52859 #ifdef ROCKET_DEBUG_OPEN
52860 @@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52861 #endif
52862 }
52863 #ifdef ROCKET_DEBUG_OPEN
52864 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
52865 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
52866 #endif
52867
52868 /*
52869 @@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
52870 spin_unlock_irqrestore(&info->port.lock, flags);
52871 return;
52872 }
52873 - if (info->port.count)
52874 + if (atomic_read(&info->port.count))
52875 atomic_dec(&rp_num_ports_open);
52876 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
52877 spin_unlock_irqrestore(&info->port.lock, flags);
52878 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
52879 index aa28209..e08fb85 100644
52880 --- a/drivers/tty/serial/ioc4_serial.c
52881 +++ b/drivers/tty/serial/ioc4_serial.c
52882 @@ -437,7 +437,7 @@ struct ioc4_soft {
52883 } is_intr_info[MAX_IOC4_INTR_ENTS];
52884
52885 /* Number of entries active in the above array */
52886 - atomic_t is_num_intrs;
52887 + atomic_unchecked_t is_num_intrs;
52888 } is_intr_type[IOC4_NUM_INTR_TYPES];
52889
52890 /* is_ir_lock must be held while
52891 @@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
52892 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
52893 || (type == IOC4_OTHER_INTR_TYPE)));
52894
52895 - i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
52896 + i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
52897 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
52898
52899 /* Save off the lower level interrupt handler */
52900 @@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
52901
52902 soft = arg;
52903 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
52904 - num_intrs = (int)atomic_read(
52905 + num_intrs = (int)atomic_read_unchecked(
52906 &soft->is_intr_type[intr_type].is_num_intrs);
52907
52908 this_mir = this_ir = pending_intrs(soft, intr_type);
52909 diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
52910 index 129dc5b..1da5bb8 100644
52911 --- a/drivers/tty/serial/kgdb_nmi.c
52912 +++ b/drivers/tty/serial/kgdb_nmi.c
52913 @@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
52914 * I/O utilities that messages sent to the console will automatically
52915 * be displayed on the dbg_io.
52916 */
52917 - dbg_io_ops->is_console = true;
52918 + pax_open_kernel();
52919 + *(int *)&dbg_io_ops->is_console = true;
52920 + pax_close_kernel();
52921
52922 return 0;
52923 }
52924 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
52925 index a260cde..6b2b5ce 100644
52926 --- a/drivers/tty/serial/kgdboc.c
52927 +++ b/drivers/tty/serial/kgdboc.c
52928 @@ -24,8 +24,9 @@
52929 #define MAX_CONFIG_LEN 40
52930
52931 static struct kgdb_io kgdboc_io_ops;
52932 +static struct kgdb_io kgdboc_io_ops_console;
52933
52934 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
52935 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
52936 static int configured = -1;
52937
52938 static char config[MAX_CONFIG_LEN];
52939 @@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
52940 kgdboc_unregister_kbd();
52941 if (configured == 1)
52942 kgdb_unregister_io_module(&kgdboc_io_ops);
52943 + else if (configured == 2)
52944 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
52945 }
52946
52947 static int configure_kgdboc(void)
52948 @@ -160,13 +163,13 @@ static int configure_kgdboc(void)
52949 int err;
52950 char *cptr = config;
52951 struct console *cons;
52952 + int is_console = 0;
52953
52954 err = kgdboc_option_setup(config);
52955 if (err || !strlen(config) || isspace(config[0]))
52956 goto noconfig;
52957
52958 err = -ENODEV;
52959 - kgdboc_io_ops.is_console = 0;
52960 kgdb_tty_driver = NULL;
52961
52962 kgdboc_use_kms = 0;
52963 @@ -187,7 +190,7 @@ static int configure_kgdboc(void)
52964 int idx;
52965 if (cons->device && cons->device(cons, &idx) == p &&
52966 idx == tty_line) {
52967 - kgdboc_io_ops.is_console = 1;
52968 + is_console = 1;
52969 break;
52970 }
52971 cons = cons->next;
52972 @@ -197,7 +200,13 @@ static int configure_kgdboc(void)
52973 kgdb_tty_line = tty_line;
52974
52975 do_register:
52976 - err = kgdb_register_io_module(&kgdboc_io_ops);
52977 + if (is_console) {
52978 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
52979 + configured = 2;
52980 + } else {
52981 + err = kgdb_register_io_module(&kgdboc_io_ops);
52982 + configured = 1;
52983 + }
52984 if (err)
52985 goto noconfig;
52986
52987 @@ -205,8 +214,6 @@ do_register:
52988 if (err)
52989 goto nmi_con_failed;
52990
52991 - configured = 1;
52992 -
52993 return 0;
52994
52995 nmi_con_failed:
52996 @@ -223,7 +230,7 @@ noconfig:
52997 static int __init init_kgdboc(void)
52998 {
52999 /* Already configured? */
53000 - if (configured == 1)
53001 + if (configured >= 1)
53002 return 0;
53003
53004 return configure_kgdboc();
53005 @@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53006 if (config[len - 1] == '\n')
53007 config[len - 1] = '\0';
53008
53009 - if (configured == 1)
53010 + if (configured >= 1)
53011 cleanup_kgdboc();
53012
53013 /* Go and configure with the new params. */
53014 @@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53015 .post_exception = kgdboc_post_exp_handler,
53016 };
53017
53018 +static struct kgdb_io kgdboc_io_ops_console = {
53019 + .name = "kgdboc",
53020 + .read_char = kgdboc_get_char,
53021 + .write_char = kgdboc_put_char,
53022 + .pre_exception = kgdboc_pre_exp_handler,
53023 + .post_exception = kgdboc_post_exp_handler,
53024 + .is_console = 1
53025 +};
53026 +
53027 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53028 /* This is only available if kgdboc is a built in for early debugging */
53029 static int __init kgdboc_early_init(char *opt)
53030 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53031 index 4b6c783..9a19db3 100644
53032 --- a/drivers/tty/serial/msm_serial.c
53033 +++ b/drivers/tty/serial/msm_serial.c
53034 @@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53035 .cons = MSM_CONSOLE,
53036 };
53037
53038 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53039 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53040
53041 static const struct of_device_id msm_uartdm_table[] = {
53042 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53043 @@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53044 int irq;
53045
53046 if (pdev->id == -1)
53047 - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
53048 + pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53049
53050 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
53051 return -ENXIO;
53052 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53053 index c78f43a..22b1dab 100644
53054 --- a/drivers/tty/serial/samsung.c
53055 +++ b/drivers/tty/serial/samsung.c
53056 @@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53057 }
53058 }
53059
53060 +static int s3c64xx_serial_startup(struct uart_port *port);
53061 static int s3c24xx_serial_startup(struct uart_port *port)
53062 {
53063 struct s3c24xx_uart_port *ourport = to_ourport(port);
53064 int ret;
53065
53066 + /* Startup sequence is different for s3c64xx and higher SoC's */
53067 + if (s3c24xx_serial_has_interrupt_mask(port))
53068 + return s3c64xx_serial_startup(port);
53069 +
53070 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53071 port, (unsigned long long)port->mapbase, port->membase);
53072
53073 @@ -1155,10 +1160,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53074 /* setup info for port */
53075 port->dev = &platdev->dev;
53076
53077 - /* Startup sequence is different for s3c64xx and higher SoC's */
53078 - if (s3c24xx_serial_has_interrupt_mask(port))
53079 - s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53080 -
53081 port->uartclk = 1;
53082
53083 if (cfg->uart_flags & UPF_CONS_FLOW) {
53084 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53085 index eaeb9a0..01a238c 100644
53086 --- a/drivers/tty/serial/serial_core.c
53087 +++ b/drivers/tty/serial/serial_core.c
53088 @@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53089
53090 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53091
53092 - if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53093 + if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53094 return;
53095
53096 /*
53097 @@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
53098 uart_flush_buffer(tty);
53099 uart_shutdown(tty, state);
53100 spin_lock_irqsave(&port->lock, flags);
53101 - port->count = 0;
53102 + atomic_set(&port->count, 0);
53103 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53104 spin_unlock_irqrestore(&port->lock, flags);
53105 tty_port_tty_set(port, NULL);
53106 @@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53107 goto end;
53108 }
53109
53110 - port->count++;
53111 + atomic_inc(&port->count);
53112 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
53113 retval = -ENXIO;
53114 goto err_dec_count;
53115 @@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53116 end:
53117 return retval;
53118 err_dec_count:
53119 - port->count--;
53120 + atomic_dec(&port->count);
53121 mutex_unlock(&port->mutex);
53122 goto end;
53123 }
53124 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53125 index b799170..87dafd5 100644
53126 --- a/drivers/tty/synclink.c
53127 +++ b/drivers/tty/synclink.c
53128 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53129
53130 if (debug_level >= DEBUG_LEVEL_INFO)
53131 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53132 - __FILE__,__LINE__, info->device_name, info->port.count);
53133 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53134
53135 if (tty_port_close_start(&info->port, tty, filp) == 0)
53136 goto cleanup;
53137 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53138 cleanup:
53139 if (debug_level >= DEBUG_LEVEL_INFO)
53140 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53141 - tty->driver->name, info->port.count);
53142 + tty->driver->name, atomic_read(&info->port.count));
53143
53144 } /* end of mgsl_close() */
53145
53146 @@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53147
53148 mgsl_flush_buffer(tty);
53149 shutdown(info);
53150 -
53151 - info->port.count = 0;
53152 +
53153 + atomic_set(&info->port.count, 0);
53154 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53155 info->port.tty = NULL;
53156
53157 @@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53158
53159 if (debug_level >= DEBUG_LEVEL_INFO)
53160 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53161 - __FILE__,__LINE__, tty->driver->name, port->count );
53162 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53163
53164 spin_lock_irqsave(&info->irq_spinlock, flags);
53165 - port->count--;
53166 + atomic_dec(&port->count);
53167 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53168 port->blocked_open++;
53169
53170 @@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53171
53172 if (debug_level >= DEBUG_LEVEL_INFO)
53173 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53174 - __FILE__,__LINE__, tty->driver->name, port->count );
53175 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53176
53177 tty_unlock(tty);
53178 schedule();
53179 @@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53180
53181 /* FIXME: Racy on hangup during close wait */
53182 if (!tty_hung_up_p(filp))
53183 - port->count++;
53184 + atomic_inc(&port->count);
53185 port->blocked_open--;
53186
53187 if (debug_level >= DEBUG_LEVEL_INFO)
53188 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53189 - __FILE__,__LINE__, tty->driver->name, port->count );
53190 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53191
53192 if (!retval)
53193 port->flags |= ASYNC_NORMAL_ACTIVE;
53194 @@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53195
53196 if (debug_level >= DEBUG_LEVEL_INFO)
53197 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53198 - __FILE__,__LINE__,tty->driver->name, info->port.count);
53199 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53200
53201 /* If port is closing, signal caller to try again */
53202 if (info->port.flags & ASYNC_CLOSING){
53203 @@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53204 spin_unlock_irqrestore(&info->netlock, flags);
53205 goto cleanup;
53206 }
53207 - info->port.count++;
53208 + atomic_inc(&info->port.count);
53209 spin_unlock_irqrestore(&info->netlock, flags);
53210
53211 - if (info->port.count == 1) {
53212 + if (atomic_read(&info->port.count) == 1) {
53213 /* 1st open on this device, init hardware */
53214 retval = startup(info);
53215 if (retval < 0)
53216 @@ -3442,8 +3442,8 @@ cleanup:
53217 if (retval) {
53218 if (tty->count == 1)
53219 info->port.tty = NULL; /* tty layer will release tty struct */
53220 - if(info->port.count)
53221 - info->port.count--;
53222 + if (atomic_read(&info->port.count))
53223 + atomic_dec(&info->port.count);
53224 }
53225
53226 return retval;
53227 @@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53228 unsigned short new_crctype;
53229
53230 /* return error if TTY interface open */
53231 - if (info->port.count)
53232 + if (atomic_read(&info->port.count))
53233 return -EBUSY;
53234
53235 switch (encoding)
53236 @@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53237
53238 /* arbitrate between network and tty opens */
53239 spin_lock_irqsave(&info->netlock, flags);
53240 - if (info->port.count != 0 || info->netcount != 0) {
53241 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53242 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53243 spin_unlock_irqrestore(&info->netlock, flags);
53244 return -EBUSY;
53245 @@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53246 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53247
53248 /* return error if TTY interface open */
53249 - if (info->port.count)
53250 + if (atomic_read(&info->port.count))
53251 return -EBUSY;
53252
53253 if (cmd != SIOCWANDEV)
53254 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53255 index 0e8c39b..e0cb171 100644
53256 --- a/drivers/tty/synclink_gt.c
53257 +++ b/drivers/tty/synclink_gt.c
53258 @@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53259 tty->driver_data = info;
53260 info->port.tty = tty;
53261
53262 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53263 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53264
53265 /* If port is closing, signal caller to try again */
53266 if (info->port.flags & ASYNC_CLOSING){
53267 @@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53268 mutex_unlock(&info->port.mutex);
53269 goto cleanup;
53270 }
53271 - info->port.count++;
53272 + atomic_inc(&info->port.count);
53273 spin_unlock_irqrestore(&info->netlock, flags);
53274
53275 - if (info->port.count == 1) {
53276 + if (atomic_read(&info->port.count) == 1) {
53277 /* 1st open on this device, init hardware */
53278 retval = startup(info);
53279 if (retval < 0) {
53280 @@ -715,8 +715,8 @@ cleanup:
53281 if (retval) {
53282 if (tty->count == 1)
53283 info->port.tty = NULL; /* tty layer will release tty struct */
53284 - if(info->port.count)
53285 - info->port.count--;
53286 + if(atomic_read(&info->port.count))
53287 + atomic_dec(&info->port.count);
53288 }
53289
53290 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53291 @@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53292
53293 if (sanity_check(info, tty->name, "close"))
53294 return;
53295 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53296 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53297
53298 if (tty_port_close_start(&info->port, tty, filp) == 0)
53299 goto cleanup;
53300 @@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53301 tty_port_close_end(&info->port, tty);
53302 info->port.tty = NULL;
53303 cleanup:
53304 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53305 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53306 }
53307
53308 static void hangup(struct tty_struct *tty)
53309 @@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53310 shutdown(info);
53311
53312 spin_lock_irqsave(&info->port.lock, flags);
53313 - info->port.count = 0;
53314 + atomic_set(&info->port.count, 0);
53315 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53316 info->port.tty = NULL;
53317 spin_unlock_irqrestore(&info->port.lock, flags);
53318 @@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53319 unsigned short new_crctype;
53320
53321 /* return error if TTY interface open */
53322 - if (info->port.count)
53323 + if (atomic_read(&info->port.count))
53324 return -EBUSY;
53325
53326 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53327 @@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53328
53329 /* arbitrate between network and tty opens */
53330 spin_lock_irqsave(&info->netlock, flags);
53331 - if (info->port.count != 0 || info->netcount != 0) {
53332 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53333 DBGINFO(("%s hdlc_open busy\n", dev->name));
53334 spin_unlock_irqrestore(&info->netlock, flags);
53335 return -EBUSY;
53336 @@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53337 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53338
53339 /* return error if TTY interface open */
53340 - if (info->port.count)
53341 + if (atomic_read(&info->port.count))
53342 return -EBUSY;
53343
53344 if (cmd != SIOCWANDEV)
53345 @@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53346 if (port == NULL)
53347 continue;
53348 spin_lock(&port->lock);
53349 - if ((port->port.count || port->netcount) &&
53350 + if ((atomic_read(&port->port.count) || port->netcount) &&
53351 port->pending_bh && !port->bh_running &&
53352 !port->bh_requested) {
53353 DBGISR(("%s bh queued\n", port->device_name));
53354 @@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53355 add_wait_queue(&port->open_wait, &wait);
53356
53357 spin_lock_irqsave(&info->lock, flags);
53358 - port->count--;
53359 + atomic_dec(&port->count);
53360 spin_unlock_irqrestore(&info->lock, flags);
53361 port->blocked_open++;
53362
53363 @@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53364 remove_wait_queue(&port->open_wait, &wait);
53365
53366 if (!tty_hung_up_p(filp))
53367 - port->count++;
53368 + atomic_inc(&port->count);
53369 port->blocked_open--;
53370
53371 if (!retval)
53372 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53373 index c3f9091..abe4601 100644
53374 --- a/drivers/tty/synclinkmp.c
53375 +++ b/drivers/tty/synclinkmp.c
53376 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53377
53378 if (debug_level >= DEBUG_LEVEL_INFO)
53379 printk("%s(%d):%s open(), old ref count = %d\n",
53380 - __FILE__,__LINE__,tty->driver->name, info->port.count);
53381 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53382
53383 /* If port is closing, signal caller to try again */
53384 if (info->port.flags & ASYNC_CLOSING){
53385 @@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53386 spin_unlock_irqrestore(&info->netlock, flags);
53387 goto cleanup;
53388 }
53389 - info->port.count++;
53390 + atomic_inc(&info->port.count);
53391 spin_unlock_irqrestore(&info->netlock, flags);
53392
53393 - if (info->port.count == 1) {
53394 + if (atomic_read(&info->port.count) == 1) {
53395 /* 1st open on this device, init hardware */
53396 retval = startup(info);
53397 if (retval < 0)
53398 @@ -796,8 +796,8 @@ cleanup:
53399 if (retval) {
53400 if (tty->count == 1)
53401 info->port.tty = NULL; /* tty layer will release tty struct */
53402 - if(info->port.count)
53403 - info->port.count--;
53404 + if(atomic_read(&info->port.count))
53405 + atomic_dec(&info->port.count);
53406 }
53407
53408 return retval;
53409 @@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53410
53411 if (debug_level >= DEBUG_LEVEL_INFO)
53412 printk("%s(%d):%s close() entry, count=%d\n",
53413 - __FILE__,__LINE__, info->device_name, info->port.count);
53414 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53415
53416 if (tty_port_close_start(&info->port, tty, filp) == 0)
53417 goto cleanup;
53418 @@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53419 cleanup:
53420 if (debug_level >= DEBUG_LEVEL_INFO)
53421 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53422 - tty->driver->name, info->port.count);
53423 + tty->driver->name, atomic_read(&info->port.count));
53424 }
53425
53426 /* Called by tty_hangup() when a hangup is signaled.
53427 @@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53428 shutdown(info);
53429
53430 spin_lock_irqsave(&info->port.lock, flags);
53431 - info->port.count = 0;
53432 + atomic_set(&info->port.count, 0);
53433 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53434 info->port.tty = NULL;
53435 spin_unlock_irqrestore(&info->port.lock, flags);
53436 @@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53437 unsigned short new_crctype;
53438
53439 /* return error if TTY interface open */
53440 - if (info->port.count)
53441 + if (atomic_read(&info->port.count))
53442 return -EBUSY;
53443
53444 switch (encoding)
53445 @@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
53446
53447 /* arbitrate between network and tty opens */
53448 spin_lock_irqsave(&info->netlock, flags);
53449 - if (info->port.count != 0 || info->netcount != 0) {
53450 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53451 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53452 spin_unlock_irqrestore(&info->netlock, flags);
53453 return -EBUSY;
53454 @@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53455 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53456
53457 /* return error if TTY interface open */
53458 - if (info->port.count)
53459 + if (atomic_read(&info->port.count))
53460 return -EBUSY;
53461
53462 if (cmd != SIOCWANDEV)
53463 @@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
53464 * do not request bottom half processing if the
53465 * device is not open in a normal mode.
53466 */
53467 - if ( port && (port->port.count || port->netcount) &&
53468 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
53469 port->pending_bh && !port->bh_running &&
53470 !port->bh_requested ) {
53471 if ( debug_level >= DEBUG_LEVEL_ISR )
53472 @@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53473
53474 if (debug_level >= DEBUG_LEVEL_INFO)
53475 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
53476 - __FILE__,__LINE__, tty->driver->name, port->count );
53477 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53478
53479 spin_lock_irqsave(&info->lock, flags);
53480 - port->count--;
53481 + atomic_dec(&port->count);
53482 spin_unlock_irqrestore(&info->lock, flags);
53483 port->blocked_open++;
53484
53485 @@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53486
53487 if (debug_level >= DEBUG_LEVEL_INFO)
53488 printk("%s(%d):%s block_til_ready() count=%d\n",
53489 - __FILE__,__LINE__, tty->driver->name, port->count );
53490 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53491
53492 tty_unlock(tty);
53493 schedule();
53494 @@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53495 set_current_state(TASK_RUNNING);
53496 remove_wait_queue(&port->open_wait, &wait);
53497 if (!tty_hung_up_p(filp))
53498 - port->count++;
53499 + atomic_inc(&port->count);
53500 port->blocked_open--;
53501
53502 if (debug_level >= DEBUG_LEVEL_INFO)
53503 printk("%s(%d):%s block_til_ready() after, count=%d\n",
53504 - __FILE__,__LINE__, tty->driver->name, port->count );
53505 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53506
53507 if (!retval)
53508 port->flags |= ASYNC_NORMAL_ACTIVE;
53509 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
53510 index 42bad18..447d7a2 100644
53511 --- a/drivers/tty/sysrq.c
53512 +++ b/drivers/tty/sysrq.c
53513 @@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
53514 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
53515 size_t count, loff_t *ppos)
53516 {
53517 - if (count) {
53518 + if (count && capable(CAP_SYS_ADMIN)) {
53519 char c;
53520
53521 if (get_user(c, buf))
53522 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
53523 index 0508a1d..b610592 100644
53524 --- a/drivers/tty/tty_io.c
53525 +++ b/drivers/tty/tty_io.c
53526 @@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
53527
53528 void tty_default_fops(struct file_operations *fops)
53529 {
53530 - *fops = tty_fops;
53531 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
53532 }
53533
53534 /*
53535 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
53536 index 2d822aa..a566234 100644
53537 --- a/drivers/tty/tty_ldisc.c
53538 +++ b/drivers/tty/tty_ldisc.c
53539 @@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
53540 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53541 tty_ldiscs[disc] = new_ldisc;
53542 new_ldisc->num = disc;
53543 - new_ldisc->refcount = 0;
53544 + atomic_set(&new_ldisc->refcount, 0);
53545 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53546
53547 return ret;
53548 @@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
53549 return -EINVAL;
53550
53551 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53552 - if (tty_ldiscs[disc]->refcount)
53553 + if (atomic_read(&tty_ldiscs[disc]->refcount))
53554 ret = -EBUSY;
53555 else
53556 tty_ldiscs[disc] = NULL;
53557 @@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
53558 if (ldops) {
53559 ret = ERR_PTR(-EAGAIN);
53560 if (try_module_get(ldops->owner)) {
53561 - ldops->refcount++;
53562 + atomic_inc(&ldops->refcount);
53563 ret = ldops;
53564 }
53565 }
53566 @@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
53567 unsigned long flags;
53568
53569 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53570 - ldops->refcount--;
53571 + atomic_dec(&ldops->refcount);
53572 module_put(ldops->owner);
53573 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53574 }
53575 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
53576 index 1b93357..ea9f82c 100644
53577 --- a/drivers/tty/tty_port.c
53578 +++ b/drivers/tty/tty_port.c
53579 @@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
53580 unsigned long flags;
53581
53582 spin_lock_irqsave(&port->lock, flags);
53583 - port->count = 0;
53584 + atomic_set(&port->count, 0);
53585 port->flags &= ~ASYNC_NORMAL_ACTIVE;
53586 tty = port->tty;
53587 if (tty)
53588 @@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53589
53590 /* The port lock protects the port counts */
53591 spin_lock_irqsave(&port->lock, flags);
53592 - port->count--;
53593 + atomic_dec(&port->count);
53594 port->blocked_open++;
53595 spin_unlock_irqrestore(&port->lock, flags);
53596
53597 @@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53598 we must not mess that up further */
53599 spin_lock_irqsave(&port->lock, flags);
53600 if (!tty_hung_up_p(filp))
53601 - port->count++;
53602 + atomic_inc(&port->count);
53603 port->blocked_open--;
53604 if (retval == 0)
53605 port->flags |= ASYNC_NORMAL_ACTIVE;
53606 @@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
53607 return 0;
53608 }
53609
53610 - if (tty->count == 1 && port->count != 1) {
53611 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
53612 printk(KERN_WARNING
53613 "tty_port_close_start: tty->count = 1 port count = %d.\n",
53614 - port->count);
53615 - port->count = 1;
53616 + atomic_read(&port->count));
53617 + atomic_set(&port->count, 1);
53618 }
53619 - if (--port->count < 0) {
53620 + if (atomic_dec_return(&port->count) < 0) {
53621 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
53622 - port->count);
53623 - port->count = 0;
53624 + atomic_read(&port->count));
53625 + atomic_set(&port->count, 0);
53626 }
53627
53628 - if (port->count) {
53629 + if (atomic_read(&port->count)) {
53630 spin_unlock_irqrestore(&port->lock, flags);
53631 return 0;
53632 }
53633 @@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
53634 struct file *filp)
53635 {
53636 spin_lock_irq(&port->lock);
53637 - ++port->count;
53638 + atomic_inc(&port->count);
53639 spin_unlock_irq(&port->lock);
53640 tty_port_tty_set(port, tty);
53641
53642 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
53643 index c039cfe..0b463b0 100644
53644 --- a/drivers/tty/vt/keyboard.c
53645 +++ b/drivers/tty/vt/keyboard.c
53646 @@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
53647 kbd->kbdmode == VC_OFF) &&
53648 value != KVAL(K_SAK))
53649 return; /* SAK is allowed even in raw mode */
53650 +
53651 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53652 + {
53653 + void *func = fn_handler[value];
53654 + if (func == fn_show_state || func == fn_show_ptregs ||
53655 + func == fn_show_mem)
53656 + return;
53657 + }
53658 +#endif
53659 +
53660 fn_handler[value](vc);
53661 }
53662
53663 @@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53664 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
53665 return -EFAULT;
53666
53667 - if (!capable(CAP_SYS_TTY_CONFIG))
53668 - perm = 0;
53669 -
53670 switch (cmd) {
53671 case KDGKBENT:
53672 /* Ensure another thread doesn't free it under us */
53673 @@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53674 spin_unlock_irqrestore(&kbd_event_lock, flags);
53675 return put_user(val, &user_kbe->kb_value);
53676 case KDSKBENT:
53677 + if (!capable(CAP_SYS_TTY_CONFIG))
53678 + perm = 0;
53679 +
53680 if (!perm)
53681 return -EPERM;
53682 if (!i && v == K_NOSUCHMAP) {
53683 @@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53684 int i, j, k;
53685 int ret;
53686
53687 - if (!capable(CAP_SYS_TTY_CONFIG))
53688 - perm = 0;
53689 -
53690 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
53691 if (!kbs) {
53692 ret = -ENOMEM;
53693 @@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53694 kfree(kbs);
53695 return ((p && *p) ? -EOVERFLOW : 0);
53696 case KDSKBSENT:
53697 + if (!capable(CAP_SYS_TTY_CONFIG))
53698 + perm = 0;
53699 +
53700 if (!perm) {
53701 ret = -EPERM;
53702 goto reterr;
53703 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
53704 index 60fa627..7214965 100644
53705 --- a/drivers/uio/uio.c
53706 +++ b/drivers/uio/uio.c
53707 @@ -25,6 +25,7 @@
53708 #include <linux/kobject.h>
53709 #include <linux/cdev.h>
53710 #include <linux/uio_driver.h>
53711 +#include <asm/local.h>
53712
53713 #define UIO_MAX_DEVICES (1U << MINORBITS)
53714
53715 @@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
53716 struct device_attribute *attr, char *buf)
53717 {
53718 struct uio_device *idev = dev_get_drvdata(dev);
53719 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
53720 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
53721 }
53722 static DEVICE_ATTR_RO(event);
53723
53724 @@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
53725 {
53726 struct uio_device *idev = info->uio_dev;
53727
53728 - atomic_inc(&idev->event);
53729 + atomic_inc_unchecked(&idev->event);
53730 wake_up_interruptible(&idev->wait);
53731 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
53732 }
53733 @@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
53734 }
53735
53736 listener->dev = idev;
53737 - listener->event_count = atomic_read(&idev->event);
53738 + listener->event_count = atomic_read_unchecked(&idev->event);
53739 filep->private_data = listener;
53740
53741 if (idev->info->open) {
53742 @@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
53743 return -EIO;
53744
53745 poll_wait(filep, &idev->wait, wait);
53746 - if (listener->event_count != atomic_read(&idev->event))
53747 + if (listener->event_count != atomic_read_unchecked(&idev->event))
53748 return POLLIN | POLLRDNORM;
53749 return 0;
53750 }
53751 @@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
53752 do {
53753 set_current_state(TASK_INTERRUPTIBLE);
53754
53755 - event_count = atomic_read(&idev->event);
53756 + event_count = atomic_read_unchecked(&idev->event);
53757 if (event_count != listener->event_count) {
53758 if (copy_to_user(buf, &event_count, count))
53759 retval = -EFAULT;
53760 @@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
53761 static int uio_find_mem_index(struct vm_area_struct *vma)
53762 {
53763 struct uio_device *idev = vma->vm_private_data;
53764 + unsigned long size;
53765
53766 if (vma->vm_pgoff < MAX_UIO_MAPS) {
53767 - if (idev->info->mem[vma->vm_pgoff].size == 0)
53768 + size = idev->info->mem[vma->vm_pgoff].size;
53769 + if (size == 0)
53770 + return -1;
53771 + if (vma->vm_end - vma->vm_start > size)
53772 return -1;
53773 return (int)vma->vm_pgoff;
53774 }
53775 @@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
53776 idev->owner = owner;
53777 idev->info = info;
53778 init_waitqueue_head(&idev->wait);
53779 - atomic_set(&idev->event, 0);
53780 + atomic_set_unchecked(&idev->event, 0);
53781
53782 ret = uio_get_minor(idev);
53783 if (ret)
53784 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
53785 index 813d4d3..a71934f 100644
53786 --- a/drivers/usb/atm/cxacru.c
53787 +++ b/drivers/usb/atm/cxacru.c
53788 @@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
53789 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
53790 if (ret < 2)
53791 return -EINVAL;
53792 - if (index < 0 || index > 0x7f)
53793 + if (index > 0x7f)
53794 return -EINVAL;
53795 pos += tmp;
53796
53797 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
53798 index dada014..1d0d517 100644
53799 --- a/drivers/usb/atm/usbatm.c
53800 +++ b/drivers/usb/atm/usbatm.c
53801 @@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53802 if (printk_ratelimit())
53803 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
53804 __func__, vpi, vci);
53805 - atomic_inc(&vcc->stats->rx_err);
53806 + atomic_inc_unchecked(&vcc->stats->rx_err);
53807 return;
53808 }
53809
53810 @@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53811 if (length > ATM_MAX_AAL5_PDU) {
53812 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
53813 __func__, length, vcc);
53814 - atomic_inc(&vcc->stats->rx_err);
53815 + atomic_inc_unchecked(&vcc->stats->rx_err);
53816 goto out;
53817 }
53818
53819 @@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53820 if (sarb->len < pdu_length) {
53821 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
53822 __func__, pdu_length, sarb->len, vcc);
53823 - atomic_inc(&vcc->stats->rx_err);
53824 + atomic_inc_unchecked(&vcc->stats->rx_err);
53825 goto out;
53826 }
53827
53828 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
53829 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
53830 __func__, vcc);
53831 - atomic_inc(&vcc->stats->rx_err);
53832 + atomic_inc_unchecked(&vcc->stats->rx_err);
53833 goto out;
53834 }
53835
53836 @@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53837 if (printk_ratelimit())
53838 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
53839 __func__, length);
53840 - atomic_inc(&vcc->stats->rx_drop);
53841 + atomic_inc_unchecked(&vcc->stats->rx_drop);
53842 goto out;
53843 }
53844
53845 @@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53846
53847 vcc->push(vcc, skb);
53848
53849 - atomic_inc(&vcc->stats->rx);
53850 + atomic_inc_unchecked(&vcc->stats->rx);
53851 out:
53852 skb_trim(sarb, 0);
53853 }
53854 @@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
53855 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
53856
53857 usbatm_pop(vcc, skb);
53858 - atomic_inc(&vcc->stats->tx);
53859 + atomic_inc_unchecked(&vcc->stats->tx);
53860
53861 skb = skb_dequeue(&instance->sndqueue);
53862 }
53863 @@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
53864 if (!left--)
53865 return sprintf(page,
53866 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
53867 - atomic_read(&atm_dev->stats.aal5.tx),
53868 - atomic_read(&atm_dev->stats.aal5.tx_err),
53869 - atomic_read(&atm_dev->stats.aal5.rx),
53870 - atomic_read(&atm_dev->stats.aal5.rx_err),
53871 - atomic_read(&atm_dev->stats.aal5.rx_drop));
53872 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
53873 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
53874 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
53875 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
53876 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
53877
53878 if (!left--) {
53879 if (instance->disconnected)
53880 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
53881 index 2a3bbdf..91d72cf 100644
53882 --- a/drivers/usb/core/devices.c
53883 +++ b/drivers/usb/core/devices.c
53884 @@ -126,7 +126,7 @@ static const char format_endpt[] =
53885 * time it gets called.
53886 */
53887 static struct device_connect_event {
53888 - atomic_t count;
53889 + atomic_unchecked_t count;
53890 wait_queue_head_t wait;
53891 } device_event = {
53892 .count = ATOMIC_INIT(1),
53893 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
53894
53895 void usbfs_conn_disc_event(void)
53896 {
53897 - atomic_add(2, &device_event.count);
53898 + atomic_add_unchecked(2, &device_event.count);
53899 wake_up(&device_event.wait);
53900 }
53901
53902 @@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
53903
53904 poll_wait(file, &device_event.wait, wait);
53905
53906 - event_count = atomic_read(&device_event.count);
53907 + event_count = atomic_read_unchecked(&device_event.count);
53908 if (file->f_version != event_count) {
53909 file->f_version = event_count;
53910 return POLLIN | POLLRDNORM;
53911 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
53912 index 0b59731..46ee7d1 100644
53913 --- a/drivers/usb/core/devio.c
53914 +++ b/drivers/usb/core/devio.c
53915 @@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
53916 struct usb_dev_state *ps = file->private_data;
53917 struct usb_device *dev = ps->dev;
53918 ssize_t ret = 0;
53919 - unsigned len;
53920 + size_t len;
53921 loff_t pos;
53922 int i;
53923
53924 @@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
53925 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
53926 struct usb_config_descriptor *config =
53927 (struct usb_config_descriptor *)dev->rawdescriptors[i];
53928 - unsigned int length = le16_to_cpu(config->wTotalLength);
53929 + size_t length = le16_to_cpu(config->wTotalLength);
53930
53931 if (*ppos < pos + length) {
53932
53933 /* The descriptor may claim to be longer than it
53934 * really is. Here is the actual allocated length. */
53935 - unsigned alloclen =
53936 + size_t alloclen =
53937 le16_to_cpu(dev->config[i].desc.wTotalLength);
53938
53939 - len = length - (*ppos - pos);
53940 + len = length + pos - *ppos;
53941 if (len > nbytes)
53942 len = nbytes;
53943
53944 /* Simply don't write (skip over) unallocated parts */
53945 if (alloclen > (*ppos - pos)) {
53946 - alloclen -= (*ppos - pos);
53947 + alloclen = alloclen + pos - *ppos;
53948 if (copy_to_user(buf,
53949 dev->rawdescriptors[i] + (*ppos - pos),
53950 min(len, alloclen))) {
53951 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
53952 index a6efb41..6f72549b 100644
53953 --- a/drivers/usb/core/hcd.c
53954 +++ b/drivers/usb/core/hcd.c
53955 @@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
53956 */
53957 usb_get_urb(urb);
53958 atomic_inc(&urb->use_count);
53959 - atomic_inc(&urb->dev->urbnum);
53960 + atomic_inc_unchecked(&urb->dev->urbnum);
53961 usbmon_urb_submit(&hcd->self, urb);
53962
53963 /* NOTE requirements on root-hub callers (usbfs and the hub
53964 @@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
53965 urb->hcpriv = NULL;
53966 INIT_LIST_HEAD(&urb->urb_list);
53967 atomic_dec(&urb->use_count);
53968 - atomic_dec(&urb->dev->urbnum);
53969 + atomic_dec_unchecked(&urb->dev->urbnum);
53970 if (atomic_read(&urb->reject))
53971 wake_up(&usb_kill_urb_queue);
53972 usb_put_urb(urb);
53973 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
53974 index b649fef..c7107a0 100644
53975 --- a/drivers/usb/core/hub.c
53976 +++ b/drivers/usb/core/hub.c
53977 @@ -26,6 +26,7 @@
53978 #include <linux/mutex.h>
53979 #include <linux/random.h>
53980 #include <linux/pm_qos.h>
53981 +#include <linux/grsecurity.h>
53982
53983 #include <asm/uaccess.h>
53984 #include <asm/byteorder.h>
53985 @@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
53986 goto done;
53987 return;
53988 }
53989 +
53990 + if (gr_handle_new_usb())
53991 + goto done;
53992 +
53993 if (hub_is_superspeed(hub->hdev))
53994 unit_load = 150;
53995 else
53996 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
53997 index f7b7713..23d07ec 100644
53998 --- a/drivers/usb/core/message.c
53999 +++ b/drivers/usb/core/message.c
54000 @@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54001 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54002 * error number.
54003 */
54004 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54005 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54006 __u8 requesttype, __u16 value, __u16 index, void *data,
54007 __u16 size, int timeout)
54008 {
54009 @@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54010 * If successful, 0. Otherwise a negative error number. The number of actual
54011 * bytes transferred will be stored in the @actual_length parameter.
54012 */
54013 -int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54014 +int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54015 void *data, int len, int *actual_length, int timeout)
54016 {
54017 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54018 @@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54019 * bytes transferred will be stored in the @actual_length parameter.
54020 *
54021 */
54022 -int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54023 +int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54024 void *data, int len, int *actual_length, int timeout)
54025 {
54026 struct urb *urb;
54027 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54028 index 1236c60..d47a51c 100644
54029 --- a/drivers/usb/core/sysfs.c
54030 +++ b/drivers/usb/core/sysfs.c
54031 @@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54032 struct usb_device *udev;
54033
54034 udev = to_usb_device(dev);
54035 - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54036 + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54037 }
54038 static DEVICE_ATTR_RO(urbnum);
54039
54040 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54041 index 2dd2362..1135437 100644
54042 --- a/drivers/usb/core/usb.c
54043 +++ b/drivers/usb/core/usb.c
54044 @@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54045 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54046 dev->state = USB_STATE_ATTACHED;
54047 dev->lpm_disable_count = 1;
54048 - atomic_set(&dev->urbnum, 0);
54049 + atomic_set_unchecked(&dev->urbnum, 0);
54050
54051 INIT_LIST_HEAD(&dev->ep0.urb_list);
54052 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54053 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54054 index 8cfc319..4868255 100644
54055 --- a/drivers/usb/early/ehci-dbgp.c
54056 +++ b/drivers/usb/early/ehci-dbgp.c
54057 @@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54058
54059 #ifdef CONFIG_KGDB
54060 static struct kgdb_io kgdbdbgp_io_ops;
54061 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54062 +static struct kgdb_io kgdbdbgp_io_ops_console;
54063 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54064 #else
54065 #define dbgp_kgdb_mode (0)
54066 #endif
54067 @@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54068 .write_char = kgdbdbgp_write_char,
54069 };
54070
54071 +static struct kgdb_io kgdbdbgp_io_ops_console = {
54072 + .name = "kgdbdbgp",
54073 + .read_char = kgdbdbgp_read_char,
54074 + .write_char = kgdbdbgp_write_char,
54075 + .is_console = 1
54076 +};
54077 +
54078 static int kgdbdbgp_wait_time;
54079
54080 static int __init kgdbdbgp_parse_config(char *str)
54081 @@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54082 ptr++;
54083 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54084 }
54085 - kgdb_register_io_module(&kgdbdbgp_io_ops);
54086 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54087 + if (early_dbgp_console.index != -1)
54088 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54089 + else
54090 + kgdb_register_io_module(&kgdbdbgp_io_ops);
54091
54092 return 0;
54093 }
54094 diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54095 index f7b2032..fbb340c 100644
54096 --- a/drivers/usb/gadget/function/f_uac1.c
54097 +++ b/drivers/usb/gadget/function/f_uac1.c
54098 @@ -14,6 +14,7 @@
54099 #include <linux/module.h>
54100 #include <linux/device.h>
54101 #include <linux/atomic.h>
54102 +#include <linux/module.h>
54103
54104 #include "u_uac1.h"
54105
54106 diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54107 index 491082a..dfd7d17 100644
54108 --- a/drivers/usb/gadget/function/u_serial.c
54109 +++ b/drivers/usb/gadget/function/u_serial.c
54110 @@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54111 spin_lock_irq(&port->port_lock);
54112
54113 /* already open? Great. */
54114 - if (port->port.count) {
54115 + if (atomic_read(&port->port.count)) {
54116 status = 0;
54117 - port->port.count++;
54118 + atomic_inc(&port->port.count);
54119
54120 /* currently opening/closing? wait ... */
54121 } else if (port->openclose) {
54122 @@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54123 tty->driver_data = port;
54124 port->port.tty = tty;
54125
54126 - port->port.count = 1;
54127 + atomic_set(&port->port.count, 1);
54128 port->openclose = false;
54129
54130 /* if connected, start the I/O stream */
54131 @@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54132
54133 spin_lock_irq(&port->port_lock);
54134
54135 - if (port->port.count != 1) {
54136 - if (port->port.count == 0)
54137 + if (atomic_read(&port->port.count) != 1) {
54138 + if (atomic_read(&port->port.count) == 0)
54139 WARN_ON(1);
54140 else
54141 - --port->port.count;
54142 + atomic_dec(&port->port.count);
54143 goto exit;
54144 }
54145
54146 @@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54147 * and sleep if necessary
54148 */
54149 port->openclose = true;
54150 - port->port.count = 0;
54151 + atomic_set(&port->port.count, 0);
54152
54153 gser = port->port_usb;
54154 if (gser && gser->disconnect)
54155 @@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54156 int cond;
54157
54158 spin_lock_irq(&port->port_lock);
54159 - cond = (port->port.count == 0) && !port->openclose;
54160 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54161 spin_unlock_irq(&port->port_lock);
54162 return cond;
54163 }
54164 @@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54165 /* if it's already open, start I/O ... and notify the serial
54166 * protocol about open/close status (connect/disconnect).
54167 */
54168 - if (port->port.count) {
54169 + if (atomic_read(&port->port.count)) {
54170 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54171 gs_start_io(port);
54172 if (gser->connect)
54173 @@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54174
54175 port->port_usb = NULL;
54176 gser->ioport = NULL;
54177 - if (port->port.count > 0 || port->openclose) {
54178 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
54179 wake_up_interruptible(&port->drain_wait);
54180 if (port->port.tty)
54181 tty_hangup(port->port.tty);
54182 @@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54183
54184 /* finally, free any unused/unusable I/O buffers */
54185 spin_lock_irqsave(&port->port_lock, flags);
54186 - if (port->port.count == 0 && !port->openclose)
54187 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
54188 gs_buf_free(&port->port_write_buf);
54189 gs_free_requests(gser->out, &port->read_pool, NULL);
54190 gs_free_requests(gser->out, &port->read_queue, NULL);
54191 diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54192 index a44a07f..ecea924 100644
54193 --- a/drivers/usb/gadget/function/u_uac1.c
54194 +++ b/drivers/usb/gadget/function/u_uac1.c
54195 @@ -17,6 +17,7 @@
54196 #include <linux/ctype.h>
54197 #include <linux/random.h>
54198 #include <linux/syscalls.h>
54199 +#include <linux/module.h>
54200
54201 #include "u_uac1.h"
54202
54203 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54204 index 5728829..fefc6bf 100644
54205 --- a/drivers/usb/host/ehci-hub.c
54206 +++ b/drivers/usb/host/ehci-hub.c
54207 @@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
54208 urb->transfer_flags = URB_DIR_IN;
54209 usb_get_urb(urb);
54210 atomic_inc(&urb->use_count);
54211 - atomic_inc(&urb->dev->urbnum);
54212 + atomic_inc_unchecked(&urb->dev->urbnum);
54213 urb->setup_dma = dma_map_single(
54214 hcd->self.controller,
54215 urb->setup_packet,
54216 @@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54217 urb->status = -EINPROGRESS;
54218 usb_get_urb(urb);
54219 atomic_inc(&urb->use_count);
54220 - atomic_inc(&urb->dev->urbnum);
54221 + atomic_inc_unchecked(&urb->dev->urbnum);
54222 retval = submit_single_step_set_feature(hcd, urb, 0);
54223 if (!retval && !wait_for_completion_timeout(&done,
54224 msecs_to_jiffies(2000))) {
54225 diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54226 index 1db0626..4948782 100644
54227 --- a/drivers/usb/host/hwa-hc.c
54228 +++ b/drivers/usb/host/hwa-hc.c
54229 @@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54230 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54231 struct wahc *wa = &hwahc->wa;
54232 struct device *dev = &wa->usb_iface->dev;
54233 - u8 mas_le[UWB_NUM_MAS/8];
54234 + u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54235 +
54236 + if (mas_le == NULL)
54237 + return -ENOMEM;
54238
54239 /* Set the stream index */
54240 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54241 @@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54242 WUSB_REQ_SET_WUSB_MAS,
54243 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54244 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54245 - mas_le, 32, USB_CTRL_SET_TIMEOUT);
54246 + mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54247 if (result < 0)
54248 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54249 out:
54250 + kfree(mas_le);
54251 +
54252 return result;
54253 }
54254
54255 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54256 index b3d245e..99549ed 100644
54257 --- a/drivers/usb/misc/appledisplay.c
54258 +++ b/drivers/usb/misc/appledisplay.c
54259 @@ -84,7 +84,7 @@ struct appledisplay {
54260 struct mutex sysfslock; /* concurrent read and write */
54261 };
54262
54263 -static atomic_t count_displays = ATOMIC_INIT(0);
54264 +static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54265 static struct workqueue_struct *wq;
54266
54267 static void appledisplay_complete(struct urb *urb)
54268 @@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54269
54270 /* Register backlight device */
54271 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54272 - atomic_inc_return(&count_displays) - 1);
54273 + atomic_inc_return_unchecked(&count_displays) - 1);
54274 memset(&props, 0, sizeof(struct backlight_properties));
54275 props.type = BACKLIGHT_RAW;
54276 props.max_brightness = 0xff;
54277 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54278 index 8d7fc48..01c4986 100644
54279 --- a/drivers/usb/serial/console.c
54280 +++ b/drivers/usb/serial/console.c
54281 @@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
54282
54283 info->port = port;
54284
54285 - ++port->port.count;
54286 + atomic_inc(&port->port.count);
54287 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54288 if (serial->type->set_termios) {
54289 /*
54290 @@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
54291 }
54292 /* Now that any required fake tty operations are completed restore
54293 * the tty port count */
54294 - --port->port.count;
54295 + atomic_dec(&port->port.count);
54296 /* The console is special in terms of closing the device so
54297 * indicate this port is now acting as a system console. */
54298 port->port.console = 1;
54299 @@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
54300 free_tty:
54301 kfree(tty);
54302 reset_open_count:
54303 - port->port.count = 0;
54304 + atomic_set(&port->port.count, 0);
54305 usb_autopm_put_interface(serial->interface);
54306 error_get_interface:
54307 usb_serial_put(serial);
54308 @@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
54309 static void usb_console_write(struct console *co,
54310 const char *buf, unsigned count)
54311 {
54312 - static struct usbcons_info *info = &usbcons_info;
54313 + struct usbcons_info *info = &usbcons_info;
54314 struct usb_serial_port *port = info->port;
54315 struct usb_serial *serial;
54316 int retval = -ENODEV;
54317 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54318 index 307e339..6aa97cb 100644
54319 --- a/drivers/usb/storage/usb.h
54320 +++ b/drivers/usb/storage/usb.h
54321 @@ -63,7 +63,7 @@ struct us_unusual_dev {
54322 __u8 useProtocol;
54323 __u8 useTransport;
54324 int (*initFunction)(struct us_data *);
54325 -};
54326 +} __do_const;
54327
54328
54329 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54330 diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54331 index a863a98..d272795 100644
54332 --- a/drivers/usb/usbip/vhci.h
54333 +++ b/drivers/usb/usbip/vhci.h
54334 @@ -83,7 +83,7 @@ struct vhci_hcd {
54335 unsigned resuming:1;
54336 unsigned long re_timeout;
54337
54338 - atomic_t seqnum;
54339 + atomic_unchecked_t seqnum;
54340
54341 /*
54342 * NOTE:
54343 diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54344 index c02374b..32d47a9 100644
54345 --- a/drivers/usb/usbip/vhci_hcd.c
54346 +++ b/drivers/usb/usbip/vhci_hcd.c
54347 @@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54348
54349 spin_lock(&vdev->priv_lock);
54350
54351 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54352 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54353 if (priv->seqnum == 0xffff)
54354 dev_info(&urb->dev->dev, "seqnum max\n");
54355
54356 @@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54357 return -ENOMEM;
54358 }
54359
54360 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54361 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54362 if (unlink->seqnum == 0xffff)
54363 pr_info("seqnum max\n");
54364
54365 @@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
54366 vdev->rhport = rhport;
54367 }
54368
54369 - atomic_set(&vhci->seqnum, 0);
54370 + atomic_set_unchecked(&vhci->seqnum, 0);
54371 spin_lock_init(&vhci->lock);
54372
54373 hcd->power_budget = 0; /* no limit */
54374 diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54375 index 00e4a54..d676f85 100644
54376 --- a/drivers/usb/usbip/vhci_rx.c
54377 +++ b/drivers/usb/usbip/vhci_rx.c
54378 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54379 if (!urb) {
54380 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54381 pr_info("max seqnum %d\n",
54382 - atomic_read(&the_controller->seqnum));
54383 + atomic_read_unchecked(&the_controller->seqnum));
54384 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54385 return;
54386 }
54387 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54388 index edc7267..9f65ce2 100644
54389 --- a/drivers/usb/wusbcore/wa-hc.h
54390 +++ b/drivers/usb/wusbcore/wa-hc.h
54391 @@ -240,7 +240,7 @@ struct wahc {
54392 spinlock_t xfer_list_lock;
54393 struct work_struct xfer_enqueue_work;
54394 struct work_struct xfer_error_work;
54395 - atomic_t xfer_id_count;
54396 + atomic_unchecked_t xfer_id_count;
54397
54398 kernel_ulong_t quirks;
54399 };
54400 @@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54401 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54402 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54403 wa->dto_in_use = 0;
54404 - atomic_set(&wa->xfer_id_count, 1);
54405 + atomic_set_unchecked(&wa->xfer_id_count, 1);
54406 /* init the buf in URBs */
54407 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54408 usb_init_urb(&(wa->buf_in_urbs[index]));
54409 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54410 index 69af4fd..da390d7 100644
54411 --- a/drivers/usb/wusbcore/wa-xfer.c
54412 +++ b/drivers/usb/wusbcore/wa-xfer.c
54413 @@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54414 */
54415 static void wa_xfer_id_init(struct wa_xfer *xfer)
54416 {
54417 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54418 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54419 }
54420
54421 /* Return the xfer's ID. */
54422 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54423 index f018d8d..ccab63f 100644
54424 --- a/drivers/vfio/vfio.c
54425 +++ b/drivers/vfio/vfio.c
54426 @@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54427 return 0;
54428
54429 /* TODO Prevent device auto probing */
54430 - WARN("Device %s added to live group %d!\n", dev_name(dev),
54431 + WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
54432 iommu_group_id(group->iommu_group));
54433
54434 return 0;
54435 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
54436 index 5174eba..451e6bc 100644
54437 --- a/drivers/vhost/vringh.c
54438 +++ b/drivers/vhost/vringh.c
54439 @@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
54440 /* Userspace access helpers: in this case, addresses are really userspace. */
54441 static inline int getu16_user(u16 *val, const u16 *p)
54442 {
54443 - return get_user(*val, (__force u16 __user *)p);
54444 + return get_user(*val, (u16 __force_user *)p);
54445 }
54446
54447 static inline int putu16_user(u16 *p, u16 val)
54448 {
54449 - return put_user(val, (__force u16 __user *)p);
54450 + return put_user(val, (u16 __force_user *)p);
54451 }
54452
54453 static inline int copydesc_user(void *dst, const void *src, size_t len)
54454 {
54455 - return copy_from_user(dst, (__force void __user *)src, len) ?
54456 + return copy_from_user(dst, (void __force_user *)src, len) ?
54457 -EFAULT : 0;
54458 }
54459
54460 @@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
54461 const struct vring_used_elem *src,
54462 unsigned int num)
54463 {
54464 - return copy_to_user((__force void __user *)dst, src,
54465 + return copy_to_user((void __force_user *)dst, src,
54466 sizeof(*dst) * num) ? -EFAULT : 0;
54467 }
54468
54469 static inline int xfer_from_user(void *src, void *dst, size_t len)
54470 {
54471 - return copy_from_user(dst, (__force void __user *)src, len) ?
54472 + return copy_from_user(dst, (void __force_user *)src, len) ?
54473 -EFAULT : 0;
54474 }
54475
54476 static inline int xfer_to_user(void *dst, void *src, size_t len)
54477 {
54478 - return copy_to_user((__force void __user *)dst, src, len) ?
54479 + return copy_to_user((void __force_user *)dst, src, len) ?
54480 -EFAULT : 0;
54481 }
54482
54483 @@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
54484 vrh->last_used_idx = 0;
54485 vrh->vring.num = num;
54486 /* vring expects kernel addresses, but only used via accessors. */
54487 - vrh->vring.desc = (__force struct vring_desc *)desc;
54488 - vrh->vring.avail = (__force struct vring_avail *)avail;
54489 - vrh->vring.used = (__force struct vring_used *)used;
54490 + vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
54491 + vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
54492 + vrh->vring.used = (__force_kernel struct vring_used *)used;
54493 return 0;
54494 }
54495 EXPORT_SYMBOL(vringh_init_user);
54496 @@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
54497
54498 static inline int putu16_kern(u16 *p, u16 val)
54499 {
54500 - ACCESS_ONCE(*p) = val;
54501 + ACCESS_ONCE_RW(*p) = val;
54502 return 0;
54503 }
54504
54505 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
54506 index 84a110a..96312c3 100644
54507 --- a/drivers/video/backlight/kb3886_bl.c
54508 +++ b/drivers/video/backlight/kb3886_bl.c
54509 @@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
54510 static unsigned long kb3886bl_flags;
54511 #define KB3886BL_SUSPENDED 0x01
54512
54513 -static struct dmi_system_id kb3886bl_device_table[] __initdata = {
54514 +static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
54515 {
54516 .ident = "Sahara Touch-iT",
54517 .matches = {
54518 diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
54519 index 1b0b233..6f34c2c 100644
54520 --- a/drivers/video/fbdev/arcfb.c
54521 +++ b/drivers/video/fbdev/arcfb.c
54522 @@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
54523 return -ENOSPC;
54524
54525 err = 0;
54526 - if ((count + p) > fbmemlength) {
54527 + if (count > (fbmemlength - p)) {
54528 count = fbmemlength - p;
54529 err = -ENOSPC;
54530 }
54531 diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
54532 index aedf2fb..47c9aca 100644
54533 --- a/drivers/video/fbdev/aty/aty128fb.c
54534 +++ b/drivers/video/fbdev/aty/aty128fb.c
54535 @@ -149,7 +149,7 @@ enum {
54536 };
54537
54538 /* Must match above enum */
54539 -static char * const r128_family[] = {
54540 +static const char * const r128_family[] = {
54541 "AGP",
54542 "PCI",
54543 "PRO AGP",
54544 diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
54545 index 37ec09b..98f8862 100644
54546 --- a/drivers/video/fbdev/aty/atyfb_base.c
54547 +++ b/drivers/video/fbdev/aty/atyfb_base.c
54548 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
54549 par->accel_flags = var->accel_flags; /* hack */
54550
54551 if (var->accel_flags) {
54552 - info->fbops->fb_sync = atyfb_sync;
54553 + pax_open_kernel();
54554 + *(void **)&info->fbops->fb_sync = atyfb_sync;
54555 + pax_close_kernel();
54556 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54557 } else {
54558 - info->fbops->fb_sync = NULL;
54559 + pax_open_kernel();
54560 + *(void **)&info->fbops->fb_sync = NULL;
54561 + pax_close_kernel();
54562 info->flags |= FBINFO_HWACCEL_DISABLED;
54563 }
54564
54565 diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
54566 index 2fa0317..4983f2a 100644
54567 --- a/drivers/video/fbdev/aty/mach64_cursor.c
54568 +++ b/drivers/video/fbdev/aty/mach64_cursor.c
54569 @@ -8,6 +8,7 @@
54570 #include "../core/fb_draw.h"
54571
54572 #include <asm/io.h>
54573 +#include <asm/pgtable.h>
54574
54575 #ifdef __sparc__
54576 #include <asm/fbio.h>
54577 @@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
54578 info->sprite.buf_align = 16; /* and 64 lines tall. */
54579 info->sprite.flags = FB_PIXMAP_IO;
54580
54581 - info->fbops->fb_cursor = atyfb_cursor;
54582 + pax_open_kernel();
54583 + *(void **)&info->fbops->fb_cursor = atyfb_cursor;
54584 + pax_close_kernel();
54585
54586 return 0;
54587 }
54588 diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
54589 index 900aa4e..6d49418 100644
54590 --- a/drivers/video/fbdev/core/fb_defio.c
54591 +++ b/drivers/video/fbdev/core/fb_defio.c
54592 @@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
54593
54594 BUG_ON(!fbdefio);
54595 mutex_init(&fbdefio->lock);
54596 - info->fbops->fb_mmap = fb_deferred_io_mmap;
54597 + pax_open_kernel();
54598 + *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
54599 + pax_close_kernel();
54600 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
54601 INIT_LIST_HEAD(&fbdefio->pagelist);
54602 if (fbdefio->delay == 0) /* set a default of 1 s */
54603 @@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
54604 page->mapping = NULL;
54605 }
54606
54607 - info->fbops->fb_mmap = NULL;
54608 + *(void **)&info->fbops->fb_mmap = NULL;
54609 mutex_destroy(&fbdefio->lock);
54610 }
54611 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
54612 diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
54613 index 0705d88..d9429bf 100644
54614 --- a/drivers/video/fbdev/core/fbmem.c
54615 +++ b/drivers/video/fbdev/core/fbmem.c
54616 @@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
54617 __u32 data;
54618 int err;
54619
54620 - err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
54621 + err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
54622
54623 data = (__u32) (unsigned long) fix->smem_start;
54624 err |= put_user(data, &fix32->smem_start);
54625 diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
54626 index 4254336..282567e 100644
54627 --- a/drivers/video/fbdev/hyperv_fb.c
54628 +++ b/drivers/video/fbdev/hyperv_fb.c
54629 @@ -240,7 +240,7 @@ static uint screen_fb_size;
54630 static inline int synthvid_send(struct hv_device *hdev,
54631 struct synthvid_msg *msg)
54632 {
54633 - static atomic64_t request_id = ATOMIC64_INIT(0);
54634 + static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
54635 int ret;
54636
54637 msg->pipe_hdr.type = PIPE_MSG_DATA;
54638 @@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
54639
54640 ret = vmbus_sendpacket(hdev->channel, msg,
54641 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
54642 - atomic64_inc_return(&request_id),
54643 + atomic64_inc_return_unchecked(&request_id),
54644 VM_PKT_DATA_INBAND, 0);
54645
54646 if (ret)
54647 diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
54648 index 7672d2e..b56437f 100644
54649 --- a/drivers/video/fbdev/i810/i810_accel.c
54650 +++ b/drivers/video/fbdev/i810/i810_accel.c
54651 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
54652 }
54653 }
54654 printk("ringbuffer lockup!!!\n");
54655 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
54656 i810_report_error(mmio);
54657 par->dev_flags |= LOCKUP;
54658 info->pixmap.scan_align = 1;
54659 diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54660 index a01147f..5d896f8 100644
54661 --- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54662 +++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54663 @@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
54664
54665 #ifdef CONFIG_FB_MATROX_MYSTIQUE
54666 struct matrox_switch matrox_mystique = {
54667 - MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
54668 + .preinit = MGA1064_preinit,
54669 + .reset = MGA1064_reset,
54670 + .init = MGA1064_init,
54671 + .restore = MGA1064_restore,
54672 };
54673 EXPORT_SYMBOL(matrox_mystique);
54674 #endif
54675
54676 #ifdef CONFIG_FB_MATROX_G
54677 struct matrox_switch matrox_G100 = {
54678 - MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
54679 + .preinit = MGAG100_preinit,
54680 + .reset = MGAG100_reset,
54681 + .init = MGAG100_init,
54682 + .restore = MGAG100_restore,
54683 };
54684 EXPORT_SYMBOL(matrox_G100);
54685 #endif
54686 diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54687 index 195ad7c..09743fc 100644
54688 --- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54689 +++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54690 @@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
54691 }
54692
54693 struct matrox_switch matrox_millennium = {
54694 - Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
54695 + .preinit = Ti3026_preinit,
54696 + .reset = Ti3026_reset,
54697 + .init = Ti3026_init,
54698 + .restore = Ti3026_restore
54699 };
54700 EXPORT_SYMBOL(matrox_millennium);
54701 #endif
54702 diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54703 index fe92eed..106e085 100644
54704 --- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54705 +++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54706 @@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
54707 struct mb862xxfb_par *par = info->par;
54708
54709 if (info->var.bits_per_pixel == 32) {
54710 - info->fbops->fb_fillrect = cfb_fillrect;
54711 - info->fbops->fb_copyarea = cfb_copyarea;
54712 - info->fbops->fb_imageblit = cfb_imageblit;
54713 + pax_open_kernel();
54714 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54715 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54716 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54717 + pax_close_kernel();
54718 } else {
54719 outreg(disp, GC_L0EM, 3);
54720 - info->fbops->fb_fillrect = mb86290fb_fillrect;
54721 - info->fbops->fb_copyarea = mb86290fb_copyarea;
54722 - info->fbops->fb_imageblit = mb86290fb_imageblit;
54723 + pax_open_kernel();
54724 + *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
54725 + *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
54726 + *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
54727 + pax_close_kernel();
54728 }
54729 outreg(draw, GDC_REG_DRAW_BASE, 0);
54730 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
54731 diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
54732 index def0412..fed6529 100644
54733 --- a/drivers/video/fbdev/nvidia/nvidia.c
54734 +++ b/drivers/video/fbdev/nvidia/nvidia.c
54735 @@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
54736 info->fix.line_length = (info->var.xres_virtual *
54737 info->var.bits_per_pixel) >> 3;
54738 if (info->var.accel_flags) {
54739 - info->fbops->fb_imageblit = nvidiafb_imageblit;
54740 - info->fbops->fb_fillrect = nvidiafb_fillrect;
54741 - info->fbops->fb_copyarea = nvidiafb_copyarea;
54742 - info->fbops->fb_sync = nvidiafb_sync;
54743 + pax_open_kernel();
54744 + *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
54745 + *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
54746 + *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
54747 + *(void **)&info->fbops->fb_sync = nvidiafb_sync;
54748 + pax_close_kernel();
54749 info->pixmap.scan_align = 4;
54750 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54751 info->flags |= FBINFO_READS_FAST;
54752 NVResetGraphics(info);
54753 } else {
54754 - info->fbops->fb_imageblit = cfb_imageblit;
54755 - info->fbops->fb_fillrect = cfb_fillrect;
54756 - info->fbops->fb_copyarea = cfb_copyarea;
54757 - info->fbops->fb_sync = NULL;
54758 + pax_open_kernel();
54759 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54760 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54761 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54762 + *(void **)&info->fbops->fb_sync = NULL;
54763 + pax_close_kernel();
54764 info->pixmap.scan_align = 1;
54765 info->flags |= FBINFO_HWACCEL_DISABLED;
54766 info->flags &= ~FBINFO_READS_FAST;
54767 @@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
54768 info->pixmap.size = 8 * 1024;
54769 info->pixmap.flags = FB_PIXMAP_SYSTEM;
54770
54771 - if (!hwcur)
54772 - info->fbops->fb_cursor = NULL;
54773 + if (!hwcur) {
54774 + pax_open_kernel();
54775 + *(void **)&info->fbops->fb_cursor = NULL;
54776 + pax_close_kernel();
54777 + }
54778
54779 info->var.accel_flags = (!noaccel);
54780
54781 diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
54782 index 2412a0d..294215b 100644
54783 --- a/drivers/video/fbdev/omap2/dss/display.c
54784 +++ b/drivers/video/fbdev/omap2/dss/display.c
54785 @@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
54786 if (dssdev->name == NULL)
54787 dssdev->name = dssdev->alias;
54788
54789 + pax_open_kernel();
54790 if (drv && drv->get_resolution == NULL)
54791 - drv->get_resolution = omapdss_default_get_resolution;
54792 + *(void **)&drv->get_resolution = omapdss_default_get_resolution;
54793 if (drv && drv->get_recommended_bpp == NULL)
54794 - drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54795 + *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54796 if (drv && drv->get_timings == NULL)
54797 - drv->get_timings = omapdss_default_get_timings;
54798 + *(void **)&drv->get_timings = omapdss_default_get_timings;
54799 + pax_close_kernel();
54800
54801 mutex_lock(&panel_list_mutex);
54802 list_add_tail(&dssdev->panel_list, &panel_list);
54803 diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
54804 index 83433cb..71e9b98 100644
54805 --- a/drivers/video/fbdev/s1d13xxxfb.c
54806 +++ b/drivers/video/fbdev/s1d13xxxfb.c
54807 @@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
54808
54809 switch(prod_id) {
54810 case S1D13506_PROD_ID: /* activate acceleration */
54811 - s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54812 - s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54813 + pax_open_kernel();
54814 + *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54815 + *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54816 + pax_close_kernel();
54817 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
54818 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
54819 break;
54820 diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54821 index 2bcc84a..29dd1ea 100644
54822 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
54823 +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54824 @@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
54825 }
54826
54827 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
54828 - lcdc_sys_write_index,
54829 - lcdc_sys_write_data,
54830 - lcdc_sys_read_data,
54831 + .write_index = lcdc_sys_write_index,
54832 + .write_data = lcdc_sys_write_data,
54833 + .read_data = lcdc_sys_read_data,
54834 };
54835
54836 static int sh_mobile_lcdc_sginit(struct fb_info *info,
54837 diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
54838 index d513ed6..90b0de9 100644
54839 --- a/drivers/video/fbdev/smscufx.c
54840 +++ b/drivers/video/fbdev/smscufx.c
54841 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
54842 fb_deferred_io_cleanup(info);
54843 kfree(info->fbdefio);
54844 info->fbdefio = NULL;
54845 - info->fbops->fb_mmap = ufx_ops_mmap;
54846 + pax_open_kernel();
54847 + *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
54848 + pax_close_kernel();
54849 }
54850
54851 pr_debug("released /dev/fb%d user=%d count=%d",
54852 diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
54853 index 046d51d..be564da 100644
54854 --- a/drivers/video/fbdev/udlfb.c
54855 +++ b/drivers/video/fbdev/udlfb.c
54856 @@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
54857 dlfb_urb_completion(urb);
54858
54859 error:
54860 - atomic_add(bytes_sent, &dev->bytes_sent);
54861 - atomic_add(bytes_identical, &dev->bytes_identical);
54862 - atomic_add(width*height*2, &dev->bytes_rendered);
54863 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54864 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54865 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
54866 end_cycles = get_cycles();
54867 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
54868 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54869 >> 10)), /* Kcycles */
54870 &dev->cpu_kcycles_used);
54871
54872 @@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
54873 dlfb_urb_completion(urb);
54874
54875 error:
54876 - atomic_add(bytes_sent, &dev->bytes_sent);
54877 - atomic_add(bytes_identical, &dev->bytes_identical);
54878 - atomic_add(bytes_rendered, &dev->bytes_rendered);
54879 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54880 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54881 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
54882 end_cycles = get_cycles();
54883 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
54884 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54885 >> 10)), /* Kcycles */
54886 &dev->cpu_kcycles_used);
54887 }
54888 @@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
54889 fb_deferred_io_cleanup(info);
54890 kfree(info->fbdefio);
54891 info->fbdefio = NULL;
54892 - info->fbops->fb_mmap = dlfb_ops_mmap;
54893 + pax_open_kernel();
54894 + *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
54895 + pax_close_kernel();
54896 }
54897
54898 pr_warn("released /dev/fb%d user=%d count=%d\n",
54899 @@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
54900 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54901 struct dlfb_data *dev = fb_info->par;
54902 return snprintf(buf, PAGE_SIZE, "%u\n",
54903 - atomic_read(&dev->bytes_rendered));
54904 + atomic_read_unchecked(&dev->bytes_rendered));
54905 }
54906
54907 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
54908 @@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
54909 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54910 struct dlfb_data *dev = fb_info->par;
54911 return snprintf(buf, PAGE_SIZE, "%u\n",
54912 - atomic_read(&dev->bytes_identical));
54913 + atomic_read_unchecked(&dev->bytes_identical));
54914 }
54915
54916 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
54917 @@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
54918 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54919 struct dlfb_data *dev = fb_info->par;
54920 return snprintf(buf, PAGE_SIZE, "%u\n",
54921 - atomic_read(&dev->bytes_sent));
54922 + atomic_read_unchecked(&dev->bytes_sent));
54923 }
54924
54925 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
54926 @@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
54927 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54928 struct dlfb_data *dev = fb_info->par;
54929 return snprintf(buf, PAGE_SIZE, "%u\n",
54930 - atomic_read(&dev->cpu_kcycles_used));
54931 + atomic_read_unchecked(&dev->cpu_kcycles_used));
54932 }
54933
54934 static ssize_t edid_show(
54935 @@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
54936 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54937 struct dlfb_data *dev = fb_info->par;
54938
54939 - atomic_set(&dev->bytes_rendered, 0);
54940 - atomic_set(&dev->bytes_identical, 0);
54941 - atomic_set(&dev->bytes_sent, 0);
54942 - atomic_set(&dev->cpu_kcycles_used, 0);
54943 + atomic_set_unchecked(&dev->bytes_rendered, 0);
54944 + atomic_set_unchecked(&dev->bytes_identical, 0);
54945 + atomic_set_unchecked(&dev->bytes_sent, 0);
54946 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
54947
54948 return count;
54949 }
54950 diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
54951 index 509d452..7c9d2de 100644
54952 --- a/drivers/video/fbdev/uvesafb.c
54953 +++ b/drivers/video/fbdev/uvesafb.c
54954 @@ -19,6 +19,7 @@
54955 #include <linux/io.h>
54956 #include <linux/mutex.h>
54957 #include <linux/slab.h>
54958 +#include <linux/moduleloader.h>
54959 #include <video/edid.h>
54960 #include <video/uvesafb.h>
54961 #ifdef CONFIG_X86
54962 @@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
54963 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
54964 par->pmi_setpal = par->ypan = 0;
54965 } else {
54966 +
54967 +#ifdef CONFIG_PAX_KERNEXEC
54968 +#ifdef CONFIG_MODULES
54969 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
54970 +#endif
54971 + if (!par->pmi_code) {
54972 + par->pmi_setpal = par->ypan = 0;
54973 + return 0;
54974 + }
54975 +#endif
54976 +
54977 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
54978 + task->t.regs.edi);
54979 +
54980 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
54981 + pax_open_kernel();
54982 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
54983 + pax_close_kernel();
54984 +
54985 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
54986 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
54987 +#else
54988 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
54989 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
54990 +#endif
54991 +
54992 printk(KERN_INFO "uvesafb: protected mode interface info at "
54993 "%04x:%04x\n",
54994 (u16)task->t.regs.es, (u16)task->t.regs.edi);
54995 @@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
54996 par->ypan = ypan;
54997
54998 if (par->pmi_setpal || par->ypan) {
54999 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55000 if (__supported_pte_mask & _PAGE_NX) {
55001 par->pmi_setpal = par->ypan = 0;
55002 printk(KERN_WARNING "uvesafb: NX protection is active, "
55003 "better not use the PMI.\n");
55004 - } else {
55005 + } else
55006 +#endif
55007 uvesafb_vbe_getpmi(task, par);
55008 - }
55009 }
55010 #else
55011 /* The protected mode interface is not available on non-x86. */
55012 @@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55013 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55014
55015 /* Disable blanking if the user requested so. */
55016 - if (!blank)
55017 - info->fbops->fb_blank = NULL;
55018 + if (!blank) {
55019 + pax_open_kernel();
55020 + *(void **)&info->fbops->fb_blank = NULL;
55021 + pax_close_kernel();
55022 + }
55023
55024 /*
55025 * Find out how much IO memory is required for the mode with
55026 @@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55027 info->flags = FBINFO_FLAG_DEFAULT |
55028 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55029
55030 - if (!par->ypan)
55031 - info->fbops->fb_pan_display = NULL;
55032 + if (!par->ypan) {
55033 + pax_open_kernel();
55034 + *(void **)&info->fbops->fb_pan_display = NULL;
55035 + pax_close_kernel();
55036 + }
55037 }
55038
55039 static void uvesafb_init_mtrr(struct fb_info *info)
55040 @@ -1787,6 +1817,11 @@ out_mode:
55041 out:
55042 kfree(par->vbe_modes);
55043
55044 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55045 + if (par->pmi_code)
55046 + module_free_exec(NULL, par->pmi_code);
55047 +#endif
55048 +
55049 framebuffer_release(info);
55050 return err;
55051 }
55052 @@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
55053 kfree(par->vbe_state_orig);
55054 kfree(par->vbe_state_saved);
55055
55056 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55057 + if (par->pmi_code)
55058 + module_free_exec(NULL, par->pmi_code);
55059 +#endif
55060 +
55061 framebuffer_release(info);
55062 }
55063 return 0;
55064 diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55065 index 6170e7f..dd63031 100644
55066 --- a/drivers/video/fbdev/vesafb.c
55067 +++ b/drivers/video/fbdev/vesafb.c
55068 @@ -9,6 +9,7 @@
55069 */
55070
55071 #include <linux/module.h>
55072 +#include <linux/moduleloader.h>
55073 #include <linux/kernel.h>
55074 #include <linux/errno.h>
55075 #include <linux/string.h>
55076 @@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55077 static int vram_total; /* Set total amount of memory */
55078 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55079 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55080 -static void (*pmi_start)(void) __read_mostly;
55081 -static void (*pmi_pal) (void) __read_mostly;
55082 +static void (*pmi_start)(void) __read_only;
55083 +static void (*pmi_pal) (void) __read_only;
55084 static int depth __read_mostly;
55085 static int vga_compat __read_mostly;
55086 /* --------------------------------------------------------------------- */
55087 @@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55088 unsigned int size_remap;
55089 unsigned int size_total;
55090 char *option = NULL;
55091 + void *pmi_code = NULL;
55092
55093 /* ignore error return of fb_get_options */
55094 fb_get_options("vesafb", &option);
55095 @@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55096 size_remap = size_total;
55097 vesafb_fix.smem_len = size_remap;
55098
55099 -#ifndef __i386__
55100 - screen_info.vesapm_seg = 0;
55101 -#endif
55102 -
55103 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55104 printk(KERN_WARNING
55105 "vesafb: cannot reserve video memory at 0x%lx\n",
55106 @@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55107 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55108 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55109
55110 +#ifdef __i386__
55111 +
55112 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55113 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
55114 + if (!pmi_code)
55115 +#elif !defined(CONFIG_PAX_KERNEXEC)
55116 + if (0)
55117 +#endif
55118 +
55119 +#endif
55120 + screen_info.vesapm_seg = 0;
55121 +
55122 if (screen_info.vesapm_seg) {
55123 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55124 - screen_info.vesapm_seg,screen_info.vesapm_off);
55125 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55126 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55127 }
55128
55129 if (screen_info.vesapm_seg < 0xc000)
55130 @@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55131
55132 if (ypan || pmi_setpal) {
55133 unsigned short *pmi_base;
55134 +
55135 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55136 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55137 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55138 +
55139 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55140 + pax_open_kernel();
55141 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55142 +#else
55143 + pmi_code = pmi_base;
55144 +#endif
55145 +
55146 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55147 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55148 +
55149 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55150 + pmi_start = ktva_ktla(pmi_start);
55151 + pmi_pal = ktva_ktla(pmi_pal);
55152 + pax_close_kernel();
55153 +#endif
55154 +
55155 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55156 if (pmi_base[3]) {
55157 printk(KERN_INFO "vesafb: pmi: ports = ");
55158 @@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55159 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55160 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55161
55162 - if (!ypan)
55163 - info->fbops->fb_pan_display = NULL;
55164 + if (!ypan) {
55165 + pax_open_kernel();
55166 + *(void **)&info->fbops->fb_pan_display = NULL;
55167 + pax_close_kernel();
55168 + }
55169
55170 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55171 err = -ENOMEM;
55172 @@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55173 fb_info(info, "%s frame buffer device\n", info->fix.id);
55174 return 0;
55175 err:
55176 +
55177 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55178 + module_free_exec(NULL, pmi_code);
55179 +#endif
55180 +
55181 if (info->screen_base)
55182 iounmap(info->screen_base);
55183 framebuffer_release(info);
55184 diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55185 index 88714ae..16c2e11 100644
55186 --- a/drivers/video/fbdev/via/via_clock.h
55187 +++ b/drivers/video/fbdev/via/via_clock.h
55188 @@ -56,7 +56,7 @@ struct via_clock {
55189
55190 void (*set_engine_pll_state)(u8 state);
55191 void (*set_engine_pll)(struct via_pll_config config);
55192 -};
55193 +} __no_const;
55194
55195
55196 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55197 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55198 index 3c14e43..2630570 100644
55199 --- a/drivers/video/logo/logo_linux_clut224.ppm
55200 +++ b/drivers/video/logo/logo_linux_clut224.ppm
55201 @@ -2,1603 +2,1123 @@ P3
55202 # Standard 224-color Linux logo
55203 80 80
55204 255
55205 - 0 0 0 0 0 0 0 0 0 0 0 0
55206 - 0 0 0 0 0 0 0 0 0 0 0 0
55207 - 0 0 0 0 0 0 0 0 0 0 0 0
55208 - 0 0 0 0 0 0 0 0 0 0 0 0
55209 - 0 0 0 0 0 0 0 0 0 0 0 0
55210 - 0 0 0 0 0 0 0 0 0 0 0 0
55211 - 0 0 0 0 0 0 0 0 0 0 0 0
55212 - 0 0 0 0 0 0 0 0 0 0 0 0
55213 - 0 0 0 0 0 0 0 0 0 0 0 0
55214 - 6 6 6 6 6 6 10 10 10 10 10 10
55215 - 10 10 10 6 6 6 6 6 6 6 6 6
55216 - 0 0 0 0 0 0 0 0 0 0 0 0
55217 - 0 0 0 0 0 0 0 0 0 0 0 0
55218 - 0 0 0 0 0 0 0 0 0 0 0 0
55219 - 0 0 0 0 0 0 0 0 0 0 0 0
55220 - 0 0 0 0 0 0 0 0 0 0 0 0
55221 - 0 0 0 0 0 0 0 0 0 0 0 0
55222 - 0 0 0 0 0 0 0 0 0 0 0 0
55223 - 0 0 0 0 0 0 0 0 0 0 0 0
55224 - 0 0 0 0 0 0 0 0 0 0 0 0
55225 - 0 0 0 0 0 0 0 0 0 0 0 0
55226 - 0 0 0 0 0 0 0 0 0 0 0 0
55227 - 0 0 0 0 0 0 0 0 0 0 0 0
55228 - 0 0 0 0 0 0 0 0 0 0 0 0
55229 - 0 0 0 0 0 0 0 0 0 0 0 0
55230 - 0 0 0 0 0 0 0 0 0 0 0 0
55231 - 0 0 0 0 0 0 0 0 0 0 0 0
55232 - 0 0 0 0 0 0 0 0 0 0 0 0
55233 - 0 0 0 6 6 6 10 10 10 14 14 14
55234 - 22 22 22 26 26 26 30 30 30 34 34 34
55235 - 30 30 30 30 30 30 26 26 26 18 18 18
55236 - 14 14 14 10 10 10 6 6 6 0 0 0
55237 - 0 0 0 0 0 0 0 0 0 0 0 0
55238 - 0 0 0 0 0 0 0 0 0 0 0 0
55239 - 0 0 0 0 0 0 0 0 0 0 0 0
55240 - 0 0 0 0 0 0 0 0 0 0 0 0
55241 - 0 0 0 0 0 0 0 0 0 0 0 0
55242 - 0 0 0 0 0 0 0 0 0 0 0 0
55243 - 0 0 0 0 0 0 0 0 0 0 0 0
55244 - 0 0 0 0 0 0 0 0 0 0 0 0
55245 - 0 0 0 0 0 0 0 0 0 0 0 0
55246 - 0 0 0 0 0 1 0 0 1 0 0 0
55247 - 0 0 0 0 0 0 0 0 0 0 0 0
55248 - 0 0 0 0 0 0 0 0 0 0 0 0
55249 - 0 0 0 0 0 0 0 0 0 0 0 0
55250 - 0 0 0 0 0 0 0 0 0 0 0 0
55251 - 0 0 0 0 0 0 0 0 0 0 0 0
55252 - 0 0 0 0 0 0 0 0 0 0 0 0
55253 - 6 6 6 14 14 14 26 26 26 42 42 42
55254 - 54 54 54 66 66 66 78 78 78 78 78 78
55255 - 78 78 78 74 74 74 66 66 66 54 54 54
55256 - 42 42 42 26 26 26 18 18 18 10 10 10
55257 - 6 6 6 0 0 0 0 0 0 0 0 0
55258 - 0 0 0 0 0 0 0 0 0 0 0 0
55259 - 0 0 0 0 0 0 0 0 0 0 0 0
55260 - 0 0 0 0 0 0 0 0 0 0 0 0
55261 - 0 0 0 0 0 0 0 0 0 0 0 0
55262 - 0 0 0 0 0 0 0 0 0 0 0 0
55263 - 0 0 0 0 0 0 0 0 0 0 0 0
55264 - 0 0 0 0 0 0 0 0 0 0 0 0
55265 - 0 0 0 0 0 0 0 0 0 0 0 0
55266 - 0 0 1 0 0 0 0 0 0 0 0 0
55267 - 0 0 0 0 0 0 0 0 0 0 0 0
55268 - 0 0 0 0 0 0 0 0 0 0 0 0
55269 - 0 0 0 0 0 0 0 0 0 0 0 0
55270 - 0 0 0 0 0 0 0 0 0 0 0 0
55271 - 0 0 0 0 0 0 0 0 0 0 0 0
55272 - 0 0 0 0 0 0 0 0 0 10 10 10
55273 - 22 22 22 42 42 42 66 66 66 86 86 86
55274 - 66 66 66 38 38 38 38 38 38 22 22 22
55275 - 26 26 26 34 34 34 54 54 54 66 66 66
55276 - 86 86 86 70 70 70 46 46 46 26 26 26
55277 - 14 14 14 6 6 6 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 - 0 0 0 0 0 0 0 0 0 0 0 0
55285 - 0 0 0 0 0 0 0 0 0 0 0 0
55286 - 0 0 1 0 0 1 0 0 1 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 10 10 10 26 26 26
55293 - 50 50 50 82 82 82 58 58 58 6 6 6
55294 - 2 2 6 2 2 6 2 2 6 2 2 6
55295 - 2 2 6 2 2 6 2 2 6 2 2 6
55296 - 6 6 6 54 54 54 86 86 86 66 66 66
55297 - 38 38 38 18 18 18 6 6 6 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 0 0 0 0 0 0 0 0 0
55304 - 0 0 0 0 0 0 0 0 0 0 0 0
55305 - 0 0 0 0 0 0 0 0 0 0 0 0
55306 - 0 0 0 0 0 0 0 0 0 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 6 6 6 22 22 22 50 50 50
55313 - 78 78 78 34 34 34 2 2 6 2 2 6
55314 - 2 2 6 2 2 6 2 2 6 2 2 6
55315 - 2 2 6 2 2 6 2 2 6 2 2 6
55316 - 2 2 6 2 2 6 6 6 6 70 70 70
55317 - 78 78 78 46 46 46 22 22 22 6 6 6
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 - 0 0 0 0 0 0 0 0 0 0 0 0
55324 - 0 0 0 0 0 0 0 0 0 0 0 0
55325 - 0 0 0 0 0 0 0 0 0 0 0 0
55326 - 0 0 1 0 0 1 0 0 1 0 0 0
55327 - 0 0 0 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 - 6 6 6 18 18 18 42 42 42 82 82 82
55333 - 26 26 26 2 2 6 2 2 6 2 2 6
55334 - 2 2 6 2 2 6 2 2 6 2 2 6
55335 - 2 2 6 2 2 6 2 2 6 14 14 14
55336 - 46 46 46 34 34 34 6 6 6 2 2 6
55337 - 42 42 42 78 78 78 42 42 42 18 18 18
55338 - 6 6 6 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 0 0 0
55343 - 0 0 0 0 0 0 0 0 0 0 0 0
55344 - 0 0 0 0 0 0 0 0 0 0 0 0
55345 - 0 0 0 0 0 0 0 0 0 0 0 0
55346 - 0 0 1 0 0 0 0 0 1 0 0 0
55347 - 0 0 0 0 0 0 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 - 10 10 10 30 30 30 66 66 66 58 58 58
55353 - 2 2 6 2 2 6 2 2 6 2 2 6
55354 - 2 2 6 2 2 6 2 2 6 2 2 6
55355 - 2 2 6 2 2 6 2 2 6 26 26 26
55356 - 86 86 86 101 101 101 46 46 46 10 10 10
55357 - 2 2 6 58 58 58 70 70 70 34 34 34
55358 - 10 10 10 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 0 0 0 0 0 0
55363 - 0 0 0 0 0 0 0 0 0 0 0 0
55364 - 0 0 0 0 0 0 0 0 0 0 0 0
55365 - 0 0 0 0 0 0 0 0 0 0 0 0
55366 - 0 0 1 0 0 1 0 0 1 0 0 0
55367 - 0 0 0 0 0 0 0 0 0 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 - 14 14 14 42 42 42 86 86 86 10 10 10
55373 - 2 2 6 2 2 6 2 2 6 2 2 6
55374 - 2 2 6 2 2 6 2 2 6 2 2 6
55375 - 2 2 6 2 2 6 2 2 6 30 30 30
55376 - 94 94 94 94 94 94 58 58 58 26 26 26
55377 - 2 2 6 6 6 6 78 78 78 54 54 54
55378 - 22 22 22 6 6 6 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 0 0 0 0 0 0 0 0 0
55383 - 0 0 0 0 0 0 0 0 0 0 0 0
55384 - 0 0 0 0 0 0 0 0 0 0 0 0
55385 - 0 0 0 0 0 0 0 0 0 0 0 0
55386 - 0 0 0 0 0 0 0 0 0 0 0 0
55387 - 0 0 0 0 0 0 0 0 0 0 0 0
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 6 6 6
55392 - 22 22 22 62 62 62 62 62 62 2 2 6
55393 - 2 2 6 2 2 6 2 2 6 2 2 6
55394 - 2 2 6 2 2 6 2 2 6 2 2 6
55395 - 2 2 6 2 2 6 2 2 6 26 26 26
55396 - 54 54 54 38 38 38 18 18 18 10 10 10
55397 - 2 2 6 2 2 6 34 34 34 82 82 82
55398 - 38 38 38 14 14 14 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 - 0 0 0 0 0 0 0 0 0 0 0 0
55403 - 0 0 0 0 0 0 0 0 0 0 0 0
55404 - 0 0 0 0 0 0 0 0 0 0 0 0
55405 - 0 0 0 0 0 0 0 0 0 0 0 0
55406 - 0 0 0 0 0 1 0 0 1 0 0 0
55407 - 0 0 0 0 0 0 0 0 0 0 0 0
55408 - 0 0 0 0 0 0 0 0 0 0 0 0
55409 - 0 0 0 0 0 0 0 0 0 0 0 0
55410 - 0 0 0 0 0 0 0 0 0 0 0 0
55411 - 0 0 0 0 0 0 0 0 0 6 6 6
55412 - 30 30 30 78 78 78 30 30 30 2 2 6
55413 - 2 2 6 2 2 6 2 2 6 2 2 6
55414 - 2 2 6 2 2 6 2 2 6 2 2 6
55415 - 2 2 6 2 2 6 2 2 6 10 10 10
55416 - 10 10 10 2 2 6 2 2 6 2 2 6
55417 - 2 2 6 2 2 6 2 2 6 78 78 78
55418 - 50 50 50 18 18 18 6 6 6 0 0 0
55419 - 0 0 0 0 0 0 0 0 0 0 0 0
55420 - 0 0 0 0 0 0 0 0 0 0 0 0
55421 - 0 0 0 0 0 0 0 0 0 0 0 0
55422 - 0 0 0 0 0 0 0 0 0 0 0 0
55423 - 0 0 0 0 0 0 0 0 0 0 0 0
55424 - 0 0 0 0 0 0 0 0 0 0 0 0
55425 - 0 0 0 0 0 0 0 0 0 0 0 0
55426 - 0 0 1 0 0 0 0 0 0 0 0 0
55427 - 0 0 0 0 0 0 0 0 0 0 0 0
55428 - 0 0 0 0 0 0 0 0 0 0 0 0
55429 - 0 0 0 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 10 10 10
55432 - 38 38 38 86 86 86 14 14 14 2 2 6
55433 - 2 2 6 2 2 6 2 2 6 2 2 6
55434 - 2 2 6 2 2 6 2 2 6 2 2 6
55435 - 2 2 6 2 2 6 2 2 6 2 2 6
55436 - 2 2 6 2 2 6 2 2 6 2 2 6
55437 - 2 2 6 2 2 6 2 2 6 54 54 54
55438 - 66 66 66 26 26 26 6 6 6 0 0 0
55439 - 0 0 0 0 0 0 0 0 0 0 0 0
55440 - 0 0 0 0 0 0 0 0 0 0 0 0
55441 - 0 0 0 0 0 0 0 0 0 0 0 0
55442 - 0 0 0 0 0 0 0 0 0 0 0 0
55443 - 0 0 0 0 0 0 0 0 0 0 0 0
55444 - 0 0 0 0 0 0 0 0 0 0 0 0
55445 - 0 0 0 0 0 0 0 0 0 0 0 0
55446 - 0 0 0 0 0 1 0 0 1 0 0 0
55447 - 0 0 0 0 0 0 0 0 0 0 0 0
55448 - 0 0 0 0 0 0 0 0 0 0 0 0
55449 - 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 14 14 14
55452 - 42 42 42 82 82 82 2 2 6 2 2 6
55453 - 2 2 6 6 6 6 10 10 10 2 2 6
55454 - 2 2 6 2 2 6 2 2 6 2 2 6
55455 - 2 2 6 2 2 6 2 2 6 6 6 6
55456 - 14 14 14 10 10 10 2 2 6 2 2 6
55457 - 2 2 6 2 2 6 2 2 6 18 18 18
55458 - 82 82 82 34 34 34 10 10 10 0 0 0
55459 - 0 0 0 0 0 0 0 0 0 0 0 0
55460 - 0 0 0 0 0 0 0 0 0 0 0 0
55461 - 0 0 0 0 0 0 0 0 0 0 0 0
55462 - 0 0 0 0 0 0 0 0 0 0 0 0
55463 - 0 0 0 0 0 0 0 0 0 0 0 0
55464 - 0 0 0 0 0 0 0 0 0 0 0 0
55465 - 0 0 0 0 0 0 0 0 0 0 0 0
55466 - 0 0 1 0 0 0 0 0 0 0 0 0
55467 - 0 0 0 0 0 0 0 0 0 0 0 0
55468 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55472 - 46 46 46 86 86 86 2 2 6 2 2 6
55473 - 6 6 6 6 6 6 22 22 22 34 34 34
55474 - 6 6 6 2 2 6 2 2 6 2 2 6
55475 - 2 2 6 2 2 6 18 18 18 34 34 34
55476 - 10 10 10 50 50 50 22 22 22 2 2 6
55477 - 2 2 6 2 2 6 2 2 6 10 10 10
55478 - 86 86 86 42 42 42 14 14 14 0 0 0
55479 - 0 0 0 0 0 0 0 0 0 0 0 0
55480 - 0 0 0 0 0 0 0 0 0 0 0 0
55481 - 0 0 0 0 0 0 0 0 0 0 0 0
55482 - 0 0 0 0 0 0 0 0 0 0 0 0
55483 - 0 0 0 0 0 0 0 0 0 0 0 0
55484 - 0 0 0 0 0 0 0 0 0 0 0 0
55485 - 0 0 0 0 0 0 0 0 0 0 0 0
55486 - 0 0 1 0 0 1 0 0 1 0 0 0
55487 - 0 0 0 0 0 0 0 0 0 0 0 0
55488 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55492 - 46 46 46 86 86 86 2 2 6 2 2 6
55493 - 38 38 38 116 116 116 94 94 94 22 22 22
55494 - 22 22 22 2 2 6 2 2 6 2 2 6
55495 - 14 14 14 86 86 86 138 138 138 162 162 162
55496 -154 154 154 38 38 38 26 26 26 6 6 6
55497 - 2 2 6 2 2 6 2 2 6 2 2 6
55498 - 86 86 86 46 46 46 14 14 14 0 0 0
55499 - 0 0 0 0 0 0 0 0 0 0 0 0
55500 - 0 0 0 0 0 0 0 0 0 0 0 0
55501 - 0 0 0 0 0 0 0 0 0 0 0 0
55502 - 0 0 0 0 0 0 0 0 0 0 0 0
55503 - 0 0 0 0 0 0 0 0 0 0 0 0
55504 - 0 0 0 0 0 0 0 0 0 0 0 0
55505 - 0 0 0 0 0 0 0 0 0 0 0 0
55506 - 0 0 0 0 0 0 0 0 0 0 0 0
55507 - 0 0 0 0 0 0 0 0 0 0 0 0
55508 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55512 - 46 46 46 86 86 86 2 2 6 14 14 14
55513 -134 134 134 198 198 198 195 195 195 116 116 116
55514 - 10 10 10 2 2 6 2 2 6 6 6 6
55515 -101 98 89 187 187 187 210 210 210 218 218 218
55516 -214 214 214 134 134 134 14 14 14 6 6 6
55517 - 2 2 6 2 2 6 2 2 6 2 2 6
55518 - 86 86 86 50 50 50 18 18 18 6 6 6
55519 - 0 0 0 0 0 0 0 0 0 0 0 0
55520 - 0 0 0 0 0 0 0 0 0 0 0 0
55521 - 0 0 0 0 0 0 0 0 0 0 0 0
55522 - 0 0 0 0 0 0 0 0 0 0 0 0
55523 - 0 0 0 0 0 0 0 0 0 0 0 0
55524 - 0 0 0 0 0 0 0 0 0 0 0 0
55525 - 0 0 0 0 0 0 0 0 1 0 0 0
55526 - 0 0 1 0 0 1 0 0 1 0 0 0
55527 - 0 0 0 0 0 0 0 0 0 0 0 0
55528 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55532 - 46 46 46 86 86 86 2 2 6 54 54 54
55533 -218 218 218 195 195 195 226 226 226 246 246 246
55534 - 58 58 58 2 2 6 2 2 6 30 30 30
55535 -210 210 210 253 253 253 174 174 174 123 123 123
55536 -221 221 221 234 234 234 74 74 74 2 2 6
55537 - 2 2 6 2 2 6 2 2 6 2 2 6
55538 - 70 70 70 58 58 58 22 22 22 6 6 6
55539 - 0 0 0 0 0 0 0 0 0 0 0 0
55540 - 0 0 0 0 0 0 0 0 0 0 0 0
55541 - 0 0 0 0 0 0 0 0 0 0 0 0
55542 - 0 0 0 0 0 0 0 0 0 0 0 0
55543 - 0 0 0 0 0 0 0 0 0 0 0 0
55544 - 0 0 0 0 0 0 0 0 0 0 0 0
55545 - 0 0 0 0 0 0 0 0 0 0 0 0
55546 - 0 0 0 0 0 0 0 0 0 0 0 0
55547 - 0 0 0 0 0 0 0 0 0 0 0 0
55548 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55552 - 46 46 46 82 82 82 2 2 6 106 106 106
55553 -170 170 170 26 26 26 86 86 86 226 226 226
55554 -123 123 123 10 10 10 14 14 14 46 46 46
55555 -231 231 231 190 190 190 6 6 6 70 70 70
55556 - 90 90 90 238 238 238 158 158 158 2 2 6
55557 - 2 2 6 2 2 6 2 2 6 2 2 6
55558 - 70 70 70 58 58 58 22 22 22 6 6 6
55559 - 0 0 0 0 0 0 0 0 0 0 0 0
55560 - 0 0 0 0 0 0 0 0 0 0 0 0
55561 - 0 0 0 0 0 0 0 0 0 0 0 0
55562 - 0 0 0 0 0 0 0 0 0 0 0 0
55563 - 0 0 0 0 0 0 0 0 0 0 0 0
55564 - 0 0 0 0 0 0 0 0 0 0 0 0
55565 - 0 0 0 0 0 0 0 0 1 0 0 0
55566 - 0 0 1 0 0 1 0 0 1 0 0 0
55567 - 0 0 0 0 0 0 0 0 0 0 0 0
55568 - 0 0 0 0 0 0 0 0 0 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 14 14 14
55572 - 42 42 42 86 86 86 6 6 6 116 116 116
55573 -106 106 106 6 6 6 70 70 70 149 149 149
55574 -128 128 128 18 18 18 38 38 38 54 54 54
55575 -221 221 221 106 106 106 2 2 6 14 14 14
55576 - 46 46 46 190 190 190 198 198 198 2 2 6
55577 - 2 2 6 2 2 6 2 2 6 2 2 6
55578 - 74 74 74 62 62 62 22 22 22 6 6 6
55579 - 0 0 0 0 0 0 0 0 0 0 0 0
55580 - 0 0 0 0 0 0 0 0 0 0 0 0
55581 - 0 0 0 0 0 0 0 0 0 0 0 0
55582 - 0 0 0 0 0 0 0 0 0 0 0 0
55583 - 0 0 0 0 0 0 0 0 0 0 0 0
55584 - 0 0 0 0 0 0 0 0 0 0 0 0
55585 - 0 0 0 0 0 0 0 0 1 0 0 0
55586 - 0 0 1 0 0 0 0 0 1 0 0 0
55587 - 0 0 0 0 0 0 0 0 0 0 0 0
55588 - 0 0 0 0 0 0 0 0 0 0 0 0
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 14 14 14
55592 - 42 42 42 94 94 94 14 14 14 101 101 101
55593 -128 128 128 2 2 6 18 18 18 116 116 116
55594 -118 98 46 121 92 8 121 92 8 98 78 10
55595 -162 162 162 106 106 106 2 2 6 2 2 6
55596 - 2 2 6 195 195 195 195 195 195 6 6 6
55597 - 2 2 6 2 2 6 2 2 6 2 2 6
55598 - 74 74 74 62 62 62 22 22 22 6 6 6
55599 - 0 0 0 0 0 0 0 0 0 0 0 0
55600 - 0 0 0 0 0 0 0 0 0 0 0 0
55601 - 0 0 0 0 0 0 0 0 0 0 0 0
55602 - 0 0 0 0 0 0 0 0 0 0 0 0
55603 - 0 0 0 0 0 0 0 0 0 0 0 0
55604 - 0 0 0 0 0 0 0 0 0 0 0 0
55605 - 0 0 0 0 0 0 0 0 1 0 0 1
55606 - 0 0 1 0 0 0 0 0 1 0 0 0
55607 - 0 0 0 0 0 0 0 0 0 0 0 0
55608 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55612 - 38 38 38 90 90 90 14 14 14 58 58 58
55613 -210 210 210 26 26 26 54 38 6 154 114 10
55614 -226 170 11 236 186 11 225 175 15 184 144 12
55615 -215 174 15 175 146 61 37 26 9 2 2 6
55616 - 70 70 70 246 246 246 138 138 138 2 2 6
55617 - 2 2 6 2 2 6 2 2 6 2 2 6
55618 - 70 70 70 66 66 66 26 26 26 6 6 6
55619 - 0 0 0 0 0 0 0 0 0 0 0 0
55620 - 0 0 0 0 0 0 0 0 0 0 0 0
55621 - 0 0 0 0 0 0 0 0 0 0 0 0
55622 - 0 0 0 0 0 0 0 0 0 0 0 0
55623 - 0 0 0 0 0 0 0 0 0 0 0 0
55624 - 0 0 0 0 0 0 0 0 0 0 0 0
55625 - 0 0 0 0 0 0 0 0 0 0 0 0
55626 - 0 0 0 0 0 0 0 0 0 0 0 0
55627 - 0 0 0 0 0 0 0 0 0 0 0 0
55628 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55632 - 38 38 38 86 86 86 14 14 14 10 10 10
55633 -195 195 195 188 164 115 192 133 9 225 175 15
55634 -239 182 13 234 190 10 232 195 16 232 200 30
55635 -245 207 45 241 208 19 232 195 16 184 144 12
55636 -218 194 134 211 206 186 42 42 42 2 2 6
55637 - 2 2 6 2 2 6 2 2 6 2 2 6
55638 - 50 50 50 74 74 74 30 30 30 6 6 6
55639 - 0 0 0 0 0 0 0 0 0 0 0 0
55640 - 0 0 0 0 0 0 0 0 0 0 0 0
55641 - 0 0 0 0 0 0 0 0 0 0 0 0
55642 - 0 0 0 0 0 0 0 0 0 0 0 0
55643 - 0 0 0 0 0 0 0 0 0 0 0 0
55644 - 0 0 0 0 0 0 0 0 0 0 0 0
55645 - 0 0 0 0 0 0 0 0 0 0 0 0
55646 - 0 0 0 0 0 0 0 0 0 0 0 0
55647 - 0 0 0 0 0 0 0 0 0 0 0 0
55648 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55652 - 34 34 34 86 86 86 14 14 14 2 2 6
55653 -121 87 25 192 133 9 219 162 10 239 182 13
55654 -236 186 11 232 195 16 241 208 19 244 214 54
55655 -246 218 60 246 218 38 246 215 20 241 208 19
55656 -241 208 19 226 184 13 121 87 25 2 2 6
55657 - 2 2 6 2 2 6 2 2 6 2 2 6
55658 - 50 50 50 82 82 82 34 34 34 10 10 10
55659 - 0 0 0 0 0 0 0 0 0 0 0 0
55660 - 0 0 0 0 0 0 0 0 0 0 0 0
55661 - 0 0 0 0 0 0 0 0 0 0 0 0
55662 - 0 0 0 0 0 0 0 0 0 0 0 0
55663 - 0 0 0 0 0 0 0 0 0 0 0 0
55664 - 0 0 0 0 0 0 0 0 0 0 0 0
55665 - 0 0 0 0 0 0 0 0 0 0 0 0
55666 - 0 0 0 0 0 0 0 0 0 0 0 0
55667 - 0 0 0 0 0 0 0 0 0 0 0 0
55668 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55672 - 34 34 34 82 82 82 30 30 30 61 42 6
55673 -180 123 7 206 145 10 230 174 11 239 182 13
55674 -234 190 10 238 202 15 241 208 19 246 218 74
55675 -246 218 38 246 215 20 246 215 20 246 215 20
55676 -226 184 13 215 174 15 184 144 12 6 6 6
55677 - 2 2 6 2 2 6 2 2 6 2 2 6
55678 - 26 26 26 94 94 94 42 42 42 14 14 14
55679 - 0 0 0 0 0 0 0 0 0 0 0 0
55680 - 0 0 0 0 0 0 0 0 0 0 0 0
55681 - 0 0 0 0 0 0 0 0 0 0 0 0
55682 - 0 0 0 0 0 0 0 0 0 0 0 0
55683 - 0 0 0 0 0 0 0 0 0 0 0 0
55684 - 0 0 0 0 0 0 0 0 0 0 0 0
55685 - 0 0 0 0 0 0 0 0 0 0 0 0
55686 - 0 0 0 0 0 0 0 0 0 0 0 0
55687 - 0 0 0 0 0 0 0 0 0 0 0 0
55688 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55692 - 30 30 30 78 78 78 50 50 50 104 69 6
55693 -192 133 9 216 158 10 236 178 12 236 186 11
55694 -232 195 16 241 208 19 244 214 54 245 215 43
55695 -246 215 20 246 215 20 241 208 19 198 155 10
55696 -200 144 11 216 158 10 156 118 10 2 2 6
55697 - 2 2 6 2 2 6 2 2 6 2 2 6
55698 - 6 6 6 90 90 90 54 54 54 18 18 18
55699 - 6 6 6 0 0 0 0 0 0 0 0 0
55700 - 0 0 0 0 0 0 0 0 0 0 0 0
55701 - 0 0 0 0 0 0 0 0 0 0 0 0
55702 - 0 0 0 0 0 0 0 0 0 0 0 0
55703 - 0 0 0 0 0 0 0 0 0 0 0 0
55704 - 0 0 0 0 0 0 0 0 0 0 0 0
55705 - 0 0 0 0 0 0 0 0 0 0 0 0
55706 - 0 0 0 0 0 0 0 0 0 0 0 0
55707 - 0 0 0 0 0 0 0 0 0 0 0 0
55708 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55712 - 30 30 30 78 78 78 46 46 46 22 22 22
55713 -137 92 6 210 162 10 239 182 13 238 190 10
55714 -238 202 15 241 208 19 246 215 20 246 215 20
55715 -241 208 19 203 166 17 185 133 11 210 150 10
55716 -216 158 10 210 150 10 102 78 10 2 2 6
55717 - 6 6 6 54 54 54 14 14 14 2 2 6
55718 - 2 2 6 62 62 62 74 74 74 30 30 30
55719 - 10 10 10 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 0 0 0
55722 - 0 0 0 0 0 0 0 0 0 0 0 0
55723 - 0 0 0 0 0 0 0 0 0 0 0 0
55724 - 0 0 0 0 0 0 0 0 0 0 0 0
55725 - 0 0 0 0 0 0 0 0 0 0 0 0
55726 - 0 0 0 0 0 0 0 0 0 0 0 0
55727 - 0 0 0 0 0 0 0 0 0 0 0 0
55728 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55732 - 34 34 34 78 78 78 50 50 50 6 6 6
55733 - 94 70 30 139 102 15 190 146 13 226 184 13
55734 -232 200 30 232 195 16 215 174 15 190 146 13
55735 -168 122 10 192 133 9 210 150 10 213 154 11
55736 -202 150 34 182 157 106 101 98 89 2 2 6
55737 - 2 2 6 78 78 78 116 116 116 58 58 58
55738 - 2 2 6 22 22 22 90 90 90 46 46 46
55739 - 18 18 18 6 6 6 0 0 0 0 0 0
55740 - 0 0 0 0 0 0 0 0 0 0 0 0
55741 - 0 0 0 0 0 0 0 0 0 0 0 0
55742 - 0 0 0 0 0 0 0 0 0 0 0 0
55743 - 0 0 0 0 0 0 0 0 0 0 0 0
55744 - 0 0 0 0 0 0 0 0 0 0 0 0
55745 - 0 0 0 0 0 0 0 0 0 0 0 0
55746 - 0 0 0 0 0 0 0 0 0 0 0 0
55747 - 0 0 0 0 0 0 0 0 0 0 0 0
55748 - 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55752 - 38 38 38 86 86 86 50 50 50 6 6 6
55753 -128 128 128 174 154 114 156 107 11 168 122 10
55754 -198 155 10 184 144 12 197 138 11 200 144 11
55755 -206 145 10 206 145 10 197 138 11 188 164 115
55756 -195 195 195 198 198 198 174 174 174 14 14 14
55757 - 2 2 6 22 22 22 116 116 116 116 116 116
55758 - 22 22 22 2 2 6 74 74 74 70 70 70
55759 - 30 30 30 10 10 10 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 0 0 0
55762 - 0 0 0 0 0 0 0 0 0 0 0 0
55763 - 0 0 0 0 0 0 0 0 0 0 0 0
55764 - 0 0 0 0 0 0 0 0 0 0 0 0
55765 - 0 0 0 0 0 0 0 0 0 0 0 0
55766 - 0 0 0 0 0 0 0 0 0 0 0 0
55767 - 0 0 0 0 0 0 0 0 0 0 0 0
55768 - 0 0 0 0 0 0 0 0 0 0 0 0
55769 - 0 0 0 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 6 6 6 18 18 18
55772 - 50 50 50 101 101 101 26 26 26 10 10 10
55773 -138 138 138 190 190 190 174 154 114 156 107 11
55774 -197 138 11 200 144 11 197 138 11 192 133 9
55775 -180 123 7 190 142 34 190 178 144 187 187 187
55776 -202 202 202 221 221 221 214 214 214 66 66 66
55777 - 2 2 6 2 2 6 50 50 50 62 62 62
55778 - 6 6 6 2 2 6 10 10 10 90 90 90
55779 - 50 50 50 18 18 18 6 6 6 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 0 0 0
55782 - 0 0 0 0 0 0 0 0 0 0 0 0
55783 - 0 0 0 0 0 0 0 0 0 0 0 0
55784 - 0 0 0 0 0 0 0 0 0 0 0 0
55785 - 0 0 0 0 0 0 0 0 0 0 0 0
55786 - 0 0 0 0 0 0 0 0 0 0 0 0
55787 - 0 0 0 0 0 0 0 0 0 0 0 0
55788 - 0 0 0 0 0 0 0 0 0 0 0 0
55789 - 0 0 0 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 10 10 10 34 34 34
55792 - 74 74 74 74 74 74 2 2 6 6 6 6
55793 -144 144 144 198 198 198 190 190 190 178 166 146
55794 -154 121 60 156 107 11 156 107 11 168 124 44
55795 -174 154 114 187 187 187 190 190 190 210 210 210
55796 -246 246 246 253 253 253 253 253 253 182 182 182
55797 - 6 6 6 2 2 6 2 2 6 2 2 6
55798 - 2 2 6 2 2 6 2 2 6 62 62 62
55799 - 74 74 74 34 34 34 14 14 14 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 0 0 0
55802 - 0 0 0 0 0 0 0 0 0 0 0 0
55803 - 0 0 0 0 0 0 0 0 0 0 0 0
55804 - 0 0 0 0 0 0 0 0 0 0 0 0
55805 - 0 0 0 0 0 0 0 0 0 0 0 0
55806 - 0 0 0 0 0 0 0 0 0 0 0 0
55807 - 0 0 0 0 0 0 0 0 0 0 0 0
55808 - 0 0 0 0 0 0 0 0 0 0 0 0
55809 - 0 0 0 0 0 0 0 0 0 0 0 0
55810 - 0 0 0 0 0 0 0 0 0 0 0 0
55811 - 0 0 0 10 10 10 22 22 22 54 54 54
55812 - 94 94 94 18 18 18 2 2 6 46 46 46
55813 -234 234 234 221 221 221 190 190 190 190 190 190
55814 -190 190 190 187 187 187 187 187 187 190 190 190
55815 -190 190 190 195 195 195 214 214 214 242 242 242
55816 -253 253 253 253 253 253 253 253 253 253 253 253
55817 - 82 82 82 2 2 6 2 2 6 2 2 6
55818 - 2 2 6 2 2 6 2 2 6 14 14 14
55819 - 86 86 86 54 54 54 22 22 22 6 6 6
55820 - 0 0 0 0 0 0 0 0 0 0 0 0
55821 - 0 0 0 0 0 0 0 0 0 0 0 0
55822 - 0 0 0 0 0 0 0 0 0 0 0 0
55823 - 0 0 0 0 0 0 0 0 0 0 0 0
55824 - 0 0 0 0 0 0 0 0 0 0 0 0
55825 - 0 0 0 0 0 0 0 0 0 0 0 0
55826 - 0 0 0 0 0 0 0 0 0 0 0 0
55827 - 0 0 0 0 0 0 0 0 0 0 0 0
55828 - 0 0 0 0 0 0 0 0 0 0 0 0
55829 - 0 0 0 0 0 0 0 0 0 0 0 0
55830 - 0 0 0 0 0 0 0 0 0 0 0 0
55831 - 6 6 6 18 18 18 46 46 46 90 90 90
55832 - 46 46 46 18 18 18 6 6 6 182 182 182
55833 -253 253 253 246 246 246 206 206 206 190 190 190
55834 -190 190 190 190 190 190 190 190 190 190 190 190
55835 -206 206 206 231 231 231 250 250 250 253 253 253
55836 -253 253 253 253 253 253 253 253 253 253 253 253
55837 -202 202 202 14 14 14 2 2 6 2 2 6
55838 - 2 2 6 2 2 6 2 2 6 2 2 6
55839 - 42 42 42 86 86 86 42 42 42 18 18 18
55840 - 6 6 6 0 0 0 0 0 0 0 0 0
55841 - 0 0 0 0 0 0 0 0 0 0 0 0
55842 - 0 0 0 0 0 0 0 0 0 0 0 0
55843 - 0 0 0 0 0 0 0 0 0 0 0 0
55844 - 0 0 0 0 0 0 0 0 0 0 0 0
55845 - 0 0 0 0 0 0 0 0 0 0 0 0
55846 - 0 0 0 0 0 0 0 0 0 0 0 0
55847 - 0 0 0 0 0 0 0 0 0 0 0 0
55848 - 0 0 0 0 0 0 0 0 0 0 0 0
55849 - 0 0 0 0 0 0 0 0 0 0 0 0
55850 - 0 0 0 0 0 0 0 0 0 6 6 6
55851 - 14 14 14 38 38 38 74 74 74 66 66 66
55852 - 2 2 6 6 6 6 90 90 90 250 250 250
55853 -253 253 253 253 253 253 238 238 238 198 198 198
55854 -190 190 190 190 190 190 195 195 195 221 221 221
55855 -246 246 246 253 253 253 253 253 253 253 253 253
55856 -253 253 253 253 253 253 253 253 253 253 253 253
55857 -253 253 253 82 82 82 2 2 6 2 2 6
55858 - 2 2 6 2 2 6 2 2 6 2 2 6
55859 - 2 2 6 78 78 78 70 70 70 34 34 34
55860 - 14 14 14 6 6 6 0 0 0 0 0 0
55861 - 0 0 0 0 0 0 0 0 0 0 0 0
55862 - 0 0 0 0 0 0 0 0 0 0 0 0
55863 - 0 0 0 0 0 0 0 0 0 0 0 0
55864 - 0 0 0 0 0 0 0 0 0 0 0 0
55865 - 0 0 0 0 0 0 0 0 0 0 0 0
55866 - 0 0 0 0 0 0 0 0 0 0 0 0
55867 - 0 0 0 0 0 0 0 0 0 0 0 0
55868 - 0 0 0 0 0 0 0 0 0 0 0 0
55869 - 0 0 0 0 0 0 0 0 0 0 0 0
55870 - 0 0 0 0 0 0 0 0 0 14 14 14
55871 - 34 34 34 66 66 66 78 78 78 6 6 6
55872 - 2 2 6 18 18 18 218 218 218 253 253 253
55873 -253 253 253 253 253 253 253 253 253 246 246 246
55874 -226 226 226 231 231 231 246 246 246 253 253 253
55875 -253 253 253 253 253 253 253 253 253 253 253 253
55876 -253 253 253 253 253 253 253 253 253 253 253 253
55877 -253 253 253 178 178 178 2 2 6 2 2 6
55878 - 2 2 6 2 2 6 2 2 6 2 2 6
55879 - 2 2 6 18 18 18 90 90 90 62 62 62
55880 - 30 30 30 10 10 10 0 0 0 0 0 0
55881 - 0 0 0 0 0 0 0 0 0 0 0 0
55882 - 0 0 0 0 0 0 0 0 0 0 0 0
55883 - 0 0 0 0 0 0 0 0 0 0 0 0
55884 - 0 0 0 0 0 0 0 0 0 0 0 0
55885 - 0 0 0 0 0 0 0 0 0 0 0 0
55886 - 0 0 0 0 0 0 0 0 0 0 0 0
55887 - 0 0 0 0 0 0 0 0 0 0 0 0
55888 - 0 0 0 0 0 0 0 0 0 0 0 0
55889 - 0 0 0 0 0 0 0 0 0 0 0 0
55890 - 0 0 0 0 0 0 10 10 10 26 26 26
55891 - 58 58 58 90 90 90 18 18 18 2 2 6
55892 - 2 2 6 110 110 110 253 253 253 253 253 253
55893 -253 253 253 253 253 253 253 253 253 253 253 253
55894 -250 250 250 253 253 253 253 253 253 253 253 253
55895 -253 253 253 253 253 253 253 253 253 253 253 253
55896 -253 253 253 253 253 253 253 253 253 253 253 253
55897 -253 253 253 231 231 231 18 18 18 2 2 6
55898 - 2 2 6 2 2 6 2 2 6 2 2 6
55899 - 2 2 6 2 2 6 18 18 18 94 94 94
55900 - 54 54 54 26 26 26 10 10 10 0 0 0
55901 - 0 0 0 0 0 0 0 0 0 0 0 0
55902 - 0 0 0 0 0 0 0 0 0 0 0 0
55903 - 0 0 0 0 0 0 0 0 0 0 0 0
55904 - 0 0 0 0 0 0 0 0 0 0 0 0
55905 - 0 0 0 0 0 0 0 0 0 0 0 0
55906 - 0 0 0 0 0 0 0 0 0 0 0 0
55907 - 0 0 0 0 0 0 0 0 0 0 0 0
55908 - 0 0 0 0 0 0 0 0 0 0 0 0
55909 - 0 0 0 0 0 0 0 0 0 0 0 0
55910 - 0 0 0 6 6 6 22 22 22 50 50 50
55911 - 90 90 90 26 26 26 2 2 6 2 2 6
55912 - 14 14 14 195 195 195 250 250 250 253 253 253
55913 -253 253 253 253 253 253 253 253 253 253 253 253
55914 -253 253 253 253 253 253 253 253 253 253 253 253
55915 -253 253 253 253 253 253 253 253 253 253 253 253
55916 -253 253 253 253 253 253 253 253 253 253 253 253
55917 -250 250 250 242 242 242 54 54 54 2 2 6
55918 - 2 2 6 2 2 6 2 2 6 2 2 6
55919 - 2 2 6 2 2 6 2 2 6 38 38 38
55920 - 86 86 86 50 50 50 22 22 22 6 6 6
55921 - 0 0 0 0 0 0 0 0 0 0 0 0
55922 - 0 0 0 0 0 0 0 0 0 0 0 0
55923 - 0 0 0 0 0 0 0 0 0 0 0 0
55924 - 0 0 0 0 0 0 0 0 0 0 0 0
55925 - 0 0 0 0 0 0 0 0 0 0 0 0
55926 - 0 0 0 0 0 0 0 0 0 0 0 0
55927 - 0 0 0 0 0 0 0 0 0 0 0 0
55928 - 0 0 0 0 0 0 0 0 0 0 0 0
55929 - 0 0 0 0 0 0 0 0 0 0 0 0
55930 - 6 6 6 14 14 14 38 38 38 82 82 82
55931 - 34 34 34 2 2 6 2 2 6 2 2 6
55932 - 42 42 42 195 195 195 246 246 246 253 253 253
55933 -253 253 253 253 253 253 253 253 253 250 250 250
55934 -242 242 242 242 242 242 250 250 250 253 253 253
55935 -253 253 253 253 253 253 253 253 253 253 253 253
55936 -253 253 253 250 250 250 246 246 246 238 238 238
55937 -226 226 226 231 231 231 101 101 101 6 6 6
55938 - 2 2 6 2 2 6 2 2 6 2 2 6
55939 - 2 2 6 2 2 6 2 2 6 2 2 6
55940 - 38 38 38 82 82 82 42 42 42 14 14 14
55941 - 6 6 6 0 0 0 0 0 0 0 0 0
55942 - 0 0 0 0 0 0 0 0 0 0 0 0
55943 - 0 0 0 0 0 0 0 0 0 0 0 0
55944 - 0 0 0 0 0 0 0 0 0 0 0 0
55945 - 0 0 0 0 0 0 0 0 0 0 0 0
55946 - 0 0 0 0 0 0 0 0 0 0 0 0
55947 - 0 0 0 0 0 0 0 0 0 0 0 0
55948 - 0 0 0 0 0 0 0 0 0 0 0 0
55949 - 0 0 0 0 0 0 0 0 0 0 0 0
55950 - 10 10 10 26 26 26 62 62 62 66 66 66
55951 - 2 2 6 2 2 6 2 2 6 6 6 6
55952 - 70 70 70 170 170 170 206 206 206 234 234 234
55953 -246 246 246 250 250 250 250 250 250 238 238 238
55954 -226 226 226 231 231 231 238 238 238 250 250 250
55955 -250 250 250 250 250 250 246 246 246 231 231 231
55956 -214 214 214 206 206 206 202 202 202 202 202 202
55957 -198 198 198 202 202 202 182 182 182 18 18 18
55958 - 2 2 6 2 2 6 2 2 6 2 2 6
55959 - 2 2 6 2 2 6 2 2 6 2 2 6
55960 - 2 2 6 62 62 62 66 66 66 30 30 30
55961 - 10 10 10 0 0 0 0 0 0 0 0 0
55962 - 0 0 0 0 0 0 0 0 0 0 0 0
55963 - 0 0 0 0 0 0 0 0 0 0 0 0
55964 - 0 0 0 0 0 0 0 0 0 0 0 0
55965 - 0 0 0 0 0 0 0 0 0 0 0 0
55966 - 0 0 0 0 0 0 0 0 0 0 0 0
55967 - 0 0 0 0 0 0 0 0 0 0 0 0
55968 - 0 0 0 0 0 0 0 0 0 0 0 0
55969 - 0 0 0 0 0 0 0 0 0 0 0 0
55970 - 14 14 14 42 42 42 82 82 82 18 18 18
55971 - 2 2 6 2 2 6 2 2 6 10 10 10
55972 - 94 94 94 182 182 182 218 218 218 242 242 242
55973 -250 250 250 253 253 253 253 253 253 250 250 250
55974 -234 234 234 253 253 253 253 253 253 253 253 253
55975 -253 253 253 253 253 253 253 253 253 246 246 246
55976 -238 238 238 226 226 226 210 210 210 202 202 202
55977 -195 195 195 195 195 195 210 210 210 158 158 158
55978 - 6 6 6 14 14 14 50 50 50 14 14 14
55979 - 2 2 6 2 2 6 2 2 6 2 2 6
55980 - 2 2 6 6 6 6 86 86 86 46 46 46
55981 - 18 18 18 6 6 6 0 0 0 0 0 0
55982 - 0 0 0 0 0 0 0 0 0 0 0 0
55983 - 0 0 0 0 0 0 0 0 0 0 0 0
55984 - 0 0 0 0 0 0 0 0 0 0 0 0
55985 - 0 0 0 0 0 0 0 0 0 0 0 0
55986 - 0 0 0 0 0 0 0 0 0 0 0 0
55987 - 0 0 0 0 0 0 0 0 0 0 0 0
55988 - 0 0 0 0 0 0 0 0 0 0 0 0
55989 - 0 0 0 0 0 0 0 0 0 6 6 6
55990 - 22 22 22 54 54 54 70 70 70 2 2 6
55991 - 2 2 6 10 10 10 2 2 6 22 22 22
55992 -166 166 166 231 231 231 250 250 250 253 253 253
55993 -253 253 253 253 253 253 253 253 253 250 250 250
55994 -242 242 242 253 253 253 253 253 253 253 253 253
55995 -253 253 253 253 253 253 253 253 253 253 253 253
55996 -253 253 253 253 253 253 253 253 253 246 246 246
55997 -231 231 231 206 206 206 198 198 198 226 226 226
55998 - 94 94 94 2 2 6 6 6 6 38 38 38
55999 - 30 30 30 2 2 6 2 2 6 2 2 6
56000 - 2 2 6 2 2 6 62 62 62 66 66 66
56001 - 26 26 26 10 10 10 0 0 0 0 0 0
56002 - 0 0 0 0 0 0 0 0 0 0 0 0
56003 - 0 0 0 0 0 0 0 0 0 0 0 0
56004 - 0 0 0 0 0 0 0 0 0 0 0 0
56005 - 0 0 0 0 0 0 0 0 0 0 0 0
56006 - 0 0 0 0 0 0 0 0 0 0 0 0
56007 - 0 0 0 0 0 0 0 0 0 0 0 0
56008 - 0 0 0 0 0 0 0 0 0 0 0 0
56009 - 0 0 0 0 0 0 0 0 0 10 10 10
56010 - 30 30 30 74 74 74 50 50 50 2 2 6
56011 - 26 26 26 26 26 26 2 2 6 106 106 106
56012 -238 238 238 253 253 253 253 253 253 253 253 253
56013 -253 253 253 253 253 253 253 253 253 253 253 253
56014 -253 253 253 253 253 253 253 253 253 253 253 253
56015 -253 253 253 253 253 253 253 253 253 253 253 253
56016 -253 253 253 253 253 253 253 253 253 253 253 253
56017 -253 253 253 246 246 246 218 218 218 202 202 202
56018 -210 210 210 14 14 14 2 2 6 2 2 6
56019 - 30 30 30 22 22 22 2 2 6 2 2 6
56020 - 2 2 6 2 2 6 18 18 18 86 86 86
56021 - 42 42 42 14 14 14 0 0 0 0 0 0
56022 - 0 0 0 0 0 0 0 0 0 0 0 0
56023 - 0 0 0 0 0 0 0 0 0 0 0 0
56024 - 0 0 0 0 0 0 0 0 0 0 0 0
56025 - 0 0 0 0 0 0 0 0 0 0 0 0
56026 - 0 0 0 0 0 0 0 0 0 0 0 0
56027 - 0 0 0 0 0 0 0 0 0 0 0 0
56028 - 0 0 0 0 0 0 0 0 0 0 0 0
56029 - 0 0 0 0 0 0 0 0 0 14 14 14
56030 - 42 42 42 90 90 90 22 22 22 2 2 6
56031 - 42 42 42 2 2 6 18 18 18 218 218 218
56032 -253 253 253 253 253 253 253 253 253 253 253 253
56033 -253 253 253 253 253 253 253 253 253 253 253 253
56034 -253 253 253 253 253 253 253 253 253 253 253 253
56035 -253 253 253 253 253 253 253 253 253 253 253 253
56036 -253 253 253 253 253 253 253 253 253 253 253 253
56037 -253 253 253 253 253 253 250 250 250 221 221 221
56038 -218 218 218 101 101 101 2 2 6 14 14 14
56039 - 18 18 18 38 38 38 10 10 10 2 2 6
56040 - 2 2 6 2 2 6 2 2 6 78 78 78
56041 - 58 58 58 22 22 22 6 6 6 0 0 0
56042 - 0 0 0 0 0 0 0 0 0 0 0 0
56043 - 0 0 0 0 0 0 0 0 0 0 0 0
56044 - 0 0 0 0 0 0 0 0 0 0 0 0
56045 - 0 0 0 0 0 0 0 0 0 0 0 0
56046 - 0 0 0 0 0 0 0 0 0 0 0 0
56047 - 0 0 0 0 0 0 0 0 0 0 0 0
56048 - 0 0 0 0 0 0 0 0 0 0 0 0
56049 - 0 0 0 0 0 0 6 6 6 18 18 18
56050 - 54 54 54 82 82 82 2 2 6 26 26 26
56051 - 22 22 22 2 2 6 123 123 123 253 253 253
56052 -253 253 253 253 253 253 253 253 253 253 253 253
56053 -253 253 253 253 253 253 253 253 253 253 253 253
56054 -253 253 253 253 253 253 253 253 253 253 253 253
56055 -253 253 253 253 253 253 253 253 253 253 253 253
56056 -253 253 253 253 253 253 253 253 253 253 253 253
56057 -253 253 253 253 253 253 253 253 253 250 250 250
56058 -238 238 238 198 198 198 6 6 6 38 38 38
56059 - 58 58 58 26 26 26 38 38 38 2 2 6
56060 - 2 2 6 2 2 6 2 2 6 46 46 46
56061 - 78 78 78 30 30 30 10 10 10 0 0 0
56062 - 0 0 0 0 0 0 0 0 0 0 0 0
56063 - 0 0 0 0 0 0 0 0 0 0 0 0
56064 - 0 0 0 0 0 0 0 0 0 0 0 0
56065 - 0 0 0 0 0 0 0 0 0 0 0 0
56066 - 0 0 0 0 0 0 0 0 0 0 0 0
56067 - 0 0 0 0 0 0 0 0 0 0 0 0
56068 - 0 0 0 0 0 0 0 0 0 0 0 0
56069 - 0 0 0 0 0 0 10 10 10 30 30 30
56070 - 74 74 74 58 58 58 2 2 6 42 42 42
56071 - 2 2 6 22 22 22 231 231 231 253 253 253
56072 -253 253 253 253 253 253 253 253 253 253 253 253
56073 -253 253 253 253 253 253 253 253 253 250 250 250
56074 -253 253 253 253 253 253 253 253 253 253 253 253
56075 -253 253 253 253 253 253 253 253 253 253 253 253
56076 -253 253 253 253 253 253 253 253 253 253 253 253
56077 -253 253 253 253 253 253 253 253 253 253 253 253
56078 -253 253 253 246 246 246 46 46 46 38 38 38
56079 - 42 42 42 14 14 14 38 38 38 14 14 14
56080 - 2 2 6 2 2 6 2 2 6 6 6 6
56081 - 86 86 86 46 46 46 14 14 14 0 0 0
56082 - 0 0 0 0 0 0 0 0 0 0 0 0
56083 - 0 0 0 0 0 0 0 0 0 0 0 0
56084 - 0 0 0 0 0 0 0 0 0 0 0 0
56085 - 0 0 0 0 0 0 0 0 0 0 0 0
56086 - 0 0 0 0 0 0 0 0 0 0 0 0
56087 - 0 0 0 0 0 0 0 0 0 0 0 0
56088 - 0 0 0 0 0 0 0 0 0 0 0 0
56089 - 0 0 0 6 6 6 14 14 14 42 42 42
56090 - 90 90 90 18 18 18 18 18 18 26 26 26
56091 - 2 2 6 116 116 116 253 253 253 253 253 253
56092 -253 253 253 253 253 253 253 253 253 253 253 253
56093 -253 253 253 253 253 253 250 250 250 238 238 238
56094 -253 253 253 253 253 253 253 253 253 253 253 253
56095 -253 253 253 253 253 253 253 253 253 253 253 253
56096 -253 253 253 253 253 253 253 253 253 253 253 253
56097 -253 253 253 253 253 253 253 253 253 253 253 253
56098 -253 253 253 253 253 253 94 94 94 6 6 6
56099 - 2 2 6 2 2 6 10 10 10 34 34 34
56100 - 2 2 6 2 2 6 2 2 6 2 2 6
56101 - 74 74 74 58 58 58 22 22 22 6 6 6
56102 - 0 0 0 0 0 0 0 0 0 0 0 0
56103 - 0 0 0 0 0 0 0 0 0 0 0 0
56104 - 0 0 0 0 0 0 0 0 0 0 0 0
56105 - 0 0 0 0 0 0 0 0 0 0 0 0
56106 - 0 0 0 0 0 0 0 0 0 0 0 0
56107 - 0 0 0 0 0 0 0 0 0 0 0 0
56108 - 0 0 0 0 0 0 0 0 0 0 0 0
56109 - 0 0 0 10 10 10 26 26 26 66 66 66
56110 - 82 82 82 2 2 6 38 38 38 6 6 6
56111 - 14 14 14 210 210 210 253 253 253 253 253 253
56112 -253 253 253 253 253 253 253 253 253 253 253 253
56113 -253 253 253 253 253 253 246 246 246 242 242 242
56114 -253 253 253 253 253 253 253 253 253 253 253 253
56115 -253 253 253 253 253 253 253 253 253 253 253 253
56116 -253 253 253 253 253 253 253 253 253 253 253 253
56117 -253 253 253 253 253 253 253 253 253 253 253 253
56118 -253 253 253 253 253 253 144 144 144 2 2 6
56119 - 2 2 6 2 2 6 2 2 6 46 46 46
56120 - 2 2 6 2 2 6 2 2 6 2 2 6
56121 - 42 42 42 74 74 74 30 30 30 10 10 10
56122 - 0 0 0 0 0 0 0 0 0 0 0 0
56123 - 0 0 0 0 0 0 0 0 0 0 0 0
56124 - 0 0 0 0 0 0 0 0 0 0 0 0
56125 - 0 0 0 0 0 0 0 0 0 0 0 0
56126 - 0 0 0 0 0 0 0 0 0 0 0 0
56127 - 0 0 0 0 0 0 0 0 0 0 0 0
56128 - 0 0 0 0 0 0 0 0 0 0 0 0
56129 - 6 6 6 14 14 14 42 42 42 90 90 90
56130 - 26 26 26 6 6 6 42 42 42 2 2 6
56131 - 74 74 74 250 250 250 253 253 253 253 253 253
56132 -253 253 253 253 253 253 253 253 253 253 253 253
56133 -253 253 253 253 253 253 242 242 242 242 242 242
56134 -253 253 253 253 253 253 253 253 253 253 253 253
56135 -253 253 253 253 253 253 253 253 253 253 253 253
56136 -253 253 253 253 253 253 253 253 253 253 253 253
56137 -253 253 253 253 253 253 253 253 253 253 253 253
56138 -253 253 253 253 253 253 182 182 182 2 2 6
56139 - 2 2 6 2 2 6 2 2 6 46 46 46
56140 - 2 2 6 2 2 6 2 2 6 2 2 6
56141 - 10 10 10 86 86 86 38 38 38 10 10 10
56142 - 0 0 0 0 0 0 0 0 0 0 0 0
56143 - 0 0 0 0 0 0 0 0 0 0 0 0
56144 - 0 0 0 0 0 0 0 0 0 0 0 0
56145 - 0 0 0 0 0 0 0 0 0 0 0 0
56146 - 0 0 0 0 0 0 0 0 0 0 0 0
56147 - 0 0 0 0 0 0 0 0 0 0 0 0
56148 - 0 0 0 0 0 0 0 0 0 0 0 0
56149 - 10 10 10 26 26 26 66 66 66 82 82 82
56150 - 2 2 6 22 22 22 18 18 18 2 2 6
56151 -149 149 149 253 253 253 253 253 253 253 253 253
56152 -253 253 253 253 253 253 253 253 253 253 253 253
56153 -253 253 253 253 253 253 234 234 234 242 242 242
56154 -253 253 253 253 253 253 253 253 253 253 253 253
56155 -253 253 253 253 253 253 253 253 253 253 253 253
56156 -253 253 253 253 253 253 253 253 253 253 253 253
56157 -253 253 253 253 253 253 253 253 253 253 253 253
56158 -253 253 253 253 253 253 206 206 206 2 2 6
56159 - 2 2 6 2 2 6 2 2 6 38 38 38
56160 - 2 2 6 2 2 6 2 2 6 2 2 6
56161 - 6 6 6 86 86 86 46 46 46 14 14 14
56162 - 0 0 0 0 0 0 0 0 0 0 0 0
56163 - 0 0 0 0 0 0 0 0 0 0 0 0
56164 - 0 0 0 0 0 0 0 0 0 0 0 0
56165 - 0 0 0 0 0 0 0 0 0 0 0 0
56166 - 0 0 0 0 0 0 0 0 0 0 0 0
56167 - 0 0 0 0 0 0 0 0 0 0 0 0
56168 - 0 0 0 0 0 0 0 0 0 6 6 6
56169 - 18 18 18 46 46 46 86 86 86 18 18 18
56170 - 2 2 6 34 34 34 10 10 10 6 6 6
56171 -210 210 210 253 253 253 253 253 253 253 253 253
56172 -253 253 253 253 253 253 253 253 253 253 253 253
56173 -253 253 253 253 253 253 234 234 234 242 242 242
56174 -253 253 253 253 253 253 253 253 253 253 253 253
56175 -253 253 253 253 253 253 253 253 253 253 253 253
56176 -253 253 253 253 253 253 253 253 253 253 253 253
56177 -253 253 253 253 253 253 253 253 253 253 253 253
56178 -253 253 253 253 253 253 221 221 221 6 6 6
56179 - 2 2 6 2 2 6 6 6 6 30 30 30
56180 - 2 2 6 2 2 6 2 2 6 2 2 6
56181 - 2 2 6 82 82 82 54 54 54 18 18 18
56182 - 6 6 6 0 0 0 0 0 0 0 0 0
56183 - 0 0 0 0 0 0 0 0 0 0 0 0
56184 - 0 0 0 0 0 0 0 0 0 0 0 0
56185 - 0 0 0 0 0 0 0 0 0 0 0 0
56186 - 0 0 0 0 0 0 0 0 0 0 0 0
56187 - 0 0 0 0 0 0 0 0 0 0 0 0
56188 - 0 0 0 0 0 0 0 0 0 10 10 10
56189 - 26 26 26 66 66 66 62 62 62 2 2 6
56190 - 2 2 6 38 38 38 10 10 10 26 26 26
56191 -238 238 238 253 253 253 253 253 253 253 253 253
56192 -253 253 253 253 253 253 253 253 253 253 253 253
56193 -253 253 253 253 253 253 231 231 231 238 238 238
56194 -253 253 253 253 253 253 253 253 253 253 253 253
56195 -253 253 253 253 253 253 253 253 253 253 253 253
56196 -253 253 253 253 253 253 253 253 253 253 253 253
56197 -253 253 253 253 253 253 253 253 253 253 253 253
56198 -253 253 253 253 253 253 231 231 231 6 6 6
56199 - 2 2 6 2 2 6 10 10 10 30 30 30
56200 - 2 2 6 2 2 6 2 2 6 2 2 6
56201 - 2 2 6 66 66 66 58 58 58 22 22 22
56202 - 6 6 6 0 0 0 0 0 0 0 0 0
56203 - 0 0 0 0 0 0 0 0 0 0 0 0
56204 - 0 0 0 0 0 0 0 0 0 0 0 0
56205 - 0 0 0 0 0 0 0 0 0 0 0 0
56206 - 0 0 0 0 0 0 0 0 0 0 0 0
56207 - 0 0 0 0 0 0 0 0 0 0 0 0
56208 - 0 0 0 0 0 0 0 0 0 10 10 10
56209 - 38 38 38 78 78 78 6 6 6 2 2 6
56210 - 2 2 6 46 46 46 14 14 14 42 42 42
56211 -246 246 246 253 253 253 253 253 253 253 253 253
56212 -253 253 253 253 253 253 253 253 253 253 253 253
56213 -253 253 253 253 253 253 231 231 231 242 242 242
56214 -253 253 253 253 253 253 253 253 253 253 253 253
56215 -253 253 253 253 253 253 253 253 253 253 253 253
56216 -253 253 253 253 253 253 253 253 253 253 253 253
56217 -253 253 253 253 253 253 253 253 253 253 253 253
56218 -253 253 253 253 253 253 234 234 234 10 10 10
56219 - 2 2 6 2 2 6 22 22 22 14 14 14
56220 - 2 2 6 2 2 6 2 2 6 2 2 6
56221 - 2 2 6 66 66 66 62 62 62 22 22 22
56222 - 6 6 6 0 0 0 0 0 0 0 0 0
56223 - 0 0 0 0 0 0 0 0 0 0 0 0
56224 - 0 0 0 0 0 0 0 0 0 0 0 0
56225 - 0 0 0 0 0 0 0 0 0 0 0 0
56226 - 0 0 0 0 0 0 0 0 0 0 0 0
56227 - 0 0 0 0 0 0 0 0 0 0 0 0
56228 - 0 0 0 0 0 0 6 6 6 18 18 18
56229 - 50 50 50 74 74 74 2 2 6 2 2 6
56230 - 14 14 14 70 70 70 34 34 34 62 62 62
56231 -250 250 250 253 253 253 253 253 253 253 253 253
56232 -253 253 253 253 253 253 253 253 253 253 253 253
56233 -253 253 253 253 253 253 231 231 231 246 246 246
56234 -253 253 253 253 253 253 253 253 253 253 253 253
56235 -253 253 253 253 253 253 253 253 253 253 253 253
56236 -253 253 253 253 253 253 253 253 253 253 253 253
56237 -253 253 253 253 253 253 253 253 253 253 253 253
56238 -253 253 253 253 253 253 234 234 234 14 14 14
56239 - 2 2 6 2 2 6 30 30 30 2 2 6
56240 - 2 2 6 2 2 6 2 2 6 2 2 6
56241 - 2 2 6 66 66 66 62 62 62 22 22 22
56242 - 6 6 6 0 0 0 0 0 0 0 0 0
56243 - 0 0 0 0 0 0 0 0 0 0 0 0
56244 - 0 0 0 0 0 0 0 0 0 0 0 0
56245 - 0 0 0 0 0 0 0 0 0 0 0 0
56246 - 0 0 0 0 0 0 0 0 0 0 0 0
56247 - 0 0 0 0 0 0 0 0 0 0 0 0
56248 - 0 0 0 0 0 0 6 6 6 18 18 18
56249 - 54 54 54 62 62 62 2 2 6 2 2 6
56250 - 2 2 6 30 30 30 46 46 46 70 70 70
56251 -250 250 250 253 253 253 253 253 253 253 253 253
56252 -253 253 253 253 253 253 253 253 253 253 253 253
56253 -253 253 253 253 253 253 231 231 231 246 246 246
56254 -253 253 253 253 253 253 253 253 253 253 253 253
56255 -253 253 253 253 253 253 253 253 253 253 253 253
56256 -253 253 253 253 253 253 253 253 253 253 253 253
56257 -253 253 253 253 253 253 253 253 253 253 253 253
56258 -253 253 253 253 253 253 226 226 226 10 10 10
56259 - 2 2 6 6 6 6 30 30 30 2 2 6
56260 - 2 2 6 2 2 6 2 2 6 2 2 6
56261 - 2 2 6 66 66 66 58 58 58 22 22 22
56262 - 6 6 6 0 0 0 0 0 0 0 0 0
56263 - 0 0 0 0 0 0 0 0 0 0 0 0
56264 - 0 0 0 0 0 0 0 0 0 0 0 0
56265 - 0 0 0 0 0 0 0 0 0 0 0 0
56266 - 0 0 0 0 0 0 0 0 0 0 0 0
56267 - 0 0 0 0 0 0 0 0 0 0 0 0
56268 - 0 0 0 0 0 0 6 6 6 22 22 22
56269 - 58 58 58 62 62 62 2 2 6 2 2 6
56270 - 2 2 6 2 2 6 30 30 30 78 78 78
56271 -250 250 250 253 253 253 253 253 253 253 253 253
56272 -253 253 253 253 253 253 253 253 253 253 253 253
56273 -253 253 253 253 253 253 231 231 231 246 246 246
56274 -253 253 253 253 253 253 253 253 253 253 253 253
56275 -253 253 253 253 253 253 253 253 253 253 253 253
56276 -253 253 253 253 253 253 253 253 253 253 253 253
56277 -253 253 253 253 253 253 253 253 253 253 253 253
56278 -253 253 253 253 253 253 206 206 206 2 2 6
56279 - 22 22 22 34 34 34 18 14 6 22 22 22
56280 - 26 26 26 18 18 18 6 6 6 2 2 6
56281 - 2 2 6 82 82 82 54 54 54 18 18 18
56282 - 6 6 6 0 0 0 0 0 0 0 0 0
56283 - 0 0 0 0 0 0 0 0 0 0 0 0
56284 - 0 0 0 0 0 0 0 0 0 0 0 0
56285 - 0 0 0 0 0 0 0 0 0 0 0 0
56286 - 0 0 0 0 0 0 0 0 0 0 0 0
56287 - 0 0 0 0 0 0 0 0 0 0 0 0
56288 - 0 0 0 0 0 0 6 6 6 26 26 26
56289 - 62 62 62 106 106 106 74 54 14 185 133 11
56290 -210 162 10 121 92 8 6 6 6 62 62 62
56291 -238 238 238 253 253 253 253 253 253 253 253 253
56292 -253 253 253 253 253 253 253 253 253 253 253 253
56293 -253 253 253 253 253 253 231 231 231 246 246 246
56294 -253 253 253 253 253 253 253 253 253 253 253 253
56295 -253 253 253 253 253 253 253 253 253 253 253 253
56296 -253 253 253 253 253 253 253 253 253 253 253 253
56297 -253 253 253 253 253 253 253 253 253 253 253 253
56298 -253 253 253 253 253 253 158 158 158 18 18 18
56299 - 14 14 14 2 2 6 2 2 6 2 2 6
56300 - 6 6 6 18 18 18 66 66 66 38 38 38
56301 - 6 6 6 94 94 94 50 50 50 18 18 18
56302 - 6 6 6 0 0 0 0 0 0 0 0 0
56303 - 0 0 0 0 0 0 0 0 0 0 0 0
56304 - 0 0 0 0 0 0 0 0 0 0 0 0
56305 - 0 0 0 0 0 0 0 0 0 0 0 0
56306 - 0 0 0 0 0 0 0 0 0 0 0 0
56307 - 0 0 0 0 0 0 0 0 0 6 6 6
56308 - 10 10 10 10 10 10 18 18 18 38 38 38
56309 - 78 78 78 142 134 106 216 158 10 242 186 14
56310 -246 190 14 246 190 14 156 118 10 10 10 10
56311 - 90 90 90 238 238 238 253 253 253 253 253 253
56312 -253 253 253 253 253 253 253 253 253 253 253 253
56313 -253 253 253 253 253 253 231 231 231 250 250 250
56314 -253 253 253 253 253 253 253 253 253 253 253 253
56315 -253 253 253 253 253 253 253 253 253 253 253 253
56316 -253 253 253 253 253 253 253 253 253 253 253 253
56317 -253 253 253 253 253 253 253 253 253 246 230 190
56318 -238 204 91 238 204 91 181 142 44 37 26 9
56319 - 2 2 6 2 2 6 2 2 6 2 2 6
56320 - 2 2 6 2 2 6 38 38 38 46 46 46
56321 - 26 26 26 106 106 106 54 54 54 18 18 18
56322 - 6 6 6 0 0 0 0 0 0 0 0 0
56323 - 0 0 0 0 0 0 0 0 0 0 0 0
56324 - 0 0 0 0 0 0 0 0 0 0 0 0
56325 - 0 0 0 0 0 0 0 0 0 0 0 0
56326 - 0 0 0 0 0 0 0 0 0 0 0 0
56327 - 0 0 0 6 6 6 14 14 14 22 22 22
56328 - 30 30 30 38 38 38 50 50 50 70 70 70
56329 -106 106 106 190 142 34 226 170 11 242 186 14
56330 -246 190 14 246 190 14 246 190 14 154 114 10
56331 - 6 6 6 74 74 74 226 226 226 253 253 253
56332 -253 253 253 253 253 253 253 253 253 253 253 253
56333 -253 253 253 253 253 253 231 231 231 250 250 250
56334 -253 253 253 253 253 253 253 253 253 253 253 253
56335 -253 253 253 253 253 253 253 253 253 253 253 253
56336 -253 253 253 253 253 253 253 253 253 253 253 253
56337 -253 253 253 253 253 253 253 253 253 228 184 62
56338 -241 196 14 241 208 19 232 195 16 38 30 10
56339 - 2 2 6 2 2 6 2 2 6 2 2 6
56340 - 2 2 6 6 6 6 30 30 30 26 26 26
56341 -203 166 17 154 142 90 66 66 66 26 26 26
56342 - 6 6 6 0 0 0 0 0 0 0 0 0
56343 - 0 0 0 0 0 0 0 0 0 0 0 0
56344 - 0 0 0 0 0 0 0 0 0 0 0 0
56345 - 0 0 0 0 0 0 0 0 0 0 0 0
56346 - 0 0 0 0 0 0 0 0 0 0 0 0
56347 - 6 6 6 18 18 18 38 38 38 58 58 58
56348 - 78 78 78 86 86 86 101 101 101 123 123 123
56349 -175 146 61 210 150 10 234 174 13 246 186 14
56350 -246 190 14 246 190 14 246 190 14 238 190 10
56351 -102 78 10 2 2 6 46 46 46 198 198 198
56352 -253 253 253 253 253 253 253 253 253 253 253 253
56353 -253 253 253 253 253 253 234 234 234 242 242 242
56354 -253 253 253 253 253 253 253 253 253 253 253 253
56355 -253 253 253 253 253 253 253 253 253 253 253 253
56356 -253 253 253 253 253 253 253 253 253 253 253 253
56357 -253 253 253 253 253 253 253 253 253 224 178 62
56358 -242 186 14 241 196 14 210 166 10 22 18 6
56359 - 2 2 6 2 2 6 2 2 6 2 2 6
56360 - 2 2 6 2 2 6 6 6 6 121 92 8
56361 -238 202 15 232 195 16 82 82 82 34 34 34
56362 - 10 10 10 0 0 0 0 0 0 0 0 0
56363 - 0 0 0 0 0 0 0 0 0 0 0 0
56364 - 0 0 0 0 0 0 0 0 0 0 0 0
56365 - 0 0 0 0 0 0 0 0 0 0 0 0
56366 - 0 0 0 0 0 0 0 0 0 0 0 0
56367 - 14 14 14 38 38 38 70 70 70 154 122 46
56368 -190 142 34 200 144 11 197 138 11 197 138 11
56369 -213 154 11 226 170 11 242 186 14 246 190 14
56370 -246 190 14 246 190 14 246 190 14 246 190 14
56371 -225 175 15 46 32 6 2 2 6 22 22 22
56372 -158 158 158 250 250 250 253 253 253 253 253 253
56373 -253 253 253 253 253 253 253 253 253 253 253 253
56374 -253 253 253 253 253 253 253 253 253 253 253 253
56375 -253 253 253 253 253 253 253 253 253 253 253 253
56376 -253 253 253 253 253 253 253 253 253 253 253 253
56377 -253 253 253 250 250 250 242 242 242 224 178 62
56378 -239 182 13 236 186 11 213 154 11 46 32 6
56379 - 2 2 6 2 2 6 2 2 6 2 2 6
56380 - 2 2 6 2 2 6 61 42 6 225 175 15
56381 -238 190 10 236 186 11 112 100 78 42 42 42
56382 - 14 14 14 0 0 0 0 0 0 0 0 0
56383 - 0 0 0 0 0 0 0 0 0 0 0 0
56384 - 0 0 0 0 0 0 0 0 0 0 0 0
56385 - 0 0 0 0 0 0 0 0 0 0 0 0
56386 - 0 0 0 0 0 0 0 0 0 6 6 6
56387 - 22 22 22 54 54 54 154 122 46 213 154 11
56388 -226 170 11 230 174 11 226 170 11 226 170 11
56389 -236 178 12 242 186 14 246 190 14 246 190 14
56390 -246 190 14 246 190 14 246 190 14 246 190 14
56391 -241 196 14 184 144 12 10 10 10 2 2 6
56392 - 6 6 6 116 116 116 242 242 242 253 253 253
56393 -253 253 253 253 253 253 253 253 253 253 253 253
56394 -253 253 253 253 253 253 253 253 253 253 253 253
56395 -253 253 253 253 253 253 253 253 253 253 253 253
56396 -253 253 253 253 253 253 253 253 253 253 253 253
56397 -253 253 253 231 231 231 198 198 198 214 170 54
56398 -236 178 12 236 178 12 210 150 10 137 92 6
56399 - 18 14 6 2 2 6 2 2 6 2 2 6
56400 - 6 6 6 70 47 6 200 144 11 236 178 12
56401 -239 182 13 239 182 13 124 112 88 58 58 58
56402 - 22 22 22 6 6 6 0 0 0 0 0 0
56403 - 0 0 0 0 0 0 0 0 0 0 0 0
56404 - 0 0 0 0 0 0 0 0 0 0 0 0
56405 - 0 0 0 0 0 0 0 0 0 0 0 0
56406 - 0 0 0 0 0 0 0 0 0 10 10 10
56407 - 30 30 30 70 70 70 180 133 36 226 170 11
56408 -239 182 13 242 186 14 242 186 14 246 186 14
56409 -246 190 14 246 190 14 246 190 14 246 190 14
56410 -246 190 14 246 190 14 246 190 14 246 190 14
56411 -246 190 14 232 195 16 98 70 6 2 2 6
56412 - 2 2 6 2 2 6 66 66 66 221 221 221
56413 -253 253 253 253 253 253 253 253 253 253 253 253
56414 -253 253 253 253 253 253 253 253 253 253 253 253
56415 -253 253 253 253 253 253 253 253 253 253 253 253
56416 -253 253 253 253 253 253 253 253 253 253 253 253
56417 -253 253 253 206 206 206 198 198 198 214 166 58
56418 -230 174 11 230 174 11 216 158 10 192 133 9
56419 -163 110 8 116 81 8 102 78 10 116 81 8
56420 -167 114 7 197 138 11 226 170 11 239 182 13
56421 -242 186 14 242 186 14 162 146 94 78 78 78
56422 - 34 34 34 14 14 14 6 6 6 0 0 0
56423 - 0 0 0 0 0 0 0 0 0 0 0 0
56424 - 0 0 0 0 0 0 0 0 0 0 0 0
56425 - 0 0 0 0 0 0 0 0 0 0 0 0
56426 - 0 0 0 0 0 0 0 0 0 6 6 6
56427 - 30 30 30 78 78 78 190 142 34 226 170 11
56428 -239 182 13 246 190 14 246 190 14 246 190 14
56429 -246 190 14 246 190 14 246 190 14 246 190 14
56430 -246 190 14 246 190 14 246 190 14 246 190 14
56431 -246 190 14 241 196 14 203 166 17 22 18 6
56432 - 2 2 6 2 2 6 2 2 6 38 38 38
56433 -218 218 218 253 253 253 253 253 253 253 253 253
56434 -253 253 253 253 253 253 253 253 253 253 253 253
56435 -253 253 253 253 253 253 253 253 253 253 253 253
56436 -253 253 253 253 253 253 253 253 253 253 253 253
56437 -250 250 250 206 206 206 198 198 198 202 162 69
56438 -226 170 11 236 178 12 224 166 10 210 150 10
56439 -200 144 11 197 138 11 192 133 9 197 138 11
56440 -210 150 10 226 170 11 242 186 14 246 190 14
56441 -246 190 14 246 186 14 225 175 15 124 112 88
56442 - 62 62 62 30 30 30 14 14 14 6 6 6
56443 - 0 0 0 0 0 0 0 0 0 0 0 0
56444 - 0 0 0 0 0 0 0 0 0 0 0 0
56445 - 0 0 0 0 0 0 0 0 0 0 0 0
56446 - 0 0 0 0 0 0 0 0 0 10 10 10
56447 - 30 30 30 78 78 78 174 135 50 224 166 10
56448 -239 182 13 246 190 14 246 190 14 246 190 14
56449 -246 190 14 246 190 14 246 190 14 246 190 14
56450 -246 190 14 246 190 14 246 190 14 246 190 14
56451 -246 190 14 246 190 14 241 196 14 139 102 15
56452 - 2 2 6 2 2 6 2 2 6 2 2 6
56453 - 78 78 78 250 250 250 253 253 253 253 253 253
56454 -253 253 253 253 253 253 253 253 253 253 253 253
56455 -253 253 253 253 253 253 253 253 253 253 253 253
56456 -253 253 253 253 253 253 253 253 253 253 253 253
56457 -250 250 250 214 214 214 198 198 198 190 150 46
56458 -219 162 10 236 178 12 234 174 13 224 166 10
56459 -216 158 10 213 154 11 213 154 11 216 158 10
56460 -226 170 11 239 182 13 246 190 14 246 190 14
56461 -246 190 14 246 190 14 242 186 14 206 162 42
56462 -101 101 101 58 58 58 30 30 30 14 14 14
56463 - 6 6 6 0 0 0 0 0 0 0 0 0
56464 - 0 0 0 0 0 0 0 0 0 0 0 0
56465 - 0 0 0 0 0 0 0 0 0 0 0 0
56466 - 0 0 0 0 0 0 0 0 0 10 10 10
56467 - 30 30 30 74 74 74 174 135 50 216 158 10
56468 -236 178 12 246 190 14 246 190 14 246 190 14
56469 -246 190 14 246 190 14 246 190 14 246 190 14
56470 -246 190 14 246 190 14 246 190 14 246 190 14
56471 -246 190 14 246 190 14 241 196 14 226 184 13
56472 - 61 42 6 2 2 6 2 2 6 2 2 6
56473 - 22 22 22 238 238 238 253 253 253 253 253 253
56474 -253 253 253 253 253 253 253 253 253 253 253 253
56475 -253 253 253 253 253 253 253 253 253 253 253 253
56476 -253 253 253 253 253 253 253 253 253 253 253 253
56477 -253 253 253 226 226 226 187 187 187 180 133 36
56478 -216 158 10 236 178 12 239 182 13 236 178 12
56479 -230 174 11 226 170 11 226 170 11 230 174 11
56480 -236 178 12 242 186 14 246 190 14 246 190 14
56481 -246 190 14 246 190 14 246 186 14 239 182 13
56482 -206 162 42 106 106 106 66 66 66 34 34 34
56483 - 14 14 14 6 6 6 0 0 0 0 0 0
56484 - 0 0 0 0 0 0 0 0 0 0 0 0
56485 - 0 0 0 0 0 0 0 0 0 0 0 0
56486 - 0 0 0 0 0 0 0 0 0 6 6 6
56487 - 26 26 26 70 70 70 163 133 67 213 154 11
56488 -236 178 12 246 190 14 246 190 14 246 190 14
56489 -246 190 14 246 190 14 246 190 14 246 190 14
56490 -246 190 14 246 190 14 246 190 14 246 190 14
56491 -246 190 14 246 190 14 246 190 14 241 196 14
56492 -190 146 13 18 14 6 2 2 6 2 2 6
56493 - 46 46 46 246 246 246 253 253 253 253 253 253
56494 -253 253 253 253 253 253 253 253 253 253 253 253
56495 -253 253 253 253 253 253 253 253 253 253 253 253
56496 -253 253 253 253 253 253 253 253 253 253 253 253
56497 -253 253 253 221 221 221 86 86 86 156 107 11
56498 -216 158 10 236 178 12 242 186 14 246 186 14
56499 -242 186 14 239 182 13 239 182 13 242 186 14
56500 -242 186 14 246 186 14 246 190 14 246 190 14
56501 -246 190 14 246 190 14 246 190 14 246 190 14
56502 -242 186 14 225 175 15 142 122 72 66 66 66
56503 - 30 30 30 10 10 10 0 0 0 0 0 0
56504 - 0 0 0 0 0 0 0 0 0 0 0 0
56505 - 0 0 0 0 0 0 0 0 0 0 0 0
56506 - 0 0 0 0 0 0 0 0 0 6 6 6
56507 - 26 26 26 70 70 70 163 133 67 210 150 10
56508 -236 178 12 246 190 14 246 190 14 246 190 14
56509 -246 190 14 246 190 14 246 190 14 246 190 14
56510 -246 190 14 246 190 14 246 190 14 246 190 14
56511 -246 190 14 246 190 14 246 190 14 246 190 14
56512 -232 195 16 121 92 8 34 34 34 106 106 106
56513 -221 221 221 253 253 253 253 253 253 253 253 253
56514 -253 253 253 253 253 253 253 253 253 253 253 253
56515 -253 253 253 253 253 253 253 253 253 253 253 253
56516 -253 253 253 253 253 253 253 253 253 253 253 253
56517 -242 242 242 82 82 82 18 14 6 163 110 8
56518 -216 158 10 236 178 12 242 186 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 246 190 14 246 190 14
56522 -246 190 14 246 190 14 242 186 14 163 133 67
56523 - 46 46 46 18 18 18 6 6 6 0 0 0
56524 - 0 0 0 0 0 0 0 0 0 0 0 0
56525 - 0 0 0 0 0 0 0 0 0 0 0 0
56526 - 0 0 0 0 0 0 0 0 0 10 10 10
56527 - 30 30 30 78 78 78 163 133 67 210 150 10
56528 -236 178 12 246 186 14 246 190 14 246 190 14
56529 -246 190 14 246 190 14 246 190 14 246 190 14
56530 -246 190 14 246 190 14 246 190 14 246 190 14
56531 -246 190 14 246 190 14 246 190 14 246 190 14
56532 -241 196 14 215 174 15 190 178 144 253 253 253
56533 -253 253 253 253 253 253 253 253 253 253 253 253
56534 -253 253 253 253 253 253 253 253 253 253 253 253
56535 -253 253 253 253 253 253 253 253 253 253 253 253
56536 -253 253 253 253 253 253 253 253 253 218 218 218
56537 - 58 58 58 2 2 6 22 18 6 167 114 7
56538 -216 158 10 236 178 12 246 186 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 246 190 14 246 190 14
56542 -246 190 14 246 186 14 242 186 14 190 150 46
56543 - 54 54 54 22 22 22 6 6 6 0 0 0
56544 - 0 0 0 0 0 0 0 0 0 0 0 0
56545 - 0 0 0 0 0 0 0 0 0 0 0 0
56546 - 0 0 0 0 0 0 0 0 0 14 14 14
56547 - 38 38 38 86 86 86 180 133 36 213 154 11
56548 -236 178 12 246 186 14 246 190 14 246 190 14
56549 -246 190 14 246 190 14 246 190 14 246 190 14
56550 -246 190 14 246 190 14 246 190 14 246 190 14
56551 -246 190 14 246 190 14 246 190 14 246 190 14
56552 -246 190 14 232 195 16 190 146 13 214 214 214
56553 -253 253 253 253 253 253 253 253 253 253 253 253
56554 -253 253 253 253 253 253 253 253 253 253 253 253
56555 -253 253 253 253 253 253 253 253 253 253 253 253
56556 -253 253 253 250 250 250 170 170 170 26 26 26
56557 - 2 2 6 2 2 6 37 26 9 163 110 8
56558 -219 162 10 239 182 13 246 186 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 246 190 14
56562 -246 186 14 236 178 12 224 166 10 142 122 72
56563 - 46 46 46 18 18 18 6 6 6 0 0 0
56564 - 0 0 0 0 0 0 0 0 0 0 0 0
56565 - 0 0 0 0 0 0 0 0 0 0 0 0
56566 - 0 0 0 0 0 0 6 6 6 18 18 18
56567 - 50 50 50 109 106 95 192 133 9 224 166 10
56568 -242 186 14 246 190 14 246 190 14 246 190 14
56569 -246 190 14 246 190 14 246 190 14 246 190 14
56570 -246 190 14 246 190 14 246 190 14 246 190 14
56571 -246 190 14 246 190 14 246 190 14 246 190 14
56572 -242 186 14 226 184 13 210 162 10 142 110 46
56573 -226 226 226 253 253 253 253 253 253 253 253 253
56574 -253 253 253 253 253 253 253 253 253 253 253 253
56575 -253 253 253 253 253 253 253 253 253 253 253 253
56576 -198 198 198 66 66 66 2 2 6 2 2 6
56577 - 2 2 6 2 2 6 50 34 6 156 107 11
56578 -219 162 10 239 182 13 246 186 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 242 186 14
56582 -234 174 13 213 154 11 154 122 46 66 66 66
56583 - 30 30 30 10 10 10 0 0 0 0 0 0
56584 - 0 0 0 0 0 0 0 0 0 0 0 0
56585 - 0 0 0 0 0 0 0 0 0 0 0 0
56586 - 0 0 0 0 0 0 6 6 6 22 22 22
56587 - 58 58 58 154 121 60 206 145 10 234 174 13
56588 -242 186 14 246 186 14 246 190 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 186 14 236 178 12 210 162 10 163 110 8
56593 - 61 42 6 138 138 138 218 218 218 250 250 250
56594 -253 253 253 253 253 253 253 253 253 250 250 250
56595 -242 242 242 210 210 210 144 144 144 66 66 66
56596 - 6 6 6 2 2 6 2 2 6 2 2 6
56597 - 2 2 6 2 2 6 61 42 6 163 110 8
56598 -216 158 10 236 178 12 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 239 182 13 230 174 11 216 158 10
56602 -190 142 34 124 112 88 70 70 70 38 38 38
56603 - 18 18 18 6 6 6 0 0 0 0 0 0
56604 - 0 0 0 0 0 0 0 0 0 0 0 0
56605 - 0 0 0 0 0 0 0 0 0 0 0 0
56606 - 0 0 0 0 0 0 6 6 6 22 22 22
56607 - 62 62 62 168 124 44 206 145 10 224 166 10
56608 -236 178 12 239 182 13 242 186 14 242 186 14
56609 -246 186 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 236 178 12 216 158 10 175 118 6
56613 - 80 54 7 2 2 6 6 6 6 30 30 30
56614 - 54 54 54 62 62 62 50 50 50 38 38 38
56615 - 14 14 14 2 2 6 2 2 6 2 2 6
56616 - 2 2 6 2 2 6 2 2 6 2 2 6
56617 - 2 2 6 6 6 6 80 54 7 167 114 7
56618 -213 154 11 236 178 12 246 190 14 246 190 14
56619 -246 190 14 246 190 14 246 190 14 246 190 14
56620 -246 190 14 242 186 14 239 182 13 239 182 13
56621 -230 174 11 210 150 10 174 135 50 124 112 88
56622 - 82 82 82 54 54 54 34 34 34 18 18 18
56623 - 6 6 6 0 0 0 0 0 0 0 0 0
56624 - 0 0 0 0 0 0 0 0 0 0 0 0
56625 - 0 0 0 0 0 0 0 0 0 0 0 0
56626 - 0 0 0 0 0 0 6 6 6 18 18 18
56627 - 50 50 50 158 118 36 192 133 9 200 144 11
56628 -216 158 10 219 162 10 224 166 10 226 170 11
56629 -230 174 11 236 178 12 239 182 13 239 182 13
56630 -242 186 14 246 186 14 246 190 14 246 190 14
56631 -246 190 14 246 190 14 246 190 14 246 190 14
56632 -246 186 14 230 174 11 210 150 10 163 110 8
56633 -104 69 6 10 10 10 2 2 6 2 2 6
56634 - 2 2 6 2 2 6 2 2 6 2 2 6
56635 - 2 2 6 2 2 6 2 2 6 2 2 6
56636 - 2 2 6 2 2 6 2 2 6 2 2 6
56637 - 2 2 6 6 6 6 91 60 6 167 114 7
56638 -206 145 10 230 174 11 242 186 14 246 190 14
56639 -246 190 14 246 190 14 246 186 14 242 186 14
56640 -239 182 13 230 174 11 224 166 10 213 154 11
56641 -180 133 36 124 112 88 86 86 86 58 58 58
56642 - 38 38 38 22 22 22 10 10 10 6 6 6
56643 - 0 0 0 0 0 0 0 0 0 0 0 0
56644 - 0 0 0 0 0 0 0 0 0 0 0 0
56645 - 0 0 0 0 0 0 0 0 0 0 0 0
56646 - 0 0 0 0 0 0 0 0 0 14 14 14
56647 - 34 34 34 70 70 70 138 110 50 158 118 36
56648 -167 114 7 180 123 7 192 133 9 197 138 11
56649 -200 144 11 206 145 10 213 154 11 219 162 10
56650 -224 166 10 230 174 11 239 182 13 242 186 14
56651 -246 186 14 246 186 14 246 186 14 246 186 14
56652 -239 182 13 216 158 10 185 133 11 152 99 6
56653 -104 69 6 18 14 6 2 2 6 2 2 6
56654 - 2 2 6 2 2 6 2 2 6 2 2 6
56655 - 2 2 6 2 2 6 2 2 6 2 2 6
56656 - 2 2 6 2 2 6 2 2 6 2 2 6
56657 - 2 2 6 6 6 6 80 54 7 152 99 6
56658 -192 133 9 219 162 10 236 178 12 239 182 13
56659 -246 186 14 242 186 14 239 182 13 236 178 12
56660 -224 166 10 206 145 10 192 133 9 154 121 60
56661 - 94 94 94 62 62 62 42 42 42 22 22 22
56662 - 14 14 14 6 6 6 0 0 0 0 0 0
56663 - 0 0 0 0 0 0 0 0 0 0 0 0
56664 - 0 0 0 0 0 0 0 0 0 0 0 0
56665 - 0 0 0 0 0 0 0 0 0 0 0 0
56666 - 0 0 0 0 0 0 0 0 0 6 6 6
56667 - 18 18 18 34 34 34 58 58 58 78 78 78
56668 -101 98 89 124 112 88 142 110 46 156 107 11
56669 -163 110 8 167 114 7 175 118 6 180 123 7
56670 -185 133 11 197 138 11 210 150 10 219 162 10
56671 -226 170 11 236 178 12 236 178 12 234 174 13
56672 -219 162 10 197 138 11 163 110 8 130 83 6
56673 - 91 60 6 10 10 10 2 2 6 2 2 6
56674 - 18 18 18 38 38 38 38 38 38 38 38 38
56675 - 38 38 38 38 38 38 38 38 38 38 38 38
56676 - 38 38 38 38 38 38 26 26 26 2 2 6
56677 - 2 2 6 6 6 6 70 47 6 137 92 6
56678 -175 118 6 200 144 11 219 162 10 230 174 11
56679 -234 174 13 230 174 11 219 162 10 210 150 10
56680 -192 133 9 163 110 8 124 112 88 82 82 82
56681 - 50 50 50 30 30 30 14 14 14 6 6 6
56682 - 0 0 0 0 0 0 0 0 0 0 0 0
56683 - 0 0 0 0 0 0 0 0 0 0 0 0
56684 - 0 0 0 0 0 0 0 0 0 0 0 0
56685 - 0 0 0 0 0 0 0 0 0 0 0 0
56686 - 0 0 0 0 0 0 0 0 0 0 0 0
56687 - 6 6 6 14 14 14 22 22 22 34 34 34
56688 - 42 42 42 58 58 58 74 74 74 86 86 86
56689 -101 98 89 122 102 70 130 98 46 121 87 25
56690 -137 92 6 152 99 6 163 110 8 180 123 7
56691 -185 133 11 197 138 11 206 145 10 200 144 11
56692 -180 123 7 156 107 11 130 83 6 104 69 6
56693 - 50 34 6 54 54 54 110 110 110 101 98 89
56694 - 86 86 86 82 82 82 78 78 78 78 78 78
56695 - 78 78 78 78 78 78 78 78 78 78 78 78
56696 - 78 78 78 82 82 82 86 86 86 94 94 94
56697 -106 106 106 101 101 101 86 66 34 124 80 6
56698 -156 107 11 180 123 7 192 133 9 200 144 11
56699 -206 145 10 200 144 11 192 133 9 175 118 6
56700 -139 102 15 109 106 95 70 70 70 42 42 42
56701 - 22 22 22 10 10 10 0 0 0 0 0 0
56702 - 0 0 0 0 0 0 0 0 0 0 0 0
56703 - 0 0 0 0 0 0 0 0 0 0 0 0
56704 - 0 0 0 0 0 0 0 0 0 0 0 0
56705 - 0 0 0 0 0 0 0 0 0 0 0 0
56706 - 0 0 0 0 0 0 0 0 0 0 0 0
56707 - 0 0 0 0 0 0 6 6 6 10 10 10
56708 - 14 14 14 22 22 22 30 30 30 38 38 38
56709 - 50 50 50 62 62 62 74 74 74 90 90 90
56710 -101 98 89 112 100 78 121 87 25 124 80 6
56711 -137 92 6 152 99 6 152 99 6 152 99 6
56712 -138 86 6 124 80 6 98 70 6 86 66 30
56713 -101 98 89 82 82 82 58 58 58 46 46 46
56714 - 38 38 38 34 34 34 34 34 34 34 34 34
56715 - 34 34 34 34 34 34 34 34 34 34 34 34
56716 - 34 34 34 34 34 34 38 38 38 42 42 42
56717 - 54 54 54 82 82 82 94 86 76 91 60 6
56718 -134 86 6 156 107 11 167 114 7 175 118 6
56719 -175 118 6 167 114 7 152 99 6 121 87 25
56720 -101 98 89 62 62 62 34 34 34 18 18 18
56721 - 6 6 6 0 0 0 0 0 0 0 0 0
56722 - 0 0 0 0 0 0 0 0 0 0 0 0
56723 - 0 0 0 0 0 0 0 0 0 0 0 0
56724 - 0 0 0 0 0 0 0 0 0 0 0 0
56725 - 0 0 0 0 0 0 0 0 0 0 0 0
56726 - 0 0 0 0 0 0 0 0 0 0 0 0
56727 - 0 0 0 0 0 0 0 0 0 0 0 0
56728 - 0 0 0 6 6 6 6 6 6 10 10 10
56729 - 18 18 18 22 22 22 30 30 30 42 42 42
56730 - 50 50 50 66 66 66 86 86 86 101 98 89
56731 -106 86 58 98 70 6 104 69 6 104 69 6
56732 -104 69 6 91 60 6 82 62 34 90 90 90
56733 - 62 62 62 38 38 38 22 22 22 14 14 14
56734 - 10 10 10 10 10 10 10 10 10 10 10 10
56735 - 10 10 10 10 10 10 6 6 6 10 10 10
56736 - 10 10 10 10 10 10 10 10 10 14 14 14
56737 - 22 22 22 42 42 42 70 70 70 89 81 66
56738 - 80 54 7 104 69 6 124 80 6 137 92 6
56739 -134 86 6 116 81 8 100 82 52 86 86 86
56740 - 58 58 58 30 30 30 14 14 14 6 6 6
56741 - 0 0 0 0 0 0 0 0 0 0 0 0
56742 - 0 0 0 0 0 0 0 0 0 0 0 0
56743 - 0 0 0 0 0 0 0 0 0 0 0 0
56744 - 0 0 0 0 0 0 0 0 0 0 0 0
56745 - 0 0 0 0 0 0 0 0 0 0 0 0
56746 - 0 0 0 0 0 0 0 0 0 0 0 0
56747 - 0 0 0 0 0 0 0 0 0 0 0 0
56748 - 0 0 0 0 0 0 0 0 0 0 0 0
56749 - 0 0 0 6 6 6 10 10 10 14 14 14
56750 - 18 18 18 26 26 26 38 38 38 54 54 54
56751 - 70 70 70 86 86 86 94 86 76 89 81 66
56752 - 89 81 66 86 86 86 74 74 74 50 50 50
56753 - 30 30 30 14 14 14 6 6 6 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 18 18 18 34 34 34 58 58 58
56758 - 82 82 82 89 81 66 89 81 66 89 81 66
56759 - 94 86 66 94 86 76 74 74 74 50 50 50
56760 - 26 26 26 14 14 14 6 6 6 0 0 0
56761 - 0 0 0 0 0 0 0 0 0 0 0 0
56762 - 0 0 0 0 0 0 0 0 0 0 0 0
56763 - 0 0 0 0 0 0 0 0 0 0 0 0
56764 - 0 0 0 0 0 0 0 0 0 0 0 0
56765 - 0 0 0 0 0 0 0 0 0 0 0 0
56766 - 0 0 0 0 0 0 0 0 0 0 0 0
56767 - 0 0 0 0 0 0 0 0 0 0 0 0
56768 - 0 0 0 0 0 0 0 0 0 0 0 0
56769 - 0 0 0 0 0 0 0 0 0 0 0 0
56770 - 6 6 6 6 6 6 14 14 14 18 18 18
56771 - 30 30 30 38 38 38 46 46 46 54 54 54
56772 - 50 50 50 42 42 42 30 30 30 18 18 18
56773 - 10 10 10 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 6 6 6 14 14 14 26 26 26
56778 - 38 38 38 50 50 50 58 58 58 58 58 58
56779 - 54 54 54 42 42 42 30 30 30 18 18 18
56780 - 10 10 10 0 0 0 0 0 0 0 0 0
56781 - 0 0 0 0 0 0 0 0 0 0 0 0
56782 - 0 0 0 0 0 0 0 0 0 0 0 0
56783 - 0 0 0 0 0 0 0 0 0 0 0 0
56784 - 0 0 0 0 0 0 0 0 0 0 0 0
56785 - 0 0 0 0 0 0 0 0 0 0 0 0
56786 - 0 0 0 0 0 0 0 0 0 0 0 0
56787 - 0 0 0 0 0 0 0 0 0 0 0 0
56788 - 0 0 0 0 0 0 0 0 0 0 0 0
56789 - 0 0 0 0 0 0 0 0 0 0 0 0
56790 - 0 0 0 0 0 0 0 0 0 6 6 6
56791 - 6 6 6 10 10 10 14 14 14 18 18 18
56792 - 18 18 18 14 14 14 10 10 10 6 6 6
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 6 6 6
56798 - 14 14 14 18 18 18 22 22 22 22 22 22
56799 - 18 18 18 14 14 14 10 10 10 6 6 6
56800 - 0 0 0 0 0 0 0 0 0 0 0 0
56801 - 0 0 0 0 0 0 0 0 0 0 0 0
56802 - 0 0 0 0 0 0 0 0 0 0 0 0
56803 - 0 0 0 0 0 0 0 0 0 0 0 0
56804 - 0 0 0 0 0 0 0 0 0 0 0 0
56805 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56806 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56807 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56808 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56809 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56810 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56811 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56812 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56813 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56814 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56815 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56816 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56817 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56818 +4 4 4 4 4 4
56819 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56820 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56821 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56822 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56823 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56824 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56825 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56826 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56827 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56828 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56829 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56830 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56831 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56832 +4 4 4 4 4 4
56833 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56834 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56835 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56836 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56837 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56838 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56839 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56840 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56841 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56842 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56843 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56844 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56845 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56846 +4 4 4 4 4 4
56847 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56848 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56849 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56850 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56851 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56852 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56853 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56854 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56855 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56856 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56857 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56858 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56859 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56860 +4 4 4 4 4 4
56861 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56862 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56863 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56864 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56865 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56866 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56867 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56868 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56869 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56870 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56871 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56872 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56873 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56874 +4 4 4 4 4 4
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 3 3 3 0 0 0 0 0 0
56894 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 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 1 1 1 0 0 0
56899 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
56900 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
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 2 2 2 0 0 0 3 4 3 26 28 28
56908 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
56909 +5 5 5 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 3 3 3 0 0 0 1 1 1 6 6 6
56913 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
56914 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
56915 +1 1 1 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 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
56922 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
56923 +0 0 0 3 3 3 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 0 0 0 4 4 4 41 54 63 125 124 125
56927 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
56928 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
56929 +2 2 2 2 1 0 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 5 5 5 5 5 5 2 2 2 0 0 0
56935 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
56936 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
56937 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 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 5 5 5 5 5 5
56940 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
56941 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
56942 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
56943 +37 51 59 2 0 0 1 1 1 4 5 5 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 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
56949 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
56950 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
56951 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
56952 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
56953 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
56954 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
56955 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
56956 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
56957 +64 123 161 14 17 19 0 0 0 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 5 5 5
56962 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
56963 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
56964 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
56965 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
56966 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
56967 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
56968 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
56969 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
56970 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
56971 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 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 5 5 5 3 3 3
56976 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
56977 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
56978 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
56979 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
56980 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
56981 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
56982 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
56983 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
56984 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
56985 +31 91 132 3 6 7 0 0 0 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 2 2 2 0 0 0 4 0 0
56990 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
56991 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
56992 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
56993 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
56994 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
56995 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
56996 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
56997 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
56998 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
56999 +7 12 15 0 0 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 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57004 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57005 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57006 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57007 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57008 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57009 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57010 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57011 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57012 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57013 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57014 +4 4 4 4 4 4
57015 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57016 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57017 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57018 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57019 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57020 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57021 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57022 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57023 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57024 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57025 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57026 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57027 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 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 3 3 3 0 0 0
57031 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57032 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57033 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57034 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57035 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57036 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57037 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57038 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57039 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57040 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57041 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
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 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57045 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57046 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57047 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57048 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57049 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57050 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57051 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57052 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57053 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57054 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57055 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57056 +0 0 0 4 4 4
57057 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57058 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57059 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57060 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57061 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57062 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57063 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57064 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57065 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57066 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57067 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57068 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57069 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57070 +2 0 0 0 0 0
57071 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57072 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57073 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57074 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57075 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57076 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57077 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57078 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57079 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57080 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57081 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57082 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57083 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57084 +37 38 37 0 0 0
57085 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57086 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57087 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57088 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57089 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57090 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57091 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57092 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57093 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57094 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57095 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57096 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57097 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57098 +85 115 134 4 0 0
57099 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57100 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57101 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57102 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57103 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57104 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57105 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57106 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57107 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57108 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57109 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57110 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57111 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57112 +60 73 81 4 0 0
57113 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57114 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57115 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57116 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57117 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57118 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57119 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57120 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57121 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57122 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57123 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57124 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57125 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57126 +16 19 21 4 0 0
57127 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57128 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57129 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57130 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57131 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57132 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57133 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57134 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57135 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57136 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57137 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57138 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57139 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57140 +4 0 0 4 3 3
57141 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57142 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57143 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57144 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57145 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57146 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57147 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57148 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57149 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57150 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57151 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57152 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57153 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57154 +3 2 2 4 4 4
57155 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57156 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57157 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57158 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57159 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57160 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57161 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57162 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57163 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57164 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57165 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57166 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57167 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57168 +4 4 4 4 4 4
57169 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57170 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57171 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57172 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57173 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57174 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57175 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57176 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57177 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57178 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57179 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57180 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57181 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57182 +4 4 4 4 4 4
57183 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57184 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57185 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57186 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57187 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57188 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57189 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57190 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57191 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57192 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57193 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57194 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57195 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57196 +5 5 5 5 5 5
57197 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57198 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57199 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57200 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57201 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57202 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57203 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57204 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57205 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57206 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57207 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57208 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57209 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57210 +5 5 5 4 4 4
57211 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57212 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57213 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57214 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57215 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57216 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57217 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57218 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57219 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57220 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57221 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57222 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57223 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57224 +4 4 4 4 4 4
57225 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57226 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57227 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57228 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57229 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57230 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57231 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57232 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57233 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57234 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57235 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57236 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
57237 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57238 +4 4 4 4 4 4
57239 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57240 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57241 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57242 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57243 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57244 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57245 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57246 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57247 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57248 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57249 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
57250 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57251 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57252 +4 4 4 4 4 4
57253 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57254 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57255 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57256 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57257 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57258 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57259 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57260 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57261 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57262 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57263 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
57264 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57265 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57266 +4 4 4 4 4 4
57267 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57268 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57269 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57270 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57271 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57272 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57273 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57274 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57275 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57276 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57277 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57278 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57279 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57280 +4 4 4 4 4 4
57281 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57282 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57283 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57284 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57285 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57286 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57287 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57288 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57289 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57290 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57291 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
57292 +4 4 4 4 4 4 4 4 4 4 4 4 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 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57296 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57297 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57298 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57299 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57300 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57301 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57302 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57303 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57304 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57305 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
57306 +4 4 4 4 4 4 4 4 4 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 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57310 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57311 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57312 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57313 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57314 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57315 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57316 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57317 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57318 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57319 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 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 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57324 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57325 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57326 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57327 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57328 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57329 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57330 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57331 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57332 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57333 +4 0 0 4 3 3 5 5 5 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 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57338 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57339 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57340 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57341 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57342 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57343 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57344 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57345 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57346 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57347 +4 0 0 3 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 174 174 174 177 184 187 167 166 167
57352 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57353 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57354 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57355 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57356 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57357 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57358 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57359 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57360 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57361 +0 0 0 3 3 3 5 5 5 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 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57366 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57367 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57368 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57369 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57370 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57371 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57372 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57373 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57374 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57375 +0 0 0 3 3 3 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 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57380 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57381 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57382 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57383 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57384 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57385 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57386 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57387 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57388 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57389 +0 0 0 3 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 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57394 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57395 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57396 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57397 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57398 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57399 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57400 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57401 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57402 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57403 +0 0 0 3 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 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57408 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57409 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57410 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
57411 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
57412 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
57413 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
57414 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
57415 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57416 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57417 +0 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 193 200 203 193 200 203 174 174 174
57422 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
57423 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57424 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
57425 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
57426 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
57427 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
57428 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
57429 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
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 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
57436 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
57437 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57438 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
57439 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
57440 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
57441 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
57442 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
57443 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
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 193 200 203 193 200 203 174 174 174
57450 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
57451 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
57452 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
57453 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
57454 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
57455 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
57456 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
57457 +4 4 4 5 5 5 3 3 3 0 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 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57464 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
57465 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57466 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
57467 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
57468 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
57469 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
57470 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
57471 +4 4 4 5 5 5 3 3 3 2 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 220 221 221 190 197 201 174 174 174
57478 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
57479 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
57480 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
57481 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
57482 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
57483 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57484 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
57485 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
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 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57492 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
57493 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
57494 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57495 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
57496 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
57497 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57498 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
57499 +4 4 4 5 5 5 3 3 3 2 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 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57506 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
57507 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
57508 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
57509 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
57510 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
57511 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
57512 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
57513 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
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 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57520 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
57521 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
57522 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
57523 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
57524 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
57525 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
57526 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
57527 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
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 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
57534 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
57535 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
57536 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
57537 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57538 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
57539 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
57540 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
57541 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
57542 +131 129 131 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 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57548 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
57549 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
57550 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
57551 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
57552 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
57553 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
57554 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
57555 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
57556 +125 124 125 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 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
57562 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
57563 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
57564 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
57565 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
57566 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
57567 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
57568 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
57569 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
57570 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
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 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
57576 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57577 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
57578 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
57579 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
57580 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
57581 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
57582 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
57583 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
57584 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
57585 +0 0 0 4 4 4 4 4 4 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 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
57590 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57591 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
57592 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
57593 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
57594 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
57595 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57596 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
57597 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
57598 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
57599 +4 3 3 5 5 5 4 4 4 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 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
57604 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
57605 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
57606 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
57607 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
57608 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
57609 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
57610 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
57611 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
57612 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
57613 +5 5 5 4 4 4 4 4 4 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 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
57618 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
57619 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57620 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
57621 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
57622 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
57623 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
57624 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
57625 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
57626 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
57627 +4 4 4 4 4 4 4 4 4 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 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57632 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
57633 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
57634 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
57635 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
57636 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
57637 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
57638 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
57639 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
57640 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57641 +4 4 4 4 4 4 4 4 4 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 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
57646 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
57647 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
57648 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
57649 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
57650 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
57651 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
57652 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
57653 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
57654 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57655 +4 4 4 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 3 3 6 6 6 6 6 6 4 0 0 6 6 6
57660 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
57661 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
57662 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
57663 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
57664 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
57665 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
57666 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
57667 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57668 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57669 +4 4 4 4 4 4 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 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
57674 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57675 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
57676 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57677 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
57678 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
57679 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
57680 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
57681 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
57682 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57683 +4 4 4 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 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
57688 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
57689 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
57690 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
57691 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
57692 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
57693 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
57694 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
57695 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
57696 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57702 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
57703 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
57704 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
57705 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
57706 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
57707 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
57708 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
57709 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57710 +4 4 4 4 4 4 4 4 4 4 4 4 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 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
57716 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
57717 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57718 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
57719 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
57720 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
57721 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
57722 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
57723 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57724 +4 4 4 4 4 4 4 4 4 4 4 4 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 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57730 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
57731 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
57732 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
57733 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
57734 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
57735 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
57736 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57737 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57738 +4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57744 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
57745 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57746 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
57747 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
57748 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
57749 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
57750 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
57751 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57758 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
57759 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
57760 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
57761 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
57762 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
57763 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
57764 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
57765 +4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57772 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57773 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
57774 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57775 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
57776 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
57777 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
57778 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57779 +4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57786 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57787 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57788 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
57789 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
57790 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
57791 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
57792 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4
57800 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57801 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57802 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57803 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
57804 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
57805 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
57806 +4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4
57814 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57815 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57816 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57817 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57818 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
57819 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
57820 +4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57829 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57830 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57831 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57832 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57833 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
57834 +4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
57843 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57844 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
57845 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
57846 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
57847 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
57848 +4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57858 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57859 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
57860 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57861 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57862 +4 4 4 4 4 4 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 4 4 4
57872 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57873 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
57874 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
57875 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57887 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
57888 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
57889 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 4 4 4 4 4 4
57901 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
57902 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
57903 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
57915 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57916 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
57917 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
57926 index fef20db..d28b1ab 100644
57927 --- a/drivers/xen/xenfs/xenstored.c
57928 +++ b/drivers/xen/xenfs/xenstored.c
57929 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
57930 static int xsd_kva_open(struct inode *inode, struct file *file)
57931 {
57932 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
57933 +#ifdef CONFIG_GRKERNSEC_HIDESYM
57934 + NULL);
57935 +#else
57936 xen_store_interface);
57937 +#endif
57938 +
57939 if (!file->private_data)
57940 return -ENOMEM;
57941 return 0;
57942 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
57943 index eb14e05..5156de7 100644
57944 --- a/fs/9p/vfs_addr.c
57945 +++ b/fs/9p/vfs_addr.c
57946 @@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
57947
57948 retval = v9fs_file_write_internal(inode,
57949 v9inode->writeback_fid,
57950 - (__force const char __user *)buffer,
57951 + (const char __force_user *)buffer,
57952 len, &offset, 0);
57953 if (retval > 0)
57954 retval = 0;
57955 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
57956 index 296482f..183ddc3 100644
57957 --- a/fs/9p/vfs_inode.c
57958 +++ b/fs/9p/vfs_inode.c
57959 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
57960 void
57961 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
57962 {
57963 - char *s = nd_get_link(nd);
57964 + const char *s = nd_get_link(nd);
57965
57966 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
57967 dentry, IS_ERR(s) ? "<error>" : s);
57968 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
57969 index 370b24c..ff0be7b 100644
57970 --- a/fs/Kconfig.binfmt
57971 +++ b/fs/Kconfig.binfmt
57972 @@ -103,7 +103,7 @@ config HAVE_AOUT
57973
57974 config BINFMT_AOUT
57975 tristate "Kernel support for a.out and ECOFF binaries"
57976 - depends on HAVE_AOUT
57977 + depends on HAVE_AOUT && BROKEN
57978 ---help---
57979 A.out (Assembler.OUTput) is a set of formats for libraries and
57980 executables used in the earliest versions of UNIX. Linux used
57981 diff --git a/fs/afs/inode.c b/fs/afs/inode.c
57982 index 2946712..f737435 100644
57983 --- a/fs/afs/inode.c
57984 +++ b/fs/afs/inode.c
57985 @@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
57986 struct afs_vnode *vnode;
57987 struct super_block *sb;
57988 struct inode *inode;
57989 - static atomic_t afs_autocell_ino;
57990 + static atomic_unchecked_t afs_autocell_ino;
57991
57992 _enter("{%x:%u},%*.*s,",
57993 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
57994 @@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
57995 data.fid.unique = 0;
57996 data.fid.vnode = 0;
57997
57998 - inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
57999 + inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58000 afs_iget5_autocell_test, afs_iget5_set,
58001 &data);
58002 if (!inode) {
58003 diff --git a/fs/aio.c b/fs/aio.c
58004 index 14b9315..365980f 100644
58005 --- a/fs/aio.c
58006 +++ b/fs/aio.c
58007 @@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58008 size += sizeof(struct io_event) * nr_events;
58009
58010 nr_pages = PFN_UP(size);
58011 - if (nr_pages < 0)
58012 + if (nr_pages <= 0)
58013 return -EINVAL;
58014
58015 file = aio_private_file(ctx, nr_pages);
58016 diff --git a/fs/attr.c b/fs/attr.c
58017 index 6530ced..4a827e2 100644
58018 --- a/fs/attr.c
58019 +++ b/fs/attr.c
58020 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58021 unsigned long limit;
58022
58023 limit = rlimit(RLIMIT_FSIZE);
58024 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58025 if (limit != RLIM_INFINITY && offset > limit)
58026 goto out_sig;
58027 if (offset > inode->i_sb->s_maxbytes)
58028 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58029 index 116fd38..c04182da 100644
58030 --- a/fs/autofs4/waitq.c
58031 +++ b/fs/autofs4/waitq.c
58032 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58033 {
58034 unsigned long sigpipe, flags;
58035 mm_segment_t fs;
58036 - const char *data = (const char *)addr;
58037 + const char __user *data = (const char __force_user *)addr;
58038 ssize_t wr = 0;
58039
58040 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58041 @@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58042 return 1;
58043 }
58044
58045 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58046 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58047 +#endif
58048 +
58049 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58050 enum autofs_notify notify)
58051 {
58052 @@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58053
58054 /* If this is a direct mount request create a dummy name */
58055 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58056 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58057 + /* this name does get written to userland via autofs4_write() */
58058 + qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58059 +#else
58060 qstr.len = sprintf(name, "%p", dentry);
58061 +#endif
58062 else {
58063 qstr.len = autofs4_getpath(sbi, dentry, &name);
58064 if (!qstr.len) {
58065 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58066 index 2722387..56059b5 100644
58067 --- a/fs/befs/endian.h
58068 +++ b/fs/befs/endian.h
58069 @@ -11,7 +11,7 @@
58070
58071 #include <asm/byteorder.h>
58072
58073 -static inline u64
58074 +static inline u64 __intentional_overflow(-1)
58075 fs64_to_cpu(const struct super_block *sb, fs64 n)
58076 {
58077 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58078 @@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58079 return (__force fs64)cpu_to_be64(n);
58080 }
58081
58082 -static inline u32
58083 +static inline u32 __intentional_overflow(-1)
58084 fs32_to_cpu(const struct super_block *sb, fs32 n)
58085 {
58086 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58087 @@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58088 return (__force fs32)cpu_to_be32(n);
58089 }
58090
58091 -static inline u16
58092 +static inline u16 __intentional_overflow(-1)
58093 fs16_to_cpu(const struct super_block *sb, fs16 n)
58094 {
58095 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58096 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58097 index 929dec0..84bd914 100644
58098 --- a/fs/binfmt_aout.c
58099 +++ b/fs/binfmt_aout.c
58100 @@ -16,6 +16,7 @@
58101 #include <linux/string.h>
58102 #include <linux/fs.h>
58103 #include <linux/file.h>
58104 +#include <linux/security.h>
58105 #include <linux/stat.h>
58106 #include <linux/fcntl.h>
58107 #include <linux/ptrace.h>
58108 @@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58109 #endif
58110 # define START_STACK(u) ((void __user *)u.start_stack)
58111
58112 + memset(&dump, 0, sizeof(dump));
58113 +
58114 fs = get_fs();
58115 set_fs(KERNEL_DS);
58116 has_dumped = 1;
58117 @@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58118
58119 /* If the size of the dump file exceeds the rlimit, then see what would happen
58120 if we wrote the stack, but not the data area. */
58121 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58122 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58123 dump.u_dsize = 0;
58124
58125 /* Make sure we have enough room to write the stack and data areas. */
58126 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58127 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58128 dump.u_ssize = 0;
58129
58130 @@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58131 rlim = rlimit(RLIMIT_DATA);
58132 if (rlim >= RLIM_INFINITY)
58133 rlim = ~0;
58134 +
58135 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58136 if (ex.a_data + ex.a_bss > rlim)
58137 return -ENOMEM;
58138
58139 @@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58140
58141 install_exec_creds(bprm);
58142
58143 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58144 + current->mm->pax_flags = 0UL;
58145 +#endif
58146 +
58147 +#ifdef CONFIG_PAX_PAGEEXEC
58148 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58149 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58150 +
58151 +#ifdef CONFIG_PAX_EMUTRAMP
58152 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58153 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58154 +#endif
58155 +
58156 +#ifdef CONFIG_PAX_MPROTECT
58157 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58158 + current->mm->pax_flags |= MF_PAX_MPROTECT;
58159 +#endif
58160 +
58161 + }
58162 +#endif
58163 +
58164 if (N_MAGIC(ex) == OMAGIC) {
58165 unsigned long text_addr, map_size;
58166 loff_t pos;
58167 @@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58168 return error;
58169
58170 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58171 - PROT_READ | PROT_WRITE | PROT_EXEC,
58172 + PROT_READ | PROT_WRITE,
58173 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58174 fd_offset + ex.a_text);
58175 if (error != N_DATADDR(ex))
58176 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58177 index d8fc060..cbd44d5 100644
58178 --- a/fs/binfmt_elf.c
58179 +++ b/fs/binfmt_elf.c
58180 @@ -34,6 +34,7 @@
58181 #include <linux/utsname.h>
58182 #include <linux/coredump.h>
58183 #include <linux/sched.h>
58184 +#include <linux/xattr.h>
58185 #include <asm/uaccess.h>
58186 #include <asm/param.h>
58187 #include <asm/page.h>
58188 @@ -47,7 +48,7 @@
58189
58190 static int load_elf_binary(struct linux_binprm *bprm);
58191 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58192 - int, int, unsigned long);
58193 + int, int, unsigned long) __intentional_overflow(-1);
58194
58195 #ifdef CONFIG_USELIB
58196 static int load_elf_library(struct file *);
58197 @@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58198 #define elf_core_dump NULL
58199 #endif
58200
58201 +#ifdef CONFIG_PAX_MPROTECT
58202 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58203 +#endif
58204 +
58205 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58206 +static void elf_handle_mmap(struct file *file);
58207 +#endif
58208 +
58209 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58210 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58211 #else
58212 @@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58213 .load_binary = load_elf_binary,
58214 .load_shlib = load_elf_library,
58215 .core_dump = elf_core_dump,
58216 +
58217 +#ifdef CONFIG_PAX_MPROTECT
58218 + .handle_mprotect= elf_handle_mprotect,
58219 +#endif
58220 +
58221 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58222 + .handle_mmap = elf_handle_mmap,
58223 +#endif
58224 +
58225 .min_coredump = ELF_EXEC_PAGESIZE,
58226 };
58227
58228 @@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58229
58230 static int set_brk(unsigned long start, unsigned long end)
58231 {
58232 + unsigned long e = end;
58233 +
58234 start = ELF_PAGEALIGN(start);
58235 end = ELF_PAGEALIGN(end);
58236 if (end > start) {
58237 @@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58238 if (BAD_ADDR(addr))
58239 return addr;
58240 }
58241 - current->mm->start_brk = current->mm->brk = end;
58242 + current->mm->start_brk = current->mm->brk = e;
58243 return 0;
58244 }
58245
58246 @@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58247 elf_addr_t __user *u_rand_bytes;
58248 const char *k_platform = ELF_PLATFORM;
58249 const char *k_base_platform = ELF_BASE_PLATFORM;
58250 - unsigned char k_rand_bytes[16];
58251 + u32 k_rand_bytes[4];
58252 int items;
58253 elf_addr_t *elf_info;
58254 int ei_index = 0;
58255 const struct cred *cred = current_cred();
58256 struct vm_area_struct *vma;
58257 + unsigned long saved_auxv[AT_VECTOR_SIZE];
58258
58259 /*
58260 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58261 @@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58262 * Generate 16 random bytes for userspace PRNG seeding.
58263 */
58264 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58265 - u_rand_bytes = (elf_addr_t __user *)
58266 - STACK_ALLOC(p, sizeof(k_rand_bytes));
58267 + prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58268 + prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58269 + prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58270 + prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58271 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
58272 + u_rand_bytes = (elf_addr_t __user *) p;
58273 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58274 return -EFAULT;
58275
58276 @@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58277 return -EFAULT;
58278 current->mm->env_end = p;
58279
58280 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58281 +
58282 /* Put the elf_info on the stack in the right place. */
58283 sp = (elf_addr_t __user *)envp + 1;
58284 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58285 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58286 return -EFAULT;
58287 return 0;
58288 }
58289 @@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
58290 an ELF header */
58291
58292 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58293 - struct file *interpreter, unsigned long *interp_map_addr,
58294 - unsigned long no_base)
58295 + struct file *interpreter, unsigned long no_base)
58296 {
58297 struct elf_phdr *elf_phdata;
58298 struct elf_phdr *eppnt;
58299 - unsigned long load_addr = 0;
58300 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58301 int load_addr_set = 0;
58302 unsigned long last_bss = 0, elf_bss = 0;
58303 - unsigned long error = ~0UL;
58304 + unsigned long error = -EINVAL;
58305 unsigned long total_size;
58306 int retval, i, size;
58307
58308 @@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58309 goto out_close;
58310 }
58311
58312 +#ifdef CONFIG_PAX_SEGMEXEC
58313 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58314 + pax_task_size = SEGMEXEC_TASK_SIZE;
58315 +#endif
58316 +
58317 eppnt = elf_phdata;
58318 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58319 if (eppnt->p_type == PT_LOAD) {
58320 @@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58321 map_addr = elf_map(interpreter, load_addr + vaddr,
58322 eppnt, elf_prot, elf_type, total_size);
58323 total_size = 0;
58324 - if (!*interp_map_addr)
58325 - *interp_map_addr = map_addr;
58326 error = map_addr;
58327 if (BAD_ADDR(map_addr))
58328 goto out_close;
58329 @@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58330 k = load_addr + eppnt->p_vaddr;
58331 if (BAD_ADDR(k) ||
58332 eppnt->p_filesz > eppnt->p_memsz ||
58333 - eppnt->p_memsz > TASK_SIZE ||
58334 - TASK_SIZE - eppnt->p_memsz < k) {
58335 + eppnt->p_memsz > pax_task_size ||
58336 + pax_task_size - eppnt->p_memsz < k) {
58337 error = -ENOMEM;
58338 goto out_close;
58339 }
58340 @@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58341 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58342
58343 /* Map the last of the bss segment */
58344 - error = vm_brk(elf_bss, last_bss - elf_bss);
58345 - if (BAD_ADDR(error))
58346 - goto out_close;
58347 + if (last_bss > elf_bss) {
58348 + error = vm_brk(elf_bss, last_bss - elf_bss);
58349 + if (BAD_ADDR(error))
58350 + goto out_close;
58351 + }
58352 }
58353
58354 error = load_addr;
58355 @@ -543,6 +574,336 @@ out:
58356 return error;
58357 }
58358
58359 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
58360 +#ifdef CONFIG_PAX_SOFTMODE
58361 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58362 +{
58363 + unsigned long pax_flags = 0UL;
58364 +
58365 +#ifdef CONFIG_PAX_PAGEEXEC
58366 + if (elf_phdata->p_flags & PF_PAGEEXEC)
58367 + pax_flags |= MF_PAX_PAGEEXEC;
58368 +#endif
58369 +
58370 +#ifdef CONFIG_PAX_SEGMEXEC
58371 + if (elf_phdata->p_flags & PF_SEGMEXEC)
58372 + pax_flags |= MF_PAX_SEGMEXEC;
58373 +#endif
58374 +
58375 +#ifdef CONFIG_PAX_EMUTRAMP
58376 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58377 + pax_flags |= MF_PAX_EMUTRAMP;
58378 +#endif
58379 +
58380 +#ifdef CONFIG_PAX_MPROTECT
58381 + if (elf_phdata->p_flags & PF_MPROTECT)
58382 + pax_flags |= MF_PAX_MPROTECT;
58383 +#endif
58384 +
58385 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58386 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
58387 + pax_flags |= MF_PAX_RANDMMAP;
58388 +#endif
58389 +
58390 + return pax_flags;
58391 +}
58392 +#endif
58393 +
58394 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
58395 +{
58396 + unsigned long pax_flags = 0UL;
58397 +
58398 +#ifdef CONFIG_PAX_PAGEEXEC
58399 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
58400 + pax_flags |= MF_PAX_PAGEEXEC;
58401 +#endif
58402 +
58403 +#ifdef CONFIG_PAX_SEGMEXEC
58404 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
58405 + pax_flags |= MF_PAX_SEGMEXEC;
58406 +#endif
58407 +
58408 +#ifdef CONFIG_PAX_EMUTRAMP
58409 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
58410 + pax_flags |= MF_PAX_EMUTRAMP;
58411 +#endif
58412 +
58413 +#ifdef CONFIG_PAX_MPROTECT
58414 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
58415 + pax_flags |= MF_PAX_MPROTECT;
58416 +#endif
58417 +
58418 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58419 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
58420 + pax_flags |= MF_PAX_RANDMMAP;
58421 +#endif
58422 +
58423 + return pax_flags;
58424 +}
58425 +#endif
58426 +
58427 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58428 +#ifdef CONFIG_PAX_SOFTMODE
58429 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
58430 +{
58431 + unsigned long pax_flags = 0UL;
58432 +
58433 +#ifdef CONFIG_PAX_PAGEEXEC
58434 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
58435 + pax_flags |= MF_PAX_PAGEEXEC;
58436 +#endif
58437 +
58438 +#ifdef CONFIG_PAX_SEGMEXEC
58439 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
58440 + pax_flags |= MF_PAX_SEGMEXEC;
58441 +#endif
58442 +
58443 +#ifdef CONFIG_PAX_EMUTRAMP
58444 + if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58445 + pax_flags |= MF_PAX_EMUTRAMP;
58446 +#endif
58447 +
58448 +#ifdef CONFIG_PAX_MPROTECT
58449 + if (pax_flags_softmode & MF_PAX_MPROTECT)
58450 + pax_flags |= MF_PAX_MPROTECT;
58451 +#endif
58452 +
58453 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58454 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
58455 + pax_flags |= MF_PAX_RANDMMAP;
58456 +#endif
58457 +
58458 + return pax_flags;
58459 +}
58460 +#endif
58461 +
58462 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
58463 +{
58464 + unsigned long pax_flags = 0UL;
58465 +
58466 +#ifdef CONFIG_PAX_PAGEEXEC
58467 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
58468 + pax_flags |= MF_PAX_PAGEEXEC;
58469 +#endif
58470 +
58471 +#ifdef CONFIG_PAX_SEGMEXEC
58472 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
58473 + pax_flags |= MF_PAX_SEGMEXEC;
58474 +#endif
58475 +
58476 +#ifdef CONFIG_PAX_EMUTRAMP
58477 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
58478 + pax_flags |= MF_PAX_EMUTRAMP;
58479 +#endif
58480 +
58481 +#ifdef CONFIG_PAX_MPROTECT
58482 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
58483 + pax_flags |= MF_PAX_MPROTECT;
58484 +#endif
58485 +
58486 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58487 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
58488 + pax_flags |= MF_PAX_RANDMMAP;
58489 +#endif
58490 +
58491 + return pax_flags;
58492 +}
58493 +#endif
58494 +
58495 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58496 +static unsigned long pax_parse_defaults(void)
58497 +{
58498 + unsigned long pax_flags = 0UL;
58499 +
58500 +#ifdef CONFIG_PAX_SOFTMODE
58501 + if (pax_softmode)
58502 + return pax_flags;
58503 +#endif
58504 +
58505 +#ifdef CONFIG_PAX_PAGEEXEC
58506 + pax_flags |= MF_PAX_PAGEEXEC;
58507 +#endif
58508 +
58509 +#ifdef CONFIG_PAX_SEGMEXEC
58510 + pax_flags |= MF_PAX_SEGMEXEC;
58511 +#endif
58512 +
58513 +#ifdef CONFIG_PAX_MPROTECT
58514 + pax_flags |= MF_PAX_MPROTECT;
58515 +#endif
58516 +
58517 +#ifdef CONFIG_PAX_RANDMMAP
58518 + if (randomize_va_space)
58519 + pax_flags |= MF_PAX_RANDMMAP;
58520 +#endif
58521 +
58522 + return pax_flags;
58523 +}
58524 +
58525 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
58526 +{
58527 + unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
58528 +
58529 +#ifdef CONFIG_PAX_EI_PAX
58530 +
58531 +#ifdef CONFIG_PAX_SOFTMODE
58532 + if (pax_softmode)
58533 + return pax_flags;
58534 +#endif
58535 +
58536 + pax_flags = 0UL;
58537 +
58538 +#ifdef CONFIG_PAX_PAGEEXEC
58539 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
58540 + pax_flags |= MF_PAX_PAGEEXEC;
58541 +#endif
58542 +
58543 +#ifdef CONFIG_PAX_SEGMEXEC
58544 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
58545 + pax_flags |= MF_PAX_SEGMEXEC;
58546 +#endif
58547 +
58548 +#ifdef CONFIG_PAX_EMUTRAMP
58549 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
58550 + pax_flags |= MF_PAX_EMUTRAMP;
58551 +#endif
58552 +
58553 +#ifdef CONFIG_PAX_MPROTECT
58554 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
58555 + pax_flags |= MF_PAX_MPROTECT;
58556 +#endif
58557 +
58558 +#ifdef CONFIG_PAX_ASLR
58559 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
58560 + pax_flags |= MF_PAX_RANDMMAP;
58561 +#endif
58562 +
58563 +#endif
58564 +
58565 + return pax_flags;
58566 +
58567 +}
58568 +
58569 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
58570 +{
58571 +
58572 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
58573 + unsigned long i;
58574 +
58575 + for (i = 0UL; i < elf_ex->e_phnum; i++)
58576 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
58577 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
58578 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
58579 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
58580 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
58581 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
58582 + return PAX_PARSE_FLAGS_FALLBACK;
58583 +
58584 +#ifdef CONFIG_PAX_SOFTMODE
58585 + if (pax_softmode)
58586 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
58587 + else
58588 +#endif
58589 +
58590 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
58591 + break;
58592 + }
58593 +#endif
58594 +
58595 + return PAX_PARSE_FLAGS_FALLBACK;
58596 +}
58597 +
58598 +static unsigned long pax_parse_xattr_pax(struct file * const file)
58599 +{
58600 +
58601 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58602 + ssize_t xattr_size, i;
58603 + unsigned char xattr_value[sizeof("pemrs") - 1];
58604 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
58605 +
58606 + xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
58607 + if (xattr_size < 0 || xattr_size > sizeof xattr_value)
58608 + return PAX_PARSE_FLAGS_FALLBACK;
58609 +
58610 + for (i = 0; i < xattr_size; i++)
58611 + switch (xattr_value[i]) {
58612 + default:
58613 + return PAX_PARSE_FLAGS_FALLBACK;
58614 +
58615 +#define parse_flag(option1, option2, flag) \
58616 + case option1: \
58617 + if (pax_flags_hardmode & MF_PAX_##flag) \
58618 + return PAX_PARSE_FLAGS_FALLBACK;\
58619 + pax_flags_hardmode |= MF_PAX_##flag; \
58620 + break; \
58621 + case option2: \
58622 + if (pax_flags_softmode & MF_PAX_##flag) \
58623 + return PAX_PARSE_FLAGS_FALLBACK;\
58624 + pax_flags_softmode |= MF_PAX_##flag; \
58625 + break;
58626 +
58627 + parse_flag('p', 'P', PAGEEXEC);
58628 + parse_flag('e', 'E', EMUTRAMP);
58629 + parse_flag('m', 'M', MPROTECT);
58630 + parse_flag('r', 'R', RANDMMAP);
58631 + parse_flag('s', 'S', SEGMEXEC);
58632 +
58633 +#undef parse_flag
58634 + }
58635 +
58636 + if (pax_flags_hardmode & pax_flags_softmode)
58637 + return PAX_PARSE_FLAGS_FALLBACK;
58638 +
58639 +#ifdef CONFIG_PAX_SOFTMODE
58640 + if (pax_softmode)
58641 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
58642 + else
58643 +#endif
58644 +
58645 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
58646 +#else
58647 + return PAX_PARSE_FLAGS_FALLBACK;
58648 +#endif
58649 +
58650 +}
58651 +
58652 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
58653 +{
58654 + unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
58655 +
58656 + pax_flags = pax_parse_defaults();
58657 + ei_pax_flags = pax_parse_ei_pax(elf_ex);
58658 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
58659 + xattr_pax_flags = pax_parse_xattr_pax(file);
58660 +
58661 + if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58662 + xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58663 + pt_pax_flags != xattr_pax_flags)
58664 + return -EINVAL;
58665 + if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58666 + pax_flags = xattr_pax_flags;
58667 + else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58668 + pax_flags = pt_pax_flags;
58669 + else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58670 + pax_flags = ei_pax_flags;
58671 +
58672 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
58673 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58674 + if ((__supported_pte_mask & _PAGE_NX))
58675 + pax_flags &= ~MF_PAX_SEGMEXEC;
58676 + else
58677 + pax_flags &= ~MF_PAX_PAGEEXEC;
58678 + }
58679 +#endif
58680 +
58681 + if (0 > pax_check_flags(&pax_flags))
58682 + return -EINVAL;
58683 +
58684 + current->mm->pax_flags = pax_flags;
58685 + return 0;
58686 +}
58687 +#endif
58688 +
58689 /*
58690 * These are the functions used to load ELF style executables and shared
58691 * libraries. There is no binary dependent code anywhere else.
58692 @@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
58693 {
58694 unsigned int random_variable = 0;
58695
58696 +#ifdef CONFIG_PAX_RANDUSTACK
58697 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
58698 + return stack_top - current->mm->delta_stack;
58699 +#endif
58700 +
58701 if ((current->flags & PF_RANDOMIZE) &&
58702 !(current->personality & ADDR_NO_RANDOMIZE)) {
58703 random_variable = get_random_int() & STACK_RND_MASK;
58704 @@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58705 unsigned long load_addr = 0, load_bias = 0;
58706 int load_addr_set = 0;
58707 char * elf_interpreter = NULL;
58708 - unsigned long error;
58709 + unsigned long error = 0;
58710 struct elf_phdr *elf_ppnt, *elf_phdata;
58711 unsigned long elf_bss, elf_brk;
58712 int retval, i;
58713 @@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58714 struct elfhdr elf_ex;
58715 struct elfhdr interp_elf_ex;
58716 } *loc;
58717 + unsigned long pax_task_size;
58718
58719 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
58720 if (!loc) {
58721 @@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
58722 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
58723 may depend on the personality. */
58724 SET_PERSONALITY(loc->elf_ex);
58725 +
58726 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58727 + current->mm->pax_flags = 0UL;
58728 +#endif
58729 +
58730 +#ifdef CONFIG_PAX_DLRESOLVE
58731 + current->mm->call_dl_resolve = 0UL;
58732 +#endif
58733 +
58734 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
58735 + current->mm->call_syscall = 0UL;
58736 +#endif
58737 +
58738 +#ifdef CONFIG_PAX_ASLR
58739 + current->mm->delta_mmap = 0UL;
58740 + current->mm->delta_stack = 0UL;
58741 +#endif
58742 +
58743 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58744 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
58745 + send_sig(SIGKILL, current, 0);
58746 + goto out_free_dentry;
58747 + }
58748 +#endif
58749 +
58750 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58751 + pax_set_initial_flags(bprm);
58752 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
58753 + if (pax_set_initial_flags_func)
58754 + (pax_set_initial_flags_func)(bprm);
58755 +#endif
58756 +
58757 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58758 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
58759 + current->mm->context.user_cs_limit = PAGE_SIZE;
58760 + current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
58761 + }
58762 +#endif
58763 +
58764 +#ifdef CONFIG_PAX_SEGMEXEC
58765 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
58766 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
58767 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
58768 + pax_task_size = SEGMEXEC_TASK_SIZE;
58769 + current->mm->def_flags |= VM_NOHUGEPAGE;
58770 + } else
58771 +#endif
58772 +
58773 + pax_task_size = TASK_SIZE;
58774 +
58775 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
58776 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58777 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
58778 + put_cpu();
58779 + }
58780 +#endif
58781 +
58782 +#ifdef CONFIG_PAX_ASLR
58783 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58784 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
58785 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
58786 + }
58787 +#endif
58788 +
58789 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58790 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58791 + executable_stack = EXSTACK_DISABLE_X;
58792 + current->personality &= ~READ_IMPLIES_EXEC;
58793 + } else
58794 +#endif
58795 +
58796 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
58797 current->personality |= READ_IMPLIES_EXEC;
58798
58799 @@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
58800 #else
58801 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
58802 #endif
58803 +
58804 +#ifdef CONFIG_PAX_RANDMMAP
58805 + /* PaX: randomize base address at the default exe base if requested */
58806 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
58807 +#ifdef CONFIG_SPARC64
58808 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
58809 +#else
58810 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
58811 +#endif
58812 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
58813 + elf_flags |= MAP_FIXED;
58814 + }
58815 +#endif
58816 +
58817 }
58818
58819 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
58820 @@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
58821 * allowed task size. Note that p_filesz must always be
58822 * <= p_memsz so it is only necessary to check p_memsz.
58823 */
58824 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58825 - elf_ppnt->p_memsz > TASK_SIZE ||
58826 - TASK_SIZE - elf_ppnt->p_memsz < k) {
58827 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58828 + elf_ppnt->p_memsz > pax_task_size ||
58829 + pax_task_size - elf_ppnt->p_memsz < k) {
58830 /* set_brk can never work. Avoid overflows. */
58831 retval = -EINVAL;
58832 goto out_free_dentry;
58833 @@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
58834 if (retval)
58835 goto out_free_dentry;
58836 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
58837 - retval = -EFAULT; /* Nobody gets to see this, but.. */
58838 - goto out_free_dentry;
58839 + /*
58840 + * This bss-zeroing can fail if the ELF
58841 + * file specifies odd protections. So
58842 + * we don't check the return value
58843 + */
58844 }
58845
58846 +#ifdef CONFIG_PAX_RANDMMAP
58847 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58848 + unsigned long start, size, flags;
58849 + vm_flags_t vm_flags;
58850 +
58851 + start = ELF_PAGEALIGN(elf_brk);
58852 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
58853 + flags = MAP_FIXED | MAP_PRIVATE;
58854 + vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
58855 +
58856 + down_write(&current->mm->mmap_sem);
58857 + start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
58858 + retval = -ENOMEM;
58859 + if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
58860 +// if (current->personality & ADDR_NO_RANDOMIZE)
58861 +// vm_flags |= VM_READ | VM_MAYREAD;
58862 + start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
58863 + retval = IS_ERR_VALUE(start) ? start : 0;
58864 + }
58865 + up_write(&current->mm->mmap_sem);
58866 + if (retval == 0)
58867 + retval = set_brk(start + size, start + size + PAGE_SIZE);
58868 + if (retval < 0)
58869 + goto out_free_dentry;
58870 + }
58871 +#endif
58872 +
58873 if (elf_interpreter) {
58874 - unsigned long interp_map_addr = 0;
58875 -
58876 elf_entry = load_elf_interp(&loc->interp_elf_ex,
58877 interpreter,
58878 - &interp_map_addr,
58879 load_bias);
58880 if (!IS_ERR((void *)elf_entry)) {
58881 /*
58882 @@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
58883 * Decide what to dump of a segment, part, all or none.
58884 */
58885 static unsigned long vma_dump_size(struct vm_area_struct *vma,
58886 - unsigned long mm_flags)
58887 + unsigned long mm_flags, long signr)
58888 {
58889 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
58890
58891 @@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
58892 if (vma->vm_file == NULL)
58893 return 0;
58894
58895 - if (FILTER(MAPPED_PRIVATE))
58896 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
58897 goto whole;
58898
58899 /*
58900 @@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
58901 {
58902 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
58903 int i = 0;
58904 - do
58905 + do {
58906 i += 2;
58907 - while (auxv[i - 2] != AT_NULL);
58908 + } while (auxv[i - 2] != AT_NULL);
58909 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
58910 }
58911
58912 @@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
58913 {
58914 mm_segment_t old_fs = get_fs();
58915 set_fs(KERNEL_DS);
58916 - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
58917 + copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
58918 set_fs(old_fs);
58919 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
58920 }
58921 @@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
58922 }
58923
58924 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
58925 - unsigned long mm_flags)
58926 + struct coredump_params *cprm)
58927 {
58928 struct vm_area_struct *vma;
58929 size_t size = 0;
58930
58931 for (vma = first_vma(current, gate_vma); vma != NULL;
58932 vma = next_vma(vma, gate_vma))
58933 - size += vma_dump_size(vma, mm_flags);
58934 + size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
58935 return size;
58936 }
58937
58938 @@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
58939
58940 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
58941
58942 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
58943 + offset += elf_core_vma_data_size(gate_vma, cprm);
58944 offset += elf_core_extra_data_size();
58945 e_shoff = offset;
58946
58947 @@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
58948 phdr.p_offset = offset;
58949 phdr.p_vaddr = vma->vm_start;
58950 phdr.p_paddr = 0;
58951 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
58952 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
58953 phdr.p_memsz = vma->vm_end - vma->vm_start;
58954 offset += phdr.p_filesz;
58955 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
58956 @@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
58957 unsigned long addr;
58958 unsigned long end;
58959
58960 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
58961 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
58962
58963 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
58964 struct page *page;
58965 @@ -2195,6 +2674,167 @@ out:
58966
58967 #endif /* CONFIG_ELF_CORE */
58968
58969 +#ifdef CONFIG_PAX_MPROTECT
58970 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
58971 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
58972 + * we'll remove VM_MAYWRITE for good on RELRO segments.
58973 + *
58974 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
58975 + * basis because we want to allow the common case and not the special ones.
58976 + */
58977 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
58978 +{
58979 + struct elfhdr elf_h;
58980 + struct elf_phdr elf_p;
58981 + unsigned long i;
58982 + unsigned long oldflags;
58983 + bool is_textrel_rw, is_textrel_rx, is_relro;
58984 +
58985 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
58986 + return;
58987 +
58988 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
58989 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
58990 +
58991 +#ifdef CONFIG_PAX_ELFRELOCS
58992 + /* possible TEXTREL */
58993 + is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
58994 + is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
58995 +#else
58996 + is_textrel_rw = false;
58997 + is_textrel_rx = false;
58998 +#endif
58999 +
59000 + /* possible RELRO */
59001 + is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59002 +
59003 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59004 + return;
59005 +
59006 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59007 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59008 +
59009 +#ifdef CONFIG_PAX_ETEXECRELOCS
59010 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59011 +#else
59012 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59013 +#endif
59014 +
59015 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59016 + !elf_check_arch(&elf_h) ||
59017 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59018 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59019 + return;
59020 +
59021 + for (i = 0UL; i < elf_h.e_phnum; i++) {
59022 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59023 + return;
59024 + switch (elf_p.p_type) {
59025 + case PT_DYNAMIC:
59026 + if (!is_textrel_rw && !is_textrel_rx)
59027 + continue;
59028 + i = 0UL;
59029 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59030 + elf_dyn dyn;
59031 +
59032 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59033 + break;
59034 + if (dyn.d_tag == DT_NULL)
59035 + break;
59036 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59037 + gr_log_textrel(vma);
59038 + if (is_textrel_rw)
59039 + vma->vm_flags |= VM_MAYWRITE;
59040 + else
59041 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59042 + vma->vm_flags &= ~VM_MAYWRITE;
59043 + break;
59044 + }
59045 + i++;
59046 + }
59047 + is_textrel_rw = false;
59048 + is_textrel_rx = false;
59049 + continue;
59050 +
59051 + case PT_GNU_RELRO:
59052 + if (!is_relro)
59053 + continue;
59054 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59055 + vma->vm_flags &= ~VM_MAYWRITE;
59056 + is_relro = false;
59057 + continue;
59058 +
59059 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
59060 + case PT_PAX_FLAGS: {
59061 + const char *msg_mprotect = "", *msg_emutramp = "";
59062 + char *buffer_lib, *buffer_exe;
59063 +
59064 + if (elf_p.p_flags & PF_NOMPROTECT)
59065 + msg_mprotect = "MPROTECT disabled";
59066 +
59067 +#ifdef CONFIG_PAX_EMUTRAMP
59068 + if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59069 + msg_emutramp = "EMUTRAMP enabled";
59070 +#endif
59071 +
59072 + if (!msg_mprotect[0] && !msg_emutramp[0])
59073 + continue;
59074 +
59075 + if (!printk_ratelimit())
59076 + continue;
59077 +
59078 + buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59079 + buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59080 + if (buffer_lib && buffer_exe) {
59081 + char *path_lib, *path_exe;
59082 +
59083 + path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59084 + path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59085 +
59086 + pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59087 + (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59088 +
59089 + }
59090 + free_page((unsigned long)buffer_exe);
59091 + free_page((unsigned long)buffer_lib);
59092 + continue;
59093 + }
59094 +#endif
59095 +
59096 + }
59097 + }
59098 +}
59099 +#endif
59100 +
59101 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59102 +
59103 +extern int grsec_enable_log_rwxmaps;
59104 +
59105 +static void elf_handle_mmap(struct file *file)
59106 +{
59107 + struct elfhdr elf_h;
59108 + struct elf_phdr elf_p;
59109 + unsigned long i;
59110 +
59111 + if (!grsec_enable_log_rwxmaps)
59112 + return;
59113 +
59114 + if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59115 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59116 + (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59117 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59118 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59119 + return;
59120 +
59121 + for (i = 0UL; i < elf_h.e_phnum; i++) {
59122 + if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59123 + return;
59124 + if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59125 + gr_log_ptgnustack(file);
59126 + }
59127 +}
59128 +#endif
59129 +
59130 static int __init init_elf_binfmt(void)
59131 {
59132 register_binfmt(&elf_format);
59133 diff --git a/fs/block_dev.c b/fs/block_dev.c
59134 index 1d9c9f3..2905786 100644
59135 --- a/fs/block_dev.c
59136 +++ b/fs/block_dev.c
59137 @@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59138 else if (bdev->bd_contains == bdev)
59139 return true; /* is a whole device which isn't held */
59140
59141 - else if (whole->bd_holder == bd_may_claim)
59142 + else if (whole->bd_holder == (void *)bd_may_claim)
59143 return true; /* is a partition of a device that is being partitioned */
59144 else if (whole->bd_holder != NULL)
59145 return false; /* is a partition of a held device */
59146 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59147 index 150822e..75bb326 100644
59148 --- a/fs/btrfs/ctree.c
59149 +++ b/fs/btrfs/ctree.c
59150 @@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59151 free_extent_buffer(buf);
59152 add_root_to_dirty_list(root);
59153 } else {
59154 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59155 - parent_start = parent->start;
59156 - else
59157 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59158 + if (parent)
59159 + parent_start = parent->start;
59160 + else
59161 + parent_start = 0;
59162 + } else
59163 parent_start = 0;
59164
59165 WARN_ON(trans->transid != btrfs_header_generation(parent));
59166 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59167 index 054577b..9b342cc 100644
59168 --- a/fs/btrfs/delayed-inode.c
59169 +++ b/fs/btrfs/delayed-inode.c
59170 @@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59171
59172 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59173 {
59174 - int seq = atomic_inc_return(&delayed_root->items_seq);
59175 + int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59176 if ((atomic_dec_return(&delayed_root->items) <
59177 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59178 waitqueue_active(&delayed_root->wait))
59179 @@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59180
59181 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59182 {
59183 - int val = atomic_read(&delayed_root->items_seq);
59184 + int val = atomic_read_unchecked(&delayed_root->items_seq);
59185
59186 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59187 return 1;
59188 @@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59189 int seq;
59190 int ret;
59191
59192 - seq = atomic_read(&delayed_root->items_seq);
59193 + seq = atomic_read_unchecked(&delayed_root->items_seq);
59194
59195 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59196 if (ret)
59197 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59198 index f70119f..ab5894d 100644
59199 --- a/fs/btrfs/delayed-inode.h
59200 +++ b/fs/btrfs/delayed-inode.h
59201 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59202 */
59203 struct list_head prepare_list;
59204 atomic_t items; /* for delayed items */
59205 - atomic_t items_seq; /* for delayed items */
59206 + atomic_unchecked_t items_seq; /* for delayed items */
59207 int nodes; /* for delayed nodes */
59208 wait_queue_head_t wait;
59209 };
59210 @@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59211 struct btrfs_delayed_root *delayed_root)
59212 {
59213 atomic_set(&delayed_root->items, 0);
59214 - atomic_set(&delayed_root->items_seq, 0);
59215 + atomic_set_unchecked(&delayed_root->items_seq, 0);
59216 delayed_root->nodes = 0;
59217 spin_lock_init(&delayed_root->lock);
59218 init_waitqueue_head(&delayed_root->wait);
59219 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
59220 index 4399f0c..a34d8b4 100644
59221 --- a/fs/btrfs/ioctl.c
59222 +++ b/fs/btrfs/ioctl.c
59223 @@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59224 for (i = 0; i < num_types; i++) {
59225 struct btrfs_space_info *tmp;
59226
59227 + /* Don't copy in more than we allocated */
59228 if (!slot_count)
59229 break;
59230
59231 + slot_count--;
59232 +
59233 info = NULL;
59234 rcu_read_lock();
59235 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
59236 @@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59237 memcpy(dest, &space, sizeof(space));
59238 dest++;
59239 space_args.total_spaces++;
59240 - slot_count--;
59241 }
59242 - if (!slot_count)
59243 - break;
59244 }
59245 up_read(&info->groups_sem);
59246 }
59247 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59248 index cde9c03..ad4d4db 100644
59249 --- a/fs/btrfs/super.c
59250 +++ b/fs/btrfs/super.c
59251 @@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59252 function, line, errstr);
59253 return;
59254 }
59255 - ACCESS_ONCE(trans->transaction->aborted) = errno;
59256 + ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59257 /* Wake up anybody who may be waiting on this transaction */
59258 wake_up(&root->fs_info->transaction_wait);
59259 wake_up(&root->fs_info->transaction_blocked_wait);
59260 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59261 index b2e7bb4..3719201 100644
59262 --- a/fs/btrfs/sysfs.c
59263 +++ b/fs/btrfs/sysfs.c
59264 @@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59265 for (set = 0; set < FEAT_MAX; set++) {
59266 int i;
59267 struct attribute *attrs[2];
59268 - struct attribute_group agroup = {
59269 + attribute_group_no_const agroup = {
59270 .name = "features",
59271 .attrs = attrs,
59272 };
59273 diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59274 index 2299bfd..4098e72 100644
59275 --- a/fs/btrfs/tests/free-space-tests.c
59276 +++ b/fs/btrfs/tests/free-space-tests.c
59277 @@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59278 * extent entry.
59279 */
59280 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59281 - cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59282 + pax_open_kernel();
59283 + *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59284 + pax_close_kernel();
59285
59286 /*
59287 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59288 @@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59289 if (ret)
59290 return ret;
59291
59292 - cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59293 + pax_open_kernel();
59294 + *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59295 + pax_close_kernel();
59296 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59297
59298 return 0;
59299 diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59300 index 154990c..d0cf699 100644
59301 --- a/fs/btrfs/tree-log.h
59302 +++ b/fs/btrfs/tree-log.h
59303 @@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59304 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59305 struct btrfs_trans_handle *trans)
59306 {
59307 - ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59308 + ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59309 }
59310
59311 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59312 diff --git a/fs/buffer.c b/fs/buffer.c
59313 index 20805db..2e8fc69 100644
59314 --- a/fs/buffer.c
59315 +++ b/fs/buffer.c
59316 @@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59317 bh_cachep = kmem_cache_create("buffer_head",
59318 sizeof(struct buffer_head), 0,
59319 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59320 - SLAB_MEM_SPREAD),
59321 + SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59322 NULL);
59323
59324 /*
59325 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59326 index fbb08e9..0fda764 100644
59327 --- a/fs/cachefiles/bind.c
59328 +++ b/fs/cachefiles/bind.c
59329 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59330 args);
59331
59332 /* start by checking things over */
59333 - ASSERT(cache->fstop_percent >= 0 &&
59334 - cache->fstop_percent < cache->fcull_percent &&
59335 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
59336 cache->fcull_percent < cache->frun_percent &&
59337 cache->frun_percent < 100);
59338
59339 - ASSERT(cache->bstop_percent >= 0 &&
59340 - cache->bstop_percent < cache->bcull_percent &&
59341 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
59342 cache->bcull_percent < cache->brun_percent &&
59343 cache->brun_percent < 100);
59344
59345 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59346 index ce1b115..4a6852c 100644
59347 --- a/fs/cachefiles/daemon.c
59348 +++ b/fs/cachefiles/daemon.c
59349 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59350 if (n > buflen)
59351 return -EMSGSIZE;
59352
59353 - if (copy_to_user(_buffer, buffer, n) != 0)
59354 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59355 return -EFAULT;
59356
59357 return n;
59358 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59359 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59360 return -EIO;
59361
59362 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
59363 + if (datalen > PAGE_SIZE - 1)
59364 return -EOPNOTSUPP;
59365
59366 /* drag the command string into the kernel so we can parse it */
59367 @@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59368 if (args[0] != '%' || args[1] != '\0')
59369 return -EINVAL;
59370
59371 - if (fstop < 0 || fstop >= cache->fcull_percent)
59372 + if (fstop >= cache->fcull_percent)
59373 return cachefiles_daemon_range_error(cache, args);
59374
59375 cache->fstop_percent = fstop;
59376 @@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59377 if (args[0] != '%' || args[1] != '\0')
59378 return -EINVAL;
59379
59380 - if (bstop < 0 || bstop >= cache->bcull_percent)
59381 + if (bstop >= cache->bcull_percent)
59382 return cachefiles_daemon_range_error(cache, args);
59383
59384 cache->bstop_percent = bstop;
59385 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59386 index 8c52472..c4e3a69 100644
59387 --- a/fs/cachefiles/internal.h
59388 +++ b/fs/cachefiles/internal.h
59389 @@ -66,7 +66,7 @@ struct cachefiles_cache {
59390 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59391 struct rb_root active_nodes; /* active nodes (can't be culled) */
59392 rwlock_t active_lock; /* lock for active_nodes */
59393 - atomic_t gravecounter; /* graveyard uniquifier */
59394 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59395 unsigned frun_percent; /* when to stop culling (% files) */
59396 unsigned fcull_percent; /* when to start culling (% files) */
59397 unsigned fstop_percent; /* when to stop allocating (% files) */
59398 @@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59399 * proc.c
59400 */
59401 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59402 -extern atomic_t cachefiles_lookup_histogram[HZ];
59403 -extern atomic_t cachefiles_mkdir_histogram[HZ];
59404 -extern atomic_t cachefiles_create_histogram[HZ];
59405 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59406 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59407 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59408
59409 extern int __init cachefiles_proc_init(void);
59410 extern void cachefiles_proc_cleanup(void);
59411 static inline
59412 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59413 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59414 {
59415 unsigned long jif = jiffies - start_jif;
59416 if (jif >= HZ)
59417 jif = HZ - 1;
59418 - atomic_inc(&histogram[jif]);
59419 + atomic_inc_unchecked(&histogram[jif]);
59420 }
59421
59422 #else
59423 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59424 index e12f189..ed17244 100644
59425 --- a/fs/cachefiles/namei.c
59426 +++ b/fs/cachefiles/namei.c
59427 @@ -312,7 +312,7 @@ try_again:
59428 /* first step is to make up a grave dentry in the graveyard */
59429 sprintf(nbuffer, "%08x%08x",
59430 (uint32_t) get_seconds(),
59431 - (uint32_t) atomic_inc_return(&cache->gravecounter));
59432 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59433
59434 /* do the multiway lock magic */
59435 trap = lock_rename(cache->graveyard, dir);
59436 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59437 index eccd339..4c1d995 100644
59438 --- a/fs/cachefiles/proc.c
59439 +++ b/fs/cachefiles/proc.c
59440 @@ -14,9 +14,9 @@
59441 #include <linux/seq_file.h>
59442 #include "internal.h"
59443
59444 -atomic_t cachefiles_lookup_histogram[HZ];
59445 -atomic_t cachefiles_mkdir_histogram[HZ];
59446 -atomic_t cachefiles_create_histogram[HZ];
59447 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59448 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59449 +atomic_unchecked_t cachefiles_create_histogram[HZ];
59450
59451 /*
59452 * display the latency histogram
59453 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
59454 return 0;
59455 default:
59456 index = (unsigned long) v - 3;
59457 - x = atomic_read(&cachefiles_lookup_histogram[index]);
59458 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
59459 - z = atomic_read(&cachefiles_create_histogram[index]);
59460 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
59461 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
59462 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
59463 if (x == 0 && y == 0 && z == 0)
59464 return 0;
59465
59466 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
59467 index 695e788..f4a9d4d 100644
59468 --- a/fs/ceph/dir.c
59469 +++ b/fs/ceph/dir.c
59470 @@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
59471 struct dentry *dentry, *last;
59472 struct ceph_dentry_info *di;
59473 int err = 0;
59474 + char d_name[DNAME_INLINE_LEN];
59475 + const unsigned char *name;
59476
59477 /* claim ref on last dentry we returned */
59478 last = fi->dentry;
59479 @@ -192,7 +194,12 @@ more:
59480
59481 dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
59482 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
59483 - if (!dir_emit(ctx, dentry->d_name.name,
59484 + name = dentry->d_name.name;
59485 + if (name == dentry->d_iname) {
59486 + memcpy(d_name, name, dentry->d_name.len);
59487 + name = d_name;
59488 + }
59489 + if (!dir_emit(ctx, name,
59490 dentry->d_name.len,
59491 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
59492 dentry->d_inode->i_mode >> 12)) {
59493 @@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
59494 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
59495 struct ceph_mds_client *mdsc = fsc->mdsc;
59496 unsigned frag = fpos_frag(ctx->pos);
59497 - int off = fpos_off(ctx->pos);
59498 + unsigned int off = fpos_off(ctx->pos);
59499 int err;
59500 u32 ftype;
59501 struct ceph_mds_reply_info_parsed *rinfo;
59502 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
59503 index f6e1237..796ffd1 100644
59504 --- a/fs/ceph/super.c
59505 +++ b/fs/ceph/super.c
59506 @@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
59507 /*
59508 * construct our own bdi so we can control readahead, etc.
59509 */
59510 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
59511 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
59512
59513 static int ceph_register_bdi(struct super_block *sb,
59514 struct ceph_fs_client *fsc)
59515 @@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
59516 default_backing_dev_info.ra_pages;
59517
59518 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
59519 - atomic_long_inc_return(&bdi_seq));
59520 + atomic_long_inc_return_unchecked(&bdi_seq));
59521 if (!err)
59522 sb->s_bdi = &fsc->backing_dev_info;
59523 return err;
59524 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
59525 index 44ec726..bcb06a3 100644
59526 --- a/fs/cifs/cifs_debug.c
59527 +++ b/fs/cifs/cifs_debug.c
59528 @@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59529
59530 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
59531 #ifdef CONFIG_CIFS_STATS2
59532 - atomic_set(&totBufAllocCount, 0);
59533 - atomic_set(&totSmBufAllocCount, 0);
59534 + atomic_set_unchecked(&totBufAllocCount, 0);
59535 + atomic_set_unchecked(&totSmBufAllocCount, 0);
59536 #endif /* CONFIG_CIFS_STATS2 */
59537 spin_lock(&cifs_tcp_ses_lock);
59538 list_for_each(tmp1, &cifs_tcp_ses_list) {
59539 @@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59540 tcon = list_entry(tmp3,
59541 struct cifs_tcon,
59542 tcon_list);
59543 - atomic_set(&tcon->num_smbs_sent, 0);
59544 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
59545 if (server->ops->clear_stats)
59546 server->ops->clear_stats(tcon);
59547 }
59548 @@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59549 smBufAllocCount.counter, cifs_min_small);
59550 #ifdef CONFIG_CIFS_STATS2
59551 seq_printf(m, "Total Large %d Small %d Allocations\n",
59552 - atomic_read(&totBufAllocCount),
59553 - atomic_read(&totSmBufAllocCount));
59554 + atomic_read_unchecked(&totBufAllocCount),
59555 + atomic_read_unchecked(&totSmBufAllocCount));
59556 #endif /* CONFIG_CIFS_STATS2 */
59557
59558 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
59559 @@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59560 if (tcon->need_reconnect)
59561 seq_puts(m, "\tDISCONNECTED ");
59562 seq_printf(m, "\nSMBs: %d",
59563 - atomic_read(&tcon->num_smbs_sent));
59564 + atomic_read_unchecked(&tcon->num_smbs_sent));
59565 if (server->ops->print_stats)
59566 server->ops->print_stats(m, tcon);
59567 }
59568 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
59569 index 9d7996e..35ad5cf4 100644
59570 --- a/fs/cifs/cifsfs.c
59571 +++ b/fs/cifs/cifsfs.c
59572 @@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
59573 */
59574 cifs_req_cachep = kmem_cache_create("cifs_request",
59575 CIFSMaxBufSize + max_hdr_size, 0,
59576 - SLAB_HWCACHE_ALIGN, NULL);
59577 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
59578 if (cifs_req_cachep == NULL)
59579 return -ENOMEM;
59580
59581 @@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
59582 efficient to alloc 1 per page off the slab compared to 17K (5page)
59583 alloc of large cifs buffers even when page debugging is on */
59584 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
59585 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
59586 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
59587 NULL);
59588 if (cifs_sm_req_cachep == NULL) {
59589 mempool_destroy(cifs_req_poolp);
59590 @@ -1205,8 +1205,8 @@ init_cifs(void)
59591 atomic_set(&bufAllocCount, 0);
59592 atomic_set(&smBufAllocCount, 0);
59593 #ifdef CONFIG_CIFS_STATS2
59594 - atomic_set(&totBufAllocCount, 0);
59595 - atomic_set(&totSmBufAllocCount, 0);
59596 + atomic_set_unchecked(&totBufAllocCount, 0);
59597 + atomic_set_unchecked(&totSmBufAllocCount, 0);
59598 #endif /* CONFIG_CIFS_STATS2 */
59599
59600 atomic_set(&midCount, 0);
59601 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
59602 index 02a33e5..3a28b5a 100644
59603 --- a/fs/cifs/cifsglob.h
59604 +++ b/fs/cifs/cifsglob.h
59605 @@ -823,35 +823,35 @@ struct cifs_tcon {
59606 __u16 Flags; /* optional support bits */
59607 enum statusEnum tidStatus;
59608 #ifdef CONFIG_CIFS_STATS
59609 - atomic_t num_smbs_sent;
59610 + atomic_unchecked_t num_smbs_sent;
59611 union {
59612 struct {
59613 - atomic_t num_writes;
59614 - atomic_t num_reads;
59615 - atomic_t num_flushes;
59616 - atomic_t num_oplock_brks;
59617 - atomic_t num_opens;
59618 - atomic_t num_closes;
59619 - atomic_t num_deletes;
59620 - atomic_t num_mkdirs;
59621 - atomic_t num_posixopens;
59622 - atomic_t num_posixmkdirs;
59623 - atomic_t num_rmdirs;
59624 - atomic_t num_renames;
59625 - atomic_t num_t2renames;
59626 - atomic_t num_ffirst;
59627 - atomic_t num_fnext;
59628 - atomic_t num_fclose;
59629 - atomic_t num_hardlinks;
59630 - atomic_t num_symlinks;
59631 - atomic_t num_locks;
59632 - atomic_t num_acl_get;
59633 - atomic_t num_acl_set;
59634 + atomic_unchecked_t num_writes;
59635 + atomic_unchecked_t num_reads;
59636 + atomic_unchecked_t num_flushes;
59637 + atomic_unchecked_t num_oplock_brks;
59638 + atomic_unchecked_t num_opens;
59639 + atomic_unchecked_t num_closes;
59640 + atomic_unchecked_t num_deletes;
59641 + atomic_unchecked_t num_mkdirs;
59642 + atomic_unchecked_t num_posixopens;
59643 + atomic_unchecked_t num_posixmkdirs;
59644 + atomic_unchecked_t num_rmdirs;
59645 + atomic_unchecked_t num_renames;
59646 + atomic_unchecked_t num_t2renames;
59647 + atomic_unchecked_t num_ffirst;
59648 + atomic_unchecked_t num_fnext;
59649 + atomic_unchecked_t num_fclose;
59650 + atomic_unchecked_t num_hardlinks;
59651 + atomic_unchecked_t num_symlinks;
59652 + atomic_unchecked_t num_locks;
59653 + atomic_unchecked_t num_acl_get;
59654 + atomic_unchecked_t num_acl_set;
59655 } cifs_stats;
59656 #ifdef CONFIG_CIFS_SMB2
59657 struct {
59658 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59659 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59660 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59661 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59662 } smb2_stats;
59663 #endif /* CONFIG_CIFS_SMB2 */
59664 } stats;
59665 @@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
59666 }
59667
59668 #ifdef CONFIG_CIFS_STATS
59669 -#define cifs_stats_inc atomic_inc
59670 +#define cifs_stats_inc atomic_inc_unchecked
59671
59672 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
59673 unsigned int bytes)
59674 @@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
59675 /* Various Debug counters */
59676 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
59677 #ifdef CONFIG_CIFS_STATS2
59678 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
59679 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
59680 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
59681 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
59682 #endif
59683 GLOBAL_EXTERN atomic_t smBufAllocCount;
59684 GLOBAL_EXTERN atomic_t midCount;
59685 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
59686 index 3e4d00a..38a122d 100644
59687 --- a/fs/cifs/file.c
59688 +++ b/fs/cifs/file.c
59689 @@ -2056,10 +2056,14 @@ static int cifs_writepages(struct address_space *mapping,
59690 index = mapping->writeback_index; /* Start from prev offset */
59691 end = -1;
59692 } else {
59693 - index = wbc->range_start >> PAGE_CACHE_SHIFT;
59694 - end = wbc->range_end >> PAGE_CACHE_SHIFT;
59695 - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
59696 + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
59697 range_whole = true;
59698 + index = 0;
59699 + end = ULONG_MAX;
59700 + } else {
59701 + index = wbc->range_start >> PAGE_CACHE_SHIFT;
59702 + end = wbc->range_end >> PAGE_CACHE_SHIFT;
59703 + }
59704 scanned = true;
59705 }
59706 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
59707 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
59708 index b7415d5..3984ec0 100644
59709 --- a/fs/cifs/misc.c
59710 +++ b/fs/cifs/misc.c
59711 @@ -170,7 +170,7 @@ cifs_buf_get(void)
59712 memset(ret_buf, 0, buf_size + 3);
59713 atomic_inc(&bufAllocCount);
59714 #ifdef CONFIG_CIFS_STATS2
59715 - atomic_inc(&totBufAllocCount);
59716 + atomic_inc_unchecked(&totBufAllocCount);
59717 #endif /* CONFIG_CIFS_STATS2 */
59718 }
59719
59720 @@ -205,7 +205,7 @@ cifs_small_buf_get(void)
59721 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
59722 atomic_inc(&smBufAllocCount);
59723 #ifdef CONFIG_CIFS_STATS2
59724 - atomic_inc(&totSmBufAllocCount);
59725 + atomic_inc_unchecked(&totSmBufAllocCount);
59726 #endif /* CONFIG_CIFS_STATS2 */
59727
59728 }
59729 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
59730 index d297903..1cb7516 100644
59731 --- a/fs/cifs/smb1ops.c
59732 +++ b/fs/cifs/smb1ops.c
59733 @@ -622,27 +622,27 @@ static void
59734 cifs_clear_stats(struct cifs_tcon *tcon)
59735 {
59736 #ifdef CONFIG_CIFS_STATS
59737 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
59738 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
59739 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
59740 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59741 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
59742 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
59743 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59744 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
59745 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
59746 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
59747 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
59748 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
59749 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
59750 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
59751 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
59752 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
59753 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
59754 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
59755 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
59756 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
59757 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
59758 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
59759 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
59760 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
59761 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59762 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
59763 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
59764 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59765 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
59766 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
59767 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
59768 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
59769 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
59770 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
59771 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
59772 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
59773 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
59774 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
59775 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
59776 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
59777 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
59778 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
59779 #endif
59780 }
59781
59782 @@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59783 {
59784 #ifdef CONFIG_CIFS_STATS
59785 seq_printf(m, " Oplocks breaks: %d",
59786 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
59787 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
59788 seq_printf(m, "\nReads: %d Bytes: %llu",
59789 - atomic_read(&tcon->stats.cifs_stats.num_reads),
59790 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
59791 (long long)(tcon->bytes_read));
59792 seq_printf(m, "\nWrites: %d Bytes: %llu",
59793 - atomic_read(&tcon->stats.cifs_stats.num_writes),
59794 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
59795 (long long)(tcon->bytes_written));
59796 seq_printf(m, "\nFlushes: %d",
59797 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
59798 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
59799 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
59800 - atomic_read(&tcon->stats.cifs_stats.num_locks),
59801 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
59802 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
59803 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
59804 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
59805 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
59806 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
59807 - atomic_read(&tcon->stats.cifs_stats.num_opens),
59808 - atomic_read(&tcon->stats.cifs_stats.num_closes),
59809 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
59810 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
59811 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
59812 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
59813 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
59814 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
59815 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
59816 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
59817 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
59818 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
59819 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
59820 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
59821 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
59822 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
59823 seq_printf(m, "\nRenames: %d T2 Renames %d",
59824 - atomic_read(&tcon->stats.cifs_stats.num_renames),
59825 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
59826 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
59827 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
59828 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
59829 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
59830 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
59831 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
59832 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
59833 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
59834 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
59835 #endif
59836 }
59837
59838 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
59839 index c5f521b..1a40865 100644
59840 --- a/fs/cifs/smb2ops.c
59841 +++ b/fs/cifs/smb2ops.c
59842 @@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
59843 #ifdef CONFIG_CIFS_STATS
59844 int i;
59845 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
59846 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59847 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59848 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59849 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59850 }
59851 #endif
59852 }
59853 @@ -458,65 +458,65 @@ static void
59854 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59855 {
59856 #ifdef CONFIG_CIFS_STATS
59857 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59858 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59859 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59860 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59861 seq_printf(m, "\nNegotiates: %d sent %d failed",
59862 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
59863 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
59864 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
59865 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
59866 seq_printf(m, "\nSessionSetups: %d sent %d failed",
59867 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
59868 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
59869 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
59870 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
59871 seq_printf(m, "\nLogoffs: %d sent %d failed",
59872 - atomic_read(&sent[SMB2_LOGOFF_HE]),
59873 - atomic_read(&failed[SMB2_LOGOFF_HE]));
59874 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
59875 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
59876 seq_printf(m, "\nTreeConnects: %d sent %d failed",
59877 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
59878 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
59879 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
59880 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
59881 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
59882 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
59883 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
59884 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
59885 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
59886 seq_printf(m, "\nCreates: %d sent %d failed",
59887 - atomic_read(&sent[SMB2_CREATE_HE]),
59888 - atomic_read(&failed[SMB2_CREATE_HE]));
59889 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
59890 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
59891 seq_printf(m, "\nCloses: %d sent %d failed",
59892 - atomic_read(&sent[SMB2_CLOSE_HE]),
59893 - atomic_read(&failed[SMB2_CLOSE_HE]));
59894 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
59895 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
59896 seq_printf(m, "\nFlushes: %d sent %d failed",
59897 - atomic_read(&sent[SMB2_FLUSH_HE]),
59898 - atomic_read(&failed[SMB2_FLUSH_HE]));
59899 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
59900 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
59901 seq_printf(m, "\nReads: %d sent %d failed",
59902 - atomic_read(&sent[SMB2_READ_HE]),
59903 - atomic_read(&failed[SMB2_READ_HE]));
59904 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
59905 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
59906 seq_printf(m, "\nWrites: %d sent %d failed",
59907 - atomic_read(&sent[SMB2_WRITE_HE]),
59908 - atomic_read(&failed[SMB2_WRITE_HE]));
59909 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
59910 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
59911 seq_printf(m, "\nLocks: %d sent %d failed",
59912 - atomic_read(&sent[SMB2_LOCK_HE]),
59913 - atomic_read(&failed[SMB2_LOCK_HE]));
59914 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
59915 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
59916 seq_printf(m, "\nIOCTLs: %d sent %d failed",
59917 - atomic_read(&sent[SMB2_IOCTL_HE]),
59918 - atomic_read(&failed[SMB2_IOCTL_HE]));
59919 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
59920 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
59921 seq_printf(m, "\nCancels: %d sent %d failed",
59922 - atomic_read(&sent[SMB2_CANCEL_HE]),
59923 - atomic_read(&failed[SMB2_CANCEL_HE]));
59924 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
59925 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
59926 seq_printf(m, "\nEchos: %d sent %d failed",
59927 - atomic_read(&sent[SMB2_ECHO_HE]),
59928 - atomic_read(&failed[SMB2_ECHO_HE]));
59929 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
59930 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
59931 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
59932 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
59933 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
59934 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
59935 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
59936 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
59937 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
59938 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
59939 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
59940 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
59941 seq_printf(m, "\nQueryInfos: %d sent %d failed",
59942 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
59943 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
59944 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
59945 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
59946 seq_printf(m, "\nSetInfos: %d sent %d failed",
59947 - atomic_read(&sent[SMB2_SET_INFO_HE]),
59948 - atomic_read(&failed[SMB2_SET_INFO_HE]));
59949 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
59950 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
59951 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
59952 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
59953 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
59954 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
59955 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
59956 #endif
59957 }
59958
59959 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
59960 index 8f1672b..af339c07 100644
59961 --- a/fs/cifs/smb2pdu.c
59962 +++ b/fs/cifs/smb2pdu.c
59963 @@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
59964 default:
59965 cifs_dbg(VFS, "info level %u isn't supported\n",
59966 srch_inf->info_level);
59967 - rc = -EINVAL;
59968 - goto qdir_exit;
59969 + return -EINVAL;
59970 }
59971
59972 req->FileIndex = cpu_to_le32(index);
59973 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
59974 index 46ee6f2..89a9e7f 100644
59975 --- a/fs/coda/cache.c
59976 +++ b/fs/coda/cache.c
59977 @@ -24,7 +24,7 @@
59978 #include "coda_linux.h"
59979 #include "coda_cache.h"
59980
59981 -static atomic_t permission_epoch = ATOMIC_INIT(0);
59982 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
59983
59984 /* replace or extend an acl cache hit */
59985 void coda_cache_enter(struct inode *inode, int mask)
59986 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
59987 struct coda_inode_info *cii = ITOC(inode);
59988
59989 spin_lock(&cii->c_lock);
59990 - cii->c_cached_epoch = atomic_read(&permission_epoch);
59991 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
59992 if (!uid_eq(cii->c_uid, current_fsuid())) {
59993 cii->c_uid = current_fsuid();
59994 cii->c_cached_perm = mask;
59995 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
59996 {
59997 struct coda_inode_info *cii = ITOC(inode);
59998 spin_lock(&cii->c_lock);
59999 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60000 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60001 spin_unlock(&cii->c_lock);
60002 }
60003
60004 /* remove all acl caches */
60005 void coda_cache_clear_all(struct super_block *sb)
60006 {
60007 - atomic_inc(&permission_epoch);
60008 + atomic_inc_unchecked(&permission_epoch);
60009 }
60010
60011
60012 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60013 spin_lock(&cii->c_lock);
60014 hit = (mask & cii->c_cached_perm) == mask &&
60015 uid_eq(cii->c_uid, current_fsuid()) &&
60016 - cii->c_cached_epoch == atomic_read(&permission_epoch);
60017 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60018 spin_unlock(&cii->c_lock);
60019
60020 return hit;
60021 diff --git a/fs/compat.c b/fs/compat.c
60022 index b13df99..6f6f4a3 100644
60023 --- a/fs/compat.c
60024 +++ b/fs/compat.c
60025 @@ -54,7 +54,7 @@
60026 #include <asm/ioctls.h>
60027 #include "internal.h"
60028
60029 -int compat_log = 1;
60030 +int compat_log = 0;
60031
60032 int compat_printk(const char *fmt, ...)
60033 {
60034 @@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60035
60036 set_fs(KERNEL_DS);
60037 /* The __user pointer cast is valid because of the set_fs() */
60038 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60039 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60040 set_fs(oldfs);
60041 /* truncating is ok because it's a user address */
60042 if (!ret)
60043 @@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60044 goto out;
60045
60046 ret = -EINVAL;
60047 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60048 + if (nr_segs > UIO_MAXIOV)
60049 goto out;
60050 if (nr_segs > fast_segs) {
60051 ret = -ENOMEM;
60052 @@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60053 struct compat_readdir_callback {
60054 struct dir_context ctx;
60055 struct compat_old_linux_dirent __user *dirent;
60056 + struct file * file;
60057 int result;
60058 };
60059
60060 @@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
60061 buf->result = -EOVERFLOW;
60062 return -EOVERFLOW;
60063 }
60064 +
60065 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60066 + return 0;
60067 +
60068 buf->result++;
60069 dirent = buf->dirent;
60070 if (!access_ok(VERIFY_WRITE, dirent,
60071 @@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60072 if (!f.file)
60073 return -EBADF;
60074
60075 + buf.file = f.file;
60076 error = iterate_dir(f.file, &buf.ctx);
60077 if (buf.result)
60078 error = buf.result;
60079 @@ -911,6 +917,7 @@ struct compat_getdents_callback {
60080 struct dir_context ctx;
60081 struct compat_linux_dirent __user *current_dir;
60082 struct compat_linux_dirent __user *previous;
60083 + struct file * file;
60084 int count;
60085 int error;
60086 };
60087 @@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
60088 buf->error = -EOVERFLOW;
60089 return -EOVERFLOW;
60090 }
60091 +
60092 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60093 + return 0;
60094 +
60095 dirent = buf->previous;
60096 if (dirent) {
60097 if (__put_user(offset, &dirent->d_off))
60098 @@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60099 if (!f.file)
60100 return -EBADF;
60101
60102 + buf.file = f.file;
60103 error = iterate_dir(f.file, &buf.ctx);
60104 if (error >= 0)
60105 error = buf.error;
60106 @@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
60107 struct dir_context ctx;
60108 struct linux_dirent64 __user *current_dir;
60109 struct linux_dirent64 __user *previous;
60110 + struct file * file;
60111 int count;
60112 int error;
60113 };
60114 @@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
60115 buf->error = -EINVAL; /* only used if we fail.. */
60116 if (reclen > buf->count)
60117 return -EINVAL;
60118 +
60119 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60120 + return 0;
60121 +
60122 dirent = buf->previous;
60123
60124 if (dirent) {
60125 @@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60126 if (!f.file)
60127 return -EBADF;
60128
60129 + buf.file = f.file;
60130 error = iterate_dir(f.file, &buf.ctx);
60131 if (error >= 0)
60132 error = buf.error;
60133 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60134 index 4d24d17..4f8c09e 100644
60135 --- a/fs/compat_binfmt_elf.c
60136 +++ b/fs/compat_binfmt_elf.c
60137 @@ -30,11 +30,13 @@
60138 #undef elf_phdr
60139 #undef elf_shdr
60140 #undef elf_note
60141 +#undef elf_dyn
60142 #undef elf_addr_t
60143 #define elfhdr elf32_hdr
60144 #define elf_phdr elf32_phdr
60145 #define elf_shdr elf32_shdr
60146 #define elf_note elf32_note
60147 +#define elf_dyn Elf32_Dyn
60148 #define elf_addr_t Elf32_Addr
60149
60150 /*
60151 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60152 index afec645..9c65620 100644
60153 --- a/fs/compat_ioctl.c
60154 +++ b/fs/compat_ioctl.c
60155 @@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60156 return -EFAULT;
60157 if (__get_user(udata, &ss32->iomem_base))
60158 return -EFAULT;
60159 - ss.iomem_base = compat_ptr(udata);
60160 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60161 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60162 __get_user(ss.port_high, &ss32->port_high))
60163 return -EFAULT;
60164 @@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60165 for (i = 0; i < nmsgs; i++) {
60166 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60167 return -EFAULT;
60168 - if (get_user(datap, &umsgs[i].buf) ||
60169 - put_user(compat_ptr(datap), &tmsgs[i].buf))
60170 + if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60171 + put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60172 return -EFAULT;
60173 }
60174 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60175 @@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60176 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60177 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60178 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60179 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60180 + copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60181 return -EFAULT;
60182
60183 return ioctl_preallocate(file, p);
60184 @@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60185 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60186 {
60187 unsigned int a, b;
60188 - a = *(unsigned int *)p;
60189 - b = *(unsigned int *)q;
60190 + a = *(const unsigned int *)p;
60191 + b = *(const unsigned int *)q;
60192 if (a > b)
60193 return 1;
60194 if (a < b)
60195 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60196 index 668dcab..daebcd6 100644
60197 --- a/fs/configfs/dir.c
60198 +++ b/fs/configfs/dir.c
60199 @@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60200 }
60201 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60202 struct configfs_dirent *next;
60203 - const char *name;
60204 + const unsigned char * name;
60205 + char d_name[sizeof(next->s_dentry->d_iname)];
60206 int len;
60207 struct inode *inode = NULL;
60208
60209 @@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60210 continue;
60211
60212 name = configfs_get_name(next);
60213 - len = strlen(name);
60214 + if (next->s_dentry && name == next->s_dentry->d_iname) {
60215 + len = next->s_dentry->d_name.len;
60216 + memcpy(d_name, name, len);
60217 + name = d_name;
60218 + } else
60219 + len = strlen(name);
60220
60221 /*
60222 * We'll have a dentry and an inode for
60223 diff --git a/fs/coredump.c b/fs/coredump.c
60224 index b5c86ff..0dac262 100644
60225 --- a/fs/coredump.c
60226 +++ b/fs/coredump.c
60227 @@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60228 struct pipe_inode_info *pipe = file->private_data;
60229
60230 pipe_lock(pipe);
60231 - pipe->readers++;
60232 - pipe->writers--;
60233 + atomic_inc(&pipe->readers);
60234 + atomic_dec(&pipe->writers);
60235 wake_up_interruptible_sync(&pipe->wait);
60236 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60237 pipe_unlock(pipe);
60238 @@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60239 * We actually want wait_event_freezable() but then we need
60240 * to clear TIF_SIGPENDING and improve dump_interrupted().
60241 */
60242 - wait_event_interruptible(pipe->wait, pipe->readers == 1);
60243 + wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60244
60245 pipe_lock(pipe);
60246 - pipe->readers--;
60247 - pipe->writers++;
60248 + atomic_dec(&pipe->readers);
60249 + atomic_inc(&pipe->writers);
60250 pipe_unlock(pipe);
60251 }
60252
60253 @@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60254 struct files_struct *displaced;
60255 bool need_nonrelative = false;
60256 bool core_dumped = false;
60257 - static atomic_t core_dump_count = ATOMIC_INIT(0);
60258 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60259 + long signr = siginfo->si_signo;
60260 + int dumpable;
60261 struct coredump_params cprm = {
60262 .siginfo = siginfo,
60263 .regs = signal_pt_regs(),
60264 @@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60265 .mm_flags = mm->flags,
60266 };
60267
60268 - audit_core_dumps(siginfo->si_signo);
60269 + audit_core_dumps(signr);
60270 +
60271 + dumpable = __get_dumpable(cprm.mm_flags);
60272 +
60273 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60274 + gr_handle_brute_attach(dumpable);
60275
60276 binfmt = mm->binfmt;
60277 if (!binfmt || !binfmt->core_dump)
60278 goto fail;
60279 - if (!__get_dumpable(cprm.mm_flags))
60280 + if (!dumpable)
60281 goto fail;
60282
60283 cred = prepare_creds();
60284 @@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60285 need_nonrelative = true;
60286 }
60287
60288 - retval = coredump_wait(siginfo->si_signo, &core_state);
60289 + retval = coredump_wait(signr, &core_state);
60290 if (retval < 0)
60291 goto fail_creds;
60292
60293 @@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60294 }
60295 cprm.limit = RLIM_INFINITY;
60296
60297 - dump_count = atomic_inc_return(&core_dump_count);
60298 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
60299 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60300 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60301 task_tgid_vnr(current), current->comm);
60302 @@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60303 } else {
60304 struct inode *inode;
60305
60306 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60307 +
60308 if (cprm.limit < binfmt->min_coredump)
60309 goto fail_unlock;
60310
60311 @@ -681,7 +690,7 @@ close_fail:
60312 filp_close(cprm.file, NULL);
60313 fail_dropcount:
60314 if (ispipe)
60315 - atomic_dec(&core_dump_count);
60316 + atomic_dec_unchecked(&core_dump_count);
60317 fail_unlock:
60318 kfree(cn.corename);
60319 coredump_finish(mm, core_dumped);
60320 @@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60321 struct file *file = cprm->file;
60322 loff_t pos = file->f_pos;
60323 ssize_t n;
60324 +
60325 + gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60326 if (cprm->written + nr > cprm->limit)
60327 return 0;
60328 while (nr) {
60329 diff --git a/fs/dcache.c b/fs/dcache.c
60330 index 03dca3c..f66c622 100644
60331 --- a/fs/dcache.c
60332 +++ b/fs/dcache.c
60333 @@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60334 * dentry_iput drops the locks, at which point nobody (except
60335 * transient RCU lookups) can reach this dentry.
60336 */
60337 - BUG_ON((int)dentry->d_lockref.count > 0);
60338 + BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60339 this_cpu_dec(nr_dentry);
60340 if (dentry->d_op && dentry->d_op->d_release)
60341 dentry->d_op->d_release(dentry);
60342 @@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60343 struct dentry *parent = dentry->d_parent;
60344 if (IS_ROOT(dentry))
60345 return NULL;
60346 - if (unlikely((int)dentry->d_lockref.count < 0))
60347 + if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60348 return NULL;
60349 if (likely(spin_trylock(&parent->d_lock)))
60350 return parent;
60351 @@ -638,7 +638,7 @@ repeat:
60352 dentry->d_flags |= DCACHE_REFERENCED;
60353 dentry_lru_add(dentry);
60354
60355 - dentry->d_lockref.count--;
60356 + __lockref_dec(&dentry->d_lockref);
60357 spin_unlock(&dentry->d_lock);
60358 return;
60359
60360 @@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60361 /* This must be called with d_lock held */
60362 static inline void __dget_dlock(struct dentry *dentry)
60363 {
60364 - dentry->d_lockref.count++;
60365 + __lockref_inc(&dentry->d_lockref);
60366 }
60367
60368 static inline void __dget(struct dentry *dentry)
60369 @@ -694,8 +694,8 @@ repeat:
60370 goto repeat;
60371 }
60372 rcu_read_unlock();
60373 - BUG_ON(!ret->d_lockref.count);
60374 - ret->d_lockref.count++;
60375 + BUG_ON(!__lockref_read(&ret->d_lockref));
60376 + __lockref_inc(&ret->d_lockref);
60377 spin_unlock(&ret->d_lock);
60378 return ret;
60379 }
60380 @@ -773,9 +773,9 @@ restart:
60381 spin_lock(&inode->i_lock);
60382 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60383 spin_lock(&dentry->d_lock);
60384 - if (!dentry->d_lockref.count) {
60385 + if (!__lockref_read(&dentry->d_lockref)) {
60386 struct dentry *parent = lock_parent(dentry);
60387 - if (likely(!dentry->d_lockref.count)) {
60388 + if (likely(!__lockref_read(&dentry->d_lockref))) {
60389 __dentry_kill(dentry);
60390 dput(parent);
60391 goto restart;
60392 @@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60393 * We found an inuse dentry which was not removed from
60394 * the LRU because of laziness during lookup. Do not free it.
60395 */
60396 - if ((int)dentry->d_lockref.count > 0) {
60397 + if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60398 spin_unlock(&dentry->d_lock);
60399 if (parent)
60400 spin_unlock(&parent->d_lock);
60401 @@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60402 dentry = parent;
60403 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60404 parent = lock_parent(dentry);
60405 - if (dentry->d_lockref.count != 1) {
60406 - dentry->d_lockref.count--;
60407 + if (__lockref_read(&dentry->d_lockref) != 1) {
60408 + __lockref_inc(&dentry->d_lockref);
60409 spin_unlock(&dentry->d_lock);
60410 if (parent)
60411 spin_unlock(&parent->d_lock);
60412 @@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60413 * counts, just remove them from the LRU. Otherwise give them
60414 * another pass through the LRU.
60415 */
60416 - if (dentry->d_lockref.count) {
60417 + if (__lockref_read(&dentry->d_lockref) > 0) {
60418 d_lru_isolate(dentry);
60419 spin_unlock(&dentry->d_lock);
60420 return LRU_REMOVED;
60421 @@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60422 } else {
60423 if (dentry->d_flags & DCACHE_LRU_LIST)
60424 d_lru_del(dentry);
60425 - if (!dentry->d_lockref.count) {
60426 + if (!__lockref_read(&dentry->d_lockref)) {
60427 d_shrink_add(dentry, &data->dispose);
60428 data->found++;
60429 }
60430 @@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60431 return D_WALK_CONTINUE;
60432
60433 /* root with refcount 1 is fine */
60434 - if (dentry == _data && dentry->d_lockref.count == 1)
60435 + if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60436 return D_WALK_CONTINUE;
60437
60438 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60439 @@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60440 dentry->d_inode ?
60441 dentry->d_inode->i_ino : 0UL,
60442 dentry,
60443 - dentry->d_lockref.count,
60444 + __lockref_read(&dentry->d_lockref),
60445 dentry->d_sb->s_type->name,
60446 dentry->d_sb->s_id);
60447 WARN_ON(1);
60448 @@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60449 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
60450 if (name->len > DNAME_INLINE_LEN-1) {
60451 size_t size = offsetof(struct external_name, name[1]);
60452 - struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
60453 + struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
60454 if (!p) {
60455 kmem_cache_free(dentry_cache, dentry);
60456 return NULL;
60457 @@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60458 smp_wmb();
60459 dentry->d_name.name = dname;
60460
60461 - dentry->d_lockref.count = 1;
60462 + __lockref_set(&dentry->d_lockref, 1);
60463 dentry->d_flags = 0;
60464 spin_lock_init(&dentry->d_lock);
60465 seqcount_init(&dentry->d_seq);
60466 @@ -2183,7 +2183,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
60467 goto next;
60468 }
60469
60470 - dentry->d_lockref.count++;
60471 + __lockref_inc(&dentry->d_lockref);
60472 found = dentry;
60473 spin_unlock(&dentry->d_lock);
60474 break;
60475 @@ -2282,7 +2282,7 @@ again:
60476 spin_lock(&dentry->d_lock);
60477 inode = dentry->d_inode;
60478 isdir = S_ISDIR(inode->i_mode);
60479 - if (dentry->d_lockref.count == 1) {
60480 + if (__lockref_read(&dentry->d_lockref) == 1) {
60481 if (!spin_trylock(&inode->i_lock)) {
60482 spin_unlock(&dentry->d_lock);
60483 cpu_relax();
60484 @@ -3308,7 +3308,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
60485
60486 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
60487 dentry->d_flags |= DCACHE_GENOCIDE;
60488 - dentry->d_lockref.count--;
60489 + __lockref_dec(&dentry->d_lockref);
60490 }
60491 }
60492 return D_WALK_CONTINUE;
60493 @@ -3424,7 +3424,8 @@ void __init vfs_caches_init(unsigned long mempages)
60494 mempages -= reserve;
60495
60496 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
60497 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
60498 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
60499 + SLAB_NO_SANITIZE, NULL);
60500
60501 dcache_init();
60502 inode_init();
60503 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
60504 index 05f2960..b012481 100644
60505 --- a/fs/debugfs/inode.c
60506 +++ b/fs/debugfs/inode.c
60507 @@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
60508 */
60509 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
60510 {
60511 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
60512 + return __create_file(name, S_IFDIR | S_IRWXU,
60513 +#else
60514 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
60515 +#endif
60516 parent, NULL, NULL);
60517 }
60518 EXPORT_SYMBOL_GPL(debugfs_create_dir);
60519 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
60520 index 1686dc2..9611c50 100644
60521 --- a/fs/ecryptfs/inode.c
60522 +++ b/fs/ecryptfs/inode.c
60523 @@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
60524 old_fs = get_fs();
60525 set_fs(get_ds());
60526 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
60527 - (char __user *)lower_buf,
60528 + (char __force_user *)lower_buf,
60529 PATH_MAX);
60530 set_fs(old_fs);
60531 if (rc < 0)
60532 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
60533 index e4141f2..d8263e8 100644
60534 --- a/fs/ecryptfs/miscdev.c
60535 +++ b/fs/ecryptfs/miscdev.c
60536 @@ -304,7 +304,7 @@ check_list:
60537 goto out_unlock_msg_ctx;
60538 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
60539 if (msg_ctx->msg) {
60540 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
60541 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
60542 goto out_unlock_msg_ctx;
60543 i += packet_length_size;
60544 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
60545 diff --git a/fs/exec.c b/fs/exec.c
60546 index 7302b75..7d61d19 100644
60547 --- a/fs/exec.c
60548 +++ b/fs/exec.c
60549 @@ -56,8 +56,20 @@
60550 #include <linux/pipe_fs_i.h>
60551 #include <linux/oom.h>
60552 #include <linux/compat.h>
60553 +#include <linux/random.h>
60554 +#include <linux/seq_file.h>
60555 +#include <linux/coredump.h>
60556 +#include <linux/mman.h>
60557 +
60558 +#ifdef CONFIG_PAX_REFCOUNT
60559 +#include <linux/kallsyms.h>
60560 +#include <linux/kdebug.h>
60561 +#endif
60562 +
60563 +#include <trace/events/fs.h>
60564
60565 #include <asm/uaccess.h>
60566 +#include <asm/sections.h>
60567 #include <asm/mmu_context.h>
60568 #include <asm/tlb.h>
60569
60570 @@ -66,19 +78,34 @@
60571
60572 #include <trace/events/sched.h>
60573
60574 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60575 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
60576 +{
60577 + 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");
60578 +}
60579 +#endif
60580 +
60581 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
60582 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60583 +EXPORT_SYMBOL(pax_set_initial_flags_func);
60584 +#endif
60585 +
60586 int suid_dumpable = 0;
60587
60588 static LIST_HEAD(formats);
60589 static DEFINE_RWLOCK(binfmt_lock);
60590
60591 +extern int gr_process_kernel_exec_ban(void);
60592 +extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
60593 +
60594 void __register_binfmt(struct linux_binfmt * fmt, int insert)
60595 {
60596 BUG_ON(!fmt);
60597 if (WARN_ON(!fmt->load_binary))
60598 return;
60599 write_lock(&binfmt_lock);
60600 - insert ? list_add(&fmt->lh, &formats) :
60601 - list_add_tail(&fmt->lh, &formats);
60602 + insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
60603 + pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
60604 write_unlock(&binfmt_lock);
60605 }
60606
60607 @@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
60608 void unregister_binfmt(struct linux_binfmt * fmt)
60609 {
60610 write_lock(&binfmt_lock);
60611 - list_del(&fmt->lh);
60612 + pax_list_del((struct list_head *)&fmt->lh);
60613 write_unlock(&binfmt_lock);
60614 }
60615
60616 @@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60617 int write)
60618 {
60619 struct page *page;
60620 - int ret;
60621
60622 -#ifdef CONFIG_STACK_GROWSUP
60623 - if (write) {
60624 - ret = expand_downwards(bprm->vma, pos);
60625 - if (ret < 0)
60626 - return NULL;
60627 - }
60628 -#endif
60629 - ret = get_user_pages(current, bprm->mm, pos,
60630 - 1, write, 1, &page, NULL);
60631 - if (ret <= 0)
60632 + if (0 > expand_downwards(bprm->vma, pos))
60633 + return NULL;
60634 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
60635 return NULL;
60636
60637 if (write) {
60638 @@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60639 if (size <= ARG_MAX)
60640 return page;
60641
60642 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60643 + // only allow 512KB for argv+env on suid/sgid binaries
60644 + // to prevent easy ASLR exhaustion
60645 + if (((!uid_eq(bprm->cred->euid, current_euid())) ||
60646 + (!gid_eq(bprm->cred->egid, current_egid()))) &&
60647 + (size > (512 * 1024))) {
60648 + put_page(page);
60649 + return NULL;
60650 + }
60651 +#endif
60652 +
60653 /*
60654 * Limit to 1/4-th the stack size for the argv+env strings.
60655 * This ensures that:
60656 @@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60657 vma->vm_end = STACK_TOP_MAX;
60658 vma->vm_start = vma->vm_end - PAGE_SIZE;
60659 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
60660 +
60661 +#ifdef CONFIG_PAX_SEGMEXEC
60662 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
60663 +#endif
60664 +
60665 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
60666 INIT_LIST_HEAD(&vma->anon_vma_chain);
60667
60668 @@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60669 mm->stack_vm = mm->total_vm = 1;
60670 up_write(&mm->mmap_sem);
60671 bprm->p = vma->vm_end - sizeof(void *);
60672 +
60673 +#ifdef CONFIG_PAX_RANDUSTACK
60674 + if (randomize_va_space)
60675 + bprm->p ^= prandom_u32() & ~PAGE_MASK;
60676 +#endif
60677 +
60678 return 0;
60679 err:
60680 up_write(&mm->mmap_sem);
60681 @@ -395,7 +436,7 @@ struct user_arg_ptr {
60682 } ptr;
60683 };
60684
60685 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60686 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60687 {
60688 const char __user *native;
60689
60690 @@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60691 compat_uptr_t compat;
60692
60693 if (get_user(compat, argv.ptr.compat + nr))
60694 - return ERR_PTR(-EFAULT);
60695 + return (const char __force_user *)ERR_PTR(-EFAULT);
60696
60697 return compat_ptr(compat);
60698 }
60699 #endif
60700
60701 if (get_user(native, argv.ptr.native + nr))
60702 - return ERR_PTR(-EFAULT);
60703 + return (const char __force_user *)ERR_PTR(-EFAULT);
60704
60705 return native;
60706 }
60707 @@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
60708 if (!p)
60709 break;
60710
60711 - if (IS_ERR(p))
60712 + if (IS_ERR((const char __force_kernel *)p))
60713 return -EFAULT;
60714
60715 if (i >= max)
60716 @@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
60717
60718 ret = -EFAULT;
60719 str = get_user_arg_ptr(argv, argc);
60720 - if (IS_ERR(str))
60721 + if (IS_ERR((const char __force_kernel *)str))
60722 goto out;
60723
60724 len = strnlen_user(str, MAX_ARG_STRLEN);
60725 @@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
60726 int r;
60727 mm_segment_t oldfs = get_fs();
60728 struct user_arg_ptr argv = {
60729 - .ptr.native = (const char __user *const __user *)__argv,
60730 + .ptr.native = (const char __user * const __force_user *)__argv,
60731 };
60732
60733 set_fs(KERNEL_DS);
60734 @@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60735 unsigned long new_end = old_end - shift;
60736 struct mmu_gather tlb;
60737
60738 - BUG_ON(new_start > new_end);
60739 + if (new_start >= new_end || new_start < mmap_min_addr)
60740 + return -ENOMEM;
60741
60742 /*
60743 * ensure there are no vmas between where we want to go
60744 @@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60745 if (vma != find_vma(mm, new_start))
60746 return -EFAULT;
60747
60748 +#ifdef CONFIG_PAX_SEGMEXEC
60749 + BUG_ON(pax_find_mirror_vma(vma));
60750 +#endif
60751 +
60752 /*
60753 * cover the whole range: [new_start, old_end)
60754 */
60755 @@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60756 stack_top = arch_align_stack(stack_top);
60757 stack_top = PAGE_ALIGN(stack_top);
60758
60759 - if (unlikely(stack_top < mmap_min_addr) ||
60760 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
60761 - return -ENOMEM;
60762 -
60763 stack_shift = vma->vm_end - stack_top;
60764
60765 bprm->p -= stack_shift;
60766 @@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
60767 bprm->exec -= stack_shift;
60768
60769 down_write(&mm->mmap_sem);
60770 +
60771 + /* Move stack pages down in memory. */
60772 + if (stack_shift) {
60773 + ret = shift_arg_pages(vma, stack_shift);
60774 + if (ret)
60775 + goto out_unlock;
60776 + }
60777 +
60778 vm_flags = VM_STACK_FLAGS;
60779
60780 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
60781 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
60782 + vm_flags &= ~VM_EXEC;
60783 +
60784 +#ifdef CONFIG_PAX_MPROTECT
60785 + if (mm->pax_flags & MF_PAX_MPROTECT)
60786 + vm_flags &= ~VM_MAYEXEC;
60787 +#endif
60788 +
60789 + }
60790 +#endif
60791 +
60792 /*
60793 * Adjust stack execute permissions; explicitly enable for
60794 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
60795 @@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60796 goto out_unlock;
60797 BUG_ON(prev != vma);
60798
60799 - /* Move stack pages down in memory. */
60800 - if (stack_shift) {
60801 - ret = shift_arg_pages(vma, stack_shift);
60802 - if (ret)
60803 - goto out_unlock;
60804 - }
60805 -
60806 /* mprotect_fixup is overkill to remove the temporary stack flags */
60807 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
60808
60809 @@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
60810 #endif
60811 current->mm->start_stack = bprm->p;
60812 ret = expand_stack(vma, stack_base);
60813 +
60814 +#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
60815 + if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
60816 + unsigned long size;
60817 + vm_flags_t vm_flags;
60818 +
60819 + size = STACK_TOP - vma->vm_end;
60820 + vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
60821 +
60822 + ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
60823 +
60824 +#ifdef CONFIG_X86
60825 + if (!ret) {
60826 + size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
60827 + ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
60828 + }
60829 +#endif
60830 +
60831 + }
60832 +#endif
60833 +
60834 if (ret)
60835 ret = -EFAULT;
60836
60837 @@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
60838
60839 fsnotify_open(file);
60840
60841 + trace_open_exec(name->name);
60842 +
60843 err = deny_write_access(file);
60844 if (err)
60845 goto exit;
60846 @@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
60847 old_fs = get_fs();
60848 set_fs(get_ds());
60849 /* The cast to a user pointer is valid due to the set_fs() */
60850 - result = vfs_read(file, (void __user *)addr, count, &pos);
60851 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
60852 set_fs(old_fs);
60853 return result;
60854 }
60855 @@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
60856 tsk->mm = mm;
60857 tsk->active_mm = mm;
60858 activate_mm(active_mm, mm);
60859 + populate_stack();
60860 tsk->mm->vmacache_seqnum = 0;
60861 vmacache_flush(tsk);
60862 task_unlock(tsk);
60863 @@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
60864 }
60865 rcu_read_unlock();
60866
60867 - if (p->fs->users > n_fs)
60868 + if (atomic_read(&p->fs->users) > n_fs)
60869 bprm->unsafe |= LSM_UNSAFE_SHARE;
60870 else
60871 p->fs->in_exec = 1;
60872 @@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
60873 return ret;
60874 }
60875
60876 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60877 +static DEFINE_PER_CPU(u64, exec_counter);
60878 +static int __init init_exec_counters(void)
60879 +{
60880 + unsigned int cpu;
60881 +
60882 + for_each_possible_cpu(cpu) {
60883 + per_cpu(exec_counter, cpu) = (u64)cpu;
60884 + }
60885 +
60886 + return 0;
60887 +}
60888 +early_initcall(init_exec_counters);
60889 +static inline void increment_exec_counter(void)
60890 +{
60891 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
60892 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
60893 +}
60894 +#else
60895 +static inline void increment_exec_counter(void) {}
60896 +#endif
60897 +
60898 +extern void gr_handle_exec_args(struct linux_binprm *bprm,
60899 + struct user_arg_ptr argv);
60900 +
60901 /*
60902 * sys_execve() executes a new program.
60903 */
60904 @@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
60905 struct user_arg_ptr argv,
60906 struct user_arg_ptr envp)
60907 {
60908 +#ifdef CONFIG_GRKERNSEC
60909 + struct file *old_exec_file;
60910 + struct acl_subject_label *old_acl;
60911 + struct rlimit old_rlim[RLIM_NLIMITS];
60912 +#endif
60913 struct linux_binprm *bprm;
60914 struct file *file;
60915 struct files_struct *displaced;
60916 @@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
60917 if (IS_ERR(filename))
60918 return PTR_ERR(filename);
60919
60920 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
60921 +
60922 /*
60923 * We move the actual failure in case of RLIMIT_NPROC excess from
60924 * set*uid() to execve() because too many poorly written programs
60925 @@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
60926 if (IS_ERR(file))
60927 goto out_unmark;
60928
60929 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
60930 + retval = -EPERM;
60931 + goto out_unmark;
60932 + }
60933 +
60934 sched_exec();
60935
60936 bprm->file = file;
60937 bprm->filename = bprm->interp = filename->name;
60938
60939 + if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
60940 + retval = -EACCES;
60941 + goto out_unmark;
60942 + }
60943 +
60944 retval = bprm_mm_init(bprm);
60945 if (retval)
60946 goto out_unmark;
60947 @@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
60948 if (retval < 0)
60949 goto out;
60950
60951 +#ifdef CONFIG_GRKERNSEC
60952 + old_acl = current->acl;
60953 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
60954 + old_exec_file = current->exec_file;
60955 + get_file(file);
60956 + current->exec_file = file;
60957 +#endif
60958 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60959 + /* limit suid stack to 8MB
60960 + * we saved the old limits above and will restore them if this exec fails
60961 + */
60962 + if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
60963 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
60964 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
60965 +#endif
60966 +
60967 + if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
60968 + retval = -EPERM;
60969 + goto out_fail;
60970 + }
60971 +
60972 + if (!gr_tpe_allow(file)) {
60973 + retval = -EACCES;
60974 + goto out_fail;
60975 + }
60976 +
60977 + if (gr_check_crash_exec(file)) {
60978 + retval = -EACCES;
60979 + goto out_fail;
60980 + }
60981 +
60982 + retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
60983 + bprm->unsafe);
60984 + if (retval < 0)
60985 + goto out_fail;
60986 +
60987 retval = copy_strings_kernel(1, &bprm->filename, bprm);
60988 if (retval < 0)
60989 - goto out;
60990 + goto out_fail;
60991
60992 bprm->exec = bprm->p;
60993 retval = copy_strings(bprm->envc, envp, bprm);
60994 if (retval < 0)
60995 - goto out;
60996 + goto out_fail;
60997
60998 retval = copy_strings(bprm->argc, argv, bprm);
60999 if (retval < 0)
61000 - goto out;
61001 + goto out_fail;
61002 +
61003 + gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61004 +
61005 + gr_handle_exec_args(bprm, argv);
61006
61007 retval = exec_binprm(bprm);
61008 if (retval < 0)
61009 - goto out;
61010 + goto out_fail;
61011 +#ifdef CONFIG_GRKERNSEC
61012 + if (old_exec_file)
61013 + fput(old_exec_file);
61014 +#endif
61015
61016 /* execve succeeded */
61017 +
61018 + increment_exec_counter();
61019 current->fs->in_exec = 0;
61020 current->in_execve = 0;
61021 acct_update_integrals(current);
61022 @@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
61023 put_files_struct(displaced);
61024 return retval;
61025
61026 +out_fail:
61027 +#ifdef CONFIG_GRKERNSEC
61028 + current->acl = old_acl;
61029 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61030 + fput(current->exec_file);
61031 + current->exec_file = old_exec_file;
61032 +#endif
61033 +
61034 out:
61035 if (bprm->mm) {
61036 acct_arg_size(bprm, 0);
61037 @@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
61038 return compat_do_execve(getname(filename), argv, envp);
61039 }
61040 #endif
61041 +
61042 +int pax_check_flags(unsigned long *flags)
61043 +{
61044 + int retval = 0;
61045 +
61046 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61047 + if (*flags & MF_PAX_SEGMEXEC)
61048 + {
61049 + *flags &= ~MF_PAX_SEGMEXEC;
61050 + retval = -EINVAL;
61051 + }
61052 +#endif
61053 +
61054 + if ((*flags & MF_PAX_PAGEEXEC)
61055 +
61056 +#ifdef CONFIG_PAX_PAGEEXEC
61057 + && (*flags & MF_PAX_SEGMEXEC)
61058 +#endif
61059 +
61060 + )
61061 + {
61062 + *flags &= ~MF_PAX_PAGEEXEC;
61063 + retval = -EINVAL;
61064 + }
61065 +
61066 + if ((*flags & MF_PAX_MPROTECT)
61067 +
61068 +#ifdef CONFIG_PAX_MPROTECT
61069 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61070 +#endif
61071 +
61072 + )
61073 + {
61074 + *flags &= ~MF_PAX_MPROTECT;
61075 + retval = -EINVAL;
61076 + }
61077 +
61078 + if ((*flags & MF_PAX_EMUTRAMP)
61079 +
61080 +#ifdef CONFIG_PAX_EMUTRAMP
61081 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61082 +#endif
61083 +
61084 + )
61085 + {
61086 + *flags &= ~MF_PAX_EMUTRAMP;
61087 + retval = -EINVAL;
61088 + }
61089 +
61090 + return retval;
61091 +}
61092 +
61093 +EXPORT_SYMBOL(pax_check_flags);
61094 +
61095 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61096 +char *pax_get_path(const struct path *path, char *buf, int buflen)
61097 +{
61098 + char *pathname = d_path(path, buf, buflen);
61099 +
61100 + if (IS_ERR(pathname))
61101 + goto toolong;
61102 +
61103 + pathname = mangle_path(buf, pathname, "\t\n\\");
61104 + if (!pathname)
61105 + goto toolong;
61106 +
61107 + *pathname = 0;
61108 + return buf;
61109 +
61110 +toolong:
61111 + return "<path too long>";
61112 +}
61113 +EXPORT_SYMBOL(pax_get_path);
61114 +
61115 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61116 +{
61117 + struct task_struct *tsk = current;
61118 + struct mm_struct *mm = current->mm;
61119 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61120 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61121 + char *path_exec = NULL;
61122 + char *path_fault = NULL;
61123 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
61124 + siginfo_t info = { };
61125 +
61126 + if (buffer_exec && buffer_fault) {
61127 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61128 +
61129 + down_read(&mm->mmap_sem);
61130 + vma = mm->mmap;
61131 + while (vma && (!vma_exec || !vma_fault)) {
61132 + if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61133 + vma_exec = vma;
61134 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61135 + vma_fault = vma;
61136 + vma = vma->vm_next;
61137 + }
61138 + if (vma_exec)
61139 + path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61140 + if (vma_fault) {
61141 + start = vma_fault->vm_start;
61142 + end = vma_fault->vm_end;
61143 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61144 + if (vma_fault->vm_file)
61145 + path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61146 + else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61147 + path_fault = "<heap>";
61148 + else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61149 + path_fault = "<stack>";
61150 + else
61151 + path_fault = "<anonymous mapping>";
61152 + }
61153 + up_read(&mm->mmap_sem);
61154 + }
61155 + if (tsk->signal->curr_ip)
61156 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61157 + else
61158 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61159 + 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),
61160 + from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61161 + free_page((unsigned long)buffer_exec);
61162 + free_page((unsigned long)buffer_fault);
61163 + pax_report_insns(regs, pc, sp);
61164 + info.si_signo = SIGKILL;
61165 + info.si_errno = 0;
61166 + info.si_code = SI_KERNEL;
61167 + info.si_pid = 0;
61168 + info.si_uid = 0;
61169 + do_coredump(&info);
61170 +}
61171 +#endif
61172 +
61173 +#ifdef CONFIG_PAX_REFCOUNT
61174 +void pax_report_refcount_overflow(struct pt_regs *regs)
61175 +{
61176 + if (current->signal->curr_ip)
61177 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61178 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
61179 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61180 + else
61181 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61182 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61183 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61184 + preempt_disable();
61185 + show_regs(regs);
61186 + preempt_enable();
61187 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61188 +}
61189 +#endif
61190 +
61191 +#ifdef CONFIG_PAX_USERCOPY
61192 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61193 +static noinline int check_stack_object(const void *obj, unsigned long len)
61194 +{
61195 + const void * const stack = task_stack_page(current);
61196 + const void * const stackend = stack + THREAD_SIZE;
61197 +
61198 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61199 + const void *frame = NULL;
61200 + const void *oldframe;
61201 +#endif
61202 +
61203 + if (obj + len < obj)
61204 + return -1;
61205 +
61206 + if (obj + len <= stack || stackend <= obj)
61207 + return 0;
61208 +
61209 + if (obj < stack || stackend < obj + len)
61210 + return -1;
61211 +
61212 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61213 + oldframe = __builtin_frame_address(1);
61214 + if (oldframe)
61215 + frame = __builtin_frame_address(2);
61216 + /*
61217 + low ----------------------------------------------> high
61218 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
61219 + ^----------------^
61220 + allow copies only within here
61221 + */
61222 + while (stack <= frame && frame < stackend) {
61223 + /* if obj + len extends past the last frame, this
61224 + check won't pass and the next frame will be 0,
61225 + causing us to bail out and correctly report
61226 + the copy as invalid
61227 + */
61228 + if (obj + len <= frame)
61229 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61230 + oldframe = frame;
61231 + frame = *(const void * const *)frame;
61232 + }
61233 + return -1;
61234 +#else
61235 + return 1;
61236 +#endif
61237 +}
61238 +
61239 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61240 +{
61241 + if (current->signal->curr_ip)
61242 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61243 + &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61244 + else
61245 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61246 + to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61247 + dump_stack();
61248 + gr_handle_kernel_exploit();
61249 + do_group_exit(SIGKILL);
61250 +}
61251 +#endif
61252 +
61253 +#ifdef CONFIG_PAX_USERCOPY
61254 +
61255 +static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61256 +{
61257 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61258 + unsigned long textlow = ktla_ktva((unsigned long)_stext);
61259 +#ifdef CONFIG_MODULES
61260 + unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61261 +#else
61262 + unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61263 +#endif
61264 +
61265 +#else
61266 + unsigned long textlow = (unsigned long)_stext;
61267 + unsigned long texthigh = (unsigned long)_etext;
61268 +
61269 +#ifdef CONFIG_X86_64
61270 + /* check against linear mapping as well */
61271 + if (high > (unsigned long)__va(__pa(textlow)) &&
61272 + low < (unsigned long)__va(__pa(texthigh)))
61273 + return true;
61274 +#endif
61275 +
61276 +#endif
61277 +
61278 + if (high <= textlow || low >= texthigh)
61279 + return false;
61280 + else
61281 + return true;
61282 +}
61283 +#endif
61284 +
61285 +void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61286 +{
61287 +#ifdef CONFIG_PAX_USERCOPY
61288 + const char *type;
61289 +#endif
61290 +
61291 +#ifndef CONFIG_STACK_GROWSUP
61292 + unsigned long stackstart = (unsigned long)task_stack_page(current);
61293 + unsigned long currentsp = (unsigned long)&stackstart;
61294 + if (unlikely((currentsp < stackstart + 512 ||
61295 + currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61296 + BUG();
61297 +#endif
61298 +
61299 +#ifndef CONFIG_PAX_USERCOPY_DEBUG
61300 + if (const_size)
61301 + return;
61302 +#endif
61303 +
61304 +#ifdef CONFIG_PAX_USERCOPY
61305 + if (!n)
61306 + return;
61307 +
61308 + type = check_heap_object(ptr, n);
61309 + if (!type) {
61310 + int ret = check_stack_object(ptr, n);
61311 + if (ret == 1 || ret == 2)
61312 + return;
61313 + if (ret == 0) {
61314 + if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61315 + type = "<kernel text>";
61316 + else
61317 + return;
61318 + } else
61319 + type = "<process stack>";
61320 + }
61321 +
61322 + pax_report_usercopy(ptr, n, to_user, type);
61323 +#endif
61324 +
61325 +}
61326 +EXPORT_SYMBOL(__check_object_size);
61327 +
61328 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61329 +void pax_track_stack(void)
61330 +{
61331 + unsigned long sp = (unsigned long)&sp;
61332 + if (sp < current_thread_info()->lowest_stack &&
61333 + sp > (unsigned long)task_stack_page(current))
61334 + current_thread_info()->lowest_stack = sp;
61335 + if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61336 + BUG();
61337 +}
61338 +EXPORT_SYMBOL(pax_track_stack);
61339 +#endif
61340 +
61341 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
61342 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61343 +{
61344 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61345 + dump_stack();
61346 + do_group_exit(SIGKILL);
61347 +}
61348 +EXPORT_SYMBOL(report_size_overflow);
61349 +#endif
61350 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61351 index 9f9992b..8b59411 100644
61352 --- a/fs/ext2/balloc.c
61353 +++ b/fs/ext2/balloc.c
61354 @@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61355
61356 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61357 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61358 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61359 + if (free_blocks < root_blocks + 1 &&
61360 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61361 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61362 - !in_group_p (sbi->s_resgid))) {
61363 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61364 return 0;
61365 }
61366 return 1;
61367 diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61368 index 170dc41..62f6b18 100644
61369 --- a/fs/ext2/super.c
61370 +++ b/fs/ext2/super.c
61371 @@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61372 #ifdef CONFIG_EXT2_FS_XATTR
61373 if (test_opt(sb, XATTR_USER))
61374 seq_puts(seq, ",user_xattr");
61375 - if (!test_opt(sb, XATTR_USER) &&
61376 - (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61377 + if (!test_opt(sb, XATTR_USER))
61378 seq_puts(seq, ",nouser_xattr");
61379 - }
61380 #endif
61381
61382 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61383 @@ -841,8 +839,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61384 if (def_mount_opts & EXT2_DEFM_UID16)
61385 set_opt(sbi->s_mount_opt, NO_UID32);
61386 #ifdef CONFIG_EXT2_FS_XATTR
61387 - if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61388 - set_opt(sbi->s_mount_opt, XATTR_USER);
61389 + /* always enable user xattrs */
61390 + set_opt(sbi->s_mount_opt, XATTR_USER);
61391 #endif
61392 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61393 if (def_mount_opts & EXT2_DEFM_ACL)
61394 diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61395 index 9142614..97484fa 100644
61396 --- a/fs/ext2/xattr.c
61397 +++ b/fs/ext2/xattr.c
61398 @@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61399 struct buffer_head *bh = NULL;
61400 struct ext2_xattr_entry *entry;
61401 char *end;
61402 - size_t rest = buffer_size;
61403 + size_t rest = buffer_size, total_size = 0;
61404 int error;
61405
61406 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
61407 @@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
61408 buffer += size;
61409 }
61410 rest -= size;
61411 + total_size += size;
61412 }
61413 }
61414 - error = buffer_size - rest; /* total size */
61415 + error = total_size;
61416
61417 cleanup:
61418 brelse(bh);
61419 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
61420 index 158b5d4..2432610 100644
61421 --- a/fs/ext3/balloc.c
61422 +++ b/fs/ext3/balloc.c
61423 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
61424
61425 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61426 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61427 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61428 + if (free_blocks < root_blocks + 1 &&
61429 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
61430 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61431 - !in_group_p (sbi->s_resgid))) {
61432 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61433 return 0;
61434 }
61435 return 1;
61436 diff --git a/fs/ext3/super.c b/fs/ext3/super.c
61437 index eb742d0..c19f705 100644
61438 --- a/fs/ext3/super.c
61439 +++ b/fs/ext3/super.c
61440 @@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
61441 #ifdef CONFIG_EXT3_FS_XATTR
61442 if (test_opt(sb, XATTR_USER))
61443 seq_puts(seq, ",user_xattr");
61444 - if (!test_opt(sb, XATTR_USER) &&
61445 - (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
61446 + if (!test_opt(sb, XATTR_USER))
61447 seq_puts(seq, ",nouser_xattr");
61448 - }
61449 #endif
61450 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61451 if (test_opt(sb, POSIX_ACL))
61452 @@ -1749,8 +1747,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
61453 if (def_mount_opts & EXT3_DEFM_UID16)
61454 set_opt(sbi->s_mount_opt, NO_UID32);
61455 #ifdef CONFIG_EXT3_FS_XATTR
61456 - if (def_mount_opts & EXT3_DEFM_XATTR_USER)
61457 - set_opt(sbi->s_mount_opt, XATTR_USER);
61458 + /* always enable user xattrs */
61459 + set_opt(sbi->s_mount_opt, XATTR_USER);
61460 #endif
61461 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61462 if (def_mount_opts & EXT3_DEFM_ACL)
61463 diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
61464 index c6874be..f8a6ae8 100644
61465 --- a/fs/ext3/xattr.c
61466 +++ b/fs/ext3/xattr.c
61467 @@ -330,7 +330,7 @@ static int
61468 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61469 char *buffer, size_t buffer_size)
61470 {
61471 - size_t rest = buffer_size;
61472 + size_t rest = buffer_size, total_size = 0;
61473
61474 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
61475 const struct xattr_handler *handler =
61476 @@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61477 buffer += size;
61478 }
61479 rest -= size;
61480 + total_size += size;
61481 }
61482 }
61483 - return buffer_size - rest;
61484 + return total_size;
61485 }
61486
61487 static int
61488 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
61489 index 83a6f49..d4e4d03 100644
61490 --- a/fs/ext4/balloc.c
61491 +++ b/fs/ext4/balloc.c
61492 @@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
61493 /* Hm, nope. Are (enough) root reserved clusters available? */
61494 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
61495 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
61496 - capable(CAP_SYS_RESOURCE) ||
61497 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
61498 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
61499 + capable_nolog(CAP_SYS_RESOURCE)) {
61500
61501 if (free_clusters >= (nclusters + dirty_clusters +
61502 resv_clusters))
61503 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
61504 index c55a1fa..9904ebb 100644
61505 --- a/fs/ext4/ext4.h
61506 +++ b/fs/ext4/ext4.h
61507 @@ -1279,19 +1279,19 @@ struct ext4_sb_info {
61508 unsigned long s_mb_last_start;
61509
61510 /* stats for buddy allocator */
61511 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
61512 - atomic_t s_bal_success; /* we found long enough chunks */
61513 - atomic_t s_bal_allocated; /* in blocks */
61514 - atomic_t s_bal_ex_scanned; /* total extents scanned */
61515 - atomic_t s_bal_goals; /* goal hits */
61516 - atomic_t s_bal_breaks; /* too long searches */
61517 - atomic_t s_bal_2orders; /* 2^order hits */
61518 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
61519 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
61520 + atomic_unchecked_t s_bal_allocated; /* in blocks */
61521 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
61522 + atomic_unchecked_t s_bal_goals; /* goal hits */
61523 + atomic_unchecked_t s_bal_breaks; /* too long searches */
61524 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
61525 spinlock_t s_bal_lock;
61526 unsigned long s_mb_buddies_generated;
61527 unsigned long long s_mb_generation_time;
61528 - atomic_t s_mb_lost_chunks;
61529 - atomic_t s_mb_preallocated;
61530 - atomic_t s_mb_discarded;
61531 + atomic_unchecked_t s_mb_lost_chunks;
61532 + atomic_unchecked_t s_mb_preallocated;
61533 + atomic_unchecked_t s_mb_discarded;
61534 atomic_t s_lock_busy;
61535
61536 /* locality groups */
61537 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
61538 index dbfe15c..9a6ee8d 100644
61539 --- a/fs/ext4/mballoc.c
61540 +++ b/fs/ext4/mballoc.c
61541 @@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
61542 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
61543
61544 if (EXT4_SB(sb)->s_mb_stats)
61545 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
61546 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
61547
61548 break;
61549 }
61550 @@ -2211,7 +2211,7 @@ repeat:
61551 ac->ac_status = AC_STATUS_CONTINUE;
61552 ac->ac_flags |= EXT4_MB_HINT_FIRST;
61553 cr = 3;
61554 - atomic_inc(&sbi->s_mb_lost_chunks);
61555 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
61556 goto repeat;
61557 }
61558 }
61559 @@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
61560 if (sbi->s_mb_stats) {
61561 ext4_msg(sb, KERN_INFO,
61562 "mballoc: %u blocks %u reqs (%u success)",
61563 - atomic_read(&sbi->s_bal_allocated),
61564 - atomic_read(&sbi->s_bal_reqs),
61565 - atomic_read(&sbi->s_bal_success));
61566 + atomic_read_unchecked(&sbi->s_bal_allocated),
61567 + atomic_read_unchecked(&sbi->s_bal_reqs),
61568 + atomic_read_unchecked(&sbi->s_bal_success));
61569 ext4_msg(sb, KERN_INFO,
61570 "mballoc: %u extents scanned, %u goal hits, "
61571 "%u 2^N hits, %u breaks, %u lost",
61572 - atomic_read(&sbi->s_bal_ex_scanned),
61573 - atomic_read(&sbi->s_bal_goals),
61574 - atomic_read(&sbi->s_bal_2orders),
61575 - atomic_read(&sbi->s_bal_breaks),
61576 - atomic_read(&sbi->s_mb_lost_chunks));
61577 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
61578 + atomic_read_unchecked(&sbi->s_bal_goals),
61579 + atomic_read_unchecked(&sbi->s_bal_2orders),
61580 + atomic_read_unchecked(&sbi->s_bal_breaks),
61581 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
61582 ext4_msg(sb, KERN_INFO,
61583 "mballoc: %lu generated and it took %Lu",
61584 sbi->s_mb_buddies_generated,
61585 sbi->s_mb_generation_time);
61586 ext4_msg(sb, KERN_INFO,
61587 "mballoc: %u preallocated, %u discarded",
61588 - atomic_read(&sbi->s_mb_preallocated),
61589 - atomic_read(&sbi->s_mb_discarded));
61590 + atomic_read_unchecked(&sbi->s_mb_preallocated),
61591 + atomic_read_unchecked(&sbi->s_mb_discarded));
61592 }
61593
61594 free_percpu(sbi->s_locality_groups);
61595 @@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
61596 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
61597
61598 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
61599 - atomic_inc(&sbi->s_bal_reqs);
61600 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61601 + atomic_inc_unchecked(&sbi->s_bal_reqs);
61602 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61603 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
61604 - atomic_inc(&sbi->s_bal_success);
61605 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
61606 + atomic_inc_unchecked(&sbi->s_bal_success);
61607 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
61608 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
61609 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
61610 - atomic_inc(&sbi->s_bal_goals);
61611 + atomic_inc_unchecked(&sbi->s_bal_goals);
61612 if (ac->ac_found > sbi->s_mb_max_to_scan)
61613 - atomic_inc(&sbi->s_bal_breaks);
61614 + atomic_inc_unchecked(&sbi->s_bal_breaks);
61615 }
61616
61617 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
61618 @@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
61619 trace_ext4_mb_new_inode_pa(ac, pa);
61620
61621 ext4_mb_use_inode_pa(ac, pa);
61622 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
61623 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
61624
61625 ei = EXT4_I(ac->ac_inode);
61626 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61627 @@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
61628 trace_ext4_mb_new_group_pa(ac, pa);
61629
61630 ext4_mb_use_group_pa(ac, pa);
61631 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61632 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61633
61634 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61635 lg = ac->ac_lg;
61636 @@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
61637 * from the bitmap and continue.
61638 */
61639 }
61640 - atomic_add(free, &sbi->s_mb_discarded);
61641 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
61642
61643 return err;
61644 }
61645 @@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
61646 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
61647 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
61648 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
61649 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61650 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61651 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
61652
61653 return 0;
61654 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
61655 index 8313ca3..8a37d08 100644
61656 --- a/fs/ext4/mmp.c
61657 +++ b/fs/ext4/mmp.c
61658 @@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
61659 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
61660 const char *function, unsigned int line, const char *msg)
61661 {
61662 - __ext4_warning(sb, function, line, msg);
61663 + __ext4_warning(sb, function, line, "%s", msg);
61664 __ext4_warning(sb, function, line,
61665 "MMP failure info: last update time: %llu, last update "
61666 "node: %s, last update device: %s\n",
61667 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
61668 index 2c9e686..6a40edc 100644
61669 --- a/fs/ext4/super.c
61670 +++ b/fs/ext4/super.c
61671 @@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
61672 }
61673
61674 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
61675 -static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61676 +static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61677 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
61678
61679 #ifdef CONFIG_QUOTA
61680 @@ -2434,7 +2434,7 @@ struct ext4_attr {
61681 int offset;
61682 int deprecated_val;
61683 } u;
61684 -};
61685 +} __do_const;
61686
61687 static int parse_strtoull(const char *buf,
61688 unsigned long long max, unsigned long long *value)
61689 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
61690 index 1e09fc7..0400dd4 100644
61691 --- a/fs/ext4/xattr.c
61692 +++ b/fs/ext4/xattr.c
61693 @@ -399,7 +399,7 @@ static int
61694 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61695 char *buffer, size_t buffer_size)
61696 {
61697 - size_t rest = buffer_size;
61698 + size_t rest = buffer_size, total_size = 0;
61699
61700 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
61701 const struct xattr_handler *handler =
61702 @@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61703 buffer += size;
61704 }
61705 rest -= size;
61706 + total_size += size;
61707 }
61708 }
61709 - return buffer_size - rest;
61710 + return total_size;
61711 }
61712
61713 static int
61714 diff --git a/fs/fcntl.c b/fs/fcntl.c
61715 index 99d440a..eb979d1 100644
61716 --- a/fs/fcntl.c
61717 +++ b/fs/fcntl.c
61718 @@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
61719 int force)
61720 {
61721 security_file_set_fowner(filp);
61722 + if (gr_handle_chroot_fowner(pid, type))
61723 + return;
61724 + if (gr_check_protected_task_fowner(pid, type))
61725 + return;
61726 f_modown(filp, pid, type, force);
61727 }
61728 EXPORT_SYMBOL(__f_setown);
61729 diff --git a/fs/fhandle.c b/fs/fhandle.c
61730 index 999ff5c..ac037c9 100644
61731 --- a/fs/fhandle.c
61732 +++ b/fs/fhandle.c
61733 @@ -8,6 +8,7 @@
61734 #include <linux/fs_struct.h>
61735 #include <linux/fsnotify.h>
61736 #include <linux/personality.h>
61737 +#include <linux/grsecurity.h>
61738 #include <asm/uaccess.h>
61739 #include "internal.h"
61740 #include "mount.h"
61741 @@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
61742 } else
61743 retval = 0;
61744 /* copy the mount id */
61745 - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
61746 - sizeof(*mnt_id)) ||
61747 + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
61748 copy_to_user(ufh, handle,
61749 sizeof(struct file_handle) + handle_bytes))
61750 retval = -EFAULT;
61751 @@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
61752 * the directory. Ideally we would like CAP_DAC_SEARCH.
61753 * But we don't have that
61754 */
61755 - if (!capable(CAP_DAC_READ_SEARCH)) {
61756 + if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
61757 retval = -EPERM;
61758 goto out_err;
61759 }
61760 diff --git a/fs/file.c b/fs/file.c
61761 index ab3eb6a..8de2392 100644
61762 --- a/fs/file.c
61763 +++ b/fs/file.c
61764 @@ -16,6 +16,7 @@
61765 #include <linux/slab.h>
61766 #include <linux/vmalloc.h>
61767 #include <linux/file.h>
61768 +#include <linux/security.h>
61769 #include <linux/fdtable.h>
61770 #include <linux/bitops.h>
61771 #include <linux/interrupt.h>
61772 @@ -139,7 +140,7 @@ out:
61773 * Return <0 error code on error; 1 on successful completion.
61774 * The files->file_lock should be held on entry, and will be held on exit.
61775 */
61776 -static int expand_fdtable(struct files_struct *files, int nr)
61777 +static int expand_fdtable(struct files_struct *files, unsigned int nr)
61778 __releases(files->file_lock)
61779 __acquires(files->file_lock)
61780 {
61781 @@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
61782 * expanded and execution may have blocked.
61783 * The files->file_lock should be held on entry, and will be held on exit.
61784 */
61785 -static int expand_files(struct files_struct *files, int nr)
61786 +static int expand_files(struct files_struct *files, unsigned int nr)
61787 {
61788 struct fdtable *fdt;
61789
61790 @@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
61791 if (!file)
61792 return __close_fd(files, fd);
61793
61794 + gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
61795 if (fd >= rlimit(RLIMIT_NOFILE))
61796 return -EBADF;
61797
61798 @@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
61799 if (unlikely(oldfd == newfd))
61800 return -EINVAL;
61801
61802 + gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
61803 if (newfd >= rlimit(RLIMIT_NOFILE))
61804 return -EBADF;
61805
61806 @@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
61807 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
61808 {
61809 int err;
61810 + gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
61811 if (from >= rlimit(RLIMIT_NOFILE))
61812 return -EINVAL;
61813 err = alloc_fd(from, flags);
61814 diff --git a/fs/filesystems.c b/fs/filesystems.c
61815 index 5797d45..7d7d79a 100644
61816 --- a/fs/filesystems.c
61817 +++ b/fs/filesystems.c
61818 @@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
61819 int len = dot ? dot - name : strlen(name);
61820
61821 fs = __get_fs_type(name, len);
61822 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
61823 + if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
61824 +#else
61825 if (!fs && (request_module("fs-%.*s", len, name) == 0))
61826 +#endif
61827 fs = __get_fs_type(name, len);
61828
61829 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
61830 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
61831 index 7dca743..543d620 100644
61832 --- a/fs/fs_struct.c
61833 +++ b/fs/fs_struct.c
61834 @@ -4,6 +4,7 @@
61835 #include <linux/path.h>
61836 #include <linux/slab.h>
61837 #include <linux/fs_struct.h>
61838 +#include <linux/grsecurity.h>
61839 #include "internal.h"
61840
61841 /*
61842 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
61843 write_seqcount_begin(&fs->seq);
61844 old_root = fs->root;
61845 fs->root = *path;
61846 + gr_set_chroot_entries(current, path);
61847 write_seqcount_end(&fs->seq);
61848 spin_unlock(&fs->lock);
61849 if (old_root.dentry)
61850 @@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
61851 int hits = 0;
61852 spin_lock(&fs->lock);
61853 write_seqcount_begin(&fs->seq);
61854 + /* this root replacement is only done by pivot_root,
61855 + leave grsec's chroot tagging alone for this task
61856 + so that a pivoted root isn't treated as a chroot
61857 + */
61858 hits += replace_path(&fs->root, old_root, new_root);
61859 hits += replace_path(&fs->pwd, old_root, new_root);
61860 write_seqcount_end(&fs->seq);
61861 @@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
61862 task_lock(tsk);
61863 spin_lock(&fs->lock);
61864 tsk->fs = NULL;
61865 - kill = !--fs->users;
61866 + gr_clear_chroot_entries(tsk);
61867 + kill = !atomic_dec_return(&fs->users);
61868 spin_unlock(&fs->lock);
61869 task_unlock(tsk);
61870 if (kill)
61871 @@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61872 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
61873 /* We don't need to lock fs - think why ;-) */
61874 if (fs) {
61875 - fs->users = 1;
61876 + atomic_set(&fs->users, 1);
61877 fs->in_exec = 0;
61878 spin_lock_init(&fs->lock);
61879 seqcount_init(&fs->seq);
61880 @@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61881 spin_lock(&old->lock);
61882 fs->root = old->root;
61883 path_get(&fs->root);
61884 + /* instead of calling gr_set_chroot_entries here,
61885 + we call it from every caller of this function
61886 + */
61887 fs->pwd = old->pwd;
61888 path_get(&fs->pwd);
61889 spin_unlock(&old->lock);
61890 @@ -139,8 +149,9 @@ int unshare_fs_struct(void)
61891
61892 task_lock(current);
61893 spin_lock(&fs->lock);
61894 - kill = !--fs->users;
61895 + kill = !atomic_dec_return(&fs->users);
61896 current->fs = new_fs;
61897 + gr_set_chroot_entries(current, &new_fs->root);
61898 spin_unlock(&fs->lock);
61899 task_unlock(current);
61900
61901 @@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
61902
61903 int current_umask(void)
61904 {
61905 - return current->fs->umask;
61906 + return current->fs->umask | gr_acl_umask();
61907 }
61908 EXPORT_SYMBOL(current_umask);
61909
61910 /* to be mentioned only in INIT_TASK */
61911 struct fs_struct init_fs = {
61912 - .users = 1,
61913 + .users = ATOMIC_INIT(1),
61914 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
61915 .seq = SEQCNT_ZERO(init_fs.seq),
61916 .umask = 0022,
61917 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
61918 index 89acec7..a575262 100644
61919 --- a/fs/fscache/cookie.c
61920 +++ b/fs/fscache/cookie.c
61921 @@ -19,7 +19,7 @@
61922
61923 struct kmem_cache *fscache_cookie_jar;
61924
61925 -static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
61926 +static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
61927
61928 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
61929 static int fscache_alloc_object(struct fscache_cache *cache,
61930 @@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
61931 parent ? (char *) parent->def->name : "<no-parent>",
61932 def->name, netfs_data, enable);
61933
61934 - fscache_stat(&fscache_n_acquires);
61935 + fscache_stat_unchecked(&fscache_n_acquires);
61936
61937 /* if there's no parent cookie, then we don't create one here either */
61938 if (!parent) {
61939 - fscache_stat(&fscache_n_acquires_null);
61940 + fscache_stat_unchecked(&fscache_n_acquires_null);
61941 _leave(" [no parent]");
61942 return NULL;
61943 }
61944 @@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
61945 /* allocate and initialise a cookie */
61946 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
61947 if (!cookie) {
61948 - fscache_stat(&fscache_n_acquires_oom);
61949 + fscache_stat_unchecked(&fscache_n_acquires_oom);
61950 _leave(" [ENOMEM]");
61951 return NULL;
61952 }
61953 @@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
61954
61955 switch (cookie->def->type) {
61956 case FSCACHE_COOKIE_TYPE_INDEX:
61957 - fscache_stat(&fscache_n_cookie_index);
61958 + fscache_stat_unchecked(&fscache_n_cookie_index);
61959 break;
61960 case FSCACHE_COOKIE_TYPE_DATAFILE:
61961 - fscache_stat(&fscache_n_cookie_data);
61962 + fscache_stat_unchecked(&fscache_n_cookie_data);
61963 break;
61964 default:
61965 - fscache_stat(&fscache_n_cookie_special);
61966 + fscache_stat_unchecked(&fscache_n_cookie_special);
61967 break;
61968 }
61969
61970 @@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
61971 } else {
61972 atomic_dec(&parent->n_children);
61973 __fscache_cookie_put(cookie);
61974 - fscache_stat(&fscache_n_acquires_nobufs);
61975 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
61976 _leave(" = NULL");
61977 return NULL;
61978 }
61979 @@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
61980 }
61981 }
61982
61983 - fscache_stat(&fscache_n_acquires_ok);
61984 + fscache_stat_unchecked(&fscache_n_acquires_ok);
61985 _leave(" = %p", cookie);
61986 return cookie;
61987 }
61988 @@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
61989 cache = fscache_select_cache_for_object(cookie->parent);
61990 if (!cache) {
61991 up_read(&fscache_addremove_sem);
61992 - fscache_stat(&fscache_n_acquires_no_cache);
61993 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
61994 _leave(" = -ENOMEDIUM [no cache]");
61995 return -ENOMEDIUM;
61996 }
61997 @@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
61998 object = cache->ops->alloc_object(cache, cookie);
61999 fscache_stat_d(&fscache_n_cop_alloc_object);
62000 if (IS_ERR(object)) {
62001 - fscache_stat(&fscache_n_object_no_alloc);
62002 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
62003 ret = PTR_ERR(object);
62004 goto error;
62005 }
62006
62007 - fscache_stat(&fscache_n_object_alloc);
62008 + fscache_stat_unchecked(&fscache_n_object_alloc);
62009
62010 - object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62011 + object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62012
62013 _debug("ALLOC OBJ%x: %s {%lx}",
62014 object->debug_id, cookie->def->name, object->events);
62015 @@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62016
62017 _enter("{%s}", cookie->def->name);
62018
62019 - fscache_stat(&fscache_n_invalidates);
62020 + fscache_stat_unchecked(&fscache_n_invalidates);
62021
62022 /* Only permit invalidation of data files. Invalidating an index will
62023 * require the caller to release all its attachments to the tree rooted
62024 @@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62025 {
62026 struct fscache_object *object;
62027
62028 - fscache_stat(&fscache_n_updates);
62029 + fscache_stat_unchecked(&fscache_n_updates);
62030
62031 if (!cookie) {
62032 - fscache_stat(&fscache_n_updates_null);
62033 + fscache_stat_unchecked(&fscache_n_updates_null);
62034 _leave(" [no cookie]");
62035 return;
62036 }
62037 @@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62038 */
62039 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62040 {
62041 - fscache_stat(&fscache_n_relinquishes);
62042 + fscache_stat_unchecked(&fscache_n_relinquishes);
62043 if (retire)
62044 - fscache_stat(&fscache_n_relinquishes_retire);
62045 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62046
62047 if (!cookie) {
62048 - fscache_stat(&fscache_n_relinquishes_null);
62049 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
62050 _leave(" [no cookie]");
62051 return;
62052 }
62053 @@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62054 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62055 goto inconsistent;
62056
62057 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62058 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62059
62060 __fscache_use_cookie(cookie);
62061 if (fscache_submit_op(object, op) < 0)
62062 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62063 index 7872a62..d91b19f 100644
62064 --- a/fs/fscache/internal.h
62065 +++ b/fs/fscache/internal.h
62066 @@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62067 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62068 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62069 struct fscache_operation *,
62070 - atomic_t *,
62071 - atomic_t *,
62072 + atomic_unchecked_t *,
62073 + atomic_unchecked_t *,
62074 void (*)(struct fscache_operation *));
62075 extern void fscache_invalidate_writes(struct fscache_cookie *);
62076
62077 @@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62078 * stats.c
62079 */
62080 #ifdef CONFIG_FSCACHE_STATS
62081 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62082 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62083 +extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62084 +extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62085
62086 -extern atomic_t fscache_n_op_pend;
62087 -extern atomic_t fscache_n_op_run;
62088 -extern atomic_t fscache_n_op_enqueue;
62089 -extern atomic_t fscache_n_op_deferred_release;
62090 -extern atomic_t fscache_n_op_release;
62091 -extern atomic_t fscache_n_op_gc;
62092 -extern atomic_t fscache_n_op_cancelled;
62093 -extern atomic_t fscache_n_op_rejected;
62094 +extern atomic_unchecked_t fscache_n_op_pend;
62095 +extern atomic_unchecked_t fscache_n_op_run;
62096 +extern atomic_unchecked_t fscache_n_op_enqueue;
62097 +extern atomic_unchecked_t fscache_n_op_deferred_release;
62098 +extern atomic_unchecked_t fscache_n_op_release;
62099 +extern atomic_unchecked_t fscache_n_op_gc;
62100 +extern atomic_unchecked_t fscache_n_op_cancelled;
62101 +extern atomic_unchecked_t fscache_n_op_rejected;
62102
62103 -extern atomic_t fscache_n_attr_changed;
62104 -extern atomic_t fscache_n_attr_changed_ok;
62105 -extern atomic_t fscache_n_attr_changed_nobufs;
62106 -extern atomic_t fscache_n_attr_changed_nomem;
62107 -extern atomic_t fscache_n_attr_changed_calls;
62108 +extern atomic_unchecked_t fscache_n_attr_changed;
62109 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
62110 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62111 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62112 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
62113
62114 -extern atomic_t fscache_n_allocs;
62115 -extern atomic_t fscache_n_allocs_ok;
62116 -extern atomic_t fscache_n_allocs_wait;
62117 -extern atomic_t fscache_n_allocs_nobufs;
62118 -extern atomic_t fscache_n_allocs_intr;
62119 -extern atomic_t fscache_n_allocs_object_dead;
62120 -extern atomic_t fscache_n_alloc_ops;
62121 -extern atomic_t fscache_n_alloc_op_waits;
62122 +extern atomic_unchecked_t fscache_n_allocs;
62123 +extern atomic_unchecked_t fscache_n_allocs_ok;
62124 +extern atomic_unchecked_t fscache_n_allocs_wait;
62125 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
62126 +extern atomic_unchecked_t fscache_n_allocs_intr;
62127 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
62128 +extern atomic_unchecked_t fscache_n_alloc_ops;
62129 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
62130
62131 -extern atomic_t fscache_n_retrievals;
62132 -extern atomic_t fscache_n_retrievals_ok;
62133 -extern atomic_t fscache_n_retrievals_wait;
62134 -extern atomic_t fscache_n_retrievals_nodata;
62135 -extern atomic_t fscache_n_retrievals_nobufs;
62136 -extern atomic_t fscache_n_retrievals_intr;
62137 -extern atomic_t fscache_n_retrievals_nomem;
62138 -extern atomic_t fscache_n_retrievals_object_dead;
62139 -extern atomic_t fscache_n_retrieval_ops;
62140 -extern atomic_t fscache_n_retrieval_op_waits;
62141 +extern atomic_unchecked_t fscache_n_retrievals;
62142 +extern atomic_unchecked_t fscache_n_retrievals_ok;
62143 +extern atomic_unchecked_t fscache_n_retrievals_wait;
62144 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
62145 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62146 +extern atomic_unchecked_t fscache_n_retrievals_intr;
62147 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
62148 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62149 +extern atomic_unchecked_t fscache_n_retrieval_ops;
62150 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62151
62152 -extern atomic_t fscache_n_stores;
62153 -extern atomic_t fscache_n_stores_ok;
62154 -extern atomic_t fscache_n_stores_again;
62155 -extern atomic_t fscache_n_stores_nobufs;
62156 -extern atomic_t fscache_n_stores_oom;
62157 -extern atomic_t fscache_n_store_ops;
62158 -extern atomic_t fscache_n_store_calls;
62159 -extern atomic_t fscache_n_store_pages;
62160 -extern atomic_t fscache_n_store_radix_deletes;
62161 -extern atomic_t fscache_n_store_pages_over_limit;
62162 +extern atomic_unchecked_t fscache_n_stores;
62163 +extern atomic_unchecked_t fscache_n_stores_ok;
62164 +extern atomic_unchecked_t fscache_n_stores_again;
62165 +extern atomic_unchecked_t fscache_n_stores_nobufs;
62166 +extern atomic_unchecked_t fscache_n_stores_oom;
62167 +extern atomic_unchecked_t fscache_n_store_ops;
62168 +extern atomic_unchecked_t fscache_n_store_calls;
62169 +extern atomic_unchecked_t fscache_n_store_pages;
62170 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
62171 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62172
62173 -extern atomic_t fscache_n_store_vmscan_not_storing;
62174 -extern atomic_t fscache_n_store_vmscan_gone;
62175 -extern atomic_t fscache_n_store_vmscan_busy;
62176 -extern atomic_t fscache_n_store_vmscan_cancelled;
62177 -extern atomic_t fscache_n_store_vmscan_wait;
62178 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62179 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62180 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62181 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62182 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62183
62184 -extern atomic_t fscache_n_marks;
62185 -extern atomic_t fscache_n_uncaches;
62186 +extern atomic_unchecked_t fscache_n_marks;
62187 +extern atomic_unchecked_t fscache_n_uncaches;
62188
62189 -extern atomic_t fscache_n_acquires;
62190 -extern atomic_t fscache_n_acquires_null;
62191 -extern atomic_t fscache_n_acquires_no_cache;
62192 -extern atomic_t fscache_n_acquires_ok;
62193 -extern atomic_t fscache_n_acquires_nobufs;
62194 -extern atomic_t fscache_n_acquires_oom;
62195 +extern atomic_unchecked_t fscache_n_acquires;
62196 +extern atomic_unchecked_t fscache_n_acquires_null;
62197 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
62198 +extern atomic_unchecked_t fscache_n_acquires_ok;
62199 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
62200 +extern atomic_unchecked_t fscache_n_acquires_oom;
62201
62202 -extern atomic_t fscache_n_invalidates;
62203 -extern atomic_t fscache_n_invalidates_run;
62204 +extern atomic_unchecked_t fscache_n_invalidates;
62205 +extern atomic_unchecked_t fscache_n_invalidates_run;
62206
62207 -extern atomic_t fscache_n_updates;
62208 -extern atomic_t fscache_n_updates_null;
62209 -extern atomic_t fscache_n_updates_run;
62210 +extern atomic_unchecked_t fscache_n_updates;
62211 +extern atomic_unchecked_t fscache_n_updates_null;
62212 +extern atomic_unchecked_t fscache_n_updates_run;
62213
62214 -extern atomic_t fscache_n_relinquishes;
62215 -extern atomic_t fscache_n_relinquishes_null;
62216 -extern atomic_t fscache_n_relinquishes_waitcrt;
62217 -extern atomic_t fscache_n_relinquishes_retire;
62218 +extern atomic_unchecked_t fscache_n_relinquishes;
62219 +extern atomic_unchecked_t fscache_n_relinquishes_null;
62220 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62221 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
62222
62223 -extern atomic_t fscache_n_cookie_index;
62224 -extern atomic_t fscache_n_cookie_data;
62225 -extern atomic_t fscache_n_cookie_special;
62226 +extern atomic_unchecked_t fscache_n_cookie_index;
62227 +extern atomic_unchecked_t fscache_n_cookie_data;
62228 +extern atomic_unchecked_t fscache_n_cookie_special;
62229
62230 -extern atomic_t fscache_n_object_alloc;
62231 -extern atomic_t fscache_n_object_no_alloc;
62232 -extern atomic_t fscache_n_object_lookups;
62233 -extern atomic_t fscache_n_object_lookups_negative;
62234 -extern atomic_t fscache_n_object_lookups_positive;
62235 -extern atomic_t fscache_n_object_lookups_timed_out;
62236 -extern atomic_t fscache_n_object_created;
62237 -extern atomic_t fscache_n_object_avail;
62238 -extern atomic_t fscache_n_object_dead;
62239 +extern atomic_unchecked_t fscache_n_object_alloc;
62240 +extern atomic_unchecked_t fscache_n_object_no_alloc;
62241 +extern atomic_unchecked_t fscache_n_object_lookups;
62242 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
62243 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
62244 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62245 +extern atomic_unchecked_t fscache_n_object_created;
62246 +extern atomic_unchecked_t fscache_n_object_avail;
62247 +extern atomic_unchecked_t fscache_n_object_dead;
62248
62249 -extern atomic_t fscache_n_checkaux_none;
62250 -extern atomic_t fscache_n_checkaux_okay;
62251 -extern atomic_t fscache_n_checkaux_update;
62252 -extern atomic_t fscache_n_checkaux_obsolete;
62253 +extern atomic_unchecked_t fscache_n_checkaux_none;
62254 +extern atomic_unchecked_t fscache_n_checkaux_okay;
62255 +extern atomic_unchecked_t fscache_n_checkaux_update;
62256 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62257
62258 extern atomic_t fscache_n_cop_alloc_object;
62259 extern atomic_t fscache_n_cop_lookup_object;
62260 @@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62261 atomic_inc(stat);
62262 }
62263
62264 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62265 +{
62266 + atomic_inc_unchecked(stat);
62267 +}
62268 +
62269 static inline void fscache_stat_d(atomic_t *stat)
62270 {
62271 atomic_dec(stat);
62272 @@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62273
62274 #define __fscache_stat(stat) (NULL)
62275 #define fscache_stat(stat) do {} while (0)
62276 +#define fscache_stat_unchecked(stat) do {} while (0)
62277 #define fscache_stat_d(stat) do {} while (0)
62278 #endif
62279
62280 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62281 index da032da..0076ce7 100644
62282 --- a/fs/fscache/object.c
62283 +++ b/fs/fscache/object.c
62284 @@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62285 _debug("LOOKUP \"%s\" in \"%s\"",
62286 cookie->def->name, object->cache->tag->name);
62287
62288 - fscache_stat(&fscache_n_object_lookups);
62289 + fscache_stat_unchecked(&fscache_n_object_lookups);
62290 fscache_stat(&fscache_n_cop_lookup_object);
62291 ret = object->cache->ops->lookup_object(object);
62292 fscache_stat_d(&fscache_n_cop_lookup_object);
62293 @@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62294 if (ret == -ETIMEDOUT) {
62295 /* probably stuck behind another object, so move this one to
62296 * the back of the queue */
62297 - fscache_stat(&fscache_n_object_lookups_timed_out);
62298 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62299 _leave(" [timeout]");
62300 return NO_TRANSIT;
62301 }
62302 @@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62303 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62304
62305 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62306 - fscache_stat(&fscache_n_object_lookups_negative);
62307 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62308
62309 /* Allow write requests to begin stacking up and read requests to begin
62310 * returning ENODATA.
62311 @@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62312 /* if we were still looking up, then we must have a positive lookup
62313 * result, in which case there may be data available */
62314 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62315 - fscache_stat(&fscache_n_object_lookups_positive);
62316 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62317
62318 /* We do (presumably) have data */
62319 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62320 @@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62321 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62322 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
62323 } else {
62324 - fscache_stat(&fscache_n_object_created);
62325 + fscache_stat_unchecked(&fscache_n_object_created);
62326 }
62327
62328 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
62329 @@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
62330 fscache_stat_d(&fscache_n_cop_lookup_complete);
62331
62332 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
62333 - fscache_stat(&fscache_n_object_avail);
62334 + fscache_stat_unchecked(&fscache_n_object_avail);
62335
62336 _leave("");
62337 return transit_to(JUMPSTART_DEPS);
62338 @@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
62339
62340 /* this just shifts the object release to the work processor */
62341 fscache_put_object(object);
62342 - fscache_stat(&fscache_n_object_dead);
62343 + fscache_stat_unchecked(&fscache_n_object_dead);
62344
62345 _leave("");
62346 return transit_to(OBJECT_DEAD);
62347 @@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62348 enum fscache_checkaux result;
62349
62350 if (!object->cookie->def->check_aux) {
62351 - fscache_stat(&fscache_n_checkaux_none);
62352 + fscache_stat_unchecked(&fscache_n_checkaux_none);
62353 return FSCACHE_CHECKAUX_OKAY;
62354 }
62355
62356 @@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62357 switch (result) {
62358 /* entry okay as is */
62359 case FSCACHE_CHECKAUX_OKAY:
62360 - fscache_stat(&fscache_n_checkaux_okay);
62361 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
62362 break;
62363
62364 /* entry requires update */
62365 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
62366 - fscache_stat(&fscache_n_checkaux_update);
62367 + fscache_stat_unchecked(&fscache_n_checkaux_update);
62368 break;
62369
62370 /* entry requires deletion */
62371 case FSCACHE_CHECKAUX_OBSOLETE:
62372 - fscache_stat(&fscache_n_checkaux_obsolete);
62373 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
62374 break;
62375
62376 default:
62377 @@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
62378 {
62379 const struct fscache_state *s;
62380
62381 - fscache_stat(&fscache_n_invalidates_run);
62382 + fscache_stat_unchecked(&fscache_n_invalidates_run);
62383 fscache_stat(&fscache_n_cop_invalidate_object);
62384 s = _fscache_invalidate_object(object, event);
62385 fscache_stat_d(&fscache_n_cop_invalidate_object);
62386 @@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
62387 {
62388 _enter("{OBJ%x},%d", object->debug_id, event);
62389
62390 - fscache_stat(&fscache_n_updates_run);
62391 + fscache_stat_unchecked(&fscache_n_updates_run);
62392 fscache_stat(&fscache_n_cop_update_object);
62393 object->cache->ops->update_object(object);
62394 fscache_stat_d(&fscache_n_cop_update_object);
62395 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
62396 index e7b87a0..a85d47a 100644
62397 --- a/fs/fscache/operation.c
62398 +++ b/fs/fscache/operation.c
62399 @@ -17,7 +17,7 @@
62400 #include <linux/slab.h>
62401 #include "internal.h"
62402
62403 -atomic_t fscache_op_debug_id;
62404 +atomic_unchecked_t fscache_op_debug_id;
62405 EXPORT_SYMBOL(fscache_op_debug_id);
62406
62407 /**
62408 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
62409 ASSERTCMP(atomic_read(&op->usage), >, 0);
62410 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
62411
62412 - fscache_stat(&fscache_n_op_enqueue);
62413 + fscache_stat_unchecked(&fscache_n_op_enqueue);
62414 switch (op->flags & FSCACHE_OP_TYPE) {
62415 case FSCACHE_OP_ASYNC:
62416 _debug("queue async");
62417 @@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
62418 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
62419 if (op->processor)
62420 fscache_enqueue_operation(op);
62421 - fscache_stat(&fscache_n_op_run);
62422 + fscache_stat_unchecked(&fscache_n_op_run);
62423 }
62424
62425 /*
62426 @@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62427 if (object->n_in_progress > 0) {
62428 atomic_inc(&op->usage);
62429 list_add_tail(&op->pend_link, &object->pending_ops);
62430 - fscache_stat(&fscache_n_op_pend);
62431 + fscache_stat_unchecked(&fscache_n_op_pend);
62432 } else if (!list_empty(&object->pending_ops)) {
62433 atomic_inc(&op->usage);
62434 list_add_tail(&op->pend_link, &object->pending_ops);
62435 - fscache_stat(&fscache_n_op_pend);
62436 + fscache_stat_unchecked(&fscache_n_op_pend);
62437 fscache_start_operations(object);
62438 } else {
62439 ASSERTCMP(object->n_in_progress, ==, 0);
62440 @@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62441 object->n_exclusive++; /* reads and writes must wait */
62442 atomic_inc(&op->usage);
62443 list_add_tail(&op->pend_link, &object->pending_ops);
62444 - fscache_stat(&fscache_n_op_pend);
62445 + fscache_stat_unchecked(&fscache_n_op_pend);
62446 ret = 0;
62447 } else {
62448 /* If we're in any other state, there must have been an I/O
62449 @@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
62450 if (object->n_exclusive > 0) {
62451 atomic_inc(&op->usage);
62452 list_add_tail(&op->pend_link, &object->pending_ops);
62453 - fscache_stat(&fscache_n_op_pend);
62454 + fscache_stat_unchecked(&fscache_n_op_pend);
62455 } else if (!list_empty(&object->pending_ops)) {
62456 atomic_inc(&op->usage);
62457 list_add_tail(&op->pend_link, &object->pending_ops);
62458 - fscache_stat(&fscache_n_op_pend);
62459 + fscache_stat_unchecked(&fscache_n_op_pend);
62460 fscache_start_operations(object);
62461 } else {
62462 ASSERTCMP(object->n_exclusive, ==, 0);
62463 @@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
62464 object->n_ops++;
62465 atomic_inc(&op->usage);
62466 list_add_tail(&op->pend_link, &object->pending_ops);
62467 - fscache_stat(&fscache_n_op_pend);
62468 + fscache_stat_unchecked(&fscache_n_op_pend);
62469 ret = 0;
62470 } else if (fscache_object_is_dying(object)) {
62471 - fscache_stat(&fscache_n_op_rejected);
62472 + fscache_stat_unchecked(&fscache_n_op_rejected);
62473 op->state = FSCACHE_OP_ST_CANCELLED;
62474 ret = -ENOBUFS;
62475 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
62476 @@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
62477 ret = -EBUSY;
62478 if (op->state == FSCACHE_OP_ST_PENDING) {
62479 ASSERT(!list_empty(&op->pend_link));
62480 - fscache_stat(&fscache_n_op_cancelled);
62481 + fscache_stat_unchecked(&fscache_n_op_cancelled);
62482 list_del_init(&op->pend_link);
62483 if (do_cancel)
62484 do_cancel(op);
62485 @@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
62486 while (!list_empty(&object->pending_ops)) {
62487 op = list_entry(object->pending_ops.next,
62488 struct fscache_operation, pend_link);
62489 - fscache_stat(&fscache_n_op_cancelled);
62490 + fscache_stat_unchecked(&fscache_n_op_cancelled);
62491 list_del_init(&op->pend_link);
62492
62493 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
62494 @@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
62495 op->state, ==, FSCACHE_OP_ST_CANCELLED);
62496 op->state = FSCACHE_OP_ST_DEAD;
62497
62498 - fscache_stat(&fscache_n_op_release);
62499 + fscache_stat_unchecked(&fscache_n_op_release);
62500
62501 if (op->release) {
62502 op->release(op);
62503 @@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
62504 * lock, and defer it otherwise */
62505 if (!spin_trylock(&object->lock)) {
62506 _debug("defer put");
62507 - fscache_stat(&fscache_n_op_deferred_release);
62508 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
62509
62510 cache = object->cache;
62511 spin_lock(&cache->op_gc_list_lock);
62512 @@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
62513
62514 _debug("GC DEFERRED REL OBJ%x OP%x",
62515 object->debug_id, op->debug_id);
62516 - fscache_stat(&fscache_n_op_gc);
62517 + fscache_stat_unchecked(&fscache_n_op_gc);
62518
62519 ASSERTCMP(atomic_read(&op->usage), ==, 0);
62520 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
62521 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
62522 index de33b3f..8be4d29 100644
62523 --- a/fs/fscache/page.c
62524 +++ b/fs/fscache/page.c
62525 @@ -74,7 +74,7 @@ try_again:
62526 val = radix_tree_lookup(&cookie->stores, page->index);
62527 if (!val) {
62528 rcu_read_unlock();
62529 - fscache_stat(&fscache_n_store_vmscan_not_storing);
62530 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
62531 __fscache_uncache_page(cookie, page);
62532 return true;
62533 }
62534 @@ -104,11 +104,11 @@ try_again:
62535 spin_unlock(&cookie->stores_lock);
62536
62537 if (xpage) {
62538 - fscache_stat(&fscache_n_store_vmscan_cancelled);
62539 - fscache_stat(&fscache_n_store_radix_deletes);
62540 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
62541 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62542 ASSERTCMP(xpage, ==, page);
62543 } else {
62544 - fscache_stat(&fscache_n_store_vmscan_gone);
62545 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
62546 }
62547
62548 wake_up_bit(&cookie->flags, 0);
62549 @@ -123,11 +123,11 @@ page_busy:
62550 * sleeping on memory allocation, so we may need to impose a timeout
62551 * too. */
62552 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
62553 - fscache_stat(&fscache_n_store_vmscan_busy);
62554 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
62555 return false;
62556 }
62557
62558 - fscache_stat(&fscache_n_store_vmscan_wait);
62559 + fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
62560 if (!release_page_wait_timeout(cookie, page))
62561 _debug("fscache writeout timeout page: %p{%lx}",
62562 page, page->index);
62563 @@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
62564 FSCACHE_COOKIE_STORING_TAG);
62565 if (!radix_tree_tag_get(&cookie->stores, page->index,
62566 FSCACHE_COOKIE_PENDING_TAG)) {
62567 - fscache_stat(&fscache_n_store_radix_deletes);
62568 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62569 xpage = radix_tree_delete(&cookie->stores, page->index);
62570 }
62571 spin_unlock(&cookie->stores_lock);
62572 @@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
62573
62574 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
62575
62576 - fscache_stat(&fscache_n_attr_changed_calls);
62577 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
62578
62579 if (fscache_object_is_active(object)) {
62580 fscache_stat(&fscache_n_cop_attr_changed);
62581 @@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62582
62583 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62584
62585 - fscache_stat(&fscache_n_attr_changed);
62586 + fscache_stat_unchecked(&fscache_n_attr_changed);
62587
62588 op = kzalloc(sizeof(*op), GFP_KERNEL);
62589 if (!op) {
62590 - fscache_stat(&fscache_n_attr_changed_nomem);
62591 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
62592 _leave(" = -ENOMEM");
62593 return -ENOMEM;
62594 }
62595 @@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62596 if (fscache_submit_exclusive_op(object, op) < 0)
62597 goto nobufs_dec;
62598 spin_unlock(&cookie->lock);
62599 - fscache_stat(&fscache_n_attr_changed_ok);
62600 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
62601 fscache_put_operation(op);
62602 _leave(" = 0");
62603 return 0;
62604 @@ -242,7 +242,7 @@ nobufs:
62605 kfree(op);
62606 if (wake_cookie)
62607 __fscache_wake_unused_cookie(cookie);
62608 - fscache_stat(&fscache_n_attr_changed_nobufs);
62609 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
62610 _leave(" = %d", -ENOBUFS);
62611 return -ENOBUFS;
62612 }
62613 @@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
62614 /* allocate a retrieval operation and attempt to submit it */
62615 op = kzalloc(sizeof(*op), GFP_NOIO);
62616 if (!op) {
62617 - fscache_stat(&fscache_n_retrievals_nomem);
62618 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62619 return NULL;
62620 }
62621
62622 @@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
62623 return 0;
62624 }
62625
62626 - fscache_stat(&fscache_n_retrievals_wait);
62627 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
62628
62629 jif = jiffies;
62630 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
62631 TASK_INTERRUPTIBLE) != 0) {
62632 - fscache_stat(&fscache_n_retrievals_intr);
62633 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62634 _leave(" = -ERESTARTSYS");
62635 return -ERESTARTSYS;
62636 }
62637 @@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
62638 */
62639 int fscache_wait_for_operation_activation(struct fscache_object *object,
62640 struct fscache_operation *op,
62641 - atomic_t *stat_op_waits,
62642 - atomic_t *stat_object_dead,
62643 + atomic_unchecked_t *stat_op_waits,
62644 + atomic_unchecked_t *stat_object_dead,
62645 void (*do_cancel)(struct fscache_operation *))
62646 {
62647 int ret;
62648 @@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62649
62650 _debug(">>> WT");
62651 if (stat_op_waits)
62652 - fscache_stat(stat_op_waits);
62653 + fscache_stat_unchecked(stat_op_waits);
62654 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
62655 TASK_INTERRUPTIBLE) != 0) {
62656 ret = fscache_cancel_op(op, do_cancel);
62657 @@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62658 check_if_dead:
62659 if (op->state == FSCACHE_OP_ST_CANCELLED) {
62660 if (stat_object_dead)
62661 - fscache_stat(stat_object_dead);
62662 + fscache_stat_unchecked(stat_object_dead);
62663 _leave(" = -ENOBUFS [cancelled]");
62664 return -ENOBUFS;
62665 }
62666 @@ -381,7 +381,7 @@ check_if_dead:
62667 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
62668 fscache_cancel_op(op, do_cancel);
62669 if (stat_object_dead)
62670 - fscache_stat(stat_object_dead);
62671 + fscache_stat_unchecked(stat_object_dead);
62672 return -ENOBUFS;
62673 }
62674 return 0;
62675 @@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62676
62677 _enter("%p,%p,,,", cookie, page);
62678
62679 - fscache_stat(&fscache_n_retrievals);
62680 + fscache_stat_unchecked(&fscache_n_retrievals);
62681
62682 if (hlist_empty(&cookie->backing_objects))
62683 goto nobufs;
62684 @@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62685 goto nobufs_unlock_dec;
62686 spin_unlock(&cookie->lock);
62687
62688 - fscache_stat(&fscache_n_retrieval_ops);
62689 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
62690
62691 /* pin the netfs read context in case we need to do the actual netfs
62692 * read because we've encountered a cache read failure */
62693 @@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62694
62695 error:
62696 if (ret == -ENOMEM)
62697 - fscache_stat(&fscache_n_retrievals_nomem);
62698 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62699 else if (ret == -ERESTARTSYS)
62700 - fscache_stat(&fscache_n_retrievals_intr);
62701 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62702 else if (ret == -ENODATA)
62703 - fscache_stat(&fscache_n_retrievals_nodata);
62704 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62705 else if (ret < 0)
62706 - fscache_stat(&fscache_n_retrievals_nobufs);
62707 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62708 else
62709 - fscache_stat(&fscache_n_retrievals_ok);
62710 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
62711
62712 fscache_put_retrieval(op);
62713 _leave(" = %d", ret);
62714 @@ -505,7 +505,7 @@ nobufs_unlock:
62715 __fscache_wake_unused_cookie(cookie);
62716 kfree(op);
62717 nobufs:
62718 - fscache_stat(&fscache_n_retrievals_nobufs);
62719 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62720 _leave(" = -ENOBUFS");
62721 return -ENOBUFS;
62722 }
62723 @@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62724
62725 _enter("%p,,%d,,,", cookie, *nr_pages);
62726
62727 - fscache_stat(&fscache_n_retrievals);
62728 + fscache_stat_unchecked(&fscache_n_retrievals);
62729
62730 if (hlist_empty(&cookie->backing_objects))
62731 goto nobufs;
62732 @@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62733 goto nobufs_unlock_dec;
62734 spin_unlock(&cookie->lock);
62735
62736 - fscache_stat(&fscache_n_retrieval_ops);
62737 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
62738
62739 /* pin the netfs read context in case we need to do the actual netfs
62740 * read because we've encountered a cache read failure */
62741 @@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62742
62743 error:
62744 if (ret == -ENOMEM)
62745 - fscache_stat(&fscache_n_retrievals_nomem);
62746 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62747 else if (ret == -ERESTARTSYS)
62748 - fscache_stat(&fscache_n_retrievals_intr);
62749 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62750 else if (ret == -ENODATA)
62751 - fscache_stat(&fscache_n_retrievals_nodata);
62752 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62753 else if (ret < 0)
62754 - fscache_stat(&fscache_n_retrievals_nobufs);
62755 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62756 else
62757 - fscache_stat(&fscache_n_retrievals_ok);
62758 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
62759
62760 fscache_put_retrieval(op);
62761 _leave(" = %d", ret);
62762 @@ -636,7 +636,7 @@ nobufs_unlock:
62763 if (wake_cookie)
62764 __fscache_wake_unused_cookie(cookie);
62765 nobufs:
62766 - fscache_stat(&fscache_n_retrievals_nobufs);
62767 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62768 _leave(" = -ENOBUFS");
62769 return -ENOBUFS;
62770 }
62771 @@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62772
62773 _enter("%p,%p,,,", cookie, page);
62774
62775 - fscache_stat(&fscache_n_allocs);
62776 + fscache_stat_unchecked(&fscache_n_allocs);
62777
62778 if (hlist_empty(&cookie->backing_objects))
62779 goto nobufs;
62780 @@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62781 goto nobufs_unlock_dec;
62782 spin_unlock(&cookie->lock);
62783
62784 - fscache_stat(&fscache_n_alloc_ops);
62785 + fscache_stat_unchecked(&fscache_n_alloc_ops);
62786
62787 ret = fscache_wait_for_operation_activation(
62788 object, &op->op,
62789 @@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62790
62791 error:
62792 if (ret == -ERESTARTSYS)
62793 - fscache_stat(&fscache_n_allocs_intr);
62794 + fscache_stat_unchecked(&fscache_n_allocs_intr);
62795 else if (ret < 0)
62796 - fscache_stat(&fscache_n_allocs_nobufs);
62797 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62798 else
62799 - fscache_stat(&fscache_n_allocs_ok);
62800 + fscache_stat_unchecked(&fscache_n_allocs_ok);
62801
62802 fscache_put_retrieval(op);
62803 _leave(" = %d", ret);
62804 @@ -730,7 +730,7 @@ nobufs_unlock:
62805 if (wake_cookie)
62806 __fscache_wake_unused_cookie(cookie);
62807 nobufs:
62808 - fscache_stat(&fscache_n_allocs_nobufs);
62809 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62810 _leave(" = -ENOBUFS");
62811 return -ENOBUFS;
62812 }
62813 @@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62814
62815 spin_lock(&cookie->stores_lock);
62816
62817 - fscache_stat(&fscache_n_store_calls);
62818 + fscache_stat_unchecked(&fscache_n_store_calls);
62819
62820 /* find a page to store */
62821 page = NULL;
62822 @@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62823 page = results[0];
62824 _debug("gang %d [%lx]", n, page->index);
62825 if (page->index > op->store_limit) {
62826 - fscache_stat(&fscache_n_store_pages_over_limit);
62827 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
62828 goto superseded;
62829 }
62830
62831 @@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62832 spin_unlock(&cookie->stores_lock);
62833 spin_unlock(&object->lock);
62834
62835 - fscache_stat(&fscache_n_store_pages);
62836 + fscache_stat_unchecked(&fscache_n_store_pages);
62837 fscache_stat(&fscache_n_cop_write_page);
62838 ret = object->cache->ops->write_page(op, page);
62839 fscache_stat_d(&fscache_n_cop_write_page);
62840 @@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62841 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62842 ASSERT(PageFsCache(page));
62843
62844 - fscache_stat(&fscache_n_stores);
62845 + fscache_stat_unchecked(&fscache_n_stores);
62846
62847 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
62848 _leave(" = -ENOBUFS [invalidating]");
62849 @@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62850 spin_unlock(&cookie->stores_lock);
62851 spin_unlock(&object->lock);
62852
62853 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
62854 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62855 op->store_limit = object->store_limit;
62856
62857 __fscache_use_cookie(cookie);
62858 @@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62859
62860 spin_unlock(&cookie->lock);
62861 radix_tree_preload_end();
62862 - fscache_stat(&fscache_n_store_ops);
62863 - fscache_stat(&fscache_n_stores_ok);
62864 + fscache_stat_unchecked(&fscache_n_store_ops);
62865 + fscache_stat_unchecked(&fscache_n_stores_ok);
62866
62867 /* the work queue now carries its own ref on the object */
62868 fscache_put_operation(&op->op);
62869 @@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62870 return 0;
62871
62872 already_queued:
62873 - fscache_stat(&fscache_n_stores_again);
62874 + fscache_stat_unchecked(&fscache_n_stores_again);
62875 already_pending:
62876 spin_unlock(&cookie->stores_lock);
62877 spin_unlock(&object->lock);
62878 spin_unlock(&cookie->lock);
62879 radix_tree_preload_end();
62880 kfree(op);
62881 - fscache_stat(&fscache_n_stores_ok);
62882 + fscache_stat_unchecked(&fscache_n_stores_ok);
62883 _leave(" = 0");
62884 return 0;
62885
62886 @@ -1039,14 +1039,14 @@ nobufs:
62887 kfree(op);
62888 if (wake_cookie)
62889 __fscache_wake_unused_cookie(cookie);
62890 - fscache_stat(&fscache_n_stores_nobufs);
62891 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
62892 _leave(" = -ENOBUFS");
62893 return -ENOBUFS;
62894
62895 nomem_free:
62896 kfree(op);
62897 nomem:
62898 - fscache_stat(&fscache_n_stores_oom);
62899 + fscache_stat_unchecked(&fscache_n_stores_oom);
62900 _leave(" = -ENOMEM");
62901 return -ENOMEM;
62902 }
62903 @@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
62904 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62905 ASSERTCMP(page, !=, NULL);
62906
62907 - fscache_stat(&fscache_n_uncaches);
62908 + fscache_stat_unchecked(&fscache_n_uncaches);
62909
62910 /* cache withdrawal may beat us to it */
62911 if (!PageFsCache(page))
62912 @@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
62913 struct fscache_cookie *cookie = op->op.object->cookie;
62914
62915 #ifdef CONFIG_FSCACHE_STATS
62916 - atomic_inc(&fscache_n_marks);
62917 + atomic_inc_unchecked(&fscache_n_marks);
62918 #endif
62919
62920 _debug("- mark %p{%lx}", page, page->index);
62921 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
62922 index 40d13c7..ddf52b9 100644
62923 --- a/fs/fscache/stats.c
62924 +++ b/fs/fscache/stats.c
62925 @@ -18,99 +18,99 @@
62926 /*
62927 * operation counters
62928 */
62929 -atomic_t fscache_n_op_pend;
62930 -atomic_t fscache_n_op_run;
62931 -atomic_t fscache_n_op_enqueue;
62932 -atomic_t fscache_n_op_requeue;
62933 -atomic_t fscache_n_op_deferred_release;
62934 -atomic_t fscache_n_op_release;
62935 -atomic_t fscache_n_op_gc;
62936 -atomic_t fscache_n_op_cancelled;
62937 -atomic_t fscache_n_op_rejected;
62938 +atomic_unchecked_t fscache_n_op_pend;
62939 +atomic_unchecked_t fscache_n_op_run;
62940 +atomic_unchecked_t fscache_n_op_enqueue;
62941 +atomic_unchecked_t fscache_n_op_requeue;
62942 +atomic_unchecked_t fscache_n_op_deferred_release;
62943 +atomic_unchecked_t fscache_n_op_release;
62944 +atomic_unchecked_t fscache_n_op_gc;
62945 +atomic_unchecked_t fscache_n_op_cancelled;
62946 +atomic_unchecked_t fscache_n_op_rejected;
62947
62948 -atomic_t fscache_n_attr_changed;
62949 -atomic_t fscache_n_attr_changed_ok;
62950 -atomic_t fscache_n_attr_changed_nobufs;
62951 -atomic_t fscache_n_attr_changed_nomem;
62952 -atomic_t fscache_n_attr_changed_calls;
62953 +atomic_unchecked_t fscache_n_attr_changed;
62954 +atomic_unchecked_t fscache_n_attr_changed_ok;
62955 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
62956 +atomic_unchecked_t fscache_n_attr_changed_nomem;
62957 +atomic_unchecked_t fscache_n_attr_changed_calls;
62958
62959 -atomic_t fscache_n_allocs;
62960 -atomic_t fscache_n_allocs_ok;
62961 -atomic_t fscache_n_allocs_wait;
62962 -atomic_t fscache_n_allocs_nobufs;
62963 -atomic_t fscache_n_allocs_intr;
62964 -atomic_t fscache_n_allocs_object_dead;
62965 -atomic_t fscache_n_alloc_ops;
62966 -atomic_t fscache_n_alloc_op_waits;
62967 +atomic_unchecked_t fscache_n_allocs;
62968 +atomic_unchecked_t fscache_n_allocs_ok;
62969 +atomic_unchecked_t fscache_n_allocs_wait;
62970 +atomic_unchecked_t fscache_n_allocs_nobufs;
62971 +atomic_unchecked_t fscache_n_allocs_intr;
62972 +atomic_unchecked_t fscache_n_allocs_object_dead;
62973 +atomic_unchecked_t fscache_n_alloc_ops;
62974 +atomic_unchecked_t fscache_n_alloc_op_waits;
62975
62976 -atomic_t fscache_n_retrievals;
62977 -atomic_t fscache_n_retrievals_ok;
62978 -atomic_t fscache_n_retrievals_wait;
62979 -atomic_t fscache_n_retrievals_nodata;
62980 -atomic_t fscache_n_retrievals_nobufs;
62981 -atomic_t fscache_n_retrievals_intr;
62982 -atomic_t fscache_n_retrievals_nomem;
62983 -atomic_t fscache_n_retrievals_object_dead;
62984 -atomic_t fscache_n_retrieval_ops;
62985 -atomic_t fscache_n_retrieval_op_waits;
62986 +atomic_unchecked_t fscache_n_retrievals;
62987 +atomic_unchecked_t fscache_n_retrievals_ok;
62988 +atomic_unchecked_t fscache_n_retrievals_wait;
62989 +atomic_unchecked_t fscache_n_retrievals_nodata;
62990 +atomic_unchecked_t fscache_n_retrievals_nobufs;
62991 +atomic_unchecked_t fscache_n_retrievals_intr;
62992 +atomic_unchecked_t fscache_n_retrievals_nomem;
62993 +atomic_unchecked_t fscache_n_retrievals_object_dead;
62994 +atomic_unchecked_t fscache_n_retrieval_ops;
62995 +atomic_unchecked_t fscache_n_retrieval_op_waits;
62996
62997 -atomic_t fscache_n_stores;
62998 -atomic_t fscache_n_stores_ok;
62999 -atomic_t fscache_n_stores_again;
63000 -atomic_t fscache_n_stores_nobufs;
63001 -atomic_t fscache_n_stores_oom;
63002 -atomic_t fscache_n_store_ops;
63003 -atomic_t fscache_n_store_calls;
63004 -atomic_t fscache_n_store_pages;
63005 -atomic_t fscache_n_store_radix_deletes;
63006 -atomic_t fscache_n_store_pages_over_limit;
63007 +atomic_unchecked_t fscache_n_stores;
63008 +atomic_unchecked_t fscache_n_stores_ok;
63009 +atomic_unchecked_t fscache_n_stores_again;
63010 +atomic_unchecked_t fscache_n_stores_nobufs;
63011 +atomic_unchecked_t fscache_n_stores_oom;
63012 +atomic_unchecked_t fscache_n_store_ops;
63013 +atomic_unchecked_t fscache_n_store_calls;
63014 +atomic_unchecked_t fscache_n_store_pages;
63015 +atomic_unchecked_t fscache_n_store_radix_deletes;
63016 +atomic_unchecked_t fscache_n_store_pages_over_limit;
63017
63018 -atomic_t fscache_n_store_vmscan_not_storing;
63019 -atomic_t fscache_n_store_vmscan_gone;
63020 -atomic_t fscache_n_store_vmscan_busy;
63021 -atomic_t fscache_n_store_vmscan_cancelled;
63022 -atomic_t fscache_n_store_vmscan_wait;
63023 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63024 +atomic_unchecked_t fscache_n_store_vmscan_gone;
63025 +atomic_unchecked_t fscache_n_store_vmscan_busy;
63026 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63027 +atomic_unchecked_t fscache_n_store_vmscan_wait;
63028
63029 -atomic_t fscache_n_marks;
63030 -atomic_t fscache_n_uncaches;
63031 +atomic_unchecked_t fscache_n_marks;
63032 +atomic_unchecked_t fscache_n_uncaches;
63033
63034 -atomic_t fscache_n_acquires;
63035 -atomic_t fscache_n_acquires_null;
63036 -atomic_t fscache_n_acquires_no_cache;
63037 -atomic_t fscache_n_acquires_ok;
63038 -atomic_t fscache_n_acquires_nobufs;
63039 -atomic_t fscache_n_acquires_oom;
63040 +atomic_unchecked_t fscache_n_acquires;
63041 +atomic_unchecked_t fscache_n_acquires_null;
63042 +atomic_unchecked_t fscache_n_acquires_no_cache;
63043 +atomic_unchecked_t fscache_n_acquires_ok;
63044 +atomic_unchecked_t fscache_n_acquires_nobufs;
63045 +atomic_unchecked_t fscache_n_acquires_oom;
63046
63047 -atomic_t fscache_n_invalidates;
63048 -atomic_t fscache_n_invalidates_run;
63049 +atomic_unchecked_t fscache_n_invalidates;
63050 +atomic_unchecked_t fscache_n_invalidates_run;
63051
63052 -atomic_t fscache_n_updates;
63053 -atomic_t fscache_n_updates_null;
63054 -atomic_t fscache_n_updates_run;
63055 +atomic_unchecked_t fscache_n_updates;
63056 +atomic_unchecked_t fscache_n_updates_null;
63057 +atomic_unchecked_t fscache_n_updates_run;
63058
63059 -atomic_t fscache_n_relinquishes;
63060 -atomic_t fscache_n_relinquishes_null;
63061 -atomic_t fscache_n_relinquishes_waitcrt;
63062 -atomic_t fscache_n_relinquishes_retire;
63063 +atomic_unchecked_t fscache_n_relinquishes;
63064 +atomic_unchecked_t fscache_n_relinquishes_null;
63065 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63066 +atomic_unchecked_t fscache_n_relinquishes_retire;
63067
63068 -atomic_t fscache_n_cookie_index;
63069 -atomic_t fscache_n_cookie_data;
63070 -atomic_t fscache_n_cookie_special;
63071 +atomic_unchecked_t fscache_n_cookie_index;
63072 +atomic_unchecked_t fscache_n_cookie_data;
63073 +atomic_unchecked_t fscache_n_cookie_special;
63074
63075 -atomic_t fscache_n_object_alloc;
63076 -atomic_t fscache_n_object_no_alloc;
63077 -atomic_t fscache_n_object_lookups;
63078 -atomic_t fscache_n_object_lookups_negative;
63079 -atomic_t fscache_n_object_lookups_positive;
63080 -atomic_t fscache_n_object_lookups_timed_out;
63081 -atomic_t fscache_n_object_created;
63082 -atomic_t fscache_n_object_avail;
63083 -atomic_t fscache_n_object_dead;
63084 +atomic_unchecked_t fscache_n_object_alloc;
63085 +atomic_unchecked_t fscache_n_object_no_alloc;
63086 +atomic_unchecked_t fscache_n_object_lookups;
63087 +atomic_unchecked_t fscache_n_object_lookups_negative;
63088 +atomic_unchecked_t fscache_n_object_lookups_positive;
63089 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
63090 +atomic_unchecked_t fscache_n_object_created;
63091 +atomic_unchecked_t fscache_n_object_avail;
63092 +atomic_unchecked_t fscache_n_object_dead;
63093
63094 -atomic_t fscache_n_checkaux_none;
63095 -atomic_t fscache_n_checkaux_okay;
63096 -atomic_t fscache_n_checkaux_update;
63097 -atomic_t fscache_n_checkaux_obsolete;
63098 +atomic_unchecked_t fscache_n_checkaux_none;
63099 +atomic_unchecked_t fscache_n_checkaux_okay;
63100 +atomic_unchecked_t fscache_n_checkaux_update;
63101 +atomic_unchecked_t fscache_n_checkaux_obsolete;
63102
63103 atomic_t fscache_n_cop_alloc_object;
63104 atomic_t fscache_n_cop_lookup_object;
63105 @@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63106 seq_puts(m, "FS-Cache statistics\n");
63107
63108 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63109 - atomic_read(&fscache_n_cookie_index),
63110 - atomic_read(&fscache_n_cookie_data),
63111 - atomic_read(&fscache_n_cookie_special));
63112 + atomic_read_unchecked(&fscache_n_cookie_index),
63113 + atomic_read_unchecked(&fscache_n_cookie_data),
63114 + atomic_read_unchecked(&fscache_n_cookie_special));
63115
63116 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63117 - atomic_read(&fscache_n_object_alloc),
63118 - atomic_read(&fscache_n_object_no_alloc),
63119 - atomic_read(&fscache_n_object_avail),
63120 - atomic_read(&fscache_n_object_dead));
63121 + atomic_read_unchecked(&fscache_n_object_alloc),
63122 + atomic_read_unchecked(&fscache_n_object_no_alloc),
63123 + atomic_read_unchecked(&fscache_n_object_avail),
63124 + atomic_read_unchecked(&fscache_n_object_dead));
63125 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63126 - atomic_read(&fscache_n_checkaux_none),
63127 - atomic_read(&fscache_n_checkaux_okay),
63128 - atomic_read(&fscache_n_checkaux_update),
63129 - atomic_read(&fscache_n_checkaux_obsolete));
63130 + atomic_read_unchecked(&fscache_n_checkaux_none),
63131 + atomic_read_unchecked(&fscache_n_checkaux_okay),
63132 + atomic_read_unchecked(&fscache_n_checkaux_update),
63133 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63134
63135 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63136 - atomic_read(&fscache_n_marks),
63137 - atomic_read(&fscache_n_uncaches));
63138 + atomic_read_unchecked(&fscache_n_marks),
63139 + atomic_read_unchecked(&fscache_n_uncaches));
63140
63141 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63142 " oom=%u\n",
63143 - atomic_read(&fscache_n_acquires),
63144 - atomic_read(&fscache_n_acquires_null),
63145 - atomic_read(&fscache_n_acquires_no_cache),
63146 - atomic_read(&fscache_n_acquires_ok),
63147 - atomic_read(&fscache_n_acquires_nobufs),
63148 - atomic_read(&fscache_n_acquires_oom));
63149 + atomic_read_unchecked(&fscache_n_acquires),
63150 + atomic_read_unchecked(&fscache_n_acquires_null),
63151 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
63152 + atomic_read_unchecked(&fscache_n_acquires_ok),
63153 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
63154 + atomic_read_unchecked(&fscache_n_acquires_oom));
63155
63156 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63157 - atomic_read(&fscache_n_object_lookups),
63158 - atomic_read(&fscache_n_object_lookups_negative),
63159 - atomic_read(&fscache_n_object_lookups_positive),
63160 - atomic_read(&fscache_n_object_created),
63161 - atomic_read(&fscache_n_object_lookups_timed_out));
63162 + atomic_read_unchecked(&fscache_n_object_lookups),
63163 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
63164 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
63165 + atomic_read_unchecked(&fscache_n_object_created),
63166 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63167
63168 seq_printf(m, "Invals : n=%u run=%u\n",
63169 - atomic_read(&fscache_n_invalidates),
63170 - atomic_read(&fscache_n_invalidates_run));
63171 + atomic_read_unchecked(&fscache_n_invalidates),
63172 + atomic_read_unchecked(&fscache_n_invalidates_run));
63173
63174 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63175 - atomic_read(&fscache_n_updates),
63176 - atomic_read(&fscache_n_updates_null),
63177 - atomic_read(&fscache_n_updates_run));
63178 + atomic_read_unchecked(&fscache_n_updates),
63179 + atomic_read_unchecked(&fscache_n_updates_null),
63180 + atomic_read_unchecked(&fscache_n_updates_run));
63181
63182 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63183 - atomic_read(&fscache_n_relinquishes),
63184 - atomic_read(&fscache_n_relinquishes_null),
63185 - atomic_read(&fscache_n_relinquishes_waitcrt),
63186 - atomic_read(&fscache_n_relinquishes_retire));
63187 + atomic_read_unchecked(&fscache_n_relinquishes),
63188 + atomic_read_unchecked(&fscache_n_relinquishes_null),
63189 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63190 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
63191
63192 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63193 - atomic_read(&fscache_n_attr_changed),
63194 - atomic_read(&fscache_n_attr_changed_ok),
63195 - atomic_read(&fscache_n_attr_changed_nobufs),
63196 - atomic_read(&fscache_n_attr_changed_nomem),
63197 - atomic_read(&fscache_n_attr_changed_calls));
63198 + atomic_read_unchecked(&fscache_n_attr_changed),
63199 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
63200 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63201 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63202 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
63203
63204 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63205 - atomic_read(&fscache_n_allocs),
63206 - atomic_read(&fscache_n_allocs_ok),
63207 - atomic_read(&fscache_n_allocs_wait),
63208 - atomic_read(&fscache_n_allocs_nobufs),
63209 - atomic_read(&fscache_n_allocs_intr));
63210 + atomic_read_unchecked(&fscache_n_allocs),
63211 + atomic_read_unchecked(&fscache_n_allocs_ok),
63212 + atomic_read_unchecked(&fscache_n_allocs_wait),
63213 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
63214 + atomic_read_unchecked(&fscache_n_allocs_intr));
63215 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63216 - atomic_read(&fscache_n_alloc_ops),
63217 - atomic_read(&fscache_n_alloc_op_waits),
63218 - atomic_read(&fscache_n_allocs_object_dead));
63219 + atomic_read_unchecked(&fscache_n_alloc_ops),
63220 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
63221 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
63222
63223 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63224 " int=%u oom=%u\n",
63225 - atomic_read(&fscache_n_retrievals),
63226 - atomic_read(&fscache_n_retrievals_ok),
63227 - atomic_read(&fscache_n_retrievals_wait),
63228 - atomic_read(&fscache_n_retrievals_nodata),
63229 - atomic_read(&fscache_n_retrievals_nobufs),
63230 - atomic_read(&fscache_n_retrievals_intr),
63231 - atomic_read(&fscache_n_retrievals_nomem));
63232 + atomic_read_unchecked(&fscache_n_retrievals),
63233 + atomic_read_unchecked(&fscache_n_retrievals_ok),
63234 + atomic_read_unchecked(&fscache_n_retrievals_wait),
63235 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
63236 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63237 + atomic_read_unchecked(&fscache_n_retrievals_intr),
63238 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
63239 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63240 - atomic_read(&fscache_n_retrieval_ops),
63241 - atomic_read(&fscache_n_retrieval_op_waits),
63242 - atomic_read(&fscache_n_retrievals_object_dead));
63243 + atomic_read_unchecked(&fscache_n_retrieval_ops),
63244 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63245 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63246
63247 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63248 - atomic_read(&fscache_n_stores),
63249 - atomic_read(&fscache_n_stores_ok),
63250 - atomic_read(&fscache_n_stores_again),
63251 - atomic_read(&fscache_n_stores_nobufs),
63252 - atomic_read(&fscache_n_stores_oom));
63253 + atomic_read_unchecked(&fscache_n_stores),
63254 + atomic_read_unchecked(&fscache_n_stores_ok),
63255 + atomic_read_unchecked(&fscache_n_stores_again),
63256 + atomic_read_unchecked(&fscache_n_stores_nobufs),
63257 + atomic_read_unchecked(&fscache_n_stores_oom));
63258 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63259 - atomic_read(&fscache_n_store_ops),
63260 - atomic_read(&fscache_n_store_calls),
63261 - atomic_read(&fscache_n_store_pages),
63262 - atomic_read(&fscache_n_store_radix_deletes),
63263 - atomic_read(&fscache_n_store_pages_over_limit));
63264 + atomic_read_unchecked(&fscache_n_store_ops),
63265 + atomic_read_unchecked(&fscache_n_store_calls),
63266 + atomic_read_unchecked(&fscache_n_store_pages),
63267 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
63268 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63269
63270 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63271 - atomic_read(&fscache_n_store_vmscan_not_storing),
63272 - atomic_read(&fscache_n_store_vmscan_gone),
63273 - atomic_read(&fscache_n_store_vmscan_busy),
63274 - atomic_read(&fscache_n_store_vmscan_cancelled),
63275 - atomic_read(&fscache_n_store_vmscan_wait));
63276 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63277 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63278 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63279 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63280 + atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63281
63282 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63283 - atomic_read(&fscache_n_op_pend),
63284 - atomic_read(&fscache_n_op_run),
63285 - atomic_read(&fscache_n_op_enqueue),
63286 - atomic_read(&fscache_n_op_cancelled),
63287 - atomic_read(&fscache_n_op_rejected));
63288 + atomic_read_unchecked(&fscache_n_op_pend),
63289 + atomic_read_unchecked(&fscache_n_op_run),
63290 + atomic_read_unchecked(&fscache_n_op_enqueue),
63291 + atomic_read_unchecked(&fscache_n_op_cancelled),
63292 + atomic_read_unchecked(&fscache_n_op_rejected));
63293 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63294 - atomic_read(&fscache_n_op_deferred_release),
63295 - atomic_read(&fscache_n_op_release),
63296 - atomic_read(&fscache_n_op_gc));
63297 + atomic_read_unchecked(&fscache_n_op_deferred_release),
63298 + atomic_read_unchecked(&fscache_n_op_release),
63299 + atomic_read_unchecked(&fscache_n_op_gc));
63300
63301 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63302 atomic_read(&fscache_n_cop_alloc_object),
63303 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63304 index 966ace8..030a03a 100644
63305 --- a/fs/fuse/cuse.c
63306 +++ b/fs/fuse/cuse.c
63307 @@ -611,10 +611,12 @@ static int __init cuse_init(void)
63308 INIT_LIST_HEAD(&cuse_conntbl[i]);
63309
63310 /* inherit and extend fuse_dev_operations */
63311 - cuse_channel_fops = fuse_dev_operations;
63312 - cuse_channel_fops.owner = THIS_MODULE;
63313 - cuse_channel_fops.open = cuse_channel_open;
63314 - cuse_channel_fops.release = cuse_channel_release;
63315 + pax_open_kernel();
63316 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63317 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63318 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
63319 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
63320 + pax_close_kernel();
63321
63322 cuse_class = class_create(THIS_MODULE, "cuse");
63323 if (IS_ERR(cuse_class))
63324 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
63325 index ca88731..8e9c55d 100644
63326 --- a/fs/fuse/dev.c
63327 +++ b/fs/fuse/dev.c
63328 @@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63329 ret = 0;
63330 pipe_lock(pipe);
63331
63332 - if (!pipe->readers) {
63333 + if (!atomic_read(&pipe->readers)) {
63334 send_sig(SIGPIPE, current, 0);
63335 if (!ret)
63336 ret = -EPIPE;
63337 @@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63338 page_nr++;
63339 ret += buf->len;
63340
63341 - if (pipe->files)
63342 + if (atomic_read(&pipe->files))
63343 do_wakeup = 1;
63344 }
63345
63346 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
63347 index dbab798..fefa22b 100644
63348 --- a/fs/fuse/dir.c
63349 +++ b/fs/fuse/dir.c
63350 @@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
63351 return link;
63352 }
63353
63354 -static void free_link(char *link)
63355 +static void free_link(const char *link)
63356 {
63357 if (!IS_ERR(link))
63358 free_page((unsigned long) link);
63359 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
63360 index fd62cae..3494dfa 100644
63361 --- a/fs/hostfs/hostfs_kern.c
63362 +++ b/fs/hostfs/hostfs_kern.c
63363 @@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
63364
63365 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
63366 {
63367 - char *s = nd_get_link(nd);
63368 + const char *s = nd_get_link(nd);
63369 if (!IS_ERR(s))
63370 __putname(s);
63371 }
63372 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
63373 index 1e2872b..7aea000 100644
63374 --- a/fs/hugetlbfs/inode.c
63375 +++ b/fs/hugetlbfs/inode.c
63376 @@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63377 struct mm_struct *mm = current->mm;
63378 struct vm_area_struct *vma;
63379 struct hstate *h = hstate_file(file);
63380 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
63381 struct vm_unmapped_area_info info;
63382
63383 if (len & ~huge_page_mask(h))
63384 @@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63385 return addr;
63386 }
63387
63388 +#ifdef CONFIG_PAX_RANDMMAP
63389 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
63390 +#endif
63391 +
63392 if (addr) {
63393 addr = ALIGN(addr, huge_page_size(h));
63394 vma = find_vma(mm, addr);
63395 - if (TASK_SIZE - len >= addr &&
63396 - (!vma || addr + len <= vma->vm_start))
63397 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
63398 return addr;
63399 }
63400
63401 info.flags = 0;
63402 info.length = len;
63403 info.low_limit = TASK_UNMAPPED_BASE;
63404 +
63405 +#ifdef CONFIG_PAX_RANDMMAP
63406 + if (mm->pax_flags & MF_PAX_RANDMMAP)
63407 + info.low_limit += mm->delta_mmap;
63408 +#endif
63409 +
63410 info.high_limit = TASK_SIZE;
63411 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
63412 info.align_offset = 0;
63413 @@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
63414 };
63415 MODULE_ALIAS_FS("hugetlbfs");
63416
63417 -static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63418 +struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63419
63420 static int can_do_hugetlb_shm(void)
63421 {
63422 diff --git a/fs/inode.c b/fs/inode.c
63423 index 26753ba..d19eb34 100644
63424 --- a/fs/inode.c
63425 +++ b/fs/inode.c
63426 @@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
63427 unsigned int *p = &get_cpu_var(last_ino);
63428 unsigned int res = *p;
63429
63430 +start:
63431 +
63432 #ifdef CONFIG_SMP
63433 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
63434 - static atomic_t shared_last_ino;
63435 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
63436 + static atomic_unchecked_t shared_last_ino;
63437 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
63438
63439 res = next - LAST_INO_BATCH;
63440 }
63441 #endif
63442
63443 - *p = ++res;
63444 + if (unlikely(!++res))
63445 + goto start; /* never zero */
63446 + *p = res;
63447 put_cpu_var(last_ino);
63448 return res;
63449 }
63450 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
63451 index 4a6cf28..d3a29d3 100644
63452 --- a/fs/jffs2/erase.c
63453 +++ b/fs/jffs2/erase.c
63454 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
63455 struct jffs2_unknown_node marker = {
63456 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
63457 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63458 - .totlen = cpu_to_je32(c->cleanmarker_size)
63459 + .totlen = cpu_to_je32(c->cleanmarker_size),
63460 + .hdr_crc = cpu_to_je32(0)
63461 };
63462
63463 jffs2_prealloc_raw_node_refs(c, jeb, 1);
63464 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
63465 index 09ed551..45684f8 100644
63466 --- a/fs/jffs2/wbuf.c
63467 +++ b/fs/jffs2/wbuf.c
63468 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
63469 {
63470 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
63471 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63472 - .totlen = constant_cpu_to_je32(8)
63473 + .totlen = constant_cpu_to_je32(8),
63474 + .hdr_crc = constant_cpu_to_je32(0)
63475 };
63476
63477 /*
63478 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
63479 index 93e897e..a863de4 100644
63480 --- a/fs/jfs/super.c
63481 +++ b/fs/jfs/super.c
63482 @@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
63483
63484 jfs_inode_cachep =
63485 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
63486 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
63487 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
63488 init_once);
63489 if (jfs_inode_cachep == NULL)
63490 return -ENOMEM;
63491 diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
63492 index 1c77193..6d5c924 100644
63493 --- a/fs/kernfs/dir.c
63494 +++ b/fs/kernfs/dir.c
63495 @@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
63496 *
63497 * Returns 31 bit hash of ns + name (so it fits in an off_t )
63498 */
63499 -static unsigned int kernfs_name_hash(const char *name, const void *ns)
63500 +static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
63501 {
63502 unsigned long hash = init_name_hash();
63503 unsigned int len = strlen(name);
63504 @@ -829,6 +829,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
63505 ret = scops->mkdir(parent, dentry->d_name.name, mode);
63506
63507 kernfs_put_active(parent);
63508 +
63509 + if (!ret) {
63510 + struct dentry *dentry = kernfs_iop_lookup(dir, dentry, 0);
63511 + ret = PTR_ERR_OR_ZERO(dentry);
63512 + }
63513 +
63514 return ret;
63515 }
63516
63517 diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
63518 index 4429d6d..9831f52 100644
63519 --- a/fs/kernfs/file.c
63520 +++ b/fs/kernfs/file.c
63521 @@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
63522
63523 struct kernfs_open_node {
63524 atomic_t refcnt;
63525 - atomic_t event;
63526 + atomic_unchecked_t event;
63527 wait_queue_head_t poll;
63528 struct list_head files; /* goes through kernfs_open_file.list */
63529 };
63530 @@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
63531 {
63532 struct kernfs_open_file *of = sf->private;
63533
63534 - of->event = atomic_read(&of->kn->attr.open->event);
63535 + of->event = atomic_read_unchecked(&of->kn->attr.open->event);
63536
63537 return of->kn->attr.ops->seq_show(sf, v);
63538 }
63539 @@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
63540 return ret;
63541 }
63542
63543 -static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63544 - void *buf, int len, int write)
63545 +static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63546 + void *buf, size_t len, int write)
63547 {
63548 struct file *file = vma->vm_file;
63549 struct kernfs_open_file *of = kernfs_of(file);
63550 - int ret;
63551 + ssize_t ret;
63552
63553 if (!of->vm_ops)
63554 return -EINVAL;
63555 @@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
63556 return -ENOMEM;
63557
63558 atomic_set(&new_on->refcnt, 0);
63559 - atomic_set(&new_on->event, 1);
63560 + atomic_set_unchecked(&new_on->event, 1);
63561 init_waitqueue_head(&new_on->poll);
63562 INIT_LIST_HEAD(&new_on->files);
63563 goto retry;
63564 @@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
63565
63566 kernfs_put_active(kn);
63567
63568 - if (of->event != atomic_read(&on->event))
63569 + if (of->event != atomic_read_unchecked(&on->event))
63570 goto trigger;
63571
63572 return DEFAULT_POLLMASK;
63573 @@ -818,7 +818,7 @@ repeat:
63574
63575 on = kn->attr.open;
63576 if (on) {
63577 - atomic_inc(&on->event);
63578 + atomic_inc_unchecked(&on->event);
63579 wake_up_interruptible(&on->poll);
63580 }
63581
63582 diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
63583 index 8a19889..4c3069a 100644
63584 --- a/fs/kernfs/symlink.c
63585 +++ b/fs/kernfs/symlink.c
63586 @@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
63587 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
63588 void *cookie)
63589 {
63590 - char *page = nd_get_link(nd);
63591 + const char *page = nd_get_link(nd);
63592 if (!IS_ERR(page))
63593 free_page((unsigned long)page);
63594 }
63595 diff --git a/fs/libfs.c b/fs/libfs.c
63596 index 005843c..06c4191 100644
63597 --- a/fs/libfs.c
63598 +++ b/fs/libfs.c
63599 @@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63600
63601 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
63602 struct dentry *next = list_entry(p, struct dentry, d_child);
63603 + char d_name[sizeof(next->d_iname)];
63604 + const unsigned char *name;
63605 +
63606 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
63607 if (!simple_positive(next)) {
63608 spin_unlock(&next->d_lock);
63609 @@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63610
63611 spin_unlock(&next->d_lock);
63612 spin_unlock(&dentry->d_lock);
63613 - if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
63614 + name = next->d_name.name;
63615 + if (name == next->d_iname) {
63616 + memcpy(d_name, name, next->d_name.len);
63617 + name = d_name;
63618 + }
63619 + if (!dir_emit(ctx, name, next->d_name.len,
63620 next->d_inode->i_ino, dt_type(next->d_inode)))
63621 return 0;
63622 spin_lock(&dentry->d_lock);
63623 @@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
63624 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
63625 void *cookie)
63626 {
63627 - char *s = nd_get_link(nd);
63628 + const char *s = nd_get_link(nd);
63629 if (!IS_ERR(s))
63630 kfree(s);
63631 }
63632 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
63633 index acd3947..1f896e2 100644
63634 --- a/fs/lockd/clntproc.c
63635 +++ b/fs/lockd/clntproc.c
63636 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
63637 /*
63638 * Cookie counter for NLM requests
63639 */
63640 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
63641 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
63642
63643 void nlmclnt_next_cookie(struct nlm_cookie *c)
63644 {
63645 - u32 cookie = atomic_inc_return(&nlm_cookie);
63646 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
63647
63648 memcpy(c->data, &cookie, 4);
63649 c->len=4;
63650 diff --git a/fs/locks.c b/fs/locks.c
63651 index 735b8d3..dfc44a2 100644
63652 --- a/fs/locks.c
63653 +++ b/fs/locks.c
63654 @@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
63655 locks_remove_posix(filp, filp);
63656
63657 if (filp->f_op->flock) {
63658 - struct file_lock fl = {
63659 + struct file_lock flock = {
63660 .fl_owner = filp,
63661 .fl_pid = current->tgid,
63662 .fl_file = filp,
63663 @@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
63664 .fl_type = F_UNLCK,
63665 .fl_end = OFFSET_MAX,
63666 };
63667 - filp->f_op->flock(filp, F_SETLKW, &fl);
63668 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
63669 - fl.fl_ops->fl_release_private(&fl);
63670 + filp->f_op->flock(filp, F_SETLKW, &flock);
63671 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
63672 + flock.fl_ops->fl_release_private(&flock);
63673 }
63674
63675 spin_lock(&inode->i_lock);
63676 diff --git a/fs/mount.h b/fs/mount.h
63677 index f82c628..9492b99 100644
63678 --- a/fs/mount.h
63679 +++ b/fs/mount.h
63680 @@ -11,7 +11,7 @@ struct mnt_namespace {
63681 u64 seq; /* Sequence number to prevent loops */
63682 wait_queue_head_t poll;
63683 u64 event;
63684 -};
63685 +} __randomize_layout;
63686
63687 struct mnt_pcp {
63688 int mnt_count;
63689 @@ -62,7 +62,7 @@ struct mount {
63690 int mnt_expiry_mark; /* true if marked for expiry */
63691 struct hlist_head mnt_pins;
63692 struct path mnt_ex_mountpoint;
63693 -};
63694 +} __randomize_layout;
63695
63696 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
63697
63698 diff --git a/fs/namei.c b/fs/namei.c
63699 index db5fe86..d3dcc14 100644
63700 --- a/fs/namei.c
63701 +++ b/fs/namei.c
63702 @@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
63703 if (ret != -EACCES)
63704 return ret;
63705
63706 +#ifdef CONFIG_GRKERNSEC
63707 + /* we'll block if we have to log due to a denied capability use */
63708 + if (mask & MAY_NOT_BLOCK)
63709 + return -ECHILD;
63710 +#endif
63711 +
63712 if (S_ISDIR(inode->i_mode)) {
63713 /* DACs are overridable for directories */
63714 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63715 - return 0;
63716 if (!(mask & MAY_WRITE))
63717 - if (capable_wrt_inode_uidgid(inode,
63718 - CAP_DAC_READ_SEARCH))
63719 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63720 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63721 return 0;
63722 + if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63723 + return 0;
63724 return -EACCES;
63725 }
63726 /*
63727 + * Searching includes executable on directories, else just read.
63728 + */
63729 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63730 + if (mask == MAY_READ)
63731 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63732 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63733 + return 0;
63734 +
63735 + /*
63736 * Read/write DACs are always overridable.
63737 * Executable DACs are overridable when there is
63738 * at least one exec bit set.
63739 @@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
63740 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63741 return 0;
63742
63743 - /*
63744 - * Searching includes executable on directories, else just read.
63745 - */
63746 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63747 - if (mask == MAY_READ)
63748 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63749 - return 0;
63750 -
63751 return -EACCES;
63752 }
63753 EXPORT_SYMBOL(generic_permission);
63754 @@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63755 {
63756 struct dentry *dentry = link->dentry;
63757 int error;
63758 - char *s;
63759 + const char *s;
63760
63761 BUG_ON(nd->flags & LOOKUP_RCU);
63762
63763 @@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63764 if (error)
63765 goto out_put_nd_path;
63766
63767 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
63768 + dentry->d_inode, dentry, nd->path.mnt)) {
63769 + error = -EACCES;
63770 + goto out_put_nd_path;
63771 + }
63772 +
63773 nd->last_type = LAST_BIND;
63774 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
63775 error = PTR_ERR(*p);
63776 @@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
63777 if (res)
63778 break;
63779 res = walk_component(nd, path, LOOKUP_FOLLOW);
63780 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
63781 + res = -EACCES;
63782 put_link(nd, &link, cookie);
63783 } while (res > 0);
63784
63785 @@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
63786 static inline u64 hash_name(const char *name)
63787 {
63788 unsigned long a, b, adata, bdata, mask, hash, len;
63789 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63790 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63791
63792 hash = a = 0;
63793 len = -sizeof(unsigned long);
63794 @@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
63795 if (err)
63796 break;
63797 err = lookup_last(nd, &path);
63798 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
63799 + err = -EACCES;
63800 put_link(nd, &link, cookie);
63801 }
63802 }
63803 @@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
63804 if (!err)
63805 err = complete_walk(nd);
63806
63807 + if (!err && !(nd->flags & LOOKUP_PARENT)) {
63808 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
63809 + path_put(&nd->path);
63810 + err = -ENOENT;
63811 + }
63812 + }
63813 +
63814 if (!err && nd->flags & LOOKUP_DIRECTORY) {
63815 if (!d_can_lookup(nd->path.dentry)) {
63816 path_put(&nd->path);
63817 @@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
63818 retval = path_lookupat(dfd, name->name,
63819 flags | LOOKUP_REVAL, nd);
63820
63821 - if (likely(!retval))
63822 + if (likely(!retval)) {
63823 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
63824 + if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
63825 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
63826 + path_put(&nd->path);
63827 + return -ENOENT;
63828 + }
63829 + }
63830 + }
63831 return retval;
63832 }
63833
63834 @@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
63835 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
63836 return -EPERM;
63837
63838 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
63839 + return -EPERM;
63840 + if (gr_handle_rawio(inode))
63841 + return -EPERM;
63842 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
63843 + return -EACCES;
63844 +
63845 return 0;
63846 }
63847
63848 @@ -2813,7 +2851,7 @@ looked_up:
63849 * cleared otherwise prior to returning.
63850 */
63851 static int lookup_open(struct nameidata *nd, struct path *path,
63852 - struct file *file,
63853 + struct path *link, struct file *file,
63854 const struct open_flags *op,
63855 bool got_write, int *opened)
63856 {
63857 @@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63858 /* Negative dentry, just create the file */
63859 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
63860 umode_t mode = op->mode;
63861 +
63862 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
63863 + error = -EACCES;
63864 + goto out_dput;
63865 + }
63866 +
63867 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
63868 + error = -EACCES;
63869 + goto out_dput;
63870 + }
63871 +
63872 if (!IS_POSIXACL(dir->d_inode))
63873 mode &= ~current_umask();
63874 /*
63875 @@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63876 nd->flags & LOOKUP_EXCL);
63877 if (error)
63878 goto out_dput;
63879 + else
63880 + gr_handle_create(dentry, nd->path.mnt);
63881 }
63882 out_no_open:
63883 path->dentry = dentry;
63884 @@ -2883,7 +2934,7 @@ out_dput:
63885 /*
63886 * Handle the last step of open()
63887 */
63888 -static int do_last(struct nameidata *nd, struct path *path,
63889 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
63890 struct file *file, const struct open_flags *op,
63891 int *opened, struct filename *name)
63892 {
63893 @@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
63894 if (error)
63895 return error;
63896
63897 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
63898 + error = -ENOENT;
63899 + goto out;
63900 + }
63901 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
63902 + error = -EACCES;
63903 + goto out;
63904 + }
63905 +
63906 audit_inode(name, dir, LOOKUP_PARENT);
63907 error = -EISDIR;
63908 /* trailing slashes? */
63909 @@ -2952,7 +3012,7 @@ retry_lookup:
63910 */
63911 }
63912 mutex_lock(&dir->d_inode->i_mutex);
63913 - error = lookup_open(nd, path, file, op, got_write, opened);
63914 + error = lookup_open(nd, path, link, file, op, got_write, opened);
63915 mutex_unlock(&dir->d_inode->i_mutex);
63916
63917 if (error <= 0) {
63918 @@ -2976,11 +3036,28 @@ retry_lookup:
63919 goto finish_open_created;
63920 }
63921
63922 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
63923 + error = -ENOENT;
63924 + goto exit_dput;
63925 + }
63926 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
63927 + error = -EACCES;
63928 + goto exit_dput;
63929 + }
63930 +
63931 /*
63932 * create/update audit record if it already exists.
63933 */
63934 - if (d_is_positive(path->dentry))
63935 + if (d_is_positive(path->dentry)) {
63936 + /* only check if O_CREAT is specified, all other checks need to go
63937 + into may_open */
63938 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
63939 + error = -EACCES;
63940 + goto exit_dput;
63941 + }
63942 +
63943 audit_inode(name, path->dentry, 0);
63944 + }
63945
63946 /*
63947 * If atomic_open() acquired write access it is dropped now due to
63948 @@ -3021,6 +3098,11 @@ finish_lookup:
63949 }
63950 }
63951 BUG_ON(inode != path->dentry->d_inode);
63952 + /* if we're resolving a symlink to another symlink */
63953 + if (link && gr_handle_symlink_owner(link, inode)) {
63954 + error = -EACCES;
63955 + goto out;
63956 + }
63957 return 1;
63958 }
63959
63960 @@ -3040,7 +3122,18 @@ finish_open:
63961 path_put(&save_parent);
63962 return error;
63963 }
63964 +
63965 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
63966 + error = -ENOENT;
63967 + goto out;
63968 + }
63969 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
63970 + error = -EACCES;
63971 + goto out;
63972 + }
63973 +
63974 audit_inode(name, nd->path.dentry, 0);
63975 +
63976 error = -EISDIR;
63977 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
63978 goto out;
63979 @@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
63980 if (unlikely(error))
63981 goto out;
63982
63983 - error = do_last(nd, &path, file, op, &opened, pathname);
63984 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
63985 while (unlikely(error > 0)) { /* trailing symlink */
63986 struct path link = path;
63987 void *cookie;
63988 @@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
63989 error = follow_link(&link, nd, &cookie);
63990 if (unlikely(error))
63991 break;
63992 - error = do_last(nd, &path, file, op, &opened, pathname);
63993 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
63994 put_link(nd, &link, cookie);
63995 }
63996 out:
63997 @@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
63998 goto unlock;
63999
64000 error = -EEXIST;
64001 - if (d_is_positive(dentry))
64002 + if (d_is_positive(dentry)) {
64003 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64004 + error = -ENOENT;
64005 goto fail;
64006 -
64007 + }
64008 /*
64009 * Special case - lookup gave negative, but... we had foo/bar/
64010 * From the vfs_mknod() POV we just have a negative dentry -
64011 @@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64012 }
64013 EXPORT_SYMBOL(user_path_create);
64014
64015 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64016 +{
64017 + struct filename *tmp = getname(pathname);
64018 + struct dentry *res;
64019 + if (IS_ERR(tmp))
64020 + return ERR_CAST(tmp);
64021 + res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64022 + if (IS_ERR(res))
64023 + putname(tmp);
64024 + else
64025 + *to = tmp;
64026 + return res;
64027 +}
64028 +
64029 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64030 {
64031 int error = may_create(dir, dentry);
64032 @@ -3442,6 +3551,17 @@ retry:
64033
64034 if (!IS_POSIXACL(path.dentry->d_inode))
64035 mode &= ~current_umask();
64036 +
64037 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64038 + error = -EPERM;
64039 + goto out;
64040 + }
64041 +
64042 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64043 + error = -EACCES;
64044 + goto out;
64045 + }
64046 +
64047 error = security_path_mknod(&path, dentry, mode, dev);
64048 if (error)
64049 goto out;
64050 @@ -3457,6 +3577,8 @@ retry:
64051 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64052 break;
64053 }
64054 + if (!error)
64055 + gr_handle_create(dentry, path.mnt);
64056 out:
64057 done_path_create(&path, dentry);
64058 if (retry_estale(error, lookup_flags)) {
64059 @@ -3511,9 +3633,16 @@ retry:
64060
64061 if (!IS_POSIXACL(path.dentry->d_inode))
64062 mode &= ~current_umask();
64063 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64064 + error = -EACCES;
64065 + goto out;
64066 + }
64067 error = security_path_mkdir(&path, dentry, mode);
64068 if (!error)
64069 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64070 + if (!error)
64071 + gr_handle_create(dentry, path.mnt);
64072 +out:
64073 done_path_create(&path, dentry);
64074 if (retry_estale(error, lookup_flags)) {
64075 lookup_flags |= LOOKUP_REVAL;
64076 @@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64077 struct filename *name;
64078 struct dentry *dentry;
64079 struct nameidata nd;
64080 + ino_t saved_ino = 0;
64081 + dev_t saved_dev = 0;
64082 unsigned int lookup_flags = 0;
64083 retry:
64084 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64085 @@ -3629,10 +3760,21 @@ retry:
64086 error = -ENOENT;
64087 goto exit3;
64088 }
64089 +
64090 + saved_ino = dentry->d_inode->i_ino;
64091 + saved_dev = gr_get_dev_from_dentry(dentry);
64092 +
64093 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64094 + error = -EACCES;
64095 + goto exit3;
64096 + }
64097 +
64098 error = security_path_rmdir(&nd.path, dentry);
64099 if (error)
64100 goto exit3;
64101 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64102 + if (!error && (saved_dev || saved_ino))
64103 + gr_handle_delete(saved_ino, saved_dev);
64104 exit3:
64105 dput(dentry);
64106 exit2:
64107 @@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64108 struct nameidata nd;
64109 struct inode *inode = NULL;
64110 struct inode *delegated_inode = NULL;
64111 + ino_t saved_ino = 0;
64112 + dev_t saved_dev = 0;
64113 unsigned int lookup_flags = 0;
64114 retry:
64115 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64116 @@ -3751,10 +3895,22 @@ retry_deleg:
64117 if (d_is_negative(dentry))
64118 goto slashes;
64119 ihold(inode);
64120 +
64121 + if (inode->i_nlink <= 1) {
64122 + saved_ino = inode->i_ino;
64123 + saved_dev = gr_get_dev_from_dentry(dentry);
64124 + }
64125 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64126 + error = -EACCES;
64127 + goto exit2;
64128 + }
64129 +
64130 error = security_path_unlink(&nd.path, dentry);
64131 if (error)
64132 goto exit2;
64133 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64134 + if (!error && (saved_ino || saved_dev))
64135 + gr_handle_delete(saved_ino, saved_dev);
64136 exit2:
64137 dput(dentry);
64138 }
64139 @@ -3843,9 +3999,17 @@ retry:
64140 if (IS_ERR(dentry))
64141 goto out_putname;
64142
64143 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64144 + error = -EACCES;
64145 + goto out;
64146 + }
64147 +
64148 error = security_path_symlink(&path, dentry, from->name);
64149 if (!error)
64150 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64151 + if (!error)
64152 + gr_handle_create(dentry, path.mnt);
64153 +out:
64154 done_path_create(&path, dentry);
64155 if (retry_estale(error, lookup_flags)) {
64156 lookup_flags |= LOOKUP_REVAL;
64157 @@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64158 struct dentry *new_dentry;
64159 struct path old_path, new_path;
64160 struct inode *delegated_inode = NULL;
64161 + struct filename *to = NULL;
64162 int how = 0;
64163 int error;
64164
64165 @@ -3972,7 +4137,7 @@ retry:
64166 if (error)
64167 return error;
64168
64169 - new_dentry = user_path_create(newdfd, newname, &new_path,
64170 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64171 (how & LOOKUP_REVAL));
64172 error = PTR_ERR(new_dentry);
64173 if (IS_ERR(new_dentry))
64174 @@ -3984,11 +4149,28 @@ retry:
64175 error = may_linkat(&old_path);
64176 if (unlikely(error))
64177 goto out_dput;
64178 +
64179 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64180 + old_path.dentry->d_inode,
64181 + old_path.dentry->d_inode->i_mode, to)) {
64182 + error = -EACCES;
64183 + goto out_dput;
64184 + }
64185 +
64186 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64187 + old_path.dentry, old_path.mnt, to)) {
64188 + error = -EACCES;
64189 + goto out_dput;
64190 + }
64191 +
64192 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64193 if (error)
64194 goto out_dput;
64195 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64196 + if (!error)
64197 + gr_handle_create(new_dentry, new_path.mnt);
64198 out_dput:
64199 + putname(to);
64200 done_path_create(&new_path, new_dentry);
64201 if (delegated_inode) {
64202 error = break_deleg_wait(&delegated_inode);
64203 @@ -4304,6 +4486,12 @@ retry_deleg:
64204 if (new_dentry == trap)
64205 goto exit5;
64206
64207 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64208 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
64209 + to, flags);
64210 + if (error)
64211 + goto exit5;
64212 +
64213 error = security_path_rename(&oldnd.path, old_dentry,
64214 &newnd.path, new_dentry, flags);
64215 if (error)
64216 @@ -4311,6 +4499,9 @@ retry_deleg:
64217 error = vfs_rename(old_dir->d_inode, old_dentry,
64218 new_dir->d_inode, new_dentry,
64219 &delegated_inode, flags);
64220 + if (!error)
64221 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64222 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64223 exit5:
64224 dput(new_dentry);
64225 exit4:
64226 @@ -4367,14 +4558,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64227
64228 int readlink_copy(char __user *buffer, int buflen, const char *link)
64229 {
64230 + char tmpbuf[64];
64231 + const char *newlink;
64232 int len = PTR_ERR(link);
64233 +
64234 if (IS_ERR(link))
64235 goto out;
64236
64237 len = strlen(link);
64238 if (len > (unsigned) buflen)
64239 len = buflen;
64240 - if (copy_to_user(buffer, link, len))
64241 +
64242 + if (len < sizeof(tmpbuf)) {
64243 + memcpy(tmpbuf, link, len);
64244 + newlink = tmpbuf;
64245 + } else
64246 + newlink = link;
64247 +
64248 + if (copy_to_user(buffer, newlink, len))
64249 len = -EFAULT;
64250 out:
64251 return len;
64252 diff --git a/fs/namespace.c b/fs/namespace.c
64253 index bbde147..f4deeba 100644
64254 --- a/fs/namespace.c
64255 +++ b/fs/namespace.c
64256 @@ -1447,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
64257 if (!(sb->s_flags & MS_RDONLY))
64258 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64259 up_write(&sb->s_umount);
64260 +
64261 + gr_log_remount(mnt->mnt_devname, retval);
64262 +
64263 return retval;
64264 }
64265
64266 @@ -1469,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
64267 }
64268 unlock_mount_hash();
64269 namespace_unlock();
64270 +
64271 + gr_log_unmount(mnt->mnt_devname, retval);
64272 +
64273 return retval;
64274 }
64275
64276 @@ -1519,7 +1525,7 @@ static inline bool may_mount(void)
64277 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64278 */
64279
64280 -SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
64281 +SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
64282 {
64283 struct path path;
64284 struct mount *mnt;
64285 @@ -1564,7 +1570,7 @@ out:
64286 /*
64287 * The 2.0 compatible umount. No flags.
64288 */
64289 -SYSCALL_DEFINE1(oldumount, char __user *, name)
64290 +SYSCALL_DEFINE1(oldumount, const char __user *, name)
64291 {
64292 return sys_umount(name, 0);
64293 }
64294 @@ -2632,6 +2638,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64295 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
64296 MS_STRICTATIME);
64297
64298 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
64299 + retval = -EPERM;
64300 + goto dput_out;
64301 + }
64302 +
64303 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
64304 + retval = -EPERM;
64305 + goto dput_out;
64306 + }
64307 +
64308 if (flags & MS_REMOUNT)
64309 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
64310 data_page);
64311 @@ -2645,7 +2661,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64312 retval = do_new_mount(&path, type_page, flags, mnt_flags,
64313 dev_name, data_page);
64314 dput_out:
64315 + gr_log_mount(dev_name, &path, retval);
64316 +
64317 path_put(&path);
64318 +
64319 return retval;
64320 }
64321
64322 @@ -2663,7 +2682,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
64323 * number incrementing at 10Ghz will take 12,427 years to wrap which
64324 * is effectively never, so we can ignore the possibility.
64325 */
64326 -static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
64327 +static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
64328
64329 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64330 {
64331 @@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64332 kfree(new_ns);
64333 return ERR_PTR(ret);
64334 }
64335 - new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
64336 + new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
64337 atomic_set(&new_ns->count, 1);
64338 new_ns->root = NULL;
64339 INIT_LIST_HEAD(&new_ns->list);
64340 @@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64341 return new_ns;
64342 }
64343
64344 -struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64345 +__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64346 struct user_namespace *user_ns, struct fs_struct *new_fs)
64347 {
64348 struct mnt_namespace *new_ns;
64349 @@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
64350 }
64351 EXPORT_SYMBOL(mount_subtree);
64352
64353 -SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
64354 - char __user *, type, unsigned long, flags, void __user *, data)
64355 +SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
64356 + const char __user *, type, unsigned long, flags, void __user *, data)
64357 {
64358 int ret;
64359 char *kernel_type;
64360 @@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
64361 if (error)
64362 goto out2;
64363
64364 + if (gr_handle_chroot_pivot()) {
64365 + error = -EPERM;
64366 + goto out2;
64367 + }
64368 +
64369 get_fs_root(current->fs, &root);
64370 old_mp = lock_mount(&old);
64371 error = PTR_ERR(old_mp);
64372 @@ -3187,7 +3211,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
64373 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
64374 return -EPERM;
64375
64376 - if (fs->users != 1)
64377 + if (atomic_read(&fs->users) != 1)
64378 return -EINVAL;
64379
64380 get_mnt_ns(mnt_ns);
64381 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
64382 index f4ccfe6..a5cf064 100644
64383 --- a/fs/nfs/callback_xdr.c
64384 +++ b/fs/nfs/callback_xdr.c
64385 @@ -51,7 +51,7 @@ struct callback_op {
64386 callback_decode_arg_t decode_args;
64387 callback_encode_res_t encode_res;
64388 long res_maxsize;
64389 -};
64390 +} __do_const;
64391
64392 static struct callback_op callback_ops[];
64393
64394 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
64395 index 00689a8..b162632 100644
64396 --- a/fs/nfs/inode.c
64397 +++ b/fs/nfs/inode.c
64398 @@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
64399 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
64400 }
64401
64402 -static atomic_long_t nfs_attr_generation_counter;
64403 +static atomic_long_unchecked_t nfs_attr_generation_counter;
64404
64405 static unsigned long nfs_read_attr_generation_counter(void)
64406 {
64407 - return atomic_long_read(&nfs_attr_generation_counter);
64408 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
64409 }
64410
64411 unsigned long nfs_inc_attr_generation_counter(void)
64412 {
64413 - return atomic_long_inc_return(&nfs_attr_generation_counter);
64414 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
64415 }
64416
64417 void nfs_fattr_init(struct nfs_fattr *fattr)
64418 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
64419 index 0beb023..3f685ec 100644
64420 --- a/fs/nfsd/nfs4proc.c
64421 +++ b/fs/nfsd/nfs4proc.c
64422 @@ -1198,7 +1198,7 @@ struct nfsd4_operation {
64423 nfsd4op_rsize op_rsize_bop;
64424 stateid_getter op_get_currentstateid;
64425 stateid_setter op_set_currentstateid;
64426 -};
64427 +} __do_const;
64428
64429 static struct nfsd4_operation nfsd4_ops[];
64430
64431 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
64432 index eeea7a9..f3ba422 100644
64433 --- a/fs/nfsd/nfs4xdr.c
64434 +++ b/fs/nfsd/nfs4xdr.c
64435 @@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
64436
64437 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
64438
64439 -static nfsd4_dec nfsd4_dec_ops[] = {
64440 +static const nfsd4_dec nfsd4_dec_ops[] = {
64441 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
64442 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
64443 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
64444 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
64445 index 122f691..a00e2e0 100644
64446 --- a/fs/nfsd/nfscache.c
64447 +++ b/fs/nfsd/nfscache.c
64448 @@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64449 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
64450 u32 hash;
64451 struct nfsd_drc_bucket *b;
64452 - int len;
64453 + long len;
64454 size_t bufsize = 0;
64455
64456 if (!rp)
64457 @@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64458 hash = nfsd_cache_hash(rp->c_xid);
64459 b = &drc_hashtbl[hash];
64460
64461 - len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
64462 - len >>= 2;
64463 + if (statp) {
64464 + len = (char*)statp - (char*)resv->iov_base;
64465 + len = resv->iov_len - len;
64466 + len >>= 2;
64467 + }
64468
64469 /* Don't cache excessive amounts of data and XDR failures */
64470 - if (!statp || len > (256 >> 2)) {
64471 + if (!statp || len > (256 >> 2) || len < 0) {
64472 nfsd_reply_cache_free(b, rp);
64473 return;
64474 }
64475 @@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64476 switch (cachetype) {
64477 case RC_REPLSTAT:
64478 if (len != 1)
64479 - printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
64480 + printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
64481 rp->c_replstat = *statp;
64482 break;
64483 case RC_REPLBUFF:
64484 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
64485 index 989129e..42e019e 100644
64486 --- a/fs/nfsd/vfs.c
64487 +++ b/fs/nfsd/vfs.c
64488 @@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
64489
64490 oldfs = get_fs();
64491 set_fs(KERNEL_DS);
64492 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
64493 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
64494 set_fs(oldfs);
64495 return nfsd_finish_read(file, count, host_err);
64496 }
64497 @@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
64498
64499 /* Write the data. */
64500 oldfs = get_fs(); set_fs(KERNEL_DS);
64501 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
64502 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
64503 set_fs(oldfs);
64504 if (host_err < 0)
64505 goto out_nfserr;
64506 @@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
64507 */
64508
64509 oldfs = get_fs(); set_fs(KERNEL_DS);
64510 - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
64511 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
64512 set_fs(oldfs);
64513
64514 if (host_err < 0)
64515 diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
64516 index 52ccd34..7a6b202 100644
64517 --- a/fs/nls/nls_base.c
64518 +++ b/fs/nls/nls_base.c
64519 @@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
64520
64521 int __register_nls(struct nls_table *nls, struct module *owner)
64522 {
64523 - struct nls_table ** tmp = &tables;
64524 + struct nls_table *tmp = tables;
64525
64526 if (nls->next)
64527 return -EBUSY;
64528
64529 - nls->owner = owner;
64530 + pax_open_kernel();
64531 + *(void **)&nls->owner = owner;
64532 + pax_close_kernel();
64533 spin_lock(&nls_lock);
64534 - while (*tmp) {
64535 - if (nls == *tmp) {
64536 + while (tmp) {
64537 + if (nls == tmp) {
64538 spin_unlock(&nls_lock);
64539 return -EBUSY;
64540 }
64541 - tmp = &(*tmp)->next;
64542 + tmp = tmp->next;
64543 }
64544 - nls->next = tables;
64545 + pax_open_kernel();
64546 + *(struct nls_table **)&nls->next = tables;
64547 + pax_close_kernel();
64548 tables = nls;
64549 spin_unlock(&nls_lock);
64550 return 0;
64551 @@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
64552
64553 int unregister_nls(struct nls_table * nls)
64554 {
64555 - struct nls_table ** tmp = &tables;
64556 + struct nls_table * const * tmp = &tables;
64557
64558 spin_lock(&nls_lock);
64559 while (*tmp) {
64560 if (nls == *tmp) {
64561 - *tmp = nls->next;
64562 + pax_open_kernel();
64563 + *(struct nls_table **)tmp = nls->next;
64564 + pax_close_kernel();
64565 spin_unlock(&nls_lock);
64566 return 0;
64567 }
64568 @@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
64569 return -EINVAL;
64570 }
64571
64572 -static struct nls_table *find_nls(char *charset)
64573 +static struct nls_table *find_nls(const char *charset)
64574 {
64575 struct nls_table *nls;
64576 spin_lock(&nls_lock);
64577 @@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
64578 return nls;
64579 }
64580
64581 -struct nls_table *load_nls(char *charset)
64582 +struct nls_table *load_nls(const char *charset)
64583 {
64584 return try_then_request_module(find_nls(charset), "nls_%s", charset);
64585 }
64586 diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
64587 index 162b3f1..6076a7c 100644
64588 --- a/fs/nls/nls_euc-jp.c
64589 +++ b/fs/nls/nls_euc-jp.c
64590 @@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
64591 p_nls = load_nls("cp932");
64592
64593 if (p_nls) {
64594 - table.charset2upper = p_nls->charset2upper;
64595 - table.charset2lower = p_nls->charset2lower;
64596 + pax_open_kernel();
64597 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64598 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64599 + pax_close_kernel();
64600 return register_nls(&table);
64601 }
64602
64603 diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
64604 index a80a741..7b96e1b 100644
64605 --- a/fs/nls/nls_koi8-ru.c
64606 +++ b/fs/nls/nls_koi8-ru.c
64607 @@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
64608 p_nls = load_nls("koi8-u");
64609
64610 if (p_nls) {
64611 - table.charset2upper = p_nls->charset2upper;
64612 - table.charset2lower = p_nls->charset2lower;
64613 + pax_open_kernel();
64614 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64615 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64616 + pax_close_kernel();
64617 return register_nls(&table);
64618 }
64619
64620 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
64621 index c991616..5ae51af 100644
64622 --- a/fs/notify/fanotify/fanotify_user.c
64623 +++ b/fs/notify/fanotify/fanotify_user.c
64624 @@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
64625
64626 fd = fanotify_event_metadata.fd;
64627 ret = -EFAULT;
64628 - if (copy_to_user(buf, &fanotify_event_metadata,
64629 - fanotify_event_metadata.event_len))
64630 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
64631 + copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
64632 goto out_close_fd;
64633
64634 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
64635 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
64636 index a95d8e0..a91a5fd 100644
64637 --- a/fs/notify/notification.c
64638 +++ b/fs/notify/notification.c
64639 @@ -48,7 +48,7 @@
64640 #include <linux/fsnotify_backend.h>
64641 #include "fsnotify.h"
64642
64643 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64644 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64645
64646 /**
64647 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
64648 @@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64649 */
64650 u32 fsnotify_get_cookie(void)
64651 {
64652 - return atomic_inc_return(&fsnotify_sync_cookie);
64653 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
64654 }
64655 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
64656
64657 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
64658 index 9e38daf..5727cae 100644
64659 --- a/fs/ntfs/dir.c
64660 +++ b/fs/ntfs/dir.c
64661 @@ -1310,7 +1310,7 @@ find_next_index_buffer:
64662 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
64663 ~(s64)(ndir->itype.index.block_size - 1)));
64664 /* Bounds checks. */
64665 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64666 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64667 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
64668 "inode 0x%lx or driver bug.", vdir->i_ino);
64669 goto err_out;
64670 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
64671 index 643faa4..ef9027e 100644
64672 --- a/fs/ntfs/file.c
64673 +++ b/fs/ntfs/file.c
64674 @@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
64675 char *addr;
64676 size_t total = 0;
64677 unsigned len;
64678 - int left;
64679 + unsigned left;
64680
64681 do {
64682 len = PAGE_CACHE_SIZE - ofs;
64683 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
64684 index 9e1e112..241a52a 100644
64685 --- a/fs/ntfs/super.c
64686 +++ b/fs/ntfs/super.c
64687 @@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64688 if (!silent)
64689 ntfs_error(sb, "Primary boot sector is invalid.");
64690 } else if (!silent)
64691 - ntfs_error(sb, read_err_str, "primary");
64692 + ntfs_error(sb, read_err_str, "%s", "primary");
64693 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
64694 if (bh_primary)
64695 brelse(bh_primary);
64696 @@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64697 goto hotfix_primary_boot_sector;
64698 brelse(bh_backup);
64699 } else if (!silent)
64700 - ntfs_error(sb, read_err_str, "backup");
64701 + ntfs_error(sb, read_err_str, "%s", "backup");
64702 /* Try to read NT3.51- backup boot sector. */
64703 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
64704 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
64705 @@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64706 "sector.");
64707 brelse(bh_backup);
64708 } else if (!silent)
64709 - ntfs_error(sb, read_err_str, "backup");
64710 + ntfs_error(sb, read_err_str, "%s", "backup");
64711 /* We failed. Cleanup and return. */
64712 if (bh_primary)
64713 brelse(bh_primary);
64714 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
64715 index 0440134..d52c93a 100644
64716 --- a/fs/ocfs2/localalloc.c
64717 +++ b/fs/ocfs2/localalloc.c
64718 @@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
64719 goto bail;
64720 }
64721
64722 - atomic_inc(&osb->alloc_stats.moves);
64723 + atomic_inc_unchecked(&osb->alloc_stats.moves);
64724
64725 bail:
64726 if (handle)
64727 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
64728 index bbec539..7b266d5 100644
64729 --- a/fs/ocfs2/ocfs2.h
64730 +++ b/fs/ocfs2/ocfs2.h
64731 @@ -236,11 +236,11 @@ enum ocfs2_vol_state
64732
64733 struct ocfs2_alloc_stats
64734 {
64735 - atomic_t moves;
64736 - atomic_t local_data;
64737 - atomic_t bitmap_data;
64738 - atomic_t bg_allocs;
64739 - atomic_t bg_extends;
64740 + atomic_unchecked_t moves;
64741 + atomic_unchecked_t local_data;
64742 + atomic_unchecked_t bitmap_data;
64743 + atomic_unchecked_t bg_allocs;
64744 + atomic_unchecked_t bg_extends;
64745 };
64746
64747 enum ocfs2_local_alloc_state
64748 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
64749 index 0cb889a..6a26b24 100644
64750 --- a/fs/ocfs2/suballoc.c
64751 +++ b/fs/ocfs2/suballoc.c
64752 @@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
64753 mlog_errno(status);
64754 goto bail;
64755 }
64756 - atomic_inc(&osb->alloc_stats.bg_extends);
64757 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
64758
64759 /* You should never ask for this much metadata */
64760 BUG_ON(bits_wanted >
64761 @@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
64762 mlog_errno(status);
64763 goto bail;
64764 }
64765 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64766 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64767
64768 *suballoc_loc = res.sr_bg_blkno;
64769 *suballoc_bit_start = res.sr_bit_offset;
64770 @@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
64771 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
64772 res->sr_bits);
64773
64774 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64775 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64776
64777 BUG_ON(res->sr_bits != 1);
64778
64779 @@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
64780 mlog_errno(status);
64781 goto bail;
64782 }
64783 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64784 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64785
64786 BUG_ON(res.sr_bits != 1);
64787
64788 @@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64789 cluster_start,
64790 num_clusters);
64791 if (!status)
64792 - atomic_inc(&osb->alloc_stats.local_data);
64793 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
64794 } else {
64795 if (min_clusters > (osb->bitmap_cpg - 1)) {
64796 /* The only paths asking for contiguousness
64797 @@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64798 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
64799 res.sr_bg_blkno,
64800 res.sr_bit_offset);
64801 - atomic_inc(&osb->alloc_stats.bitmap_data);
64802 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
64803 *num_clusters = res.sr_bits;
64804 }
64805 }
64806 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
64807 index 93c85bc..02f68a4 100644
64808 --- a/fs/ocfs2/super.c
64809 +++ b/fs/ocfs2/super.c
64810 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
64811 "%10s => GlobalAllocs: %d LocalAllocs: %d "
64812 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
64813 "Stats",
64814 - atomic_read(&osb->alloc_stats.bitmap_data),
64815 - atomic_read(&osb->alloc_stats.local_data),
64816 - atomic_read(&osb->alloc_stats.bg_allocs),
64817 - atomic_read(&osb->alloc_stats.moves),
64818 - atomic_read(&osb->alloc_stats.bg_extends));
64819 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
64820 + atomic_read_unchecked(&osb->alloc_stats.local_data),
64821 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
64822 + atomic_read_unchecked(&osb->alloc_stats.moves),
64823 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
64824
64825 out += snprintf(buf + out, len - out,
64826 "%10s => State: %u Descriptor: %llu Size: %u bits "
64827 @@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
64828
64829 mutex_init(&osb->system_file_mutex);
64830
64831 - atomic_set(&osb->alloc_stats.moves, 0);
64832 - atomic_set(&osb->alloc_stats.local_data, 0);
64833 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
64834 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
64835 - atomic_set(&osb->alloc_stats.bg_extends, 0);
64836 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
64837 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
64838 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
64839 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
64840 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
64841
64842 /* Copy the blockcheck stats from the superblock probe */
64843 osb->osb_ecc_stats = *stats;
64844 diff --git a/fs/open.c b/fs/open.c
64845 index de92c13..52d2a6c 100644
64846 --- a/fs/open.c
64847 +++ b/fs/open.c
64848 @@ -32,6 +32,8 @@
64849 #include <linux/dnotify.h>
64850 #include <linux/compat.h>
64851
64852 +#define CREATE_TRACE_POINTS
64853 +#include <trace/events/fs.h>
64854 #include "internal.h"
64855
64856 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
64857 @@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
64858 error = locks_verify_truncate(inode, NULL, length);
64859 if (!error)
64860 error = security_path_truncate(path);
64861 + if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
64862 + error = -EACCES;
64863 if (!error)
64864 error = do_truncate(path->dentry, length, 0, NULL);
64865
64866 @@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
64867 error = locks_verify_truncate(inode, f.file, length);
64868 if (!error)
64869 error = security_path_truncate(&f.file->f_path);
64870 + if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
64871 + error = -EACCES;
64872 if (!error)
64873 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
64874 sb_end_write(inode->i_sb);
64875 @@ -380,6 +386,9 @@ retry:
64876 if (__mnt_is_readonly(path.mnt))
64877 res = -EROFS;
64878
64879 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
64880 + res = -EACCES;
64881 +
64882 out_path_release:
64883 path_put(&path);
64884 if (retry_estale(res, lookup_flags)) {
64885 @@ -411,6 +420,8 @@ retry:
64886 if (error)
64887 goto dput_and_out;
64888
64889 + gr_log_chdir(path.dentry, path.mnt);
64890 +
64891 set_fs_pwd(current->fs, &path);
64892
64893 dput_and_out:
64894 @@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
64895 goto out_putf;
64896
64897 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
64898 +
64899 + if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
64900 + error = -EPERM;
64901 +
64902 + if (!error)
64903 + gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
64904 +
64905 if (!error)
64906 set_fs_pwd(current->fs, &f.file->f_path);
64907 out_putf:
64908 @@ -469,7 +487,13 @@ retry:
64909 if (error)
64910 goto dput_and_out;
64911
64912 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
64913 + goto dput_and_out;
64914 +
64915 set_fs_root(current->fs, &path);
64916 +
64917 + gr_handle_chroot_chdir(&path);
64918 +
64919 error = 0;
64920 dput_and_out:
64921 path_put(&path);
64922 @@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
64923 return error;
64924 retry_deleg:
64925 mutex_lock(&inode->i_mutex);
64926 +
64927 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
64928 + error = -EACCES;
64929 + goto out_unlock;
64930 + }
64931 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
64932 + error = -EACCES;
64933 + goto out_unlock;
64934 + }
64935 +
64936 error = security_path_chmod(path, mode);
64937 if (error)
64938 goto out_unlock;
64939 @@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
64940 uid = make_kuid(current_user_ns(), user);
64941 gid = make_kgid(current_user_ns(), group);
64942
64943 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
64944 + return -EACCES;
64945 +
64946 newattrs.ia_valid = ATTR_CTIME;
64947 if (user != (uid_t) -1) {
64948 if (!uid_valid(uid))
64949 @@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
64950 } else {
64951 fsnotify_open(f);
64952 fd_install(fd, f);
64953 + trace_do_sys_open(tmp->name, flags, mode);
64954 }
64955 }
64956 putname(tmp);
64957 diff --git a/fs/pipe.c b/fs/pipe.c
64958 index 21981e5..3d5f55c 100644
64959 --- a/fs/pipe.c
64960 +++ b/fs/pipe.c
64961 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
64962
64963 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
64964 {
64965 - if (pipe->files)
64966 + if (atomic_read(&pipe->files))
64967 mutex_lock_nested(&pipe->mutex, subclass);
64968 }
64969
64970 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
64971
64972 void pipe_unlock(struct pipe_inode_info *pipe)
64973 {
64974 - if (pipe->files)
64975 + if (atomic_read(&pipe->files))
64976 mutex_unlock(&pipe->mutex);
64977 }
64978 EXPORT_SYMBOL(pipe_unlock);
64979 @@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
64980 }
64981 if (bufs) /* More to do? */
64982 continue;
64983 - if (!pipe->writers)
64984 + if (!atomic_read(&pipe->writers))
64985 break;
64986 - if (!pipe->waiting_writers) {
64987 + if (!atomic_read(&pipe->waiting_writers)) {
64988 /* syscall merging: Usually we must not sleep
64989 * if O_NONBLOCK is set, or if we got some data.
64990 * But if a writer sleeps in kernel space, then
64991 @@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
64992
64993 __pipe_lock(pipe);
64994
64995 - if (!pipe->readers) {
64996 + if (!atomic_read(&pipe->readers)) {
64997 send_sig(SIGPIPE, current, 0);
64998 ret = -EPIPE;
64999 goto out;
65000 @@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65001 for (;;) {
65002 int bufs;
65003
65004 - if (!pipe->readers) {
65005 + if (!atomic_read(&pipe->readers)) {
65006 send_sig(SIGPIPE, current, 0);
65007 if (!ret)
65008 ret = -EPIPE;
65009 @@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65010 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65011 do_wakeup = 0;
65012 }
65013 - pipe->waiting_writers++;
65014 + atomic_inc(&pipe->waiting_writers);
65015 pipe_wait(pipe);
65016 - pipe->waiting_writers--;
65017 + atomic_dec(&pipe->waiting_writers);
65018 }
65019 out:
65020 __pipe_unlock(pipe);
65021 @@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65022 mask = 0;
65023 if (filp->f_mode & FMODE_READ) {
65024 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65025 - if (!pipe->writers && filp->f_version != pipe->w_counter)
65026 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65027 mask |= POLLHUP;
65028 }
65029
65030 @@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65031 * Most Unices do not set POLLERR for FIFOs but on Linux they
65032 * behave exactly like pipes for poll().
65033 */
65034 - if (!pipe->readers)
65035 + if (!atomic_read(&pipe->readers))
65036 mask |= POLLERR;
65037 }
65038
65039 @@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65040 int kill = 0;
65041
65042 spin_lock(&inode->i_lock);
65043 - if (!--pipe->files) {
65044 + if (atomic_dec_and_test(&pipe->files)) {
65045 inode->i_pipe = NULL;
65046 kill = 1;
65047 }
65048 @@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65049
65050 __pipe_lock(pipe);
65051 if (file->f_mode & FMODE_READ)
65052 - pipe->readers--;
65053 + atomic_dec(&pipe->readers);
65054 if (file->f_mode & FMODE_WRITE)
65055 - pipe->writers--;
65056 + atomic_dec(&pipe->writers);
65057
65058 - if (pipe->readers || pipe->writers) {
65059 + if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65060 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65061 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65062 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65063 @@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65064 kfree(pipe);
65065 }
65066
65067 -static struct vfsmount *pipe_mnt __read_mostly;
65068 +struct vfsmount *pipe_mnt __read_mostly;
65069
65070 /*
65071 * pipefs_dname() is called from d_path().
65072 @@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65073 goto fail_iput;
65074
65075 inode->i_pipe = pipe;
65076 - pipe->files = 2;
65077 - pipe->readers = pipe->writers = 1;
65078 + atomic_set(&pipe->files, 2);
65079 + atomic_set(&pipe->readers, 1);
65080 + atomic_set(&pipe->writers, 1);
65081 inode->i_fop = &pipefifo_fops;
65082
65083 /*
65084 @@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65085 spin_lock(&inode->i_lock);
65086 if (inode->i_pipe) {
65087 pipe = inode->i_pipe;
65088 - pipe->files++;
65089 + atomic_inc(&pipe->files);
65090 spin_unlock(&inode->i_lock);
65091 } else {
65092 spin_unlock(&inode->i_lock);
65093 pipe = alloc_pipe_info();
65094 if (!pipe)
65095 return -ENOMEM;
65096 - pipe->files = 1;
65097 + atomic_set(&pipe->files, 1);
65098 spin_lock(&inode->i_lock);
65099 if (unlikely(inode->i_pipe)) {
65100 - inode->i_pipe->files++;
65101 + atomic_inc(&inode->i_pipe->files);
65102 spin_unlock(&inode->i_lock);
65103 free_pipe_info(pipe);
65104 pipe = inode->i_pipe;
65105 @@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65106 * opened, even when there is no process writing the FIFO.
65107 */
65108 pipe->r_counter++;
65109 - if (pipe->readers++ == 0)
65110 + if (atomic_inc_return(&pipe->readers) == 1)
65111 wake_up_partner(pipe);
65112
65113 - if (!is_pipe && !pipe->writers) {
65114 + if (!is_pipe && !atomic_read(&pipe->writers)) {
65115 if ((filp->f_flags & O_NONBLOCK)) {
65116 /* suppress POLLHUP until we have
65117 * seen a writer */
65118 @@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65119 * errno=ENXIO when there is no process reading the FIFO.
65120 */
65121 ret = -ENXIO;
65122 - if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65123 + if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65124 goto err;
65125
65126 pipe->w_counter++;
65127 - if (!pipe->writers++)
65128 + if (atomic_inc_return(&pipe->writers) == 1)
65129 wake_up_partner(pipe);
65130
65131 - if (!is_pipe && !pipe->readers) {
65132 + if (!is_pipe && !atomic_read(&pipe->readers)) {
65133 if (wait_for_partner(pipe, &pipe->r_counter))
65134 goto err_wr;
65135 }
65136 @@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65137 * the process can at least talk to itself.
65138 */
65139
65140 - pipe->readers++;
65141 - pipe->writers++;
65142 + atomic_inc(&pipe->readers);
65143 + atomic_inc(&pipe->writers);
65144 pipe->r_counter++;
65145 pipe->w_counter++;
65146 - if (pipe->readers == 1 || pipe->writers == 1)
65147 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65148 wake_up_partner(pipe);
65149 break;
65150
65151 @@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65152 return 0;
65153
65154 err_rd:
65155 - if (!--pipe->readers)
65156 + if (atomic_dec_and_test(&pipe->readers))
65157 wake_up_interruptible(&pipe->wait);
65158 ret = -ERESTARTSYS;
65159 goto err;
65160
65161 err_wr:
65162 - if (!--pipe->writers)
65163 + if (atomic_dec_and_test(&pipe->writers))
65164 wake_up_interruptible(&pipe->wait);
65165 ret = -ERESTARTSYS;
65166 goto err;
65167 diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65168 index 0855f77..6787d50 100644
65169 --- a/fs/posix_acl.c
65170 +++ b/fs/posix_acl.c
65171 @@ -20,6 +20,7 @@
65172 #include <linux/xattr.h>
65173 #include <linux/export.h>
65174 #include <linux/user_namespace.h>
65175 +#include <linux/grsecurity.h>
65176
65177 struct posix_acl **acl_by_type(struct inode *inode, int type)
65178 {
65179 @@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65180 }
65181 }
65182 if (mode_p)
65183 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65184 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65185 return not_equiv;
65186 }
65187 EXPORT_SYMBOL(posix_acl_equiv_mode);
65188 @@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65189 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65190 }
65191
65192 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65193 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65194 return not_equiv;
65195 }
65196
65197 @@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65198 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65199 int err = -ENOMEM;
65200 if (clone) {
65201 + *mode_p &= ~gr_acl_umask();
65202 +
65203 err = posix_acl_create_masq(clone, mode_p);
65204 if (err < 0) {
65205 posix_acl_release(clone);
65206 @@ -659,11 +662,12 @@ struct posix_acl *
65207 posix_acl_from_xattr(struct user_namespace *user_ns,
65208 const void *value, size_t size)
65209 {
65210 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65211 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65212 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65213 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65214 int count;
65215 struct posix_acl *acl;
65216 struct posix_acl_entry *acl_e;
65217 + umode_t umask = gr_acl_umask();
65218
65219 if (!value)
65220 return NULL;
65221 @@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65222
65223 switch(acl_e->e_tag) {
65224 case ACL_USER_OBJ:
65225 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65226 + break;
65227 case ACL_GROUP_OBJ:
65228 case ACL_MASK:
65229 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65230 + break;
65231 case ACL_OTHER:
65232 + acl_e->e_perm &= ~(umask & S_IRWXO);
65233 break;
65234
65235 case ACL_USER:
65236 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65237 acl_e->e_uid =
65238 make_kuid(user_ns,
65239 le32_to_cpu(entry->e_id));
65240 @@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65241 goto fail;
65242 break;
65243 case ACL_GROUP:
65244 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65245 acl_e->e_gid =
65246 make_kgid(user_ns,
65247 le32_to_cpu(entry->e_id));
65248 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65249 index 2183fcf..3c32a98 100644
65250 --- a/fs/proc/Kconfig
65251 +++ b/fs/proc/Kconfig
65252 @@ -30,7 +30,7 @@ config PROC_FS
65253
65254 config PROC_KCORE
65255 bool "/proc/kcore support" if !ARM
65256 - depends on PROC_FS && MMU
65257 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65258 help
65259 Provides a virtual ELF core file of the live kernel. This can
65260 be read with gdb and other ELF tools. No modifications can be
65261 @@ -38,8 +38,8 @@ config PROC_KCORE
65262
65263 config PROC_VMCORE
65264 bool "/proc/vmcore support"
65265 - depends on PROC_FS && CRASH_DUMP
65266 - default y
65267 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
65268 + default n
65269 help
65270 Exports the dump image of crashed kernel in ELF format.
65271
65272 @@ -63,8 +63,8 @@ config PROC_SYSCTL
65273 limited in memory.
65274
65275 config PROC_PAGE_MONITOR
65276 - default y
65277 - depends on PROC_FS && MMU
65278 + default n
65279 + depends on PROC_FS && MMU && !GRKERNSEC
65280 bool "Enable /proc page monitoring" if EXPERT
65281 help
65282 Various /proc files exist to monitor process memory utilization:
65283 diff --git a/fs/proc/array.c b/fs/proc/array.c
65284 index cd3653e..9b9b79a 100644
65285 --- a/fs/proc/array.c
65286 +++ b/fs/proc/array.c
65287 @@ -60,6 +60,7 @@
65288 #include <linux/tty.h>
65289 #include <linux/string.h>
65290 #include <linux/mman.h>
65291 +#include <linux/grsecurity.h>
65292 #include <linux/proc_fs.h>
65293 #include <linux/ioport.h>
65294 #include <linux/uaccess.h>
65295 @@ -347,6 +348,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
65296 seq_putc(m, '\n');
65297 }
65298
65299 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65300 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
65301 +{
65302 + if (p->mm)
65303 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
65304 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
65305 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
65306 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
65307 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
65308 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
65309 + else
65310 + seq_printf(m, "PaX:\t-----\n");
65311 +}
65312 +#endif
65313 +
65314 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65315 struct pid *pid, struct task_struct *task)
65316 {
65317 @@ -365,9 +381,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65318 task_cpus_allowed(m, task);
65319 cpuset_task_status_allowed(m, task);
65320 task_context_switch_counts(m, task);
65321 +
65322 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65323 + task_pax(m, task);
65324 +#endif
65325 +
65326 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
65327 + task_grsec_rbac(m, task);
65328 +#endif
65329 +
65330 return 0;
65331 }
65332
65333 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65334 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65335 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
65336 + _mm->pax_flags & MF_PAX_SEGMEXEC))
65337 +#endif
65338 +
65339 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65340 struct pid *pid, struct task_struct *task, int whole)
65341 {
65342 @@ -389,6 +420,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65343 char tcomm[sizeof(task->comm)];
65344 unsigned long flags;
65345
65346 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65347 + if (current->exec_id != m->exec_id) {
65348 + gr_log_badprocpid("stat");
65349 + return 0;
65350 + }
65351 +#endif
65352 +
65353 state = *get_task_state(task);
65354 vsize = eip = esp = 0;
65355 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65356 @@ -459,6 +497,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65357 gtime = task_gtime(task);
65358 }
65359
65360 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65361 + if (PAX_RAND_FLAGS(mm)) {
65362 + eip = 0;
65363 + esp = 0;
65364 + wchan = 0;
65365 + }
65366 +#endif
65367 +#ifdef CONFIG_GRKERNSEC_HIDESYM
65368 + wchan = 0;
65369 + eip =0;
65370 + esp =0;
65371 +#endif
65372 +
65373 /* scale priority and nice values from timeslices to -20..20 */
65374 /* to make it look like a "normal" Unix priority/nice value */
65375 priority = task_prio(task);
65376 @@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65377 seq_put_decimal_ull(m, ' ', vsize);
65378 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
65379 seq_put_decimal_ull(m, ' ', rsslim);
65380 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65381 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
65382 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
65383 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
65384 +#else
65385 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
65386 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
65387 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
65388 +#endif
65389 seq_put_decimal_ull(m, ' ', esp);
65390 seq_put_decimal_ull(m, ' ', eip);
65391 /* The signal information here is obsolete.
65392 @@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65393 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
65394 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
65395
65396 - if (mm && permitted) {
65397 + if (mm && permitted
65398 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65399 + && !PAX_RAND_FLAGS(mm)
65400 +#endif
65401 + ) {
65402 seq_put_decimal_ull(m, ' ', mm->start_data);
65403 seq_put_decimal_ull(m, ' ', mm->end_data);
65404 seq_put_decimal_ull(m, ' ', mm->start_brk);
65405 @@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65406 struct pid *pid, struct task_struct *task)
65407 {
65408 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
65409 - struct mm_struct *mm = get_task_mm(task);
65410 + struct mm_struct *mm;
65411
65412 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65413 + if (current->exec_id != m->exec_id) {
65414 + gr_log_badprocpid("statm");
65415 + return 0;
65416 + }
65417 +#endif
65418 + mm = get_task_mm(task);
65419 if (mm) {
65420 size = task_statm(mm, &shared, &text, &data, &resident);
65421 mmput(mm);
65422 @@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65423 return 0;
65424 }
65425
65426 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65427 +int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
65428 +{
65429 + unsigned long flags;
65430 + u32 curr_ip = 0;
65431 +
65432 + if (lock_task_sighand(task, &flags)) {
65433 + curr_ip = task->signal->curr_ip;
65434 + unlock_task_sighand(task, &flags);
65435 + }
65436 + return seq_printf(m, "%pI4\n", &curr_ip);
65437 +}
65438 +#endif
65439 +
65440 #ifdef CONFIG_CHECKPOINT_RESTORE
65441 static struct pid *
65442 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
65443 diff --git a/fs/proc/base.c b/fs/proc/base.c
65444 index 7dc3ea8..4cfe92f 100644
65445 --- a/fs/proc/base.c
65446 +++ b/fs/proc/base.c
65447 @@ -113,6 +113,14 @@ struct pid_entry {
65448 union proc_op op;
65449 };
65450
65451 +struct getdents_callback {
65452 + struct linux_dirent __user * current_dir;
65453 + struct linux_dirent __user * previous;
65454 + struct file * file;
65455 + int count;
65456 + int error;
65457 +};
65458 +
65459 #define NOD(NAME, MODE, IOP, FOP, OP) { \
65460 .name = (NAME), \
65461 .len = sizeof(NAME) - 1, \
65462 @@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
65463 return 0;
65464 }
65465
65466 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65467 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65468 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
65469 + _mm->pax_flags & MF_PAX_SEGMEXEC))
65470 +#endif
65471 +
65472 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65473 struct pid *pid, struct task_struct *task)
65474 {
65475 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
65476 if (mm && !IS_ERR(mm)) {
65477 unsigned int nwords = 0;
65478 +
65479 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65480 + /* allow if we're currently ptracing this task */
65481 + if (PAX_RAND_FLAGS(mm) &&
65482 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
65483 + mmput(mm);
65484 + return 0;
65485 + }
65486 +#endif
65487 +
65488 do {
65489 nwords += 2;
65490 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
65491 @@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65492 }
65493
65494
65495 -#ifdef CONFIG_KALLSYMS
65496 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65497 /*
65498 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
65499 * Returns the resolved symbol. If that fails, simply return the address.
65500 @@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
65501 mutex_unlock(&task->signal->cred_guard_mutex);
65502 }
65503
65504 -#ifdef CONFIG_STACKTRACE
65505 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65506
65507 #define MAX_STACK_TRACE_DEPTH 64
65508
65509 @@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
65510 return 0;
65511 }
65512
65513 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65514 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65515 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65516 struct pid *pid, struct task_struct *task)
65517 {
65518 @@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65519 /************************************************************************/
65520
65521 /* permission checks */
65522 -static int proc_fd_access_allowed(struct inode *inode)
65523 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
65524 {
65525 struct task_struct *task;
65526 int allowed = 0;
65527 @@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
65528 */
65529 task = get_proc_task(inode);
65530 if (task) {
65531 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65532 + if (log)
65533 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65534 + else
65535 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65536 put_task_struct(task);
65537 }
65538 return allowed;
65539 @@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
65540 struct task_struct *task,
65541 int hide_pid_min)
65542 {
65543 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65544 + return false;
65545 +
65546 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65547 + rcu_read_lock();
65548 + {
65549 + const struct cred *tmpcred = current_cred();
65550 + const struct cred *cred = __task_cred(task);
65551 +
65552 + if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
65553 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65554 + || in_group_p(grsec_proc_gid)
65555 +#endif
65556 + ) {
65557 + rcu_read_unlock();
65558 + return true;
65559 + }
65560 + }
65561 + rcu_read_unlock();
65562 +
65563 + if (!pid->hide_pid)
65564 + return false;
65565 +#endif
65566 +
65567 if (pid->hide_pid < hide_pid_min)
65568 return true;
65569 if (in_group_p(pid->pid_gid))
65570 return true;
65571 +
65572 return ptrace_may_access(task, PTRACE_MODE_READ);
65573 }
65574
65575 @@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
65576 put_task_struct(task);
65577
65578 if (!has_perms) {
65579 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65580 + {
65581 +#else
65582 if (pid->hide_pid == 2) {
65583 +#endif
65584 /*
65585 * Let's make getdents(), stat(), and open()
65586 * consistent with each other. If a process
65587 @@ -609,6 +665,8 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
65588
65589 if (task) {
65590 mm = mm_access(task, mode);
65591 + if (gr_acl_handle_procpidmem(task))
65592 + mm = ERR_PTR(-EPERM);
65593 put_task_struct(task);
65594
65595 if (!IS_ERR_OR_NULL(mm)) {
65596 @@ -630,6 +688,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
65597 return PTR_ERR(mm);
65598
65599 file->private_data = mm;
65600 +
65601 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65602 + file->f_version = current->exec_id;
65603 +#endif
65604 +
65605 return 0;
65606 }
65607
65608 @@ -651,6 +714,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65609 ssize_t copied;
65610 char *page;
65611
65612 +#ifdef CONFIG_GRKERNSEC
65613 + if (write)
65614 + return -EPERM;
65615 +#endif
65616 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65617 + if (file->f_version != current->exec_id) {
65618 + gr_log_badprocpid("mem");
65619 + return 0;
65620 + }
65621 +#endif
65622 +
65623 if (!mm)
65624 return 0;
65625
65626 @@ -663,7 +737,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65627 goto free;
65628
65629 while (count > 0) {
65630 - int this_len = min_t(int, count, PAGE_SIZE);
65631 + ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
65632
65633 if (write && copy_from_user(page, buf, this_len)) {
65634 copied = -EFAULT;
65635 @@ -755,6 +829,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65636 if (!mm)
65637 return 0;
65638
65639 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65640 + if (file->f_version != current->exec_id) {
65641 + gr_log_badprocpid("environ");
65642 + return 0;
65643 + }
65644 +#endif
65645 +
65646 page = (char *)__get_free_page(GFP_TEMPORARY);
65647 if (!page)
65648 return -ENOMEM;
65649 @@ -764,7 +845,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65650 goto free;
65651 while (count > 0) {
65652 size_t this_len, max_len;
65653 - int retval;
65654 + ssize_t retval;
65655
65656 if (src >= (mm->env_end - mm->env_start))
65657 break;
65658 @@ -1378,7 +1459,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
65659 int error = -EACCES;
65660
65661 /* Are we allowed to snoop on the tasks file descriptors? */
65662 - if (!proc_fd_access_allowed(inode))
65663 + if (!proc_fd_access_allowed(inode, 0))
65664 goto out;
65665
65666 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65667 @@ -1422,8 +1503,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
65668 struct path path;
65669
65670 /* Are we allowed to snoop on the tasks file descriptors? */
65671 - if (!proc_fd_access_allowed(inode))
65672 - goto out;
65673 + /* logging this is needed for learning on chromium to work properly,
65674 + but we don't want to flood the logs from 'ps' which does a readlink
65675 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
65676 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
65677 + */
65678 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
65679 + if (!proc_fd_access_allowed(inode,0))
65680 + goto out;
65681 + } else {
65682 + if (!proc_fd_access_allowed(inode,1))
65683 + goto out;
65684 + }
65685
65686 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65687 if (error)
65688 @@ -1473,7 +1564,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
65689 rcu_read_lock();
65690 cred = __task_cred(task);
65691 inode->i_uid = cred->euid;
65692 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65693 + inode->i_gid = grsec_proc_gid;
65694 +#else
65695 inode->i_gid = cred->egid;
65696 +#endif
65697 rcu_read_unlock();
65698 }
65699 security_task_to_inode(task, inode);
65700 @@ -1509,10 +1604,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
65701 return -ENOENT;
65702 }
65703 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65704 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65705 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65706 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65707 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65708 +#endif
65709 task_dumpable(task)) {
65710 cred = __task_cred(task);
65711 stat->uid = cred->euid;
65712 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65713 + stat->gid = grsec_proc_gid;
65714 +#else
65715 stat->gid = cred->egid;
65716 +#endif
65717 }
65718 }
65719 rcu_read_unlock();
65720 @@ -1550,11 +1654,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
65721
65722 if (task) {
65723 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65724 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65725 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65726 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65727 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65728 +#endif
65729 task_dumpable(task)) {
65730 rcu_read_lock();
65731 cred = __task_cred(task);
65732 inode->i_uid = cred->euid;
65733 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65734 + inode->i_gid = grsec_proc_gid;
65735 +#else
65736 inode->i_gid = cred->egid;
65737 +#endif
65738 rcu_read_unlock();
65739 } else {
65740 inode->i_uid = GLOBAL_ROOT_UID;
65741 @@ -2085,6 +2198,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
65742 if (!task)
65743 goto out_no_task;
65744
65745 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65746 + goto out;
65747 +
65748 /*
65749 * Yes, it does not scale. And it should not. Don't add
65750 * new entries into /proc/<tgid>/ without very good reasons.
65751 @@ -2115,6 +2231,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
65752 if (!task)
65753 return -ENOENT;
65754
65755 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65756 + goto out;
65757 +
65758 if (!dir_emit_dots(file, ctx))
65759 goto out;
65760
65761 @@ -2557,7 +2676,7 @@ static const struct pid_entry tgid_base_stuff[] = {
65762 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
65763 #endif
65764 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65765 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65766 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65767 ONE("syscall", S_IRUSR, proc_pid_syscall),
65768 #endif
65769 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65770 @@ -2582,10 +2701,10 @@ static const struct pid_entry tgid_base_stuff[] = {
65771 #ifdef CONFIG_SECURITY
65772 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65773 #endif
65774 -#ifdef CONFIG_KALLSYMS
65775 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65776 ONE("wchan", S_IRUGO, proc_pid_wchan),
65777 #endif
65778 -#ifdef CONFIG_STACKTRACE
65779 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65780 ONE("stack", S_IRUSR, proc_pid_stack),
65781 #endif
65782 #ifdef CONFIG_SCHEDSTATS
65783 @@ -2619,6 +2738,9 @@ static const struct pid_entry tgid_base_stuff[] = {
65784 #ifdef CONFIG_HARDWALL
65785 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
65786 #endif
65787 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65788 + ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
65789 +#endif
65790 #ifdef CONFIG_USER_NS
65791 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
65792 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
65793 @@ -2748,7 +2870,14 @@ static int proc_pid_instantiate(struct inode *dir,
65794 if (!inode)
65795 goto out;
65796
65797 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65798 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
65799 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65800 + inode->i_gid = grsec_proc_gid;
65801 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
65802 +#else
65803 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
65804 +#endif
65805 inode->i_op = &proc_tgid_base_inode_operations;
65806 inode->i_fop = &proc_tgid_base_operations;
65807 inode->i_flags|=S_IMMUTABLE;
65808 @@ -2786,7 +2915,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
65809 if (!task)
65810 goto out;
65811
65812 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65813 + goto out_put_task;
65814 +
65815 result = proc_pid_instantiate(dir, dentry, task, NULL);
65816 +out_put_task:
65817 put_task_struct(task);
65818 out:
65819 return ERR_PTR(result);
65820 @@ -2900,7 +3033,7 @@ static const struct pid_entry tid_base_stuff[] = {
65821 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
65822 #endif
65823 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65824 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65825 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65826 ONE("syscall", S_IRUSR, proc_pid_syscall),
65827 #endif
65828 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65829 @@ -2927,10 +3060,10 @@ static const struct pid_entry tid_base_stuff[] = {
65830 #ifdef CONFIG_SECURITY
65831 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65832 #endif
65833 -#ifdef CONFIG_KALLSYMS
65834 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65835 ONE("wchan", S_IRUGO, proc_pid_wchan),
65836 #endif
65837 -#ifdef CONFIG_STACKTRACE
65838 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65839 ONE("stack", S_IRUSR, proc_pid_stack),
65840 #endif
65841 #ifdef CONFIG_SCHEDSTATS
65842 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
65843 index cbd82df..c0407d2 100644
65844 --- a/fs/proc/cmdline.c
65845 +++ b/fs/proc/cmdline.c
65846 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
65847
65848 static int __init proc_cmdline_init(void)
65849 {
65850 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
65851 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
65852 +#else
65853 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
65854 +#endif
65855 return 0;
65856 }
65857 fs_initcall(proc_cmdline_init);
65858 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
65859 index 50493ed..248166b 100644
65860 --- a/fs/proc/devices.c
65861 +++ b/fs/proc/devices.c
65862 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
65863
65864 static int __init proc_devices_init(void)
65865 {
65866 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
65867 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
65868 +#else
65869 proc_create("devices", 0, NULL, &proc_devinfo_operations);
65870 +#endif
65871 return 0;
65872 }
65873 fs_initcall(proc_devices_init);
65874 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
65875 index e11d7c5..9128ce06 100644
65876 --- a/fs/proc/fd.c
65877 +++ b/fs/proc/fd.c
65878 @@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
65879 if (!task)
65880 return -ENOENT;
65881
65882 - files = get_files_struct(task);
65883 + if (!gr_acl_handle_procpidmem(task))
65884 + files = get_files_struct(task);
65885 put_task_struct(task);
65886
65887 if (files) {
65888 @@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
65889 */
65890 int proc_fd_permission(struct inode *inode, int mask)
65891 {
65892 + struct task_struct *task;
65893 int rv = generic_permission(inode, mask);
65894 - if (rv == 0)
65895 - return 0;
65896 +
65897 if (task_tgid(current) == proc_pid(inode))
65898 rv = 0;
65899 +
65900 + task = get_proc_task(inode);
65901 + if (task == NULL)
65902 + return rv;
65903 +
65904 + if (gr_acl_handle_procpidmem(task))
65905 + rv = -EACCES;
65906 +
65907 + put_task_struct(task);
65908 +
65909 return rv;
65910 }
65911
65912 diff --git a/fs/proc/generic.c b/fs/proc/generic.c
65913 index 317b726..e329aed 100644
65914 --- a/fs/proc/generic.c
65915 +++ b/fs/proc/generic.c
65916 @@ -23,6 +23,7 @@
65917 #include <linux/bitops.h>
65918 #include <linux/spinlock.h>
65919 #include <linux/completion.h>
65920 +#include <linux/grsecurity.h>
65921 #include <asm/uaccess.h>
65922
65923 #include "internal.h"
65924 @@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
65925 return proc_lookup_de(PDE(dir), dir, dentry);
65926 }
65927
65928 +struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
65929 + unsigned int flags)
65930 +{
65931 + if (gr_proc_is_restricted())
65932 + return ERR_PTR(-EACCES);
65933 +
65934 + return proc_lookup_de(PDE(dir), dir, dentry);
65935 +}
65936 +
65937 /*
65938 * This returns non-zero if at EOF, so that the /proc
65939 * root directory can use this and check if it should
65940 @@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
65941 return proc_readdir_de(PDE(inode), file, ctx);
65942 }
65943
65944 +int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
65945 +{
65946 + struct inode *inode = file_inode(file);
65947 +
65948 + if (gr_proc_is_restricted())
65949 + return -EACCES;
65950 +
65951 + return proc_readdir_de(PDE(inode), file, ctx);
65952 +}
65953 +
65954 /*
65955 * These are the generic /proc directory operations. They
65956 * use the in-memory "struct proc_dir_entry" tree to parse
65957 @@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
65958 .iterate = proc_readdir,
65959 };
65960
65961 +static const struct file_operations proc_dir_restricted_operations = {
65962 + .llseek = generic_file_llseek,
65963 + .read = generic_read_dir,
65964 + .iterate = proc_readdir_restrict,
65965 +};
65966 +
65967 /*
65968 * proc directories can do almost nothing..
65969 */
65970 @@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
65971 .setattr = proc_notify_change,
65972 };
65973
65974 +static const struct inode_operations proc_dir_restricted_inode_operations = {
65975 + .lookup = proc_lookup_restrict,
65976 + .getattr = proc_getattr,
65977 + .setattr = proc_notify_change,
65978 +};
65979 +
65980 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
65981 {
65982 struct proc_dir_entry *tmp;
65983 @@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
65984 return ret;
65985
65986 if (S_ISDIR(dp->mode)) {
65987 - dp->proc_fops = &proc_dir_operations;
65988 - dp->proc_iops = &proc_dir_inode_operations;
65989 + if (dp->restricted) {
65990 + dp->proc_fops = &proc_dir_restricted_operations;
65991 + dp->proc_iops = &proc_dir_restricted_inode_operations;
65992 + } else {
65993 + dp->proc_fops = &proc_dir_operations;
65994 + dp->proc_iops = &proc_dir_inode_operations;
65995 + }
65996 dir->nlink++;
65997 } else if (S_ISLNK(dp->mode)) {
65998 dp->proc_iops = &proc_link_inode_operations;
65999 @@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66000 }
66001 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66002
66003 +struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66004 + struct proc_dir_entry *parent, void *data)
66005 +{
66006 + struct proc_dir_entry *ent;
66007 +
66008 + if (mode == 0)
66009 + mode = S_IRUGO | S_IXUGO;
66010 +
66011 + ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66012 + if (ent) {
66013 + ent->data = data;
66014 + ent->restricted = 1;
66015 + if (proc_register(parent, ent) < 0) {
66016 + kfree(ent);
66017 + ent = NULL;
66018 + }
66019 + }
66020 + return ent;
66021 +}
66022 +EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66023 +
66024 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66025 struct proc_dir_entry *parent)
66026 {
66027 @@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66028 }
66029 EXPORT_SYMBOL(proc_mkdir);
66030
66031 +struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66032 + struct proc_dir_entry *parent)
66033 +{
66034 + return proc_mkdir_data_restrict(name, 0, parent, NULL);
66035 +}
66036 +EXPORT_SYMBOL(proc_mkdir_restrict);
66037 +
66038 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66039 struct proc_dir_entry *parent,
66040 const struct file_operations *proc_fops,
66041 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66042 index 333080d..0a35ec4 100644
66043 --- a/fs/proc/inode.c
66044 +++ b/fs/proc/inode.c
66045 @@ -23,11 +23,17 @@
66046 #include <linux/slab.h>
66047 #include <linux/mount.h>
66048 #include <linux/magic.h>
66049 +#include <linux/grsecurity.h>
66050
66051 #include <asm/uaccess.h>
66052
66053 #include "internal.h"
66054
66055 +#ifdef CONFIG_PROC_SYSCTL
66056 +extern const struct inode_operations proc_sys_inode_operations;
66057 +extern const struct inode_operations proc_sys_dir_operations;
66058 +#endif
66059 +
66060 static void proc_evict_inode(struct inode *inode)
66061 {
66062 struct proc_dir_entry *de;
66063 @@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
66064 ns = PROC_I(inode)->ns.ns;
66065 if (ns_ops && ns)
66066 ns_ops->put(ns);
66067 +
66068 +#ifdef CONFIG_PROC_SYSCTL
66069 + if (inode->i_op == &proc_sys_inode_operations ||
66070 + inode->i_op == &proc_sys_dir_operations)
66071 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66072 +#endif
66073 +
66074 }
66075
66076 static struct kmem_cache * proc_inode_cachep;
66077 @@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66078 if (de->mode) {
66079 inode->i_mode = de->mode;
66080 inode->i_uid = de->uid;
66081 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66082 + inode->i_gid = grsec_proc_gid;
66083 +#else
66084 inode->i_gid = de->gid;
66085 +#endif
66086 }
66087 if (de->size)
66088 inode->i_size = de->size;
66089 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66090 index aa7a0ee..f2318df 100644
66091 --- a/fs/proc/internal.h
66092 +++ b/fs/proc/internal.h
66093 @@ -46,9 +46,10 @@ struct proc_dir_entry {
66094 struct completion *pde_unload_completion;
66095 struct list_head pde_openers; /* who did ->open, but not ->release */
66096 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66097 + u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66098 u8 namelen;
66099 char name[];
66100 -};
66101 +} __randomize_layout;
66102
66103 union proc_op {
66104 int (*proc_get_link)(struct dentry *, struct path *);
66105 @@ -66,7 +67,7 @@ struct proc_inode {
66106 struct ctl_table *sysctl_entry;
66107 struct proc_ns ns;
66108 struct inode vfs_inode;
66109 -};
66110 +} __randomize_layout;
66111
66112 /*
66113 * General functions
66114 @@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66115 struct pid *, struct task_struct *);
66116 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66117 struct pid *, struct task_struct *);
66118 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66119 +extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66120 + struct pid *, struct task_struct *);
66121 +#endif
66122
66123 /*
66124 * base.c
66125 @@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66126 * generic.c
66127 */
66128 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66129 +extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66130 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66131 struct dentry *);
66132 extern int proc_readdir(struct file *, struct dir_context *);
66133 +extern int proc_readdir_restrict(struct file *, struct dir_context *);
66134 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66135
66136 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66137 diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66138 index a352d57..cb94a5c 100644
66139 --- a/fs/proc/interrupts.c
66140 +++ b/fs/proc/interrupts.c
66141 @@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66142
66143 static int __init proc_interrupts_init(void)
66144 {
66145 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66146 + proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66147 +#else
66148 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66149 +#endif
66150 return 0;
66151 }
66152 fs_initcall(proc_interrupts_init);
66153 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66154 index 91a4e64..cb007c0 100644
66155 --- a/fs/proc/kcore.c
66156 +++ b/fs/proc/kcore.c
66157 @@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66158 * the addresses in the elf_phdr on our list.
66159 */
66160 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66161 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66162 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66163 + if (tsz > buflen)
66164 tsz = buflen;
66165 -
66166 +
66167 while (buflen) {
66168 struct kcore_list *m;
66169
66170 @@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66171 kfree(elf_buf);
66172 } else {
66173 if (kern_addr_valid(start)) {
66174 - unsigned long n;
66175 + char *elf_buf;
66176 + mm_segment_t oldfs;
66177
66178 - n = copy_to_user(buffer, (char *)start, tsz);
66179 - /*
66180 - * We cannot distinguish between fault on source
66181 - * and fault on destination. When this happens
66182 - * we clear too and hope it will trigger the
66183 - * EFAULT again.
66184 - */
66185 - if (n) {
66186 - if (clear_user(buffer + tsz - n,
66187 - n))
66188 + elf_buf = kmalloc(tsz, GFP_KERNEL);
66189 + if (!elf_buf)
66190 + return -ENOMEM;
66191 + oldfs = get_fs();
66192 + set_fs(KERNEL_DS);
66193 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66194 + set_fs(oldfs);
66195 + if (copy_to_user(buffer, elf_buf, tsz)) {
66196 + kfree(elf_buf);
66197 return -EFAULT;
66198 + }
66199 }
66200 + set_fs(oldfs);
66201 + kfree(elf_buf);
66202 } else {
66203 if (clear_user(buffer, tsz))
66204 return -EFAULT;
66205 @@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66206
66207 static int open_kcore(struct inode *inode, struct file *filp)
66208 {
66209 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66210 + return -EPERM;
66211 +#endif
66212 if (!capable(CAP_SYS_RAWIO))
66213 return -EPERM;
66214 if (kcore_need_update)
66215 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66216 index aa1eee0..03dda72 100644
66217 --- a/fs/proc/meminfo.c
66218 +++ b/fs/proc/meminfo.c
66219 @@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66220 vmi.used >> 10,
66221 vmi.largest_chunk >> 10
66222 #ifdef CONFIG_MEMORY_FAILURE
66223 - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66224 + ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66225 #endif
66226 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66227 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66228 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66229 index d4a3574..b421ce9 100644
66230 --- a/fs/proc/nommu.c
66231 +++ b/fs/proc/nommu.c
66232 @@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66233
66234 if (file) {
66235 seq_pad(m, ' ');
66236 - seq_path(m, &file->f_path, "");
66237 + seq_path(m, &file->f_path, "\n\\");
66238 }
66239
66240 seq_putc(m, '\n');
66241 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66242 index a63af3e..b4f262a 100644
66243 --- a/fs/proc/proc_net.c
66244 +++ b/fs/proc/proc_net.c
66245 @@ -23,9 +23,27 @@
66246 #include <linux/nsproxy.h>
66247 #include <net/net_namespace.h>
66248 #include <linux/seq_file.h>
66249 +#include <linux/grsecurity.h>
66250
66251 #include "internal.h"
66252
66253 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66254 +static struct seq_operations *ipv6_seq_ops_addr;
66255 +
66256 +void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66257 +{
66258 + ipv6_seq_ops_addr = addr;
66259 +}
66260 +
66261 +void unregister_ipv6_seq_ops_addr(void)
66262 +{
66263 + ipv6_seq_ops_addr = NULL;
66264 +}
66265 +
66266 +EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
66267 +EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
66268 +#endif
66269 +
66270 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
66271 {
66272 return pde->parent->data;
66273 @@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
66274 return maybe_get_net(PDE_NET(PDE(inode)));
66275 }
66276
66277 +extern const struct seq_operations dev_seq_ops;
66278 +
66279 int seq_open_net(struct inode *ino, struct file *f,
66280 const struct seq_operations *ops, int size)
66281 {
66282 @@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
66283
66284 BUG_ON(size < sizeof(*p));
66285
66286 + /* only permit access to /proc/net/dev */
66287 + if (
66288 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66289 + ops != ipv6_seq_ops_addr &&
66290 +#endif
66291 + ops != &dev_seq_ops && gr_proc_is_restricted())
66292 + return -EACCES;
66293 +
66294 net = get_proc_net(ino);
66295 if (net == NULL)
66296 return -ENXIO;
66297 @@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
66298 int err;
66299 struct net *net;
66300
66301 + if (gr_proc_is_restricted())
66302 + return -EACCES;
66303 +
66304 err = -ENXIO;
66305 net = get_proc_net(inode);
66306 if (net == NULL)
66307 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
66308 index f92d5dd..26398ac 100644
66309 --- a/fs/proc/proc_sysctl.c
66310 +++ b/fs/proc/proc_sysctl.c
66311 @@ -11,13 +11,21 @@
66312 #include <linux/namei.h>
66313 #include <linux/mm.h>
66314 #include <linux/module.h>
66315 +#include <linux/nsproxy.h>
66316 +#ifdef CONFIG_GRKERNSEC
66317 +#include <net/net_namespace.h>
66318 +#endif
66319 #include "internal.h"
66320
66321 +extern int gr_handle_chroot_sysctl(const int op);
66322 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66323 + const int op);
66324 +
66325 static const struct dentry_operations proc_sys_dentry_operations;
66326 static const struct file_operations proc_sys_file_operations;
66327 -static const struct inode_operations proc_sys_inode_operations;
66328 +const struct inode_operations proc_sys_inode_operations;
66329 static const struct file_operations proc_sys_dir_file_operations;
66330 -static const struct inode_operations proc_sys_dir_operations;
66331 +const struct inode_operations proc_sys_dir_operations;
66332
66333 void proc_sys_poll_notify(struct ctl_table_poll *poll)
66334 {
66335 @@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
66336
66337 err = NULL;
66338 d_set_d_op(dentry, &proc_sys_dentry_operations);
66339 +
66340 + gr_handle_proc_create(dentry, inode);
66341 +
66342 d_add(dentry, inode);
66343
66344 out:
66345 @@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66346 struct inode *inode = file_inode(filp);
66347 struct ctl_table_header *head = grab_header(inode);
66348 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
66349 + int op = write ? MAY_WRITE : MAY_READ;
66350 ssize_t error;
66351 size_t res;
66352
66353 @@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66354 * and won't be until we finish.
66355 */
66356 error = -EPERM;
66357 - if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
66358 + if (sysctl_perm(head, table, op))
66359 goto out;
66360
66361 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
66362 @@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66363 if (!table->proc_handler)
66364 goto out;
66365
66366 +#ifdef CONFIG_GRKERNSEC
66367 + error = -EPERM;
66368 + if (gr_handle_chroot_sysctl(op))
66369 + goto out;
66370 + dget(filp->f_path.dentry);
66371 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
66372 + dput(filp->f_path.dentry);
66373 + goto out;
66374 + }
66375 + dput(filp->f_path.dentry);
66376 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
66377 + goto out;
66378 + if (write) {
66379 + if (current->nsproxy->net_ns != table->extra2) {
66380 + if (!capable(CAP_SYS_ADMIN))
66381 + goto out;
66382 + } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
66383 + goto out;
66384 + }
66385 +#endif
66386 +
66387 /* careful: calling conventions are nasty here */
66388 res = count;
66389 error = table->proc_handler(table, write, buf, &res, ppos);
66390 @@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
66391 return false;
66392 } else {
66393 d_set_d_op(child, &proc_sys_dentry_operations);
66394 +
66395 + gr_handle_proc_create(child, inode);
66396 +
66397 d_add(child, inode);
66398 }
66399 } else {
66400 @@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
66401 if ((*pos)++ < ctx->pos)
66402 return true;
66403
66404 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
66405 + return 0;
66406 +
66407 if (unlikely(S_ISLNK(table->mode)))
66408 res = proc_sys_link_fill_cache(file, ctx, head, table);
66409 else
66410 @@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
66411 if (IS_ERR(head))
66412 return PTR_ERR(head);
66413
66414 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
66415 + return -ENOENT;
66416 +
66417 generic_fillattr(inode, stat);
66418 if (table)
66419 stat->mode = (stat->mode & S_IFMT) | table->mode;
66420 @@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
66421 .llseek = generic_file_llseek,
66422 };
66423
66424 -static const struct inode_operations proc_sys_inode_operations = {
66425 +const struct inode_operations proc_sys_inode_operations = {
66426 .permission = proc_sys_permission,
66427 .setattr = proc_sys_setattr,
66428 .getattr = proc_sys_getattr,
66429 };
66430
66431 -static const struct inode_operations proc_sys_dir_operations = {
66432 +const struct inode_operations proc_sys_dir_operations = {
66433 .lookup = proc_sys_lookup,
66434 .permission = proc_sys_permission,
66435 .setattr = proc_sys_setattr,
66436 @@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
66437 static struct ctl_dir *new_dir(struct ctl_table_set *set,
66438 const char *name, int namelen)
66439 {
66440 - struct ctl_table *table;
66441 + ctl_table_no_const *table;
66442 struct ctl_dir *new;
66443 struct ctl_node *node;
66444 char *new_name;
66445 @@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
66446 return NULL;
66447
66448 node = (struct ctl_node *)(new + 1);
66449 - table = (struct ctl_table *)(node + 1);
66450 + table = (ctl_table_no_const *)(node + 1);
66451 new_name = (char *)(table + 2);
66452 memcpy(new_name, name, namelen);
66453 new_name[namelen] = '\0';
66454 @@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
66455 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
66456 struct ctl_table_root *link_root)
66457 {
66458 - struct ctl_table *link_table, *entry, *link;
66459 + ctl_table_no_const *link_table, *link;
66460 + struct ctl_table *entry;
66461 struct ctl_table_header *links;
66462 struct ctl_node *node;
66463 char *link_name;
66464 @@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
66465 return NULL;
66466
66467 node = (struct ctl_node *)(links + 1);
66468 - link_table = (struct ctl_table *)(node + nr_entries);
66469 + link_table = (ctl_table_no_const *)(node + nr_entries);
66470 link_name = (char *)&link_table[nr_entries + 1];
66471
66472 for (link = link_table, entry = table; entry->procname; link++, entry++) {
66473 @@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66474 struct ctl_table_header ***subheader, struct ctl_table_set *set,
66475 struct ctl_table *table)
66476 {
66477 - struct ctl_table *ctl_table_arg = NULL;
66478 - struct ctl_table *entry, *files;
66479 + ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
66480 + struct ctl_table *entry;
66481 int nr_files = 0;
66482 int nr_dirs = 0;
66483 int err = -ENOMEM;
66484 @@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66485 nr_files++;
66486 }
66487
66488 - files = table;
66489 /* If there are mixed files and directories we need a new table */
66490 if (nr_dirs && nr_files) {
66491 - struct ctl_table *new;
66492 + ctl_table_no_const *new;
66493 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
66494 GFP_KERNEL);
66495 if (!files)
66496 @@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66497 /* Register everything except a directory full of subdirectories */
66498 if (nr_files || !nr_dirs) {
66499 struct ctl_table_header *header;
66500 - header = __register_sysctl_table(set, path, files);
66501 + header = __register_sysctl_table(set, path, files ? files : table);
66502 if (!header) {
66503 kfree(ctl_table_arg);
66504 goto out;
66505 diff --git a/fs/proc/root.c b/fs/proc/root.c
66506 index 094e44d..085a877 100644
66507 --- a/fs/proc/root.c
66508 +++ b/fs/proc/root.c
66509 @@ -188,7 +188,15 @@ void __init proc_root_init(void)
66510 proc_mkdir("openprom", NULL);
66511 #endif
66512 proc_tty_init();
66513 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66514 +#ifdef CONFIG_GRKERNSEC_PROC_USER
66515 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
66516 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66517 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
66518 +#endif
66519 +#else
66520 proc_mkdir("bus", NULL);
66521 +#endif
66522 proc_sys_init();
66523 }
66524
66525 diff --git a/fs/proc/stat.c b/fs/proc/stat.c
66526 index bf2d03f..f058f9c 100644
66527 --- a/fs/proc/stat.c
66528 +++ b/fs/proc/stat.c
66529 @@ -11,6 +11,7 @@
66530 #include <linux/irqnr.h>
66531 #include <linux/cputime.h>
66532 #include <linux/tick.h>
66533 +#include <linux/grsecurity.h>
66534
66535 #ifndef arch_irq_stat_cpu
66536 #define arch_irq_stat_cpu(cpu) 0
66537 @@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
66538 u64 sum_softirq = 0;
66539 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
66540 struct timespec boottime;
66541 + int unrestricted = 1;
66542 +
66543 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66544 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66545 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
66546 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66547 + && !in_group_p(grsec_proc_gid)
66548 +#endif
66549 + )
66550 + unrestricted = 0;
66551 +#endif
66552 +#endif
66553
66554 user = nice = system = idle = iowait =
66555 irq = softirq = steal = 0;
66556 @@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
66557 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66558 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66559 idle += get_idle_time(i);
66560 - iowait += get_iowait_time(i);
66561 - irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66562 - softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66563 - steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66564 - guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66565 - guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66566 - sum += kstat_cpu_irqs_sum(i);
66567 - sum += arch_irq_stat_cpu(i);
66568 + if (unrestricted) {
66569 + iowait += get_iowait_time(i);
66570 + irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66571 + softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66572 + steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66573 + guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66574 + guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66575 + sum += kstat_cpu_irqs_sum(i);
66576 + sum += arch_irq_stat_cpu(i);
66577 + for (j = 0; j < NR_SOFTIRQS; j++) {
66578 + unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66579
66580 - for (j = 0; j < NR_SOFTIRQS; j++) {
66581 - unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66582 -
66583 - per_softirq_sums[j] += softirq_stat;
66584 - sum_softirq += softirq_stat;
66585 + per_softirq_sums[j] += softirq_stat;
66586 + sum_softirq += softirq_stat;
66587 + }
66588 }
66589 }
66590 - sum += arch_irq_stat();
66591 + if (unrestricted)
66592 + sum += arch_irq_stat();
66593
66594 seq_puts(p, "cpu ");
66595 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66596 @@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
66597 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66598 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66599 idle = get_idle_time(i);
66600 - iowait = get_iowait_time(i);
66601 - irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66602 - softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66603 - steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66604 - guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66605 - guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66606 + if (unrestricted) {
66607 + iowait = get_iowait_time(i);
66608 + irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66609 + softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66610 + steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66611 + guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66612 + guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66613 + }
66614 seq_printf(p, "cpu%d", i);
66615 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66616 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
66617 @@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
66618
66619 /* sum again ? it could be updated? */
66620 for_each_irq_nr(j)
66621 - seq_put_decimal_ull(p, ' ', kstat_irqs(j));
66622 + seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
66623
66624 seq_printf(p,
66625 "\nctxt %llu\n"
66626 @@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
66627 "processes %lu\n"
66628 "procs_running %lu\n"
66629 "procs_blocked %lu\n",
66630 - nr_context_switches(),
66631 + unrestricted ? nr_context_switches() : 0ULL,
66632 (unsigned long)jif,
66633 - total_forks,
66634 - nr_running(),
66635 - nr_iowait());
66636 + unrestricted ? total_forks : 0UL,
66637 + unrestricted ? nr_running() : 0UL,
66638 + unrestricted ? nr_iowait() : 0UL);
66639
66640 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
66641
66642 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
66643 index 4e0388c..fc6a0e1 100644
66644 --- a/fs/proc/task_mmu.c
66645 +++ b/fs/proc/task_mmu.c
66646 @@ -13,12 +13,19 @@
66647 #include <linux/swap.h>
66648 #include <linux/swapops.h>
66649 #include <linux/mmu_notifier.h>
66650 +#include <linux/grsecurity.h>
66651
66652 #include <asm/elf.h>
66653 #include <asm/uaccess.h>
66654 #include <asm/tlbflush.h>
66655 #include "internal.h"
66656
66657 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66658 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66659 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
66660 + _mm->pax_flags & MF_PAX_SEGMEXEC))
66661 +#endif
66662 +
66663 void task_mem(struct seq_file *m, struct mm_struct *mm)
66664 {
66665 unsigned long data, text, lib, swap;
66666 @@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66667 "VmExe:\t%8lu kB\n"
66668 "VmLib:\t%8lu kB\n"
66669 "VmPTE:\t%8lu kB\n"
66670 - "VmSwap:\t%8lu kB\n",
66671 - hiwater_vm << (PAGE_SHIFT-10),
66672 + "VmSwap:\t%8lu kB\n"
66673 +
66674 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66675 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
66676 +#endif
66677 +
66678 + ,hiwater_vm << (PAGE_SHIFT-10),
66679 total_vm << (PAGE_SHIFT-10),
66680 mm->locked_vm << (PAGE_SHIFT-10),
66681 mm->pinned_vm << (PAGE_SHIFT-10),
66682 @@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66683 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
66684 (PTRS_PER_PTE * sizeof(pte_t) *
66685 atomic_long_read(&mm->nr_ptes)) >> 10,
66686 - swap << (PAGE_SHIFT-10));
66687 + swap << (PAGE_SHIFT-10)
66688 +
66689 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66690 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66691 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
66692 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
66693 +#else
66694 + , mm->context.user_cs_base
66695 + , mm->context.user_cs_limit
66696 +#endif
66697 +#endif
66698 +
66699 + );
66700 }
66701
66702 unsigned long task_vsize(struct mm_struct *mm)
66703 @@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66704 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
66705 }
66706
66707 - /* We don't show the stack guard page in /proc/maps */
66708 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66709 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
66710 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
66711 +#else
66712 start = vma->vm_start;
66713 - if (stack_guard_page_start(vma, start))
66714 - start += PAGE_SIZE;
66715 end = vma->vm_end;
66716 - if (stack_guard_page_end(vma, end))
66717 - end -= PAGE_SIZE;
66718 +#endif
66719
66720 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
66721 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
66722 @@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66723 flags & VM_WRITE ? 'w' : '-',
66724 flags & VM_EXEC ? 'x' : '-',
66725 flags & VM_MAYSHARE ? 's' : 'p',
66726 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66727 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
66728 +#else
66729 pgoff,
66730 +#endif
66731 MAJOR(dev), MINOR(dev), ino);
66732
66733 /*
66734 @@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66735 */
66736 if (file) {
66737 seq_pad(m, ' ');
66738 - seq_path(m, &file->f_path, "\n");
66739 + seq_path(m, &file->f_path, "\n\\");
66740 goto done;
66741 }
66742
66743 @@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66744 * Thread stack in /proc/PID/task/TID/maps or
66745 * the main process stack.
66746 */
66747 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
66748 - vma->vm_end >= mm->start_stack)) {
66749 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
66750 + (vma->vm_start <= mm->start_stack &&
66751 + vma->vm_end >= mm->start_stack)) {
66752 name = "[stack]";
66753 } else {
66754 /* Thread stack in /proc/PID/maps */
66755 @@ -359,6 +388,12 @@ done:
66756
66757 static int show_map(struct seq_file *m, void *v, int is_pid)
66758 {
66759 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66760 + if (current->exec_id != m->exec_id) {
66761 + gr_log_badprocpid("maps");
66762 + return 0;
66763 + }
66764 +#endif
66765 show_map_vma(m, v, is_pid);
66766 m_cache_vma(m, v);
66767 return 0;
66768 @@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66769 .private = &mss,
66770 };
66771
66772 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66773 + if (current->exec_id != m->exec_id) {
66774 + gr_log_badprocpid("smaps");
66775 + return 0;
66776 + }
66777 +#endif
66778 memset(&mss, 0, sizeof mss);
66779 - mss.vma = vma;
66780 - /* mmap_sem is held in m_start */
66781 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66782 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66783 -
66784 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66785 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
66786 +#endif
66787 + mss.vma = vma;
66788 + /* mmap_sem is held in m_start */
66789 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66790 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66791 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66792 + }
66793 +#endif
66794 show_map_vma(m, vma, is_pid);
66795
66796 seq_printf(m,
66797 @@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66798 "KernelPageSize: %8lu kB\n"
66799 "MMUPageSize: %8lu kB\n"
66800 "Locked: %8lu kB\n",
66801 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66802 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
66803 +#else
66804 (vma->vm_end - vma->vm_start) >> 10,
66805 +#endif
66806 mss.resident >> 10,
66807 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
66808 mss.shared_clean >> 10,
66809 @@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66810 char buffer[64];
66811 int nid;
66812
66813 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66814 + if (current->exec_id != m->exec_id) {
66815 + gr_log_badprocpid("numa_maps");
66816 + return 0;
66817 + }
66818 +#endif
66819 +
66820 if (!mm)
66821 return 0;
66822
66823 @@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66824 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
66825 }
66826
66827 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66828 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
66829 +#else
66830 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
66831 +#endif
66832
66833 if (file) {
66834 seq_puts(m, " file=");
66835 - seq_path(m, &file->f_path, "\n\t= ");
66836 + seq_path(m, &file->f_path, "\n\t\\= ");
66837 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
66838 seq_puts(m, " heap");
66839 } else {
66840 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
66841 index 599ec2e..f1413ae 100644
66842 --- a/fs/proc/task_nommu.c
66843 +++ b/fs/proc/task_nommu.c
66844 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66845 else
66846 bytes += kobjsize(mm);
66847
66848 - if (current->fs && current->fs->users > 1)
66849 + if (current->fs && atomic_read(&current->fs->users) > 1)
66850 sbytes += kobjsize(current->fs);
66851 else
66852 bytes += kobjsize(current->fs);
66853 @@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
66854
66855 if (file) {
66856 seq_pad(m, ' ');
66857 - seq_path(m, &file->f_path, "");
66858 + seq_path(m, &file->f_path, "\n\\");
66859 } else if (mm) {
66860 pid_t tid = pid_of_stack(priv, vma, is_pid);
66861
66862 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
66863 index a90d6d35..d08047c 100644
66864 --- a/fs/proc/vmcore.c
66865 +++ b/fs/proc/vmcore.c
66866 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
66867 nr_bytes = count;
66868
66869 /* If pfn is not ram, return zeros for sparse dump files */
66870 - if (pfn_is_ram(pfn) == 0)
66871 - memset(buf, 0, nr_bytes);
66872 - else {
66873 + if (pfn_is_ram(pfn) == 0) {
66874 + if (userbuf) {
66875 + if (clear_user((char __force_user *)buf, nr_bytes))
66876 + return -EFAULT;
66877 + } else
66878 + memset(buf, 0, nr_bytes);
66879 + } else {
66880 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
66881 offset, userbuf);
66882 if (tmp < 0)
66883 @@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
66884 static int copy_to(void *target, void *src, size_t size, int userbuf)
66885 {
66886 if (userbuf) {
66887 - if (copy_to_user((char __user *) target, src, size))
66888 + if (copy_to_user((char __force_user *) target, src, size))
66889 return -EFAULT;
66890 } else {
66891 memcpy(target, src, size);
66892 @@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
66893 if (*fpos < m->offset + m->size) {
66894 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
66895 start = m->paddr + *fpos - m->offset;
66896 - tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
66897 + tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
66898 if (tmp < 0)
66899 return tmp;
66900 buflen -= tsz;
66901 @@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
66902 static ssize_t read_vmcore(struct file *file, char __user *buffer,
66903 size_t buflen, loff_t *fpos)
66904 {
66905 - return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
66906 + return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
66907 }
66908
66909 /*
66910 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
66911 index d3fb2b6..43a8140 100644
66912 --- a/fs/qnx6/qnx6.h
66913 +++ b/fs/qnx6/qnx6.h
66914 @@ -74,7 +74,7 @@ enum {
66915 BYTESEX_BE,
66916 };
66917
66918 -static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
66919 +static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
66920 {
66921 if (sbi->s_bytesex == BYTESEX_LE)
66922 return le64_to_cpu((__force __le64)n);
66923 @@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
66924 return (__force __fs64)cpu_to_be64(n);
66925 }
66926
66927 -static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
66928 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
66929 {
66930 if (sbi->s_bytesex == BYTESEX_LE)
66931 return le32_to_cpu((__force __le32)n);
66932 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
66933 index bb2869f..d34ada8 100644
66934 --- a/fs/quota/netlink.c
66935 +++ b/fs/quota/netlink.c
66936 @@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
66937 void quota_send_warning(struct kqid qid, dev_t dev,
66938 const char warntype)
66939 {
66940 - static atomic_t seq;
66941 + static atomic_unchecked_t seq;
66942 struct sk_buff *skb;
66943 void *msg_head;
66944 int ret;
66945 @@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
66946 "VFS: Not enough memory to send quota warning.\n");
66947 return;
66948 }
66949 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
66950 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
66951 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
66952 if (!msg_head) {
66953 printk(KERN_ERR
66954 diff --git a/fs/read_write.c b/fs/read_write.c
66955 index 7d9318c..51b336f 100644
66956 --- a/fs/read_write.c
66957 +++ b/fs/read_write.c
66958 @@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
66959
66960 old_fs = get_fs();
66961 set_fs(get_ds());
66962 - p = (__force const char __user *)buf;
66963 + p = (const char __force_user *)buf;
66964 if (count > MAX_RW_COUNT)
66965 count = MAX_RW_COUNT;
66966 if (file->f_op->write)
66967 diff --git a/fs/readdir.c b/fs/readdir.c
66968 index 33fd922..e0d6094 100644
66969 --- a/fs/readdir.c
66970 +++ b/fs/readdir.c
66971 @@ -18,6 +18,7 @@
66972 #include <linux/security.h>
66973 #include <linux/syscalls.h>
66974 #include <linux/unistd.h>
66975 +#include <linux/namei.h>
66976
66977 #include <asm/uaccess.h>
66978
66979 @@ -71,6 +72,7 @@ struct old_linux_dirent {
66980 struct readdir_callback {
66981 struct dir_context ctx;
66982 struct old_linux_dirent __user * dirent;
66983 + struct file * file;
66984 int result;
66985 };
66986
66987 @@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
66988 buf->result = -EOVERFLOW;
66989 return -EOVERFLOW;
66990 }
66991 +
66992 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
66993 + return 0;
66994 +
66995 buf->result++;
66996 dirent = buf->dirent;
66997 if (!access_ok(VERIFY_WRITE, dirent,
66998 @@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
66999 if (!f.file)
67000 return -EBADF;
67001
67002 + buf.file = f.file;
67003 error = iterate_dir(f.file, &buf.ctx);
67004 if (buf.result)
67005 error = buf.result;
67006 @@ -144,6 +151,7 @@ struct getdents_callback {
67007 struct dir_context ctx;
67008 struct linux_dirent __user * current_dir;
67009 struct linux_dirent __user * previous;
67010 + struct file * file;
67011 int count;
67012 int error;
67013 };
67014 @@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
67015 buf->error = -EOVERFLOW;
67016 return -EOVERFLOW;
67017 }
67018 +
67019 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67020 + return 0;
67021 +
67022 dirent = buf->previous;
67023 if (dirent) {
67024 if (__put_user(offset, &dirent->d_off))
67025 @@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67026 if (!f.file)
67027 return -EBADF;
67028
67029 + buf.file = f.file;
67030 error = iterate_dir(f.file, &buf.ctx);
67031 if (error >= 0)
67032 error = buf.error;
67033 @@ -228,6 +241,7 @@ struct getdents_callback64 {
67034 struct dir_context ctx;
67035 struct linux_dirent64 __user * current_dir;
67036 struct linux_dirent64 __user * previous;
67037 + struct file *file;
67038 int count;
67039 int error;
67040 };
67041 @@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
67042 buf->error = -EINVAL; /* only used if we fail.. */
67043 if (reclen > buf->count)
67044 return -EINVAL;
67045 +
67046 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67047 + return 0;
67048 +
67049 dirent = buf->previous;
67050 if (dirent) {
67051 if (__put_user(offset, &dirent->d_off))
67052 @@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67053 if (!f.file)
67054 return -EBADF;
67055
67056 + buf.file = f.file;
67057 error = iterate_dir(f.file, &buf.ctx);
67058 if (error >= 0)
67059 error = buf.error;
67060 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67061 index 9c02d96..6562c10 100644
67062 --- a/fs/reiserfs/do_balan.c
67063 +++ b/fs/reiserfs/do_balan.c
67064 @@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67065 return;
67066 }
67067
67068 - atomic_inc(&fs_generation(tb->tb_sb));
67069 + atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67070 do_balance_starts(tb);
67071
67072 /*
67073 diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67074 index aca73dd..e3c558d 100644
67075 --- a/fs/reiserfs/item_ops.c
67076 +++ b/fs/reiserfs/item_ops.c
67077 @@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67078 }
67079
67080 static struct item_operations errcatch_ops = {
67081 - errcatch_bytes_number,
67082 - errcatch_decrement_key,
67083 - errcatch_is_left_mergeable,
67084 - errcatch_print_item,
67085 - errcatch_check_item,
67086 + .bytes_number = errcatch_bytes_number,
67087 + .decrement_key = errcatch_decrement_key,
67088 + .is_left_mergeable = errcatch_is_left_mergeable,
67089 + .print_item = errcatch_print_item,
67090 + .check_item = errcatch_check_item,
67091
67092 - errcatch_create_vi,
67093 - errcatch_check_left,
67094 - errcatch_check_right,
67095 - errcatch_part_size,
67096 - errcatch_unit_num,
67097 - errcatch_print_vi
67098 + .create_vi = errcatch_create_vi,
67099 + .check_left = errcatch_check_left,
67100 + .check_right = errcatch_check_right,
67101 + .part_size = errcatch_part_size,
67102 + .unit_num = errcatch_unit_num,
67103 + .print_vi = errcatch_print_vi
67104 };
67105
67106 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67107 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67108 index 621b9f3..af527fd 100644
67109 --- a/fs/reiserfs/procfs.c
67110 +++ b/fs/reiserfs/procfs.c
67111 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67112 "SMALL_TAILS " : "NO_TAILS ",
67113 replay_only(sb) ? "REPLAY_ONLY " : "",
67114 convert_reiserfs(sb) ? "CONV " : "",
67115 - atomic_read(&r->s_generation_counter),
67116 + atomic_read_unchecked(&r->s_generation_counter),
67117 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67118 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67119 SF(s_good_search_by_key_reada), SF(s_bmaps),
67120 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67121 index 1894d96..1dfd1c2 100644
67122 --- a/fs/reiserfs/reiserfs.h
67123 +++ b/fs/reiserfs/reiserfs.h
67124 @@ -576,7 +576,7 @@ struct reiserfs_sb_info {
67125 /* Comment? -Hans */
67126 wait_queue_head_t s_wait;
67127 /* increased by one every time the tree gets re-balanced */
67128 - atomic_t s_generation_counter;
67129 + atomic_unchecked_t s_generation_counter;
67130
67131 /* File system properties. Currently holds on-disk FS format */
67132 unsigned long s_properties;
67133 @@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67134 #define REISERFS_USER_MEM 1 /* user memory mode */
67135
67136 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67137 -#define get_generation(s) atomic_read (&fs_generation(s))
67138 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67139 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67140 #define __fs_changed(gen,s) (gen != get_generation (s))
67141 #define fs_changed(gen,s) \
67142 diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67143 index f1376c9..f9378e9 100644
67144 --- a/fs/reiserfs/super.c
67145 +++ b/fs/reiserfs/super.c
67146 @@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67147 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67148 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67149 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67150 +#ifdef CONFIG_REISERFS_FS_XATTR
67151 + /* turn on user xattrs by default */
67152 + sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67153 +#endif
67154 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67155 sbi->s_alloc_options.preallocmin = 0;
67156 /* Preallocate by 16 blocks (17-1) at once */
67157 diff --git a/fs/select.c b/fs/select.c
67158 index 467bb1c..cf9d65a 100644
67159 --- a/fs/select.c
67160 +++ b/fs/select.c
67161 @@ -20,6 +20,7 @@
67162 #include <linux/export.h>
67163 #include <linux/slab.h>
67164 #include <linux/poll.h>
67165 +#include <linux/security.h>
67166 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67167 #include <linux/file.h>
67168 #include <linux/fdtable.h>
67169 @@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67170 struct poll_list *walk = head;
67171 unsigned long todo = nfds;
67172
67173 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67174 if (nfds > rlimit(RLIMIT_NOFILE))
67175 return -EINVAL;
67176
67177 diff --git a/fs/seq_file.c b/fs/seq_file.c
67178 index 3857b72..0b7281e 100644
67179 --- a/fs/seq_file.c
67180 +++ b/fs/seq_file.c
67181 @@ -12,6 +12,8 @@
67182 #include <linux/slab.h>
67183 #include <linux/cred.h>
67184 #include <linux/mm.h>
67185 +#include <linux/sched.h>
67186 +#include <linux/grsecurity.h>
67187
67188 #include <asm/uaccess.h>
67189 #include <asm/page.h>
67190 @@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
67191
67192 static void *seq_buf_alloc(unsigned long size)
67193 {
67194 - void *buf;
67195 -
67196 - buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
67197 - if (!buf && size > PAGE_SIZE)
67198 - buf = vmalloc(size);
67199 - return buf;
67200 + return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67201 }
67202
67203 /**
67204 @@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67205 #ifdef CONFIG_USER_NS
67206 p->user_ns = file->f_cred->user_ns;
67207 #endif
67208 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67209 + p->exec_id = current->exec_id;
67210 +#endif
67211
67212 /*
67213 * Wrappers around seq_open(e.g. swaps_open) need to be
67214 @@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67215 }
67216 EXPORT_SYMBOL(seq_open);
67217
67218 +
67219 +int seq_open_restrict(struct file *file, const struct seq_operations *op)
67220 +{
67221 + if (gr_proc_is_restricted())
67222 + return -EACCES;
67223 +
67224 + return seq_open(file, op);
67225 +}
67226 +EXPORT_SYMBOL(seq_open_restrict);
67227 +
67228 static int traverse(struct seq_file *m, loff_t offset)
67229 {
67230 loff_t pos = 0, index;
67231 @@ -165,7 +175,7 @@ Eoverflow:
67232 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67233 {
67234 struct seq_file *m = file->private_data;
67235 - size_t copied = 0;
67236 + ssize_t copied = 0;
67237 loff_t pos;
67238 size_t n;
67239 void *p;
67240 @@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
67241 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67242 void *data)
67243 {
67244 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67245 + seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67246 int res = -ENOMEM;
67247
67248 if (op) {
67249 @@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67250 }
67251 EXPORT_SYMBOL(single_open_size);
67252
67253 +int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67254 + void *data)
67255 +{
67256 + if (gr_proc_is_restricted())
67257 + return -EACCES;
67258 +
67259 + return single_open(file, show, data);
67260 +}
67261 +EXPORT_SYMBOL(single_open_restrict);
67262 +
67263 +
67264 int single_release(struct inode *inode, struct file *file)
67265 {
67266 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
67267 diff --git a/fs/splice.c b/fs/splice.c
67268 index 75c6058..770d40c 100644
67269 --- a/fs/splice.c
67270 +++ b/fs/splice.c
67271 @@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67272 pipe_lock(pipe);
67273
67274 for (;;) {
67275 - if (!pipe->readers) {
67276 + if (!atomic_read(&pipe->readers)) {
67277 send_sig(SIGPIPE, current, 0);
67278 if (!ret)
67279 ret = -EPIPE;
67280 @@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67281 page_nr++;
67282 ret += buf->len;
67283
67284 - if (pipe->files)
67285 + if (atomic_read(&pipe->files))
67286 do_wakeup = 1;
67287
67288 if (!--spd->nr_pages)
67289 @@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67290 do_wakeup = 0;
67291 }
67292
67293 - pipe->waiting_writers++;
67294 + atomic_inc(&pipe->waiting_writers);
67295 pipe_wait(pipe);
67296 - pipe->waiting_writers--;
67297 + atomic_dec(&pipe->waiting_writers);
67298 }
67299
67300 pipe_unlock(pipe);
67301 @@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
67302 old_fs = get_fs();
67303 set_fs(get_ds());
67304 /* The cast to a user pointer is valid due to the set_fs() */
67305 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
67306 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
67307 set_fs(old_fs);
67308
67309 return res;
67310 @@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
67311 old_fs = get_fs();
67312 set_fs(get_ds());
67313 /* The cast to a user pointer is valid due to the set_fs() */
67314 - res = vfs_write(file, (__force const char __user *)buf, count, &pos);
67315 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
67316 set_fs(old_fs);
67317
67318 return res;
67319 @@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
67320 goto err;
67321
67322 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
67323 - vec[i].iov_base = (void __user *) page_address(page);
67324 + vec[i].iov_base = (void __force_user *) page_address(page);
67325 vec[i].iov_len = this_len;
67326 spd.pages[i] = page;
67327 spd.nr_pages++;
67328 @@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67329 ops->release(pipe, buf);
67330 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67331 pipe->nrbufs--;
67332 - if (pipe->files)
67333 + if (atomic_read(&pipe->files))
67334 sd->need_wakeup = true;
67335 }
67336
67337 @@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67338 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
67339 {
67340 while (!pipe->nrbufs) {
67341 - if (!pipe->writers)
67342 + if (!atomic_read(&pipe->writers))
67343 return 0;
67344
67345 - if (!pipe->waiting_writers && sd->num_spliced)
67346 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
67347 return 0;
67348
67349 if (sd->flags & SPLICE_F_NONBLOCK)
67350 @@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
67351 ops->release(pipe, buf);
67352 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67353 pipe->nrbufs--;
67354 - if (pipe->files)
67355 + if (atomic_read(&pipe->files))
67356 sd.need_wakeup = true;
67357 } else {
67358 buf->offset += ret;
67359 @@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
67360 * out of the pipe right after the splice_to_pipe(). So set
67361 * PIPE_READERS appropriately.
67362 */
67363 - pipe->readers = 1;
67364 + atomic_set(&pipe->readers, 1);
67365
67366 current->splice_pipe = pipe;
67367 }
67368 @@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
67369
67370 partial[buffers].offset = off;
67371 partial[buffers].len = plen;
67372 + partial[buffers].private = 0;
67373
67374 off = 0;
67375 len -= plen;
67376 @@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67377 ret = -ERESTARTSYS;
67378 break;
67379 }
67380 - if (!pipe->writers)
67381 + if (!atomic_read(&pipe->writers))
67382 break;
67383 - if (!pipe->waiting_writers) {
67384 + if (!atomic_read(&pipe->waiting_writers)) {
67385 if (flags & SPLICE_F_NONBLOCK) {
67386 ret = -EAGAIN;
67387 break;
67388 @@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67389 pipe_lock(pipe);
67390
67391 while (pipe->nrbufs >= pipe->buffers) {
67392 - if (!pipe->readers) {
67393 + if (!atomic_read(&pipe->readers)) {
67394 send_sig(SIGPIPE, current, 0);
67395 ret = -EPIPE;
67396 break;
67397 @@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67398 ret = -ERESTARTSYS;
67399 break;
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 @@ -1818,14 +1819,14 @@ retry:
67410 pipe_double_lock(ipipe, opipe);
67411
67412 do {
67413 - if (!opipe->readers) {
67414 + if (!atomic_read(&opipe->readers)) {
67415 send_sig(SIGPIPE, current, 0);
67416 if (!ret)
67417 ret = -EPIPE;
67418 break;
67419 }
67420
67421 - if (!ipipe->nrbufs && !ipipe->writers)
67422 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
67423 break;
67424
67425 /*
67426 @@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67427 pipe_double_lock(ipipe, opipe);
67428
67429 do {
67430 - if (!opipe->readers) {
67431 + if (!atomic_read(&opipe->readers)) {
67432 send_sig(SIGPIPE, current, 0);
67433 if (!ret)
67434 ret = -EPIPE;
67435 @@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67436 * return EAGAIN if we have the potential of some data in the
67437 * future, otherwise just return 0
67438 */
67439 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
67440 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
67441 ret = -EAGAIN;
67442
67443 pipe_unlock(ipipe);
67444 diff --git a/fs/stat.c b/fs/stat.c
67445 index ae0c3ce..9ee641c 100644
67446 --- a/fs/stat.c
67447 +++ b/fs/stat.c
67448 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
67449 stat->gid = inode->i_gid;
67450 stat->rdev = inode->i_rdev;
67451 stat->size = i_size_read(inode);
67452 - stat->atime = inode->i_atime;
67453 - stat->mtime = inode->i_mtime;
67454 + if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67455 + stat->atime = inode->i_ctime;
67456 + stat->mtime = inode->i_ctime;
67457 + } else {
67458 + stat->atime = inode->i_atime;
67459 + stat->mtime = inode->i_mtime;
67460 + }
67461 stat->ctime = inode->i_ctime;
67462 stat->blksize = (1 << inode->i_blkbits);
67463 stat->blocks = inode->i_blocks;
67464 @@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
67465 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
67466 {
67467 struct inode *inode = path->dentry->d_inode;
67468 + int retval;
67469
67470 - if (inode->i_op->getattr)
67471 - return inode->i_op->getattr(path->mnt, path->dentry, stat);
67472 + if (inode->i_op->getattr) {
67473 + retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
67474 + if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67475 + stat->atime = stat->ctime;
67476 + stat->mtime = stat->ctime;
67477 + }
67478 + return retval;
67479 + }
67480
67481 generic_fillattr(inode, stat);
67482 return 0;
67483 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
67484 index 0b45ff4..847de5b 100644
67485 --- a/fs/sysfs/dir.c
67486 +++ b/fs/sysfs/dir.c
67487 @@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
67488 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67489 {
67490 struct kernfs_node *parent, *kn;
67491 + const char *name;
67492 + umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
67493 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67494 + const char *parent_name;
67495 +#endif
67496
67497 BUG_ON(!kobj);
67498
67499 + name = kobject_name(kobj);
67500 +
67501 if (kobj->parent)
67502 parent = kobj->parent->sd;
67503 else
67504 @@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67505 if (!parent)
67506 return -ENOENT;
67507
67508 - kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
67509 - S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
67510 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67511 + parent_name = parent->name;
67512 + mode = S_IRWXU;
67513 +
67514 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
67515 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
67516 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
67517 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
67518 + mode = S_IRWXU | S_IRUGO | S_IXUGO;
67519 +#endif
67520 +
67521 + kn = kernfs_create_dir_ns(parent, name,
67522 + mode, kobj, ns);
67523 if (IS_ERR(kn)) {
67524 if (PTR_ERR(kn) == -EEXIST)
67525 - sysfs_warn_dup(parent, kobject_name(kobj));
67526 + sysfs_warn_dup(parent, name);
67527 return PTR_ERR(kn);
67528 }
67529
67530 diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
67531 index 69d4889..a810bd4 100644
67532 --- a/fs/sysv/sysv.h
67533 +++ b/fs/sysv/sysv.h
67534 @@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
67535 #endif
67536 }
67537
67538 -static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67539 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67540 {
67541 if (sbi->s_bytesex == BYTESEX_PDP)
67542 return PDP_swab((__force __u32)n);
67543 diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
67544 index fb08b0c..65fcc7e 100644
67545 --- a/fs/ubifs/io.c
67546 +++ b/fs/ubifs/io.c
67547 @@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
67548 return err;
67549 }
67550
67551 -int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67552 +int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67553 {
67554 int err;
67555
67556 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
67557 index c175b4d..8f36a16 100644
67558 --- a/fs/udf/misc.c
67559 +++ b/fs/udf/misc.c
67560 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
67561
67562 u8 udf_tag_checksum(const struct tag *t)
67563 {
67564 - u8 *data = (u8 *)t;
67565 + const u8 *data = (const u8 *)t;
67566 u8 checksum = 0;
67567 int i;
67568 for (i = 0; i < sizeof(struct tag); ++i)
67569 diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
67570 index 8d974c4..b82f6ec 100644
67571 --- a/fs/ufs/swab.h
67572 +++ b/fs/ufs/swab.h
67573 @@ -22,7 +22,7 @@ enum {
67574 BYTESEX_BE
67575 };
67576
67577 -static inline u64
67578 +static inline u64 __intentional_overflow(-1)
67579 fs64_to_cpu(struct super_block *sbp, __fs64 n)
67580 {
67581 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67582 @@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
67583 return (__force __fs64)cpu_to_be64(n);
67584 }
67585
67586 -static inline u32
67587 +static inline u32 __intentional_overflow(-1)
67588 fs32_to_cpu(struct super_block *sbp, __fs32 n)
67589 {
67590 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67591 diff --git a/fs/utimes.c b/fs/utimes.c
67592 index aa138d6..5f3a811 100644
67593 --- a/fs/utimes.c
67594 +++ b/fs/utimes.c
67595 @@ -1,6 +1,7 @@
67596 #include <linux/compiler.h>
67597 #include <linux/file.h>
67598 #include <linux/fs.h>
67599 +#include <linux/security.h>
67600 #include <linux/linkage.h>
67601 #include <linux/mount.h>
67602 #include <linux/namei.h>
67603 @@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
67604 }
67605 }
67606 retry_deleg:
67607 +
67608 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
67609 + error = -EACCES;
67610 + goto mnt_drop_write_and_out;
67611 + }
67612 +
67613 mutex_lock(&inode->i_mutex);
67614 error = notify_change(path->dentry, &newattrs, &delegated_inode);
67615 mutex_unlock(&inode->i_mutex);
67616 diff --git a/fs/xattr.c b/fs/xattr.c
67617 index 64e83ef..b6be154 100644
67618 --- a/fs/xattr.c
67619 +++ b/fs/xattr.c
67620 @@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
67621 return rc;
67622 }
67623
67624 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
67625 +ssize_t
67626 +pax_getxattr(struct dentry *dentry, void *value, size_t size)
67627 +{
67628 + struct inode *inode = dentry->d_inode;
67629 + ssize_t error;
67630 +
67631 + error = inode_permission(inode, MAY_EXEC);
67632 + if (error)
67633 + return error;
67634 +
67635 + if (inode->i_op->getxattr)
67636 + error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
67637 + else
67638 + error = -EOPNOTSUPP;
67639 +
67640 + return error;
67641 +}
67642 +EXPORT_SYMBOL(pax_getxattr);
67643 +#endif
67644 +
67645 ssize_t
67646 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
67647 {
67648 @@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
67649 * Extended attribute SET operations
67650 */
67651 static long
67652 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
67653 +setxattr(struct path *path, const char __user *name, const void __user *value,
67654 size_t size, int flags)
67655 {
67656 int error;
67657 @@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
67658 posix_acl_fix_xattr_from_user(kvalue, size);
67659 }
67660
67661 - error = vfs_setxattr(d, kname, kvalue, size, flags);
67662 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
67663 + error = -EACCES;
67664 + goto out;
67665 + }
67666 +
67667 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
67668 out:
67669 if (vvalue)
67670 vfree(vvalue);
67671 @@ -376,7 +402,7 @@ retry:
67672 return error;
67673 error = mnt_want_write(path.mnt);
67674 if (!error) {
67675 - error = setxattr(path.dentry, name, value, size, flags);
67676 + error = setxattr(&path, name, value, size, flags);
67677 mnt_drop_write(path.mnt);
67678 }
67679 path_put(&path);
67680 @@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
67681 const void __user *,value, size_t, size, int, flags)
67682 {
67683 struct fd f = fdget(fd);
67684 - struct dentry *dentry;
67685 int error = -EBADF;
67686
67687 if (!f.file)
67688 return error;
67689 - dentry = f.file->f_path.dentry;
67690 - audit_inode(NULL, dentry, 0);
67691 + audit_inode(NULL, f.file->f_path.dentry, 0);
67692 error = mnt_want_write_file(f.file);
67693 if (!error) {
67694 - error = setxattr(dentry, name, value, size, flags);
67695 + error = setxattr(&f.file->f_path, name, value, size, flags);
67696 mnt_drop_write_file(f.file);
67697 }
67698 fdput(f);
67699 @@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
67700 * Extended attribute REMOVE operations
67701 */
67702 static long
67703 -removexattr(struct dentry *d, const char __user *name)
67704 +removexattr(struct path *path, const char __user *name)
67705 {
67706 int error;
67707 char kname[XATTR_NAME_MAX + 1];
67708 @@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
67709 if (error < 0)
67710 return error;
67711
67712 - return vfs_removexattr(d, kname);
67713 + if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
67714 + return -EACCES;
67715 +
67716 + return vfs_removexattr(path->dentry, kname);
67717 }
67718
67719 static int path_removexattr(const char __user *pathname,
67720 @@ -625,7 +652,7 @@ retry:
67721 return error;
67722 error = mnt_want_write(path.mnt);
67723 if (!error) {
67724 - error = removexattr(path.dentry, name);
67725 + error = removexattr(&path, name);
67726 mnt_drop_write(path.mnt);
67727 }
67728 path_put(&path);
67729 @@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
67730 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
67731 {
67732 struct fd f = fdget(fd);
67733 - struct dentry *dentry;
67734 + struct path *path;
67735 int error = -EBADF;
67736
67737 if (!f.file)
67738 return error;
67739 - dentry = f.file->f_path.dentry;
67740 - audit_inode(NULL, dentry, 0);
67741 + path = &f.file->f_path;
67742 + audit_inode(NULL, path->dentry, 0);
67743 error = mnt_want_write_file(f.file);
67744 if (!error) {
67745 - error = removexattr(dentry, name);
67746 + error = removexattr(path, name);
67747 mnt_drop_write_file(f.file);
67748 }
67749 fdput(f);
67750 diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
67751 index 79c9819..22226b4 100644
67752 --- a/fs/xfs/libxfs/xfs_bmap.c
67753 +++ b/fs/xfs/libxfs/xfs_bmap.c
67754 @@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
67755
67756 #else
67757 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
67758 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
67759 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
67760 #endif /* DEBUG */
67761
67762 /*
67763 diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
67764 index f1b69ed..3d0222f 100644
67765 --- a/fs/xfs/xfs_dir2_readdir.c
67766 +++ b/fs/xfs/xfs_dir2_readdir.c
67767 @@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
67768 ino = dp->d_ops->sf_get_ino(sfp, sfep);
67769 filetype = dp->d_ops->sf_get_ftype(sfep);
67770 ctx->pos = off & 0x7fffffff;
67771 - if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67772 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
67773 + char name[sfep->namelen];
67774 + memcpy(name, sfep->name, sfep->namelen);
67775 + if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
67776 + return 0;
67777 + } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67778 xfs_dir3_get_dtype(dp->i_mount, filetype)))
67779 return 0;
67780 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
67781 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
67782 index 24c926b6..8726af88 100644
67783 --- a/fs/xfs/xfs_ioctl.c
67784 +++ b/fs/xfs/xfs_ioctl.c
67785 @@ -122,7 +122,7 @@ xfs_find_handle(
67786 }
67787
67788 error = -EFAULT;
67789 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
67790 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
67791 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
67792 goto out_put;
67793
67794 diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
67795 index 6a51619..9592e1b 100644
67796 --- a/fs/xfs/xfs_linux.h
67797 +++ b/fs/xfs/xfs_linux.h
67798 @@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
67799 * of the compiler which do not like us using do_div in the middle
67800 * of large functions.
67801 */
67802 -static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67803 +static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67804 {
67805 __u32 mod;
67806
67807 @@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
67808 return 0;
67809 }
67810 #else
67811 -static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67812 +static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67813 {
67814 __u32 mod;
67815
67816 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
67817 new file mode 100644
67818 index 0000000..f27264e
67819 --- /dev/null
67820 +++ b/grsecurity/Kconfig
67821 @@ -0,0 +1,1166 @@
67822 +#
67823 +# grecurity configuration
67824 +#
67825 +menu "Memory Protections"
67826 +depends on GRKERNSEC
67827 +
67828 +config GRKERNSEC_KMEM
67829 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
67830 + default y if GRKERNSEC_CONFIG_AUTO
67831 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
67832 + help
67833 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
67834 + be written to or read from to modify or leak the contents of the running
67835 + kernel. /dev/port will also not be allowed to be opened, writing to
67836 + /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
67837 + If you have module support disabled, enabling this will close up several
67838 + ways that are currently used to insert malicious code into the running
67839 + kernel.
67840 +
67841 + Even with this feature enabled, we still highly recommend that
67842 + you use the RBAC system, as it is still possible for an attacker to
67843 + modify the running kernel through other more obscure methods.
67844 +
67845 + It is highly recommended that you say Y here if you meet all the
67846 + conditions above.
67847 +
67848 +config GRKERNSEC_VM86
67849 + bool "Restrict VM86 mode"
67850 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67851 + depends on X86_32
67852 +
67853 + help
67854 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
67855 + make use of a special execution mode on 32bit x86 processors called
67856 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
67857 + video cards and will still work with this option enabled. The purpose
67858 + of the option is to prevent exploitation of emulation errors in
67859 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
67860 + Nearly all users should be able to enable this option.
67861 +
67862 +config GRKERNSEC_IO
67863 + bool "Disable privileged I/O"
67864 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67865 + depends on X86
67866 + select RTC_CLASS
67867 + select RTC_INTF_DEV
67868 + select RTC_DRV_CMOS
67869 +
67870 + help
67871 + If you say Y here, all ioperm and iopl calls will return an error.
67872 + Ioperm and iopl can be used to modify the running kernel.
67873 + Unfortunately, some programs need this access to operate properly,
67874 + the most notable of which are XFree86 and hwclock. hwclock can be
67875 + remedied by having RTC support in the kernel, so real-time
67876 + clock support is enabled if this option is enabled, to ensure
67877 + that hwclock operates correctly. If hwclock still does not work,
67878 + either update udev or symlink /dev/rtc to /dev/rtc0.
67879 +
67880 + If you're using XFree86 or a version of Xorg from 2012 or earlier,
67881 + you may not be able to boot into a graphical environment with this
67882 + option enabled. In this case, you should use the RBAC system instead.
67883 +
67884 +config GRKERNSEC_BPF_HARDEN
67885 + bool "Harden BPF interpreter"
67886 + default y if GRKERNSEC_CONFIG_AUTO
67887 + help
67888 + Unlike previous versions of grsecurity that hardened both the BPF
67889 + interpreted code against corruption at rest as well as the JIT code
67890 + against JIT-spray attacks and attacker-controlled immediate values
67891 + for ROP, this feature will enforce disabling of the new eBPF JIT engine
67892 + and will ensure the interpreted code is read-only at rest. This feature
67893 + may be removed at a later time when eBPF stabilizes to entirely revert
67894 + back to the more secure pre-3.16 BPF interpreter/JIT.
67895 +
67896 + If you're using KERNEXEC, it's recommended that you enable this option
67897 + to supplement the hardening of the kernel.
67898 +
67899 +config GRKERNSEC_PERF_HARDEN
67900 + bool "Disable unprivileged PERF_EVENTS usage by default"
67901 + default y if GRKERNSEC_CONFIG_AUTO
67902 + depends on PERF_EVENTS
67903 + help
67904 + If you say Y here, the range of acceptable values for the
67905 + /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
67906 + default to a new value: 3. When the sysctl is set to this value, no
67907 + unprivileged use of the PERF_EVENTS syscall interface will be permitted.
67908 +
67909 + Though PERF_EVENTS can be used legitimately for performance monitoring
67910 + and low-level application profiling, it is forced on regardless of
67911 + configuration, has been at fault for several vulnerabilities, and
67912 + creates new opportunities for side channels and other information leaks.
67913 +
67914 + This feature puts PERF_EVENTS into a secure default state and permits
67915 + the administrator to change out of it temporarily if unprivileged
67916 + application profiling is needed.
67917 +
67918 +config GRKERNSEC_RAND_THREADSTACK
67919 + bool "Insert random gaps between thread stacks"
67920 + default y if GRKERNSEC_CONFIG_AUTO
67921 + depends on PAX_RANDMMAP && !PPC
67922 + help
67923 + If you say Y here, a random-sized gap will be enforced between allocated
67924 + thread stacks. Glibc's NPTL and other threading libraries that
67925 + pass MAP_STACK to the kernel for thread stack allocation are supported.
67926 + The implementation currently provides 8 bits of entropy for the gap.
67927 +
67928 + Many distributions do not compile threaded remote services with the
67929 + -fstack-check argument to GCC, causing the variable-sized stack-based
67930 + allocator, alloca(), to not probe the stack on allocation. This
67931 + permits an unbounded alloca() to skip over any guard page and potentially
67932 + modify another thread's stack reliably. An enforced random gap
67933 + reduces the reliability of such an attack and increases the chance
67934 + that such a read/write to another thread's stack instead lands in
67935 + an unmapped area, causing a crash and triggering grsecurity's
67936 + anti-bruteforcing logic.
67937 +
67938 +config GRKERNSEC_PROC_MEMMAP
67939 + bool "Harden ASLR against information leaks and entropy reduction"
67940 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
67941 + depends on PAX_NOEXEC || PAX_ASLR
67942 + help
67943 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
67944 + give no information about the addresses of its mappings if
67945 + PaX features that rely on random addresses are enabled on the task.
67946 + In addition to sanitizing this information and disabling other
67947 + dangerous sources of information, this option causes reads of sensitive
67948 + /proc/<pid> entries where the file descriptor was opened in a different
67949 + task than the one performing the read. Such attempts are logged.
67950 + This option also limits argv/env strings for suid/sgid binaries
67951 + to 512KB to prevent a complete exhaustion of the stack entropy provided
67952 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
67953 + binaries to prevent alternative mmap layouts from being abused.
67954 +
67955 + If you use PaX it is essential that you say Y here as it closes up
67956 + several holes that make full ASLR useless locally.
67957 +
67958 +
67959 +config GRKERNSEC_KSTACKOVERFLOW
67960 + bool "Prevent kernel stack overflows"
67961 + default y if GRKERNSEC_CONFIG_AUTO
67962 + depends on !IA64 && 64BIT
67963 + help
67964 + If you say Y here, the kernel's process stacks will be allocated
67965 + with vmalloc instead of the kernel's default allocator. This
67966 + introduces guard pages that in combination with the alloca checking
67967 + of the STACKLEAK feature prevents all forms of kernel process stack
67968 + overflow abuse. Note that this is different from kernel stack
67969 + buffer overflows.
67970 +
67971 +config GRKERNSEC_BRUTE
67972 + bool "Deter exploit bruteforcing"
67973 + default y if GRKERNSEC_CONFIG_AUTO
67974 + help
67975 + If you say Y here, attempts to bruteforce exploits against forking
67976 + daemons such as apache or sshd, as well as against suid/sgid binaries
67977 + will be deterred. When a child of a forking daemon is killed by PaX
67978 + or crashes due to an illegal instruction or other suspicious signal,
67979 + the parent process will be delayed 30 seconds upon every subsequent
67980 + fork until the administrator is able to assess the situation and
67981 + restart the daemon.
67982 + In the suid/sgid case, the attempt is logged, the user has all their
67983 + existing instances of the suid/sgid binary terminated and will
67984 + be unable to execute any suid/sgid binaries for 15 minutes.
67985 +
67986 + It is recommended that you also enable signal logging in the auditing
67987 + section so that logs are generated when a process triggers a suspicious
67988 + signal.
67989 + If the sysctl option is enabled, a sysctl option with name
67990 + "deter_bruteforce" is created.
67991 +
67992 +config GRKERNSEC_MODHARDEN
67993 + bool "Harden module auto-loading"
67994 + default y if GRKERNSEC_CONFIG_AUTO
67995 + depends on MODULES
67996 + help
67997 + If you say Y here, module auto-loading in response to use of some
67998 + feature implemented by an unloaded module will be restricted to
67999 + root users. Enabling this option helps defend against attacks
68000 + by unprivileged users who abuse the auto-loading behavior to
68001 + cause a vulnerable module to load that is then exploited.
68002 +
68003 + If this option prevents a legitimate use of auto-loading for a
68004 + non-root user, the administrator can execute modprobe manually
68005 + with the exact name of the module mentioned in the alert log.
68006 + Alternatively, the administrator can add the module to the list
68007 + of modules loaded at boot by modifying init scripts.
68008 +
68009 + Modification of init scripts will most likely be needed on
68010 + Ubuntu servers with encrypted home directory support enabled,
68011 + as the first non-root user logging in will cause the ecb(aes),
68012 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68013 +
68014 +config GRKERNSEC_HIDESYM
68015 + bool "Hide kernel symbols"
68016 + default y if GRKERNSEC_CONFIG_AUTO
68017 + select PAX_USERCOPY_SLABS
68018 + help
68019 + If you say Y here, getting information on loaded modules, and
68020 + displaying all kernel symbols through a syscall will be restricted
68021 + to users with CAP_SYS_MODULE. For software compatibility reasons,
68022 + /proc/kallsyms will be restricted to the root user. The RBAC
68023 + system can hide that entry even from root.
68024 +
68025 + This option also prevents leaking of kernel addresses through
68026 + several /proc entries.
68027 +
68028 + Note that this option is only effective provided the following
68029 + conditions are met:
68030 + 1) The kernel using grsecurity is not precompiled by some distribution
68031 + 2) You have also enabled GRKERNSEC_DMESG
68032 + 3) You are using the RBAC system and hiding other files such as your
68033 + kernel image and System.map. Alternatively, enabling this option
68034 + causes the permissions on /boot, /lib/modules, and the kernel
68035 + source directory to change at compile time to prevent
68036 + reading by non-root users.
68037 + If the above conditions are met, this option will aid in providing a
68038 + useful protection against local kernel exploitation of overflows
68039 + and arbitrary read/write vulnerabilities.
68040 +
68041 + It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68042 + in addition to this feature.
68043 +
68044 +config GRKERNSEC_RANDSTRUCT
68045 + bool "Randomize layout of sensitive kernel structures"
68046 + default y if GRKERNSEC_CONFIG_AUTO
68047 + select GRKERNSEC_HIDESYM
68048 + select MODVERSIONS if MODULES
68049 + help
68050 + If you say Y here, the layouts of a number of sensitive kernel
68051 + structures (task, fs, cred, etc) and all structures composed entirely
68052 + of function pointers (aka "ops" structs) will be randomized at compile-time.
68053 + This can introduce the requirement of an additional infoleak
68054 + vulnerability for exploits targeting these structure types.
68055 +
68056 + Enabling this feature will introduce some performance impact, slightly
68057 + increase memory usage, and prevent the use of forensic tools like
68058 + Volatility against the system (unless the kernel source tree isn't
68059 + cleaned after kernel installation).
68060 +
68061 + The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68062 + It remains after a make clean to allow for external modules to be compiled
68063 + with the existing seed and will be removed by a make mrproper or
68064 + make distclean.
68065 +
68066 + Note that the implementation requires gcc 4.6.4. or newer. You may need
68067 + to install the supporting headers explicitly in addition to the normal
68068 + gcc package.
68069 +
68070 +config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68071 + bool "Use cacheline-aware structure randomization"
68072 + depends on GRKERNSEC_RANDSTRUCT
68073 + default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68074 + help
68075 + If you say Y here, the RANDSTRUCT randomization will make a best effort
68076 + at restricting randomization to cacheline-sized groups of elements. It
68077 + will further not randomize bitfields in structures. This reduces the
68078 + performance hit of RANDSTRUCT at the cost of weakened randomization.
68079 +
68080 +config GRKERNSEC_KERN_LOCKOUT
68081 + bool "Active kernel exploit response"
68082 + default y if GRKERNSEC_CONFIG_AUTO
68083 + depends on X86 || ARM || PPC || SPARC
68084 + help
68085 + If you say Y here, when a PaX alert is triggered due to suspicious
68086 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68087 + or an OOPS occurs due to bad memory accesses, instead of just
68088 + terminating the offending process (and potentially allowing
68089 + a subsequent exploit from the same user), we will take one of two
68090 + actions:
68091 + If the user was root, we will panic the system
68092 + If the user was non-root, we will log the attempt, terminate
68093 + all processes owned by the user, then prevent them from creating
68094 + any new processes until the system is restarted
68095 + This deters repeated kernel exploitation/bruteforcing attempts
68096 + and is useful for later forensics.
68097 +
68098 +config GRKERNSEC_OLD_ARM_USERLAND
68099 + bool "Old ARM userland compatibility"
68100 + depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68101 + help
68102 + If you say Y here, stubs of executable code to perform such operations
68103 + as "compare-exchange" will be placed at fixed locations in the ARM vector
68104 + table. This is unfortunately needed for old ARM userland meant to run
68105 + across a wide range of processors. Without this option enabled,
68106 + the get_tls and data memory barrier stubs will be emulated by the kernel,
68107 + which is enough for Linaro userlands or other userlands designed for v6
68108 + and newer ARM CPUs. It's recommended that you try without this option enabled
68109 + first, and only enable it if your userland does not boot (it will likely fail
68110 + at init time).
68111 +
68112 +endmenu
68113 +menu "Role Based Access Control Options"
68114 +depends on GRKERNSEC
68115 +
68116 +config GRKERNSEC_RBAC_DEBUG
68117 + bool
68118 +
68119 +config GRKERNSEC_NO_RBAC
68120 + bool "Disable RBAC system"
68121 + help
68122 + If you say Y here, the /dev/grsec device will be removed from the kernel,
68123 + preventing the RBAC system from being enabled. You should only say Y
68124 + here if you have no intention of using the RBAC system, so as to prevent
68125 + an attacker with root access from misusing the RBAC system to hide files
68126 + and processes when loadable module support and /dev/[k]mem have been
68127 + locked down.
68128 +
68129 +config GRKERNSEC_ACL_HIDEKERN
68130 + bool "Hide kernel processes"
68131 + help
68132 + If you say Y here, all kernel threads will be hidden to all
68133 + processes but those whose subject has the "view hidden processes"
68134 + flag.
68135 +
68136 +config GRKERNSEC_ACL_MAXTRIES
68137 + int "Maximum tries before password lockout"
68138 + default 3
68139 + help
68140 + This option enforces the maximum number of times a user can attempt
68141 + to authorize themselves with the grsecurity RBAC system before being
68142 + denied the ability to attempt authorization again for a specified time.
68143 + The lower the number, the harder it will be to brute-force a password.
68144 +
68145 +config GRKERNSEC_ACL_TIMEOUT
68146 + int "Time to wait after max password tries, in seconds"
68147 + default 30
68148 + help
68149 + This option specifies the time the user must wait after attempting to
68150 + authorize to the RBAC system with the maximum number of invalid
68151 + passwords. The higher the number, the harder it will be to brute-force
68152 + a password.
68153 +
68154 +endmenu
68155 +menu "Filesystem Protections"
68156 +depends on GRKERNSEC
68157 +
68158 +config GRKERNSEC_PROC
68159 + bool "Proc restrictions"
68160 + default y if GRKERNSEC_CONFIG_AUTO
68161 + help
68162 + If you say Y here, the permissions of the /proc filesystem
68163 + will be altered to enhance system security and privacy. You MUST
68164 + choose either a user only restriction or a user and group restriction.
68165 + Depending upon the option you choose, you can either restrict users to
68166 + see only the processes they themselves run, or choose a group that can
68167 + view all processes and files normally restricted to root if you choose
68168 + the "restrict to user only" option. NOTE: If you're running identd or
68169 + ntpd as a non-root user, you will have to run it as the group you
68170 + specify here.
68171 +
68172 +config GRKERNSEC_PROC_USER
68173 + bool "Restrict /proc to user only"
68174 + depends on GRKERNSEC_PROC
68175 + help
68176 + If you say Y here, non-root users will only be able to view their own
68177 + processes, and restricts them from viewing network-related information,
68178 + and viewing kernel symbol and module information.
68179 +
68180 +config GRKERNSEC_PROC_USERGROUP
68181 + bool "Allow special group"
68182 + default y if GRKERNSEC_CONFIG_AUTO
68183 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68184 + help
68185 + If you say Y here, you will be able to select a group that will be
68186 + able to view all processes and network-related information. If you've
68187 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68188 + remain hidden. This option is useful if you want to run identd as
68189 + a non-root user. The group you select may also be chosen at boot time
68190 + via "grsec_proc_gid=" on the kernel commandline.
68191 +
68192 +config GRKERNSEC_PROC_GID
68193 + int "GID for special group"
68194 + depends on GRKERNSEC_PROC_USERGROUP
68195 + default 1001
68196 +
68197 +config GRKERNSEC_PROC_ADD
68198 + bool "Additional restrictions"
68199 + default y if GRKERNSEC_CONFIG_AUTO
68200 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68201 + help
68202 + If you say Y here, additional restrictions will be placed on
68203 + /proc that keep normal users from viewing device information and
68204 + slabinfo information that could be useful for exploits.
68205 +
68206 +config GRKERNSEC_LINK
68207 + bool "Linking restrictions"
68208 + default y if GRKERNSEC_CONFIG_AUTO
68209 + help
68210 + If you say Y here, /tmp race exploits will be prevented, since users
68211 + will no longer be able to follow symlinks owned by other users in
68212 + world-writable +t directories (e.g. /tmp), unless the owner of the
68213 + symlink is the owner of the directory. users will also not be
68214 + able to hardlink to files they do not own. If the sysctl option is
68215 + enabled, a sysctl option with name "linking_restrictions" is created.
68216 +
68217 +config GRKERNSEC_SYMLINKOWN
68218 + bool "Kernel-enforced SymlinksIfOwnerMatch"
68219 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68220 + help
68221 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
68222 + that prevents it from being used as a security feature. As Apache
68223 + verifies the symlink by performing a stat() against the target of
68224 + the symlink before it is followed, an attacker can setup a symlink
68225 + to point to a same-owned file, then replace the symlink with one
68226 + that targets another user's file just after Apache "validates" the
68227 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
68228 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68229 + will be in place for the group you specify. If the sysctl option
68230 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
68231 + created.
68232 +
68233 +config GRKERNSEC_SYMLINKOWN_GID
68234 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68235 + depends on GRKERNSEC_SYMLINKOWN
68236 + default 1006
68237 + help
68238 + Setting this GID determines what group kernel-enforced
68239 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68240 + is enabled, a sysctl option with name "symlinkown_gid" is created.
68241 +
68242 +config GRKERNSEC_FIFO
68243 + bool "FIFO restrictions"
68244 + default y if GRKERNSEC_CONFIG_AUTO
68245 + help
68246 + If you say Y here, users will not be able to write to FIFOs they don't
68247 + own in world-writable +t directories (e.g. /tmp), unless the owner of
68248 + the FIFO is the same owner of the directory it's held in. If the sysctl
68249 + option is enabled, a sysctl option with name "fifo_restrictions" is
68250 + created.
68251 +
68252 +config GRKERNSEC_SYSFS_RESTRICT
68253 + bool "Sysfs/debugfs restriction"
68254 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68255 + depends on SYSFS
68256 + help
68257 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68258 + any filesystem normally mounted under it (e.g. debugfs) will be
68259 + mostly accessible only by root. These filesystems generally provide access
68260 + to hardware and debug information that isn't appropriate for unprivileged
68261 + users of the system. Sysfs and debugfs have also become a large source
68262 + of new vulnerabilities, ranging from infoleaks to local compromise.
68263 + There has been very little oversight with an eye toward security involved
68264 + in adding new exporters of information to these filesystems, so their
68265 + use is discouraged.
68266 + For reasons of compatibility, a few directories have been whitelisted
68267 + for access by non-root users:
68268 + /sys/fs/selinux
68269 + /sys/fs/fuse
68270 + /sys/devices/system/cpu
68271 +
68272 +config GRKERNSEC_ROFS
68273 + bool "Runtime read-only mount protection"
68274 + depends on SYSCTL
68275 + help
68276 + If you say Y here, a sysctl option with name "romount_protect" will
68277 + be created. By setting this option to 1 at runtime, filesystems
68278 + will be protected in the following ways:
68279 + * No new writable mounts will be allowed
68280 + * Existing read-only mounts won't be able to be remounted read/write
68281 + * Write operations will be denied on all block devices
68282 + This option acts independently of grsec_lock: once it is set to 1,
68283 + it cannot be turned off. Therefore, please be mindful of the resulting
68284 + behavior if this option is enabled in an init script on a read-only
68285 + filesystem.
68286 + Also be aware that as with other root-focused features, GRKERNSEC_KMEM
68287 + and GRKERNSEC_IO should be enabled and module loading disabled via
68288 + config or at runtime.
68289 + This feature is mainly intended for secure embedded systems.
68290 +
68291 +
68292 +config GRKERNSEC_DEVICE_SIDECHANNEL
68293 + bool "Eliminate stat/notify-based device sidechannels"
68294 + default y if GRKERNSEC_CONFIG_AUTO
68295 + help
68296 + If you say Y here, timing analyses on block or character
68297 + devices like /dev/ptmx using stat or inotify/dnotify/fanotify
68298 + will be thwarted for unprivileged users. If a process without
68299 + CAP_MKNOD stats such a device, the last access and last modify times
68300 + will match the device's create time. No access or modify events
68301 + will be triggered through inotify/dnotify/fanotify for such devices.
68302 + This feature will prevent attacks that may at a minimum
68303 + allow an attacker to determine the administrator's password length.
68304 +
68305 +config GRKERNSEC_CHROOT
68306 + bool "Chroot jail restrictions"
68307 + default y if GRKERNSEC_CONFIG_AUTO
68308 + help
68309 + If you say Y here, you will be able to choose several options that will
68310 + make breaking out of a chrooted jail much more difficult. If you
68311 + encounter no software incompatibilities with the following options, it
68312 + is recommended that you enable each one.
68313 +
68314 + Note that the chroot restrictions are not intended to apply to "chroots"
68315 + to directories that are simple bind mounts of the global root filesystem.
68316 + For several other reasons, a user shouldn't expect any significant
68317 + security by performing such a chroot.
68318 +
68319 +config GRKERNSEC_CHROOT_MOUNT
68320 + bool "Deny mounts"
68321 + default y if GRKERNSEC_CONFIG_AUTO
68322 + depends on GRKERNSEC_CHROOT
68323 + help
68324 + If you say Y here, processes inside a chroot will not be able to
68325 + mount or remount filesystems. If the sysctl option is enabled, a
68326 + sysctl option with name "chroot_deny_mount" is created.
68327 +
68328 +config GRKERNSEC_CHROOT_DOUBLE
68329 + bool "Deny double-chroots"
68330 + default y if GRKERNSEC_CONFIG_AUTO
68331 + depends on GRKERNSEC_CHROOT
68332 + help
68333 + If you say Y here, processes inside a chroot will not be able to chroot
68334 + again outside the chroot. This is a widely used method of breaking
68335 + out of a chroot jail and should not be allowed. If the sysctl
68336 + option is enabled, a sysctl option with name
68337 + "chroot_deny_chroot" is created.
68338 +
68339 +config GRKERNSEC_CHROOT_PIVOT
68340 + bool "Deny pivot_root in chroot"
68341 + default y if GRKERNSEC_CONFIG_AUTO
68342 + depends on GRKERNSEC_CHROOT
68343 + help
68344 + If you say Y here, processes inside a chroot will not be able to use
68345 + a function called pivot_root() that was introduced in Linux 2.3.41. It
68346 + works similar to chroot in that it changes the root filesystem. This
68347 + function could be misused in a chrooted process to attempt to break out
68348 + of the chroot, and therefore should not be allowed. If the sysctl
68349 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
68350 + created.
68351 +
68352 +config GRKERNSEC_CHROOT_CHDIR
68353 + bool "Enforce chdir(\"/\") on all chroots"
68354 + default y if GRKERNSEC_CONFIG_AUTO
68355 + depends on GRKERNSEC_CHROOT
68356 + help
68357 + If you say Y here, the current working directory of all newly-chrooted
68358 + applications will be set to the the root directory of the chroot.
68359 + The man page on chroot(2) states:
68360 + Note that this call does not change the current working
68361 + directory, so that `.' can be outside the tree rooted at
68362 + `/'. In particular, the super-user can escape from a
68363 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
68364 +
68365 + It is recommended that you say Y here, since it's not known to break
68366 + any software. If the sysctl option is enabled, a sysctl option with
68367 + name "chroot_enforce_chdir" is created.
68368 +
68369 +config GRKERNSEC_CHROOT_CHMOD
68370 + bool "Deny (f)chmod +s"
68371 + default y if GRKERNSEC_CONFIG_AUTO
68372 + depends on GRKERNSEC_CHROOT
68373 + help
68374 + If you say Y here, processes inside a chroot will not be able to chmod
68375 + or fchmod files to make them have suid or sgid bits. This protects
68376 + against another published method of breaking a chroot. If the sysctl
68377 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
68378 + created.
68379 +
68380 +config GRKERNSEC_CHROOT_FCHDIR
68381 + bool "Deny fchdir and fhandle out of chroot"
68382 + default y if GRKERNSEC_CONFIG_AUTO
68383 + depends on GRKERNSEC_CHROOT
68384 + help
68385 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
68386 + to a file descriptor of the chrooting process that points to a directory
68387 + outside the filesystem will be stopped. Additionally, this option prevents
68388 + use of the recently-created syscall for opening files by a guessable "file
68389 + handle" inside a chroot. If the sysctl option is enabled, a sysctl option
68390 + with name "chroot_deny_fchdir" is created.
68391 +
68392 +config GRKERNSEC_CHROOT_MKNOD
68393 + bool "Deny mknod"
68394 + default y if GRKERNSEC_CONFIG_AUTO
68395 + depends on GRKERNSEC_CHROOT
68396 + help
68397 + If you say Y here, processes inside a chroot will not be allowed to
68398 + mknod. The problem with using mknod inside a chroot is that it
68399 + would allow an attacker to create a device entry that is the same
68400 + as one on the physical root of your system, which could range from
68401 + anything from the console device to a device for your harddrive (which
68402 + they could then use to wipe the drive or steal data). It is recommended
68403 + that you say Y here, unless you run into software incompatibilities.
68404 + If the sysctl option is enabled, a sysctl option with name
68405 + "chroot_deny_mknod" is created.
68406 +
68407 +config GRKERNSEC_CHROOT_SHMAT
68408 + bool "Deny shmat() out of chroot"
68409 + default y if GRKERNSEC_CONFIG_AUTO
68410 + depends on GRKERNSEC_CHROOT
68411 + help
68412 + If you say Y here, processes inside a chroot will not be able to attach
68413 + to shared memory segments that were created outside of the chroot jail.
68414 + It is recommended that you say Y here. If the sysctl option is enabled,
68415 + a sysctl option with name "chroot_deny_shmat" is created.
68416 +
68417 +config GRKERNSEC_CHROOT_UNIX
68418 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
68419 + default y if GRKERNSEC_CONFIG_AUTO
68420 + depends on GRKERNSEC_CHROOT
68421 + help
68422 + If you say Y here, processes inside a chroot will not be able to
68423 + connect to abstract (meaning not belonging to a filesystem) Unix
68424 + domain sockets that were bound outside of a chroot. It is recommended
68425 + that you say Y here. If the sysctl option is enabled, a sysctl option
68426 + with name "chroot_deny_unix" is created.
68427 +
68428 +config GRKERNSEC_CHROOT_FINDTASK
68429 + bool "Protect outside processes"
68430 + default y if GRKERNSEC_CONFIG_AUTO
68431 + depends on GRKERNSEC_CHROOT
68432 + help
68433 + If you say Y here, processes inside a chroot will not be able to
68434 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
68435 + getsid, or view any process outside of the chroot. If the sysctl
68436 + option is enabled, a sysctl option with name "chroot_findtask" is
68437 + created.
68438 +
68439 +config GRKERNSEC_CHROOT_NICE
68440 + bool "Restrict priority changes"
68441 + default y if GRKERNSEC_CONFIG_AUTO
68442 + depends on GRKERNSEC_CHROOT
68443 + help
68444 + If you say Y here, processes inside a chroot will not be able to raise
68445 + the priority of processes in the chroot, or alter the priority of
68446 + processes outside the chroot. This provides more security than simply
68447 + removing CAP_SYS_NICE from the process' capability set. If the
68448 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
68449 + is created.
68450 +
68451 +config GRKERNSEC_CHROOT_SYSCTL
68452 + bool "Deny sysctl writes"
68453 + default y if GRKERNSEC_CONFIG_AUTO
68454 + depends on GRKERNSEC_CHROOT
68455 + help
68456 + If you say Y here, an attacker in a chroot will not be able to
68457 + write to sysctl entries, either by sysctl(2) or through a /proc
68458 + interface. It is strongly recommended that you say Y here. If the
68459 + sysctl option is enabled, a sysctl option with name
68460 + "chroot_deny_sysctl" is created.
68461 +
68462 +config GRKERNSEC_CHROOT_CAPS
68463 + bool "Capability restrictions"
68464 + default y if GRKERNSEC_CONFIG_AUTO
68465 + depends on GRKERNSEC_CHROOT
68466 + help
68467 + If you say Y here, the capabilities on all processes within a
68468 + chroot jail will be lowered to stop module insertion, raw i/o,
68469 + system and net admin tasks, rebooting the system, modifying immutable
68470 + files, modifying IPC owned by another, and changing the system time.
68471 + This is left an option because it can break some apps. Disable this
68472 + if your chrooted apps are having problems performing those kinds of
68473 + tasks. If the sysctl option is enabled, a sysctl option with
68474 + name "chroot_caps" is created.
68475 +
68476 +config GRKERNSEC_CHROOT_INITRD
68477 + bool "Exempt initrd tasks from restrictions"
68478 + default y if GRKERNSEC_CONFIG_AUTO
68479 + depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
68480 + help
68481 + If you say Y here, tasks started prior to init will be exempted from
68482 + grsecurity's chroot restrictions. This option is mainly meant to
68483 + resolve Plymouth's performing privileged operations unnecessarily
68484 + in a chroot.
68485 +
68486 +endmenu
68487 +menu "Kernel Auditing"
68488 +depends on GRKERNSEC
68489 +
68490 +config GRKERNSEC_AUDIT_GROUP
68491 + bool "Single group for auditing"
68492 + help
68493 + If you say Y here, the exec and chdir logging features will only operate
68494 + on a group you specify. This option is recommended if you only want to
68495 + watch certain users instead of having a large amount of logs from the
68496 + entire system. If the sysctl option is enabled, a sysctl option with
68497 + name "audit_group" is created.
68498 +
68499 +config GRKERNSEC_AUDIT_GID
68500 + int "GID for auditing"
68501 + depends on GRKERNSEC_AUDIT_GROUP
68502 + default 1007
68503 +
68504 +config GRKERNSEC_EXECLOG
68505 + bool "Exec logging"
68506 + help
68507 + If you say Y here, all execve() calls will be logged (since the
68508 + other exec*() calls are frontends to execve(), all execution
68509 + will be logged). Useful for shell-servers that like to keep track
68510 + of their users. If the sysctl option is enabled, a sysctl option with
68511 + name "exec_logging" is created.
68512 + WARNING: This option when enabled will produce a LOT of logs, especially
68513 + on an active system.
68514 +
68515 +config GRKERNSEC_RESLOG
68516 + bool "Resource logging"
68517 + default y if GRKERNSEC_CONFIG_AUTO
68518 + help
68519 + If you say Y here, all attempts to overstep resource limits will
68520 + be logged with the resource name, the requested size, and the current
68521 + limit. It is highly recommended that you say Y here. If the sysctl
68522 + option is enabled, a sysctl option with name "resource_logging" is
68523 + created. If the RBAC system is enabled, the sysctl value is ignored.
68524 +
68525 +config GRKERNSEC_CHROOT_EXECLOG
68526 + bool "Log execs within chroot"
68527 + help
68528 + If you say Y here, all executions inside a chroot jail will be logged
68529 + to syslog. This can cause a large amount of logs if certain
68530 + applications (eg. djb's daemontools) are installed on the system, and
68531 + is therefore left as an option. If the sysctl option is enabled, a
68532 + sysctl option with name "chroot_execlog" is created.
68533 +
68534 +config GRKERNSEC_AUDIT_PTRACE
68535 + bool "Ptrace logging"
68536 + help
68537 + If you say Y here, all attempts to attach to a process via ptrace
68538 + will be logged. If the sysctl option is enabled, a sysctl option
68539 + with name "audit_ptrace" is created.
68540 +
68541 +config GRKERNSEC_AUDIT_CHDIR
68542 + bool "Chdir logging"
68543 + help
68544 + If you say Y here, all chdir() calls will be logged. If the sysctl
68545 + option is enabled, a sysctl option with name "audit_chdir" is created.
68546 +
68547 +config GRKERNSEC_AUDIT_MOUNT
68548 + bool "(Un)Mount logging"
68549 + help
68550 + If you say Y here, all mounts and unmounts will be logged. If the
68551 + sysctl option is enabled, a sysctl option with name "audit_mount" is
68552 + created.
68553 +
68554 +config GRKERNSEC_SIGNAL
68555 + bool "Signal logging"
68556 + default y if GRKERNSEC_CONFIG_AUTO
68557 + help
68558 + If you say Y here, certain important signals will be logged, such as
68559 + SIGSEGV, which will as a result inform you of when a error in a program
68560 + occurred, which in some cases could mean a possible exploit attempt.
68561 + If the sysctl option is enabled, a sysctl option with name
68562 + "signal_logging" is created.
68563 +
68564 +config GRKERNSEC_FORKFAIL
68565 + bool "Fork failure logging"
68566 + help
68567 + If you say Y here, all failed fork() attempts will be logged.
68568 + This could suggest a fork bomb, or someone attempting to overstep
68569 + their process limit. If the sysctl option is enabled, a sysctl option
68570 + with name "forkfail_logging" is created.
68571 +
68572 +config GRKERNSEC_TIME
68573 + bool "Time change logging"
68574 + default y if GRKERNSEC_CONFIG_AUTO
68575 + help
68576 + If you say Y here, any changes of the system clock will be logged.
68577 + If the sysctl option is enabled, a sysctl option with name
68578 + "timechange_logging" is created.
68579 +
68580 +config GRKERNSEC_PROC_IPADDR
68581 + bool "/proc/<pid>/ipaddr support"
68582 + default y if GRKERNSEC_CONFIG_AUTO
68583 + help
68584 + If you say Y here, a new entry will be added to each /proc/<pid>
68585 + directory that contains the IP address of the person using the task.
68586 + The IP is carried across local TCP and AF_UNIX stream sockets.
68587 + This information can be useful for IDS/IPSes to perform remote response
68588 + to a local attack. The entry is readable by only the owner of the
68589 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
68590 + the RBAC system), and thus does not create privacy concerns.
68591 +
68592 +config GRKERNSEC_RWXMAP_LOG
68593 + bool 'Denied RWX mmap/mprotect logging'
68594 + default y if GRKERNSEC_CONFIG_AUTO
68595 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
68596 + help
68597 + If you say Y here, calls to mmap() and mprotect() with explicit
68598 + usage of PROT_WRITE and PROT_EXEC together will be logged when
68599 + denied by the PAX_MPROTECT feature. This feature will also
68600 + log other problematic scenarios that can occur when PAX_MPROTECT
68601 + is enabled on a binary, like textrels and PT_GNU_STACK. If the
68602 + sysctl option is enabled, a sysctl option with name "rwxmap_logging"
68603 + is created.
68604 +
68605 +endmenu
68606 +
68607 +menu "Executable Protections"
68608 +depends on GRKERNSEC
68609 +
68610 +config GRKERNSEC_DMESG
68611 + bool "Dmesg(8) restriction"
68612 + default y if GRKERNSEC_CONFIG_AUTO
68613 + help
68614 + If you say Y here, non-root users will not be able to use dmesg(8)
68615 + to view the contents of the kernel's circular log buffer.
68616 + The kernel's log buffer often contains kernel addresses and other
68617 + identifying information useful to an attacker in fingerprinting a
68618 + system for a targeted exploit.
68619 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
68620 + created.
68621 +
68622 +config GRKERNSEC_HARDEN_PTRACE
68623 + bool "Deter ptrace-based process snooping"
68624 + default y if GRKERNSEC_CONFIG_AUTO
68625 + help
68626 + If you say Y here, TTY sniffers and other malicious monitoring
68627 + programs implemented through ptrace will be defeated. If you
68628 + have been using the RBAC system, this option has already been
68629 + enabled for several years for all users, with the ability to make
68630 + fine-grained exceptions.
68631 +
68632 + This option only affects the ability of non-root users to ptrace
68633 + processes that are not a descendent of the ptracing process.
68634 + This means that strace ./binary and gdb ./binary will still work,
68635 + but attaching to arbitrary processes will not. If the sysctl
68636 + option is enabled, a sysctl option with name "harden_ptrace" is
68637 + created.
68638 +
68639 +config GRKERNSEC_PTRACE_READEXEC
68640 + bool "Require read access to ptrace sensitive binaries"
68641 + default y if GRKERNSEC_CONFIG_AUTO
68642 + help
68643 + If you say Y here, unprivileged users will not be able to ptrace unreadable
68644 + binaries. This option is useful in environments that
68645 + remove the read bits (e.g. file mode 4711) from suid binaries to
68646 + prevent infoleaking of their contents. This option adds
68647 + consistency to the use of that file mode, as the binary could normally
68648 + be read out when run without privileges while ptracing.
68649 +
68650 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
68651 + is created.
68652 +
68653 +config GRKERNSEC_SETXID
68654 + bool "Enforce consistent multithreaded privileges"
68655 + default y if GRKERNSEC_CONFIG_AUTO
68656 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
68657 + help
68658 + If you say Y here, a change from a root uid to a non-root uid
68659 + in a multithreaded application will cause the resulting uids,
68660 + gids, supplementary groups, and capabilities in that thread
68661 + to be propagated to the other threads of the process. In most
68662 + cases this is unnecessary, as glibc will emulate this behavior
68663 + on behalf of the application. Other libcs do not act in the
68664 + same way, allowing the other threads of the process to continue
68665 + running with root privileges. If the sysctl option is enabled,
68666 + a sysctl option with name "consistent_setxid" is created.
68667 +
68668 +config GRKERNSEC_HARDEN_IPC
68669 + bool "Disallow access to overly-permissive IPC objects"
68670 + default y if GRKERNSEC_CONFIG_AUTO
68671 + depends on SYSVIPC
68672 + help
68673 + If you say Y here, access to overly-permissive IPC objects (shared
68674 + memory, message queues, and semaphores) will be denied for processes
68675 + given the following criteria beyond normal permission checks:
68676 + 1) If the IPC object is world-accessible and the euid doesn't match
68677 + that of the creator or current uid for the IPC object
68678 + 2) If the IPC object is group-accessible and the egid doesn't
68679 + match that of the creator or current gid for the IPC object
68680 + It's a common error to grant too much permission to these objects,
68681 + with impact ranging from denial of service and information leaking to
68682 + privilege escalation. This feature was developed in response to
68683 + research by Tim Brown:
68684 + http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
68685 + who found hundreds of such insecure usages. Processes with
68686 + CAP_IPC_OWNER are still permitted to access these IPC objects.
68687 + If the sysctl option is enabled, a sysctl option with name
68688 + "harden_ipc" is created.
68689 +
68690 +config GRKERNSEC_TPE
68691 + bool "Trusted Path Execution (TPE)"
68692 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68693 + help
68694 + If you say Y here, you will be able to choose a gid to add to the
68695 + supplementary groups of users you want to mark as "untrusted."
68696 + These users will not be able to execute any files that are not in
68697 + root-owned directories writable only by root. If the sysctl option
68698 + is enabled, a sysctl option with name "tpe" is created.
68699 +
68700 +config GRKERNSEC_TPE_ALL
68701 + bool "Partially restrict all non-root users"
68702 + depends on GRKERNSEC_TPE
68703 + help
68704 + If you say Y here, all non-root users will be covered under
68705 + a weaker TPE restriction. This is separate from, and in addition to,
68706 + the main TPE options that you have selected elsewhere. Thus, if a
68707 + "trusted" GID is chosen, this restriction applies to even that GID.
68708 + Under this restriction, all non-root users will only be allowed to
68709 + execute files in directories they own that are not group or
68710 + world-writable, or in directories owned by root and writable only by
68711 + root. If the sysctl option is enabled, a sysctl option with name
68712 + "tpe_restrict_all" is created.
68713 +
68714 +config GRKERNSEC_TPE_INVERT
68715 + bool "Invert GID option"
68716 + depends on GRKERNSEC_TPE
68717 + help
68718 + If you say Y here, the group you specify in the TPE configuration will
68719 + decide what group TPE restrictions will be *disabled* for. This
68720 + option is useful if you want TPE restrictions to be applied to most
68721 + users on the system. If the sysctl option is enabled, a sysctl option
68722 + with name "tpe_invert" is created. Unlike other sysctl options, this
68723 + entry will default to on for backward-compatibility.
68724 +
68725 +config GRKERNSEC_TPE_GID
68726 + int
68727 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
68728 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
68729 +
68730 +config GRKERNSEC_TPE_UNTRUSTED_GID
68731 + int "GID for TPE-untrusted users"
68732 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
68733 + default 1005
68734 + help
68735 + Setting this GID determines what group TPE restrictions will be
68736 + *enabled* for. If the sysctl option is enabled, a sysctl option
68737 + with name "tpe_gid" is created.
68738 +
68739 +config GRKERNSEC_TPE_TRUSTED_GID
68740 + int "GID for TPE-trusted users"
68741 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
68742 + default 1005
68743 + help
68744 + Setting this GID determines what group TPE restrictions will be
68745 + *disabled* for. If the sysctl option is enabled, a sysctl option
68746 + with name "tpe_gid" is created.
68747 +
68748 +endmenu
68749 +menu "Network Protections"
68750 +depends on GRKERNSEC
68751 +
68752 +config GRKERNSEC_BLACKHOLE
68753 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
68754 + default y if GRKERNSEC_CONFIG_AUTO
68755 + depends on NET
68756 + help
68757 + If you say Y here, neither TCP resets nor ICMP
68758 + destination-unreachable packets will be sent in response to packets
68759 + sent to ports for which no associated listening process exists.
68760 + It will also prevent the sending of ICMP protocol unreachable packets
68761 + in response to packets with unknown protocols.
68762 + This feature supports both IPV4 and IPV6 and exempts the
68763 + loopback interface from blackholing. Enabling this feature
68764 + makes a host more resilient to DoS attacks and reduces network
68765 + visibility against scanners.
68766 +
68767 + The blackhole feature as-implemented is equivalent to the FreeBSD
68768 + blackhole feature, as it prevents RST responses to all packets, not
68769 + just SYNs. Under most application behavior this causes no
68770 + problems, but applications (like haproxy) may not close certain
68771 + connections in a way that cleanly terminates them on the remote
68772 + end, leaving the remote host in LAST_ACK state. Because of this
68773 + side-effect and to prevent intentional LAST_ACK DoSes, this
68774 + feature also adds automatic mitigation against such attacks.
68775 + The mitigation drastically reduces the amount of time a socket
68776 + can spend in LAST_ACK state. If you're using haproxy and not
68777 + all servers it connects to have this option enabled, consider
68778 + disabling this feature on the haproxy host.
68779 +
68780 + If the sysctl option is enabled, two sysctl options with names
68781 + "ip_blackhole" and "lastack_retries" will be created.
68782 + While "ip_blackhole" takes the standard zero/non-zero on/off
68783 + toggle, "lastack_retries" uses the same kinds of values as
68784 + "tcp_retries1" and "tcp_retries2". The default value of 4
68785 + prevents a socket from lasting more than 45 seconds in LAST_ACK
68786 + state.
68787 +
68788 +config GRKERNSEC_NO_SIMULT_CONNECT
68789 + bool "Disable TCP Simultaneous Connect"
68790 + default y if GRKERNSEC_CONFIG_AUTO
68791 + depends on NET
68792 + help
68793 + If you say Y here, a feature by Willy Tarreau will be enabled that
68794 + removes a weakness in Linux's strict implementation of TCP that
68795 + allows two clients to connect to each other without either entering
68796 + a listening state. The weakness allows an attacker to easily prevent
68797 + a client from connecting to a known server provided the source port
68798 + for the connection is guessed correctly.
68799 +
68800 + As the weakness could be used to prevent an antivirus or IPS from
68801 + fetching updates, or prevent an SSL gateway from fetching a CRL,
68802 + it should be eliminated by enabling this option. Though Linux is
68803 + one of few operating systems supporting simultaneous connect, it
68804 + has no legitimate use in practice and is rarely supported by firewalls.
68805 +
68806 +config GRKERNSEC_SOCKET
68807 + bool "Socket restrictions"
68808 + depends on NET
68809 + help
68810 + If you say Y here, you will be able to choose from several options.
68811 + If you assign a GID on your system and add it to the supplementary
68812 + groups of users you want to restrict socket access to, this patch
68813 + will perform up to three things, based on the option(s) you choose.
68814 +
68815 +config GRKERNSEC_SOCKET_ALL
68816 + bool "Deny any sockets to group"
68817 + depends on GRKERNSEC_SOCKET
68818 + help
68819 + If you say Y here, you will be able to choose a GID of whose users will
68820 + be unable to connect to other hosts from your machine or run server
68821 + applications from your machine. If the sysctl option is enabled, a
68822 + sysctl option with name "socket_all" is created.
68823 +
68824 +config GRKERNSEC_SOCKET_ALL_GID
68825 + int "GID to deny all sockets for"
68826 + depends on GRKERNSEC_SOCKET_ALL
68827 + default 1004
68828 + help
68829 + Here you can choose the GID to disable socket access for. Remember to
68830 + add the users you want socket access disabled for to the GID
68831 + specified here. If the sysctl option is enabled, a sysctl option
68832 + with name "socket_all_gid" is created.
68833 +
68834 +config GRKERNSEC_SOCKET_CLIENT
68835 + bool "Deny client sockets to group"
68836 + depends on GRKERNSEC_SOCKET
68837 + help
68838 + If you say Y here, you will be able to choose a GID of whose users will
68839 + be unable to connect to other hosts from your machine, but will be
68840 + able to run servers. If this option is enabled, all users in the group
68841 + you specify will have to use passive mode when initiating ftp transfers
68842 + from the shell on your machine. If the sysctl option is enabled, a
68843 + sysctl option with name "socket_client" is created.
68844 +
68845 +config GRKERNSEC_SOCKET_CLIENT_GID
68846 + int "GID to deny client sockets for"
68847 + depends on GRKERNSEC_SOCKET_CLIENT
68848 + default 1003
68849 + help
68850 + Here you can choose the GID to disable client socket access for.
68851 + Remember to add the users you want client socket access disabled for to
68852 + the GID specified here. If the sysctl option is enabled, a sysctl
68853 + option with name "socket_client_gid" is created.
68854 +
68855 +config GRKERNSEC_SOCKET_SERVER
68856 + bool "Deny server sockets to group"
68857 + depends on GRKERNSEC_SOCKET
68858 + help
68859 + If you say Y here, you will be able to choose a GID of whose users will
68860 + be unable to run server applications from your machine. If the sysctl
68861 + option is enabled, a sysctl option with name "socket_server" is created.
68862 +
68863 +config GRKERNSEC_SOCKET_SERVER_GID
68864 + int "GID to deny server sockets for"
68865 + depends on GRKERNSEC_SOCKET_SERVER
68866 + default 1002
68867 + help
68868 + Here you can choose the GID to disable server socket access for.
68869 + Remember to add the users you want server socket access disabled for to
68870 + the GID specified here. If the sysctl option is enabled, a sysctl
68871 + option with name "socket_server_gid" is created.
68872 +
68873 +endmenu
68874 +
68875 +menu "Physical Protections"
68876 +depends on GRKERNSEC
68877 +
68878 +config GRKERNSEC_DENYUSB
68879 + bool "Deny new USB connections after toggle"
68880 + default y if GRKERNSEC_CONFIG_AUTO
68881 + depends on SYSCTL && USB_SUPPORT
68882 + help
68883 + If you say Y here, a new sysctl option with name "deny_new_usb"
68884 + will be created. Setting its value to 1 will prevent any new
68885 + USB devices from being recognized by the OS. Any attempted USB
68886 + device insertion will be logged. This option is intended to be
68887 + used against custom USB devices designed to exploit vulnerabilities
68888 + in various USB device drivers.
68889 +
68890 + For greatest effectiveness, this sysctl should be set after any
68891 + relevant init scripts. This option is safe to enable in distros
68892 + as each user can choose whether or not to toggle the sysctl.
68893 +
68894 +config GRKERNSEC_DENYUSB_FORCE
68895 + bool "Reject all USB devices not connected at boot"
68896 + select USB
68897 + depends on GRKERNSEC_DENYUSB
68898 + help
68899 + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
68900 + that doesn't involve a sysctl entry. This option should only be
68901 + enabled if you're sure you want to deny all new USB connections
68902 + at runtime and don't want to modify init scripts. This should not
68903 + be enabled by distros. It forces the core USB code to be built
68904 + into the kernel image so that all devices connected at boot time
68905 + can be recognized and new USB device connections can be prevented
68906 + prior to init running.
68907 +
68908 +endmenu
68909 +
68910 +menu "Sysctl Support"
68911 +depends on GRKERNSEC && SYSCTL
68912 +
68913 +config GRKERNSEC_SYSCTL
68914 + bool "Sysctl support"
68915 + default y if GRKERNSEC_CONFIG_AUTO
68916 + help
68917 + If you say Y here, you will be able to change the options that
68918 + grsecurity runs with at bootup, without having to recompile your
68919 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
68920 + to enable (1) or disable (0) various features. All the sysctl entries
68921 + are mutable until the "grsec_lock" entry is set to a non-zero value.
68922 + All features enabled in the kernel configuration are disabled at boot
68923 + if you do not say Y to the "Turn on features by default" option.
68924 + All options should be set at startup, and the grsec_lock entry should
68925 + be set to a non-zero value after all the options are set.
68926 + *THIS IS EXTREMELY IMPORTANT*
68927 +
68928 +config GRKERNSEC_SYSCTL_DISTRO
68929 + bool "Extra sysctl support for distro makers (READ HELP)"
68930 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
68931 + help
68932 + If you say Y here, additional sysctl options will be created
68933 + for features that affect processes running as root. Therefore,
68934 + it is critical when using this option that the grsec_lock entry be
68935 + enabled after boot. Only distros with prebuilt kernel packages
68936 + with this option enabled that can ensure grsec_lock is enabled
68937 + after boot should use this option.
68938 + *Failure to set grsec_lock after boot makes all grsec features
68939 + this option covers useless*
68940 +
68941 + Currently this option creates the following sysctl entries:
68942 + "Disable Privileged I/O": "disable_priv_io"
68943 +
68944 +config GRKERNSEC_SYSCTL_ON
68945 + bool "Turn on features by default"
68946 + default y if GRKERNSEC_CONFIG_AUTO
68947 + depends on GRKERNSEC_SYSCTL
68948 + help
68949 + If you say Y here, instead of having all features enabled in the
68950 + kernel configuration disabled at boot time, the features will be
68951 + enabled at boot time. It is recommended you say Y here unless
68952 + there is some reason you would want all sysctl-tunable features to
68953 + be disabled by default. As mentioned elsewhere, it is important
68954 + to enable the grsec_lock entry once you have finished modifying
68955 + the sysctl entries.
68956 +
68957 +endmenu
68958 +menu "Logging Options"
68959 +depends on GRKERNSEC
68960 +
68961 +config GRKERNSEC_FLOODTIME
68962 + int "Seconds in between log messages (minimum)"
68963 + default 10
68964 + help
68965 + This option allows you to enforce the number of seconds between
68966 + grsecurity log messages. The default should be suitable for most
68967 + people, however, if you choose to change it, choose a value small enough
68968 + to allow informative logs to be produced, but large enough to
68969 + prevent flooding.
68970 +
68971 + Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
68972 + any rate limiting on grsecurity log messages.
68973 +
68974 +config GRKERNSEC_FLOODBURST
68975 + int "Number of messages in a burst (maximum)"
68976 + default 6
68977 + help
68978 + This option allows you to choose the maximum number of messages allowed
68979 + within the flood time interval you chose in a separate option. The
68980 + default should be suitable for most people, however if you find that
68981 + many of your logs are being interpreted as flooding, you may want to
68982 + raise this value.
68983 +
68984 + Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
68985 + any rate limiting on grsecurity log messages.
68986 +
68987 +endmenu
68988 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
68989 new file mode 100644
68990 index 0000000..30ababb
68991 --- /dev/null
68992 +++ b/grsecurity/Makefile
68993 @@ -0,0 +1,54 @@
68994 +# grsecurity – access control and security hardening for Linux
68995 +# All code in this directory and various hooks located throughout the Linux kernel are
68996 +# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
68997 +# http://www.grsecurity.net spender@grsecurity.net
68998 +#
68999 +# This program is free software; you can redistribute it and/or
69000 +# modify it under the terms of the GNU General Public License version 2
69001 +# as published by the Free Software Foundation.
69002 +#
69003 +# This program is distributed in the hope that it will be useful,
69004 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
69005 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69006 +# GNU General Public License for more details.
69007 +#
69008 +# You should have received a copy of the GNU General Public License
69009 +# along with this program; if not, write to the Free Software
69010 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69011 +
69012 +KBUILD_CFLAGS += -Werror
69013 +
69014 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69015 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
69016 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69017 + grsec_usb.o grsec_ipc.o grsec_proc.o
69018 +
69019 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69020 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69021 + gracl_learn.o grsec_log.o gracl_policy.o
69022 +ifdef CONFIG_COMPAT
69023 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69024 +endif
69025 +
69026 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69027 +
69028 +ifdef CONFIG_NET
69029 +obj-y += grsec_sock.o
69030 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69031 +endif
69032 +
69033 +ifndef CONFIG_GRKERNSEC
69034 +obj-y += grsec_disabled.o
69035 +endif
69036 +
69037 +ifdef CONFIG_GRKERNSEC_HIDESYM
69038 +extra-y := grsec_hidesym.o
69039 +$(obj)/grsec_hidesym.o:
69040 + @-chmod -f 500 /boot
69041 + @-chmod -f 500 /lib/modules
69042 + @-chmod -f 500 /lib64/modules
69043 + @-chmod -f 500 /lib32/modules
69044 + @-chmod -f 700 .
69045 + @-chmod -f 700 $(objtree)
69046 + @echo ' grsec: protected kernel image paths'
69047 +endif
69048 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69049 new file mode 100644
69050 index 0000000..6ae3aa0
69051 --- /dev/null
69052 +++ b/grsecurity/gracl.c
69053 @@ -0,0 +1,2703 @@
69054 +#include <linux/kernel.h>
69055 +#include <linux/module.h>
69056 +#include <linux/sched.h>
69057 +#include <linux/mm.h>
69058 +#include <linux/file.h>
69059 +#include <linux/fs.h>
69060 +#include <linux/namei.h>
69061 +#include <linux/mount.h>
69062 +#include <linux/tty.h>
69063 +#include <linux/proc_fs.h>
69064 +#include <linux/lglock.h>
69065 +#include <linux/slab.h>
69066 +#include <linux/vmalloc.h>
69067 +#include <linux/types.h>
69068 +#include <linux/sysctl.h>
69069 +#include <linux/netdevice.h>
69070 +#include <linux/ptrace.h>
69071 +#include <linux/gracl.h>
69072 +#include <linux/gralloc.h>
69073 +#include <linux/security.h>
69074 +#include <linux/grinternal.h>
69075 +#include <linux/pid_namespace.h>
69076 +#include <linux/stop_machine.h>
69077 +#include <linux/fdtable.h>
69078 +#include <linux/percpu.h>
69079 +#include <linux/lglock.h>
69080 +#include <linux/hugetlb.h>
69081 +#include <linux/posix-timers.h>
69082 +#include <linux/prefetch.h>
69083 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69084 +#include <linux/magic.h>
69085 +#include <linux/pagemap.h>
69086 +#include "../fs/btrfs/async-thread.h"
69087 +#include "../fs/btrfs/ctree.h"
69088 +#include "../fs/btrfs/btrfs_inode.h"
69089 +#endif
69090 +#include "../fs/mount.h"
69091 +
69092 +#include <asm/uaccess.h>
69093 +#include <asm/errno.h>
69094 +#include <asm/mman.h>
69095 +
69096 +#define FOR_EACH_ROLE_START(role) \
69097 + role = running_polstate.role_list; \
69098 + while (role) {
69099 +
69100 +#define FOR_EACH_ROLE_END(role) \
69101 + role = role->prev; \
69102 + }
69103 +
69104 +extern struct path gr_real_root;
69105 +
69106 +static struct gr_policy_state running_polstate;
69107 +struct gr_policy_state *polstate = &running_polstate;
69108 +extern struct gr_alloc_state *current_alloc_state;
69109 +
69110 +extern char *gr_shared_page[4];
69111 +DEFINE_RWLOCK(gr_inode_lock);
69112 +
69113 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
69114 +
69115 +#ifdef CONFIG_NET
69116 +extern struct vfsmount *sock_mnt;
69117 +#endif
69118 +
69119 +extern struct vfsmount *pipe_mnt;
69120 +extern struct vfsmount *shm_mnt;
69121 +
69122 +#ifdef CONFIG_HUGETLBFS
69123 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69124 +#endif
69125 +
69126 +extern u16 acl_sp_role_value;
69127 +extern struct acl_object_label *fakefs_obj_rw;
69128 +extern struct acl_object_label *fakefs_obj_rwx;
69129 +
69130 +int gr_acl_is_enabled(void)
69131 +{
69132 + return (gr_status & GR_READY);
69133 +}
69134 +
69135 +void gr_enable_rbac_system(void)
69136 +{
69137 + pax_open_kernel();
69138 + gr_status |= GR_READY;
69139 + pax_close_kernel();
69140 +}
69141 +
69142 +int gr_rbac_disable(void *unused)
69143 +{
69144 + pax_open_kernel();
69145 + gr_status &= ~GR_READY;
69146 + pax_close_kernel();
69147 +
69148 + return 0;
69149 +}
69150 +
69151 +static inline dev_t __get_dev(const struct dentry *dentry)
69152 +{
69153 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69154 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69155 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
69156 + else
69157 +#endif
69158 + return dentry->d_sb->s_dev;
69159 +}
69160 +
69161 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69162 +{
69163 + return __get_dev(dentry);
69164 +}
69165 +
69166 +static char gr_task_roletype_to_char(struct task_struct *task)
69167 +{
69168 + switch (task->role->roletype &
69169 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69170 + GR_ROLE_SPECIAL)) {
69171 + case GR_ROLE_DEFAULT:
69172 + return 'D';
69173 + case GR_ROLE_USER:
69174 + return 'U';
69175 + case GR_ROLE_GROUP:
69176 + return 'G';
69177 + case GR_ROLE_SPECIAL:
69178 + return 'S';
69179 + }
69180 +
69181 + return 'X';
69182 +}
69183 +
69184 +char gr_roletype_to_char(void)
69185 +{
69186 + return gr_task_roletype_to_char(current);
69187 +}
69188 +
69189 +__inline__ int
69190 +gr_acl_tpe_check(void)
69191 +{
69192 + if (unlikely(!(gr_status & GR_READY)))
69193 + return 0;
69194 + if (current->role->roletype & GR_ROLE_TPE)
69195 + return 1;
69196 + else
69197 + return 0;
69198 +}
69199 +
69200 +int
69201 +gr_handle_rawio(const struct inode *inode)
69202 +{
69203 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69204 + if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69205 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69206 + !capable(CAP_SYS_RAWIO))
69207 + return 1;
69208 +#endif
69209 + return 0;
69210 +}
69211 +
69212 +int
69213 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69214 +{
69215 + if (likely(lena != lenb))
69216 + return 0;
69217 +
69218 + return !memcmp(a, b, lena);
69219 +}
69220 +
69221 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69222 +{
69223 + *buflen -= namelen;
69224 + if (*buflen < 0)
69225 + return -ENAMETOOLONG;
69226 + *buffer -= namelen;
69227 + memcpy(*buffer, str, namelen);
69228 + return 0;
69229 +}
69230 +
69231 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
69232 +{
69233 + return prepend(buffer, buflen, name->name, name->len);
69234 +}
69235 +
69236 +static int prepend_path(const struct path *path, struct path *root,
69237 + char **buffer, int *buflen)
69238 +{
69239 + struct dentry *dentry = path->dentry;
69240 + struct vfsmount *vfsmnt = path->mnt;
69241 + struct mount *mnt = real_mount(vfsmnt);
69242 + bool slash = false;
69243 + int error = 0;
69244 +
69245 + while (dentry != root->dentry || vfsmnt != root->mnt) {
69246 + struct dentry * parent;
69247 +
69248 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
69249 + /* Global root? */
69250 + if (!mnt_has_parent(mnt)) {
69251 + goto out;
69252 + }
69253 + dentry = mnt->mnt_mountpoint;
69254 + mnt = mnt->mnt_parent;
69255 + vfsmnt = &mnt->mnt;
69256 + continue;
69257 + }
69258 + parent = dentry->d_parent;
69259 + prefetch(parent);
69260 + spin_lock(&dentry->d_lock);
69261 + error = prepend_name(buffer, buflen, &dentry->d_name);
69262 + spin_unlock(&dentry->d_lock);
69263 + if (!error)
69264 + error = prepend(buffer, buflen, "/", 1);
69265 + if (error)
69266 + break;
69267 +
69268 + slash = true;
69269 + dentry = parent;
69270 + }
69271 +
69272 +out:
69273 + if (!error && !slash)
69274 + error = prepend(buffer, buflen, "/", 1);
69275 +
69276 + return error;
69277 +}
69278 +
69279 +/* this must be called with mount_lock and rename_lock held */
69280 +
69281 +static char *__our_d_path(const struct path *path, struct path *root,
69282 + char *buf, int buflen)
69283 +{
69284 + char *res = buf + buflen;
69285 + int error;
69286 +
69287 + prepend(&res, &buflen, "\0", 1);
69288 + error = prepend_path(path, root, &res, &buflen);
69289 + if (error)
69290 + return ERR_PTR(error);
69291 +
69292 + return res;
69293 +}
69294 +
69295 +static char *
69296 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
69297 +{
69298 + char *retval;
69299 +
69300 + retval = __our_d_path(path, root, buf, buflen);
69301 + if (unlikely(IS_ERR(retval)))
69302 + retval = strcpy(buf, "<path too long>");
69303 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
69304 + retval[1] = '\0';
69305 +
69306 + return retval;
69307 +}
69308 +
69309 +static char *
69310 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69311 + char *buf, int buflen)
69312 +{
69313 + struct path path;
69314 + char *res;
69315 +
69316 + path.dentry = (struct dentry *)dentry;
69317 + path.mnt = (struct vfsmount *)vfsmnt;
69318 +
69319 + /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
69320 + by the RBAC system */
69321 + res = gen_full_path(&path, &gr_real_root, buf, buflen);
69322 +
69323 + return res;
69324 +}
69325 +
69326 +static char *
69327 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69328 + char *buf, int buflen)
69329 +{
69330 + char *res;
69331 + struct path path;
69332 + struct path root;
69333 + struct task_struct *reaper = init_pid_ns.child_reaper;
69334 +
69335 + path.dentry = (struct dentry *)dentry;
69336 + path.mnt = (struct vfsmount *)vfsmnt;
69337 +
69338 + /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
69339 + get_fs_root(reaper->fs, &root);
69340 +
69341 + read_seqlock_excl(&mount_lock);
69342 + write_seqlock(&rename_lock);
69343 + res = gen_full_path(&path, &root, buf, buflen);
69344 + write_sequnlock(&rename_lock);
69345 + read_sequnlock_excl(&mount_lock);
69346 +
69347 + path_put(&root);
69348 + return res;
69349 +}
69350 +
69351 +char *
69352 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69353 +{
69354 + char *ret;
69355 + read_seqlock_excl(&mount_lock);
69356 + write_seqlock(&rename_lock);
69357 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69358 + PAGE_SIZE);
69359 + write_sequnlock(&rename_lock);
69360 + read_sequnlock_excl(&mount_lock);
69361 + return ret;
69362 +}
69363 +
69364 +static char *
69365 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69366 +{
69367 + char *ret;
69368 + char *buf;
69369 + int buflen;
69370 +
69371 + read_seqlock_excl(&mount_lock);
69372 + write_seqlock(&rename_lock);
69373 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
69374 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
69375 + buflen = (int)(ret - buf);
69376 + if (buflen >= 5)
69377 + prepend(&ret, &buflen, "/proc", 5);
69378 + else
69379 + ret = strcpy(buf, "<path too long>");
69380 + write_sequnlock(&rename_lock);
69381 + read_sequnlock_excl(&mount_lock);
69382 + return ret;
69383 +}
69384 +
69385 +char *
69386 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
69387 +{
69388 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69389 + PAGE_SIZE);
69390 +}
69391 +
69392 +char *
69393 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
69394 +{
69395 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69396 + PAGE_SIZE);
69397 +}
69398 +
69399 +char *
69400 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
69401 +{
69402 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
69403 + PAGE_SIZE);
69404 +}
69405 +
69406 +char *
69407 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
69408 +{
69409 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
69410 + PAGE_SIZE);
69411 +}
69412 +
69413 +char *
69414 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
69415 +{
69416 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
69417 + PAGE_SIZE);
69418 +}
69419 +
69420 +__inline__ __u32
69421 +to_gr_audit(const __u32 reqmode)
69422 +{
69423 + /* masks off auditable permission flags, then shifts them to create
69424 + auditing flags, and adds the special case of append auditing if
69425 + we're requesting write */
69426 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
69427 +}
69428 +
69429 +struct acl_role_label *
69430 +__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
69431 + const gid_t gid)
69432 +{
69433 + unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
69434 + struct acl_role_label *match;
69435 + struct role_allowed_ip *ipp;
69436 + unsigned int x;
69437 + u32 curr_ip = task->signal->saved_ip;
69438 +
69439 + match = state->acl_role_set.r_hash[index];
69440 +
69441 + while (match) {
69442 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
69443 + for (x = 0; x < match->domain_child_num; x++) {
69444 + if (match->domain_children[x] == uid)
69445 + goto found;
69446 + }
69447 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
69448 + break;
69449 + match = match->next;
69450 + }
69451 +found:
69452 + if (match == NULL) {
69453 + try_group:
69454 + index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
69455 + match = state->acl_role_set.r_hash[index];
69456 +
69457 + while (match) {
69458 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
69459 + for (x = 0; x < match->domain_child_num; x++) {
69460 + if (match->domain_children[x] == gid)
69461 + goto found2;
69462 + }
69463 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
69464 + break;
69465 + match = match->next;
69466 + }
69467 +found2:
69468 + if (match == NULL)
69469 + match = state->default_role;
69470 + if (match->allowed_ips == NULL)
69471 + return match;
69472 + else {
69473 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69474 + if (likely
69475 + ((ntohl(curr_ip) & ipp->netmask) ==
69476 + (ntohl(ipp->addr) & ipp->netmask)))
69477 + return match;
69478 + }
69479 + match = state->default_role;
69480 + }
69481 + } else if (match->allowed_ips == NULL) {
69482 + return match;
69483 + } else {
69484 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69485 + if (likely
69486 + ((ntohl(curr_ip) & ipp->netmask) ==
69487 + (ntohl(ipp->addr) & ipp->netmask)))
69488 + return match;
69489 + }
69490 + goto try_group;
69491 + }
69492 +
69493 + return match;
69494 +}
69495 +
69496 +static struct acl_role_label *
69497 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
69498 + const gid_t gid)
69499 +{
69500 + return __lookup_acl_role_label(&running_polstate, task, uid, gid);
69501 +}
69502 +
69503 +struct acl_subject_label *
69504 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
69505 + const struct acl_role_label *role)
69506 +{
69507 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69508 + struct acl_subject_label *match;
69509 +
69510 + match = role->subj_hash[index];
69511 +
69512 + while (match && (match->inode != ino || match->device != dev ||
69513 + (match->mode & GR_DELETED))) {
69514 + match = match->next;
69515 + }
69516 +
69517 + if (match && !(match->mode & GR_DELETED))
69518 + return match;
69519 + else
69520 + return NULL;
69521 +}
69522 +
69523 +struct acl_subject_label *
69524 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
69525 + const struct acl_role_label *role)
69526 +{
69527 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69528 + struct acl_subject_label *match;
69529 +
69530 + match = role->subj_hash[index];
69531 +
69532 + while (match && (match->inode != ino || match->device != dev ||
69533 + !(match->mode & GR_DELETED))) {
69534 + match = match->next;
69535 + }
69536 +
69537 + if (match && (match->mode & GR_DELETED))
69538 + return match;
69539 + else
69540 + return NULL;
69541 +}
69542 +
69543 +static struct acl_object_label *
69544 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
69545 + const struct acl_subject_label *subj)
69546 +{
69547 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69548 + struct acl_object_label *match;
69549 +
69550 + match = subj->obj_hash[index];
69551 +
69552 + while (match && (match->inode != ino || match->device != dev ||
69553 + (match->mode & GR_DELETED))) {
69554 + match = match->next;
69555 + }
69556 +
69557 + if (match && !(match->mode & GR_DELETED))
69558 + return match;
69559 + else
69560 + return NULL;
69561 +}
69562 +
69563 +static struct acl_object_label *
69564 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
69565 + const struct acl_subject_label *subj)
69566 +{
69567 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69568 + struct acl_object_label *match;
69569 +
69570 + match = subj->obj_hash[index];
69571 +
69572 + while (match && (match->inode != ino || match->device != dev ||
69573 + !(match->mode & GR_DELETED))) {
69574 + match = match->next;
69575 + }
69576 +
69577 + if (match && (match->mode & GR_DELETED))
69578 + return match;
69579 +
69580 + match = subj->obj_hash[index];
69581 +
69582 + while (match && (match->inode != ino || match->device != dev ||
69583 + (match->mode & GR_DELETED))) {
69584 + match = match->next;
69585 + }
69586 +
69587 + if (match && !(match->mode & GR_DELETED))
69588 + return match;
69589 + else
69590 + return NULL;
69591 +}
69592 +
69593 +struct name_entry *
69594 +__lookup_name_entry(const struct gr_policy_state *state, const char *name)
69595 +{
69596 + unsigned int len = strlen(name);
69597 + unsigned int key = full_name_hash(name, len);
69598 + unsigned int index = key % state->name_set.n_size;
69599 + struct name_entry *match;
69600 +
69601 + match = state->name_set.n_hash[index];
69602 +
69603 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
69604 + match = match->next;
69605 +
69606 + return match;
69607 +}
69608 +
69609 +static struct name_entry *
69610 +lookup_name_entry(const char *name)
69611 +{
69612 + return __lookup_name_entry(&running_polstate, name);
69613 +}
69614 +
69615 +static struct name_entry *
69616 +lookup_name_entry_create(const char *name)
69617 +{
69618 + unsigned int len = strlen(name);
69619 + unsigned int key = full_name_hash(name, len);
69620 + unsigned int index = key % running_polstate.name_set.n_size;
69621 + struct name_entry *match;
69622 +
69623 + match = running_polstate.name_set.n_hash[index];
69624 +
69625 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69626 + !match->deleted))
69627 + match = match->next;
69628 +
69629 + if (match && match->deleted)
69630 + return match;
69631 +
69632 + match = running_polstate.name_set.n_hash[index];
69633 +
69634 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69635 + match->deleted))
69636 + match = match->next;
69637 +
69638 + if (match && !match->deleted)
69639 + return match;
69640 + else
69641 + return NULL;
69642 +}
69643 +
69644 +static struct inodev_entry *
69645 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
69646 +{
69647 + unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
69648 + struct inodev_entry *match;
69649 +
69650 + match = running_polstate.inodev_set.i_hash[index];
69651 +
69652 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
69653 + match = match->next;
69654 +
69655 + return match;
69656 +}
69657 +
69658 +void
69659 +__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
69660 +{
69661 + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
69662 + state->inodev_set.i_size);
69663 + struct inodev_entry **curr;
69664 +
69665 + entry->prev = NULL;
69666 +
69667 + curr = &state->inodev_set.i_hash[index];
69668 + if (*curr != NULL)
69669 + (*curr)->prev = entry;
69670 +
69671 + entry->next = *curr;
69672 + *curr = entry;
69673 +
69674 + return;
69675 +}
69676 +
69677 +static void
69678 +insert_inodev_entry(struct inodev_entry *entry)
69679 +{
69680 + __insert_inodev_entry(&running_polstate, entry);
69681 +}
69682 +
69683 +void
69684 +insert_acl_obj_label(struct acl_object_label *obj,
69685 + struct acl_subject_label *subj)
69686 +{
69687 + unsigned int index =
69688 + gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
69689 + struct acl_object_label **curr;
69690 +
69691 + obj->prev = NULL;
69692 +
69693 + curr = &subj->obj_hash[index];
69694 + if (*curr != NULL)
69695 + (*curr)->prev = obj;
69696 +
69697 + obj->next = *curr;
69698 + *curr = obj;
69699 +
69700 + return;
69701 +}
69702 +
69703 +void
69704 +insert_acl_subj_label(struct acl_subject_label *obj,
69705 + struct acl_role_label *role)
69706 +{
69707 + unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
69708 + struct acl_subject_label **curr;
69709 +
69710 + obj->prev = NULL;
69711 +
69712 + curr = &role->subj_hash[index];
69713 + if (*curr != NULL)
69714 + (*curr)->prev = obj;
69715 +
69716 + obj->next = *curr;
69717 + *curr = obj;
69718 +
69719 + return;
69720 +}
69721 +
69722 +/* derived from glibc fnmatch() 0: match, 1: no match*/
69723 +
69724 +static int
69725 +glob_match(const char *p, const char *n)
69726 +{
69727 + char c;
69728 +
69729 + while ((c = *p++) != '\0') {
69730 + switch (c) {
69731 + case '?':
69732 + if (*n == '\0')
69733 + return 1;
69734 + else if (*n == '/')
69735 + return 1;
69736 + break;
69737 + case '\\':
69738 + if (*n != c)
69739 + return 1;
69740 + break;
69741 + case '*':
69742 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
69743 + if (*n == '/')
69744 + return 1;
69745 + else if (c == '?') {
69746 + if (*n == '\0')
69747 + return 1;
69748 + else
69749 + ++n;
69750 + }
69751 + }
69752 + if (c == '\0') {
69753 + return 0;
69754 + } else {
69755 + const char *endp;
69756 +
69757 + if ((endp = strchr(n, '/')) == NULL)
69758 + endp = n + strlen(n);
69759 +
69760 + if (c == '[') {
69761 + for (--p; n < endp; ++n)
69762 + if (!glob_match(p, n))
69763 + return 0;
69764 + } else if (c == '/') {
69765 + while (*n != '\0' && *n != '/')
69766 + ++n;
69767 + if (*n == '/' && !glob_match(p, n + 1))
69768 + return 0;
69769 + } else {
69770 + for (--p; n < endp; ++n)
69771 + if (*n == c && !glob_match(p, n))
69772 + return 0;
69773 + }
69774 +
69775 + return 1;
69776 + }
69777 + case '[':
69778 + {
69779 + int not;
69780 + char cold;
69781 +
69782 + if (*n == '\0' || *n == '/')
69783 + return 1;
69784 +
69785 + not = (*p == '!' || *p == '^');
69786 + if (not)
69787 + ++p;
69788 +
69789 + c = *p++;
69790 + for (;;) {
69791 + unsigned char fn = (unsigned char)*n;
69792 +
69793 + if (c == '\0')
69794 + return 1;
69795 + else {
69796 + if (c == fn)
69797 + goto matched;
69798 + cold = c;
69799 + c = *p++;
69800 +
69801 + if (c == '-' && *p != ']') {
69802 + unsigned char cend = *p++;
69803 +
69804 + if (cend == '\0')
69805 + return 1;
69806 +
69807 + if (cold <= fn && fn <= cend)
69808 + goto matched;
69809 +
69810 + c = *p++;
69811 + }
69812 + }
69813 +
69814 + if (c == ']')
69815 + break;
69816 + }
69817 + if (!not)
69818 + return 1;
69819 + break;
69820 + matched:
69821 + while (c != ']') {
69822 + if (c == '\0')
69823 + return 1;
69824 +
69825 + c = *p++;
69826 + }
69827 + if (not)
69828 + return 1;
69829 + }
69830 + break;
69831 + default:
69832 + if (c != *n)
69833 + return 1;
69834 + }
69835 +
69836 + ++n;
69837 + }
69838 +
69839 + if (*n == '\0')
69840 + return 0;
69841 +
69842 + if (*n == '/')
69843 + return 0;
69844 +
69845 + return 1;
69846 +}
69847 +
69848 +static struct acl_object_label *
69849 +chk_glob_label(struct acl_object_label *globbed,
69850 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
69851 +{
69852 + struct acl_object_label *tmp;
69853 +
69854 + if (*path == NULL)
69855 + *path = gr_to_filename_nolock(dentry, mnt);
69856 +
69857 + tmp = globbed;
69858 +
69859 + while (tmp) {
69860 + if (!glob_match(tmp->filename, *path))
69861 + return tmp;
69862 + tmp = tmp->next;
69863 + }
69864 +
69865 + return NULL;
69866 +}
69867 +
69868 +static struct acl_object_label *
69869 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
69870 + const ino_t curr_ino, const dev_t curr_dev,
69871 + const struct acl_subject_label *subj, char **path, const int checkglob)
69872 +{
69873 + struct acl_subject_label *tmpsubj;
69874 + struct acl_object_label *retval;
69875 + struct acl_object_label *retval2;
69876 +
69877 + tmpsubj = (struct acl_subject_label *) subj;
69878 + read_lock(&gr_inode_lock);
69879 + do {
69880 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
69881 + if (retval) {
69882 + if (checkglob && retval->globbed) {
69883 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
69884 + if (retval2)
69885 + retval = retval2;
69886 + }
69887 + break;
69888 + }
69889 + } while ((tmpsubj = tmpsubj->parent_subject));
69890 + read_unlock(&gr_inode_lock);
69891 +
69892 + return retval;
69893 +}
69894 +
69895 +static __inline__ struct acl_object_label *
69896 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
69897 + struct dentry *curr_dentry,
69898 + const struct acl_subject_label *subj, char **path, const int checkglob)
69899 +{
69900 + int newglob = checkglob;
69901 + ino_t inode;
69902 + dev_t device;
69903 +
69904 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
69905 + as we don't want a / * rule to match instead of the / object
69906 + don't do this for create lookups that call this function though, since they're looking up
69907 + on the parent and thus need globbing checks on all paths
69908 + */
69909 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
69910 + newglob = GR_NO_GLOB;
69911 +
69912 + spin_lock(&curr_dentry->d_lock);
69913 + inode = curr_dentry->d_inode->i_ino;
69914 + device = __get_dev(curr_dentry);
69915 + spin_unlock(&curr_dentry->d_lock);
69916 +
69917 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
69918 +}
69919 +
69920 +#ifdef CONFIG_HUGETLBFS
69921 +static inline bool
69922 +is_hugetlbfs_mnt(const struct vfsmount *mnt)
69923 +{
69924 + int i;
69925 + for (i = 0; i < HUGE_MAX_HSTATE; i++) {
69926 + if (unlikely(hugetlbfs_vfsmount[i] == mnt))
69927 + return true;
69928 + }
69929 +
69930 + return false;
69931 +}
69932 +#endif
69933 +
69934 +static struct acl_object_label *
69935 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
69936 + const struct acl_subject_label *subj, char *path, const int checkglob)
69937 +{
69938 + struct dentry *dentry = (struct dentry *) l_dentry;
69939 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
69940 + struct mount *real_mnt = real_mount(mnt);
69941 + struct acl_object_label *retval;
69942 + struct dentry *parent;
69943 +
69944 + read_seqlock_excl(&mount_lock);
69945 + write_seqlock(&rename_lock);
69946 +
69947 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
69948 +#ifdef CONFIG_NET
69949 + mnt == sock_mnt ||
69950 +#endif
69951 +#ifdef CONFIG_HUGETLBFS
69952 + (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
69953 +#endif
69954 + /* ignore Eric Biederman */
69955 + IS_PRIVATE(l_dentry->d_inode))) {
69956 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
69957 + goto out;
69958 + }
69959 +
69960 + for (;;) {
69961 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
69962 + break;
69963 +
69964 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
69965 + if (!mnt_has_parent(real_mnt))
69966 + break;
69967 +
69968 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
69969 + if (retval != NULL)
69970 + goto out;
69971 +
69972 + dentry = real_mnt->mnt_mountpoint;
69973 + real_mnt = real_mnt->mnt_parent;
69974 + mnt = &real_mnt->mnt;
69975 + continue;
69976 + }
69977 +
69978 + parent = dentry->d_parent;
69979 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
69980 + if (retval != NULL)
69981 + goto out;
69982 +
69983 + dentry = parent;
69984 + }
69985 +
69986 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
69987 +
69988 + /* gr_real_root is pinned so we don't have to hold a reference */
69989 + if (retval == NULL)
69990 + retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
69991 +out:
69992 + write_sequnlock(&rename_lock);
69993 + read_sequnlock_excl(&mount_lock);
69994 +
69995 + BUG_ON(retval == NULL);
69996 +
69997 + return retval;
69998 +}
69999 +
70000 +static __inline__ struct acl_object_label *
70001 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70002 + const struct acl_subject_label *subj)
70003 +{
70004 + char *path = NULL;
70005 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70006 +}
70007 +
70008 +static __inline__ struct acl_object_label *
70009 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70010 + const struct acl_subject_label *subj)
70011 +{
70012 + char *path = NULL;
70013 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70014 +}
70015 +
70016 +static __inline__ struct acl_object_label *
70017 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70018 + const struct acl_subject_label *subj, char *path)
70019 +{
70020 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70021 +}
70022 +
70023 +struct acl_subject_label *
70024 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70025 + const struct acl_role_label *role)
70026 +{
70027 + struct dentry *dentry = (struct dentry *) l_dentry;
70028 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70029 + struct mount *real_mnt = real_mount(mnt);
70030 + struct acl_subject_label *retval;
70031 + struct dentry *parent;
70032 +
70033 + read_seqlock_excl(&mount_lock);
70034 + write_seqlock(&rename_lock);
70035 +
70036 + for (;;) {
70037 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70038 + break;
70039 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70040 + if (!mnt_has_parent(real_mnt))
70041 + break;
70042 +
70043 + spin_lock(&dentry->d_lock);
70044 + read_lock(&gr_inode_lock);
70045 + retval =
70046 + lookup_acl_subj_label(dentry->d_inode->i_ino,
70047 + __get_dev(dentry), role);
70048 + read_unlock(&gr_inode_lock);
70049 + spin_unlock(&dentry->d_lock);
70050 + if (retval != NULL)
70051 + goto out;
70052 +
70053 + dentry = real_mnt->mnt_mountpoint;
70054 + real_mnt = real_mnt->mnt_parent;
70055 + mnt = &real_mnt->mnt;
70056 + continue;
70057 + }
70058 +
70059 + spin_lock(&dentry->d_lock);
70060 + read_lock(&gr_inode_lock);
70061 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70062 + __get_dev(dentry), role);
70063 + read_unlock(&gr_inode_lock);
70064 + parent = dentry->d_parent;
70065 + spin_unlock(&dentry->d_lock);
70066 +
70067 + if (retval != NULL)
70068 + goto out;
70069 +
70070 + dentry = parent;
70071 + }
70072 +
70073 + spin_lock(&dentry->d_lock);
70074 + read_lock(&gr_inode_lock);
70075 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70076 + __get_dev(dentry), role);
70077 + read_unlock(&gr_inode_lock);
70078 + spin_unlock(&dentry->d_lock);
70079 +
70080 + if (unlikely(retval == NULL)) {
70081 + /* gr_real_root is pinned, we don't need to hold a reference */
70082 + read_lock(&gr_inode_lock);
70083 + retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
70084 + __get_dev(gr_real_root.dentry), role);
70085 + read_unlock(&gr_inode_lock);
70086 + }
70087 +out:
70088 + write_sequnlock(&rename_lock);
70089 + read_sequnlock_excl(&mount_lock);
70090 +
70091 + BUG_ON(retval == NULL);
70092 +
70093 + return retval;
70094 +}
70095 +
70096 +void
70097 +assign_special_role(const char *rolename)
70098 +{
70099 + struct acl_object_label *obj;
70100 + struct acl_role_label *r;
70101 + struct acl_role_label *assigned = NULL;
70102 + struct task_struct *tsk;
70103 + struct file *filp;
70104 +
70105 + FOR_EACH_ROLE_START(r)
70106 + if (!strcmp(rolename, r->rolename) &&
70107 + (r->roletype & GR_ROLE_SPECIAL)) {
70108 + assigned = r;
70109 + break;
70110 + }
70111 + FOR_EACH_ROLE_END(r)
70112 +
70113 + if (!assigned)
70114 + return;
70115 +
70116 + read_lock(&tasklist_lock);
70117 + read_lock(&grsec_exec_file_lock);
70118 +
70119 + tsk = current->real_parent;
70120 + if (tsk == NULL)
70121 + goto out_unlock;
70122 +
70123 + filp = tsk->exec_file;
70124 + if (filp == NULL)
70125 + goto out_unlock;
70126 +
70127 + tsk->is_writable = 0;
70128 + tsk->inherited = 0;
70129 +
70130 + tsk->acl_sp_role = 1;
70131 + tsk->acl_role_id = ++acl_sp_role_value;
70132 + tsk->role = assigned;
70133 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70134 +
70135 + /* ignore additional mmap checks for processes that are writable
70136 + by the default ACL */
70137 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70138 + if (unlikely(obj->mode & GR_WRITE))
70139 + tsk->is_writable = 1;
70140 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70141 + if (unlikely(obj->mode & GR_WRITE))
70142 + tsk->is_writable = 1;
70143 +
70144 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70145 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70146 + tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70147 +#endif
70148 +
70149 +out_unlock:
70150 + read_unlock(&grsec_exec_file_lock);
70151 + read_unlock(&tasklist_lock);
70152 + return;
70153 +}
70154 +
70155 +
70156 +static void
70157 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70158 +{
70159 + struct task_struct *task = current;
70160 + const struct cred *cred = current_cred();
70161 +
70162 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70163 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70164 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70165 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70166 +
70167 + return;
70168 +}
70169 +
70170 +static void
70171 +gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70172 +{
70173 + struct task_struct *task = current;
70174 + const struct cred *cred = current_cred();
70175 +
70176 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70177 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70178 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70179 + 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70180 +
70181 + return;
70182 +}
70183 +
70184 +static void
70185 +gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70186 +{
70187 + struct task_struct *task = current;
70188 + const struct cred *cred = current_cred();
70189 +
70190 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70191 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70192 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70193 + 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70194 +
70195 + return;
70196 +}
70197 +
70198 +static void
70199 +gr_set_proc_res(struct task_struct *task)
70200 +{
70201 + struct acl_subject_label *proc;
70202 + unsigned short i;
70203 +
70204 + proc = task->acl;
70205 +
70206 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70207 + return;
70208 +
70209 + for (i = 0; i < RLIM_NLIMITS; i++) {
70210 + if (!(proc->resmask & (1U << i)))
70211 + continue;
70212 +
70213 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
70214 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
70215 +
70216 + if (i == RLIMIT_CPU)
70217 + update_rlimit_cpu(task, proc->res[i].rlim_cur);
70218 + }
70219 +
70220 + return;
70221 +}
70222 +
70223 +/* both of the below must be called with
70224 + rcu_read_lock();
70225 + read_lock(&tasklist_lock);
70226 + read_lock(&grsec_exec_file_lock);
70227 +*/
70228 +
70229 +struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
70230 +{
70231 + char *tmpname;
70232 + struct acl_subject_label *tmpsubj;
70233 + struct file *filp;
70234 + struct name_entry *nmatch;
70235 +
70236 + filp = task->exec_file;
70237 + if (filp == NULL)
70238 + return NULL;
70239 +
70240 + /* the following is to apply the correct subject
70241 + on binaries running when the RBAC system
70242 + is enabled, when the binaries have been
70243 + replaced or deleted since their execution
70244 + -----
70245 + when the RBAC system starts, the inode/dev
70246 + from exec_file will be one the RBAC system
70247 + is unaware of. It only knows the inode/dev
70248 + of the present file on disk, or the absence
70249 + of it.
70250 + */
70251 +
70252 + if (filename)
70253 + nmatch = __lookup_name_entry(state, filename);
70254 + else {
70255 + preempt_disable();
70256 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
70257 +
70258 + nmatch = __lookup_name_entry(state, tmpname);
70259 + preempt_enable();
70260 + }
70261 + tmpsubj = NULL;
70262 + if (nmatch) {
70263 + if (nmatch->deleted)
70264 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
70265 + else
70266 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
70267 + }
70268 + /* this also works for the reload case -- if we don't match a potentially inherited subject
70269 + then we fall back to a normal lookup based on the binary's ino/dev
70270 + */
70271 + if (tmpsubj == NULL)
70272 + tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
70273 +
70274 + return tmpsubj;
70275 +}
70276 +
70277 +static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
70278 +{
70279 + return __gr_get_subject_for_task(&running_polstate, task, filename);
70280 +}
70281 +
70282 +void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
70283 +{
70284 + struct acl_object_label *obj;
70285 + struct file *filp;
70286 +
70287 + filp = task->exec_file;
70288 +
70289 + task->acl = subj;
70290 + task->is_writable = 0;
70291 + /* ignore additional mmap checks for processes that are writable
70292 + by the default ACL */
70293 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
70294 + if (unlikely(obj->mode & GR_WRITE))
70295 + task->is_writable = 1;
70296 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70297 + if (unlikely(obj->mode & GR_WRITE))
70298 + task->is_writable = 1;
70299 +
70300 + gr_set_proc_res(task);
70301 +
70302 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70303 + 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);
70304 +#endif
70305 +}
70306 +
70307 +static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
70308 +{
70309 + __gr_apply_subject_to_task(&running_polstate, task, subj);
70310 +}
70311 +
70312 +__u32
70313 +gr_search_file(const struct dentry * dentry, const __u32 mode,
70314 + const struct vfsmount * mnt)
70315 +{
70316 + __u32 retval = mode;
70317 + struct acl_subject_label *curracl;
70318 + struct acl_object_label *currobj;
70319 +
70320 + if (unlikely(!(gr_status & GR_READY)))
70321 + return (mode & ~GR_AUDITS);
70322 +
70323 + curracl = current->acl;
70324 +
70325 + currobj = chk_obj_label(dentry, mnt, curracl);
70326 + retval = currobj->mode & mode;
70327 +
70328 + /* if we're opening a specified transfer file for writing
70329 + (e.g. /dev/initctl), then transfer our role to init
70330 + */
70331 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
70332 + current->role->roletype & GR_ROLE_PERSIST)) {
70333 + struct task_struct *task = init_pid_ns.child_reaper;
70334 +
70335 + if (task->role != current->role) {
70336 + struct acl_subject_label *subj;
70337 +
70338 + task->acl_sp_role = 0;
70339 + task->acl_role_id = current->acl_role_id;
70340 + task->role = current->role;
70341 + rcu_read_lock();
70342 + read_lock(&grsec_exec_file_lock);
70343 + subj = gr_get_subject_for_task(task, NULL);
70344 + gr_apply_subject_to_task(task, subj);
70345 + read_unlock(&grsec_exec_file_lock);
70346 + rcu_read_unlock();
70347 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
70348 + }
70349 + }
70350 +
70351 + if (unlikely
70352 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
70353 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
70354 + __u32 new_mode = mode;
70355 +
70356 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70357 +
70358 + retval = new_mode;
70359 +
70360 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
70361 + new_mode |= GR_INHERIT;
70362 +
70363 + if (!(mode & GR_NOLEARN))
70364 + gr_log_learn(dentry, mnt, new_mode);
70365 + }
70366 +
70367 + return retval;
70368 +}
70369 +
70370 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
70371 + const struct dentry *parent,
70372 + const struct vfsmount *mnt)
70373 +{
70374 + struct name_entry *match;
70375 + struct acl_object_label *matchpo;
70376 + struct acl_subject_label *curracl;
70377 + char *path;
70378 +
70379 + if (unlikely(!(gr_status & GR_READY)))
70380 + return NULL;
70381 +
70382 + preempt_disable();
70383 + path = gr_to_filename_rbac(new_dentry, mnt);
70384 + match = lookup_name_entry_create(path);
70385 +
70386 + curracl = current->acl;
70387 +
70388 + if (match) {
70389 + read_lock(&gr_inode_lock);
70390 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
70391 + read_unlock(&gr_inode_lock);
70392 +
70393 + if (matchpo) {
70394 + preempt_enable();
70395 + return matchpo;
70396 + }
70397 + }
70398 +
70399 + // lookup parent
70400 +
70401 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
70402 +
70403 + preempt_enable();
70404 + return matchpo;
70405 +}
70406 +
70407 +__u32
70408 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
70409 + const struct vfsmount * mnt, const __u32 mode)
70410 +{
70411 + struct acl_object_label *matchpo;
70412 + __u32 retval;
70413 +
70414 + if (unlikely(!(gr_status & GR_READY)))
70415 + return (mode & ~GR_AUDITS);
70416 +
70417 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
70418 +
70419 + retval = matchpo->mode & mode;
70420 +
70421 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
70422 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70423 + __u32 new_mode = mode;
70424 +
70425 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70426 +
70427 + gr_log_learn(new_dentry, mnt, new_mode);
70428 + return new_mode;
70429 + }
70430 +
70431 + return retval;
70432 +}
70433 +
70434 +__u32
70435 +gr_check_link(const struct dentry * new_dentry,
70436 + const struct dentry * parent_dentry,
70437 + const struct vfsmount * parent_mnt,
70438 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
70439 +{
70440 + struct acl_object_label *obj;
70441 + __u32 oldmode, newmode;
70442 + __u32 needmode;
70443 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
70444 + GR_DELETE | GR_INHERIT;
70445 +
70446 + if (unlikely(!(gr_status & GR_READY)))
70447 + return (GR_CREATE | GR_LINK);
70448 +
70449 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
70450 + oldmode = obj->mode;
70451 +
70452 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
70453 + newmode = obj->mode;
70454 +
70455 + needmode = newmode & checkmodes;
70456 +
70457 + // old name for hardlink must have at least the permissions of the new name
70458 + if ((oldmode & needmode) != needmode)
70459 + goto bad;
70460 +
70461 + // if old name had restrictions/auditing, make sure the new name does as well
70462 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
70463 +
70464 + // don't allow hardlinking of suid/sgid/fcapped files without permission
70465 + if (is_privileged_binary(old_dentry))
70466 + needmode |= GR_SETID;
70467 +
70468 + if ((newmode & needmode) != needmode)
70469 + goto bad;
70470 +
70471 + // enforce minimum permissions
70472 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
70473 + return newmode;
70474 +bad:
70475 + needmode = oldmode;
70476 + if (is_privileged_binary(old_dentry))
70477 + needmode |= GR_SETID;
70478 +
70479 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
70480 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
70481 + return (GR_CREATE | GR_LINK);
70482 + } else if (newmode & GR_SUPPRESS)
70483 + return GR_SUPPRESS;
70484 + else
70485 + return 0;
70486 +}
70487 +
70488 +int
70489 +gr_check_hidden_task(const struct task_struct *task)
70490 +{
70491 + if (unlikely(!(gr_status & GR_READY)))
70492 + return 0;
70493 +
70494 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
70495 + return 1;
70496 +
70497 + return 0;
70498 +}
70499 +
70500 +int
70501 +gr_check_protected_task(const struct task_struct *task)
70502 +{
70503 + if (unlikely(!(gr_status & GR_READY) || !task))
70504 + return 0;
70505 +
70506 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70507 + task->acl != current->acl)
70508 + return 1;
70509 +
70510 + return 0;
70511 +}
70512 +
70513 +int
70514 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70515 +{
70516 + struct task_struct *p;
70517 + int ret = 0;
70518 +
70519 + if (unlikely(!(gr_status & GR_READY) || !pid))
70520 + return ret;
70521 +
70522 + read_lock(&tasklist_lock);
70523 + do_each_pid_task(pid, type, p) {
70524 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70525 + p->acl != current->acl) {
70526 + ret = 1;
70527 + goto out;
70528 + }
70529 + } while_each_pid_task(pid, type, p);
70530 +out:
70531 + read_unlock(&tasklist_lock);
70532 +
70533 + return ret;
70534 +}
70535 +
70536 +void
70537 +gr_copy_label(struct task_struct *tsk)
70538 +{
70539 + struct task_struct *p = current;
70540 +
70541 + tsk->inherited = p->inherited;
70542 + tsk->acl_sp_role = 0;
70543 + tsk->acl_role_id = p->acl_role_id;
70544 + tsk->acl = p->acl;
70545 + tsk->role = p->role;
70546 + tsk->signal->used_accept = 0;
70547 + tsk->signal->curr_ip = p->signal->curr_ip;
70548 + tsk->signal->saved_ip = p->signal->saved_ip;
70549 + if (p->exec_file)
70550 + get_file(p->exec_file);
70551 + tsk->exec_file = p->exec_file;
70552 + tsk->is_writable = p->is_writable;
70553 + if (unlikely(p->signal->used_accept)) {
70554 + p->signal->curr_ip = 0;
70555 + p->signal->saved_ip = 0;
70556 + }
70557 +
70558 + return;
70559 +}
70560 +
70561 +extern int gr_process_kernel_setuid_ban(struct user_struct *user);
70562 +
70563 +int
70564 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70565 +{
70566 + unsigned int i;
70567 + __u16 num;
70568 + uid_t *uidlist;
70569 + uid_t curuid;
70570 + int realok = 0;
70571 + int effectiveok = 0;
70572 + int fsok = 0;
70573 + uid_t globalreal, globaleffective, globalfs;
70574 +
70575 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
70576 + struct user_struct *user;
70577 +
70578 + if (!uid_valid(real))
70579 + goto skipit;
70580 +
70581 + /* find user based on global namespace */
70582 +
70583 + globalreal = GR_GLOBAL_UID(real);
70584 +
70585 + user = find_user(make_kuid(&init_user_ns, globalreal));
70586 + if (user == NULL)
70587 + goto skipit;
70588 +
70589 + if (gr_process_kernel_setuid_ban(user)) {
70590 + /* for find_user */
70591 + free_uid(user);
70592 + return 1;
70593 + }
70594 +
70595 + /* for find_user */
70596 + free_uid(user);
70597 +
70598 +skipit:
70599 +#endif
70600 +
70601 + if (unlikely(!(gr_status & GR_READY)))
70602 + return 0;
70603 +
70604 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70605 + gr_log_learn_uid_change(real, effective, fs);
70606 +
70607 + num = current->acl->user_trans_num;
70608 + uidlist = current->acl->user_transitions;
70609 +
70610 + if (uidlist == NULL)
70611 + return 0;
70612 +
70613 + if (!uid_valid(real)) {
70614 + realok = 1;
70615 + globalreal = (uid_t)-1;
70616 + } else {
70617 + globalreal = GR_GLOBAL_UID(real);
70618 + }
70619 + if (!uid_valid(effective)) {
70620 + effectiveok = 1;
70621 + globaleffective = (uid_t)-1;
70622 + } else {
70623 + globaleffective = GR_GLOBAL_UID(effective);
70624 + }
70625 + if (!uid_valid(fs)) {
70626 + fsok = 1;
70627 + globalfs = (uid_t)-1;
70628 + } else {
70629 + globalfs = GR_GLOBAL_UID(fs);
70630 + }
70631 +
70632 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
70633 + for (i = 0; i < num; i++) {
70634 + curuid = uidlist[i];
70635 + if (globalreal == curuid)
70636 + realok = 1;
70637 + if (globaleffective == curuid)
70638 + effectiveok = 1;
70639 + if (globalfs == curuid)
70640 + fsok = 1;
70641 + }
70642 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
70643 + for (i = 0; i < num; i++) {
70644 + curuid = uidlist[i];
70645 + if (globalreal == curuid)
70646 + break;
70647 + if (globaleffective == curuid)
70648 + break;
70649 + if (globalfs == curuid)
70650 + break;
70651 + }
70652 + /* not in deny list */
70653 + if (i == num) {
70654 + realok = 1;
70655 + effectiveok = 1;
70656 + fsok = 1;
70657 + }
70658 + }
70659 +
70660 + if (realok && effectiveok && fsok)
70661 + return 0;
70662 + else {
70663 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70664 + return 1;
70665 + }
70666 +}
70667 +
70668 +int
70669 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70670 +{
70671 + unsigned int i;
70672 + __u16 num;
70673 + gid_t *gidlist;
70674 + gid_t curgid;
70675 + int realok = 0;
70676 + int effectiveok = 0;
70677 + int fsok = 0;
70678 + gid_t globalreal, globaleffective, globalfs;
70679 +
70680 + if (unlikely(!(gr_status & GR_READY)))
70681 + return 0;
70682 +
70683 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70684 + gr_log_learn_gid_change(real, effective, fs);
70685 +
70686 + num = current->acl->group_trans_num;
70687 + gidlist = current->acl->group_transitions;
70688 +
70689 + if (gidlist == NULL)
70690 + return 0;
70691 +
70692 + if (!gid_valid(real)) {
70693 + realok = 1;
70694 + globalreal = (gid_t)-1;
70695 + } else {
70696 + globalreal = GR_GLOBAL_GID(real);
70697 + }
70698 + if (!gid_valid(effective)) {
70699 + effectiveok = 1;
70700 + globaleffective = (gid_t)-1;
70701 + } else {
70702 + globaleffective = GR_GLOBAL_GID(effective);
70703 + }
70704 + if (!gid_valid(fs)) {
70705 + fsok = 1;
70706 + globalfs = (gid_t)-1;
70707 + } else {
70708 + globalfs = GR_GLOBAL_GID(fs);
70709 + }
70710 +
70711 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
70712 + for (i = 0; i < num; i++) {
70713 + curgid = gidlist[i];
70714 + if (globalreal == curgid)
70715 + realok = 1;
70716 + if (globaleffective == curgid)
70717 + effectiveok = 1;
70718 + if (globalfs == curgid)
70719 + fsok = 1;
70720 + }
70721 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
70722 + for (i = 0; i < num; i++) {
70723 + curgid = gidlist[i];
70724 + if (globalreal == curgid)
70725 + break;
70726 + if (globaleffective == curgid)
70727 + break;
70728 + if (globalfs == curgid)
70729 + break;
70730 + }
70731 + /* not in deny list */
70732 + if (i == num) {
70733 + realok = 1;
70734 + effectiveok = 1;
70735 + fsok = 1;
70736 + }
70737 + }
70738 +
70739 + if (realok && effectiveok && fsok)
70740 + return 0;
70741 + else {
70742 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70743 + return 1;
70744 + }
70745 +}
70746 +
70747 +extern int gr_acl_is_capable(const int cap);
70748 +
70749 +void
70750 +gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
70751 +{
70752 + struct acl_role_label *role = task->role;
70753 + struct acl_subject_label *subj = NULL;
70754 + struct acl_object_label *obj;
70755 + struct file *filp;
70756 + uid_t uid;
70757 + gid_t gid;
70758 +
70759 + if (unlikely(!(gr_status & GR_READY)))
70760 + return;
70761 +
70762 + uid = GR_GLOBAL_UID(kuid);
70763 + gid = GR_GLOBAL_GID(kgid);
70764 +
70765 + filp = task->exec_file;
70766 +
70767 + /* kernel process, we'll give them the kernel role */
70768 + if (unlikely(!filp)) {
70769 + task->role = running_polstate.kernel_role;
70770 + task->acl = running_polstate.kernel_role->root_label;
70771 + return;
70772 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
70773 + /* save the current ip at time of role lookup so that the proper
70774 + IP will be learned for role_allowed_ip */
70775 + task->signal->saved_ip = task->signal->curr_ip;
70776 + role = lookup_acl_role_label(task, uid, gid);
70777 + }
70778 +
70779 + /* don't change the role if we're not a privileged process */
70780 + if (role && task->role != role &&
70781 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
70782 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
70783 + return;
70784 +
70785 + /* perform subject lookup in possibly new role
70786 + we can use this result below in the case where role == task->role
70787 + */
70788 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
70789 +
70790 + /* if we changed uid/gid, but result in the same role
70791 + and are using inheritance, don't lose the inherited subject
70792 + if current subject is other than what normal lookup
70793 + would result in, we arrived via inheritance, don't
70794 + lose subject
70795 + */
70796 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
70797 + (subj == task->acl)))
70798 + task->acl = subj;
70799 +
70800 + /* leave task->inherited unaffected */
70801 +
70802 + task->role = role;
70803 +
70804 + task->is_writable = 0;
70805 +
70806 + /* ignore additional mmap checks for processes that are writable
70807 + by the default ACL */
70808 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70809 + if (unlikely(obj->mode & GR_WRITE))
70810 + task->is_writable = 1;
70811 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70812 + if (unlikely(obj->mode & GR_WRITE))
70813 + task->is_writable = 1;
70814 +
70815 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70816 + 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);
70817 +#endif
70818 +
70819 + gr_set_proc_res(task);
70820 +
70821 + return;
70822 +}
70823 +
70824 +int
70825 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70826 + const int unsafe_flags)
70827 +{
70828 + struct task_struct *task = current;
70829 + struct acl_subject_label *newacl;
70830 + struct acl_object_label *obj;
70831 + __u32 retmode;
70832 +
70833 + if (unlikely(!(gr_status & GR_READY)))
70834 + return 0;
70835 +
70836 + newacl = chk_subj_label(dentry, mnt, task->role);
70837 +
70838 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
70839 + did an exec
70840 + */
70841 + rcu_read_lock();
70842 + read_lock(&tasklist_lock);
70843 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
70844 + (task->parent->acl->mode & GR_POVERRIDE))) {
70845 + read_unlock(&tasklist_lock);
70846 + rcu_read_unlock();
70847 + goto skip_check;
70848 + }
70849 + read_unlock(&tasklist_lock);
70850 + rcu_read_unlock();
70851 +
70852 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
70853 + !(task->role->roletype & GR_ROLE_GOD) &&
70854 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
70855 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70856 + if (unsafe_flags & LSM_UNSAFE_SHARE)
70857 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
70858 + else
70859 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
70860 + return -EACCES;
70861 + }
70862 +
70863 +skip_check:
70864 +
70865 + obj = chk_obj_label(dentry, mnt, task->acl);
70866 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
70867 +
70868 + if (!(task->acl->mode & GR_INHERITLEARN) &&
70869 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
70870 + if (obj->nested)
70871 + task->acl = obj->nested;
70872 + else
70873 + task->acl = newacl;
70874 + task->inherited = 0;
70875 + } else {
70876 + task->inherited = 1;
70877 + if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
70878 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
70879 + }
70880 +
70881 + task->is_writable = 0;
70882 +
70883 + /* ignore additional mmap checks for processes that are writable
70884 + by the default ACL */
70885 + obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
70886 + if (unlikely(obj->mode & GR_WRITE))
70887 + task->is_writable = 1;
70888 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
70889 + if (unlikely(obj->mode & GR_WRITE))
70890 + task->is_writable = 1;
70891 +
70892 + gr_set_proc_res(task);
70893 +
70894 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70895 + 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);
70896 +#endif
70897 + return 0;
70898 +}
70899 +
70900 +/* always called with valid inodev ptr */
70901 +static void
70902 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
70903 +{
70904 + struct acl_object_label *matchpo;
70905 + struct acl_subject_label *matchps;
70906 + struct acl_subject_label *subj;
70907 + struct acl_role_label *role;
70908 + unsigned int x;
70909 +
70910 + FOR_EACH_ROLE_START(role)
70911 + FOR_EACH_SUBJECT_START(role, subj, x)
70912 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
70913 + matchpo->mode |= GR_DELETED;
70914 + FOR_EACH_SUBJECT_END(subj,x)
70915 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
70916 + /* nested subjects aren't in the role's subj_hash table */
70917 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
70918 + matchpo->mode |= GR_DELETED;
70919 + FOR_EACH_NESTED_SUBJECT_END(subj)
70920 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
70921 + matchps->mode |= GR_DELETED;
70922 + FOR_EACH_ROLE_END(role)
70923 +
70924 + inodev->nentry->deleted = 1;
70925 +
70926 + return;
70927 +}
70928 +
70929 +void
70930 +gr_handle_delete(const ino_t ino, const dev_t dev)
70931 +{
70932 + struct inodev_entry *inodev;
70933 +
70934 + if (unlikely(!(gr_status & GR_READY)))
70935 + return;
70936 +
70937 + write_lock(&gr_inode_lock);
70938 + inodev = lookup_inodev_entry(ino, dev);
70939 + if (inodev != NULL)
70940 + do_handle_delete(inodev, ino, dev);
70941 + write_unlock(&gr_inode_lock);
70942 +
70943 + return;
70944 +}
70945 +
70946 +static void
70947 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
70948 + const ino_t newinode, const dev_t newdevice,
70949 + struct acl_subject_label *subj)
70950 +{
70951 + unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
70952 + struct acl_object_label *match;
70953 +
70954 + match = subj->obj_hash[index];
70955 +
70956 + while (match && (match->inode != oldinode ||
70957 + match->device != olddevice ||
70958 + !(match->mode & GR_DELETED)))
70959 + match = match->next;
70960 +
70961 + if (match && (match->inode == oldinode)
70962 + && (match->device == olddevice)
70963 + && (match->mode & GR_DELETED)) {
70964 + if (match->prev == NULL) {
70965 + subj->obj_hash[index] = match->next;
70966 + if (match->next != NULL)
70967 + match->next->prev = NULL;
70968 + } else {
70969 + match->prev->next = match->next;
70970 + if (match->next != NULL)
70971 + match->next->prev = match->prev;
70972 + }
70973 + match->prev = NULL;
70974 + match->next = NULL;
70975 + match->inode = newinode;
70976 + match->device = newdevice;
70977 + match->mode &= ~GR_DELETED;
70978 +
70979 + insert_acl_obj_label(match, subj);
70980 + }
70981 +
70982 + return;
70983 +}
70984 +
70985 +static void
70986 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
70987 + const ino_t newinode, const dev_t newdevice,
70988 + struct acl_role_label *role)
70989 +{
70990 + unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
70991 + struct acl_subject_label *match;
70992 +
70993 + match = role->subj_hash[index];
70994 +
70995 + while (match && (match->inode != oldinode ||
70996 + match->device != olddevice ||
70997 + !(match->mode & GR_DELETED)))
70998 + match = match->next;
70999 +
71000 + if (match && (match->inode == oldinode)
71001 + && (match->device == olddevice)
71002 + && (match->mode & GR_DELETED)) {
71003 + if (match->prev == NULL) {
71004 + role->subj_hash[index] = match->next;
71005 + if (match->next != NULL)
71006 + match->next->prev = NULL;
71007 + } else {
71008 + match->prev->next = match->next;
71009 + if (match->next != NULL)
71010 + match->next->prev = match->prev;
71011 + }
71012 + match->prev = NULL;
71013 + match->next = NULL;
71014 + match->inode = newinode;
71015 + match->device = newdevice;
71016 + match->mode &= ~GR_DELETED;
71017 +
71018 + insert_acl_subj_label(match, role);
71019 + }
71020 +
71021 + return;
71022 +}
71023 +
71024 +static void
71025 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
71026 + const ino_t newinode, const dev_t newdevice)
71027 +{
71028 + unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71029 + struct inodev_entry *match;
71030 +
71031 + match = running_polstate.inodev_set.i_hash[index];
71032 +
71033 + while (match && (match->nentry->inode != oldinode ||
71034 + match->nentry->device != olddevice || !match->nentry->deleted))
71035 + match = match->next;
71036 +
71037 + if (match && (match->nentry->inode == oldinode)
71038 + && (match->nentry->device == olddevice) &&
71039 + match->nentry->deleted) {
71040 + if (match->prev == NULL) {
71041 + running_polstate.inodev_set.i_hash[index] = match->next;
71042 + if (match->next != NULL)
71043 + match->next->prev = NULL;
71044 + } else {
71045 + match->prev->next = match->next;
71046 + if (match->next != NULL)
71047 + match->next->prev = match->prev;
71048 + }
71049 + match->prev = NULL;
71050 + match->next = NULL;
71051 + match->nentry->inode = newinode;
71052 + match->nentry->device = newdevice;
71053 + match->nentry->deleted = 0;
71054 +
71055 + insert_inodev_entry(match);
71056 + }
71057 +
71058 + return;
71059 +}
71060 +
71061 +static void
71062 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
71063 +{
71064 + struct acl_subject_label *subj;
71065 + struct acl_role_label *role;
71066 + unsigned int x;
71067 +
71068 + FOR_EACH_ROLE_START(role)
71069 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71070 +
71071 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
71072 + if ((subj->inode == ino) && (subj->device == dev)) {
71073 + subj->inode = ino;
71074 + subj->device = dev;
71075 + }
71076 + /* nested subjects aren't in the role's subj_hash table */
71077 + update_acl_obj_label(matchn->inode, matchn->device,
71078 + ino, dev, subj);
71079 + FOR_EACH_NESTED_SUBJECT_END(subj)
71080 + FOR_EACH_SUBJECT_START(role, subj, x)
71081 + update_acl_obj_label(matchn->inode, matchn->device,
71082 + ino, dev, subj);
71083 + FOR_EACH_SUBJECT_END(subj,x)
71084 + FOR_EACH_ROLE_END(role)
71085 +
71086 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71087 +
71088 + return;
71089 +}
71090 +
71091 +static void
71092 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71093 + const struct vfsmount *mnt)
71094 +{
71095 + ino_t ino = dentry->d_inode->i_ino;
71096 + dev_t dev = __get_dev(dentry);
71097 +
71098 + __do_handle_create(matchn, ino, dev);
71099 +
71100 + return;
71101 +}
71102 +
71103 +void
71104 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71105 +{
71106 + struct name_entry *matchn;
71107 +
71108 + if (unlikely(!(gr_status & GR_READY)))
71109 + return;
71110 +
71111 + preempt_disable();
71112 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71113 +
71114 + if (unlikely((unsigned long)matchn)) {
71115 + write_lock(&gr_inode_lock);
71116 + do_handle_create(matchn, dentry, mnt);
71117 + write_unlock(&gr_inode_lock);
71118 + }
71119 + preempt_enable();
71120 +
71121 + return;
71122 +}
71123 +
71124 +void
71125 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71126 +{
71127 + struct name_entry *matchn;
71128 +
71129 + if (unlikely(!(gr_status & GR_READY)))
71130 + return;
71131 +
71132 + preempt_disable();
71133 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71134 +
71135 + if (unlikely((unsigned long)matchn)) {
71136 + write_lock(&gr_inode_lock);
71137 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71138 + write_unlock(&gr_inode_lock);
71139 + }
71140 + preempt_enable();
71141 +
71142 + return;
71143 +}
71144 +
71145 +void
71146 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71147 + struct dentry *old_dentry,
71148 + struct dentry *new_dentry,
71149 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71150 +{
71151 + struct name_entry *matchn;
71152 + struct name_entry *matchn2 = NULL;
71153 + struct inodev_entry *inodev;
71154 + struct inode *inode = new_dentry->d_inode;
71155 + ino_t old_ino = old_dentry->d_inode->i_ino;
71156 + dev_t old_dev = __get_dev(old_dentry);
71157 + unsigned int exchange = flags & RENAME_EXCHANGE;
71158 +
71159 + /* vfs_rename swaps the name and parent link for old_dentry and
71160 + new_dentry
71161 + at this point, old_dentry has the new name, parent link, and inode
71162 + for the renamed file
71163 + if a file is being replaced by a rename, new_dentry has the inode
71164 + and name for the replaced file
71165 + */
71166 +
71167 + if (unlikely(!(gr_status & GR_READY)))
71168 + return;
71169 +
71170 + preempt_disable();
71171 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71172 +
71173 + /* exchange cases:
71174 + a filename exists for the source, but not dest
71175 + do a recreate on source
71176 + a filename exists for the dest, but not source
71177 + do a recreate on dest
71178 + a filename exists for both source and dest
71179 + delete source and dest, then create source and dest
71180 + a filename exists for neither source nor dest
71181 + no updates needed
71182 +
71183 + the name entry lookups get us the old inode/dev associated with
71184 + each name, so do the deletes first (if possible) so that when
71185 + we do the create, we pick up on the right entries
71186 + */
71187 +
71188 + if (exchange)
71189 + matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71190 +
71191 + /* we wouldn't have to check d_inode if it weren't for
71192 + NFS silly-renaming
71193 + */
71194 +
71195 + write_lock(&gr_inode_lock);
71196 + if (unlikely((replace || exchange) && inode)) {
71197 + ino_t new_ino = inode->i_ino;
71198 + dev_t new_dev = __get_dev(new_dentry);
71199 +
71200 + inodev = lookup_inodev_entry(new_ino, new_dev);
71201 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
71202 + do_handle_delete(inodev, new_ino, new_dev);
71203 + }
71204 +
71205 + inodev = lookup_inodev_entry(old_ino, old_dev);
71206 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
71207 + do_handle_delete(inodev, old_ino, old_dev);
71208 +
71209 + if (unlikely(matchn != NULL))
71210 + do_handle_create(matchn, old_dentry, mnt);
71211 +
71212 + if (unlikely(matchn2 != NULL))
71213 + do_handle_create(matchn2, new_dentry, mnt);
71214 +
71215 + write_unlock(&gr_inode_lock);
71216 + preempt_enable();
71217 +
71218 + return;
71219 +}
71220 +
71221 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
71222 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
71223 + [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
71224 + [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
71225 + [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
71226 + [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
71227 + [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
71228 + [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
71229 + [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
71230 + [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
71231 + [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
71232 + [RLIMIT_AS] = GR_RLIM_AS_BUMP,
71233 + [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
71234 + [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
71235 + [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
71236 + [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
71237 + [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
71238 + [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
71239 +};
71240 +
71241 +void
71242 +gr_learn_resource(const struct task_struct *task,
71243 + const int res, const unsigned long wanted, const int gt)
71244 +{
71245 + struct acl_subject_label *acl;
71246 + const struct cred *cred;
71247 +
71248 + if (unlikely((gr_status & GR_READY) &&
71249 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
71250 + goto skip_reslog;
71251 +
71252 + gr_log_resource(task, res, wanted, gt);
71253 +skip_reslog:
71254 +
71255 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
71256 + return;
71257 +
71258 + acl = task->acl;
71259 +
71260 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
71261 + !(acl->resmask & (1U << (unsigned short) res))))
71262 + return;
71263 +
71264 + if (wanted >= acl->res[res].rlim_cur) {
71265 + unsigned long res_add;
71266 +
71267 + res_add = wanted + res_learn_bumps[res];
71268 +
71269 + acl->res[res].rlim_cur = res_add;
71270 +
71271 + if (wanted > acl->res[res].rlim_max)
71272 + acl->res[res].rlim_max = res_add;
71273 +
71274 + /* only log the subject filename, since resource logging is supported for
71275 + single-subject learning only */
71276 + rcu_read_lock();
71277 + cred = __task_cred(task);
71278 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71279 + task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
71280 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
71281 + "", (unsigned long) res, &task->signal->saved_ip);
71282 + rcu_read_unlock();
71283 + }
71284 +
71285 + return;
71286 +}
71287 +EXPORT_SYMBOL_GPL(gr_learn_resource);
71288 +#endif
71289 +
71290 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
71291 +void
71292 +pax_set_initial_flags(struct linux_binprm *bprm)
71293 +{
71294 + struct task_struct *task = current;
71295 + struct acl_subject_label *proc;
71296 + unsigned long flags;
71297 +
71298 + if (unlikely(!(gr_status & GR_READY)))
71299 + return;
71300 +
71301 + flags = pax_get_flags(task);
71302 +
71303 + proc = task->acl;
71304 +
71305 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
71306 + flags &= ~MF_PAX_PAGEEXEC;
71307 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
71308 + flags &= ~MF_PAX_SEGMEXEC;
71309 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
71310 + flags &= ~MF_PAX_RANDMMAP;
71311 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
71312 + flags &= ~MF_PAX_EMUTRAMP;
71313 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
71314 + flags &= ~MF_PAX_MPROTECT;
71315 +
71316 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
71317 + flags |= MF_PAX_PAGEEXEC;
71318 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
71319 + flags |= MF_PAX_SEGMEXEC;
71320 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
71321 + flags |= MF_PAX_RANDMMAP;
71322 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
71323 + flags |= MF_PAX_EMUTRAMP;
71324 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
71325 + flags |= MF_PAX_MPROTECT;
71326 +
71327 + pax_set_flags(task, flags);
71328 +
71329 + return;
71330 +}
71331 +#endif
71332 +
71333 +int
71334 +gr_handle_proc_ptrace(struct task_struct *task)
71335 +{
71336 + struct file *filp;
71337 + struct task_struct *tmp = task;
71338 + struct task_struct *curtemp = current;
71339 + __u32 retmode;
71340 +
71341 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71342 + if (unlikely(!(gr_status & GR_READY)))
71343 + return 0;
71344 +#endif
71345 +
71346 + read_lock(&tasklist_lock);
71347 + read_lock(&grsec_exec_file_lock);
71348 + filp = task->exec_file;
71349 +
71350 + while (task_pid_nr(tmp) > 0) {
71351 + if (tmp == curtemp)
71352 + break;
71353 + tmp = tmp->real_parent;
71354 + }
71355 +
71356 + if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71357 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
71358 + read_unlock(&grsec_exec_file_lock);
71359 + read_unlock(&tasklist_lock);
71360 + return 1;
71361 + }
71362 +
71363 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71364 + if (!(gr_status & GR_READY)) {
71365 + read_unlock(&grsec_exec_file_lock);
71366 + read_unlock(&tasklist_lock);
71367 + return 0;
71368 + }
71369 +#endif
71370 +
71371 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
71372 + read_unlock(&grsec_exec_file_lock);
71373 + read_unlock(&tasklist_lock);
71374 +
71375 + if (retmode & GR_NOPTRACE)
71376 + return 1;
71377 +
71378 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
71379 + && (current->acl != task->acl || (current->acl != current->role->root_label
71380 + && task_pid_nr(current) != task_pid_nr(task))))
71381 + return 1;
71382 +
71383 + return 0;
71384 +}
71385 +
71386 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
71387 +{
71388 + if (unlikely(!(gr_status & GR_READY)))
71389 + return;
71390 +
71391 + if (!(current->role->roletype & GR_ROLE_GOD))
71392 + return;
71393 +
71394 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
71395 + p->role->rolename, gr_task_roletype_to_char(p),
71396 + p->acl->filename);
71397 +}
71398 +
71399 +int
71400 +gr_handle_ptrace(struct task_struct *task, const long request)
71401 +{
71402 + struct task_struct *tmp = task;
71403 + struct task_struct *curtemp = current;
71404 + __u32 retmode;
71405 +
71406 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71407 + if (unlikely(!(gr_status & GR_READY)))
71408 + return 0;
71409 +#endif
71410 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
71411 + read_lock(&tasklist_lock);
71412 + while (task_pid_nr(tmp) > 0) {
71413 + if (tmp == curtemp)
71414 + break;
71415 + tmp = tmp->real_parent;
71416 + }
71417 +
71418 + if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71419 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
71420 + read_unlock(&tasklist_lock);
71421 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71422 + return 1;
71423 + }
71424 + read_unlock(&tasklist_lock);
71425 + }
71426 +
71427 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71428 + if (!(gr_status & GR_READY))
71429 + return 0;
71430 +#endif
71431 +
71432 + read_lock(&grsec_exec_file_lock);
71433 + if (unlikely(!task->exec_file)) {
71434 + read_unlock(&grsec_exec_file_lock);
71435 + return 0;
71436 + }
71437 +
71438 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
71439 + read_unlock(&grsec_exec_file_lock);
71440 +
71441 + if (retmode & GR_NOPTRACE) {
71442 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71443 + return 1;
71444 + }
71445 +
71446 + if (retmode & GR_PTRACERD) {
71447 + switch (request) {
71448 + case PTRACE_SEIZE:
71449 + case PTRACE_POKETEXT:
71450 + case PTRACE_POKEDATA:
71451 + case PTRACE_POKEUSR:
71452 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
71453 + case PTRACE_SETREGS:
71454 + case PTRACE_SETFPREGS:
71455 +#endif
71456 +#ifdef CONFIG_X86
71457 + case PTRACE_SETFPXREGS:
71458 +#endif
71459 +#ifdef CONFIG_ALTIVEC
71460 + case PTRACE_SETVRREGS:
71461 +#endif
71462 + return 1;
71463 + default:
71464 + return 0;
71465 + }
71466 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
71467 + !(current->role->roletype & GR_ROLE_GOD) &&
71468 + (current->acl != task->acl)) {
71469 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71470 + return 1;
71471 + }
71472 +
71473 + return 0;
71474 +}
71475 +
71476 +static int is_writable_mmap(const struct file *filp)
71477 +{
71478 + struct task_struct *task = current;
71479 + struct acl_object_label *obj, *obj2;
71480 +
71481 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
71482 + !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))) {
71483 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71484 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
71485 + task->role->root_label);
71486 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
71487 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
71488 + return 1;
71489 + }
71490 + }
71491 + return 0;
71492 +}
71493 +
71494 +int
71495 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
71496 +{
71497 + __u32 mode;
71498 +
71499 + if (unlikely(!file || !(prot & PROT_EXEC)))
71500 + return 1;
71501 +
71502 + if (is_writable_mmap(file))
71503 + return 0;
71504 +
71505 + mode =
71506 + gr_search_file(file->f_path.dentry,
71507 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71508 + file->f_path.mnt);
71509 +
71510 + if (!gr_tpe_allow(file))
71511 + return 0;
71512 +
71513 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71514 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71515 + return 0;
71516 + } else if (unlikely(!(mode & GR_EXEC))) {
71517 + return 0;
71518 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71519 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71520 + return 1;
71521 + }
71522 +
71523 + return 1;
71524 +}
71525 +
71526 +int
71527 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
71528 +{
71529 + __u32 mode;
71530 +
71531 + if (unlikely(!file || !(prot & PROT_EXEC)))
71532 + return 1;
71533 +
71534 + if (is_writable_mmap(file))
71535 + return 0;
71536 +
71537 + mode =
71538 + gr_search_file(file->f_path.dentry,
71539 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71540 + file->f_path.mnt);
71541 +
71542 + if (!gr_tpe_allow(file))
71543 + return 0;
71544 +
71545 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71546 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71547 + return 0;
71548 + } else if (unlikely(!(mode & GR_EXEC))) {
71549 + return 0;
71550 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71551 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71552 + return 1;
71553 + }
71554 +
71555 + return 1;
71556 +}
71557 +
71558 +void
71559 +gr_acl_handle_psacct(struct task_struct *task, const long code)
71560 +{
71561 + unsigned long runtime, cputime;
71562 + cputime_t utime, stime;
71563 + unsigned int wday, cday;
71564 + __u8 whr, chr;
71565 + __u8 wmin, cmin;
71566 + __u8 wsec, csec;
71567 + struct timespec curtime, starttime;
71568 +
71569 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
71570 + !(task->acl->mode & GR_PROCACCT)))
71571 + return;
71572 +
71573 + curtime = ns_to_timespec(ktime_get_ns());
71574 + starttime = ns_to_timespec(task->start_time);
71575 + runtime = curtime.tv_sec - starttime.tv_sec;
71576 + wday = runtime / (60 * 60 * 24);
71577 + runtime -= wday * (60 * 60 * 24);
71578 + whr = runtime / (60 * 60);
71579 + runtime -= whr * (60 * 60);
71580 + wmin = runtime / 60;
71581 + runtime -= wmin * 60;
71582 + wsec = runtime;
71583 +
71584 + task_cputime(task, &utime, &stime);
71585 + cputime = cputime_to_secs(utime + stime);
71586 + cday = cputime / (60 * 60 * 24);
71587 + cputime -= cday * (60 * 60 * 24);
71588 + chr = cputime / (60 * 60);
71589 + cputime -= chr * (60 * 60);
71590 + cmin = cputime / 60;
71591 + cputime -= cmin * 60;
71592 + csec = cputime;
71593 +
71594 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
71595 +
71596 + return;
71597 +}
71598 +
71599 +#ifdef CONFIG_TASKSTATS
71600 +int gr_is_taskstats_denied(int pid)
71601 +{
71602 + struct task_struct *task;
71603 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71604 + const struct cred *cred;
71605 +#endif
71606 + int ret = 0;
71607 +
71608 + /* restrict taskstats viewing to un-chrooted root users
71609 + who have the 'view' subject flag if the RBAC system is enabled
71610 + */
71611 +
71612 + rcu_read_lock();
71613 + read_lock(&tasklist_lock);
71614 + task = find_task_by_vpid(pid);
71615 + if (task) {
71616 +#ifdef CONFIG_GRKERNSEC_CHROOT
71617 + if (proc_is_chrooted(task))
71618 + ret = -EACCES;
71619 +#endif
71620 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71621 + cred = __task_cred(task);
71622 +#ifdef CONFIG_GRKERNSEC_PROC_USER
71623 + if (gr_is_global_nonroot(cred->uid))
71624 + ret = -EACCES;
71625 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71626 + if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
71627 + ret = -EACCES;
71628 +#endif
71629 +#endif
71630 + if (gr_status & GR_READY) {
71631 + if (!(task->acl->mode & GR_VIEW))
71632 + ret = -EACCES;
71633 + }
71634 + } else
71635 + ret = -ENOENT;
71636 +
71637 + read_unlock(&tasklist_lock);
71638 + rcu_read_unlock();
71639 +
71640 + return ret;
71641 +}
71642 +#endif
71643 +
71644 +/* AUXV entries are filled via a descendant of search_binary_handler
71645 + after we've already applied the subject for the target
71646 +*/
71647 +int gr_acl_enable_at_secure(void)
71648 +{
71649 + if (unlikely(!(gr_status & GR_READY)))
71650 + return 0;
71651 +
71652 + if (current->acl->mode & GR_ATSECURE)
71653 + return 1;
71654 +
71655 + return 0;
71656 +}
71657 +
71658 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
71659 +{
71660 + struct task_struct *task = current;
71661 + struct dentry *dentry = file->f_path.dentry;
71662 + struct vfsmount *mnt = file->f_path.mnt;
71663 + struct acl_object_label *obj, *tmp;
71664 + struct acl_subject_label *subj;
71665 + unsigned int bufsize;
71666 + int is_not_root;
71667 + char *path;
71668 + dev_t dev = __get_dev(dentry);
71669 +
71670 + if (unlikely(!(gr_status & GR_READY)))
71671 + return 1;
71672 +
71673 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71674 + return 1;
71675 +
71676 + /* ignore Eric Biederman */
71677 + if (IS_PRIVATE(dentry->d_inode))
71678 + return 1;
71679 +
71680 + subj = task->acl;
71681 + read_lock(&gr_inode_lock);
71682 + do {
71683 + obj = lookup_acl_obj_label(ino, dev, subj);
71684 + if (obj != NULL) {
71685 + read_unlock(&gr_inode_lock);
71686 + return (obj->mode & GR_FIND) ? 1 : 0;
71687 + }
71688 + } while ((subj = subj->parent_subject));
71689 + read_unlock(&gr_inode_lock);
71690 +
71691 + /* this is purely an optimization since we're looking for an object
71692 + for the directory we're doing a readdir on
71693 + if it's possible for any globbed object to match the entry we're
71694 + filling into the directory, then the object we find here will be
71695 + an anchor point with attached globbed objects
71696 + */
71697 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
71698 + if (obj->globbed == NULL)
71699 + return (obj->mode & GR_FIND) ? 1 : 0;
71700 +
71701 + is_not_root = ((obj->filename[0] == '/') &&
71702 + (obj->filename[1] == '\0')) ? 0 : 1;
71703 + bufsize = PAGE_SIZE - namelen - is_not_root;
71704 +
71705 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
71706 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
71707 + return 1;
71708 +
71709 + preempt_disable();
71710 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
71711 + bufsize);
71712 +
71713 + bufsize = strlen(path);
71714 +
71715 + /* if base is "/", don't append an additional slash */
71716 + if (is_not_root)
71717 + *(path + bufsize) = '/';
71718 + memcpy(path + bufsize + is_not_root, name, namelen);
71719 + *(path + bufsize + namelen + is_not_root) = '\0';
71720 +
71721 + tmp = obj->globbed;
71722 + while (tmp) {
71723 + if (!glob_match(tmp->filename, path)) {
71724 + preempt_enable();
71725 + return (tmp->mode & GR_FIND) ? 1 : 0;
71726 + }
71727 + tmp = tmp->next;
71728 + }
71729 + preempt_enable();
71730 + return (obj->mode & GR_FIND) ? 1 : 0;
71731 +}
71732 +
71733 +void gr_put_exec_file(struct task_struct *task)
71734 +{
71735 + struct file *filp;
71736 +
71737 + write_lock(&grsec_exec_file_lock);
71738 + filp = task->exec_file;
71739 + task->exec_file = NULL;
71740 + write_unlock(&grsec_exec_file_lock);
71741 +
71742 + if (filp)
71743 + fput(filp);
71744 +
71745 + return;
71746 +}
71747 +
71748 +
71749 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
71750 +EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
71751 +#endif
71752 +#ifdef CONFIG_SECURITY
71753 +EXPORT_SYMBOL_GPL(gr_check_user_change);
71754 +EXPORT_SYMBOL_GPL(gr_check_group_change);
71755 +#endif
71756 +
71757 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
71758 new file mode 100644
71759 index 0000000..18ffbbd
71760 --- /dev/null
71761 +++ b/grsecurity/gracl_alloc.c
71762 @@ -0,0 +1,105 @@
71763 +#include <linux/kernel.h>
71764 +#include <linux/mm.h>
71765 +#include <linux/slab.h>
71766 +#include <linux/vmalloc.h>
71767 +#include <linux/gracl.h>
71768 +#include <linux/grsecurity.h>
71769 +
71770 +static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
71771 +struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
71772 +
71773 +static __inline__ int
71774 +alloc_pop(void)
71775 +{
71776 + if (current_alloc_state->alloc_stack_next == 1)
71777 + return 0;
71778 +
71779 + kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
71780 +
71781 + current_alloc_state->alloc_stack_next--;
71782 +
71783 + return 1;
71784 +}
71785 +
71786 +static __inline__ int
71787 +alloc_push(void *buf)
71788 +{
71789 + if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
71790 + return 1;
71791 +
71792 + current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
71793 +
71794 + current_alloc_state->alloc_stack_next++;
71795 +
71796 + return 0;
71797 +}
71798 +
71799 +void *
71800 +acl_alloc(unsigned long len)
71801 +{
71802 + void *ret = NULL;
71803 +
71804 + if (!len || len > PAGE_SIZE)
71805 + goto out;
71806 +
71807 + ret = kmalloc(len, GFP_KERNEL);
71808 +
71809 + if (ret) {
71810 + if (alloc_push(ret)) {
71811 + kfree(ret);
71812 + ret = NULL;
71813 + }
71814 + }
71815 +
71816 +out:
71817 + return ret;
71818 +}
71819 +
71820 +void *
71821 +acl_alloc_num(unsigned long num, unsigned long len)
71822 +{
71823 + if (!len || (num > (PAGE_SIZE / len)))
71824 + return NULL;
71825 +
71826 + return acl_alloc(num * len);
71827 +}
71828 +
71829 +void
71830 +acl_free_all(void)
71831 +{
71832 + if (!current_alloc_state->alloc_stack)
71833 + return;
71834 +
71835 + while (alloc_pop()) ;
71836 +
71837 + if (current_alloc_state->alloc_stack) {
71838 + if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
71839 + kfree(current_alloc_state->alloc_stack);
71840 + else
71841 + vfree(current_alloc_state->alloc_stack);
71842 + }
71843 +
71844 + current_alloc_state->alloc_stack = NULL;
71845 + current_alloc_state->alloc_stack_size = 1;
71846 + current_alloc_state->alloc_stack_next = 1;
71847 +
71848 + return;
71849 +}
71850 +
71851 +int
71852 +acl_alloc_stack_init(unsigned long size)
71853 +{
71854 + if ((size * sizeof (void *)) <= PAGE_SIZE)
71855 + current_alloc_state->alloc_stack =
71856 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
71857 + else
71858 + current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
71859 +
71860 + current_alloc_state->alloc_stack_size = size;
71861 + current_alloc_state->alloc_stack_next = 1;
71862 +
71863 + if (!current_alloc_state->alloc_stack)
71864 + return 0;
71865 + else
71866 + return 1;
71867 +}
71868 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
71869 new file mode 100644
71870 index 0000000..1a94c11
71871 --- /dev/null
71872 +++ b/grsecurity/gracl_cap.c
71873 @@ -0,0 +1,127 @@
71874 +#include <linux/kernel.h>
71875 +#include <linux/module.h>
71876 +#include <linux/sched.h>
71877 +#include <linux/gracl.h>
71878 +#include <linux/grsecurity.h>
71879 +#include <linux/grinternal.h>
71880 +
71881 +extern const char *captab_log[];
71882 +extern int captab_log_entries;
71883 +
71884 +int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
71885 +{
71886 + struct acl_subject_label *curracl;
71887 +
71888 + if (!gr_acl_is_enabled())
71889 + return 1;
71890 +
71891 + curracl = task->acl;
71892 +
71893 + if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
71894 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71895 + task->role->roletype, GR_GLOBAL_UID(cred->uid),
71896 + GR_GLOBAL_GID(cred->gid), task->exec_file ?
71897 + gr_to_filename(task->exec_file->f_path.dentry,
71898 + task->exec_file->f_path.mnt) : curracl->filename,
71899 + curracl->filename, 0UL,
71900 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
71901 + return 1;
71902 + }
71903 +
71904 + return 0;
71905 +}
71906 +
71907 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
71908 +{
71909 + struct acl_subject_label *curracl;
71910 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
71911 + kernel_cap_t cap_audit = __cap_empty_set;
71912 +
71913 + if (!gr_acl_is_enabled())
71914 + return 1;
71915 +
71916 + curracl = task->acl;
71917 +
71918 + cap_drop = curracl->cap_lower;
71919 + cap_mask = curracl->cap_mask;
71920 + cap_audit = curracl->cap_invert_audit;
71921 +
71922 + while ((curracl = curracl->parent_subject)) {
71923 + /* if the cap isn't specified in the current computed mask but is specified in the
71924 + current level subject, and is lowered in the current level subject, then add
71925 + it to the set of dropped capabilities
71926 + otherwise, add the current level subject's mask to the current computed mask
71927 + */
71928 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
71929 + cap_raise(cap_mask, cap);
71930 + if (cap_raised(curracl->cap_lower, cap))
71931 + cap_raise(cap_drop, cap);
71932 + if (cap_raised(curracl->cap_invert_audit, cap))
71933 + cap_raise(cap_audit, cap);
71934 + }
71935 + }
71936 +
71937 + if (!cap_raised(cap_drop, cap)) {
71938 + if (cap_raised(cap_audit, cap))
71939 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
71940 + return 1;
71941 + }
71942 +
71943 + /* only learn the capability use if the process has the capability in the
71944 + general case, the two uses in sys.c of gr_learn_cap are an exception
71945 + to this rule to ensure any role transition involves what the full-learned
71946 + policy believes in a privileged process
71947 + */
71948 + if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
71949 + return 1;
71950 +
71951 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
71952 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
71953 +
71954 + return 0;
71955 +}
71956 +
71957 +int
71958 +gr_acl_is_capable(const int cap)
71959 +{
71960 + return gr_task_acl_is_capable(current, current_cred(), cap);
71961 +}
71962 +
71963 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
71964 +{
71965 + struct acl_subject_label *curracl;
71966 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
71967 +
71968 + if (!gr_acl_is_enabled())
71969 + return 1;
71970 +
71971 + curracl = task->acl;
71972 +
71973 + cap_drop = curracl->cap_lower;
71974 + cap_mask = curracl->cap_mask;
71975 +
71976 + while ((curracl = curracl->parent_subject)) {
71977 + /* if the cap isn't specified in the current computed mask but is specified in the
71978 + current level subject, and is lowered in the current level subject, then add
71979 + it to the set of dropped capabilities
71980 + otherwise, add the current level subject's mask to the current computed mask
71981 + */
71982 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
71983 + cap_raise(cap_mask, cap);
71984 + if (cap_raised(curracl->cap_lower, cap))
71985 + cap_raise(cap_drop, cap);
71986 + }
71987 + }
71988 +
71989 + if (!cap_raised(cap_drop, cap))
71990 + return 1;
71991 +
71992 + return 0;
71993 +}
71994 +
71995 +int
71996 +gr_acl_is_capable_nolog(const int cap)
71997 +{
71998 + return gr_task_acl_is_capable_nolog(current, cap);
71999 +}
72000 +
72001 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72002 new file mode 100644
72003 index 0000000..ca25605
72004 --- /dev/null
72005 +++ b/grsecurity/gracl_compat.c
72006 @@ -0,0 +1,270 @@
72007 +#include <linux/kernel.h>
72008 +#include <linux/gracl.h>
72009 +#include <linux/compat.h>
72010 +#include <linux/gracl_compat.h>
72011 +
72012 +#include <asm/uaccess.h>
72013 +
72014 +int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72015 +{
72016 + struct gr_arg_wrapper_compat uwrapcompat;
72017 +
72018 + if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72019 + return -EFAULT;
72020 +
72021 + if (((uwrapcompat.version != GRSECURITY_VERSION) &&
72022 + (uwrapcompat.version != 0x2901)) ||
72023 + (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72024 + return -EINVAL;
72025 +
72026 + uwrap->arg = compat_ptr(uwrapcompat.arg);
72027 + uwrap->version = uwrapcompat.version;
72028 + uwrap->size = sizeof(struct gr_arg);
72029 +
72030 + return 0;
72031 +}
72032 +
72033 +int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72034 +{
72035 + struct gr_arg_compat argcompat;
72036 +
72037 + if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72038 + return -EFAULT;
72039 +
72040 + arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72041 + arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72042 + arg->role_db.num_roles = argcompat.role_db.num_roles;
72043 + arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72044 + arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72045 + arg->role_db.num_objects = argcompat.role_db.num_objects;
72046 +
72047 + memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72048 + memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72049 + memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72050 + memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72051 + arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72052 + arg->segv_device = argcompat.segv_device;
72053 + arg->segv_inode = argcompat.segv_inode;
72054 + arg->segv_uid = argcompat.segv_uid;
72055 + arg->num_sprole_pws = argcompat.num_sprole_pws;
72056 + arg->mode = argcompat.mode;
72057 +
72058 + return 0;
72059 +}
72060 +
72061 +int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72062 +{
72063 + struct acl_object_label_compat objcompat;
72064 +
72065 + if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72066 + return -EFAULT;
72067 +
72068 + obj->filename = compat_ptr(objcompat.filename);
72069 + obj->inode = objcompat.inode;
72070 + obj->device = objcompat.device;
72071 + obj->mode = objcompat.mode;
72072 +
72073 + obj->nested = compat_ptr(objcompat.nested);
72074 + obj->globbed = compat_ptr(objcompat.globbed);
72075 +
72076 + obj->prev = compat_ptr(objcompat.prev);
72077 + obj->next = compat_ptr(objcompat.next);
72078 +
72079 + return 0;
72080 +}
72081 +
72082 +int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72083 +{
72084 + unsigned int i;
72085 + struct acl_subject_label_compat subjcompat;
72086 +
72087 + if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72088 + return -EFAULT;
72089 +
72090 + subj->filename = compat_ptr(subjcompat.filename);
72091 + subj->inode = subjcompat.inode;
72092 + subj->device = subjcompat.device;
72093 + subj->mode = subjcompat.mode;
72094 + subj->cap_mask = subjcompat.cap_mask;
72095 + subj->cap_lower = subjcompat.cap_lower;
72096 + subj->cap_invert_audit = subjcompat.cap_invert_audit;
72097 +
72098 + for (i = 0; i < GR_NLIMITS; i++) {
72099 + if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72100 + subj->res[i].rlim_cur = RLIM_INFINITY;
72101 + else
72102 + subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72103 + if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72104 + subj->res[i].rlim_max = RLIM_INFINITY;
72105 + else
72106 + subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72107 + }
72108 + subj->resmask = subjcompat.resmask;
72109 +
72110 + subj->user_trans_type = subjcompat.user_trans_type;
72111 + subj->group_trans_type = subjcompat.group_trans_type;
72112 + subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72113 + subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72114 + subj->user_trans_num = subjcompat.user_trans_num;
72115 + subj->group_trans_num = subjcompat.group_trans_num;
72116 +
72117 + memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72118 + memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72119 + subj->ip_type = subjcompat.ip_type;
72120 + subj->ips = compat_ptr(subjcompat.ips);
72121 + subj->ip_num = subjcompat.ip_num;
72122 + subj->inaddr_any_override = subjcompat.inaddr_any_override;
72123 +
72124 + subj->crashes = subjcompat.crashes;
72125 + subj->expires = subjcompat.expires;
72126 +
72127 + subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72128 + subj->hash = compat_ptr(subjcompat.hash);
72129 + subj->prev = compat_ptr(subjcompat.prev);
72130 + subj->next = compat_ptr(subjcompat.next);
72131 +
72132 + subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72133 + subj->obj_hash_size = subjcompat.obj_hash_size;
72134 + subj->pax_flags = subjcompat.pax_flags;
72135 +
72136 + return 0;
72137 +}
72138 +
72139 +int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72140 +{
72141 + struct acl_role_label_compat rolecompat;
72142 +
72143 + if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72144 + return -EFAULT;
72145 +
72146 + role->rolename = compat_ptr(rolecompat.rolename);
72147 + role->uidgid = rolecompat.uidgid;
72148 + role->roletype = rolecompat.roletype;
72149 +
72150 + role->auth_attempts = rolecompat.auth_attempts;
72151 + role->expires = rolecompat.expires;
72152 +
72153 + role->root_label = compat_ptr(rolecompat.root_label);
72154 + role->hash = compat_ptr(rolecompat.hash);
72155 +
72156 + role->prev = compat_ptr(rolecompat.prev);
72157 + role->next = compat_ptr(rolecompat.next);
72158 +
72159 + role->transitions = compat_ptr(rolecompat.transitions);
72160 + role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72161 + role->domain_children = compat_ptr(rolecompat.domain_children);
72162 + role->domain_child_num = rolecompat.domain_child_num;
72163 +
72164 + role->umask = rolecompat.umask;
72165 +
72166 + role->subj_hash = compat_ptr(rolecompat.subj_hash);
72167 + role->subj_hash_size = rolecompat.subj_hash_size;
72168 +
72169 + return 0;
72170 +}
72171 +
72172 +int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72173 +{
72174 + struct role_allowed_ip_compat roleip_compat;
72175 +
72176 + if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72177 + return -EFAULT;
72178 +
72179 + roleip->addr = roleip_compat.addr;
72180 + roleip->netmask = roleip_compat.netmask;
72181 +
72182 + roleip->prev = compat_ptr(roleip_compat.prev);
72183 + roleip->next = compat_ptr(roleip_compat.next);
72184 +
72185 + return 0;
72186 +}
72187 +
72188 +int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72189 +{
72190 + struct role_transition_compat trans_compat;
72191 +
72192 + if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72193 + return -EFAULT;
72194 +
72195 + trans->rolename = compat_ptr(trans_compat.rolename);
72196 +
72197 + trans->prev = compat_ptr(trans_compat.prev);
72198 + trans->next = compat_ptr(trans_compat.next);
72199 +
72200 + return 0;
72201 +
72202 +}
72203 +
72204 +int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
72205 +{
72206 + struct gr_hash_struct_compat hash_compat;
72207 +
72208 + if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
72209 + return -EFAULT;
72210 +
72211 + hash->table = compat_ptr(hash_compat.table);
72212 + hash->nametable = compat_ptr(hash_compat.nametable);
72213 + hash->first = compat_ptr(hash_compat.first);
72214 +
72215 + hash->table_size = hash_compat.table_size;
72216 + hash->used_size = hash_compat.used_size;
72217 +
72218 + hash->type = hash_compat.type;
72219 +
72220 + return 0;
72221 +}
72222 +
72223 +int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
72224 +{
72225 + compat_uptr_t ptrcompat;
72226 +
72227 + if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
72228 + return -EFAULT;
72229 +
72230 + *(void **)ptr = compat_ptr(ptrcompat);
72231 +
72232 + return 0;
72233 +}
72234 +
72235 +int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
72236 +{
72237 + struct acl_ip_label_compat ip_compat;
72238 +
72239 + if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
72240 + return -EFAULT;
72241 +
72242 + ip->iface = compat_ptr(ip_compat.iface);
72243 + ip->addr = ip_compat.addr;
72244 + ip->netmask = ip_compat.netmask;
72245 + ip->low = ip_compat.low;
72246 + ip->high = ip_compat.high;
72247 + ip->mode = ip_compat.mode;
72248 + ip->type = ip_compat.type;
72249 +
72250 + memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
72251 +
72252 + ip->prev = compat_ptr(ip_compat.prev);
72253 + ip->next = compat_ptr(ip_compat.next);
72254 +
72255 + return 0;
72256 +}
72257 +
72258 +int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
72259 +{
72260 + struct sprole_pw_compat pw_compat;
72261 +
72262 + if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
72263 + return -EFAULT;
72264 +
72265 + pw->rolename = compat_ptr(pw_compat.rolename);
72266 + memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
72267 + memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
72268 +
72269 + return 0;
72270 +}
72271 +
72272 +size_t get_gr_arg_wrapper_size_compat(void)
72273 +{
72274 + return sizeof(struct gr_arg_wrapper_compat);
72275 +}
72276 +
72277 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
72278 new file mode 100644
72279 index 0000000..4008fdc
72280 --- /dev/null
72281 +++ b/grsecurity/gracl_fs.c
72282 @@ -0,0 +1,445 @@
72283 +#include <linux/kernel.h>
72284 +#include <linux/sched.h>
72285 +#include <linux/types.h>
72286 +#include <linux/fs.h>
72287 +#include <linux/file.h>
72288 +#include <linux/stat.h>
72289 +#include <linux/grsecurity.h>
72290 +#include <linux/grinternal.h>
72291 +#include <linux/gracl.h>
72292 +
72293 +umode_t
72294 +gr_acl_umask(void)
72295 +{
72296 + if (unlikely(!gr_acl_is_enabled()))
72297 + return 0;
72298 +
72299 + return current->role->umask;
72300 +}
72301 +
72302 +__u32
72303 +gr_acl_handle_hidden_file(const struct dentry * dentry,
72304 + const struct vfsmount * mnt)
72305 +{
72306 + __u32 mode;
72307 +
72308 + if (unlikely(d_is_negative(dentry)))
72309 + return GR_FIND;
72310 +
72311 + mode =
72312 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
72313 +
72314 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
72315 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72316 + return mode;
72317 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
72318 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72319 + return 0;
72320 + } else if (unlikely(!(mode & GR_FIND)))
72321 + return 0;
72322 +
72323 + return GR_FIND;
72324 +}
72325 +
72326 +__u32
72327 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
72328 + int acc_mode)
72329 +{
72330 + __u32 reqmode = GR_FIND;
72331 + __u32 mode;
72332 +
72333 + if (unlikely(d_is_negative(dentry)))
72334 + return reqmode;
72335 +
72336 + if (acc_mode & MAY_APPEND)
72337 + reqmode |= GR_APPEND;
72338 + else if (acc_mode & MAY_WRITE)
72339 + reqmode |= GR_WRITE;
72340 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
72341 + reqmode |= GR_READ;
72342 +
72343 + mode =
72344 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72345 + mnt);
72346 +
72347 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72348 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72349 + reqmode & GR_READ ? " reading" : "",
72350 + reqmode & GR_WRITE ? " writing" : reqmode &
72351 + GR_APPEND ? " appending" : "");
72352 + return reqmode;
72353 + } else
72354 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72355 + {
72356 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72357 + reqmode & GR_READ ? " reading" : "",
72358 + reqmode & GR_WRITE ? " writing" : reqmode &
72359 + GR_APPEND ? " appending" : "");
72360 + return 0;
72361 + } else if (unlikely((mode & reqmode) != reqmode))
72362 + return 0;
72363 +
72364 + return reqmode;
72365 +}
72366 +
72367 +__u32
72368 +gr_acl_handle_creat(const struct dentry * dentry,
72369 + const struct dentry * p_dentry,
72370 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
72371 + const int imode)
72372 +{
72373 + __u32 reqmode = GR_WRITE | GR_CREATE;
72374 + __u32 mode;
72375 +
72376 + if (acc_mode & MAY_APPEND)
72377 + reqmode |= GR_APPEND;
72378 + // if a directory was required or the directory already exists, then
72379 + // don't count this open as a read
72380 + if ((acc_mode & MAY_READ) &&
72381 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
72382 + reqmode |= GR_READ;
72383 + if ((open_flags & O_CREAT) &&
72384 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72385 + reqmode |= GR_SETID;
72386 +
72387 + mode =
72388 + gr_check_create(dentry, p_dentry, p_mnt,
72389 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72390 +
72391 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72392 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72393 + reqmode & GR_READ ? " reading" : "",
72394 + reqmode & GR_WRITE ? " writing" : reqmode &
72395 + GR_APPEND ? " appending" : "");
72396 + return reqmode;
72397 + } else
72398 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72399 + {
72400 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72401 + reqmode & GR_READ ? " reading" : "",
72402 + reqmode & GR_WRITE ? " writing" : reqmode &
72403 + GR_APPEND ? " appending" : "");
72404 + return 0;
72405 + } else if (unlikely((mode & reqmode) != reqmode))
72406 + return 0;
72407 +
72408 + return reqmode;
72409 +}
72410 +
72411 +__u32
72412 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
72413 + const int fmode)
72414 +{
72415 + __u32 mode, reqmode = GR_FIND;
72416 +
72417 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
72418 + reqmode |= GR_EXEC;
72419 + if (fmode & S_IWOTH)
72420 + reqmode |= GR_WRITE;
72421 + if (fmode & S_IROTH)
72422 + reqmode |= GR_READ;
72423 +
72424 + mode =
72425 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72426 + mnt);
72427 +
72428 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72429 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72430 + reqmode & GR_READ ? " reading" : "",
72431 + reqmode & GR_WRITE ? " writing" : "",
72432 + reqmode & GR_EXEC ? " executing" : "");
72433 + return reqmode;
72434 + } else
72435 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72436 + {
72437 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72438 + reqmode & GR_READ ? " reading" : "",
72439 + reqmode & GR_WRITE ? " writing" : "",
72440 + reqmode & GR_EXEC ? " executing" : "");
72441 + return 0;
72442 + } else if (unlikely((mode & reqmode) != reqmode))
72443 + return 0;
72444 +
72445 + return reqmode;
72446 +}
72447 +
72448 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
72449 +{
72450 + __u32 mode;
72451 +
72452 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
72453 +
72454 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72455 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
72456 + return mode;
72457 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72458 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
72459 + return 0;
72460 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
72461 + return 0;
72462 +
72463 + return (reqmode);
72464 +}
72465 +
72466 +__u32
72467 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
72468 +{
72469 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
72470 +}
72471 +
72472 +__u32
72473 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
72474 +{
72475 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
72476 +}
72477 +
72478 +__u32
72479 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
72480 +{
72481 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
72482 +}
72483 +
72484 +__u32
72485 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
72486 +{
72487 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
72488 +}
72489 +
72490 +__u32
72491 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
72492 + umode_t *modeptr)
72493 +{
72494 + umode_t mode;
72495 +
72496 + *modeptr &= ~gr_acl_umask();
72497 + mode = *modeptr;
72498 +
72499 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
72500 + return 1;
72501 +
72502 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
72503 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
72504 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
72505 + GR_CHMOD_ACL_MSG);
72506 + } else {
72507 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
72508 + }
72509 +}
72510 +
72511 +__u32
72512 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
72513 +{
72514 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
72515 +}
72516 +
72517 +__u32
72518 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
72519 +{
72520 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
72521 +}
72522 +
72523 +__u32
72524 +gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
72525 +{
72526 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
72527 +}
72528 +
72529 +__u32
72530 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
72531 +{
72532 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
72533 +}
72534 +
72535 +__u32
72536 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
72537 +{
72538 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
72539 + GR_UNIXCONNECT_ACL_MSG);
72540 +}
72541 +
72542 +/* hardlinks require at minimum create and link permission,
72543 + any additional privilege required is based on the
72544 + privilege of the file being linked to
72545 +*/
72546 +__u32
72547 +gr_acl_handle_link(const struct dentry * new_dentry,
72548 + const struct dentry * parent_dentry,
72549 + const struct vfsmount * parent_mnt,
72550 + const struct dentry * old_dentry,
72551 + const struct vfsmount * old_mnt, const struct filename *to)
72552 +{
72553 + __u32 mode;
72554 + __u32 needmode = GR_CREATE | GR_LINK;
72555 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
72556 +
72557 + mode =
72558 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
72559 + old_mnt);
72560 +
72561 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
72562 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72563 + return mode;
72564 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72565 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72566 + return 0;
72567 + } else if (unlikely((mode & needmode) != needmode))
72568 + return 0;
72569 +
72570 + return 1;
72571 +}
72572 +
72573 +__u32
72574 +gr_acl_handle_symlink(const struct dentry * new_dentry,
72575 + const struct dentry * parent_dentry,
72576 + const struct vfsmount * parent_mnt, const struct filename *from)
72577 +{
72578 + __u32 needmode = GR_WRITE | GR_CREATE;
72579 + __u32 mode;
72580 +
72581 + mode =
72582 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
72583 + GR_CREATE | GR_AUDIT_CREATE |
72584 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
72585 +
72586 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
72587 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72588 + return mode;
72589 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72590 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72591 + return 0;
72592 + } else if (unlikely((mode & needmode) != needmode))
72593 + return 0;
72594 +
72595 + return (GR_WRITE | GR_CREATE);
72596 +}
72597 +
72598 +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)
72599 +{
72600 + __u32 mode;
72601 +
72602 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72603 +
72604 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72605 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
72606 + return mode;
72607 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72608 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
72609 + return 0;
72610 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
72611 + return 0;
72612 +
72613 + return (reqmode);
72614 +}
72615 +
72616 +__u32
72617 +gr_acl_handle_mknod(const struct dentry * new_dentry,
72618 + const struct dentry * parent_dentry,
72619 + const struct vfsmount * parent_mnt,
72620 + const int mode)
72621 +{
72622 + __u32 reqmode = GR_WRITE | GR_CREATE;
72623 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72624 + reqmode |= GR_SETID;
72625 +
72626 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72627 + reqmode, GR_MKNOD_ACL_MSG);
72628 +}
72629 +
72630 +__u32
72631 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
72632 + const struct dentry *parent_dentry,
72633 + const struct vfsmount *parent_mnt)
72634 +{
72635 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72636 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
72637 +}
72638 +
72639 +#define RENAME_CHECK_SUCCESS(old, new) \
72640 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
72641 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
72642 +
72643 +int
72644 +gr_acl_handle_rename(struct dentry *new_dentry,
72645 + struct dentry *parent_dentry,
72646 + const struct vfsmount *parent_mnt,
72647 + struct dentry *old_dentry,
72648 + struct inode *old_parent_inode,
72649 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
72650 +{
72651 + __u32 comp1, comp2;
72652 + int error = 0;
72653 +
72654 + if (unlikely(!gr_acl_is_enabled()))
72655 + return 0;
72656 +
72657 + if (flags & RENAME_EXCHANGE) {
72658 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72659 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72660 + GR_SUPPRESS, parent_mnt);
72661 + comp2 =
72662 + gr_search_file(old_dentry,
72663 + GR_READ | GR_WRITE | GR_AUDIT_READ |
72664 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72665 + } else if (d_is_negative(new_dentry)) {
72666 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
72667 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
72668 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
72669 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
72670 + GR_DELETE | GR_AUDIT_DELETE |
72671 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72672 + GR_SUPPRESS, old_mnt);
72673 + } else {
72674 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72675 + GR_CREATE | GR_DELETE |
72676 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
72677 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72678 + GR_SUPPRESS, parent_mnt);
72679 + comp2 =
72680 + gr_search_file(old_dentry,
72681 + GR_READ | GR_WRITE | GR_AUDIT_READ |
72682 + GR_DELETE | GR_AUDIT_DELETE |
72683 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72684 + }
72685 +
72686 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
72687 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
72688 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72689 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
72690 + && !(comp2 & GR_SUPPRESS)) {
72691 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72692 + error = -EACCES;
72693 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
72694 + error = -EACCES;
72695 +
72696 + return error;
72697 +}
72698 +
72699 +void
72700 +gr_acl_handle_exit(void)
72701 +{
72702 + u16 id;
72703 + char *rolename;
72704 +
72705 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
72706 + !(current->role->roletype & GR_ROLE_PERSIST))) {
72707 + id = current->acl_role_id;
72708 + rolename = current->role->rolename;
72709 + gr_set_acls(1);
72710 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
72711 + }
72712 +
72713 + gr_put_exec_file(current);
72714 + return;
72715 +}
72716 +
72717 +int
72718 +gr_acl_handle_procpidmem(const struct task_struct *task)
72719 +{
72720 + if (unlikely(!gr_acl_is_enabled()))
72721 + return 0;
72722 +
72723 + if (task != current && task->acl->mode & GR_PROTPROCFD)
72724 + return -EACCES;
72725 +
72726 + return 0;
72727 +}
72728 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
72729 new file mode 100644
72730 index 0000000..f056b81
72731 --- /dev/null
72732 +++ b/grsecurity/gracl_ip.c
72733 @@ -0,0 +1,386 @@
72734 +#include <linux/kernel.h>
72735 +#include <asm/uaccess.h>
72736 +#include <asm/errno.h>
72737 +#include <net/sock.h>
72738 +#include <linux/file.h>
72739 +#include <linux/fs.h>
72740 +#include <linux/net.h>
72741 +#include <linux/in.h>
72742 +#include <linux/skbuff.h>
72743 +#include <linux/ip.h>
72744 +#include <linux/udp.h>
72745 +#include <linux/types.h>
72746 +#include <linux/sched.h>
72747 +#include <linux/netdevice.h>
72748 +#include <linux/inetdevice.h>
72749 +#include <linux/gracl.h>
72750 +#include <linux/grsecurity.h>
72751 +#include <linux/grinternal.h>
72752 +
72753 +#define GR_BIND 0x01
72754 +#define GR_CONNECT 0x02
72755 +#define GR_INVERT 0x04
72756 +#define GR_BINDOVERRIDE 0x08
72757 +#define GR_CONNECTOVERRIDE 0x10
72758 +#define GR_SOCK_FAMILY 0x20
72759 +
72760 +static const char * gr_protocols[IPPROTO_MAX] = {
72761 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
72762 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
72763 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
72764 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
72765 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
72766 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
72767 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
72768 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
72769 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
72770 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
72771 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
72772 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
72773 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
72774 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
72775 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
72776 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
72777 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
72778 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
72779 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
72780 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
72781 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
72782 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
72783 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
72784 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
72785 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
72786 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
72787 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
72788 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
72789 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
72790 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
72791 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
72792 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
72793 + };
72794 +
72795 +static const char * gr_socktypes[SOCK_MAX] = {
72796 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
72797 + "unknown:7", "unknown:8", "unknown:9", "packet"
72798 + };
72799 +
72800 +static const char * gr_sockfamilies[AF_MAX+1] = {
72801 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
72802 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
72803 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
72804 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
72805 + };
72806 +
72807 +const char *
72808 +gr_proto_to_name(unsigned char proto)
72809 +{
72810 + return gr_protocols[proto];
72811 +}
72812 +
72813 +const char *
72814 +gr_socktype_to_name(unsigned char type)
72815 +{
72816 + return gr_socktypes[type];
72817 +}
72818 +
72819 +const char *
72820 +gr_sockfamily_to_name(unsigned char family)
72821 +{
72822 + return gr_sockfamilies[family];
72823 +}
72824 +
72825 +extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
72826 +
72827 +int
72828 +gr_search_socket(const int domain, const int type, const int protocol)
72829 +{
72830 + struct acl_subject_label *curr;
72831 + const struct cred *cred = current_cred();
72832 +
72833 + if (unlikely(!gr_acl_is_enabled()))
72834 + goto exit;
72835 +
72836 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
72837 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
72838 + goto exit; // let the kernel handle it
72839 +
72840 + curr = current->acl;
72841 +
72842 + if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
72843 + /* the family is allowed, if this is PF_INET allow it only if
72844 + the extra sock type/protocol checks pass */
72845 + if (domain == PF_INET)
72846 + goto inet_check;
72847 + goto exit;
72848 + } else {
72849 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72850 + __u32 fakeip = 0;
72851 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72852 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72853 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
72854 + gr_to_filename(current->exec_file->f_path.dentry,
72855 + current->exec_file->f_path.mnt) :
72856 + curr->filename, curr->filename,
72857 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
72858 + &current->signal->saved_ip);
72859 + goto exit;
72860 + }
72861 + goto exit_fail;
72862 + }
72863 +
72864 +inet_check:
72865 + /* the rest of this checking is for IPv4 only */
72866 + if (!curr->ips)
72867 + goto exit;
72868 +
72869 + if ((curr->ip_type & (1U << type)) &&
72870 + (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
72871 + goto exit;
72872 +
72873 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72874 + /* we don't place acls on raw sockets , and sometimes
72875 + dgram/ip sockets are opened for ioctl and not
72876 + bind/connect, so we'll fake a bind learn log */
72877 + if (type == SOCK_RAW || type == SOCK_PACKET) {
72878 + __u32 fakeip = 0;
72879 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72880 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72881 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
72882 + gr_to_filename(current->exec_file->f_path.dentry,
72883 + current->exec_file->f_path.mnt) :
72884 + curr->filename, curr->filename,
72885 + &fakeip, 0, type,
72886 + protocol, GR_CONNECT, &current->signal->saved_ip);
72887 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
72888 + __u32 fakeip = 0;
72889 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72890 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72891 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
72892 + gr_to_filename(current->exec_file->f_path.dentry,
72893 + current->exec_file->f_path.mnt) :
72894 + curr->filename, curr->filename,
72895 + &fakeip, 0, type,
72896 + protocol, GR_BIND, &current->signal->saved_ip);
72897 + }
72898 + /* we'll log when they use connect or bind */
72899 + goto exit;
72900 + }
72901 +
72902 +exit_fail:
72903 + if (domain == PF_INET)
72904 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
72905 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
72906 + else if (rcu_access_pointer(net_families[domain]) != NULL)
72907 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
72908 + gr_socktype_to_name(type), protocol);
72909 +
72910 + return 0;
72911 +exit:
72912 + return 1;
72913 +}
72914 +
72915 +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)
72916 +{
72917 + if ((ip->mode & mode) &&
72918 + (ip_port >= ip->low) &&
72919 + (ip_port <= ip->high) &&
72920 + ((ntohl(ip_addr) & our_netmask) ==
72921 + (ntohl(our_addr) & our_netmask))
72922 + && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
72923 + && (ip->type & (1U << type))) {
72924 + if (ip->mode & GR_INVERT)
72925 + return 2; // specifically denied
72926 + else
72927 + return 1; // allowed
72928 + }
72929 +
72930 + return 0; // not specifically allowed, may continue parsing
72931 +}
72932 +
72933 +static int
72934 +gr_search_connectbind(const int full_mode, struct sock *sk,
72935 + struct sockaddr_in *addr, const int type)
72936 +{
72937 + char iface[IFNAMSIZ] = {0};
72938 + struct acl_subject_label *curr;
72939 + struct acl_ip_label *ip;
72940 + struct inet_sock *isk;
72941 + struct net_device *dev;
72942 + struct in_device *idev;
72943 + unsigned long i;
72944 + int ret;
72945 + int mode = full_mode & (GR_BIND | GR_CONNECT);
72946 + __u32 ip_addr = 0;
72947 + __u32 our_addr;
72948 + __u32 our_netmask;
72949 + char *p;
72950 + __u16 ip_port = 0;
72951 + const struct cred *cred = current_cred();
72952 +
72953 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
72954 + return 0;
72955 +
72956 + curr = current->acl;
72957 + isk = inet_sk(sk);
72958 +
72959 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
72960 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
72961 + addr->sin_addr.s_addr = curr->inaddr_any_override;
72962 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
72963 + struct sockaddr_in saddr;
72964 + int err;
72965 +
72966 + saddr.sin_family = AF_INET;
72967 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
72968 + saddr.sin_port = isk->inet_sport;
72969 +
72970 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
72971 + if (err)
72972 + return err;
72973 +
72974 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
72975 + if (err)
72976 + return err;
72977 + }
72978 +
72979 + if (!curr->ips)
72980 + return 0;
72981 +
72982 + ip_addr = addr->sin_addr.s_addr;
72983 + ip_port = ntohs(addr->sin_port);
72984 +
72985 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72986 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72987 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
72988 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
72989 + gr_to_filename(current->exec_file->f_path.dentry,
72990 + current->exec_file->f_path.mnt) :
72991 + curr->filename, curr->filename,
72992 + &ip_addr, ip_port, type,
72993 + sk->sk_protocol, mode, &current->signal->saved_ip);
72994 + return 0;
72995 + }
72996 +
72997 + for (i = 0; i < curr->ip_num; i++) {
72998 + ip = *(curr->ips + i);
72999 + if (ip->iface != NULL) {
73000 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
73001 + p = strchr(iface, ':');
73002 + if (p != NULL)
73003 + *p = '\0';
73004 + dev = dev_get_by_name(sock_net(sk), iface);
73005 + if (dev == NULL)
73006 + continue;
73007 + idev = in_dev_get(dev);
73008 + if (idev == NULL) {
73009 + dev_put(dev);
73010 + continue;
73011 + }
73012 + rcu_read_lock();
73013 + for_ifa(idev) {
73014 + if (!strcmp(ip->iface, ifa->ifa_label)) {
73015 + our_addr = ifa->ifa_address;
73016 + our_netmask = 0xffffffff;
73017 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73018 + if (ret == 1) {
73019 + rcu_read_unlock();
73020 + in_dev_put(idev);
73021 + dev_put(dev);
73022 + return 0;
73023 + } else if (ret == 2) {
73024 + rcu_read_unlock();
73025 + in_dev_put(idev);
73026 + dev_put(dev);
73027 + goto denied;
73028 + }
73029 + }
73030 + } endfor_ifa(idev);
73031 + rcu_read_unlock();
73032 + in_dev_put(idev);
73033 + dev_put(dev);
73034 + } else {
73035 + our_addr = ip->addr;
73036 + our_netmask = ip->netmask;
73037 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73038 + if (ret == 1)
73039 + return 0;
73040 + else if (ret == 2)
73041 + goto denied;
73042 + }
73043 + }
73044 +
73045 +denied:
73046 + if (mode == GR_BIND)
73047 + 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));
73048 + else if (mode == GR_CONNECT)
73049 + 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));
73050 +
73051 + return -EACCES;
73052 +}
73053 +
73054 +int
73055 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73056 +{
73057 + /* always allow disconnection of dgram sockets with connect */
73058 + if (addr->sin_family == AF_UNSPEC)
73059 + return 0;
73060 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73061 +}
73062 +
73063 +int
73064 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73065 +{
73066 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73067 +}
73068 +
73069 +int gr_search_listen(struct socket *sock)
73070 +{
73071 + struct sock *sk = sock->sk;
73072 + struct sockaddr_in addr;
73073 +
73074 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73075 + addr.sin_port = inet_sk(sk)->inet_sport;
73076 +
73077 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73078 +}
73079 +
73080 +int gr_search_accept(struct socket *sock)
73081 +{
73082 + struct sock *sk = sock->sk;
73083 + struct sockaddr_in addr;
73084 +
73085 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73086 + addr.sin_port = inet_sk(sk)->inet_sport;
73087 +
73088 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73089 +}
73090 +
73091 +int
73092 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73093 +{
73094 + if (addr)
73095 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73096 + else {
73097 + struct sockaddr_in sin;
73098 + const struct inet_sock *inet = inet_sk(sk);
73099 +
73100 + sin.sin_addr.s_addr = inet->inet_daddr;
73101 + sin.sin_port = inet->inet_dport;
73102 +
73103 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73104 + }
73105 +}
73106 +
73107 +int
73108 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73109 +{
73110 + struct sockaddr_in sin;
73111 +
73112 + if (unlikely(skb->len < sizeof (struct udphdr)))
73113 + return 0; // skip this packet
73114 +
73115 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73116 + sin.sin_port = udp_hdr(skb)->source;
73117 +
73118 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73119 +}
73120 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73121 new file mode 100644
73122 index 0000000..25f54ef
73123 --- /dev/null
73124 +++ b/grsecurity/gracl_learn.c
73125 @@ -0,0 +1,207 @@
73126 +#include <linux/kernel.h>
73127 +#include <linux/mm.h>
73128 +#include <linux/sched.h>
73129 +#include <linux/poll.h>
73130 +#include <linux/string.h>
73131 +#include <linux/file.h>
73132 +#include <linux/types.h>
73133 +#include <linux/vmalloc.h>
73134 +#include <linux/grinternal.h>
73135 +
73136 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73137 + size_t count, loff_t *ppos);
73138 +extern int gr_acl_is_enabled(void);
73139 +
73140 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73141 +static int gr_learn_attached;
73142 +
73143 +/* use a 512k buffer */
73144 +#define LEARN_BUFFER_SIZE (512 * 1024)
73145 +
73146 +static DEFINE_SPINLOCK(gr_learn_lock);
73147 +static DEFINE_MUTEX(gr_learn_user_mutex);
73148 +
73149 +/* we need to maintain two buffers, so that the kernel context of grlearn
73150 + uses a semaphore around the userspace copying, and the other kernel contexts
73151 + use a spinlock when copying into the buffer, since they cannot sleep
73152 +*/
73153 +static char *learn_buffer;
73154 +static char *learn_buffer_user;
73155 +static int learn_buffer_len;
73156 +static int learn_buffer_user_len;
73157 +
73158 +static ssize_t
73159 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73160 +{
73161 + DECLARE_WAITQUEUE(wait, current);
73162 + ssize_t retval = 0;
73163 +
73164 + add_wait_queue(&learn_wait, &wait);
73165 + set_current_state(TASK_INTERRUPTIBLE);
73166 + do {
73167 + mutex_lock(&gr_learn_user_mutex);
73168 + spin_lock(&gr_learn_lock);
73169 + if (learn_buffer_len)
73170 + break;
73171 + spin_unlock(&gr_learn_lock);
73172 + mutex_unlock(&gr_learn_user_mutex);
73173 + if (file->f_flags & O_NONBLOCK) {
73174 + retval = -EAGAIN;
73175 + goto out;
73176 + }
73177 + if (signal_pending(current)) {
73178 + retval = -ERESTARTSYS;
73179 + goto out;
73180 + }
73181 +
73182 + schedule();
73183 + } while (1);
73184 +
73185 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73186 + learn_buffer_user_len = learn_buffer_len;
73187 + retval = learn_buffer_len;
73188 + learn_buffer_len = 0;
73189 +
73190 + spin_unlock(&gr_learn_lock);
73191 +
73192 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73193 + retval = -EFAULT;
73194 +
73195 + mutex_unlock(&gr_learn_user_mutex);
73196 +out:
73197 + set_current_state(TASK_RUNNING);
73198 + remove_wait_queue(&learn_wait, &wait);
73199 + return retval;
73200 +}
73201 +
73202 +static unsigned int
73203 +poll_learn(struct file * file, poll_table * wait)
73204 +{
73205 + poll_wait(file, &learn_wait, wait);
73206 +
73207 + if (learn_buffer_len)
73208 + return (POLLIN | POLLRDNORM);
73209 +
73210 + return 0;
73211 +}
73212 +
73213 +void
73214 +gr_clear_learn_entries(void)
73215 +{
73216 + char *tmp;
73217 +
73218 + mutex_lock(&gr_learn_user_mutex);
73219 + spin_lock(&gr_learn_lock);
73220 + tmp = learn_buffer;
73221 + learn_buffer = NULL;
73222 + spin_unlock(&gr_learn_lock);
73223 + if (tmp)
73224 + vfree(tmp);
73225 + if (learn_buffer_user != NULL) {
73226 + vfree(learn_buffer_user);
73227 + learn_buffer_user = NULL;
73228 + }
73229 + learn_buffer_len = 0;
73230 + mutex_unlock(&gr_learn_user_mutex);
73231 +
73232 + return;
73233 +}
73234 +
73235 +void
73236 +gr_add_learn_entry(const char *fmt, ...)
73237 +{
73238 + va_list args;
73239 + unsigned int len;
73240 +
73241 + if (!gr_learn_attached)
73242 + return;
73243 +
73244 + spin_lock(&gr_learn_lock);
73245 +
73246 + /* leave a gap at the end so we know when it's "full" but don't have to
73247 + compute the exact length of the string we're trying to append
73248 + */
73249 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
73250 + spin_unlock(&gr_learn_lock);
73251 + wake_up_interruptible(&learn_wait);
73252 + return;
73253 + }
73254 + if (learn_buffer == NULL) {
73255 + spin_unlock(&gr_learn_lock);
73256 + return;
73257 + }
73258 +
73259 + va_start(args, fmt);
73260 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
73261 + va_end(args);
73262 +
73263 + learn_buffer_len += len + 1;
73264 +
73265 + spin_unlock(&gr_learn_lock);
73266 + wake_up_interruptible(&learn_wait);
73267 +
73268 + return;
73269 +}
73270 +
73271 +static int
73272 +open_learn(struct inode *inode, struct file *file)
73273 +{
73274 + if (file->f_mode & FMODE_READ && gr_learn_attached)
73275 + return -EBUSY;
73276 + if (file->f_mode & FMODE_READ) {
73277 + int retval = 0;
73278 + mutex_lock(&gr_learn_user_mutex);
73279 + if (learn_buffer == NULL)
73280 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
73281 + if (learn_buffer_user == NULL)
73282 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
73283 + if (learn_buffer == NULL) {
73284 + retval = -ENOMEM;
73285 + goto out_error;
73286 + }
73287 + if (learn_buffer_user == NULL) {
73288 + retval = -ENOMEM;
73289 + goto out_error;
73290 + }
73291 + learn_buffer_len = 0;
73292 + learn_buffer_user_len = 0;
73293 + gr_learn_attached = 1;
73294 +out_error:
73295 + mutex_unlock(&gr_learn_user_mutex);
73296 + return retval;
73297 + }
73298 + return 0;
73299 +}
73300 +
73301 +static int
73302 +close_learn(struct inode *inode, struct file *file)
73303 +{
73304 + if (file->f_mode & FMODE_READ) {
73305 + char *tmp = NULL;
73306 + mutex_lock(&gr_learn_user_mutex);
73307 + spin_lock(&gr_learn_lock);
73308 + tmp = learn_buffer;
73309 + learn_buffer = NULL;
73310 + spin_unlock(&gr_learn_lock);
73311 + if (tmp)
73312 + vfree(tmp);
73313 + if (learn_buffer_user != NULL) {
73314 + vfree(learn_buffer_user);
73315 + learn_buffer_user = NULL;
73316 + }
73317 + learn_buffer_len = 0;
73318 + learn_buffer_user_len = 0;
73319 + gr_learn_attached = 0;
73320 + mutex_unlock(&gr_learn_user_mutex);
73321 + }
73322 +
73323 + return 0;
73324 +}
73325 +
73326 +const struct file_operations grsec_fops = {
73327 + .read = read_learn,
73328 + .write = write_grsec_handler,
73329 + .open = open_learn,
73330 + .release = close_learn,
73331 + .poll = poll_learn,
73332 +};
73333 diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
73334 new file mode 100644
73335 index 0000000..3f8ade0
73336 --- /dev/null
73337 +++ b/grsecurity/gracl_policy.c
73338 @@ -0,0 +1,1782 @@
73339 +#include <linux/kernel.h>
73340 +#include <linux/module.h>
73341 +#include <linux/sched.h>
73342 +#include <linux/mm.h>
73343 +#include <linux/file.h>
73344 +#include <linux/fs.h>
73345 +#include <linux/namei.h>
73346 +#include <linux/mount.h>
73347 +#include <linux/tty.h>
73348 +#include <linux/proc_fs.h>
73349 +#include <linux/lglock.h>
73350 +#include <linux/slab.h>
73351 +#include <linux/vmalloc.h>
73352 +#include <linux/types.h>
73353 +#include <linux/sysctl.h>
73354 +#include <linux/netdevice.h>
73355 +#include <linux/ptrace.h>
73356 +#include <linux/gracl.h>
73357 +#include <linux/gralloc.h>
73358 +#include <linux/security.h>
73359 +#include <linux/grinternal.h>
73360 +#include <linux/pid_namespace.h>
73361 +#include <linux/stop_machine.h>
73362 +#include <linux/fdtable.h>
73363 +#include <linux/percpu.h>
73364 +#include <linux/lglock.h>
73365 +#include <linux/hugetlb.h>
73366 +#include <linux/posix-timers.h>
73367 +#include "../fs/mount.h"
73368 +
73369 +#include <asm/uaccess.h>
73370 +#include <asm/errno.h>
73371 +#include <asm/mman.h>
73372 +
73373 +extern struct gr_policy_state *polstate;
73374 +
73375 +#define FOR_EACH_ROLE_START(role) \
73376 + role = polstate->role_list; \
73377 + while (role) {
73378 +
73379 +#define FOR_EACH_ROLE_END(role) \
73380 + role = role->prev; \
73381 + }
73382 +
73383 +struct path gr_real_root;
73384 +
73385 +extern struct gr_alloc_state *current_alloc_state;
73386 +
73387 +u16 acl_sp_role_value;
73388 +
73389 +static DEFINE_MUTEX(gr_dev_mutex);
73390 +
73391 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
73392 +extern void gr_clear_learn_entries(void);
73393 +
73394 +struct gr_arg *gr_usermode __read_only;
73395 +unsigned char *gr_system_salt __read_only;
73396 +unsigned char *gr_system_sum __read_only;
73397 +
73398 +static unsigned int gr_auth_attempts = 0;
73399 +static unsigned long gr_auth_expires = 0UL;
73400 +
73401 +struct acl_object_label *fakefs_obj_rw;
73402 +struct acl_object_label *fakefs_obj_rwx;
73403 +
73404 +extern int gr_init_uidset(void);
73405 +extern void gr_free_uidset(void);
73406 +extern void gr_remove_uid(uid_t uid);
73407 +extern int gr_find_uid(uid_t uid);
73408 +
73409 +extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
73410 +extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
73411 +extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
73412 +extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
73413 +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);
73414 +extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
73415 +extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
73416 +extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
73417 +extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
73418 +extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73419 +extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73420 +extern void assign_special_role(const char *rolename);
73421 +extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
73422 +extern int gr_rbac_disable(void *unused);
73423 +extern void gr_enable_rbac_system(void);
73424 +
73425 +static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
73426 +{
73427 + if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
73428 + return -EFAULT;
73429 +
73430 + return 0;
73431 +}
73432 +
73433 +static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73434 +{
73435 + if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
73436 + return -EFAULT;
73437 +
73438 + return 0;
73439 +}
73440 +
73441 +static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73442 +{
73443 + if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
73444 + return -EFAULT;
73445 +
73446 + return 0;
73447 +}
73448 +
73449 +static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
73450 +{
73451 + if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
73452 + return -EFAULT;
73453 +
73454 + return 0;
73455 +}
73456 +
73457 +static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73458 +{
73459 + if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
73460 + return -EFAULT;
73461 +
73462 + return 0;
73463 +}
73464 +
73465 +static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73466 +{
73467 + if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
73468 + return -EFAULT;
73469 +
73470 + return 0;
73471 +}
73472 +
73473 +static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73474 +{
73475 + if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
73476 + return -EFAULT;
73477 +
73478 + return 0;
73479 +}
73480 +
73481 +static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
73482 +{
73483 + if (copy_from_user(trans, userp, sizeof(struct role_transition)))
73484 + return -EFAULT;
73485 +
73486 + return 0;
73487 +}
73488 +
73489 +int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
73490 +{
73491 + if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
73492 + return -EFAULT;
73493 +
73494 + return 0;
73495 +}
73496 +
73497 +static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
73498 +{
73499 + if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
73500 + return -EFAULT;
73501 +
73502 + if (((uwrap->version != GRSECURITY_VERSION) &&
73503 + (uwrap->version != 0x2901)) ||
73504 + (uwrap->size != sizeof(struct gr_arg)))
73505 + return -EINVAL;
73506 +
73507 + return 0;
73508 +}
73509 +
73510 +static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
73511 +{
73512 + if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
73513 + return -EFAULT;
73514 +
73515 + return 0;
73516 +}
73517 +
73518 +static size_t get_gr_arg_wrapper_size_normal(void)
73519 +{
73520 + return sizeof(struct gr_arg_wrapper);
73521 +}
73522 +
73523 +#ifdef CONFIG_COMPAT
73524 +extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
73525 +extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
73526 +extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
73527 +extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
73528 +extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
73529 +extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
73530 +extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
73531 +extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
73532 +extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
73533 +extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
73534 +extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
73535 +extern size_t get_gr_arg_wrapper_size_compat(void);
73536 +
73537 +int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
73538 +int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
73539 +int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
73540 +int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
73541 +int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
73542 +int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
73543 +int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
73544 +int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
73545 +int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
73546 +int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
73547 +int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
73548 +size_t (* get_gr_arg_wrapper_size)(void) __read_only;
73549 +
73550 +#else
73551 +#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
73552 +#define copy_gr_arg copy_gr_arg_normal
73553 +#define copy_gr_hash_struct copy_gr_hash_struct_normal
73554 +#define copy_acl_object_label copy_acl_object_label_normal
73555 +#define copy_acl_subject_label copy_acl_subject_label_normal
73556 +#define copy_acl_role_label copy_acl_role_label_normal
73557 +#define copy_acl_ip_label copy_acl_ip_label_normal
73558 +#define copy_pointer_from_array copy_pointer_from_array_normal
73559 +#define copy_sprole_pw copy_sprole_pw_normal
73560 +#define copy_role_transition copy_role_transition_normal
73561 +#define copy_role_allowed_ip copy_role_allowed_ip_normal
73562 +#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
73563 +#endif
73564 +
73565 +static struct acl_subject_label *
73566 +lookup_subject_map(const struct acl_subject_label *userp)
73567 +{
73568 + unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
73569 + struct subject_map *match;
73570 +
73571 + match = polstate->subj_map_set.s_hash[index];
73572 +
73573 + while (match && match->user != userp)
73574 + match = match->next;
73575 +
73576 + if (match != NULL)
73577 + return match->kernel;
73578 + else
73579 + return NULL;
73580 +}
73581 +
73582 +static void
73583 +insert_subj_map_entry(struct subject_map *subjmap)
73584 +{
73585 + unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
73586 + struct subject_map **curr;
73587 +
73588 + subjmap->prev = NULL;
73589 +
73590 + curr = &polstate->subj_map_set.s_hash[index];
73591 + if (*curr != NULL)
73592 + (*curr)->prev = subjmap;
73593 +
73594 + subjmap->next = *curr;
73595 + *curr = subjmap;
73596 +
73597 + return;
73598 +}
73599 +
73600 +static void
73601 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
73602 +{
73603 + unsigned int index =
73604 + gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
73605 + struct acl_role_label **curr;
73606 + struct acl_role_label *tmp, *tmp2;
73607 +
73608 + curr = &polstate->acl_role_set.r_hash[index];
73609 +
73610 + /* simple case, slot is empty, just set it to our role */
73611 + if (*curr == NULL) {
73612 + *curr = role;
73613 + } else {
73614 + /* example:
73615 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
73616 + 2 -> 3
73617 + */
73618 + /* first check to see if we can already be reached via this slot */
73619 + tmp = *curr;
73620 + while (tmp && tmp != role)
73621 + tmp = tmp->next;
73622 + if (tmp == role) {
73623 + /* we don't need to add ourselves to this slot's chain */
73624 + return;
73625 + }
73626 + /* we need to add ourselves to this chain, two cases */
73627 + if (role->next == NULL) {
73628 + /* simple case, append the current chain to our role */
73629 + role->next = *curr;
73630 + *curr = role;
73631 + } else {
73632 + /* 1 -> 2 -> 3 -> 4
73633 + 2 -> 3 -> 4
73634 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
73635 + */
73636 + /* trickier case: walk our role's chain until we find
73637 + the role for the start of the current slot's chain */
73638 + tmp = role;
73639 + tmp2 = *curr;
73640 + while (tmp->next && tmp->next != tmp2)
73641 + tmp = tmp->next;
73642 + if (tmp->next == tmp2) {
73643 + /* from example above, we found 3, so just
73644 + replace this slot's chain with ours */
73645 + *curr = role;
73646 + } else {
73647 + /* we didn't find a subset of our role's chain
73648 + in the current slot's chain, so append their
73649 + chain to ours, and set us as the first role in
73650 + the slot's chain
73651 +
73652 + we could fold this case with the case above,
73653 + but making it explicit for clarity
73654 + */
73655 + tmp->next = tmp2;
73656 + *curr = role;
73657 + }
73658 + }
73659 + }
73660 +
73661 + return;
73662 +}
73663 +
73664 +static void
73665 +insert_acl_role_label(struct acl_role_label *role)
73666 +{
73667 + int i;
73668 +
73669 + if (polstate->role_list == NULL) {
73670 + polstate->role_list = role;
73671 + role->prev = NULL;
73672 + } else {
73673 + role->prev = polstate->role_list;
73674 + polstate->role_list = role;
73675 + }
73676 +
73677 + /* used for hash chains */
73678 + role->next = NULL;
73679 +
73680 + if (role->roletype & GR_ROLE_DOMAIN) {
73681 + for (i = 0; i < role->domain_child_num; i++)
73682 + __insert_acl_role_label(role, role->domain_children[i]);
73683 + } else
73684 + __insert_acl_role_label(role, role->uidgid);
73685 +}
73686 +
73687 +static int
73688 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
73689 +{
73690 + struct name_entry **curr, *nentry;
73691 + struct inodev_entry *ientry;
73692 + unsigned int len = strlen(name);
73693 + unsigned int key = full_name_hash(name, len);
73694 + unsigned int index = key % polstate->name_set.n_size;
73695 +
73696 + curr = &polstate->name_set.n_hash[index];
73697 +
73698 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
73699 + curr = &((*curr)->next);
73700 +
73701 + if (*curr != NULL)
73702 + return 1;
73703 +
73704 + nentry = acl_alloc(sizeof (struct name_entry));
73705 + if (nentry == NULL)
73706 + return 0;
73707 + ientry = acl_alloc(sizeof (struct inodev_entry));
73708 + if (ientry == NULL)
73709 + return 0;
73710 + ientry->nentry = nentry;
73711 +
73712 + nentry->key = key;
73713 + nentry->name = name;
73714 + nentry->inode = inode;
73715 + nentry->device = device;
73716 + nentry->len = len;
73717 + nentry->deleted = deleted;
73718 +
73719 + nentry->prev = NULL;
73720 + curr = &polstate->name_set.n_hash[index];
73721 + if (*curr != NULL)
73722 + (*curr)->prev = nentry;
73723 + nentry->next = *curr;
73724 + *curr = nentry;
73725 +
73726 + /* insert us into the table searchable by inode/dev */
73727 + __insert_inodev_entry(polstate, ientry);
73728 +
73729 + return 1;
73730 +}
73731 +
73732 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
73733 +
73734 +static void *
73735 +create_table(__u32 * len, int elementsize)
73736 +{
73737 + unsigned int table_sizes[] = {
73738 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
73739 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
73740 + 4194301, 8388593, 16777213, 33554393, 67108859
73741 + };
73742 + void *newtable = NULL;
73743 + unsigned int pwr = 0;
73744 +
73745 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
73746 + table_sizes[pwr] <= *len)
73747 + pwr++;
73748 +
73749 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
73750 + return newtable;
73751 +
73752 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
73753 + newtable =
73754 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
73755 + else
73756 + newtable = vmalloc(table_sizes[pwr] * elementsize);
73757 +
73758 + *len = table_sizes[pwr];
73759 +
73760 + return newtable;
73761 +}
73762 +
73763 +static int
73764 +init_variables(const struct gr_arg *arg, bool reload)
73765 +{
73766 + struct task_struct *reaper = init_pid_ns.child_reaper;
73767 + unsigned int stacksize;
73768 +
73769 + polstate->subj_map_set.s_size = arg->role_db.num_subjects;
73770 + polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
73771 + polstate->name_set.n_size = arg->role_db.num_objects;
73772 + polstate->inodev_set.i_size = arg->role_db.num_objects;
73773 +
73774 + if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
73775 + !polstate->name_set.n_size || !polstate->inodev_set.i_size)
73776 + return 1;
73777 +
73778 + if (!reload) {
73779 + if (!gr_init_uidset())
73780 + return 1;
73781 + }
73782 +
73783 + /* set up the stack that holds allocation info */
73784 +
73785 + stacksize = arg->role_db.num_pointers + 5;
73786 +
73787 + if (!acl_alloc_stack_init(stacksize))
73788 + return 1;
73789 +
73790 + if (!reload) {
73791 + /* grab reference for the real root dentry and vfsmount */
73792 + get_fs_root(reaper->fs, &gr_real_root);
73793 +
73794 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
73795 + 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);
73796 +#endif
73797 +
73798 + fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73799 + if (fakefs_obj_rw == NULL)
73800 + return 1;
73801 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
73802 +
73803 + fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73804 + if (fakefs_obj_rwx == NULL)
73805 + return 1;
73806 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
73807 + }
73808 +
73809 + polstate->subj_map_set.s_hash =
73810 + (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
73811 + polstate->acl_role_set.r_hash =
73812 + (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
73813 + polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
73814 + polstate->inodev_set.i_hash =
73815 + (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
73816 +
73817 + if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
73818 + !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
73819 + return 1;
73820 +
73821 + memset(polstate->subj_map_set.s_hash, 0,
73822 + sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
73823 + memset(polstate->acl_role_set.r_hash, 0,
73824 + sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
73825 + memset(polstate->name_set.n_hash, 0,
73826 + sizeof (struct name_entry *) * polstate->name_set.n_size);
73827 + memset(polstate->inodev_set.i_hash, 0,
73828 + sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
73829 +
73830 + return 0;
73831 +}
73832 +
73833 +/* free information not needed after startup
73834 + currently contains user->kernel pointer mappings for subjects
73835 +*/
73836 +
73837 +static void
73838 +free_init_variables(void)
73839 +{
73840 + __u32 i;
73841 +
73842 + if (polstate->subj_map_set.s_hash) {
73843 + for (i = 0; i < polstate->subj_map_set.s_size; i++) {
73844 + if (polstate->subj_map_set.s_hash[i]) {
73845 + kfree(polstate->subj_map_set.s_hash[i]);
73846 + polstate->subj_map_set.s_hash[i] = NULL;
73847 + }
73848 + }
73849 +
73850 + if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
73851 + PAGE_SIZE)
73852 + kfree(polstate->subj_map_set.s_hash);
73853 + else
73854 + vfree(polstate->subj_map_set.s_hash);
73855 + }
73856 +
73857 + return;
73858 +}
73859 +
73860 +static void
73861 +free_variables(bool reload)
73862 +{
73863 + struct acl_subject_label *s;
73864 + struct acl_role_label *r;
73865 + struct task_struct *task, *task2;
73866 + unsigned int x;
73867 +
73868 + if (!reload) {
73869 + gr_clear_learn_entries();
73870 +
73871 + read_lock(&tasklist_lock);
73872 + do_each_thread(task2, task) {
73873 + task->acl_sp_role = 0;
73874 + task->acl_role_id = 0;
73875 + task->inherited = 0;
73876 + task->acl = NULL;
73877 + task->role = NULL;
73878 + } while_each_thread(task2, task);
73879 + read_unlock(&tasklist_lock);
73880 +
73881 + kfree(fakefs_obj_rw);
73882 + fakefs_obj_rw = NULL;
73883 + kfree(fakefs_obj_rwx);
73884 + fakefs_obj_rwx = NULL;
73885 +
73886 + /* release the reference to the real root dentry and vfsmount */
73887 + path_put(&gr_real_root);
73888 + memset(&gr_real_root, 0, sizeof(gr_real_root));
73889 + }
73890 +
73891 + /* free all object hash tables */
73892 +
73893 + FOR_EACH_ROLE_START(r)
73894 + if (r->subj_hash == NULL)
73895 + goto next_role;
73896 + FOR_EACH_SUBJECT_START(r, s, x)
73897 + if (s->obj_hash == NULL)
73898 + break;
73899 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
73900 + kfree(s->obj_hash);
73901 + else
73902 + vfree(s->obj_hash);
73903 + FOR_EACH_SUBJECT_END(s, x)
73904 + FOR_EACH_NESTED_SUBJECT_START(r, s)
73905 + if (s->obj_hash == NULL)
73906 + break;
73907 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
73908 + kfree(s->obj_hash);
73909 + else
73910 + vfree(s->obj_hash);
73911 + FOR_EACH_NESTED_SUBJECT_END(s)
73912 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
73913 + kfree(r->subj_hash);
73914 + else
73915 + vfree(r->subj_hash);
73916 + r->subj_hash = NULL;
73917 +next_role:
73918 + FOR_EACH_ROLE_END(r)
73919 +
73920 + acl_free_all();
73921 +
73922 + if (polstate->acl_role_set.r_hash) {
73923 + if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
73924 + PAGE_SIZE)
73925 + kfree(polstate->acl_role_set.r_hash);
73926 + else
73927 + vfree(polstate->acl_role_set.r_hash);
73928 + }
73929 + if (polstate->name_set.n_hash) {
73930 + if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
73931 + PAGE_SIZE)
73932 + kfree(polstate->name_set.n_hash);
73933 + else
73934 + vfree(polstate->name_set.n_hash);
73935 + }
73936 +
73937 + if (polstate->inodev_set.i_hash) {
73938 + if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
73939 + PAGE_SIZE)
73940 + kfree(polstate->inodev_set.i_hash);
73941 + else
73942 + vfree(polstate->inodev_set.i_hash);
73943 + }
73944 +
73945 + if (!reload)
73946 + gr_free_uidset();
73947 +
73948 + memset(&polstate->name_set, 0, sizeof (struct name_db));
73949 + memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
73950 + memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
73951 + memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
73952 +
73953 + polstate->default_role = NULL;
73954 + polstate->kernel_role = NULL;
73955 + polstate->role_list = NULL;
73956 +
73957 + return;
73958 +}
73959 +
73960 +static struct acl_subject_label *
73961 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
73962 +
73963 +static int alloc_and_copy_string(char **name, unsigned int maxlen)
73964 +{
73965 + unsigned int len = strnlen_user(*name, maxlen);
73966 + char *tmp;
73967 +
73968 + if (!len || len >= maxlen)
73969 + return -EINVAL;
73970 +
73971 + if ((tmp = (char *) acl_alloc(len)) == NULL)
73972 + return -ENOMEM;
73973 +
73974 + if (copy_from_user(tmp, *name, len))
73975 + return -EFAULT;
73976 +
73977 + tmp[len-1] = '\0';
73978 + *name = tmp;
73979 +
73980 + return 0;
73981 +}
73982 +
73983 +static int
73984 +copy_user_glob(struct acl_object_label *obj)
73985 +{
73986 + struct acl_object_label *g_tmp, **guser;
73987 + int error;
73988 +
73989 + if (obj->globbed == NULL)
73990 + return 0;
73991 +
73992 + guser = &obj->globbed;
73993 + while (*guser) {
73994 + g_tmp = (struct acl_object_label *)
73995 + acl_alloc(sizeof (struct acl_object_label));
73996 + if (g_tmp == NULL)
73997 + return -ENOMEM;
73998 +
73999 + if (copy_acl_object_label(g_tmp, *guser))
74000 + return -EFAULT;
74001 +
74002 + error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74003 + if (error)
74004 + return error;
74005 +
74006 + *guser = g_tmp;
74007 + guser = &(g_tmp->next);
74008 + }
74009 +
74010 + return 0;
74011 +}
74012 +
74013 +static int
74014 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74015 + struct acl_role_label *role)
74016 +{
74017 + struct acl_object_label *o_tmp;
74018 + int ret;
74019 +
74020 + while (userp) {
74021 + if ((o_tmp = (struct acl_object_label *)
74022 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
74023 + return -ENOMEM;
74024 +
74025 + if (copy_acl_object_label(o_tmp, userp))
74026 + return -EFAULT;
74027 +
74028 + userp = o_tmp->prev;
74029 +
74030 + ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74031 + if (ret)
74032 + return ret;
74033 +
74034 + insert_acl_obj_label(o_tmp, subj);
74035 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74036 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74037 + return -ENOMEM;
74038 +
74039 + ret = copy_user_glob(o_tmp);
74040 + if (ret)
74041 + return ret;
74042 +
74043 + if (o_tmp->nested) {
74044 + int already_copied;
74045 +
74046 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74047 + if (IS_ERR(o_tmp->nested))
74048 + return PTR_ERR(o_tmp->nested);
74049 +
74050 + /* insert into nested subject list if we haven't copied this one yet
74051 + to prevent duplicate entries */
74052 + if (!already_copied) {
74053 + o_tmp->nested->next = role->hash->first;
74054 + role->hash->first = o_tmp->nested;
74055 + }
74056 + }
74057 + }
74058 +
74059 + return 0;
74060 +}
74061 +
74062 +static __u32
74063 +count_user_subjs(struct acl_subject_label *userp)
74064 +{
74065 + struct acl_subject_label s_tmp;
74066 + __u32 num = 0;
74067 +
74068 + while (userp) {
74069 + if (copy_acl_subject_label(&s_tmp, userp))
74070 + break;
74071 +
74072 + userp = s_tmp.prev;
74073 + }
74074 +
74075 + return num;
74076 +}
74077 +
74078 +static int
74079 +copy_user_allowedips(struct acl_role_label *rolep)
74080 +{
74081 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74082 +
74083 + ruserip = rolep->allowed_ips;
74084 +
74085 + while (ruserip) {
74086 + rlast = rtmp;
74087 +
74088 + if ((rtmp = (struct role_allowed_ip *)
74089 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74090 + return -ENOMEM;
74091 +
74092 + if (copy_role_allowed_ip(rtmp, ruserip))
74093 + return -EFAULT;
74094 +
74095 + ruserip = rtmp->prev;
74096 +
74097 + if (!rlast) {
74098 + rtmp->prev = NULL;
74099 + rolep->allowed_ips = rtmp;
74100 + } else {
74101 + rlast->next = rtmp;
74102 + rtmp->prev = rlast;
74103 + }
74104 +
74105 + if (!ruserip)
74106 + rtmp->next = NULL;
74107 + }
74108 +
74109 + return 0;
74110 +}
74111 +
74112 +static int
74113 +copy_user_transitions(struct acl_role_label *rolep)
74114 +{
74115 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
74116 + int error;
74117 +
74118 + rusertp = rolep->transitions;
74119 +
74120 + while (rusertp) {
74121 + rlast = rtmp;
74122 +
74123 + if ((rtmp = (struct role_transition *)
74124 + acl_alloc(sizeof (struct role_transition))) == NULL)
74125 + return -ENOMEM;
74126 +
74127 + if (copy_role_transition(rtmp, rusertp))
74128 + return -EFAULT;
74129 +
74130 + rusertp = rtmp->prev;
74131 +
74132 + error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74133 + if (error)
74134 + return error;
74135 +
74136 + if (!rlast) {
74137 + rtmp->prev = NULL;
74138 + rolep->transitions = rtmp;
74139 + } else {
74140 + rlast->next = rtmp;
74141 + rtmp->prev = rlast;
74142 + }
74143 +
74144 + if (!rusertp)
74145 + rtmp->next = NULL;
74146 + }
74147 +
74148 + return 0;
74149 +}
74150 +
74151 +static __u32 count_user_objs(const struct acl_object_label __user *userp)
74152 +{
74153 + struct acl_object_label o_tmp;
74154 + __u32 num = 0;
74155 +
74156 + while (userp) {
74157 + if (copy_acl_object_label(&o_tmp, userp))
74158 + break;
74159 +
74160 + userp = o_tmp.prev;
74161 + num++;
74162 + }
74163 +
74164 + return num;
74165 +}
74166 +
74167 +static struct acl_subject_label *
74168 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74169 +{
74170 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74171 + __u32 num_objs;
74172 + struct acl_ip_label **i_tmp, *i_utmp2;
74173 + struct gr_hash_struct ghash;
74174 + struct subject_map *subjmap;
74175 + unsigned int i_num;
74176 + int err;
74177 +
74178 + if (already_copied != NULL)
74179 + *already_copied = 0;
74180 +
74181 + s_tmp = lookup_subject_map(userp);
74182 +
74183 + /* we've already copied this subject into the kernel, just return
74184 + the reference to it, and don't copy it over again
74185 + */
74186 + if (s_tmp) {
74187 + if (already_copied != NULL)
74188 + *already_copied = 1;
74189 + return(s_tmp);
74190 + }
74191 +
74192 + if ((s_tmp = (struct acl_subject_label *)
74193 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74194 + return ERR_PTR(-ENOMEM);
74195 +
74196 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74197 + if (subjmap == NULL)
74198 + return ERR_PTR(-ENOMEM);
74199 +
74200 + subjmap->user = userp;
74201 + subjmap->kernel = s_tmp;
74202 + insert_subj_map_entry(subjmap);
74203 +
74204 + if (copy_acl_subject_label(s_tmp, userp))
74205 + return ERR_PTR(-EFAULT);
74206 +
74207 + err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
74208 + if (err)
74209 + return ERR_PTR(err);
74210 +
74211 + if (!strcmp(s_tmp->filename, "/"))
74212 + role->root_label = s_tmp;
74213 +
74214 + if (copy_gr_hash_struct(&ghash, s_tmp->hash))
74215 + return ERR_PTR(-EFAULT);
74216 +
74217 + /* copy user and group transition tables */
74218 +
74219 + if (s_tmp->user_trans_num) {
74220 + uid_t *uidlist;
74221 +
74222 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
74223 + if (uidlist == NULL)
74224 + return ERR_PTR(-ENOMEM);
74225 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
74226 + return ERR_PTR(-EFAULT);
74227 +
74228 + s_tmp->user_transitions = uidlist;
74229 + }
74230 +
74231 + if (s_tmp->group_trans_num) {
74232 + gid_t *gidlist;
74233 +
74234 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
74235 + if (gidlist == NULL)
74236 + return ERR_PTR(-ENOMEM);
74237 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
74238 + return ERR_PTR(-EFAULT);
74239 +
74240 + s_tmp->group_transitions = gidlist;
74241 + }
74242 +
74243 + /* set up object hash table */
74244 + num_objs = count_user_objs(ghash.first);
74245 +
74246 + s_tmp->obj_hash_size = num_objs;
74247 + s_tmp->obj_hash =
74248 + (struct acl_object_label **)
74249 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
74250 +
74251 + if (!s_tmp->obj_hash)
74252 + return ERR_PTR(-ENOMEM);
74253 +
74254 + memset(s_tmp->obj_hash, 0,
74255 + s_tmp->obj_hash_size *
74256 + sizeof (struct acl_object_label *));
74257 +
74258 + /* add in objects */
74259 + err = copy_user_objs(ghash.first, s_tmp, role);
74260 +
74261 + if (err)
74262 + return ERR_PTR(err);
74263 +
74264 + /* set pointer for parent subject */
74265 + if (s_tmp->parent_subject) {
74266 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
74267 +
74268 + if (IS_ERR(s_tmp2))
74269 + return s_tmp2;
74270 +
74271 + s_tmp->parent_subject = s_tmp2;
74272 + }
74273 +
74274 + /* add in ip acls */
74275 +
74276 + if (!s_tmp->ip_num) {
74277 + s_tmp->ips = NULL;
74278 + goto insert;
74279 + }
74280 +
74281 + i_tmp =
74282 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
74283 + sizeof (struct acl_ip_label *));
74284 +
74285 + if (!i_tmp)
74286 + return ERR_PTR(-ENOMEM);
74287 +
74288 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
74289 + *(i_tmp + i_num) =
74290 + (struct acl_ip_label *)
74291 + acl_alloc(sizeof (struct acl_ip_label));
74292 + if (!*(i_tmp + i_num))
74293 + return ERR_PTR(-ENOMEM);
74294 +
74295 + if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
74296 + return ERR_PTR(-EFAULT);
74297 +
74298 + if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
74299 + return ERR_PTR(-EFAULT);
74300 +
74301 + if ((*(i_tmp + i_num))->iface == NULL)
74302 + continue;
74303 +
74304 + err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
74305 + if (err)
74306 + return ERR_PTR(err);
74307 + }
74308 +
74309 + s_tmp->ips = i_tmp;
74310 +
74311 +insert:
74312 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
74313 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
74314 + return ERR_PTR(-ENOMEM);
74315 +
74316 + return s_tmp;
74317 +}
74318 +
74319 +static int
74320 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
74321 +{
74322 + struct acl_subject_label s_pre;
74323 + struct acl_subject_label * ret;
74324 + int err;
74325 +
74326 + while (userp) {
74327 + if (copy_acl_subject_label(&s_pre, userp))
74328 + return -EFAULT;
74329 +
74330 + ret = do_copy_user_subj(userp, role, NULL);
74331 +
74332 + err = PTR_ERR(ret);
74333 + if (IS_ERR(ret))
74334 + return err;
74335 +
74336 + insert_acl_subj_label(ret, role);
74337 +
74338 + userp = s_pre.prev;
74339 + }
74340 +
74341 + return 0;
74342 +}
74343 +
74344 +static int
74345 +copy_user_acl(struct gr_arg *arg)
74346 +{
74347 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
74348 + struct acl_subject_label *subj_list;
74349 + struct sprole_pw *sptmp;
74350 + struct gr_hash_struct *ghash;
74351 + uid_t *domainlist;
74352 + unsigned int r_num;
74353 + int err = 0;
74354 + __u16 i;
74355 + __u32 num_subjs;
74356 +
74357 + /* we need a default and kernel role */
74358 + if (arg->role_db.num_roles < 2)
74359 + return -EINVAL;
74360 +
74361 + /* copy special role authentication info from userspace */
74362 +
74363 + polstate->num_sprole_pws = arg->num_sprole_pws;
74364 + polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
74365 +
74366 + if (!polstate->acl_special_roles && polstate->num_sprole_pws)
74367 + return -ENOMEM;
74368 +
74369 + for (i = 0; i < polstate->num_sprole_pws; i++) {
74370 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
74371 + if (!sptmp)
74372 + return -ENOMEM;
74373 + if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
74374 + return -EFAULT;
74375 +
74376 + err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
74377 + if (err)
74378 + return err;
74379 +
74380 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74381 + printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
74382 +#endif
74383 +
74384 + polstate->acl_special_roles[i] = sptmp;
74385 + }
74386 +
74387 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
74388 +
74389 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
74390 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
74391 +
74392 + if (!r_tmp)
74393 + return -ENOMEM;
74394 +
74395 + if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
74396 + return -EFAULT;
74397 +
74398 + if (copy_acl_role_label(r_tmp, r_utmp2))
74399 + return -EFAULT;
74400 +
74401 + err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
74402 + if (err)
74403 + return err;
74404 +
74405 + if (!strcmp(r_tmp->rolename, "default")
74406 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
74407 + polstate->default_role = r_tmp;
74408 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
74409 + polstate->kernel_role = r_tmp;
74410 + }
74411 +
74412 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
74413 + return -ENOMEM;
74414 +
74415 + if (copy_gr_hash_struct(ghash, r_tmp->hash))
74416 + return -EFAULT;
74417 +
74418 + r_tmp->hash = ghash;
74419 +
74420 + num_subjs = count_user_subjs(r_tmp->hash->first);
74421 +
74422 + r_tmp->subj_hash_size = num_subjs;
74423 + r_tmp->subj_hash =
74424 + (struct acl_subject_label **)
74425 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
74426 +
74427 + if (!r_tmp->subj_hash)
74428 + return -ENOMEM;
74429 +
74430 + err = copy_user_allowedips(r_tmp);
74431 + if (err)
74432 + return err;
74433 +
74434 + /* copy domain info */
74435 + if (r_tmp->domain_children != NULL) {
74436 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
74437 + if (domainlist == NULL)
74438 + return -ENOMEM;
74439 +
74440 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
74441 + return -EFAULT;
74442 +
74443 + r_tmp->domain_children = domainlist;
74444 + }
74445 +
74446 + err = copy_user_transitions(r_tmp);
74447 + if (err)
74448 + return err;
74449 +
74450 + memset(r_tmp->subj_hash, 0,
74451 + r_tmp->subj_hash_size *
74452 + sizeof (struct acl_subject_label *));
74453 +
74454 + /* acquire the list of subjects, then NULL out
74455 + the list prior to parsing the subjects for this role,
74456 + as during this parsing the list is replaced with a list
74457 + of *nested* subjects for the role
74458 + */
74459 + subj_list = r_tmp->hash->first;
74460 +
74461 + /* set nested subject list to null */
74462 + r_tmp->hash->first = NULL;
74463 +
74464 + err = copy_user_subjs(subj_list, r_tmp);
74465 +
74466 + if (err)
74467 + return err;
74468 +
74469 + insert_acl_role_label(r_tmp);
74470 + }
74471 +
74472 + if (polstate->default_role == NULL || polstate->kernel_role == NULL)
74473 + return -EINVAL;
74474 +
74475 + return err;
74476 +}
74477 +
74478 +static int gracl_reload_apply_policies(void *reload)
74479 +{
74480 + struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
74481 + struct task_struct *task, *task2;
74482 + struct acl_role_label *role, *rtmp;
74483 + struct acl_subject_label *subj;
74484 + const struct cred *cred;
74485 + int role_applied;
74486 + int ret = 0;
74487 +
74488 + memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
74489 + memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
74490 +
74491 + /* first make sure we'll be able to apply the new policy cleanly */
74492 + do_each_thread(task2, task) {
74493 + if (task->exec_file == NULL)
74494 + continue;
74495 + role_applied = 0;
74496 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74497 + /* preserve special roles */
74498 + FOR_EACH_ROLE_START(role)
74499 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74500 + rtmp = task->role;
74501 + task->role = role;
74502 + role_applied = 1;
74503 + break;
74504 + }
74505 + FOR_EACH_ROLE_END(role)
74506 + }
74507 + if (!role_applied) {
74508 + cred = __task_cred(task);
74509 + rtmp = task->role;
74510 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74511 + }
74512 + /* this handles non-nested inherited subjects, nested subjects will still
74513 + be dropped currently */
74514 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74515 + task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
74516 + /* change the role back so that we've made no modifications to the policy */
74517 + task->role = rtmp;
74518 +
74519 + if (subj == NULL || task->tmpacl == NULL) {
74520 + ret = -EINVAL;
74521 + goto out;
74522 + }
74523 + } while_each_thread(task2, task);
74524 +
74525 + /* now actually apply the policy */
74526 +
74527 + do_each_thread(task2, task) {
74528 + if (task->exec_file) {
74529 + role_applied = 0;
74530 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74531 + /* preserve special roles */
74532 + FOR_EACH_ROLE_START(role)
74533 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74534 + task->role = role;
74535 + role_applied = 1;
74536 + break;
74537 + }
74538 + FOR_EACH_ROLE_END(role)
74539 + }
74540 + if (!role_applied) {
74541 + cred = __task_cred(task);
74542 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74543 + }
74544 + /* this handles non-nested inherited subjects, nested subjects will still
74545 + be dropped currently */
74546 + if (!reload_state->oldmode && task->inherited)
74547 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74548 + else {
74549 + /* looked up and tagged to the task previously */
74550 + subj = task->tmpacl;
74551 + }
74552 + /* subj will be non-null */
74553 + __gr_apply_subject_to_task(polstate, task, subj);
74554 + if (reload_state->oldmode) {
74555 + task->acl_role_id = 0;
74556 + task->acl_sp_role = 0;
74557 + task->inherited = 0;
74558 + }
74559 + } else {
74560 + // it's a kernel process
74561 + task->role = polstate->kernel_role;
74562 + task->acl = polstate->kernel_role->root_label;
74563 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
74564 + task->acl->mode &= ~GR_PROCFIND;
74565 +#endif
74566 + }
74567 + } while_each_thread(task2, task);
74568 +
74569 + memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
74570 + memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
74571 +
74572 +out:
74573 +
74574 + return ret;
74575 +}
74576 +
74577 +static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
74578 +{
74579 + struct gr_reload_state new_reload_state = { };
74580 + int err;
74581 +
74582 + new_reload_state.oldpolicy_ptr = polstate;
74583 + new_reload_state.oldalloc_ptr = current_alloc_state;
74584 + new_reload_state.oldmode = oldmode;
74585 +
74586 + current_alloc_state = &new_reload_state.newalloc;
74587 + polstate = &new_reload_state.newpolicy;
74588 +
74589 + /* everything relevant is now saved off, copy in the new policy */
74590 + if (init_variables(args, true)) {
74591 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74592 + err = -ENOMEM;
74593 + goto error;
74594 + }
74595 +
74596 + err = copy_user_acl(args);
74597 + free_init_variables();
74598 + if (err)
74599 + goto error;
74600 + /* the new policy is copied in, with the old policy available via saved_state
74601 + first go through applying roles, making sure to preserve special roles
74602 + then apply new subjects, making sure to preserve inherited and nested subjects,
74603 + though currently only inherited subjects will be preserved
74604 + */
74605 + err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
74606 + if (err)
74607 + goto error;
74608 +
74609 + /* we've now applied the new policy, so restore the old policy state to free it */
74610 + polstate = &new_reload_state.oldpolicy;
74611 + current_alloc_state = &new_reload_state.oldalloc;
74612 + free_variables(true);
74613 +
74614 + /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
74615 + to running_polstate/current_alloc_state inside stop_machine
74616 + */
74617 + err = 0;
74618 + goto out;
74619 +error:
74620 + /* on error of loading the new policy, we'll just keep the previous
74621 + policy set around
74622 + */
74623 + free_variables(true);
74624 +
74625 + /* doesn't affect runtime, but maintains consistent state */
74626 +out:
74627 + polstate = new_reload_state.oldpolicy_ptr;
74628 + current_alloc_state = new_reload_state.oldalloc_ptr;
74629 +
74630 + return err;
74631 +}
74632 +
74633 +static int
74634 +gracl_init(struct gr_arg *args)
74635 +{
74636 + int error = 0;
74637 +
74638 + memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
74639 + memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
74640 +
74641 + if (init_variables(args, false)) {
74642 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74643 + error = -ENOMEM;
74644 + goto out;
74645 + }
74646 +
74647 + error = copy_user_acl(args);
74648 + free_init_variables();
74649 + if (error)
74650 + goto out;
74651 +
74652 + error = gr_set_acls(0);
74653 + if (error)
74654 + goto out;
74655 +
74656 + gr_enable_rbac_system();
74657 +
74658 + return 0;
74659 +
74660 +out:
74661 + free_variables(false);
74662 + return error;
74663 +}
74664 +
74665 +static int
74666 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
74667 + unsigned char **sum)
74668 +{
74669 + struct acl_role_label *r;
74670 + struct role_allowed_ip *ipp;
74671 + struct role_transition *trans;
74672 + unsigned int i;
74673 + int found = 0;
74674 + u32 curr_ip = current->signal->curr_ip;
74675 +
74676 + current->signal->saved_ip = curr_ip;
74677 +
74678 + /* check transition table */
74679 +
74680 + for (trans = current->role->transitions; trans; trans = trans->next) {
74681 + if (!strcmp(rolename, trans->rolename)) {
74682 + found = 1;
74683 + break;
74684 + }
74685 + }
74686 +
74687 + if (!found)
74688 + return 0;
74689 +
74690 + /* handle special roles that do not require authentication
74691 + and check ip */
74692 +
74693 + FOR_EACH_ROLE_START(r)
74694 + if (!strcmp(rolename, r->rolename) &&
74695 + (r->roletype & GR_ROLE_SPECIAL)) {
74696 + found = 0;
74697 + if (r->allowed_ips != NULL) {
74698 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
74699 + if ((ntohl(curr_ip) & ipp->netmask) ==
74700 + (ntohl(ipp->addr) & ipp->netmask))
74701 + found = 1;
74702 + }
74703 + } else
74704 + found = 2;
74705 + if (!found)
74706 + return 0;
74707 +
74708 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
74709 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
74710 + *salt = NULL;
74711 + *sum = NULL;
74712 + return 1;
74713 + }
74714 + }
74715 + FOR_EACH_ROLE_END(r)
74716 +
74717 + for (i = 0; i < polstate->num_sprole_pws; i++) {
74718 + if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
74719 + *salt = polstate->acl_special_roles[i]->salt;
74720 + *sum = polstate->acl_special_roles[i]->sum;
74721 + return 1;
74722 + }
74723 + }
74724 +
74725 + return 0;
74726 +}
74727 +
74728 +int gr_check_secure_terminal(struct task_struct *task)
74729 +{
74730 + struct task_struct *p, *p2, *p3;
74731 + struct files_struct *files;
74732 + struct fdtable *fdt;
74733 + struct file *our_file = NULL, *file;
74734 + int i;
74735 +
74736 + if (task->signal->tty == NULL)
74737 + return 1;
74738 +
74739 + files = get_files_struct(task);
74740 + if (files != NULL) {
74741 + rcu_read_lock();
74742 + fdt = files_fdtable(files);
74743 + for (i=0; i < fdt->max_fds; i++) {
74744 + file = fcheck_files(files, i);
74745 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
74746 + get_file(file);
74747 + our_file = file;
74748 + }
74749 + }
74750 + rcu_read_unlock();
74751 + put_files_struct(files);
74752 + }
74753 +
74754 + if (our_file == NULL)
74755 + return 1;
74756 +
74757 + read_lock(&tasklist_lock);
74758 + do_each_thread(p2, p) {
74759 + files = get_files_struct(p);
74760 + if (files == NULL ||
74761 + (p->signal && p->signal->tty == task->signal->tty)) {
74762 + if (files != NULL)
74763 + put_files_struct(files);
74764 + continue;
74765 + }
74766 + rcu_read_lock();
74767 + fdt = files_fdtable(files);
74768 + for (i=0; i < fdt->max_fds; i++) {
74769 + file = fcheck_files(files, i);
74770 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
74771 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
74772 + p3 = task;
74773 + while (task_pid_nr(p3) > 0) {
74774 + if (p3 == p)
74775 + break;
74776 + p3 = p3->real_parent;
74777 + }
74778 + if (p3 == p)
74779 + break;
74780 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
74781 + gr_handle_alertkill(p);
74782 + rcu_read_unlock();
74783 + put_files_struct(files);
74784 + read_unlock(&tasklist_lock);
74785 + fput(our_file);
74786 + return 0;
74787 + }
74788 + }
74789 + rcu_read_unlock();
74790 + put_files_struct(files);
74791 + } while_each_thread(p2, p);
74792 + read_unlock(&tasklist_lock);
74793 +
74794 + fput(our_file);
74795 + return 1;
74796 +}
74797 +
74798 +ssize_t
74799 +write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
74800 +{
74801 + struct gr_arg_wrapper uwrap;
74802 + unsigned char *sprole_salt = NULL;
74803 + unsigned char *sprole_sum = NULL;
74804 + int error = 0;
74805 + int error2 = 0;
74806 + size_t req_count = 0;
74807 + unsigned char oldmode = 0;
74808 +
74809 + mutex_lock(&gr_dev_mutex);
74810 +
74811 + if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
74812 + error = -EPERM;
74813 + goto out;
74814 + }
74815 +
74816 +#ifdef CONFIG_COMPAT
74817 + pax_open_kernel();
74818 + if (is_compat_task()) {
74819 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
74820 + copy_gr_arg = &copy_gr_arg_compat;
74821 + copy_acl_object_label = &copy_acl_object_label_compat;
74822 + copy_acl_subject_label = &copy_acl_subject_label_compat;
74823 + copy_acl_role_label = &copy_acl_role_label_compat;
74824 + copy_acl_ip_label = &copy_acl_ip_label_compat;
74825 + copy_role_allowed_ip = &copy_role_allowed_ip_compat;
74826 + copy_role_transition = &copy_role_transition_compat;
74827 + copy_sprole_pw = &copy_sprole_pw_compat;
74828 + copy_gr_hash_struct = &copy_gr_hash_struct_compat;
74829 + copy_pointer_from_array = &copy_pointer_from_array_compat;
74830 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
74831 + } else {
74832 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
74833 + copy_gr_arg = &copy_gr_arg_normal;
74834 + copy_acl_object_label = &copy_acl_object_label_normal;
74835 + copy_acl_subject_label = &copy_acl_subject_label_normal;
74836 + copy_acl_role_label = &copy_acl_role_label_normal;
74837 + copy_acl_ip_label = &copy_acl_ip_label_normal;
74838 + copy_role_allowed_ip = &copy_role_allowed_ip_normal;
74839 + copy_role_transition = &copy_role_transition_normal;
74840 + copy_sprole_pw = &copy_sprole_pw_normal;
74841 + copy_gr_hash_struct = &copy_gr_hash_struct_normal;
74842 + copy_pointer_from_array = &copy_pointer_from_array_normal;
74843 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
74844 + }
74845 + pax_close_kernel();
74846 +#endif
74847 +
74848 + req_count = get_gr_arg_wrapper_size();
74849 +
74850 + if (count != req_count) {
74851 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
74852 + error = -EINVAL;
74853 + goto out;
74854 + }
74855 +
74856 +
74857 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
74858 + gr_auth_expires = 0;
74859 + gr_auth_attempts = 0;
74860 + }
74861 +
74862 + error = copy_gr_arg_wrapper(buf, &uwrap);
74863 + if (error)
74864 + goto out;
74865 +
74866 + error = copy_gr_arg(uwrap.arg, gr_usermode);
74867 + if (error)
74868 + goto out;
74869 +
74870 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74871 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
74872 + time_after(gr_auth_expires, get_seconds())) {
74873 + error = -EBUSY;
74874 + goto out;
74875 + }
74876 +
74877 + /* if non-root trying to do anything other than use a special role,
74878 + do not attempt authentication, do not count towards authentication
74879 + locking
74880 + */
74881 +
74882 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
74883 + gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74884 + gr_is_global_nonroot(current_uid())) {
74885 + error = -EPERM;
74886 + goto out;
74887 + }
74888 +
74889 + /* ensure pw and special role name are null terminated */
74890 +
74891 + gr_usermode->pw[GR_PW_LEN - 1] = '\0';
74892 + gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
74893 +
74894 + /* Okay.
74895 + * We have our enough of the argument structure..(we have yet
74896 + * to copy_from_user the tables themselves) . Copy the tables
74897 + * only if we need them, i.e. for loading operations. */
74898 +
74899 + switch (gr_usermode->mode) {
74900 + case GR_STATUS:
74901 + if (gr_acl_is_enabled()) {
74902 + error = 1;
74903 + if (!gr_check_secure_terminal(current))
74904 + error = 3;
74905 + } else
74906 + error = 2;
74907 + goto out;
74908 + case GR_SHUTDOWN:
74909 + if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
74910 + stop_machine(gr_rbac_disable, NULL, NULL);
74911 + free_variables(false);
74912 + memset(gr_usermode, 0, sizeof(struct gr_arg));
74913 + memset(gr_system_salt, 0, GR_SALT_LEN);
74914 + memset(gr_system_sum, 0, GR_SHA_LEN);
74915 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
74916 + } else if (gr_acl_is_enabled()) {
74917 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
74918 + error = -EPERM;
74919 + } else {
74920 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
74921 + error = -EAGAIN;
74922 + }
74923 + break;
74924 + case GR_ENABLE:
74925 + if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
74926 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
74927 + else {
74928 + if (gr_acl_is_enabled())
74929 + error = -EAGAIN;
74930 + else
74931 + error = error2;
74932 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
74933 + }
74934 + break;
74935 + case GR_OLDRELOAD:
74936 + oldmode = 1;
74937 + case GR_RELOAD:
74938 + if (!gr_acl_is_enabled()) {
74939 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
74940 + error = -EAGAIN;
74941 + } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
74942 + error2 = gracl_reload(gr_usermode, oldmode);
74943 + if (!error2)
74944 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
74945 + else {
74946 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
74947 + error = error2;
74948 + }
74949 + } else {
74950 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
74951 + error = -EPERM;
74952 + }
74953 + break;
74954 + case GR_SEGVMOD:
74955 + if (unlikely(!gr_acl_is_enabled())) {
74956 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
74957 + error = -EAGAIN;
74958 + break;
74959 + }
74960 +
74961 + if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
74962 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
74963 + if (gr_usermode->segv_device && gr_usermode->segv_inode) {
74964 + struct acl_subject_label *segvacl;
74965 + segvacl =
74966 + lookup_acl_subj_label(gr_usermode->segv_inode,
74967 + gr_usermode->segv_device,
74968 + current->role);
74969 + if (segvacl) {
74970 + segvacl->crashes = 0;
74971 + segvacl->expires = 0;
74972 + }
74973 + } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
74974 + gr_remove_uid(gr_usermode->segv_uid);
74975 + }
74976 + } else {
74977 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
74978 + error = -EPERM;
74979 + }
74980 + break;
74981 + case GR_SPROLE:
74982 + case GR_SPROLEPAM:
74983 + if (unlikely(!gr_acl_is_enabled())) {
74984 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
74985 + error = -EAGAIN;
74986 + break;
74987 + }
74988 +
74989 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
74990 + current->role->expires = 0;
74991 + current->role->auth_attempts = 0;
74992 + }
74993 +
74994 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
74995 + time_after(current->role->expires, get_seconds())) {
74996 + error = -EBUSY;
74997 + goto out;
74998 + }
74999 +
75000 + if (lookup_special_role_auth
75001 + (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75002 + && ((!sprole_salt && !sprole_sum)
75003 + || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75004 + char *p = "";
75005 + assign_special_role(gr_usermode->sp_role);
75006 + read_lock(&tasklist_lock);
75007 + if (current->real_parent)
75008 + p = current->real_parent->role->rolename;
75009 + read_unlock(&tasklist_lock);
75010 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75011 + p, acl_sp_role_value);
75012 + } else {
75013 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75014 + error = -EPERM;
75015 + if(!(current->role->auth_attempts++))
75016 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75017 +
75018 + goto out;
75019 + }
75020 + break;
75021 + case GR_UNSPROLE:
75022 + if (unlikely(!gr_acl_is_enabled())) {
75023 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75024 + error = -EAGAIN;
75025 + break;
75026 + }
75027 +
75028 + if (current->role->roletype & GR_ROLE_SPECIAL) {
75029 + char *p = "";
75030 + int i = 0;
75031 +
75032 + read_lock(&tasklist_lock);
75033 + if (current->real_parent) {
75034 + p = current->real_parent->role->rolename;
75035 + i = current->real_parent->acl_role_id;
75036 + }
75037 + read_unlock(&tasklist_lock);
75038 +
75039 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75040 + gr_set_acls(1);
75041 + } else {
75042 + error = -EPERM;
75043 + goto out;
75044 + }
75045 + break;
75046 + default:
75047 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75048 + error = -EINVAL;
75049 + break;
75050 + }
75051 +
75052 + if (error != -EPERM)
75053 + goto out;
75054 +
75055 + if(!(gr_auth_attempts++))
75056 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75057 +
75058 + out:
75059 + mutex_unlock(&gr_dev_mutex);
75060 +
75061 + if (!error)
75062 + error = req_count;
75063 +
75064 + return error;
75065 +}
75066 +
75067 +int
75068 +gr_set_acls(const int type)
75069 +{
75070 + struct task_struct *task, *task2;
75071 + struct acl_role_label *role = current->role;
75072 + struct acl_subject_label *subj;
75073 + __u16 acl_role_id = current->acl_role_id;
75074 + const struct cred *cred;
75075 + int ret;
75076 +
75077 + rcu_read_lock();
75078 + read_lock(&tasklist_lock);
75079 + read_lock(&grsec_exec_file_lock);
75080 + do_each_thread(task2, task) {
75081 + /* check to see if we're called from the exit handler,
75082 + if so, only replace ACLs that have inherited the admin
75083 + ACL */
75084 +
75085 + if (type && (task->role != role ||
75086 + task->acl_role_id != acl_role_id))
75087 + continue;
75088 +
75089 + task->acl_role_id = 0;
75090 + task->acl_sp_role = 0;
75091 + task->inherited = 0;
75092 +
75093 + if (task->exec_file) {
75094 + cred = __task_cred(task);
75095 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75096 + subj = __gr_get_subject_for_task(polstate, task, NULL);
75097 + if (subj == NULL) {
75098 + ret = -EINVAL;
75099 + read_unlock(&grsec_exec_file_lock);
75100 + read_unlock(&tasklist_lock);
75101 + rcu_read_unlock();
75102 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75103 + return ret;
75104 + }
75105 + __gr_apply_subject_to_task(polstate, task, subj);
75106 + } else {
75107 + // it's a kernel process
75108 + task->role = polstate->kernel_role;
75109 + task->acl = polstate->kernel_role->root_label;
75110 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75111 + task->acl->mode &= ~GR_PROCFIND;
75112 +#endif
75113 + }
75114 + } while_each_thread(task2, task);
75115 + read_unlock(&grsec_exec_file_lock);
75116 + read_unlock(&tasklist_lock);
75117 + rcu_read_unlock();
75118 +
75119 + return 0;
75120 +}
75121 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75122 new file mode 100644
75123 index 0000000..39645c9
75124 --- /dev/null
75125 +++ b/grsecurity/gracl_res.c
75126 @@ -0,0 +1,68 @@
75127 +#include <linux/kernel.h>
75128 +#include <linux/sched.h>
75129 +#include <linux/gracl.h>
75130 +#include <linux/grinternal.h>
75131 +
75132 +static const char *restab_log[] = {
75133 + [RLIMIT_CPU] = "RLIMIT_CPU",
75134 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75135 + [RLIMIT_DATA] = "RLIMIT_DATA",
75136 + [RLIMIT_STACK] = "RLIMIT_STACK",
75137 + [RLIMIT_CORE] = "RLIMIT_CORE",
75138 + [RLIMIT_RSS] = "RLIMIT_RSS",
75139 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
75140 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75141 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75142 + [RLIMIT_AS] = "RLIMIT_AS",
75143 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75144 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75145 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75146 + [RLIMIT_NICE] = "RLIMIT_NICE",
75147 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75148 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75149 + [GR_CRASH_RES] = "RLIMIT_CRASH"
75150 +};
75151 +
75152 +void
75153 +gr_log_resource(const struct task_struct *task,
75154 + const int res, const unsigned long wanted, const int gt)
75155 +{
75156 + const struct cred *cred;
75157 + unsigned long rlim;
75158 +
75159 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
75160 + return;
75161 +
75162 + // not yet supported resource
75163 + if (unlikely(!restab_log[res]))
75164 + return;
75165 +
75166 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75167 + rlim = task_rlimit_max(task, res);
75168 + else
75169 + rlim = task_rlimit(task, res);
75170 +
75171 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75172 + return;
75173 +
75174 + rcu_read_lock();
75175 + cred = __task_cred(task);
75176 +
75177 + if (res == RLIMIT_NPROC &&
75178 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75179 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75180 + goto out_rcu_unlock;
75181 + else if (res == RLIMIT_MEMLOCK &&
75182 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75183 + goto out_rcu_unlock;
75184 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75185 + goto out_rcu_unlock;
75186 + rcu_read_unlock();
75187 +
75188 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75189 +
75190 + return;
75191 +out_rcu_unlock:
75192 + rcu_read_unlock();
75193 + return;
75194 +}
75195 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75196 new file mode 100644
75197 index 0000000..2040e61
75198 --- /dev/null
75199 +++ b/grsecurity/gracl_segv.c
75200 @@ -0,0 +1,313 @@
75201 +#include <linux/kernel.h>
75202 +#include <linux/mm.h>
75203 +#include <asm/uaccess.h>
75204 +#include <asm/errno.h>
75205 +#include <asm/mman.h>
75206 +#include <net/sock.h>
75207 +#include <linux/file.h>
75208 +#include <linux/fs.h>
75209 +#include <linux/net.h>
75210 +#include <linux/in.h>
75211 +#include <linux/slab.h>
75212 +#include <linux/types.h>
75213 +#include <linux/sched.h>
75214 +#include <linux/timer.h>
75215 +#include <linux/gracl.h>
75216 +#include <linux/grsecurity.h>
75217 +#include <linux/grinternal.h>
75218 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75219 +#include <linux/magic.h>
75220 +#include <linux/pagemap.h>
75221 +#include "../fs/btrfs/async-thread.h"
75222 +#include "../fs/btrfs/ctree.h"
75223 +#include "../fs/btrfs/btrfs_inode.h"
75224 +#endif
75225 +
75226 +static struct crash_uid *uid_set;
75227 +static unsigned short uid_used;
75228 +static DEFINE_SPINLOCK(gr_uid_lock);
75229 +extern rwlock_t gr_inode_lock;
75230 +extern struct acl_subject_label *
75231 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
75232 + struct acl_role_label *role);
75233 +
75234 +static inline dev_t __get_dev(const struct dentry *dentry)
75235 +{
75236 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75237 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
75238 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
75239 + else
75240 +#endif
75241 + return dentry->d_sb->s_dev;
75242 +}
75243 +
75244 +int
75245 +gr_init_uidset(void)
75246 +{
75247 + uid_set =
75248 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
75249 + uid_used = 0;
75250 +
75251 + return uid_set ? 1 : 0;
75252 +}
75253 +
75254 +void
75255 +gr_free_uidset(void)
75256 +{
75257 + if (uid_set) {
75258 + struct crash_uid *tmpset;
75259 + spin_lock(&gr_uid_lock);
75260 + tmpset = uid_set;
75261 + uid_set = NULL;
75262 + uid_used = 0;
75263 + spin_unlock(&gr_uid_lock);
75264 + if (tmpset)
75265 + kfree(tmpset);
75266 + }
75267 +
75268 + return;
75269 +}
75270 +
75271 +int
75272 +gr_find_uid(const uid_t uid)
75273 +{
75274 + struct crash_uid *tmp = uid_set;
75275 + uid_t buid;
75276 + int low = 0, high = uid_used - 1, mid;
75277 +
75278 + while (high >= low) {
75279 + mid = (low + high) >> 1;
75280 + buid = tmp[mid].uid;
75281 + if (buid == uid)
75282 + return mid;
75283 + if (buid > uid)
75284 + high = mid - 1;
75285 + if (buid < uid)
75286 + low = mid + 1;
75287 + }
75288 +
75289 + return -1;
75290 +}
75291 +
75292 +static __inline__ void
75293 +gr_insertsort(void)
75294 +{
75295 + unsigned short i, j;
75296 + struct crash_uid index;
75297 +
75298 + for (i = 1; i < uid_used; i++) {
75299 + index = uid_set[i];
75300 + j = i;
75301 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
75302 + uid_set[j] = uid_set[j - 1];
75303 + j--;
75304 + }
75305 + uid_set[j] = index;
75306 + }
75307 +
75308 + return;
75309 +}
75310 +
75311 +static __inline__ void
75312 +gr_insert_uid(const kuid_t kuid, const unsigned long expires)
75313 +{
75314 + int loc;
75315 + uid_t uid = GR_GLOBAL_UID(kuid);
75316 +
75317 + if (uid_used == GR_UIDTABLE_MAX)
75318 + return;
75319 +
75320 + loc = gr_find_uid(uid);
75321 +
75322 + if (loc >= 0) {
75323 + uid_set[loc].expires = expires;
75324 + return;
75325 + }
75326 +
75327 + uid_set[uid_used].uid = uid;
75328 + uid_set[uid_used].expires = expires;
75329 + uid_used++;
75330 +
75331 + gr_insertsort();
75332 +
75333 + return;
75334 +}
75335 +
75336 +void
75337 +gr_remove_uid(const unsigned short loc)
75338 +{
75339 + unsigned short i;
75340 +
75341 + for (i = loc + 1; i < uid_used; i++)
75342 + uid_set[i - 1] = uid_set[i];
75343 +
75344 + uid_used--;
75345 +
75346 + return;
75347 +}
75348 +
75349 +int
75350 +gr_check_crash_uid(const kuid_t kuid)
75351 +{
75352 + int loc;
75353 + int ret = 0;
75354 + uid_t uid;
75355 +
75356 + if (unlikely(!gr_acl_is_enabled()))
75357 + return 0;
75358 +
75359 + uid = GR_GLOBAL_UID(kuid);
75360 +
75361 + spin_lock(&gr_uid_lock);
75362 + loc = gr_find_uid(uid);
75363 +
75364 + if (loc < 0)
75365 + goto out_unlock;
75366 +
75367 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
75368 + gr_remove_uid(loc);
75369 + else
75370 + ret = 1;
75371 +
75372 +out_unlock:
75373 + spin_unlock(&gr_uid_lock);
75374 + return ret;
75375 +}
75376 +
75377 +static __inline__ int
75378 +proc_is_setxid(const struct cred *cred)
75379 +{
75380 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
75381 + !uid_eq(cred->uid, cred->fsuid))
75382 + return 1;
75383 + if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
75384 + !gid_eq(cred->gid, cred->fsgid))
75385 + return 1;
75386 +
75387 + return 0;
75388 +}
75389 +
75390 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
75391 +
75392 +void
75393 +gr_handle_crash(struct task_struct *task, const int sig)
75394 +{
75395 + struct acl_subject_label *curr;
75396 + struct task_struct *tsk, *tsk2;
75397 + const struct cred *cred;
75398 + const struct cred *cred2;
75399 +
75400 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
75401 + return;
75402 +
75403 + if (unlikely(!gr_acl_is_enabled()))
75404 + return;
75405 +
75406 + curr = task->acl;
75407 +
75408 + if (!(curr->resmask & (1U << GR_CRASH_RES)))
75409 + return;
75410 +
75411 + if (time_before_eq(curr->expires, get_seconds())) {
75412 + curr->expires = 0;
75413 + curr->crashes = 0;
75414 + }
75415 +
75416 + curr->crashes++;
75417 +
75418 + if (!curr->expires)
75419 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
75420 +
75421 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75422 + time_after(curr->expires, get_seconds())) {
75423 + rcu_read_lock();
75424 + cred = __task_cred(task);
75425 + if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
75426 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75427 + spin_lock(&gr_uid_lock);
75428 + gr_insert_uid(cred->uid, curr->expires);
75429 + spin_unlock(&gr_uid_lock);
75430 + curr->expires = 0;
75431 + curr->crashes = 0;
75432 + read_lock(&tasklist_lock);
75433 + do_each_thread(tsk2, tsk) {
75434 + cred2 = __task_cred(tsk);
75435 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
75436 + gr_fake_force_sig(SIGKILL, tsk);
75437 + } while_each_thread(tsk2, tsk);
75438 + read_unlock(&tasklist_lock);
75439 + } else {
75440 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75441 + read_lock(&tasklist_lock);
75442 + read_lock(&grsec_exec_file_lock);
75443 + do_each_thread(tsk2, tsk) {
75444 + if (likely(tsk != task)) {
75445 + // if this thread has the same subject as the one that triggered
75446 + // RES_CRASH and it's the same binary, kill it
75447 + if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
75448 + gr_fake_force_sig(SIGKILL, tsk);
75449 + }
75450 + } while_each_thread(tsk2, tsk);
75451 + read_unlock(&grsec_exec_file_lock);
75452 + read_unlock(&tasklist_lock);
75453 + }
75454 + rcu_read_unlock();
75455 + }
75456 +
75457 + return;
75458 +}
75459 +
75460 +int
75461 +gr_check_crash_exec(const struct file *filp)
75462 +{
75463 + struct acl_subject_label *curr;
75464 +
75465 + if (unlikely(!gr_acl_is_enabled()))
75466 + return 0;
75467 +
75468 + read_lock(&gr_inode_lock);
75469 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
75470 + __get_dev(filp->f_path.dentry),
75471 + current->role);
75472 + read_unlock(&gr_inode_lock);
75473 +
75474 + if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
75475 + (!curr->crashes && !curr->expires))
75476 + return 0;
75477 +
75478 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75479 + time_after(curr->expires, get_seconds()))
75480 + return 1;
75481 + else if (time_before_eq(curr->expires, get_seconds())) {
75482 + curr->crashes = 0;
75483 + curr->expires = 0;
75484 + }
75485 +
75486 + return 0;
75487 +}
75488 +
75489 +void
75490 +gr_handle_alertkill(struct task_struct *task)
75491 +{
75492 + struct acl_subject_label *curracl;
75493 + __u32 curr_ip;
75494 + struct task_struct *p, *p2;
75495 +
75496 + if (unlikely(!gr_acl_is_enabled()))
75497 + return;
75498 +
75499 + curracl = task->acl;
75500 + curr_ip = task->signal->curr_ip;
75501 +
75502 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
75503 + read_lock(&tasklist_lock);
75504 + do_each_thread(p2, p) {
75505 + if (p->signal->curr_ip == curr_ip)
75506 + gr_fake_force_sig(SIGKILL, p);
75507 + } while_each_thread(p2, p);
75508 + read_unlock(&tasklist_lock);
75509 + } else if (curracl->mode & GR_KILLPROC)
75510 + gr_fake_force_sig(SIGKILL, task);
75511 +
75512 + return;
75513 +}
75514 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
75515 new file mode 100644
75516 index 0000000..6b0c9cc
75517 --- /dev/null
75518 +++ b/grsecurity/gracl_shm.c
75519 @@ -0,0 +1,40 @@
75520 +#include <linux/kernel.h>
75521 +#include <linux/mm.h>
75522 +#include <linux/sched.h>
75523 +#include <linux/file.h>
75524 +#include <linux/ipc.h>
75525 +#include <linux/gracl.h>
75526 +#include <linux/grsecurity.h>
75527 +#include <linux/grinternal.h>
75528 +
75529 +int
75530 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75531 + const u64 shm_createtime, const kuid_t cuid, const int shmid)
75532 +{
75533 + struct task_struct *task;
75534 +
75535 + if (!gr_acl_is_enabled())
75536 + return 1;
75537 +
75538 + rcu_read_lock();
75539 + read_lock(&tasklist_lock);
75540 +
75541 + task = find_task_by_vpid(shm_cprid);
75542 +
75543 + if (unlikely(!task))
75544 + task = find_task_by_vpid(shm_lapid);
75545 +
75546 + if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
75547 + (task_pid_nr(task) == shm_lapid)) &&
75548 + (task->acl->mode & GR_PROTSHM) &&
75549 + (task->acl != current->acl))) {
75550 + read_unlock(&tasklist_lock);
75551 + rcu_read_unlock();
75552 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
75553 + return 0;
75554 + }
75555 + read_unlock(&tasklist_lock);
75556 + rcu_read_unlock();
75557 +
75558 + return 1;
75559 +}
75560 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
75561 new file mode 100644
75562 index 0000000..bc0be01
75563 --- /dev/null
75564 +++ b/grsecurity/grsec_chdir.c
75565 @@ -0,0 +1,19 @@
75566 +#include <linux/kernel.h>
75567 +#include <linux/sched.h>
75568 +#include <linux/fs.h>
75569 +#include <linux/file.h>
75570 +#include <linux/grsecurity.h>
75571 +#include <linux/grinternal.h>
75572 +
75573 +void
75574 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
75575 +{
75576 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
75577 + if ((grsec_enable_chdir && grsec_enable_group &&
75578 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
75579 + !grsec_enable_group)) {
75580 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
75581 + }
75582 +#endif
75583 + return;
75584 +}
75585 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
75586 new file mode 100644
75587 index 0000000..6d99cec
75588 --- /dev/null
75589 +++ b/grsecurity/grsec_chroot.c
75590 @@ -0,0 +1,385 @@
75591 +#include <linux/kernel.h>
75592 +#include <linux/module.h>
75593 +#include <linux/sched.h>
75594 +#include <linux/file.h>
75595 +#include <linux/fs.h>
75596 +#include <linux/mount.h>
75597 +#include <linux/types.h>
75598 +#include "../fs/mount.h"
75599 +#include <linux/grsecurity.h>
75600 +#include <linux/grinternal.h>
75601 +
75602 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75603 +int gr_init_ran;
75604 +#endif
75605 +
75606 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
75607 +{
75608 +#ifdef CONFIG_GRKERNSEC
75609 + if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
75610 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
75611 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75612 + && gr_init_ran
75613 +#endif
75614 + )
75615 + task->gr_is_chrooted = 1;
75616 + else {
75617 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75618 + if (task_pid_nr(task) == 1 && !gr_init_ran)
75619 + gr_init_ran = 1;
75620 +#endif
75621 + task->gr_is_chrooted = 0;
75622 + }
75623 +
75624 + task->gr_chroot_dentry = path->dentry;
75625 +#endif
75626 + return;
75627 +}
75628 +
75629 +void gr_clear_chroot_entries(struct task_struct *task)
75630 +{
75631 +#ifdef CONFIG_GRKERNSEC
75632 + task->gr_is_chrooted = 0;
75633 + task->gr_chroot_dentry = NULL;
75634 +#endif
75635 + return;
75636 +}
75637 +
75638 +int
75639 +gr_handle_chroot_unix(const pid_t pid)
75640 +{
75641 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
75642 + struct task_struct *p;
75643 +
75644 + if (unlikely(!grsec_enable_chroot_unix))
75645 + return 1;
75646 +
75647 + if (likely(!proc_is_chrooted(current)))
75648 + return 1;
75649 +
75650 + rcu_read_lock();
75651 + read_lock(&tasklist_lock);
75652 + p = find_task_by_vpid_unrestricted(pid);
75653 + if (unlikely(p && !have_same_root(current, p))) {
75654 + read_unlock(&tasklist_lock);
75655 + rcu_read_unlock();
75656 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
75657 + return 0;
75658 + }
75659 + read_unlock(&tasklist_lock);
75660 + rcu_read_unlock();
75661 +#endif
75662 + return 1;
75663 +}
75664 +
75665 +int
75666 +gr_handle_chroot_nice(void)
75667 +{
75668 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75669 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
75670 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
75671 + return -EPERM;
75672 + }
75673 +#endif
75674 + return 0;
75675 +}
75676 +
75677 +int
75678 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
75679 +{
75680 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75681 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
75682 + && proc_is_chrooted(current)) {
75683 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
75684 + return -EACCES;
75685 + }
75686 +#endif
75687 + return 0;
75688 +}
75689 +
75690 +int
75691 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
75692 +{
75693 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75694 + struct task_struct *p;
75695 + int ret = 0;
75696 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
75697 + return ret;
75698 +
75699 + read_lock(&tasklist_lock);
75700 + do_each_pid_task(pid, type, p) {
75701 + if (!have_same_root(current, p)) {
75702 + ret = 1;
75703 + goto out;
75704 + }
75705 + } while_each_pid_task(pid, type, p);
75706 +out:
75707 + read_unlock(&tasklist_lock);
75708 + return ret;
75709 +#endif
75710 + return 0;
75711 +}
75712 +
75713 +int
75714 +gr_pid_is_chrooted(struct task_struct *p)
75715 +{
75716 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75717 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
75718 + return 0;
75719 +
75720 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
75721 + !have_same_root(current, p)) {
75722 + return 1;
75723 + }
75724 +#endif
75725 + return 0;
75726 +}
75727 +
75728 +EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
75729 +
75730 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
75731 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
75732 +{
75733 + struct path path, currentroot;
75734 + int ret = 0;
75735 +
75736 + path.dentry = (struct dentry *)u_dentry;
75737 + path.mnt = (struct vfsmount *)u_mnt;
75738 + get_fs_root(current->fs, &currentroot);
75739 + if (path_is_under(&path, &currentroot))
75740 + ret = 1;
75741 + path_put(&currentroot);
75742 +
75743 + return ret;
75744 +}
75745 +#endif
75746 +
75747 +int
75748 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
75749 +{
75750 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75751 + if (!grsec_enable_chroot_fchdir)
75752 + return 1;
75753 +
75754 + if (!proc_is_chrooted(current))
75755 + return 1;
75756 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
75757 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
75758 + return 0;
75759 + }
75760 +#endif
75761 + return 1;
75762 +}
75763 +
75764 +int
75765 +gr_chroot_fhandle(void)
75766 +{
75767 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75768 + if (!grsec_enable_chroot_fchdir)
75769 + return 1;
75770 +
75771 + if (!proc_is_chrooted(current))
75772 + return 1;
75773 + else {
75774 + gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
75775 + return 0;
75776 + }
75777 +#endif
75778 + return 1;
75779 +}
75780 +
75781 +int
75782 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75783 + const u64 shm_createtime)
75784 +{
75785 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
75786 + struct task_struct *p;
75787 +
75788 + if (unlikely(!grsec_enable_chroot_shmat))
75789 + return 1;
75790 +
75791 + if (likely(!proc_is_chrooted(current)))
75792 + return 1;
75793 +
75794 + rcu_read_lock();
75795 + read_lock(&tasklist_lock);
75796 +
75797 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
75798 + if (time_before_eq64(p->start_time, shm_createtime)) {
75799 + if (have_same_root(current, p)) {
75800 + goto allow;
75801 + } else {
75802 + read_unlock(&tasklist_lock);
75803 + rcu_read_unlock();
75804 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75805 + return 0;
75806 + }
75807 + }
75808 + /* creator exited, pid reuse, fall through to next check */
75809 + }
75810 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
75811 + if (unlikely(!have_same_root(current, p))) {
75812 + read_unlock(&tasklist_lock);
75813 + rcu_read_unlock();
75814 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75815 + return 0;
75816 + }
75817 + }
75818 +
75819 +allow:
75820 + read_unlock(&tasklist_lock);
75821 + rcu_read_unlock();
75822 +#endif
75823 + return 1;
75824 +}
75825 +
75826 +void
75827 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
75828 +{
75829 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
75830 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
75831 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
75832 +#endif
75833 + return;
75834 +}
75835 +
75836 +int
75837 +gr_handle_chroot_mknod(const struct dentry *dentry,
75838 + const struct vfsmount *mnt, const int mode)
75839 +{
75840 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
75841 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
75842 + proc_is_chrooted(current)) {
75843 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
75844 + return -EPERM;
75845 + }
75846 +#endif
75847 + return 0;
75848 +}
75849 +
75850 +int
75851 +gr_handle_chroot_mount(const struct dentry *dentry,
75852 + const struct vfsmount *mnt, const char *dev_name)
75853 +{
75854 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
75855 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
75856 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
75857 + return -EPERM;
75858 + }
75859 +#endif
75860 + return 0;
75861 +}
75862 +
75863 +int
75864 +gr_handle_chroot_pivot(void)
75865 +{
75866 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
75867 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
75868 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
75869 + return -EPERM;
75870 + }
75871 +#endif
75872 + return 0;
75873 +}
75874 +
75875 +int
75876 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
75877 +{
75878 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
75879 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
75880 + !gr_is_outside_chroot(dentry, mnt)) {
75881 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
75882 + return -EPERM;
75883 + }
75884 +#endif
75885 + return 0;
75886 +}
75887 +
75888 +extern const char *captab_log[];
75889 +extern int captab_log_entries;
75890 +
75891 +int
75892 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
75893 +{
75894 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75895 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
75896 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
75897 + if (cap_raised(chroot_caps, cap)) {
75898 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
75899 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
75900 + }
75901 + return 0;
75902 + }
75903 + }
75904 +#endif
75905 + return 1;
75906 +}
75907 +
75908 +int
75909 +gr_chroot_is_capable(const int cap)
75910 +{
75911 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75912 + return gr_task_chroot_is_capable(current, current_cred(), cap);
75913 +#endif
75914 + return 1;
75915 +}
75916 +
75917 +int
75918 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
75919 +{
75920 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75921 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
75922 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
75923 + if (cap_raised(chroot_caps, cap)) {
75924 + return 0;
75925 + }
75926 + }
75927 +#endif
75928 + return 1;
75929 +}
75930 +
75931 +int
75932 +gr_chroot_is_capable_nolog(const int cap)
75933 +{
75934 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75935 + return gr_task_chroot_is_capable_nolog(current, cap);
75936 +#endif
75937 + return 1;
75938 +}
75939 +
75940 +int
75941 +gr_handle_chroot_sysctl(const int op)
75942 +{
75943 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
75944 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
75945 + proc_is_chrooted(current))
75946 + return -EACCES;
75947 +#endif
75948 + return 0;
75949 +}
75950 +
75951 +void
75952 +gr_handle_chroot_chdir(const struct path *path)
75953 +{
75954 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
75955 + if (grsec_enable_chroot_chdir)
75956 + set_fs_pwd(current->fs, path);
75957 +#endif
75958 + return;
75959 +}
75960 +
75961 +int
75962 +gr_handle_chroot_chmod(const struct dentry *dentry,
75963 + const struct vfsmount *mnt, const int mode)
75964 +{
75965 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
75966 + /* allow chmod +s on directories, but not files */
75967 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
75968 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
75969 + proc_is_chrooted(current)) {
75970 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
75971 + return -EPERM;
75972 + }
75973 +#endif
75974 + return 0;
75975 +}
75976 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
75977 new file mode 100644
75978 index 0000000..0f9ac91
75979 --- /dev/null
75980 +++ b/grsecurity/grsec_disabled.c
75981 @@ -0,0 +1,440 @@
75982 +#include <linux/kernel.h>
75983 +#include <linux/module.h>
75984 +#include <linux/sched.h>
75985 +#include <linux/file.h>
75986 +#include <linux/fs.h>
75987 +#include <linux/kdev_t.h>
75988 +#include <linux/net.h>
75989 +#include <linux/in.h>
75990 +#include <linux/ip.h>
75991 +#include <linux/skbuff.h>
75992 +#include <linux/sysctl.h>
75993 +
75994 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
75995 +void
75996 +pax_set_initial_flags(struct linux_binprm *bprm)
75997 +{
75998 + return;
75999 +}
76000 +#endif
76001 +
76002 +#ifdef CONFIG_SYSCTL
76003 +__u32
76004 +gr_handle_sysctl(const struct ctl_table * table, const int op)
76005 +{
76006 + return 0;
76007 +}
76008 +#endif
76009 +
76010 +#ifdef CONFIG_TASKSTATS
76011 +int gr_is_taskstats_denied(int pid)
76012 +{
76013 + return 0;
76014 +}
76015 +#endif
76016 +
76017 +int
76018 +gr_acl_is_enabled(void)
76019 +{
76020 + return 0;
76021 +}
76022 +
76023 +int
76024 +gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76025 +{
76026 + return 0;
76027 +}
76028 +
76029 +void
76030 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76031 +{
76032 + return;
76033 +}
76034 +
76035 +int
76036 +gr_handle_rawio(const struct inode *inode)
76037 +{
76038 + return 0;
76039 +}
76040 +
76041 +void
76042 +gr_acl_handle_psacct(struct task_struct *task, const long code)
76043 +{
76044 + return;
76045 +}
76046 +
76047 +int
76048 +gr_handle_ptrace(struct task_struct *task, const long request)
76049 +{
76050 + return 0;
76051 +}
76052 +
76053 +int
76054 +gr_handle_proc_ptrace(struct task_struct *task)
76055 +{
76056 + return 0;
76057 +}
76058 +
76059 +int
76060 +gr_set_acls(const int type)
76061 +{
76062 + return 0;
76063 +}
76064 +
76065 +int
76066 +gr_check_hidden_task(const struct task_struct *tsk)
76067 +{
76068 + return 0;
76069 +}
76070 +
76071 +int
76072 +gr_check_protected_task(const struct task_struct *task)
76073 +{
76074 + return 0;
76075 +}
76076 +
76077 +int
76078 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76079 +{
76080 + return 0;
76081 +}
76082 +
76083 +void
76084 +gr_copy_label(struct task_struct *tsk)
76085 +{
76086 + return;
76087 +}
76088 +
76089 +void
76090 +gr_set_pax_flags(struct task_struct *task)
76091 +{
76092 + return;
76093 +}
76094 +
76095 +int
76096 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76097 + const int unsafe_share)
76098 +{
76099 + return 0;
76100 +}
76101 +
76102 +void
76103 +gr_handle_delete(const ino_t ino, const dev_t dev)
76104 +{
76105 + return;
76106 +}
76107 +
76108 +void
76109 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
76110 +{
76111 + return;
76112 +}
76113 +
76114 +void
76115 +gr_handle_crash(struct task_struct *task, const int sig)
76116 +{
76117 + return;
76118 +}
76119 +
76120 +int
76121 +gr_check_crash_exec(const struct file *filp)
76122 +{
76123 + return 0;
76124 +}
76125 +
76126 +int
76127 +gr_check_crash_uid(const kuid_t uid)
76128 +{
76129 + return 0;
76130 +}
76131 +
76132 +void
76133 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76134 + struct dentry *old_dentry,
76135 + struct dentry *new_dentry,
76136 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
76137 +{
76138 + return;
76139 +}
76140 +
76141 +int
76142 +gr_search_socket(const int family, const int type, const int protocol)
76143 +{
76144 + return 1;
76145 +}
76146 +
76147 +int
76148 +gr_search_connectbind(const int mode, const struct socket *sock,
76149 + const struct sockaddr_in *addr)
76150 +{
76151 + return 0;
76152 +}
76153 +
76154 +void
76155 +gr_handle_alertkill(struct task_struct *task)
76156 +{
76157 + return;
76158 +}
76159 +
76160 +__u32
76161 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
76162 +{
76163 + return 1;
76164 +}
76165 +
76166 +__u32
76167 +gr_acl_handle_hidden_file(const struct dentry * dentry,
76168 + const struct vfsmount * mnt)
76169 +{
76170 + return 1;
76171 +}
76172 +
76173 +__u32
76174 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
76175 + int acc_mode)
76176 +{
76177 + return 1;
76178 +}
76179 +
76180 +__u32
76181 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
76182 +{
76183 + return 1;
76184 +}
76185 +
76186 +__u32
76187 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
76188 +{
76189 + return 1;
76190 +}
76191 +
76192 +int
76193 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
76194 + unsigned int *vm_flags)
76195 +{
76196 + return 1;
76197 +}
76198 +
76199 +__u32
76200 +gr_acl_handle_truncate(const struct dentry * dentry,
76201 + const struct vfsmount * mnt)
76202 +{
76203 + return 1;
76204 +}
76205 +
76206 +__u32
76207 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
76208 +{
76209 + return 1;
76210 +}
76211 +
76212 +__u32
76213 +gr_acl_handle_access(const struct dentry * dentry,
76214 + const struct vfsmount * mnt, const int fmode)
76215 +{
76216 + return 1;
76217 +}
76218 +
76219 +__u32
76220 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
76221 + umode_t *mode)
76222 +{
76223 + return 1;
76224 +}
76225 +
76226 +__u32
76227 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
76228 +{
76229 + return 1;
76230 +}
76231 +
76232 +__u32
76233 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
76234 +{
76235 + return 1;
76236 +}
76237 +
76238 +__u32
76239 +gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
76240 +{
76241 + return 1;
76242 +}
76243 +
76244 +void
76245 +grsecurity_init(void)
76246 +{
76247 + return;
76248 +}
76249 +
76250 +umode_t gr_acl_umask(void)
76251 +{
76252 + return 0;
76253 +}
76254 +
76255 +__u32
76256 +gr_acl_handle_mknod(const struct dentry * new_dentry,
76257 + const struct dentry * parent_dentry,
76258 + const struct vfsmount * parent_mnt,
76259 + const int mode)
76260 +{
76261 + return 1;
76262 +}
76263 +
76264 +__u32
76265 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
76266 + const struct dentry * parent_dentry,
76267 + const struct vfsmount * parent_mnt)
76268 +{
76269 + return 1;
76270 +}
76271 +
76272 +__u32
76273 +gr_acl_handle_symlink(const struct dentry * new_dentry,
76274 + const struct dentry * parent_dentry,
76275 + const struct vfsmount * parent_mnt, const struct filename *from)
76276 +{
76277 + return 1;
76278 +}
76279 +
76280 +__u32
76281 +gr_acl_handle_link(const struct dentry * new_dentry,
76282 + const struct dentry * parent_dentry,
76283 + const struct vfsmount * parent_mnt,
76284 + const struct dentry * old_dentry,
76285 + const struct vfsmount * old_mnt, const struct filename *to)
76286 +{
76287 + return 1;
76288 +}
76289 +
76290 +int
76291 +gr_acl_handle_rename(const struct dentry *new_dentry,
76292 + const struct dentry *parent_dentry,
76293 + const struct vfsmount *parent_mnt,
76294 + const struct dentry *old_dentry,
76295 + const struct inode *old_parent_inode,
76296 + const struct vfsmount *old_mnt, const struct filename *newname,
76297 + unsigned int flags)
76298 +{
76299 + return 0;
76300 +}
76301 +
76302 +int
76303 +gr_acl_handle_filldir(const struct file *file, const char *name,
76304 + const int namelen, const ino_t ino)
76305 +{
76306 + return 1;
76307 +}
76308 +
76309 +int
76310 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76311 + const u64 shm_createtime, const kuid_t cuid, const int shmid)
76312 +{
76313 + return 1;
76314 +}
76315 +
76316 +int
76317 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
76318 +{
76319 + return 0;
76320 +}
76321 +
76322 +int
76323 +gr_search_accept(const struct socket *sock)
76324 +{
76325 + return 0;
76326 +}
76327 +
76328 +int
76329 +gr_search_listen(const struct socket *sock)
76330 +{
76331 + return 0;
76332 +}
76333 +
76334 +int
76335 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
76336 +{
76337 + return 0;
76338 +}
76339 +
76340 +__u32
76341 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
76342 +{
76343 + return 1;
76344 +}
76345 +
76346 +__u32
76347 +gr_acl_handle_creat(const struct dentry * dentry,
76348 + const struct dentry * p_dentry,
76349 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
76350 + const int imode)
76351 +{
76352 + return 1;
76353 +}
76354 +
76355 +void
76356 +gr_acl_handle_exit(void)
76357 +{
76358 + return;
76359 +}
76360 +
76361 +int
76362 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
76363 +{
76364 + return 1;
76365 +}
76366 +
76367 +void
76368 +gr_set_role_label(const kuid_t uid, const kgid_t gid)
76369 +{
76370 + return;
76371 +}
76372 +
76373 +int
76374 +gr_acl_handle_procpidmem(const struct task_struct *task)
76375 +{
76376 + return 0;
76377 +}
76378 +
76379 +int
76380 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
76381 +{
76382 + return 0;
76383 +}
76384 +
76385 +int
76386 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
76387 +{
76388 + return 0;
76389 +}
76390 +
76391 +int
76392 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
76393 +{
76394 + return 0;
76395 +}
76396 +
76397 +int
76398 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
76399 +{
76400 + return 0;
76401 +}
76402 +
76403 +int gr_acl_enable_at_secure(void)
76404 +{
76405 + return 0;
76406 +}
76407 +
76408 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
76409 +{
76410 + return dentry->d_sb->s_dev;
76411 +}
76412 +
76413 +void gr_put_exec_file(struct task_struct *task)
76414 +{
76415 + return;
76416 +}
76417 +
76418 +#ifdef CONFIG_SECURITY
76419 +EXPORT_SYMBOL_GPL(gr_check_user_change);
76420 +EXPORT_SYMBOL_GPL(gr_check_group_change);
76421 +#endif
76422 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
76423 new file mode 100644
76424 index 0000000..14638ff
76425 --- /dev/null
76426 +++ b/grsecurity/grsec_exec.c
76427 @@ -0,0 +1,188 @@
76428 +#include <linux/kernel.h>
76429 +#include <linux/sched.h>
76430 +#include <linux/file.h>
76431 +#include <linux/binfmts.h>
76432 +#include <linux/fs.h>
76433 +#include <linux/types.h>
76434 +#include <linux/grdefs.h>
76435 +#include <linux/grsecurity.h>
76436 +#include <linux/grinternal.h>
76437 +#include <linux/capability.h>
76438 +#include <linux/module.h>
76439 +#include <linux/compat.h>
76440 +
76441 +#include <asm/uaccess.h>
76442 +
76443 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76444 +static char gr_exec_arg_buf[132];
76445 +static DEFINE_MUTEX(gr_exec_arg_mutex);
76446 +#endif
76447 +
76448 +struct user_arg_ptr {
76449 +#ifdef CONFIG_COMPAT
76450 + bool is_compat;
76451 +#endif
76452 + union {
76453 + const char __user *const __user *native;
76454 +#ifdef CONFIG_COMPAT
76455 + const compat_uptr_t __user *compat;
76456 +#endif
76457 + } ptr;
76458 +};
76459 +
76460 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
76461 +
76462 +void
76463 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
76464 +{
76465 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76466 + char *grarg = gr_exec_arg_buf;
76467 + unsigned int i, x, execlen = 0;
76468 + char c;
76469 +
76470 + if (!((grsec_enable_execlog && grsec_enable_group &&
76471 + in_group_p(grsec_audit_gid))
76472 + || (grsec_enable_execlog && !grsec_enable_group)))
76473 + return;
76474 +
76475 + mutex_lock(&gr_exec_arg_mutex);
76476 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
76477 +
76478 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
76479 + const char __user *p;
76480 + unsigned int len;
76481 +
76482 + p = get_user_arg_ptr(argv, i);
76483 + if (IS_ERR(p))
76484 + goto log;
76485 +
76486 + len = strnlen_user(p, 128 - execlen);
76487 + if (len > 128 - execlen)
76488 + len = 128 - execlen;
76489 + else if (len > 0)
76490 + len--;
76491 + if (copy_from_user(grarg + execlen, p, len))
76492 + goto log;
76493 +
76494 + /* rewrite unprintable characters */
76495 + for (x = 0; x < len; x++) {
76496 + c = *(grarg + execlen + x);
76497 + if (c < 32 || c > 126)
76498 + *(grarg + execlen + x) = ' ';
76499 + }
76500 +
76501 + execlen += len;
76502 + *(grarg + execlen) = ' ';
76503 + *(grarg + execlen + 1) = '\0';
76504 + execlen++;
76505 + }
76506 +
76507 + log:
76508 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
76509 + bprm->file->f_path.mnt, grarg);
76510 + mutex_unlock(&gr_exec_arg_mutex);
76511 +#endif
76512 + return;
76513 +}
76514 +
76515 +#ifdef CONFIG_GRKERNSEC
76516 +extern int gr_acl_is_capable(const int cap);
76517 +extern int gr_acl_is_capable_nolog(const int cap);
76518 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76519 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
76520 +extern int gr_chroot_is_capable(const int cap);
76521 +extern int gr_chroot_is_capable_nolog(const int cap);
76522 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76523 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
76524 +#endif
76525 +
76526 +const char *captab_log[] = {
76527 + "CAP_CHOWN",
76528 + "CAP_DAC_OVERRIDE",
76529 + "CAP_DAC_READ_SEARCH",
76530 + "CAP_FOWNER",
76531 + "CAP_FSETID",
76532 + "CAP_KILL",
76533 + "CAP_SETGID",
76534 + "CAP_SETUID",
76535 + "CAP_SETPCAP",
76536 + "CAP_LINUX_IMMUTABLE",
76537 + "CAP_NET_BIND_SERVICE",
76538 + "CAP_NET_BROADCAST",
76539 + "CAP_NET_ADMIN",
76540 + "CAP_NET_RAW",
76541 + "CAP_IPC_LOCK",
76542 + "CAP_IPC_OWNER",
76543 + "CAP_SYS_MODULE",
76544 + "CAP_SYS_RAWIO",
76545 + "CAP_SYS_CHROOT",
76546 + "CAP_SYS_PTRACE",
76547 + "CAP_SYS_PACCT",
76548 + "CAP_SYS_ADMIN",
76549 + "CAP_SYS_BOOT",
76550 + "CAP_SYS_NICE",
76551 + "CAP_SYS_RESOURCE",
76552 + "CAP_SYS_TIME",
76553 + "CAP_SYS_TTY_CONFIG",
76554 + "CAP_MKNOD",
76555 + "CAP_LEASE",
76556 + "CAP_AUDIT_WRITE",
76557 + "CAP_AUDIT_CONTROL",
76558 + "CAP_SETFCAP",
76559 + "CAP_MAC_OVERRIDE",
76560 + "CAP_MAC_ADMIN",
76561 + "CAP_SYSLOG",
76562 + "CAP_WAKE_ALARM",
76563 + "CAP_BLOCK_SUSPEND"
76564 +};
76565 +
76566 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
76567 +
76568 +int gr_is_capable(const int cap)
76569 +{
76570 +#ifdef CONFIG_GRKERNSEC
76571 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
76572 + return 1;
76573 + return 0;
76574 +#else
76575 + return 1;
76576 +#endif
76577 +}
76578 +
76579 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76580 +{
76581 +#ifdef CONFIG_GRKERNSEC
76582 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
76583 + return 1;
76584 + return 0;
76585 +#else
76586 + return 1;
76587 +#endif
76588 +}
76589 +
76590 +int gr_is_capable_nolog(const int cap)
76591 +{
76592 +#ifdef CONFIG_GRKERNSEC
76593 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
76594 + return 1;
76595 + return 0;
76596 +#else
76597 + return 1;
76598 +#endif
76599 +}
76600 +
76601 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
76602 +{
76603 +#ifdef CONFIG_GRKERNSEC
76604 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
76605 + return 1;
76606 + return 0;
76607 +#else
76608 + return 1;
76609 +#endif
76610 +}
76611 +
76612 +EXPORT_SYMBOL_GPL(gr_is_capable);
76613 +EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
76614 +EXPORT_SYMBOL_GPL(gr_task_is_capable);
76615 +EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
76616 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
76617 new file mode 100644
76618 index 0000000..06cc6ea
76619 --- /dev/null
76620 +++ b/grsecurity/grsec_fifo.c
76621 @@ -0,0 +1,24 @@
76622 +#include <linux/kernel.h>
76623 +#include <linux/sched.h>
76624 +#include <linux/fs.h>
76625 +#include <linux/file.h>
76626 +#include <linux/grinternal.h>
76627 +
76628 +int
76629 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
76630 + const struct dentry *dir, const int flag, const int acc_mode)
76631 +{
76632 +#ifdef CONFIG_GRKERNSEC_FIFO
76633 + const struct cred *cred = current_cred();
76634 +
76635 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
76636 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
76637 + !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
76638 + !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
76639 + if (!inode_permission(dentry->d_inode, acc_mode))
76640 + 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));
76641 + return -EACCES;
76642 + }
76643 +#endif
76644 + return 0;
76645 +}
76646 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
76647 new file mode 100644
76648 index 0000000..8ca18bf
76649 --- /dev/null
76650 +++ b/grsecurity/grsec_fork.c
76651 @@ -0,0 +1,23 @@
76652 +#include <linux/kernel.h>
76653 +#include <linux/sched.h>
76654 +#include <linux/grsecurity.h>
76655 +#include <linux/grinternal.h>
76656 +#include <linux/errno.h>
76657 +
76658 +void
76659 +gr_log_forkfail(const int retval)
76660 +{
76661 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
76662 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
76663 + switch (retval) {
76664 + case -EAGAIN:
76665 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
76666 + break;
76667 + case -ENOMEM:
76668 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
76669 + break;
76670 + }
76671 + }
76672 +#endif
76673 + return;
76674 +}
76675 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
76676 new file mode 100644
76677 index 0000000..b7cb191
76678 --- /dev/null
76679 +++ b/grsecurity/grsec_init.c
76680 @@ -0,0 +1,286 @@
76681 +#include <linux/kernel.h>
76682 +#include <linux/sched.h>
76683 +#include <linux/mm.h>
76684 +#include <linux/gracl.h>
76685 +#include <linux/slab.h>
76686 +#include <linux/vmalloc.h>
76687 +#include <linux/percpu.h>
76688 +#include <linux/module.h>
76689 +
76690 +int grsec_enable_ptrace_readexec;
76691 +int grsec_enable_setxid;
76692 +int grsec_enable_symlinkown;
76693 +kgid_t grsec_symlinkown_gid;
76694 +int grsec_enable_brute;
76695 +int grsec_enable_link;
76696 +int grsec_enable_dmesg;
76697 +int grsec_enable_harden_ptrace;
76698 +int grsec_enable_harden_ipc;
76699 +int grsec_enable_fifo;
76700 +int grsec_enable_execlog;
76701 +int grsec_enable_signal;
76702 +int grsec_enable_forkfail;
76703 +int grsec_enable_audit_ptrace;
76704 +int grsec_enable_time;
76705 +int grsec_enable_group;
76706 +kgid_t grsec_audit_gid;
76707 +int grsec_enable_chdir;
76708 +int grsec_enable_mount;
76709 +int grsec_enable_rofs;
76710 +int grsec_deny_new_usb;
76711 +int grsec_enable_chroot_findtask;
76712 +int grsec_enable_chroot_mount;
76713 +int grsec_enable_chroot_shmat;
76714 +int grsec_enable_chroot_fchdir;
76715 +int grsec_enable_chroot_double;
76716 +int grsec_enable_chroot_pivot;
76717 +int grsec_enable_chroot_chdir;
76718 +int grsec_enable_chroot_chmod;
76719 +int grsec_enable_chroot_mknod;
76720 +int grsec_enable_chroot_nice;
76721 +int grsec_enable_chroot_execlog;
76722 +int grsec_enable_chroot_caps;
76723 +int grsec_enable_chroot_sysctl;
76724 +int grsec_enable_chroot_unix;
76725 +int grsec_enable_tpe;
76726 +kgid_t grsec_tpe_gid;
76727 +int grsec_enable_blackhole;
76728 +#ifdef CONFIG_IPV6_MODULE
76729 +EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
76730 +#endif
76731 +int grsec_lastack_retries;
76732 +int grsec_enable_tpe_all;
76733 +int grsec_enable_tpe_invert;
76734 +int grsec_enable_socket_all;
76735 +kgid_t grsec_socket_all_gid;
76736 +int grsec_enable_socket_client;
76737 +kgid_t grsec_socket_client_gid;
76738 +int grsec_enable_socket_server;
76739 +kgid_t grsec_socket_server_gid;
76740 +int grsec_resource_logging;
76741 +int grsec_disable_privio;
76742 +int grsec_enable_log_rwxmaps;
76743 +int grsec_lock;
76744 +
76745 +DEFINE_SPINLOCK(grsec_alert_lock);
76746 +unsigned long grsec_alert_wtime = 0;
76747 +unsigned long grsec_alert_fyet = 0;
76748 +
76749 +DEFINE_SPINLOCK(grsec_audit_lock);
76750 +
76751 +DEFINE_RWLOCK(grsec_exec_file_lock);
76752 +
76753 +char *gr_shared_page[4];
76754 +
76755 +char *gr_alert_log_fmt;
76756 +char *gr_audit_log_fmt;
76757 +char *gr_alert_log_buf;
76758 +char *gr_audit_log_buf;
76759 +
76760 +extern struct gr_arg *gr_usermode;
76761 +extern unsigned char *gr_system_salt;
76762 +extern unsigned char *gr_system_sum;
76763 +
76764 +void __init
76765 +grsecurity_init(void)
76766 +{
76767 + int j;
76768 + /* create the per-cpu shared pages */
76769 +
76770 +#ifdef CONFIG_X86
76771 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
76772 +#endif
76773 +
76774 + for (j = 0; j < 4; j++) {
76775 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
76776 + if (gr_shared_page[j] == NULL) {
76777 + panic("Unable to allocate grsecurity shared page");
76778 + return;
76779 + }
76780 + }
76781 +
76782 + /* allocate log buffers */
76783 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
76784 + if (!gr_alert_log_fmt) {
76785 + panic("Unable to allocate grsecurity alert log format buffer");
76786 + return;
76787 + }
76788 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
76789 + if (!gr_audit_log_fmt) {
76790 + panic("Unable to allocate grsecurity audit log format buffer");
76791 + return;
76792 + }
76793 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76794 + if (!gr_alert_log_buf) {
76795 + panic("Unable to allocate grsecurity alert log buffer");
76796 + return;
76797 + }
76798 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76799 + if (!gr_audit_log_buf) {
76800 + panic("Unable to allocate grsecurity audit log buffer");
76801 + return;
76802 + }
76803 +
76804 + /* allocate memory for authentication structure */
76805 + gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
76806 + gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
76807 + gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
76808 +
76809 + if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
76810 + panic("Unable to allocate grsecurity authentication structure");
76811 + return;
76812 + }
76813 +
76814 +#ifdef CONFIG_GRKERNSEC_IO
76815 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
76816 + grsec_disable_privio = 1;
76817 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76818 + grsec_disable_privio = 1;
76819 +#else
76820 + grsec_disable_privio = 0;
76821 +#endif
76822 +#endif
76823 +
76824 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76825 + /* for backward compatibility, tpe_invert always defaults to on if
76826 + enabled in the kernel
76827 + */
76828 + grsec_enable_tpe_invert = 1;
76829 +#endif
76830 +
76831 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76832 +#ifndef CONFIG_GRKERNSEC_SYSCTL
76833 + grsec_lock = 1;
76834 +#endif
76835 +
76836 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
76837 + grsec_enable_log_rwxmaps = 1;
76838 +#endif
76839 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76840 + grsec_enable_group = 1;
76841 + grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
76842 +#endif
76843 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
76844 + grsec_enable_ptrace_readexec = 1;
76845 +#endif
76846 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76847 + grsec_enable_chdir = 1;
76848 +#endif
76849 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76850 + grsec_enable_harden_ptrace = 1;
76851 +#endif
76852 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76853 + grsec_enable_harden_ipc = 1;
76854 +#endif
76855 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76856 + grsec_enable_mount = 1;
76857 +#endif
76858 +#ifdef CONFIG_GRKERNSEC_LINK
76859 + grsec_enable_link = 1;
76860 +#endif
76861 +#ifdef CONFIG_GRKERNSEC_BRUTE
76862 + grsec_enable_brute = 1;
76863 +#endif
76864 +#ifdef CONFIG_GRKERNSEC_DMESG
76865 + grsec_enable_dmesg = 1;
76866 +#endif
76867 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76868 + grsec_enable_blackhole = 1;
76869 + grsec_lastack_retries = 4;
76870 +#endif
76871 +#ifdef CONFIG_GRKERNSEC_FIFO
76872 + grsec_enable_fifo = 1;
76873 +#endif
76874 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76875 + grsec_enable_execlog = 1;
76876 +#endif
76877 +#ifdef CONFIG_GRKERNSEC_SETXID
76878 + grsec_enable_setxid = 1;
76879 +#endif
76880 +#ifdef CONFIG_GRKERNSEC_SIGNAL
76881 + grsec_enable_signal = 1;
76882 +#endif
76883 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
76884 + grsec_enable_forkfail = 1;
76885 +#endif
76886 +#ifdef CONFIG_GRKERNSEC_TIME
76887 + grsec_enable_time = 1;
76888 +#endif
76889 +#ifdef CONFIG_GRKERNSEC_RESLOG
76890 + grsec_resource_logging = 1;
76891 +#endif
76892 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76893 + grsec_enable_chroot_findtask = 1;
76894 +#endif
76895 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76896 + grsec_enable_chroot_unix = 1;
76897 +#endif
76898 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76899 + grsec_enable_chroot_mount = 1;
76900 +#endif
76901 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76902 + grsec_enable_chroot_fchdir = 1;
76903 +#endif
76904 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76905 + grsec_enable_chroot_shmat = 1;
76906 +#endif
76907 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
76908 + grsec_enable_audit_ptrace = 1;
76909 +#endif
76910 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76911 + grsec_enable_chroot_double = 1;
76912 +#endif
76913 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76914 + grsec_enable_chroot_pivot = 1;
76915 +#endif
76916 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76917 + grsec_enable_chroot_chdir = 1;
76918 +#endif
76919 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76920 + grsec_enable_chroot_chmod = 1;
76921 +#endif
76922 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76923 + grsec_enable_chroot_mknod = 1;
76924 +#endif
76925 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76926 + grsec_enable_chroot_nice = 1;
76927 +#endif
76928 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76929 + grsec_enable_chroot_execlog = 1;
76930 +#endif
76931 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76932 + grsec_enable_chroot_caps = 1;
76933 +#endif
76934 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76935 + grsec_enable_chroot_sysctl = 1;
76936 +#endif
76937 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
76938 + grsec_enable_symlinkown = 1;
76939 + grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
76940 +#endif
76941 +#ifdef CONFIG_GRKERNSEC_TPE
76942 + grsec_enable_tpe = 1;
76943 + grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
76944 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
76945 + grsec_enable_tpe_all = 1;
76946 +#endif
76947 +#endif
76948 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
76949 + grsec_enable_socket_all = 1;
76950 + grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
76951 +#endif
76952 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
76953 + grsec_enable_socket_client = 1;
76954 + grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
76955 +#endif
76956 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
76957 + grsec_enable_socket_server = 1;
76958 + grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
76959 +#endif
76960 +#endif
76961 +#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
76962 + grsec_deny_new_usb = 1;
76963 +#endif
76964 +
76965 + return;
76966 +}
76967 diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
76968 new file mode 100644
76969 index 0000000..1773300
76970 --- /dev/null
76971 +++ b/grsecurity/grsec_ipc.c
76972 @@ -0,0 +1,48 @@
76973 +#include <linux/kernel.h>
76974 +#include <linux/mm.h>
76975 +#include <linux/sched.h>
76976 +#include <linux/file.h>
76977 +#include <linux/ipc.h>
76978 +#include <linux/ipc_namespace.h>
76979 +#include <linux/grsecurity.h>
76980 +#include <linux/grinternal.h>
76981 +
76982 +int
76983 +gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
76984 +{
76985 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76986 + int write;
76987 + int orig_granted_mode;
76988 + kuid_t euid;
76989 + kgid_t egid;
76990 +
76991 + if (!grsec_enable_harden_ipc)
76992 + return 1;
76993 +
76994 + euid = current_euid();
76995 + egid = current_egid();
76996 +
76997 + write = requested_mode & 00002;
76998 + orig_granted_mode = ipcp->mode;
76999 +
77000 + if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77001 + orig_granted_mode >>= 6;
77002 + else {
77003 + /* if likely wrong permissions, lock to user */
77004 + if (orig_granted_mode & 0007)
77005 + orig_granted_mode = 0;
77006 + /* otherwise do a egid-only check */
77007 + else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77008 + orig_granted_mode >>= 3;
77009 + /* otherwise, no access */
77010 + else
77011 + orig_granted_mode = 0;
77012 + }
77013 + if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77014 + !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77015 + gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77016 + return 0;
77017 + }
77018 +#endif
77019 + return 1;
77020 +}
77021 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77022 new file mode 100644
77023 index 0000000..5e05e20
77024 --- /dev/null
77025 +++ b/grsecurity/grsec_link.c
77026 @@ -0,0 +1,58 @@
77027 +#include <linux/kernel.h>
77028 +#include <linux/sched.h>
77029 +#include <linux/fs.h>
77030 +#include <linux/file.h>
77031 +#include <linux/grinternal.h>
77032 +
77033 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77034 +{
77035 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77036 + const struct inode *link_inode = link->dentry->d_inode;
77037 +
77038 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77039 + /* ignore root-owned links, e.g. /proc/self */
77040 + gr_is_global_nonroot(link_inode->i_uid) && target &&
77041 + !uid_eq(link_inode->i_uid, target->i_uid)) {
77042 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77043 + return 1;
77044 + }
77045 +#endif
77046 + return 0;
77047 +}
77048 +
77049 +int
77050 +gr_handle_follow_link(const struct inode *parent,
77051 + const struct inode *inode,
77052 + const struct dentry *dentry, const struct vfsmount *mnt)
77053 +{
77054 +#ifdef CONFIG_GRKERNSEC_LINK
77055 + const struct cred *cred = current_cred();
77056 +
77057 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77058 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77059 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77060 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77061 + return -EACCES;
77062 + }
77063 +#endif
77064 + return 0;
77065 +}
77066 +
77067 +int
77068 +gr_handle_hardlink(const struct dentry *dentry,
77069 + const struct vfsmount *mnt,
77070 + struct inode *inode, const int mode, const struct filename *to)
77071 +{
77072 +#ifdef CONFIG_GRKERNSEC_LINK
77073 + const struct cred *cred = current_cred();
77074 +
77075 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77076 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77077 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77078 + !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77079 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77080 + return -EPERM;
77081 + }
77082 +#endif
77083 + return 0;
77084 +}
77085 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77086 new file mode 100644
77087 index 0000000..dbe0a6b
77088 --- /dev/null
77089 +++ b/grsecurity/grsec_log.c
77090 @@ -0,0 +1,341 @@
77091 +#include <linux/kernel.h>
77092 +#include <linux/sched.h>
77093 +#include <linux/file.h>
77094 +#include <linux/tty.h>
77095 +#include <linux/fs.h>
77096 +#include <linux/mm.h>
77097 +#include <linux/grinternal.h>
77098 +
77099 +#ifdef CONFIG_TREE_PREEMPT_RCU
77100 +#define DISABLE_PREEMPT() preempt_disable()
77101 +#define ENABLE_PREEMPT() preempt_enable()
77102 +#else
77103 +#define DISABLE_PREEMPT()
77104 +#define ENABLE_PREEMPT()
77105 +#endif
77106 +
77107 +#define BEGIN_LOCKS(x) \
77108 + DISABLE_PREEMPT(); \
77109 + rcu_read_lock(); \
77110 + read_lock(&tasklist_lock); \
77111 + read_lock(&grsec_exec_file_lock); \
77112 + if (x != GR_DO_AUDIT) \
77113 + spin_lock(&grsec_alert_lock); \
77114 + else \
77115 + spin_lock(&grsec_audit_lock)
77116 +
77117 +#define END_LOCKS(x) \
77118 + if (x != GR_DO_AUDIT) \
77119 + spin_unlock(&grsec_alert_lock); \
77120 + else \
77121 + spin_unlock(&grsec_audit_lock); \
77122 + read_unlock(&grsec_exec_file_lock); \
77123 + read_unlock(&tasklist_lock); \
77124 + rcu_read_unlock(); \
77125 + ENABLE_PREEMPT(); \
77126 + if (x == GR_DONT_AUDIT) \
77127 + gr_handle_alertkill(current)
77128 +
77129 +enum {
77130 + FLOODING,
77131 + NO_FLOODING
77132 +};
77133 +
77134 +extern char *gr_alert_log_fmt;
77135 +extern char *gr_audit_log_fmt;
77136 +extern char *gr_alert_log_buf;
77137 +extern char *gr_audit_log_buf;
77138 +
77139 +static int gr_log_start(int audit)
77140 +{
77141 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
77142 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
77143 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77144 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
77145 + unsigned long curr_secs = get_seconds();
77146 +
77147 + if (audit == GR_DO_AUDIT)
77148 + goto set_fmt;
77149 +
77150 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
77151 + grsec_alert_wtime = curr_secs;
77152 + grsec_alert_fyet = 0;
77153 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
77154 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
77155 + grsec_alert_fyet++;
77156 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
77157 + grsec_alert_wtime = curr_secs;
77158 + grsec_alert_fyet++;
77159 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
77160 + return FLOODING;
77161 + }
77162 + else return FLOODING;
77163 +
77164 +set_fmt:
77165 +#endif
77166 + memset(buf, 0, PAGE_SIZE);
77167 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
77168 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
77169 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77170 + } else if (current->signal->curr_ip) {
77171 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
77172 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
77173 + } else if (gr_acl_is_enabled()) {
77174 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
77175 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77176 + } else {
77177 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
77178 + strcpy(buf, fmt);
77179 + }
77180 +
77181 + return NO_FLOODING;
77182 +}
77183 +
77184 +static void gr_log_middle(int audit, const char *msg, va_list ap)
77185 + __attribute__ ((format (printf, 2, 0)));
77186 +
77187 +static void gr_log_middle(int audit, const char *msg, va_list ap)
77188 +{
77189 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77190 + unsigned int len = strlen(buf);
77191 +
77192 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77193 +
77194 + return;
77195 +}
77196 +
77197 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
77198 + __attribute__ ((format (printf, 2, 3)));
77199 +
77200 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
77201 +{
77202 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77203 + unsigned int len = strlen(buf);
77204 + va_list ap;
77205 +
77206 + va_start(ap, msg);
77207 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77208 + va_end(ap);
77209 +
77210 + return;
77211 +}
77212 +
77213 +static void gr_log_end(int audit, int append_default)
77214 +{
77215 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77216 + if (append_default) {
77217 + struct task_struct *task = current;
77218 + struct task_struct *parent = task->real_parent;
77219 + const struct cred *cred = __task_cred(task);
77220 + const struct cred *pcred = __task_cred(parent);
77221 + unsigned int len = strlen(buf);
77222 +
77223 + 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));
77224 + }
77225 +
77226 + printk("%s\n", buf);
77227 +
77228 + return;
77229 +}
77230 +
77231 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
77232 +{
77233 + int logtype;
77234 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
77235 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
77236 + void *voidptr = NULL;
77237 + int num1 = 0, num2 = 0;
77238 + unsigned long ulong1 = 0, ulong2 = 0;
77239 + struct dentry *dentry = NULL;
77240 + struct vfsmount *mnt = NULL;
77241 + struct file *file = NULL;
77242 + struct task_struct *task = NULL;
77243 + struct vm_area_struct *vma = NULL;
77244 + const struct cred *cred, *pcred;
77245 + va_list ap;
77246 +
77247 + BEGIN_LOCKS(audit);
77248 + logtype = gr_log_start(audit);
77249 + if (logtype == FLOODING) {
77250 + END_LOCKS(audit);
77251 + return;
77252 + }
77253 + va_start(ap, argtypes);
77254 + switch (argtypes) {
77255 + case GR_TTYSNIFF:
77256 + task = va_arg(ap, struct task_struct *);
77257 + 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));
77258 + break;
77259 + case GR_SYSCTL_HIDDEN:
77260 + str1 = va_arg(ap, char *);
77261 + gr_log_middle_varargs(audit, msg, result, str1);
77262 + break;
77263 + case GR_RBAC:
77264 + dentry = va_arg(ap, struct dentry *);
77265 + mnt = va_arg(ap, struct vfsmount *);
77266 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
77267 + break;
77268 + case GR_RBAC_STR:
77269 + dentry = va_arg(ap, struct dentry *);
77270 + mnt = va_arg(ap, struct vfsmount *);
77271 + str1 = va_arg(ap, char *);
77272 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
77273 + break;
77274 + case GR_STR_RBAC:
77275 + str1 = va_arg(ap, char *);
77276 + dentry = va_arg(ap, struct dentry *);
77277 + mnt = va_arg(ap, struct vfsmount *);
77278 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
77279 + break;
77280 + case GR_RBAC_MODE2:
77281 + dentry = va_arg(ap, struct dentry *);
77282 + mnt = va_arg(ap, struct vfsmount *);
77283 + str1 = va_arg(ap, char *);
77284 + str2 = va_arg(ap, char *);
77285 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
77286 + break;
77287 + case GR_RBAC_MODE3:
77288 + dentry = va_arg(ap, struct dentry *);
77289 + mnt = va_arg(ap, struct vfsmount *);
77290 + str1 = va_arg(ap, char *);
77291 + str2 = va_arg(ap, char *);
77292 + str3 = va_arg(ap, char *);
77293 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
77294 + break;
77295 + case GR_FILENAME:
77296 + dentry = va_arg(ap, struct dentry *);
77297 + mnt = va_arg(ap, struct vfsmount *);
77298 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
77299 + break;
77300 + case GR_STR_FILENAME:
77301 + str1 = va_arg(ap, char *);
77302 + dentry = va_arg(ap, struct dentry *);
77303 + mnt = va_arg(ap, struct vfsmount *);
77304 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
77305 + break;
77306 + case GR_FILENAME_STR:
77307 + dentry = va_arg(ap, struct dentry *);
77308 + mnt = va_arg(ap, struct vfsmount *);
77309 + str1 = va_arg(ap, char *);
77310 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
77311 + break;
77312 + case GR_FILENAME_TWO_INT:
77313 + dentry = va_arg(ap, struct dentry *);
77314 + mnt = va_arg(ap, struct vfsmount *);
77315 + num1 = va_arg(ap, int);
77316 + num2 = va_arg(ap, int);
77317 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
77318 + break;
77319 + case GR_FILENAME_TWO_INT_STR:
77320 + dentry = va_arg(ap, struct dentry *);
77321 + mnt = va_arg(ap, struct vfsmount *);
77322 + num1 = va_arg(ap, int);
77323 + num2 = va_arg(ap, int);
77324 + str1 = va_arg(ap, char *);
77325 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
77326 + break;
77327 + case GR_TEXTREL:
77328 + file = va_arg(ap, struct file *);
77329 + ulong1 = va_arg(ap, unsigned long);
77330 + ulong2 = va_arg(ap, unsigned long);
77331 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
77332 + break;
77333 + case GR_PTRACE:
77334 + task = va_arg(ap, struct task_struct *);
77335 + 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));
77336 + break;
77337 + case GR_RESOURCE:
77338 + task = va_arg(ap, struct task_struct *);
77339 + cred = __task_cred(task);
77340 + pcred = __task_cred(task->real_parent);
77341 + ulong1 = va_arg(ap, unsigned long);
77342 + str1 = va_arg(ap, char *);
77343 + ulong2 = va_arg(ap, unsigned long);
77344 + 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));
77345 + break;
77346 + case GR_CAP:
77347 + task = va_arg(ap, struct task_struct *);
77348 + cred = __task_cred(task);
77349 + pcred = __task_cred(task->real_parent);
77350 + str1 = va_arg(ap, char *);
77351 + 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));
77352 + break;
77353 + case GR_SIG:
77354 + str1 = va_arg(ap, char *);
77355 + voidptr = va_arg(ap, void *);
77356 + gr_log_middle_varargs(audit, msg, str1, voidptr);
77357 + break;
77358 + case GR_SIG2:
77359 + task = va_arg(ap, struct task_struct *);
77360 + cred = __task_cred(task);
77361 + pcred = __task_cred(task->real_parent);
77362 + num1 = va_arg(ap, int);
77363 + 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));
77364 + break;
77365 + case GR_CRASH1:
77366 + task = va_arg(ap, struct task_struct *);
77367 + cred = __task_cred(task);
77368 + pcred = __task_cred(task->real_parent);
77369 + ulong1 = va_arg(ap, unsigned long);
77370 + 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);
77371 + break;
77372 + case GR_CRASH2:
77373 + task = va_arg(ap, struct task_struct *);
77374 + cred = __task_cred(task);
77375 + pcred = __task_cred(task->real_parent);
77376 + ulong1 = va_arg(ap, unsigned long);
77377 + 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);
77378 + break;
77379 + case GR_RWXMAP:
77380 + file = va_arg(ap, struct file *);
77381 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
77382 + break;
77383 + case GR_RWXMAPVMA:
77384 + vma = va_arg(ap, struct vm_area_struct *);
77385 + if (vma->vm_file)
77386 + str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
77387 + else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
77388 + str1 = "<stack>";
77389 + else if (vma->vm_start <= current->mm->brk &&
77390 + vma->vm_end >= current->mm->start_brk)
77391 + str1 = "<heap>";
77392 + else
77393 + str1 = "<anonymous mapping>";
77394 + gr_log_middle_varargs(audit, msg, str1);
77395 + break;
77396 + case GR_PSACCT:
77397 + {
77398 + unsigned int wday, cday;
77399 + __u8 whr, chr;
77400 + __u8 wmin, cmin;
77401 + __u8 wsec, csec;
77402 + char cur_tty[64] = { 0 };
77403 + char parent_tty[64] = { 0 };
77404 +
77405 + task = va_arg(ap, struct task_struct *);
77406 + wday = va_arg(ap, unsigned int);
77407 + cday = va_arg(ap, unsigned int);
77408 + whr = va_arg(ap, int);
77409 + chr = va_arg(ap, int);
77410 + wmin = va_arg(ap, int);
77411 + cmin = va_arg(ap, int);
77412 + wsec = va_arg(ap, int);
77413 + csec = va_arg(ap, int);
77414 + ulong1 = va_arg(ap, unsigned long);
77415 + cred = __task_cred(task);
77416 + pcred = __task_cred(task->real_parent);
77417 +
77418 + 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));
77419 + }
77420 + break;
77421 + default:
77422 + gr_log_middle(audit, msg, ap);
77423 + }
77424 + va_end(ap);
77425 + // these don't need DEFAULTSECARGS printed on the end
77426 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
77427 + gr_log_end(audit, 0);
77428 + else
77429 + gr_log_end(audit, 1);
77430 + END_LOCKS(audit);
77431 +}
77432 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
77433 new file mode 100644
77434 index 0000000..0e39d8c
77435 --- /dev/null
77436 +++ b/grsecurity/grsec_mem.c
77437 @@ -0,0 +1,48 @@
77438 +#include <linux/kernel.h>
77439 +#include <linux/sched.h>
77440 +#include <linux/mm.h>
77441 +#include <linux/mman.h>
77442 +#include <linux/module.h>
77443 +#include <linux/grinternal.h>
77444 +
77445 +void gr_handle_msr_write(void)
77446 +{
77447 + gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
77448 + return;
77449 +}
77450 +EXPORT_SYMBOL_GPL(gr_handle_msr_write);
77451 +
77452 +void
77453 +gr_handle_ioperm(void)
77454 +{
77455 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
77456 + return;
77457 +}
77458 +
77459 +void
77460 +gr_handle_iopl(void)
77461 +{
77462 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
77463 + return;
77464 +}
77465 +
77466 +void
77467 +gr_handle_mem_readwrite(u64 from, u64 to)
77468 +{
77469 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
77470 + return;
77471 +}
77472 +
77473 +void
77474 +gr_handle_vm86(void)
77475 +{
77476 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
77477 + return;
77478 +}
77479 +
77480 +void
77481 +gr_log_badprocpid(const char *entry)
77482 +{
77483 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
77484 + return;
77485 +}
77486 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
77487 new file mode 100644
77488 index 0000000..6f9eb73
77489 --- /dev/null
77490 +++ b/grsecurity/grsec_mount.c
77491 @@ -0,0 +1,65 @@
77492 +#include <linux/kernel.h>
77493 +#include <linux/sched.h>
77494 +#include <linux/mount.h>
77495 +#include <linux/major.h>
77496 +#include <linux/grsecurity.h>
77497 +#include <linux/grinternal.h>
77498 +
77499 +void
77500 +gr_log_remount(const char *devname, const int retval)
77501 +{
77502 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77503 + if (grsec_enable_mount && (retval >= 0))
77504 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
77505 +#endif
77506 + return;
77507 +}
77508 +
77509 +void
77510 +gr_log_unmount(const char *devname, const int retval)
77511 +{
77512 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77513 + if (grsec_enable_mount && (retval >= 0))
77514 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
77515 +#endif
77516 + return;
77517 +}
77518 +
77519 +void
77520 +gr_log_mount(const char *from, struct path *to, const int retval)
77521 +{
77522 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77523 + if (grsec_enable_mount && (retval >= 0))
77524 + gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
77525 +#endif
77526 + return;
77527 +}
77528 +
77529 +int
77530 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
77531 +{
77532 +#ifdef CONFIG_GRKERNSEC_ROFS
77533 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
77534 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
77535 + return -EPERM;
77536 + } else
77537 + return 0;
77538 +#endif
77539 + return 0;
77540 +}
77541 +
77542 +int
77543 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
77544 +{
77545 +#ifdef CONFIG_GRKERNSEC_ROFS
77546 + struct inode *inode = dentry->d_inode;
77547 +
77548 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
77549 + inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
77550 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
77551 + return -EPERM;
77552 + } else
77553 + return 0;
77554 +#endif
77555 + return 0;
77556 +}
77557 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
77558 new file mode 100644
77559 index 0000000..6ee9d50
77560 --- /dev/null
77561 +++ b/grsecurity/grsec_pax.c
77562 @@ -0,0 +1,45 @@
77563 +#include <linux/kernel.h>
77564 +#include <linux/sched.h>
77565 +#include <linux/mm.h>
77566 +#include <linux/file.h>
77567 +#include <linux/grinternal.h>
77568 +#include <linux/grsecurity.h>
77569 +
77570 +void
77571 +gr_log_textrel(struct vm_area_struct * vma)
77572 +{
77573 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77574 + if (grsec_enable_log_rwxmaps)
77575 + gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
77576 +#endif
77577 + return;
77578 +}
77579 +
77580 +void gr_log_ptgnustack(struct file *file)
77581 +{
77582 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77583 + if (grsec_enable_log_rwxmaps)
77584 + gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
77585 +#endif
77586 + return;
77587 +}
77588 +
77589 +void
77590 +gr_log_rwxmmap(struct file *file)
77591 +{
77592 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77593 + if (grsec_enable_log_rwxmaps)
77594 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
77595 +#endif
77596 + return;
77597 +}
77598 +
77599 +void
77600 +gr_log_rwxmprotect(struct vm_area_struct *vma)
77601 +{
77602 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77603 + if (grsec_enable_log_rwxmaps)
77604 + gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
77605 +#endif
77606 + return;
77607 +}
77608 diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
77609 new file mode 100644
77610 index 0000000..2005a3a
77611 --- /dev/null
77612 +++ b/grsecurity/grsec_proc.c
77613 @@ -0,0 +1,20 @@
77614 +#include <linux/kernel.h>
77615 +#include <linux/sched.h>
77616 +#include <linux/grsecurity.h>
77617 +#include <linux/grinternal.h>
77618 +
77619 +int gr_proc_is_restricted(void)
77620 +{
77621 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77622 + const struct cred *cred = current_cred();
77623 +#endif
77624 +
77625 +#ifdef CONFIG_GRKERNSEC_PROC_USER
77626 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
77627 + return -EACCES;
77628 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77629 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
77630 + return -EACCES;
77631 +#endif
77632 + return 0;
77633 +}
77634 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
77635 new file mode 100644
77636 index 0000000..f7f29aa
77637 --- /dev/null
77638 +++ b/grsecurity/grsec_ptrace.c
77639 @@ -0,0 +1,30 @@
77640 +#include <linux/kernel.h>
77641 +#include <linux/sched.h>
77642 +#include <linux/grinternal.h>
77643 +#include <linux/security.h>
77644 +
77645 +void
77646 +gr_audit_ptrace(struct task_struct *task)
77647 +{
77648 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77649 + if (grsec_enable_audit_ptrace)
77650 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
77651 +#endif
77652 + return;
77653 +}
77654 +
77655 +int
77656 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
77657 +{
77658 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77659 + const struct dentry *dentry = file->f_path.dentry;
77660 + const struct vfsmount *mnt = file->f_path.mnt;
77661 +
77662 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
77663 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
77664 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
77665 + return -EACCES;
77666 + }
77667 +#endif
77668 + return 0;
77669 +}
77670 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
77671 new file mode 100644
77672 index 0000000..3860c7e
77673 --- /dev/null
77674 +++ b/grsecurity/grsec_sig.c
77675 @@ -0,0 +1,236 @@
77676 +#include <linux/kernel.h>
77677 +#include <linux/sched.h>
77678 +#include <linux/fs.h>
77679 +#include <linux/delay.h>
77680 +#include <linux/grsecurity.h>
77681 +#include <linux/grinternal.h>
77682 +#include <linux/hardirq.h>
77683 +
77684 +char *signames[] = {
77685 + [SIGSEGV] = "Segmentation fault",
77686 + [SIGILL] = "Illegal instruction",
77687 + [SIGABRT] = "Abort",
77688 + [SIGBUS] = "Invalid alignment/Bus error"
77689 +};
77690 +
77691 +void
77692 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
77693 +{
77694 +#ifdef CONFIG_GRKERNSEC_SIGNAL
77695 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
77696 + (sig == SIGABRT) || (sig == SIGBUS))) {
77697 + if (task_pid_nr(t) == task_pid_nr(current)) {
77698 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
77699 + } else {
77700 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
77701 + }
77702 + }
77703 +#endif
77704 + return;
77705 +}
77706 +
77707 +int
77708 +gr_handle_signal(const struct task_struct *p, const int sig)
77709 +{
77710 +#ifdef CONFIG_GRKERNSEC
77711 + /* ignore the 0 signal for protected task checks */
77712 + if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
77713 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
77714 + return -EPERM;
77715 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
77716 + return -EPERM;
77717 + }
77718 +#endif
77719 + return 0;
77720 +}
77721 +
77722 +#ifdef CONFIG_GRKERNSEC
77723 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
77724 +
77725 +int gr_fake_force_sig(int sig, struct task_struct *t)
77726 +{
77727 + unsigned long int flags;
77728 + int ret, blocked, ignored;
77729 + struct k_sigaction *action;
77730 +
77731 + spin_lock_irqsave(&t->sighand->siglock, flags);
77732 + action = &t->sighand->action[sig-1];
77733 + ignored = action->sa.sa_handler == SIG_IGN;
77734 + blocked = sigismember(&t->blocked, sig);
77735 + if (blocked || ignored) {
77736 + action->sa.sa_handler = SIG_DFL;
77737 + if (blocked) {
77738 + sigdelset(&t->blocked, sig);
77739 + recalc_sigpending_and_wake(t);
77740 + }
77741 + }
77742 + if (action->sa.sa_handler == SIG_DFL)
77743 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
77744 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
77745 +
77746 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
77747 +
77748 + return ret;
77749 +}
77750 +#endif
77751 +
77752 +#define GR_USER_BAN_TIME (15 * 60)
77753 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
77754 +
77755 +void gr_handle_brute_attach(int dumpable)
77756 +{
77757 +#ifdef CONFIG_GRKERNSEC_BRUTE
77758 + struct task_struct *p = current;
77759 + kuid_t uid = GLOBAL_ROOT_UID;
77760 + int daemon = 0;
77761 +
77762 + if (!grsec_enable_brute)
77763 + return;
77764 +
77765 + rcu_read_lock();
77766 + read_lock(&tasklist_lock);
77767 + read_lock(&grsec_exec_file_lock);
77768 + if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
77769 + p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
77770 + p->real_parent->brute = 1;
77771 + daemon = 1;
77772 + } else {
77773 + const struct cred *cred = __task_cred(p), *cred2;
77774 + struct task_struct *tsk, *tsk2;
77775 +
77776 + if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
77777 + struct user_struct *user;
77778 +
77779 + uid = cred->uid;
77780 +
77781 + /* this is put upon execution past expiration */
77782 + user = find_user(uid);
77783 + if (user == NULL)
77784 + goto unlock;
77785 + user->suid_banned = 1;
77786 + user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
77787 + if (user->suid_ban_expires == ~0UL)
77788 + user->suid_ban_expires--;
77789 +
77790 + /* only kill other threads of the same binary, from the same user */
77791 + do_each_thread(tsk2, tsk) {
77792 + cred2 = __task_cred(tsk);
77793 + if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
77794 + gr_fake_force_sig(SIGKILL, tsk);
77795 + } while_each_thread(tsk2, tsk);
77796 + }
77797 + }
77798 +unlock:
77799 + read_unlock(&grsec_exec_file_lock);
77800 + read_unlock(&tasklist_lock);
77801 + rcu_read_unlock();
77802 +
77803 + if (gr_is_global_nonroot(uid))
77804 + 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);
77805 + else if (daemon)
77806 + gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
77807 +
77808 +#endif
77809 + return;
77810 +}
77811 +
77812 +void gr_handle_brute_check(void)
77813 +{
77814 +#ifdef CONFIG_GRKERNSEC_BRUTE
77815 + struct task_struct *p = current;
77816 +
77817 + if (unlikely(p->brute)) {
77818 + if (!grsec_enable_brute)
77819 + p->brute = 0;
77820 + else if (time_before(get_seconds(), p->brute_expires))
77821 + msleep(30 * 1000);
77822 + }
77823 +#endif
77824 + return;
77825 +}
77826 +
77827 +void gr_handle_kernel_exploit(void)
77828 +{
77829 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77830 + const struct cred *cred;
77831 + struct task_struct *tsk, *tsk2;
77832 + struct user_struct *user;
77833 + kuid_t uid;
77834 +
77835 + if (in_irq() || in_serving_softirq() || in_nmi())
77836 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
77837 +
77838 + uid = current_uid();
77839 +
77840 + if (gr_is_global_root(uid))
77841 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
77842 + else {
77843 + /* kill all the processes of this user, hold a reference
77844 + to their creds struct, and prevent them from creating
77845 + another process until system reset
77846 + */
77847 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
77848 + GR_GLOBAL_UID(uid));
77849 + /* we intentionally leak this ref */
77850 + user = get_uid(current->cred->user);
77851 + if (user)
77852 + user->kernel_banned = 1;
77853 +
77854 + /* kill all processes of this user */
77855 + read_lock(&tasklist_lock);
77856 + do_each_thread(tsk2, tsk) {
77857 + cred = __task_cred(tsk);
77858 + if (uid_eq(cred->uid, uid))
77859 + gr_fake_force_sig(SIGKILL, tsk);
77860 + } while_each_thread(tsk2, tsk);
77861 + read_unlock(&tasklist_lock);
77862 + }
77863 +#endif
77864 +}
77865 +
77866 +#ifdef CONFIG_GRKERNSEC_BRUTE
77867 +static bool suid_ban_expired(struct user_struct *user)
77868 +{
77869 + if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
77870 + user->suid_banned = 0;
77871 + user->suid_ban_expires = 0;
77872 + free_uid(user);
77873 + return true;
77874 + }
77875 +
77876 + return false;
77877 +}
77878 +#endif
77879 +
77880 +int gr_process_kernel_exec_ban(void)
77881 +{
77882 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77883 + if (unlikely(current->cred->user->kernel_banned))
77884 + return -EPERM;
77885 +#endif
77886 + return 0;
77887 +}
77888 +
77889 +int gr_process_kernel_setuid_ban(struct user_struct *user)
77890 +{
77891 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77892 + if (unlikely(user->kernel_banned))
77893 + gr_fake_force_sig(SIGKILL, current);
77894 +#endif
77895 + return 0;
77896 +}
77897 +
77898 +int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
77899 +{
77900 +#ifdef CONFIG_GRKERNSEC_BRUTE
77901 + struct user_struct *user = current->cred->user;
77902 + if (unlikely(user->suid_banned)) {
77903 + if (suid_ban_expired(user))
77904 + return 0;
77905 + /* disallow execution of suid binaries only */
77906 + else if (!uid_eq(bprm->cred->euid, current->cred->uid))
77907 + return -EPERM;
77908 + }
77909 +#endif
77910 + return 0;
77911 +}
77912 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
77913 new file mode 100644
77914 index 0000000..e3650b6
77915 --- /dev/null
77916 +++ b/grsecurity/grsec_sock.c
77917 @@ -0,0 +1,244 @@
77918 +#include <linux/kernel.h>
77919 +#include <linux/module.h>
77920 +#include <linux/sched.h>
77921 +#include <linux/file.h>
77922 +#include <linux/net.h>
77923 +#include <linux/in.h>
77924 +#include <linux/ip.h>
77925 +#include <net/sock.h>
77926 +#include <net/inet_sock.h>
77927 +#include <linux/grsecurity.h>
77928 +#include <linux/grinternal.h>
77929 +#include <linux/gracl.h>
77930 +
77931 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
77932 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
77933 +
77934 +EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
77935 +EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
77936 +
77937 +#ifdef CONFIG_UNIX_MODULE
77938 +EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
77939 +EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
77940 +EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
77941 +EXPORT_SYMBOL_GPL(gr_handle_create);
77942 +#endif
77943 +
77944 +#ifdef CONFIG_GRKERNSEC
77945 +#define gr_conn_table_size 32749
77946 +struct conn_table_entry {
77947 + struct conn_table_entry *next;
77948 + struct signal_struct *sig;
77949 +};
77950 +
77951 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
77952 +DEFINE_SPINLOCK(gr_conn_table_lock);
77953 +
77954 +extern const char * gr_socktype_to_name(unsigned char type);
77955 +extern const char * gr_proto_to_name(unsigned char proto);
77956 +extern const char * gr_sockfamily_to_name(unsigned char family);
77957 +
77958 +static __inline__ int
77959 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
77960 +{
77961 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
77962 +}
77963 +
77964 +static __inline__ int
77965 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
77966 + __u16 sport, __u16 dport)
77967 +{
77968 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
77969 + sig->gr_sport == sport && sig->gr_dport == dport))
77970 + return 1;
77971 + else
77972 + return 0;
77973 +}
77974 +
77975 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
77976 +{
77977 + struct conn_table_entry **match;
77978 + unsigned int index;
77979 +
77980 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
77981 + sig->gr_sport, sig->gr_dport,
77982 + gr_conn_table_size);
77983 +
77984 + newent->sig = sig;
77985 +
77986 + match = &gr_conn_table[index];
77987 + newent->next = *match;
77988 + *match = newent;
77989 +
77990 + return;
77991 +}
77992 +
77993 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
77994 +{
77995 + struct conn_table_entry *match, *last = NULL;
77996 + unsigned int index;
77997 +
77998 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
77999 + sig->gr_sport, sig->gr_dport,
78000 + gr_conn_table_size);
78001 +
78002 + match = gr_conn_table[index];
78003 + while (match && !conn_match(match->sig,
78004 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78005 + sig->gr_dport)) {
78006 + last = match;
78007 + match = match->next;
78008 + }
78009 +
78010 + if (match) {
78011 + if (last)
78012 + last->next = match->next;
78013 + else
78014 + gr_conn_table[index] = NULL;
78015 + kfree(match);
78016 + }
78017 +
78018 + return;
78019 +}
78020 +
78021 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78022 + __u16 sport, __u16 dport)
78023 +{
78024 + struct conn_table_entry *match;
78025 + unsigned int index;
78026 +
78027 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78028 +
78029 + match = gr_conn_table[index];
78030 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78031 + match = match->next;
78032 +
78033 + if (match)
78034 + return match->sig;
78035 + else
78036 + return NULL;
78037 +}
78038 +
78039 +#endif
78040 +
78041 +void gr_update_task_in_ip_table(const struct inet_sock *inet)
78042 +{
78043 +#ifdef CONFIG_GRKERNSEC
78044 + struct signal_struct *sig = current->signal;
78045 + struct conn_table_entry *newent;
78046 +
78047 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78048 + if (newent == NULL)
78049 + return;
78050 + /* no bh lock needed since we are called with bh disabled */
78051 + spin_lock(&gr_conn_table_lock);
78052 + gr_del_task_from_ip_table_nolock(sig);
78053 + sig->gr_saddr = inet->inet_rcv_saddr;
78054 + sig->gr_daddr = inet->inet_daddr;
78055 + sig->gr_sport = inet->inet_sport;
78056 + sig->gr_dport = inet->inet_dport;
78057 + gr_add_to_task_ip_table_nolock(sig, newent);
78058 + spin_unlock(&gr_conn_table_lock);
78059 +#endif
78060 + return;
78061 +}
78062 +
78063 +void gr_del_task_from_ip_table(struct task_struct *task)
78064 +{
78065 +#ifdef CONFIG_GRKERNSEC
78066 + spin_lock_bh(&gr_conn_table_lock);
78067 + gr_del_task_from_ip_table_nolock(task->signal);
78068 + spin_unlock_bh(&gr_conn_table_lock);
78069 +#endif
78070 + return;
78071 +}
78072 +
78073 +void
78074 +gr_attach_curr_ip(const struct sock *sk)
78075 +{
78076 +#ifdef CONFIG_GRKERNSEC
78077 + struct signal_struct *p, *set;
78078 + const struct inet_sock *inet = inet_sk(sk);
78079 +
78080 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78081 + return;
78082 +
78083 + set = current->signal;
78084 +
78085 + spin_lock_bh(&gr_conn_table_lock);
78086 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78087 + inet->inet_dport, inet->inet_sport);
78088 + if (unlikely(p != NULL)) {
78089 + set->curr_ip = p->curr_ip;
78090 + set->used_accept = 1;
78091 + gr_del_task_from_ip_table_nolock(p);
78092 + spin_unlock_bh(&gr_conn_table_lock);
78093 + return;
78094 + }
78095 + spin_unlock_bh(&gr_conn_table_lock);
78096 +
78097 + set->curr_ip = inet->inet_daddr;
78098 + set->used_accept = 1;
78099 +#endif
78100 + return;
78101 +}
78102 +
78103 +int
78104 +gr_handle_sock_all(const int family, const int type, const int protocol)
78105 +{
78106 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78107 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
78108 + (family != AF_UNIX)) {
78109 + if (family == AF_INET)
78110 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
78111 + else
78112 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
78113 + return -EACCES;
78114 + }
78115 +#endif
78116 + return 0;
78117 +}
78118 +
78119 +int
78120 +gr_handle_sock_server(const struct sockaddr *sck)
78121 +{
78122 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78123 + if (grsec_enable_socket_server &&
78124 + in_group_p(grsec_socket_server_gid) &&
78125 + sck && (sck->sa_family != AF_UNIX) &&
78126 + (sck->sa_family != AF_LOCAL)) {
78127 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78128 + return -EACCES;
78129 + }
78130 +#endif
78131 + return 0;
78132 +}
78133 +
78134 +int
78135 +gr_handle_sock_server_other(const struct sock *sck)
78136 +{
78137 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78138 + if (grsec_enable_socket_server &&
78139 + in_group_p(grsec_socket_server_gid) &&
78140 + sck && (sck->sk_family != AF_UNIX) &&
78141 + (sck->sk_family != AF_LOCAL)) {
78142 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78143 + return -EACCES;
78144 + }
78145 +#endif
78146 + return 0;
78147 +}
78148 +
78149 +int
78150 +gr_handle_sock_client(const struct sockaddr *sck)
78151 +{
78152 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78153 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
78154 + sck && (sck->sa_family != AF_UNIX) &&
78155 + (sck->sa_family != AF_LOCAL)) {
78156 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
78157 + return -EACCES;
78158 + }
78159 +#endif
78160 + return 0;
78161 +}
78162 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
78163 new file mode 100644
78164 index 0000000..8159888
78165 --- /dev/null
78166 +++ b/grsecurity/grsec_sysctl.c
78167 @@ -0,0 +1,479 @@
78168 +#include <linux/kernel.h>
78169 +#include <linux/sched.h>
78170 +#include <linux/sysctl.h>
78171 +#include <linux/grsecurity.h>
78172 +#include <linux/grinternal.h>
78173 +
78174 +int
78175 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
78176 +{
78177 +#ifdef CONFIG_GRKERNSEC_SYSCTL
78178 + if (dirname == NULL || name == NULL)
78179 + return 0;
78180 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
78181 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
78182 + return -EACCES;
78183 + }
78184 +#endif
78185 + return 0;
78186 +}
78187 +
78188 +#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
78189 +static int __maybe_unused __read_only one = 1;
78190 +#endif
78191 +
78192 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
78193 + defined(CONFIG_GRKERNSEC_DENYUSB)
78194 +struct ctl_table grsecurity_table[] = {
78195 +#ifdef CONFIG_GRKERNSEC_SYSCTL
78196 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
78197 +#ifdef CONFIG_GRKERNSEC_IO
78198 + {
78199 + .procname = "disable_priv_io",
78200 + .data = &grsec_disable_privio,
78201 + .maxlen = sizeof(int),
78202 + .mode = 0600,
78203 + .proc_handler = &proc_dointvec,
78204 + },
78205 +#endif
78206 +#endif
78207 +#ifdef CONFIG_GRKERNSEC_LINK
78208 + {
78209 + .procname = "linking_restrictions",
78210 + .data = &grsec_enable_link,
78211 + .maxlen = sizeof(int),
78212 + .mode = 0600,
78213 + .proc_handler = &proc_dointvec,
78214 + },
78215 +#endif
78216 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78217 + {
78218 + .procname = "enforce_symlinksifowner",
78219 + .data = &grsec_enable_symlinkown,
78220 + .maxlen = sizeof(int),
78221 + .mode = 0600,
78222 + .proc_handler = &proc_dointvec,
78223 + },
78224 + {
78225 + .procname = "symlinkown_gid",
78226 + .data = &grsec_symlinkown_gid,
78227 + .maxlen = sizeof(int),
78228 + .mode = 0600,
78229 + .proc_handler = &proc_dointvec,
78230 + },
78231 +#endif
78232 +#ifdef CONFIG_GRKERNSEC_BRUTE
78233 + {
78234 + .procname = "deter_bruteforce",
78235 + .data = &grsec_enable_brute,
78236 + .maxlen = sizeof(int),
78237 + .mode = 0600,
78238 + .proc_handler = &proc_dointvec,
78239 + },
78240 +#endif
78241 +#ifdef CONFIG_GRKERNSEC_FIFO
78242 + {
78243 + .procname = "fifo_restrictions",
78244 + .data = &grsec_enable_fifo,
78245 + .maxlen = sizeof(int),
78246 + .mode = 0600,
78247 + .proc_handler = &proc_dointvec,
78248 + },
78249 +#endif
78250 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78251 + {
78252 + .procname = "ptrace_readexec",
78253 + .data = &grsec_enable_ptrace_readexec,
78254 + .maxlen = sizeof(int),
78255 + .mode = 0600,
78256 + .proc_handler = &proc_dointvec,
78257 + },
78258 +#endif
78259 +#ifdef CONFIG_GRKERNSEC_SETXID
78260 + {
78261 + .procname = "consistent_setxid",
78262 + .data = &grsec_enable_setxid,
78263 + .maxlen = sizeof(int),
78264 + .mode = 0600,
78265 + .proc_handler = &proc_dointvec,
78266 + },
78267 +#endif
78268 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78269 + {
78270 + .procname = "ip_blackhole",
78271 + .data = &grsec_enable_blackhole,
78272 + .maxlen = sizeof(int),
78273 + .mode = 0600,
78274 + .proc_handler = &proc_dointvec,
78275 + },
78276 + {
78277 + .procname = "lastack_retries",
78278 + .data = &grsec_lastack_retries,
78279 + .maxlen = sizeof(int),
78280 + .mode = 0600,
78281 + .proc_handler = &proc_dointvec,
78282 + },
78283 +#endif
78284 +#ifdef CONFIG_GRKERNSEC_EXECLOG
78285 + {
78286 + .procname = "exec_logging",
78287 + .data = &grsec_enable_execlog,
78288 + .maxlen = sizeof(int),
78289 + .mode = 0600,
78290 + .proc_handler = &proc_dointvec,
78291 + },
78292 +#endif
78293 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78294 + {
78295 + .procname = "rwxmap_logging",
78296 + .data = &grsec_enable_log_rwxmaps,
78297 + .maxlen = sizeof(int),
78298 + .mode = 0600,
78299 + .proc_handler = &proc_dointvec,
78300 + },
78301 +#endif
78302 +#ifdef CONFIG_GRKERNSEC_SIGNAL
78303 + {
78304 + .procname = "signal_logging",
78305 + .data = &grsec_enable_signal,
78306 + .maxlen = sizeof(int),
78307 + .mode = 0600,
78308 + .proc_handler = &proc_dointvec,
78309 + },
78310 +#endif
78311 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
78312 + {
78313 + .procname = "forkfail_logging",
78314 + .data = &grsec_enable_forkfail,
78315 + .maxlen = sizeof(int),
78316 + .mode = 0600,
78317 + .proc_handler = &proc_dointvec,
78318 + },
78319 +#endif
78320 +#ifdef CONFIG_GRKERNSEC_TIME
78321 + {
78322 + .procname = "timechange_logging",
78323 + .data = &grsec_enable_time,
78324 + .maxlen = sizeof(int),
78325 + .mode = 0600,
78326 + .proc_handler = &proc_dointvec,
78327 + },
78328 +#endif
78329 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78330 + {
78331 + .procname = "chroot_deny_shmat",
78332 + .data = &grsec_enable_chroot_shmat,
78333 + .maxlen = sizeof(int),
78334 + .mode = 0600,
78335 + .proc_handler = &proc_dointvec,
78336 + },
78337 +#endif
78338 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78339 + {
78340 + .procname = "chroot_deny_unix",
78341 + .data = &grsec_enable_chroot_unix,
78342 + .maxlen = sizeof(int),
78343 + .mode = 0600,
78344 + .proc_handler = &proc_dointvec,
78345 + },
78346 +#endif
78347 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78348 + {
78349 + .procname = "chroot_deny_mount",
78350 + .data = &grsec_enable_chroot_mount,
78351 + .maxlen = sizeof(int),
78352 + .mode = 0600,
78353 + .proc_handler = &proc_dointvec,
78354 + },
78355 +#endif
78356 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78357 + {
78358 + .procname = "chroot_deny_fchdir",
78359 + .data = &grsec_enable_chroot_fchdir,
78360 + .maxlen = sizeof(int),
78361 + .mode = 0600,
78362 + .proc_handler = &proc_dointvec,
78363 + },
78364 +#endif
78365 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78366 + {
78367 + .procname = "chroot_deny_chroot",
78368 + .data = &grsec_enable_chroot_double,
78369 + .maxlen = sizeof(int),
78370 + .mode = 0600,
78371 + .proc_handler = &proc_dointvec,
78372 + },
78373 +#endif
78374 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78375 + {
78376 + .procname = "chroot_deny_pivot",
78377 + .data = &grsec_enable_chroot_pivot,
78378 + .maxlen = sizeof(int),
78379 + .mode = 0600,
78380 + .proc_handler = &proc_dointvec,
78381 + },
78382 +#endif
78383 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78384 + {
78385 + .procname = "chroot_enforce_chdir",
78386 + .data = &grsec_enable_chroot_chdir,
78387 + .maxlen = sizeof(int),
78388 + .mode = 0600,
78389 + .proc_handler = &proc_dointvec,
78390 + },
78391 +#endif
78392 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78393 + {
78394 + .procname = "chroot_deny_chmod",
78395 + .data = &grsec_enable_chroot_chmod,
78396 + .maxlen = sizeof(int),
78397 + .mode = 0600,
78398 + .proc_handler = &proc_dointvec,
78399 + },
78400 +#endif
78401 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78402 + {
78403 + .procname = "chroot_deny_mknod",
78404 + .data = &grsec_enable_chroot_mknod,
78405 + .maxlen = sizeof(int),
78406 + .mode = 0600,
78407 + .proc_handler = &proc_dointvec,
78408 + },
78409 +#endif
78410 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78411 + {
78412 + .procname = "chroot_restrict_nice",
78413 + .data = &grsec_enable_chroot_nice,
78414 + .maxlen = sizeof(int),
78415 + .mode = 0600,
78416 + .proc_handler = &proc_dointvec,
78417 + },
78418 +#endif
78419 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78420 + {
78421 + .procname = "chroot_execlog",
78422 + .data = &grsec_enable_chroot_execlog,
78423 + .maxlen = sizeof(int),
78424 + .mode = 0600,
78425 + .proc_handler = &proc_dointvec,
78426 + },
78427 +#endif
78428 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78429 + {
78430 + .procname = "chroot_caps",
78431 + .data = &grsec_enable_chroot_caps,
78432 + .maxlen = sizeof(int),
78433 + .mode = 0600,
78434 + .proc_handler = &proc_dointvec,
78435 + },
78436 +#endif
78437 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78438 + {
78439 + .procname = "chroot_deny_sysctl",
78440 + .data = &grsec_enable_chroot_sysctl,
78441 + .maxlen = sizeof(int),
78442 + .mode = 0600,
78443 + .proc_handler = &proc_dointvec,
78444 + },
78445 +#endif
78446 +#ifdef CONFIG_GRKERNSEC_TPE
78447 + {
78448 + .procname = "tpe",
78449 + .data = &grsec_enable_tpe,
78450 + .maxlen = sizeof(int),
78451 + .mode = 0600,
78452 + .proc_handler = &proc_dointvec,
78453 + },
78454 + {
78455 + .procname = "tpe_gid",
78456 + .data = &grsec_tpe_gid,
78457 + .maxlen = sizeof(int),
78458 + .mode = 0600,
78459 + .proc_handler = &proc_dointvec,
78460 + },
78461 +#endif
78462 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78463 + {
78464 + .procname = "tpe_invert",
78465 + .data = &grsec_enable_tpe_invert,
78466 + .maxlen = sizeof(int),
78467 + .mode = 0600,
78468 + .proc_handler = &proc_dointvec,
78469 + },
78470 +#endif
78471 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
78472 + {
78473 + .procname = "tpe_restrict_all",
78474 + .data = &grsec_enable_tpe_all,
78475 + .maxlen = sizeof(int),
78476 + .mode = 0600,
78477 + .proc_handler = &proc_dointvec,
78478 + },
78479 +#endif
78480 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78481 + {
78482 + .procname = "socket_all",
78483 + .data = &grsec_enable_socket_all,
78484 + .maxlen = sizeof(int),
78485 + .mode = 0600,
78486 + .proc_handler = &proc_dointvec,
78487 + },
78488 + {
78489 + .procname = "socket_all_gid",
78490 + .data = &grsec_socket_all_gid,
78491 + .maxlen = sizeof(int),
78492 + .mode = 0600,
78493 + .proc_handler = &proc_dointvec,
78494 + },
78495 +#endif
78496 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78497 + {
78498 + .procname = "socket_client",
78499 + .data = &grsec_enable_socket_client,
78500 + .maxlen = sizeof(int),
78501 + .mode = 0600,
78502 + .proc_handler = &proc_dointvec,
78503 + },
78504 + {
78505 + .procname = "socket_client_gid",
78506 + .data = &grsec_socket_client_gid,
78507 + .maxlen = sizeof(int),
78508 + .mode = 0600,
78509 + .proc_handler = &proc_dointvec,
78510 + },
78511 +#endif
78512 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78513 + {
78514 + .procname = "socket_server",
78515 + .data = &grsec_enable_socket_server,
78516 + .maxlen = sizeof(int),
78517 + .mode = 0600,
78518 + .proc_handler = &proc_dointvec,
78519 + },
78520 + {
78521 + .procname = "socket_server_gid",
78522 + .data = &grsec_socket_server_gid,
78523 + .maxlen = sizeof(int),
78524 + .mode = 0600,
78525 + .proc_handler = &proc_dointvec,
78526 + },
78527 +#endif
78528 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78529 + {
78530 + .procname = "audit_group",
78531 + .data = &grsec_enable_group,
78532 + .maxlen = sizeof(int),
78533 + .mode = 0600,
78534 + .proc_handler = &proc_dointvec,
78535 + },
78536 + {
78537 + .procname = "audit_gid",
78538 + .data = &grsec_audit_gid,
78539 + .maxlen = sizeof(int),
78540 + .mode = 0600,
78541 + .proc_handler = &proc_dointvec,
78542 + },
78543 +#endif
78544 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78545 + {
78546 + .procname = "audit_chdir",
78547 + .data = &grsec_enable_chdir,
78548 + .maxlen = sizeof(int),
78549 + .mode = 0600,
78550 + .proc_handler = &proc_dointvec,
78551 + },
78552 +#endif
78553 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78554 + {
78555 + .procname = "audit_mount",
78556 + .data = &grsec_enable_mount,
78557 + .maxlen = sizeof(int),
78558 + .mode = 0600,
78559 + .proc_handler = &proc_dointvec,
78560 + },
78561 +#endif
78562 +#ifdef CONFIG_GRKERNSEC_DMESG
78563 + {
78564 + .procname = "dmesg",
78565 + .data = &grsec_enable_dmesg,
78566 + .maxlen = sizeof(int),
78567 + .mode = 0600,
78568 + .proc_handler = &proc_dointvec,
78569 + },
78570 +#endif
78571 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
78572 + {
78573 + .procname = "chroot_findtask",
78574 + .data = &grsec_enable_chroot_findtask,
78575 + .maxlen = sizeof(int),
78576 + .mode = 0600,
78577 + .proc_handler = &proc_dointvec,
78578 + },
78579 +#endif
78580 +#ifdef CONFIG_GRKERNSEC_RESLOG
78581 + {
78582 + .procname = "resource_logging",
78583 + .data = &grsec_resource_logging,
78584 + .maxlen = sizeof(int),
78585 + .mode = 0600,
78586 + .proc_handler = &proc_dointvec,
78587 + },
78588 +#endif
78589 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78590 + {
78591 + .procname = "audit_ptrace",
78592 + .data = &grsec_enable_audit_ptrace,
78593 + .maxlen = sizeof(int),
78594 + .mode = 0600,
78595 + .proc_handler = &proc_dointvec,
78596 + },
78597 +#endif
78598 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
78599 + {
78600 + .procname = "harden_ptrace",
78601 + .data = &grsec_enable_harden_ptrace,
78602 + .maxlen = sizeof(int),
78603 + .mode = 0600,
78604 + .proc_handler = &proc_dointvec,
78605 + },
78606 +#endif
78607 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78608 + {
78609 + .procname = "harden_ipc",
78610 + .data = &grsec_enable_harden_ipc,
78611 + .maxlen = sizeof(int),
78612 + .mode = 0600,
78613 + .proc_handler = &proc_dointvec,
78614 + },
78615 +#endif
78616 + {
78617 + .procname = "grsec_lock",
78618 + .data = &grsec_lock,
78619 + .maxlen = sizeof(int),
78620 + .mode = 0600,
78621 + .proc_handler = &proc_dointvec,
78622 + },
78623 +#endif
78624 +#ifdef CONFIG_GRKERNSEC_ROFS
78625 + {
78626 + .procname = "romount_protect",
78627 + .data = &grsec_enable_rofs,
78628 + .maxlen = sizeof(int),
78629 + .mode = 0600,
78630 + .proc_handler = &proc_dointvec_minmax,
78631 + .extra1 = &one,
78632 + .extra2 = &one,
78633 + },
78634 +#endif
78635 +#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
78636 + {
78637 + .procname = "deny_new_usb",
78638 + .data = &grsec_deny_new_usb,
78639 + .maxlen = sizeof(int),
78640 + .mode = 0600,
78641 + .proc_handler = &proc_dointvec,
78642 + },
78643 +#endif
78644 + { }
78645 +};
78646 +#endif
78647 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
78648 new file mode 100644
78649 index 0000000..61b514e
78650 --- /dev/null
78651 +++ b/grsecurity/grsec_time.c
78652 @@ -0,0 +1,16 @@
78653 +#include <linux/kernel.h>
78654 +#include <linux/sched.h>
78655 +#include <linux/grinternal.h>
78656 +#include <linux/module.h>
78657 +
78658 +void
78659 +gr_log_timechange(void)
78660 +{
78661 +#ifdef CONFIG_GRKERNSEC_TIME
78662 + if (grsec_enable_time)
78663 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
78664 +#endif
78665 + return;
78666 +}
78667 +
78668 +EXPORT_SYMBOL_GPL(gr_log_timechange);
78669 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
78670 new file mode 100644
78671 index 0000000..d1953de
78672 --- /dev/null
78673 +++ b/grsecurity/grsec_tpe.c
78674 @@ -0,0 +1,78 @@
78675 +#include <linux/kernel.h>
78676 +#include <linux/sched.h>
78677 +#include <linux/file.h>
78678 +#include <linux/fs.h>
78679 +#include <linux/grinternal.h>
78680 +
78681 +extern int gr_acl_tpe_check(void);
78682 +
78683 +int
78684 +gr_tpe_allow(const struct file *file)
78685 +{
78686 +#ifdef CONFIG_GRKERNSEC
78687 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
78688 + struct inode *file_inode = file->f_path.dentry->d_inode;
78689 + const struct cred *cred = current_cred();
78690 + char *msg = NULL;
78691 + char *msg2 = NULL;
78692 +
78693 + // never restrict root
78694 + if (gr_is_global_root(cred->uid))
78695 + return 1;
78696 +
78697 + if (grsec_enable_tpe) {
78698 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78699 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
78700 + msg = "not being in trusted group";
78701 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
78702 + msg = "being in untrusted group";
78703 +#else
78704 + if (in_group_p(grsec_tpe_gid))
78705 + msg = "being in untrusted group";
78706 +#endif
78707 + }
78708 + if (!msg && gr_acl_tpe_check())
78709 + msg = "being in untrusted role";
78710 +
78711 + // not in any affected group/role
78712 + if (!msg)
78713 + goto next_check;
78714 +
78715 + if (gr_is_global_nonroot(inode->i_uid))
78716 + msg2 = "file in non-root-owned directory";
78717 + else if (inode->i_mode & S_IWOTH)
78718 + msg2 = "file in world-writable directory";
78719 + else if (inode->i_mode & S_IWGRP)
78720 + msg2 = "file in group-writable directory";
78721 + else if (file_inode->i_mode & S_IWOTH)
78722 + msg2 = "file is world-writable";
78723 +
78724 + if (msg && msg2) {
78725 + char fullmsg[70] = {0};
78726 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
78727 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
78728 + return 0;
78729 + }
78730 + msg = NULL;
78731 +next_check:
78732 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
78733 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
78734 + return 1;
78735 +
78736 + if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
78737 + msg = "directory not owned by user";
78738 + else if (inode->i_mode & S_IWOTH)
78739 + msg = "file in world-writable directory";
78740 + else if (inode->i_mode & S_IWGRP)
78741 + msg = "file in group-writable directory";
78742 + else if (file_inode->i_mode & S_IWOTH)
78743 + msg = "file is world-writable";
78744 +
78745 + if (msg) {
78746 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
78747 + return 0;
78748 + }
78749 +#endif
78750 +#endif
78751 + return 1;
78752 +}
78753 diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
78754 new file mode 100644
78755 index 0000000..ae02d8e
78756 --- /dev/null
78757 +++ b/grsecurity/grsec_usb.c
78758 @@ -0,0 +1,15 @@
78759 +#include <linux/kernel.h>
78760 +#include <linux/grinternal.h>
78761 +#include <linux/module.h>
78762 +
78763 +int gr_handle_new_usb(void)
78764 +{
78765 +#ifdef CONFIG_GRKERNSEC_DENYUSB
78766 + if (grsec_deny_new_usb) {
78767 + printk(KERN_ALERT "grsec: denied insert of new USB device\n");
78768 + return 1;
78769 + }
78770 +#endif
78771 + return 0;
78772 +}
78773 +EXPORT_SYMBOL_GPL(gr_handle_new_usb);
78774 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
78775 new file mode 100644
78776 index 0000000..158b330
78777 --- /dev/null
78778 +++ b/grsecurity/grsum.c
78779 @@ -0,0 +1,64 @@
78780 +#include <linux/err.h>
78781 +#include <linux/kernel.h>
78782 +#include <linux/sched.h>
78783 +#include <linux/mm.h>
78784 +#include <linux/scatterlist.h>
78785 +#include <linux/crypto.h>
78786 +#include <linux/gracl.h>
78787 +
78788 +
78789 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
78790 +#error "crypto and sha256 must be built into the kernel"
78791 +#endif
78792 +
78793 +int
78794 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
78795 +{
78796 + struct crypto_hash *tfm;
78797 + struct hash_desc desc;
78798 + struct scatterlist sg[2];
78799 + unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
78800 + unsigned long *tmpsumptr = (unsigned long *)temp_sum;
78801 + unsigned long *sumptr = (unsigned long *)sum;
78802 + int cryptres;
78803 + int retval = 1;
78804 + volatile int mismatched = 0;
78805 + volatile int dummy = 0;
78806 + unsigned int i;
78807 +
78808 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
78809 + if (IS_ERR(tfm)) {
78810 + /* should never happen, since sha256 should be built in */
78811 + memset(entry->pw, 0, GR_PW_LEN);
78812 + return 1;
78813 + }
78814 +
78815 + sg_init_table(sg, 2);
78816 + sg_set_buf(&sg[0], salt, GR_SALT_LEN);
78817 + sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
78818 +
78819 + desc.tfm = tfm;
78820 + desc.flags = 0;
78821 +
78822 + cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
78823 + temp_sum);
78824 +
78825 + memset(entry->pw, 0, GR_PW_LEN);
78826 +
78827 + if (cryptres)
78828 + goto out;
78829 +
78830 + for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
78831 + if (sumptr[i] != tmpsumptr[i])
78832 + mismatched = 1;
78833 + else
78834 + dummy = 1; // waste a cycle
78835 +
78836 + if (!mismatched)
78837 + retval = dummy - 1;
78838 +
78839 +out:
78840 + crypto_free_hash(tfm);
78841 +
78842 + return retval;
78843 +}
78844 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
78845 index 77ff547..181834f 100644
78846 --- a/include/asm-generic/4level-fixup.h
78847 +++ b/include/asm-generic/4level-fixup.h
78848 @@ -13,8 +13,10 @@
78849 #define pmd_alloc(mm, pud, address) \
78850 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
78851 NULL: pmd_offset(pud, address))
78852 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
78853
78854 #define pud_alloc(mm, pgd, address) (pgd)
78855 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
78856 #define pud_offset(pgd, start) (pgd)
78857 #define pud_none(pud) 0
78858 #define pud_bad(pud) 0
78859 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
78860 index b7babf0..1e4b4f1 100644
78861 --- a/include/asm-generic/atomic-long.h
78862 +++ b/include/asm-generic/atomic-long.h
78863 @@ -22,6 +22,12 @@
78864
78865 typedef atomic64_t atomic_long_t;
78866
78867 +#ifdef CONFIG_PAX_REFCOUNT
78868 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
78869 +#else
78870 +typedef atomic64_t atomic_long_unchecked_t;
78871 +#endif
78872 +
78873 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
78874
78875 static inline long atomic_long_read(atomic_long_t *l)
78876 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
78877 return (long)atomic64_read(v);
78878 }
78879
78880 +#ifdef CONFIG_PAX_REFCOUNT
78881 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
78882 +{
78883 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78884 +
78885 + return (long)atomic64_read_unchecked(v);
78886 +}
78887 +#endif
78888 +
78889 static inline void atomic_long_set(atomic_long_t *l, long i)
78890 {
78891 atomic64_t *v = (atomic64_t *)l;
78892 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
78893 atomic64_set(v, i);
78894 }
78895
78896 +#ifdef CONFIG_PAX_REFCOUNT
78897 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
78898 +{
78899 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78900 +
78901 + atomic64_set_unchecked(v, i);
78902 +}
78903 +#endif
78904 +
78905 static inline void atomic_long_inc(atomic_long_t *l)
78906 {
78907 atomic64_t *v = (atomic64_t *)l;
78908 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
78909 atomic64_inc(v);
78910 }
78911
78912 +#ifdef CONFIG_PAX_REFCOUNT
78913 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
78914 +{
78915 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78916 +
78917 + atomic64_inc_unchecked(v);
78918 +}
78919 +#endif
78920 +
78921 static inline void atomic_long_dec(atomic_long_t *l)
78922 {
78923 atomic64_t *v = (atomic64_t *)l;
78924 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
78925 atomic64_dec(v);
78926 }
78927
78928 +#ifdef CONFIG_PAX_REFCOUNT
78929 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
78930 +{
78931 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78932 +
78933 + atomic64_dec_unchecked(v);
78934 +}
78935 +#endif
78936 +
78937 static inline void atomic_long_add(long i, atomic_long_t *l)
78938 {
78939 atomic64_t *v = (atomic64_t *)l;
78940 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
78941 atomic64_add(i, v);
78942 }
78943
78944 +#ifdef CONFIG_PAX_REFCOUNT
78945 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
78946 +{
78947 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78948 +
78949 + atomic64_add_unchecked(i, v);
78950 +}
78951 +#endif
78952 +
78953 static inline void atomic_long_sub(long i, atomic_long_t *l)
78954 {
78955 atomic64_t *v = (atomic64_t *)l;
78956 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
78957 atomic64_sub(i, v);
78958 }
78959
78960 +#ifdef CONFIG_PAX_REFCOUNT
78961 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
78962 +{
78963 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78964 +
78965 + atomic64_sub_unchecked(i, v);
78966 +}
78967 +#endif
78968 +
78969 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
78970 {
78971 atomic64_t *v = (atomic64_t *)l;
78972 @@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
78973 return atomic64_add_negative(i, v);
78974 }
78975
78976 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
78977 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
78978 {
78979 atomic64_t *v = (atomic64_t *)l;
78980
78981 return (long)atomic64_add_return(i, v);
78982 }
78983
78984 +#ifdef CONFIG_PAX_REFCOUNT
78985 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
78986 +{
78987 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78988 +
78989 + return (long)atomic64_add_return_unchecked(i, v);
78990 +}
78991 +#endif
78992 +
78993 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
78994 {
78995 atomic64_t *v = (atomic64_t *)l;
78996 @@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
78997 return (long)atomic64_inc_return(v);
78998 }
78999
79000 +#ifdef CONFIG_PAX_REFCOUNT
79001 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79002 +{
79003 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79004 +
79005 + return (long)atomic64_inc_return_unchecked(v);
79006 +}
79007 +#endif
79008 +
79009 static inline long atomic_long_dec_return(atomic_long_t *l)
79010 {
79011 atomic64_t *v = (atomic64_t *)l;
79012 @@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79013
79014 typedef atomic_t atomic_long_t;
79015
79016 +#ifdef CONFIG_PAX_REFCOUNT
79017 +typedef atomic_unchecked_t atomic_long_unchecked_t;
79018 +#else
79019 +typedef atomic_t atomic_long_unchecked_t;
79020 +#endif
79021 +
79022 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79023 static inline long atomic_long_read(atomic_long_t *l)
79024 {
79025 @@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79026 return (long)atomic_read(v);
79027 }
79028
79029 +#ifdef CONFIG_PAX_REFCOUNT
79030 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79031 +{
79032 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79033 +
79034 + return (long)atomic_read_unchecked(v);
79035 +}
79036 +#endif
79037 +
79038 static inline void atomic_long_set(atomic_long_t *l, long i)
79039 {
79040 atomic_t *v = (atomic_t *)l;
79041 @@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79042 atomic_set(v, i);
79043 }
79044
79045 +#ifdef CONFIG_PAX_REFCOUNT
79046 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79047 +{
79048 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79049 +
79050 + atomic_set_unchecked(v, i);
79051 +}
79052 +#endif
79053 +
79054 static inline void atomic_long_inc(atomic_long_t *l)
79055 {
79056 atomic_t *v = (atomic_t *)l;
79057 @@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79058 atomic_inc(v);
79059 }
79060
79061 +#ifdef CONFIG_PAX_REFCOUNT
79062 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79063 +{
79064 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79065 +
79066 + atomic_inc_unchecked(v);
79067 +}
79068 +#endif
79069 +
79070 static inline void atomic_long_dec(atomic_long_t *l)
79071 {
79072 atomic_t *v = (atomic_t *)l;
79073 @@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79074 atomic_dec(v);
79075 }
79076
79077 +#ifdef CONFIG_PAX_REFCOUNT
79078 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79079 +{
79080 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79081 +
79082 + atomic_dec_unchecked(v);
79083 +}
79084 +#endif
79085 +
79086 static inline void atomic_long_add(long i, atomic_long_t *l)
79087 {
79088 atomic_t *v = (atomic_t *)l;
79089 @@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79090 atomic_add(i, v);
79091 }
79092
79093 +#ifdef CONFIG_PAX_REFCOUNT
79094 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79095 +{
79096 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79097 +
79098 + atomic_add_unchecked(i, v);
79099 +}
79100 +#endif
79101 +
79102 static inline void atomic_long_sub(long i, atomic_long_t *l)
79103 {
79104 atomic_t *v = (atomic_t *)l;
79105 @@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79106 atomic_sub(i, v);
79107 }
79108
79109 +#ifdef CONFIG_PAX_REFCOUNT
79110 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79111 +{
79112 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79113 +
79114 + atomic_sub_unchecked(i, v);
79115 +}
79116 +#endif
79117 +
79118 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79119 {
79120 atomic_t *v = (atomic_t *)l;
79121 @@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79122 return atomic_add_negative(i, v);
79123 }
79124
79125 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
79126 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79127 {
79128 atomic_t *v = (atomic_t *)l;
79129
79130 return (long)atomic_add_return(i, v);
79131 }
79132
79133 +#ifdef CONFIG_PAX_REFCOUNT
79134 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79135 +{
79136 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79137 +
79138 + return (long)atomic_add_return_unchecked(i, v);
79139 +}
79140 +
79141 +#endif
79142 +
79143 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79144 {
79145 atomic_t *v = (atomic_t *)l;
79146 @@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79147 return (long)atomic_inc_return(v);
79148 }
79149
79150 +#ifdef CONFIG_PAX_REFCOUNT
79151 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79152 +{
79153 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79154 +
79155 + return (long)atomic_inc_return_unchecked(v);
79156 +}
79157 +#endif
79158 +
79159 static inline long atomic_long_dec_return(atomic_long_t *l)
79160 {
79161 atomic_t *v = (atomic_t *)l;
79162 @@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79163
79164 #endif /* BITS_PER_LONG == 64 */
79165
79166 +#ifdef CONFIG_PAX_REFCOUNT
79167 +static inline void pax_refcount_needs_these_functions(void)
79168 +{
79169 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
79170 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
79171 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
79172 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
79173 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
79174 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
79175 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
79176 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
79177 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
79178 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
79179 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
79180 +#ifdef CONFIG_X86
79181 + atomic_clear_mask_unchecked(0, NULL);
79182 + atomic_set_mask_unchecked(0, NULL);
79183 +#endif
79184 +
79185 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
79186 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
79187 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
79188 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
79189 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
79190 + atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
79191 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
79192 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
79193 +}
79194 +#else
79195 +#define atomic_read_unchecked(v) atomic_read(v)
79196 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
79197 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
79198 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
79199 +#define atomic_inc_unchecked(v) atomic_inc(v)
79200 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
79201 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
79202 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
79203 +#define atomic_dec_unchecked(v) atomic_dec(v)
79204 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
79205 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
79206 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
79207 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
79208 +
79209 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
79210 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
79211 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
79212 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
79213 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
79214 +#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
79215 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
79216 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
79217 +#endif
79218 +
79219 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
79220 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
79221 index 30ad9c8..c70c170 100644
79222 --- a/include/asm-generic/atomic64.h
79223 +++ b/include/asm-generic/atomic64.h
79224 @@ -16,6 +16,8 @@ typedef struct {
79225 long long counter;
79226 } atomic64_t;
79227
79228 +typedef atomic64_t atomic64_unchecked_t;
79229 +
79230 #define ATOMIC64_INIT(i) { (i) }
79231
79232 extern long long atomic64_read(const atomic64_t *v);
79233 @@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
79234 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
79235 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
79236
79237 +#define atomic64_read_unchecked(v) atomic64_read(v)
79238 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
79239 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
79240 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
79241 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
79242 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
79243 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
79244 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
79245 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
79246 +
79247 #endif /* _ASM_GENERIC_ATOMIC64_H */
79248 diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
79249 index 1402fa8..025a736 100644
79250 --- a/include/asm-generic/barrier.h
79251 +++ b/include/asm-generic/barrier.h
79252 @@ -74,7 +74,7 @@
79253 do { \
79254 compiletime_assert_atomic_type(*p); \
79255 smp_mb(); \
79256 - ACCESS_ONCE(*p) = (v); \
79257 + ACCESS_ONCE_RW(*p) = (v); \
79258 } while (0)
79259
79260 #define smp_load_acquire(p) \
79261 diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
79262 index a60a7cc..0fe12f2 100644
79263 --- a/include/asm-generic/bitops/__fls.h
79264 +++ b/include/asm-generic/bitops/__fls.h
79265 @@ -9,7 +9,7 @@
79266 *
79267 * Undefined if no set bit exists, so code should check against 0 first.
79268 */
79269 -static __always_inline unsigned long __fls(unsigned long word)
79270 +static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
79271 {
79272 int num = BITS_PER_LONG - 1;
79273
79274 diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
79275 index 0576d1f..dad6c71 100644
79276 --- a/include/asm-generic/bitops/fls.h
79277 +++ b/include/asm-generic/bitops/fls.h
79278 @@ -9,7 +9,7 @@
79279 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
79280 */
79281
79282 -static __always_inline int fls(int x)
79283 +static __always_inline int __intentional_overflow(-1) fls(int x)
79284 {
79285 int r = 32;
79286
79287 diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
79288 index b097cf8..3d40e14 100644
79289 --- a/include/asm-generic/bitops/fls64.h
79290 +++ b/include/asm-generic/bitops/fls64.h
79291 @@ -15,7 +15,7 @@
79292 * at position 64.
79293 */
79294 #if BITS_PER_LONG == 32
79295 -static __always_inline int fls64(__u64 x)
79296 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79297 {
79298 __u32 h = x >> 32;
79299 if (h)
79300 @@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
79301 return fls(x);
79302 }
79303 #elif BITS_PER_LONG == 64
79304 -static __always_inline int fls64(__u64 x)
79305 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79306 {
79307 if (x == 0)
79308 return 0;
79309 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
79310 index 1bfcfe5..e04c5c9 100644
79311 --- a/include/asm-generic/cache.h
79312 +++ b/include/asm-generic/cache.h
79313 @@ -6,7 +6,7 @@
79314 * cache lines need to provide their own cache.h.
79315 */
79316
79317 -#define L1_CACHE_SHIFT 5
79318 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
79319 +#define L1_CACHE_SHIFT 5UL
79320 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
79321
79322 #endif /* __ASM_GENERIC_CACHE_H */
79323 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
79324 index 0d68a1e..b74a761 100644
79325 --- a/include/asm-generic/emergency-restart.h
79326 +++ b/include/asm-generic/emergency-restart.h
79327 @@ -1,7 +1,7 @@
79328 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
79329 #define _ASM_GENERIC_EMERGENCY_RESTART_H
79330
79331 -static inline void machine_emergency_restart(void)
79332 +static inline __noreturn void machine_emergency_restart(void)
79333 {
79334 machine_restart(NULL);
79335 }
79336 diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
79337 index b8fdc57..c6d5a5c 100644
79338 --- a/include/asm-generic/io.h
79339 +++ b/include/asm-generic/io.h
79340 @@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
79341 * These are pretty trivial
79342 */
79343 #ifndef virt_to_phys
79344 -static inline unsigned long virt_to_phys(volatile void *address)
79345 +static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
79346 {
79347 return __pa((unsigned long)address);
79348 }
79349 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
79350 index 90f99c7..00ce236 100644
79351 --- a/include/asm-generic/kmap_types.h
79352 +++ b/include/asm-generic/kmap_types.h
79353 @@ -2,9 +2,9 @@
79354 #define _ASM_GENERIC_KMAP_TYPES_H
79355
79356 #ifdef __WITH_KM_FENCE
79357 -# define KM_TYPE_NR 41
79358 +# define KM_TYPE_NR 42
79359 #else
79360 -# define KM_TYPE_NR 20
79361 +# define KM_TYPE_NR 21
79362 #endif
79363
79364 #endif
79365 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
79366 index 9ceb03b..62b0b8f 100644
79367 --- a/include/asm-generic/local.h
79368 +++ b/include/asm-generic/local.h
79369 @@ -23,24 +23,37 @@ typedef struct
79370 atomic_long_t a;
79371 } local_t;
79372
79373 +typedef struct {
79374 + atomic_long_unchecked_t a;
79375 +} local_unchecked_t;
79376 +
79377 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
79378
79379 #define local_read(l) atomic_long_read(&(l)->a)
79380 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
79381 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
79382 +#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
79383 #define local_inc(l) atomic_long_inc(&(l)->a)
79384 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
79385 #define local_dec(l) atomic_long_dec(&(l)->a)
79386 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
79387 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
79388 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
79389 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
79390 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
79391
79392 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
79393 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
79394 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
79395 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
79396 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
79397 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
79398 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
79399 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
79400 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
79401
79402 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79403 +#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79404 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
79405 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
79406 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
79407 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
79408 index 725612b..9cc513a 100644
79409 --- a/include/asm-generic/pgtable-nopmd.h
79410 +++ b/include/asm-generic/pgtable-nopmd.h
79411 @@ -1,14 +1,19 @@
79412 #ifndef _PGTABLE_NOPMD_H
79413 #define _PGTABLE_NOPMD_H
79414
79415 -#ifndef __ASSEMBLY__
79416 -
79417 #include <asm-generic/pgtable-nopud.h>
79418
79419 -struct mm_struct;
79420 -
79421 #define __PAGETABLE_PMD_FOLDED
79422
79423 +#define PMD_SHIFT PUD_SHIFT
79424 +#define PTRS_PER_PMD 1
79425 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
79426 +#define PMD_MASK (~(PMD_SIZE-1))
79427 +
79428 +#ifndef __ASSEMBLY__
79429 +
79430 +struct mm_struct;
79431 +
79432 /*
79433 * Having the pmd type consist of a pud gets the size right, and allows
79434 * us to conceptually access the pud entry that this pmd is folded into
79435 @@ -16,11 +21,6 @@ struct mm_struct;
79436 */
79437 typedef struct { pud_t pud; } pmd_t;
79438
79439 -#define PMD_SHIFT PUD_SHIFT
79440 -#define PTRS_PER_PMD 1
79441 -#define PMD_SIZE (1UL << PMD_SHIFT)
79442 -#define PMD_MASK (~(PMD_SIZE-1))
79443 -
79444 /*
79445 * The "pud_xxx()" functions here are trivial for a folded two-level
79446 * setup: the pmd is never bad, and a pmd always exists (as it's folded
79447 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
79448 index 810431d..0ec4804f 100644
79449 --- a/include/asm-generic/pgtable-nopud.h
79450 +++ b/include/asm-generic/pgtable-nopud.h
79451 @@ -1,10 +1,15 @@
79452 #ifndef _PGTABLE_NOPUD_H
79453 #define _PGTABLE_NOPUD_H
79454
79455 -#ifndef __ASSEMBLY__
79456 -
79457 #define __PAGETABLE_PUD_FOLDED
79458
79459 +#define PUD_SHIFT PGDIR_SHIFT
79460 +#define PTRS_PER_PUD 1
79461 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
79462 +#define PUD_MASK (~(PUD_SIZE-1))
79463 +
79464 +#ifndef __ASSEMBLY__
79465 +
79466 /*
79467 * Having the pud type consist of a pgd gets the size right, and allows
79468 * us to conceptually access the pgd entry that this pud is folded into
79469 @@ -12,11 +17,6 @@
79470 */
79471 typedef struct { pgd_t pgd; } pud_t;
79472
79473 -#define PUD_SHIFT PGDIR_SHIFT
79474 -#define PTRS_PER_PUD 1
79475 -#define PUD_SIZE (1UL << PUD_SHIFT)
79476 -#define PUD_MASK (~(PUD_SIZE-1))
79477 -
79478 /*
79479 * The "pgd_xxx()" functions here are trivial for a folded two-level
79480 * setup: the pud is never bad, and a pud always exists (as it's folded
79481 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
79482 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
79483
79484 #define pgd_populate(mm, pgd, pud) do { } while (0)
79485 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
79486 /*
79487 * (puds are folded into pgds so this doesn't get actually called,
79488 * but the define is needed for a generic inline function.)
79489 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
79490 index 752e30d..87f172d 100644
79491 --- a/include/asm-generic/pgtable.h
79492 +++ b/include/asm-generic/pgtable.h
79493 @@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
79494 }
79495 #endif /* CONFIG_NUMA_BALANCING */
79496
79497 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
79498 +#ifdef CONFIG_PAX_KERNEXEC
79499 +#error KERNEXEC requires pax_open_kernel
79500 +#else
79501 +static inline unsigned long pax_open_kernel(void) { return 0; }
79502 +#endif
79503 +#endif
79504 +
79505 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
79506 +#ifdef CONFIG_PAX_KERNEXEC
79507 +#error KERNEXEC requires pax_close_kernel
79508 +#else
79509 +static inline unsigned long pax_close_kernel(void) { return 0; }
79510 +#endif
79511 +#endif
79512 +
79513 #endif /* CONFIG_MMU */
79514
79515 #endif /* !__ASSEMBLY__ */
79516 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
79517 index 72d8803..cb9749c 100644
79518 --- a/include/asm-generic/uaccess.h
79519 +++ b/include/asm-generic/uaccess.h
79520 @@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
79521 return __clear_user(to, n);
79522 }
79523
79524 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
79525 +#ifdef CONFIG_PAX_MEMORY_UDEREF
79526 +#error UDEREF requires pax_open_userland
79527 +#else
79528 +static inline unsigned long pax_open_userland(void) { return 0; }
79529 +#endif
79530 +#endif
79531 +
79532 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
79533 +#ifdef CONFIG_PAX_MEMORY_UDEREF
79534 +#error UDEREF requires pax_close_userland
79535 +#else
79536 +static inline unsigned long pax_close_userland(void) { return 0; }
79537 +#endif
79538 +#endif
79539 +
79540 #endif /* __ASM_GENERIC_UACCESS_H */
79541 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
79542 index aa70cbd..fd72c7a 100644
79543 --- a/include/asm-generic/vmlinux.lds.h
79544 +++ b/include/asm-generic/vmlinux.lds.h
79545 @@ -233,6 +233,7 @@
79546 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
79547 VMLINUX_SYMBOL(__start_rodata) = .; \
79548 *(.rodata) *(.rodata.*) \
79549 + *(.data..read_only) \
79550 *(__vermagic) /* Kernel version magic */ \
79551 . = ALIGN(8); \
79552 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
79553 @@ -724,17 +725,18 @@
79554 * section in the linker script will go there too. @phdr should have
79555 * a leading colon.
79556 *
79557 - * Note that this macros defines __per_cpu_load as an absolute symbol.
79558 + * Note that this macros defines per_cpu_load as an absolute symbol.
79559 * If there is no need to put the percpu section at a predetermined
79560 * address, use PERCPU_SECTION.
79561 */
79562 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
79563 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
79564 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
79565 + per_cpu_load = .; \
79566 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
79567 - LOAD_OFFSET) { \
79568 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
79569 PERCPU_INPUT(cacheline) \
79570 } phdr \
79571 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
79572 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
79573
79574 /**
79575 * PERCPU_SECTION - define output section for percpu area, simple version
79576 diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
79577 index 623a59c..1e79ab9 100644
79578 --- a/include/crypto/algapi.h
79579 +++ b/include/crypto/algapi.h
79580 @@ -34,7 +34,7 @@ struct crypto_type {
79581 unsigned int maskclear;
79582 unsigned int maskset;
79583 unsigned int tfmsize;
79584 -};
79585 +} __do_const;
79586
79587 struct crypto_instance {
79588 struct crypto_alg alg;
79589 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
79590 index 53ed876..5bb09be 100644
79591 --- a/include/drm/drmP.h
79592 +++ b/include/drm/drmP.h
79593 @@ -59,6 +59,7 @@
79594
79595 #include <asm/mman.h>
79596 #include <asm/pgalloc.h>
79597 +#include <asm/local.h>
79598 #include <asm/uaccess.h>
79599
79600 #include <uapi/drm/drm.h>
79601 @@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
79602 * \param cmd command.
79603 * \param arg argument.
79604 */
79605 -typedef int drm_ioctl_t(struct drm_device *dev, void *data,
79606 +typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
79607 + struct drm_file *file_priv);
79608 +typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
79609 struct drm_file *file_priv);
79610
79611 -typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79612 +typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
79613 unsigned long arg);
79614
79615 #define DRM_IOCTL_NR(n) _IOC_NR(n)
79616 @@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79617 struct drm_ioctl_desc {
79618 unsigned int cmd;
79619 int flags;
79620 - drm_ioctl_t *func;
79621 + drm_ioctl_t func;
79622 unsigned int cmd_drv;
79623 const char *name;
79624 -};
79625 +} __do_const;
79626
79627 /**
79628 * Creates a driver or general drm_ioctl_desc array entry for the given
79629 @@ -629,7 +632,8 @@ struct drm_info_list {
79630 int (*show)(struct seq_file*, void*); /** show callback */
79631 u32 driver_features; /**< Required driver features for this entry */
79632 void *data;
79633 -};
79634 +} __do_const;
79635 +typedef struct drm_info_list __no_const drm_info_list_no_const;
79636
79637 /**
79638 * debugfs node structure. This structure represents a debugfs file.
79639 @@ -713,7 +717,7 @@ struct drm_device {
79640
79641 /** \name Usage Counters */
79642 /*@{ */
79643 - int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79644 + local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79645 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
79646 int buf_use; /**< Buffers in use -- cannot alloc */
79647 atomic_t buf_alloc; /**< Buffer allocation in progress */
79648 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
79649 index a3d75fe..6802f9c 100644
79650 --- a/include/drm/drm_crtc_helper.h
79651 +++ b/include/drm/drm_crtc_helper.h
79652 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
79653 struct drm_connector *connector);
79654 /* disable encoder when not in use - more explicit than dpms off */
79655 void (*disable)(struct drm_encoder *encoder);
79656 -};
79657 +} __no_const;
79658
79659 /**
79660 * drm_connector_helper_funcs - helper operations for connectors
79661 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
79662 index a70d456..6ea07cd 100644
79663 --- a/include/drm/i915_pciids.h
79664 +++ b/include/drm/i915_pciids.h
79665 @@ -37,7 +37,7 @@
79666 */
79667 #define INTEL_VGA_DEVICE(id, info) { \
79668 0x8086, id, \
79669 - ~0, ~0, \
79670 + PCI_ANY_ID, PCI_ANY_ID, \
79671 0x030000, 0xff0000, \
79672 (unsigned long) info }
79673
79674 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
79675 index 72dcbe8..8db58d7 100644
79676 --- a/include/drm/ttm/ttm_memory.h
79677 +++ b/include/drm/ttm/ttm_memory.h
79678 @@ -48,7 +48,7 @@
79679
79680 struct ttm_mem_shrink {
79681 int (*do_shrink) (struct ttm_mem_shrink *);
79682 -};
79683 +} __no_const;
79684
79685 /**
79686 * struct ttm_mem_global - Global memory accounting structure.
79687 diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
79688 index 49a8284..9643967 100644
79689 --- a/include/drm/ttm/ttm_page_alloc.h
79690 +++ b/include/drm/ttm/ttm_page_alloc.h
79691 @@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
79692 */
79693 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
79694
79695 +struct device;
79696 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79697 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79698
79699 diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
79700 index 4b840e8..155d235 100644
79701 --- a/include/keys/asymmetric-subtype.h
79702 +++ b/include/keys/asymmetric-subtype.h
79703 @@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
79704 /* Verify the signature on a key of this subtype (optional) */
79705 int (*verify_signature)(const struct key *key,
79706 const struct public_key_signature *sig);
79707 -};
79708 +} __do_const;
79709
79710 /**
79711 * asymmetric_key_subtype - Get the subtype from an asymmetric key
79712 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
79713 index c1da539..1dcec55 100644
79714 --- a/include/linux/atmdev.h
79715 +++ b/include/linux/atmdev.h
79716 @@ -28,7 +28,7 @@ struct compat_atm_iobuf {
79717 #endif
79718
79719 struct k_atm_aal_stats {
79720 -#define __HANDLE_ITEM(i) atomic_t i
79721 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
79722 __AAL_STAT_ITEMS
79723 #undef __HANDLE_ITEM
79724 };
79725 @@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
79726 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
79727 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
79728 struct module *owner;
79729 -};
79730 +} __do_const ;
79731
79732 struct atmphy_ops {
79733 int (*start)(struct atm_dev *dev);
79734 diff --git a/include/linux/audit.h b/include/linux/audit.h
79735 index 10f155b..6c73ffe 100644
79736 --- a/include/linux/audit.h
79737 +++ b/include/linux/audit.h
79738 @@ -219,7 +219,7 @@ static inline void audit_ptrace(struct task_struct *t)
79739 extern unsigned int audit_serial(void);
79740 extern int auditsc_get_stamp(struct audit_context *ctx,
79741 struct timespec *t, unsigned int *serial);
79742 -extern int audit_set_loginuid(kuid_t loginuid);
79743 +extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
79744
79745 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
79746 {
79747 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
79748 index 61f29e5..e67c658 100644
79749 --- a/include/linux/binfmts.h
79750 +++ b/include/linux/binfmts.h
79751 @@ -44,7 +44,7 @@ struct linux_binprm {
79752 unsigned interp_flags;
79753 unsigned interp_data;
79754 unsigned long loader, exec;
79755 -};
79756 +} __randomize_layout;
79757
79758 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
79759 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
79760 @@ -73,8 +73,10 @@ struct linux_binfmt {
79761 int (*load_binary)(struct linux_binprm *);
79762 int (*load_shlib)(struct file *);
79763 int (*core_dump)(struct coredump_params *cprm);
79764 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
79765 + void (*handle_mmap)(struct file *);
79766 unsigned long min_coredump; /* minimal dump size */
79767 -};
79768 +} __do_const __randomize_layout;
79769
79770 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
79771
79772 diff --git a/include/linux/bitops.h b/include/linux/bitops.h
79773 index 5d858e0..336c1d9 100644
79774 --- a/include/linux/bitops.h
79775 +++ b/include/linux/bitops.h
79776 @@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
79777 * @word: value to rotate
79778 * @shift: bits to roll
79779 */
79780 -static inline __u32 rol32(__u32 word, unsigned int shift)
79781 +static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
79782 {
79783 return (word << shift) | (word >> (32 - shift));
79784 }
79785 @@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
79786 * @word: value to rotate
79787 * @shift: bits to roll
79788 */
79789 -static inline __u32 ror32(__u32 word, unsigned int shift)
79790 +static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
79791 {
79792 return (word >> shift) | (word << (32 - shift));
79793 }
79794 @@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
79795 return (__s32)(value << shift) >> shift;
79796 }
79797
79798 -static inline unsigned fls_long(unsigned long l)
79799 +static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
79800 {
79801 if (sizeof(l) == 4)
79802 return fls(l);
79803 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
79804 index aac0f9e..73c9869 100644
79805 --- a/include/linux/blkdev.h
79806 +++ b/include/linux/blkdev.h
79807 @@ -1615,7 +1615,7 @@ struct block_device_operations {
79808 /* this callback is with swap_lock and sometimes page table lock held */
79809 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
79810 struct module *owner;
79811 -};
79812 +} __do_const;
79813
79814 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
79815 unsigned long);
79816 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
79817 index afc1343..9735539 100644
79818 --- a/include/linux/blktrace_api.h
79819 +++ b/include/linux/blktrace_api.h
79820 @@ -25,7 +25,7 @@ struct blk_trace {
79821 struct dentry *dropped_file;
79822 struct dentry *msg_file;
79823 struct list_head running_list;
79824 - atomic_t dropped;
79825 + atomic_unchecked_t dropped;
79826 };
79827
79828 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
79829 diff --git a/include/linux/cache.h b/include/linux/cache.h
79830 index 17e7e82..1d7da26 100644
79831 --- a/include/linux/cache.h
79832 +++ b/include/linux/cache.h
79833 @@ -16,6 +16,14 @@
79834 #define __read_mostly
79835 #endif
79836
79837 +#ifndef __read_only
79838 +#ifdef CONFIG_PAX_KERNEXEC
79839 +#error KERNEXEC requires __read_only
79840 +#else
79841 +#define __read_only __read_mostly
79842 +#endif
79843 +#endif
79844 +
79845 #ifndef ____cacheline_aligned
79846 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
79847 #endif
79848 diff --git a/include/linux/capability.h b/include/linux/capability.h
79849 index aa93e5e..985a1b0 100644
79850 --- a/include/linux/capability.h
79851 +++ b/include/linux/capability.h
79852 @@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
79853 extern bool capable(int cap);
79854 extern bool ns_capable(struct user_namespace *ns, int cap);
79855 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
79856 +extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
79857 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
79858 +extern bool capable_nolog(int cap);
79859 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
79860
79861 /* audit system wants to get cap info from files as well */
79862 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
79863
79864 +extern int is_privileged_binary(const struct dentry *dentry);
79865 +
79866 #endif /* !_LINUX_CAPABILITY_H */
79867 diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
79868 index 8609d57..86e4d79 100644
79869 --- a/include/linux/cdrom.h
79870 +++ b/include/linux/cdrom.h
79871 @@ -87,7 +87,6 @@ struct cdrom_device_ops {
79872
79873 /* driver specifications */
79874 const int capability; /* capability flags */
79875 - int n_minors; /* number of active minor devices */
79876 /* handle uniform packets for scsi type devices (scsi,atapi) */
79877 int (*generic_packet) (struct cdrom_device_info *,
79878 struct packet_command *);
79879 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
79880 index 4ce9056..86caac6 100644
79881 --- a/include/linux/cleancache.h
79882 +++ b/include/linux/cleancache.h
79883 @@ -31,7 +31,7 @@ struct cleancache_ops {
79884 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
79885 void (*invalidate_inode)(int, struct cleancache_filekey);
79886 void (*invalidate_fs)(int);
79887 -};
79888 +} __no_const;
79889
79890 extern struct cleancache_ops *
79891 cleancache_register_ops(struct cleancache_ops *ops);
79892 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
79893 index 2839c63..5b06b6b 100644
79894 --- a/include/linux/clk-provider.h
79895 +++ b/include/linux/clk-provider.h
79896 @@ -191,6 +191,7 @@ struct clk_ops {
79897 void (*init)(struct clk_hw *hw);
79898 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
79899 };
79900 +typedef struct clk_ops __no_const clk_ops_no_const;
79901
79902 /**
79903 * struct clk_init_data - holds init data that's common to all clocks and is
79904 diff --git a/include/linux/compat.h b/include/linux/compat.h
79905 index e649426..a74047b 100644
79906 --- a/include/linux/compat.h
79907 +++ b/include/linux/compat.h
79908 @@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
79909 compat_size_t __user *len_ptr);
79910
79911 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
79912 -asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
79913 +asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
79914 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
79915 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
79916 compat_ssize_t msgsz, int msgflg);
79917 @@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
79918 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
79919 compat_ulong_t addr, compat_ulong_t data);
79920 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
79921 - compat_long_t addr, compat_long_t data);
79922 + compat_ulong_t addr, compat_ulong_t data);
79923
79924 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
79925 /*
79926 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
79927 index d1a5582..4424efa 100644
79928 --- a/include/linux/compiler-gcc4.h
79929 +++ b/include/linux/compiler-gcc4.h
79930 @@ -39,9 +39,34 @@
79931 # define __compiletime_warning(message) __attribute__((warning(message)))
79932 # define __compiletime_error(message) __attribute__((error(message)))
79933 #endif /* __CHECKER__ */
79934 +
79935 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
79936 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
79937 +#define __bos0(ptr) __bos((ptr), 0)
79938 +#define __bos1(ptr) __bos((ptr), 1)
79939 #endif /* GCC_VERSION >= 40300 */
79940
79941 #if GCC_VERSION >= 40500
79942 +
79943 +#ifdef RANDSTRUCT_PLUGIN
79944 +#define __randomize_layout __attribute__((randomize_layout))
79945 +#define __no_randomize_layout __attribute__((no_randomize_layout))
79946 +#endif
79947 +
79948 +#ifdef CONSTIFY_PLUGIN
79949 +#define __no_const __attribute__((no_const))
79950 +#define __do_const __attribute__((do_const))
79951 +#endif
79952 +
79953 +#ifdef SIZE_OVERFLOW_PLUGIN
79954 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
79955 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
79956 +#endif
79957 +
79958 +#ifdef LATENT_ENTROPY_PLUGIN
79959 +#define __latent_entropy __attribute__((latent_entropy))
79960 +#endif
79961 +
79962 /*
79963 * Mark a position in code as unreachable. This can be used to
79964 * suppress control flow warnings after asm blocks that transfer
79965 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
79966 index d5ad7b1..3b74638 100644
79967 --- a/include/linux/compiler.h
79968 +++ b/include/linux/compiler.h
79969 @@ -5,11 +5,14 @@
79970
79971 #ifdef __CHECKER__
79972 # define __user __attribute__((noderef, address_space(1)))
79973 +# define __force_user __force __user
79974 # define __kernel __attribute__((address_space(0)))
79975 +# define __force_kernel __force __kernel
79976 # define __safe __attribute__((safe))
79977 # define __force __attribute__((force))
79978 # define __nocast __attribute__((nocast))
79979 # define __iomem __attribute__((noderef, address_space(2)))
79980 +# define __force_iomem __force __iomem
79981 # define __must_hold(x) __attribute__((context(x,1,1)))
79982 # define __acquires(x) __attribute__((context(x,0,1)))
79983 # define __releases(x) __attribute__((context(x,1,0)))
79984 @@ -17,20 +20,37 @@
79985 # define __release(x) __context__(x,-1)
79986 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
79987 # define __percpu __attribute__((noderef, address_space(3)))
79988 +# define __force_percpu __force __percpu
79989 #ifdef CONFIG_SPARSE_RCU_POINTER
79990 # define __rcu __attribute__((noderef, address_space(4)))
79991 +# define __force_rcu __force __rcu
79992 #else
79993 # define __rcu
79994 +# define __force_rcu
79995 #endif
79996 extern void __chk_user_ptr(const volatile void __user *);
79997 extern void __chk_io_ptr(const volatile void __iomem *);
79998 #else
79999 -# define __user
80000 -# define __kernel
80001 +# ifdef CHECKER_PLUGIN
80002 +//# define __user
80003 +//# define __force_user
80004 +//# define __kernel
80005 +//# define __force_kernel
80006 +# else
80007 +# ifdef STRUCTLEAK_PLUGIN
80008 +# define __user __attribute__((user))
80009 +# else
80010 +# define __user
80011 +# endif
80012 +# define __force_user
80013 +# define __kernel
80014 +# define __force_kernel
80015 +# endif
80016 # define __safe
80017 # define __force
80018 # define __nocast
80019 # define __iomem
80020 +# define __force_iomem
80021 # define __chk_user_ptr(x) (void)0
80022 # define __chk_io_ptr(x) (void)0
80023 # define __builtin_warning(x, y...) (1)
80024 @@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80025 # define __release(x) (void)0
80026 # define __cond_lock(x,c) (c)
80027 # define __percpu
80028 +# define __force_percpu
80029 # define __rcu
80030 +# define __force_rcu
80031 #endif
80032
80033 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80034 @@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80035 # define __attribute_const__ /* unimplemented */
80036 #endif
80037
80038 +#ifndef __randomize_layout
80039 +# define __randomize_layout
80040 +#endif
80041 +
80042 +#ifndef __no_randomize_layout
80043 +# define __no_randomize_layout
80044 +#endif
80045 +
80046 +#ifndef __no_const
80047 +# define __no_const
80048 +#endif
80049 +
80050 +#ifndef __do_const
80051 +# define __do_const
80052 +#endif
80053 +
80054 +#ifndef __size_overflow
80055 +# define __size_overflow(...)
80056 +#endif
80057 +
80058 +#ifndef __intentional_overflow
80059 +# define __intentional_overflow(...)
80060 +#endif
80061 +
80062 +#ifndef __latent_entropy
80063 +# define __latent_entropy
80064 +#endif
80065 +
80066 /*
80067 * Tell gcc if a function is cold. The compiler will assume any path
80068 * directly leading to the call is unlikely.
80069 @@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80070 #define __cold
80071 #endif
80072
80073 +#ifndef __alloc_size
80074 +#define __alloc_size(...)
80075 +#endif
80076 +
80077 +#ifndef __bos
80078 +#define __bos(ptr, arg)
80079 +#endif
80080 +
80081 +#ifndef __bos0
80082 +#define __bos0(ptr)
80083 +#endif
80084 +
80085 +#ifndef __bos1
80086 +#define __bos1(ptr)
80087 +#endif
80088 +
80089 /* Simple shorthand for a section definition */
80090 #ifndef __section
80091 # define __section(S) __attribute__ ((__section__(#S)))
80092 @@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80093 * use is to mediate communication between process-level code and irq/NMI
80094 * handlers, all running on the same CPU.
80095 */
80096 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
80097 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
80098 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
80099
80100 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
80101 #ifdef CONFIG_KPROBES
80102 diff --git a/include/linux/completion.h b/include/linux/completion.h
80103 index 5d5aaae..0ea9b84 100644
80104 --- a/include/linux/completion.h
80105 +++ b/include/linux/completion.h
80106 @@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
80107
80108 extern void wait_for_completion(struct completion *);
80109 extern void wait_for_completion_io(struct completion *);
80110 -extern int wait_for_completion_interruptible(struct completion *x);
80111 -extern int wait_for_completion_killable(struct completion *x);
80112 +extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
80113 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
80114 extern unsigned long wait_for_completion_timeout(struct completion *x,
80115 - unsigned long timeout);
80116 + unsigned long timeout) __intentional_overflow(-1);
80117 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
80118 - unsigned long timeout);
80119 + unsigned long timeout) __intentional_overflow(-1);
80120 extern long wait_for_completion_interruptible_timeout(
80121 - struct completion *x, unsigned long timeout);
80122 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80123 extern long wait_for_completion_killable_timeout(
80124 - struct completion *x, unsigned long timeout);
80125 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80126 extern bool try_wait_for_completion(struct completion *x);
80127 extern bool completion_done(struct completion *x);
80128
80129 diff --git a/include/linux/configfs.h b/include/linux/configfs.h
80130 index 34025df..d94bbbc 100644
80131 --- a/include/linux/configfs.h
80132 +++ b/include/linux/configfs.h
80133 @@ -125,7 +125,7 @@ struct configfs_attribute {
80134 const char *ca_name;
80135 struct module *ca_owner;
80136 umode_t ca_mode;
80137 -};
80138 +} __do_const;
80139
80140 /*
80141 * Users often need to create attribute structures for their configurable
80142 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
80143 index 503b085b..1638c9e 100644
80144 --- a/include/linux/cpufreq.h
80145 +++ b/include/linux/cpufreq.h
80146 @@ -206,6 +206,7 @@ struct global_attr {
80147 ssize_t (*store)(struct kobject *a, struct attribute *b,
80148 const char *c, size_t count);
80149 };
80150 +typedef struct global_attr __no_const global_attr_no_const;
80151
80152 #define define_one_global_ro(_name) \
80153 static struct global_attr _name = \
80154 @@ -273,7 +274,7 @@ struct cpufreq_driver {
80155 bool boost_supported;
80156 bool boost_enabled;
80157 int (*set_boost) (int state);
80158 -};
80159 +} __do_const;
80160
80161 /* flags */
80162 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
80163 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
80164 index 25e0df6..952dffd 100644
80165 --- a/include/linux/cpuidle.h
80166 +++ b/include/linux/cpuidle.h
80167 @@ -50,7 +50,8 @@ struct cpuidle_state {
80168 int index);
80169
80170 int (*enter_dead) (struct cpuidle_device *dev, int index);
80171 -};
80172 +} __do_const;
80173 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
80174
80175 /* Idle State Flags */
80176 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
80177 @@ -209,7 +210,7 @@ struct cpuidle_governor {
80178 void (*reflect) (struct cpuidle_device *dev, int index);
80179
80180 struct module *owner;
80181 -};
80182 +} __do_const;
80183
80184 #ifdef CONFIG_CPU_IDLE
80185 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
80186 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
80187 index 0a9a6da..ea597ca 100644
80188 --- a/include/linux/cpumask.h
80189 +++ b/include/linux/cpumask.h
80190 @@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80191 }
80192
80193 /* Valid inputs for n are -1 and 0. */
80194 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80195 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80196 {
80197 return n+1;
80198 }
80199
80200 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80201 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80202 {
80203 return n+1;
80204 }
80205
80206 -static inline unsigned int cpumask_next_and(int n,
80207 +static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
80208 const struct cpumask *srcp,
80209 const struct cpumask *andp)
80210 {
80211 @@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80212 *
80213 * Returns >= nr_cpu_ids if no further cpus set.
80214 */
80215 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80216 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80217 {
80218 /* -1 is a legal arg here. */
80219 if (n != -1)
80220 @@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80221 *
80222 * Returns >= nr_cpu_ids if no further cpus unset.
80223 */
80224 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80225 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80226 {
80227 /* -1 is a legal arg here. */
80228 if (n != -1)
80229 @@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80230 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
80231 }
80232
80233 -int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
80234 +int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
80235 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
80236 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
80237
80238 diff --git a/include/linux/cred.h b/include/linux/cred.h
80239 index 2fb2ca2..d6a3340 100644
80240 --- a/include/linux/cred.h
80241 +++ b/include/linux/cred.h
80242 @@ -35,7 +35,7 @@ struct group_info {
80243 int nblocks;
80244 kgid_t small_block[NGROUPS_SMALL];
80245 kgid_t *blocks[0];
80246 -};
80247 +} __randomize_layout;
80248
80249 /**
80250 * get_group_info - Get a reference to a group info structure
80251 @@ -137,7 +137,7 @@ struct cred {
80252 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
80253 struct group_info *group_info; /* supplementary groups for euid/fsgid */
80254 struct rcu_head rcu; /* RCU deletion hook */
80255 -};
80256 +} __randomize_layout;
80257
80258 extern void __put_cred(struct cred *);
80259 extern void exit_creds(struct task_struct *);
80260 @@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
80261 static inline void validate_process_creds(void)
80262 {
80263 }
80264 +static inline void validate_task_creds(struct task_struct *task)
80265 +{
80266 +}
80267 #endif
80268
80269 /**
80270 @@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
80271
80272 #define task_uid(task) (task_cred_xxx((task), uid))
80273 #define task_euid(task) (task_cred_xxx((task), euid))
80274 +#define task_securebits(task) (task_cred_xxx((task), securebits))
80275
80276 #define current_cred_xxx(xxx) \
80277 ({ \
80278 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
80279 index d45e949..51cf5ea 100644
80280 --- a/include/linux/crypto.h
80281 +++ b/include/linux/crypto.h
80282 @@ -373,7 +373,7 @@ struct cipher_tfm {
80283 const u8 *key, unsigned int keylen);
80284 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80285 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80286 -};
80287 +} __no_const;
80288
80289 struct hash_tfm {
80290 int (*init)(struct hash_desc *desc);
80291 @@ -394,13 +394,13 @@ struct compress_tfm {
80292 int (*cot_decompress)(struct crypto_tfm *tfm,
80293 const u8 *src, unsigned int slen,
80294 u8 *dst, unsigned int *dlen);
80295 -};
80296 +} __no_const;
80297
80298 struct rng_tfm {
80299 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
80300 unsigned int dlen);
80301 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
80302 -};
80303 +} __no_const;
80304
80305 #define crt_ablkcipher crt_u.ablkcipher
80306 #define crt_aead crt_u.aead
80307 diff --git a/include/linux/ctype.h b/include/linux/ctype.h
80308 index 653589e..4ef254a 100644
80309 --- a/include/linux/ctype.h
80310 +++ b/include/linux/ctype.h
80311 @@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
80312 * Fast implementation of tolower() for internal usage. Do not use in your
80313 * code.
80314 */
80315 -static inline char _tolower(const char c)
80316 +static inline unsigned char _tolower(const unsigned char c)
80317 {
80318 return c | 0x20;
80319 }
80320 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
80321 index 1c2f1b8..c67151e 100644
80322 --- a/include/linux/dcache.h
80323 +++ b/include/linux/dcache.h
80324 @@ -133,7 +133,7 @@ struct dentry {
80325 struct hlist_node d_alias; /* inode alias list */
80326 struct rcu_head d_rcu;
80327 } d_u;
80328 -};
80329 +} __randomize_layout;
80330
80331 /*
80332 * dentry->d_lock spinlock nesting subclasses:
80333 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
80334 index 7925bf0..d5143d2 100644
80335 --- a/include/linux/decompress/mm.h
80336 +++ b/include/linux/decompress/mm.h
80337 @@ -77,7 +77,7 @@ static void free(void *where)
80338 * warnings when not needed (indeed large_malloc / large_free are not
80339 * needed by inflate */
80340
80341 -#define malloc(a) kmalloc(a, GFP_KERNEL)
80342 +#define malloc(a) kmalloc((a), GFP_KERNEL)
80343 #define free(a) kfree(a)
80344
80345 #define large_malloc(a) vmalloc(a)
80346 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
80347 index f1863dc..5c26074 100644
80348 --- a/include/linux/devfreq.h
80349 +++ b/include/linux/devfreq.h
80350 @@ -114,7 +114,7 @@ struct devfreq_governor {
80351 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
80352 int (*event_handler)(struct devfreq *devfreq,
80353 unsigned int event, void *data);
80354 -};
80355 +} __do_const;
80356
80357 /**
80358 * struct devfreq - Device devfreq structure
80359 diff --git a/include/linux/device.h b/include/linux/device.h
80360 index ce1f2160..189bc33 100644
80361 --- a/include/linux/device.h
80362 +++ b/include/linux/device.h
80363 @@ -311,7 +311,7 @@ struct subsys_interface {
80364 struct list_head node;
80365 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
80366 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
80367 -};
80368 +} __do_const;
80369
80370 int subsys_interface_register(struct subsys_interface *sif);
80371 void subsys_interface_unregister(struct subsys_interface *sif);
80372 @@ -507,7 +507,7 @@ struct device_type {
80373 void (*release)(struct device *dev);
80374
80375 const struct dev_pm_ops *pm;
80376 -};
80377 +} __do_const;
80378
80379 /* interface for exporting device attributes */
80380 struct device_attribute {
80381 @@ -517,11 +517,12 @@ struct device_attribute {
80382 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
80383 const char *buf, size_t count);
80384 };
80385 +typedef struct device_attribute __no_const device_attribute_no_const;
80386
80387 struct dev_ext_attribute {
80388 struct device_attribute attr;
80389 void *var;
80390 -};
80391 +} __do_const;
80392
80393 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
80394 char *buf);
80395 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
80396 index d5d3881..7ed54af 100644
80397 --- a/include/linux/dma-mapping.h
80398 +++ b/include/linux/dma-mapping.h
80399 @@ -60,7 +60,7 @@ struct dma_map_ops {
80400 u64 (*get_required_mask)(struct device *dev);
80401 #endif
80402 int is_phys;
80403 -};
80404 +} __do_const;
80405
80406 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
80407
80408 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
80409 index 653a1fd..9133cd1 100644
80410 --- a/include/linux/dmaengine.h
80411 +++ b/include/linux/dmaengine.h
80412 @@ -1136,9 +1136,9 @@ struct dma_pinned_list {
80413 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
80414 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
80415
80416 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80417 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80418 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
80419 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80420 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80421 struct dma_pinned_list *pinned_list, struct page *page,
80422 unsigned int offset, size_t len);
80423
80424 diff --git a/include/linux/efi.h b/include/linux/efi.h
80425 index 0949f9c..04cb9a5 100644
80426 --- a/include/linux/efi.h
80427 +++ b/include/linux/efi.h
80428 @@ -1050,6 +1050,7 @@ struct efivar_operations {
80429 efi_set_variable_nonblocking_t *set_variable_nonblocking;
80430 efi_query_variable_store_t *query_variable_store;
80431 };
80432 +typedef struct efivar_operations __no_const efivar_operations_no_const;
80433
80434 struct efivars {
80435 /*
80436 diff --git a/include/linux/elf.h b/include/linux/elf.h
80437 index 67a5fa7..b817372 100644
80438 --- a/include/linux/elf.h
80439 +++ b/include/linux/elf.h
80440 @@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
80441 #define elf_note elf32_note
80442 #define elf_addr_t Elf32_Off
80443 #define Elf_Half Elf32_Half
80444 +#define elf_dyn Elf32_Dyn
80445
80446 #else
80447
80448 @@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
80449 #define elf_note elf64_note
80450 #define elf_addr_t Elf64_Off
80451 #define Elf_Half Elf64_Half
80452 +#define elf_dyn Elf64_Dyn
80453
80454 #endif
80455
80456 diff --git a/include/linux/err.h b/include/linux/err.h
80457 index a729120..6ede2c9 100644
80458 --- a/include/linux/err.h
80459 +++ b/include/linux/err.h
80460 @@ -20,12 +20,12 @@
80461
80462 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
80463
80464 -static inline void * __must_check ERR_PTR(long error)
80465 +static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
80466 {
80467 return (void *) error;
80468 }
80469
80470 -static inline long __must_check PTR_ERR(__force const void *ptr)
80471 +static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
80472 {
80473 return (long) ptr;
80474 }
80475 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
80476 index 36f49c4..a2a1f4c 100644
80477 --- a/include/linux/extcon.h
80478 +++ b/include/linux/extcon.h
80479 @@ -135,7 +135,7 @@ struct extcon_dev {
80480 /* /sys/class/extcon/.../mutually_exclusive/... */
80481 struct attribute_group attr_g_muex;
80482 struct attribute **attrs_muex;
80483 - struct device_attribute *d_attrs_muex;
80484 + device_attribute_no_const *d_attrs_muex;
80485 };
80486
80487 /**
80488 diff --git a/include/linux/fb.h b/include/linux/fb.h
80489 index 09bb7a1..d98870a 100644
80490 --- a/include/linux/fb.h
80491 +++ b/include/linux/fb.h
80492 @@ -305,7 +305,7 @@ struct fb_ops {
80493 /* called at KDB enter and leave time to prepare the console */
80494 int (*fb_debug_enter)(struct fb_info *info);
80495 int (*fb_debug_leave)(struct fb_info *info);
80496 -};
80497 +} __do_const;
80498
80499 #ifdef CONFIG_FB_TILEBLITTING
80500 #define FB_TILE_CURSOR_NONE 0
80501 diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
80502 index 230f87b..1fd0485 100644
80503 --- a/include/linux/fdtable.h
80504 +++ b/include/linux/fdtable.h
80505 @@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
80506 void put_files_struct(struct files_struct *fs);
80507 void reset_files_struct(struct files_struct *);
80508 int unshare_files(struct files_struct **);
80509 -struct files_struct *dup_fd(struct files_struct *, int *);
80510 +struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
80511 void do_close_on_exec(struct files_struct *);
80512 int iterate_fd(struct files_struct *, unsigned,
80513 int (*)(const void *, struct file *, unsigned),
80514 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
80515 index 8293262..2b3b8bd 100644
80516 --- a/include/linux/frontswap.h
80517 +++ b/include/linux/frontswap.h
80518 @@ -11,7 +11,7 @@ struct frontswap_ops {
80519 int (*load)(unsigned, pgoff_t, struct page *);
80520 void (*invalidate_page)(unsigned, pgoff_t);
80521 void (*invalidate_area)(unsigned);
80522 -};
80523 +} __no_const;
80524
80525 extern bool frontswap_enabled;
80526 extern struct frontswap_ops *
80527 diff --git a/include/linux/fs.h b/include/linux/fs.h
80528 index 9ab779e..0c636f2 100644
80529 --- a/include/linux/fs.h
80530 +++ b/include/linux/fs.h
80531 @@ -412,7 +412,7 @@ struct address_space {
80532 spinlock_t private_lock; /* for use by the address_space */
80533 struct list_head private_list; /* ditto */
80534 void *private_data; /* ditto */
80535 -} __attribute__((aligned(sizeof(long))));
80536 +} __attribute__((aligned(sizeof(long)))) __randomize_layout;
80537 /*
80538 * On most architectures that alignment is already the case; but
80539 * must be enforced here for CRIS, to let the least significant bit
80540 @@ -455,7 +455,7 @@ struct block_device {
80541 int bd_fsfreeze_count;
80542 /* Mutex for freeze */
80543 struct mutex bd_fsfreeze_mutex;
80544 -};
80545 +} __randomize_layout;
80546
80547 /*
80548 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
80549 @@ -624,7 +624,7 @@ struct inode {
80550 #endif
80551
80552 void *i_private; /* fs or device private pointer */
80553 -};
80554 +} __randomize_layout;
80555
80556 static inline int inode_unhashed(struct inode *inode)
80557 {
80558 @@ -820,7 +820,7 @@ struct file {
80559 struct list_head f_tfile_llink;
80560 #endif /* #ifdef CONFIG_EPOLL */
80561 struct address_space *f_mapping;
80562 -} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
80563 +} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
80564
80565 struct file_handle {
80566 __u32 handle_bytes;
80567 @@ -945,7 +945,7 @@ struct file_lock {
80568 int state; /* state of grant or error if -ve */
80569 } afs;
80570 } fl_u;
80571 -};
80572 +} __randomize_layout;
80573
80574 /* The following constant reflects the upper bound of the file/locking space */
80575 #ifndef OFFSET_MAX
80576 @@ -1287,7 +1287,7 @@ struct super_block {
80577 * Indicates how deep in a filesystem stack this SB is
80578 */
80579 int s_stack_depth;
80580 -};
80581 +} __randomize_layout;
80582
80583 extern struct timespec current_fs_time(struct super_block *sb);
80584
80585 @@ -1514,7 +1514,8 @@ struct file_operations {
80586 long (*fallocate)(struct file *file, int mode, loff_t offset,
80587 loff_t len);
80588 int (*show_fdinfo)(struct seq_file *m, struct file *f);
80589 -};
80590 +} __do_const __randomize_layout;
80591 +typedef struct file_operations __no_const file_operations_no_const;
80592
80593 struct inode_operations {
80594 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
80595 @@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
80596 return !IS_DEADDIR(inode);
80597 }
80598
80599 +static inline bool is_sidechannel_device(const struct inode *inode)
80600 +{
80601 +#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
80602 + umode_t mode = inode->i_mode;
80603 + return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
80604 +#else
80605 + return false;
80606 +#endif
80607 +}
80608 +
80609 #endif /* _LINUX_FS_H */
80610 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
80611 index 0efc3e6..fd23610 100644
80612 --- a/include/linux/fs_struct.h
80613 +++ b/include/linux/fs_struct.h
80614 @@ -6,13 +6,13 @@
80615 #include <linux/seqlock.h>
80616
80617 struct fs_struct {
80618 - int users;
80619 + atomic_t users;
80620 spinlock_t lock;
80621 seqcount_t seq;
80622 int umask;
80623 int in_exec;
80624 struct path root, pwd;
80625 -};
80626 +} __randomize_layout;
80627
80628 extern struct kmem_cache *fs_cachep;
80629
80630 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
80631 index 7714849..a4a5c7a 100644
80632 --- a/include/linux/fscache-cache.h
80633 +++ b/include/linux/fscache-cache.h
80634 @@ -113,7 +113,7 @@ struct fscache_operation {
80635 fscache_operation_release_t release;
80636 };
80637
80638 -extern atomic_t fscache_op_debug_id;
80639 +extern atomic_unchecked_t fscache_op_debug_id;
80640 extern void fscache_op_work_func(struct work_struct *work);
80641
80642 extern void fscache_enqueue_operation(struct fscache_operation *);
80643 @@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
80644 INIT_WORK(&op->work, fscache_op_work_func);
80645 atomic_set(&op->usage, 1);
80646 op->state = FSCACHE_OP_ST_INITIALISED;
80647 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
80648 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
80649 op->processor = processor;
80650 op->release = release;
80651 INIT_LIST_HEAD(&op->pend_link);
80652 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
80653 index 115bb81..e7b812b 100644
80654 --- a/include/linux/fscache.h
80655 +++ b/include/linux/fscache.h
80656 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
80657 * - this is mandatory for any object that may have data
80658 */
80659 void (*now_uncached)(void *cookie_netfs_data);
80660 -};
80661 +} __do_const;
80662
80663 /*
80664 * fscache cached network filesystem type
80665 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
80666 index 1c804b0..1432c2b 100644
80667 --- a/include/linux/fsnotify.h
80668 +++ b/include/linux/fsnotify.h
80669 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
80670 struct inode *inode = file_inode(file);
80671 __u32 mask = FS_ACCESS;
80672
80673 + if (is_sidechannel_device(inode))
80674 + return;
80675 +
80676 if (S_ISDIR(inode->i_mode))
80677 mask |= FS_ISDIR;
80678
80679 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
80680 struct inode *inode = file_inode(file);
80681 __u32 mask = FS_MODIFY;
80682
80683 + if (is_sidechannel_device(inode))
80684 + return;
80685 +
80686 if (S_ISDIR(inode->i_mode))
80687 mask |= FS_ISDIR;
80688
80689 @@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
80690 */
80691 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
80692 {
80693 - return kstrdup(name, GFP_KERNEL);
80694 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
80695 }
80696
80697 /*
80698 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
80699 index ec274e0..e678159 100644
80700 --- a/include/linux/genhd.h
80701 +++ b/include/linux/genhd.h
80702 @@ -194,7 +194,7 @@ struct gendisk {
80703 struct kobject *slave_dir;
80704
80705 struct timer_rand_state *random;
80706 - atomic_t sync_io; /* RAID */
80707 + atomic_unchecked_t sync_io; /* RAID */
80708 struct disk_events *ev;
80709 #ifdef CONFIG_BLK_DEV_INTEGRITY
80710 struct blk_integrity *integrity;
80711 @@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
80712 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
80713
80714 /* drivers/char/random.c */
80715 -extern void add_disk_randomness(struct gendisk *disk);
80716 +extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
80717 extern void rand_initialize_disk(struct gendisk *disk);
80718
80719 static inline sector_t get_start_sect(struct block_device *bdev)
80720 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
80721 index 667c311..abac2a7 100644
80722 --- a/include/linux/genl_magic_func.h
80723 +++ b/include/linux/genl_magic_func.h
80724 @@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
80725 },
80726
80727 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
80728 -static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
80729 +static struct genl_ops ZZZ_genl_ops[] = {
80730 #include GENL_MAGIC_INCLUDE_FILE
80731 };
80732
80733 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
80734 index 41b30fd..a3718cf 100644
80735 --- a/include/linux/gfp.h
80736 +++ b/include/linux/gfp.h
80737 @@ -34,6 +34,13 @@ struct vm_area_struct;
80738 #define ___GFP_NO_KSWAPD 0x400000u
80739 #define ___GFP_OTHER_NODE 0x800000u
80740 #define ___GFP_WRITE 0x1000000u
80741 +
80742 +#ifdef CONFIG_PAX_USERCOPY_SLABS
80743 +#define ___GFP_USERCOPY 0x2000000u
80744 +#else
80745 +#define ___GFP_USERCOPY 0
80746 +#endif
80747 +
80748 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
80749
80750 /*
80751 @@ -90,6 +97,7 @@ struct vm_area_struct;
80752 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
80753 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
80754 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
80755 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
80756
80757 /*
80758 * This may seem redundant, but it's a way of annotating false positives vs.
80759 @@ -97,7 +105,7 @@ struct vm_area_struct;
80760 */
80761 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
80762
80763 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
80764 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
80765 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
80766
80767 /* This equals 0, but use constants in case they ever change */
80768 @@ -155,6 +163,8 @@ struct vm_area_struct;
80769 /* 4GB DMA on some platforms */
80770 #define GFP_DMA32 __GFP_DMA32
80771
80772 +#define GFP_USERCOPY __GFP_USERCOPY
80773 +
80774 /* Convert GFP flags to their corresponding migrate type */
80775 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
80776 {
80777 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
80778 new file mode 100644
80779 index 0000000..edb2cb6
80780 --- /dev/null
80781 +++ b/include/linux/gracl.h
80782 @@ -0,0 +1,340 @@
80783 +#ifndef GR_ACL_H
80784 +#define GR_ACL_H
80785 +
80786 +#include <linux/grdefs.h>
80787 +#include <linux/resource.h>
80788 +#include <linux/capability.h>
80789 +#include <linux/dcache.h>
80790 +#include <asm/resource.h>
80791 +
80792 +/* Major status information */
80793 +
80794 +#define GR_VERSION "grsecurity 3.0"
80795 +#define GRSECURITY_VERSION 0x3000
80796 +
80797 +enum {
80798 + GR_SHUTDOWN = 0,
80799 + GR_ENABLE = 1,
80800 + GR_SPROLE = 2,
80801 + GR_OLDRELOAD = 3,
80802 + GR_SEGVMOD = 4,
80803 + GR_STATUS = 5,
80804 + GR_UNSPROLE = 6,
80805 + GR_PASSSET = 7,
80806 + GR_SPROLEPAM = 8,
80807 + GR_RELOAD = 9,
80808 +};
80809 +
80810 +/* Password setup definitions
80811 + * kernel/grhash.c */
80812 +enum {
80813 + GR_PW_LEN = 128,
80814 + GR_SALT_LEN = 16,
80815 + GR_SHA_LEN = 32,
80816 +};
80817 +
80818 +enum {
80819 + GR_SPROLE_LEN = 64,
80820 +};
80821 +
80822 +enum {
80823 + GR_NO_GLOB = 0,
80824 + GR_REG_GLOB,
80825 + GR_CREATE_GLOB
80826 +};
80827 +
80828 +#define GR_NLIMITS 32
80829 +
80830 +/* Begin Data Structures */
80831 +
80832 +struct sprole_pw {
80833 + unsigned char *rolename;
80834 + unsigned char salt[GR_SALT_LEN];
80835 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
80836 +};
80837 +
80838 +struct name_entry {
80839 + __u32 key;
80840 + ino_t inode;
80841 + dev_t device;
80842 + char *name;
80843 + __u16 len;
80844 + __u8 deleted;
80845 + struct name_entry *prev;
80846 + struct name_entry *next;
80847 +};
80848 +
80849 +struct inodev_entry {
80850 + struct name_entry *nentry;
80851 + struct inodev_entry *prev;
80852 + struct inodev_entry *next;
80853 +};
80854 +
80855 +struct acl_role_db {
80856 + struct acl_role_label **r_hash;
80857 + __u32 r_size;
80858 +};
80859 +
80860 +struct inodev_db {
80861 + struct inodev_entry **i_hash;
80862 + __u32 i_size;
80863 +};
80864 +
80865 +struct name_db {
80866 + struct name_entry **n_hash;
80867 + __u32 n_size;
80868 +};
80869 +
80870 +struct crash_uid {
80871 + uid_t uid;
80872 + unsigned long expires;
80873 +};
80874 +
80875 +struct gr_hash_struct {
80876 + void **table;
80877 + void **nametable;
80878 + void *first;
80879 + __u32 table_size;
80880 + __u32 used_size;
80881 + int type;
80882 +};
80883 +
80884 +/* Userspace Grsecurity ACL data structures */
80885 +
80886 +struct acl_subject_label {
80887 + char *filename;
80888 + ino_t inode;
80889 + dev_t device;
80890 + __u32 mode;
80891 + kernel_cap_t cap_mask;
80892 + kernel_cap_t cap_lower;
80893 + kernel_cap_t cap_invert_audit;
80894 +
80895 + struct rlimit res[GR_NLIMITS];
80896 + __u32 resmask;
80897 +
80898 + __u8 user_trans_type;
80899 + __u8 group_trans_type;
80900 + uid_t *user_transitions;
80901 + gid_t *group_transitions;
80902 + __u16 user_trans_num;
80903 + __u16 group_trans_num;
80904 +
80905 + __u32 sock_families[2];
80906 + __u32 ip_proto[8];
80907 + __u32 ip_type;
80908 + struct acl_ip_label **ips;
80909 + __u32 ip_num;
80910 + __u32 inaddr_any_override;
80911 +
80912 + __u32 crashes;
80913 + unsigned long expires;
80914 +
80915 + struct acl_subject_label *parent_subject;
80916 + struct gr_hash_struct *hash;
80917 + struct acl_subject_label *prev;
80918 + struct acl_subject_label *next;
80919 +
80920 + struct acl_object_label **obj_hash;
80921 + __u32 obj_hash_size;
80922 + __u16 pax_flags;
80923 +};
80924 +
80925 +struct role_allowed_ip {
80926 + __u32 addr;
80927 + __u32 netmask;
80928 +
80929 + struct role_allowed_ip *prev;
80930 + struct role_allowed_ip *next;
80931 +};
80932 +
80933 +struct role_transition {
80934 + char *rolename;
80935 +
80936 + struct role_transition *prev;
80937 + struct role_transition *next;
80938 +};
80939 +
80940 +struct acl_role_label {
80941 + char *rolename;
80942 + uid_t uidgid;
80943 + __u16 roletype;
80944 +
80945 + __u16 auth_attempts;
80946 + unsigned long expires;
80947 +
80948 + struct acl_subject_label *root_label;
80949 + struct gr_hash_struct *hash;
80950 +
80951 + struct acl_role_label *prev;
80952 + struct acl_role_label *next;
80953 +
80954 + struct role_transition *transitions;
80955 + struct role_allowed_ip *allowed_ips;
80956 + uid_t *domain_children;
80957 + __u16 domain_child_num;
80958 +
80959 + umode_t umask;
80960 +
80961 + struct acl_subject_label **subj_hash;
80962 + __u32 subj_hash_size;
80963 +};
80964 +
80965 +struct user_acl_role_db {
80966 + struct acl_role_label **r_table;
80967 + __u32 num_pointers; /* Number of allocations to track */
80968 + __u32 num_roles; /* Number of roles */
80969 + __u32 num_domain_children; /* Number of domain children */
80970 + __u32 num_subjects; /* Number of subjects */
80971 + __u32 num_objects; /* Number of objects */
80972 +};
80973 +
80974 +struct acl_object_label {
80975 + char *filename;
80976 + ino_t inode;
80977 + dev_t device;
80978 + __u32 mode;
80979 +
80980 + struct acl_subject_label *nested;
80981 + struct acl_object_label *globbed;
80982 +
80983 + /* next two structures not used */
80984 +
80985 + struct acl_object_label *prev;
80986 + struct acl_object_label *next;
80987 +};
80988 +
80989 +struct acl_ip_label {
80990 + char *iface;
80991 + __u32 addr;
80992 + __u32 netmask;
80993 + __u16 low, high;
80994 + __u8 mode;
80995 + __u32 type;
80996 + __u32 proto[8];
80997 +
80998 + /* next two structures not used */
80999 +
81000 + struct acl_ip_label *prev;
81001 + struct acl_ip_label *next;
81002 +};
81003 +
81004 +struct gr_arg {
81005 + struct user_acl_role_db role_db;
81006 + unsigned char pw[GR_PW_LEN];
81007 + unsigned char salt[GR_SALT_LEN];
81008 + unsigned char sum[GR_SHA_LEN];
81009 + unsigned char sp_role[GR_SPROLE_LEN];
81010 + struct sprole_pw *sprole_pws;
81011 + dev_t segv_device;
81012 + ino_t segv_inode;
81013 + uid_t segv_uid;
81014 + __u16 num_sprole_pws;
81015 + __u16 mode;
81016 +};
81017 +
81018 +struct gr_arg_wrapper {
81019 + struct gr_arg *arg;
81020 + __u32 version;
81021 + __u32 size;
81022 +};
81023 +
81024 +struct subject_map {
81025 + struct acl_subject_label *user;
81026 + struct acl_subject_label *kernel;
81027 + struct subject_map *prev;
81028 + struct subject_map *next;
81029 +};
81030 +
81031 +struct acl_subj_map_db {
81032 + struct subject_map **s_hash;
81033 + __u32 s_size;
81034 +};
81035 +
81036 +struct gr_policy_state {
81037 + struct sprole_pw **acl_special_roles;
81038 + __u16 num_sprole_pws;
81039 + struct acl_role_label *kernel_role;
81040 + struct acl_role_label *role_list;
81041 + struct acl_role_label *default_role;
81042 + struct acl_role_db acl_role_set;
81043 + struct acl_subj_map_db subj_map_set;
81044 + struct name_db name_set;
81045 + struct inodev_db inodev_set;
81046 +};
81047 +
81048 +struct gr_alloc_state {
81049 + unsigned long alloc_stack_next;
81050 + unsigned long alloc_stack_size;
81051 + void **alloc_stack;
81052 +};
81053 +
81054 +struct gr_reload_state {
81055 + struct gr_policy_state oldpolicy;
81056 + struct gr_alloc_state oldalloc;
81057 + struct gr_policy_state newpolicy;
81058 + struct gr_alloc_state newalloc;
81059 + struct gr_policy_state *oldpolicy_ptr;
81060 + struct gr_alloc_state *oldalloc_ptr;
81061 + unsigned char oldmode;
81062 +};
81063 +
81064 +/* End Data Structures Section */
81065 +
81066 +/* Hash functions generated by empirical testing by Brad Spengler
81067 + Makes good use of the low bits of the inode. Generally 0-1 times
81068 + in loop for successful match. 0-3 for unsuccessful match.
81069 + Shift/add algorithm with modulus of table size and an XOR*/
81070 +
81071 +static __inline__ unsigned int
81072 +gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
81073 +{
81074 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
81075 +}
81076 +
81077 + static __inline__ unsigned int
81078 +gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
81079 +{
81080 + return ((const unsigned long)userp % sz);
81081 +}
81082 +
81083 +static __inline__ unsigned int
81084 +gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
81085 +{
81086 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
81087 +}
81088 +
81089 +static __inline__ unsigned int
81090 +gr_nhash(const char *name, const __u16 len, const unsigned int sz)
81091 +{
81092 + return full_name_hash((const unsigned char *)name, len) % sz;
81093 +}
81094 +
81095 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
81096 + subj = NULL; \
81097 + iter = 0; \
81098 + while (iter < role->subj_hash_size) { \
81099 + if (subj == NULL) \
81100 + subj = role->subj_hash[iter]; \
81101 + if (subj == NULL) { \
81102 + iter++; \
81103 + continue; \
81104 + }
81105 +
81106 +#define FOR_EACH_SUBJECT_END(subj,iter) \
81107 + subj = subj->next; \
81108 + if (subj == NULL) \
81109 + iter++; \
81110 + }
81111 +
81112 +
81113 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
81114 + subj = role->hash->first; \
81115 + while (subj != NULL) {
81116 +
81117 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
81118 + subj = subj->next; \
81119 + }
81120 +
81121 +#endif
81122 +
81123 diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
81124 new file mode 100644
81125 index 0000000..33ebd1f
81126 --- /dev/null
81127 +++ b/include/linux/gracl_compat.h
81128 @@ -0,0 +1,156 @@
81129 +#ifndef GR_ACL_COMPAT_H
81130 +#define GR_ACL_COMPAT_H
81131 +
81132 +#include <linux/resource.h>
81133 +#include <asm/resource.h>
81134 +
81135 +struct sprole_pw_compat {
81136 + compat_uptr_t rolename;
81137 + unsigned char salt[GR_SALT_LEN];
81138 + unsigned char sum[GR_SHA_LEN];
81139 +};
81140 +
81141 +struct gr_hash_struct_compat {
81142 + compat_uptr_t table;
81143 + compat_uptr_t nametable;
81144 + compat_uptr_t first;
81145 + __u32 table_size;
81146 + __u32 used_size;
81147 + int type;
81148 +};
81149 +
81150 +struct acl_subject_label_compat {
81151 + compat_uptr_t filename;
81152 + compat_ino_t inode;
81153 + __u32 device;
81154 + __u32 mode;
81155 + kernel_cap_t cap_mask;
81156 + kernel_cap_t cap_lower;
81157 + kernel_cap_t cap_invert_audit;
81158 +
81159 + struct compat_rlimit res[GR_NLIMITS];
81160 + __u32 resmask;
81161 +
81162 + __u8 user_trans_type;
81163 + __u8 group_trans_type;
81164 + compat_uptr_t user_transitions;
81165 + compat_uptr_t group_transitions;
81166 + __u16 user_trans_num;
81167 + __u16 group_trans_num;
81168 +
81169 + __u32 sock_families[2];
81170 + __u32 ip_proto[8];
81171 + __u32 ip_type;
81172 + compat_uptr_t ips;
81173 + __u32 ip_num;
81174 + __u32 inaddr_any_override;
81175 +
81176 + __u32 crashes;
81177 + compat_ulong_t expires;
81178 +
81179 + compat_uptr_t parent_subject;
81180 + compat_uptr_t hash;
81181 + compat_uptr_t prev;
81182 + compat_uptr_t next;
81183 +
81184 + compat_uptr_t obj_hash;
81185 + __u32 obj_hash_size;
81186 + __u16 pax_flags;
81187 +};
81188 +
81189 +struct role_allowed_ip_compat {
81190 + __u32 addr;
81191 + __u32 netmask;
81192 +
81193 + compat_uptr_t prev;
81194 + compat_uptr_t next;
81195 +};
81196 +
81197 +struct role_transition_compat {
81198 + compat_uptr_t rolename;
81199 +
81200 + compat_uptr_t prev;
81201 + compat_uptr_t next;
81202 +};
81203 +
81204 +struct acl_role_label_compat {
81205 + compat_uptr_t rolename;
81206 + uid_t uidgid;
81207 + __u16 roletype;
81208 +
81209 + __u16 auth_attempts;
81210 + compat_ulong_t expires;
81211 +
81212 + compat_uptr_t root_label;
81213 + compat_uptr_t hash;
81214 +
81215 + compat_uptr_t prev;
81216 + compat_uptr_t next;
81217 +
81218 + compat_uptr_t transitions;
81219 + compat_uptr_t allowed_ips;
81220 + compat_uptr_t domain_children;
81221 + __u16 domain_child_num;
81222 +
81223 + umode_t umask;
81224 +
81225 + compat_uptr_t subj_hash;
81226 + __u32 subj_hash_size;
81227 +};
81228 +
81229 +struct user_acl_role_db_compat {
81230 + compat_uptr_t r_table;
81231 + __u32 num_pointers;
81232 + __u32 num_roles;
81233 + __u32 num_domain_children;
81234 + __u32 num_subjects;
81235 + __u32 num_objects;
81236 +};
81237 +
81238 +struct acl_object_label_compat {
81239 + compat_uptr_t filename;
81240 + compat_ino_t inode;
81241 + __u32 device;
81242 + __u32 mode;
81243 +
81244 + compat_uptr_t nested;
81245 + compat_uptr_t globbed;
81246 +
81247 + compat_uptr_t prev;
81248 + compat_uptr_t next;
81249 +};
81250 +
81251 +struct acl_ip_label_compat {
81252 + compat_uptr_t iface;
81253 + __u32 addr;
81254 + __u32 netmask;
81255 + __u16 low, high;
81256 + __u8 mode;
81257 + __u32 type;
81258 + __u32 proto[8];
81259 +
81260 + compat_uptr_t prev;
81261 + compat_uptr_t next;
81262 +};
81263 +
81264 +struct gr_arg_compat {
81265 + struct user_acl_role_db_compat role_db;
81266 + unsigned char pw[GR_PW_LEN];
81267 + unsigned char salt[GR_SALT_LEN];
81268 + unsigned char sum[GR_SHA_LEN];
81269 + unsigned char sp_role[GR_SPROLE_LEN];
81270 + compat_uptr_t sprole_pws;
81271 + __u32 segv_device;
81272 + compat_ino_t segv_inode;
81273 + uid_t segv_uid;
81274 + __u16 num_sprole_pws;
81275 + __u16 mode;
81276 +};
81277 +
81278 +struct gr_arg_wrapper_compat {
81279 + compat_uptr_t arg;
81280 + __u32 version;
81281 + __u32 size;
81282 +};
81283 +
81284 +#endif
81285 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
81286 new file mode 100644
81287 index 0000000..323ecf2
81288 --- /dev/null
81289 +++ b/include/linux/gralloc.h
81290 @@ -0,0 +1,9 @@
81291 +#ifndef __GRALLOC_H
81292 +#define __GRALLOC_H
81293 +
81294 +void acl_free_all(void);
81295 +int acl_alloc_stack_init(unsigned long size);
81296 +void *acl_alloc(unsigned long len);
81297 +void *acl_alloc_num(unsigned long num, unsigned long len);
81298 +
81299 +#endif
81300 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
81301 new file mode 100644
81302 index 0000000..be66033
81303 --- /dev/null
81304 +++ b/include/linux/grdefs.h
81305 @@ -0,0 +1,140 @@
81306 +#ifndef GRDEFS_H
81307 +#define GRDEFS_H
81308 +
81309 +/* Begin grsecurity status declarations */
81310 +
81311 +enum {
81312 + GR_READY = 0x01,
81313 + GR_STATUS_INIT = 0x00 // disabled state
81314 +};
81315 +
81316 +/* Begin ACL declarations */
81317 +
81318 +/* Role flags */
81319 +
81320 +enum {
81321 + GR_ROLE_USER = 0x0001,
81322 + GR_ROLE_GROUP = 0x0002,
81323 + GR_ROLE_DEFAULT = 0x0004,
81324 + GR_ROLE_SPECIAL = 0x0008,
81325 + GR_ROLE_AUTH = 0x0010,
81326 + GR_ROLE_NOPW = 0x0020,
81327 + GR_ROLE_GOD = 0x0040,
81328 + GR_ROLE_LEARN = 0x0080,
81329 + GR_ROLE_TPE = 0x0100,
81330 + GR_ROLE_DOMAIN = 0x0200,
81331 + GR_ROLE_PAM = 0x0400,
81332 + GR_ROLE_PERSIST = 0x0800
81333 +};
81334 +
81335 +/* ACL Subject and Object mode flags */
81336 +enum {
81337 + GR_DELETED = 0x80000000
81338 +};
81339 +
81340 +/* ACL Object-only mode flags */
81341 +enum {
81342 + GR_READ = 0x00000001,
81343 + GR_APPEND = 0x00000002,
81344 + GR_WRITE = 0x00000004,
81345 + GR_EXEC = 0x00000008,
81346 + GR_FIND = 0x00000010,
81347 + GR_INHERIT = 0x00000020,
81348 + GR_SETID = 0x00000040,
81349 + GR_CREATE = 0x00000080,
81350 + GR_DELETE = 0x00000100,
81351 + GR_LINK = 0x00000200,
81352 + GR_AUDIT_READ = 0x00000400,
81353 + GR_AUDIT_APPEND = 0x00000800,
81354 + GR_AUDIT_WRITE = 0x00001000,
81355 + GR_AUDIT_EXEC = 0x00002000,
81356 + GR_AUDIT_FIND = 0x00004000,
81357 + GR_AUDIT_INHERIT= 0x00008000,
81358 + GR_AUDIT_SETID = 0x00010000,
81359 + GR_AUDIT_CREATE = 0x00020000,
81360 + GR_AUDIT_DELETE = 0x00040000,
81361 + GR_AUDIT_LINK = 0x00080000,
81362 + GR_PTRACERD = 0x00100000,
81363 + GR_NOPTRACE = 0x00200000,
81364 + GR_SUPPRESS = 0x00400000,
81365 + GR_NOLEARN = 0x00800000,
81366 + GR_INIT_TRANSFER= 0x01000000
81367 +};
81368 +
81369 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
81370 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
81371 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
81372 +
81373 +/* ACL subject-only mode flags */
81374 +enum {
81375 + GR_KILL = 0x00000001,
81376 + GR_VIEW = 0x00000002,
81377 + GR_PROTECTED = 0x00000004,
81378 + GR_LEARN = 0x00000008,
81379 + GR_OVERRIDE = 0x00000010,
81380 + /* just a placeholder, this mode is only used in userspace */
81381 + GR_DUMMY = 0x00000020,
81382 + GR_PROTSHM = 0x00000040,
81383 + GR_KILLPROC = 0x00000080,
81384 + GR_KILLIPPROC = 0x00000100,
81385 + /* just a placeholder, this mode is only used in userspace */
81386 + GR_NOTROJAN = 0x00000200,
81387 + GR_PROTPROCFD = 0x00000400,
81388 + GR_PROCACCT = 0x00000800,
81389 + GR_RELAXPTRACE = 0x00001000,
81390 + //GR_NESTED = 0x00002000,
81391 + GR_INHERITLEARN = 0x00004000,
81392 + GR_PROCFIND = 0x00008000,
81393 + GR_POVERRIDE = 0x00010000,
81394 + GR_KERNELAUTH = 0x00020000,
81395 + GR_ATSECURE = 0x00040000,
81396 + GR_SHMEXEC = 0x00080000
81397 +};
81398 +
81399 +enum {
81400 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
81401 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
81402 + GR_PAX_ENABLE_MPROTECT = 0x0004,
81403 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
81404 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
81405 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
81406 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
81407 + GR_PAX_DISABLE_MPROTECT = 0x0400,
81408 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
81409 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
81410 +};
81411 +
81412 +enum {
81413 + GR_ID_USER = 0x01,
81414 + GR_ID_GROUP = 0x02,
81415 +};
81416 +
81417 +enum {
81418 + GR_ID_ALLOW = 0x01,
81419 + GR_ID_DENY = 0x02,
81420 +};
81421 +
81422 +#define GR_CRASH_RES 31
81423 +#define GR_UIDTABLE_MAX 500
81424 +
81425 +/* begin resource learning section */
81426 +enum {
81427 + GR_RLIM_CPU_BUMP = 60,
81428 + GR_RLIM_FSIZE_BUMP = 50000,
81429 + GR_RLIM_DATA_BUMP = 10000,
81430 + GR_RLIM_STACK_BUMP = 1000,
81431 + GR_RLIM_CORE_BUMP = 10000,
81432 + GR_RLIM_RSS_BUMP = 500000,
81433 + GR_RLIM_NPROC_BUMP = 1,
81434 + GR_RLIM_NOFILE_BUMP = 5,
81435 + GR_RLIM_MEMLOCK_BUMP = 50000,
81436 + GR_RLIM_AS_BUMP = 500000,
81437 + GR_RLIM_LOCKS_BUMP = 2,
81438 + GR_RLIM_SIGPENDING_BUMP = 5,
81439 + GR_RLIM_MSGQUEUE_BUMP = 10000,
81440 + GR_RLIM_NICE_BUMP = 1,
81441 + GR_RLIM_RTPRIO_BUMP = 1,
81442 + GR_RLIM_RTTIME_BUMP = 1000000
81443 +};
81444 +
81445 +#endif
81446 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
81447 new file mode 100644
81448 index 0000000..d25522e
81449 --- /dev/null
81450 +++ b/include/linux/grinternal.h
81451 @@ -0,0 +1,229 @@
81452 +#ifndef __GRINTERNAL_H
81453 +#define __GRINTERNAL_H
81454 +
81455 +#ifdef CONFIG_GRKERNSEC
81456 +
81457 +#include <linux/fs.h>
81458 +#include <linux/mnt_namespace.h>
81459 +#include <linux/nsproxy.h>
81460 +#include <linux/gracl.h>
81461 +#include <linux/grdefs.h>
81462 +#include <linux/grmsg.h>
81463 +
81464 +void gr_add_learn_entry(const char *fmt, ...)
81465 + __attribute__ ((format (printf, 1, 2)));
81466 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
81467 + const struct vfsmount *mnt);
81468 +__u32 gr_check_create(const struct dentry *new_dentry,
81469 + const struct dentry *parent,
81470 + const struct vfsmount *mnt, const __u32 mode);
81471 +int gr_check_protected_task(const struct task_struct *task);
81472 +__u32 to_gr_audit(const __u32 reqmode);
81473 +int gr_set_acls(const int type);
81474 +int gr_acl_is_enabled(void);
81475 +char gr_roletype_to_char(void);
81476 +
81477 +void gr_handle_alertkill(struct task_struct *task);
81478 +char *gr_to_filename(const struct dentry *dentry,
81479 + const struct vfsmount *mnt);
81480 +char *gr_to_filename1(const struct dentry *dentry,
81481 + const struct vfsmount *mnt);
81482 +char *gr_to_filename2(const struct dentry *dentry,
81483 + const struct vfsmount *mnt);
81484 +char *gr_to_filename3(const struct dentry *dentry,
81485 + const struct vfsmount *mnt);
81486 +
81487 +extern int grsec_enable_ptrace_readexec;
81488 +extern int grsec_enable_harden_ptrace;
81489 +extern int grsec_enable_link;
81490 +extern int grsec_enable_fifo;
81491 +extern int grsec_enable_execve;
81492 +extern int grsec_enable_shm;
81493 +extern int grsec_enable_execlog;
81494 +extern int grsec_enable_signal;
81495 +extern int grsec_enable_audit_ptrace;
81496 +extern int grsec_enable_forkfail;
81497 +extern int grsec_enable_time;
81498 +extern int grsec_enable_rofs;
81499 +extern int grsec_deny_new_usb;
81500 +extern int grsec_enable_chroot_shmat;
81501 +extern int grsec_enable_chroot_mount;
81502 +extern int grsec_enable_chroot_double;
81503 +extern int grsec_enable_chroot_pivot;
81504 +extern int grsec_enable_chroot_chdir;
81505 +extern int grsec_enable_chroot_chmod;
81506 +extern int grsec_enable_chroot_mknod;
81507 +extern int grsec_enable_chroot_fchdir;
81508 +extern int grsec_enable_chroot_nice;
81509 +extern int grsec_enable_chroot_execlog;
81510 +extern int grsec_enable_chroot_caps;
81511 +extern int grsec_enable_chroot_sysctl;
81512 +extern int grsec_enable_chroot_unix;
81513 +extern int grsec_enable_symlinkown;
81514 +extern kgid_t grsec_symlinkown_gid;
81515 +extern int grsec_enable_tpe;
81516 +extern kgid_t grsec_tpe_gid;
81517 +extern int grsec_enable_tpe_all;
81518 +extern int grsec_enable_tpe_invert;
81519 +extern int grsec_enable_socket_all;
81520 +extern kgid_t grsec_socket_all_gid;
81521 +extern int grsec_enable_socket_client;
81522 +extern kgid_t grsec_socket_client_gid;
81523 +extern int grsec_enable_socket_server;
81524 +extern kgid_t grsec_socket_server_gid;
81525 +extern kgid_t grsec_audit_gid;
81526 +extern int grsec_enable_group;
81527 +extern int grsec_enable_log_rwxmaps;
81528 +extern int grsec_enable_mount;
81529 +extern int grsec_enable_chdir;
81530 +extern int grsec_resource_logging;
81531 +extern int grsec_enable_blackhole;
81532 +extern int grsec_lastack_retries;
81533 +extern int grsec_enable_brute;
81534 +extern int grsec_enable_harden_ipc;
81535 +extern int grsec_lock;
81536 +
81537 +extern spinlock_t grsec_alert_lock;
81538 +extern unsigned long grsec_alert_wtime;
81539 +extern unsigned long grsec_alert_fyet;
81540 +
81541 +extern spinlock_t grsec_audit_lock;
81542 +
81543 +extern rwlock_t grsec_exec_file_lock;
81544 +
81545 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
81546 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
81547 + (tsk)->exec_file->f_path.mnt) : "/")
81548 +
81549 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
81550 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
81551 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81552 +
81553 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
81554 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
81555 + (tsk)->exec_file->f_path.mnt) : "/")
81556 +
81557 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
81558 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
81559 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81560 +
81561 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
81562 +
81563 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
81564 +
81565 +static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
81566 +{
81567 + if (file1 && file2) {
81568 + const struct inode *inode1 = file1->f_path.dentry->d_inode;
81569 + const struct inode *inode2 = file2->f_path.dentry->d_inode;
81570 + if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
81571 + return true;
81572 + }
81573 +
81574 + return false;
81575 +}
81576 +
81577 +#define GR_CHROOT_CAPS {{ \
81578 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
81579 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
81580 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
81581 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
81582 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
81583 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
81584 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
81585 +
81586 +#define security_learn(normal_msg,args...) \
81587 +({ \
81588 + read_lock(&grsec_exec_file_lock); \
81589 + gr_add_learn_entry(normal_msg "\n", ## args); \
81590 + read_unlock(&grsec_exec_file_lock); \
81591 +})
81592 +
81593 +enum {
81594 + GR_DO_AUDIT,
81595 + GR_DONT_AUDIT,
81596 + /* used for non-audit messages that we shouldn't kill the task on */
81597 + GR_DONT_AUDIT_GOOD
81598 +};
81599 +
81600 +enum {
81601 + GR_TTYSNIFF,
81602 + GR_RBAC,
81603 + GR_RBAC_STR,
81604 + GR_STR_RBAC,
81605 + GR_RBAC_MODE2,
81606 + GR_RBAC_MODE3,
81607 + GR_FILENAME,
81608 + GR_SYSCTL_HIDDEN,
81609 + GR_NOARGS,
81610 + GR_ONE_INT,
81611 + GR_ONE_INT_TWO_STR,
81612 + GR_ONE_STR,
81613 + GR_STR_INT,
81614 + GR_TWO_STR_INT,
81615 + GR_TWO_INT,
81616 + GR_TWO_U64,
81617 + GR_THREE_INT,
81618 + GR_FIVE_INT_TWO_STR,
81619 + GR_TWO_STR,
81620 + GR_THREE_STR,
81621 + GR_FOUR_STR,
81622 + GR_STR_FILENAME,
81623 + GR_FILENAME_STR,
81624 + GR_FILENAME_TWO_INT,
81625 + GR_FILENAME_TWO_INT_STR,
81626 + GR_TEXTREL,
81627 + GR_PTRACE,
81628 + GR_RESOURCE,
81629 + GR_CAP,
81630 + GR_SIG,
81631 + GR_SIG2,
81632 + GR_CRASH1,
81633 + GR_CRASH2,
81634 + GR_PSACCT,
81635 + GR_RWXMAP,
81636 + GR_RWXMAPVMA
81637 +};
81638 +
81639 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
81640 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
81641 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
81642 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
81643 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
81644 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
81645 +#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)
81646 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
81647 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
81648 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
81649 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
81650 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
81651 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
81652 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
81653 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
81654 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
81655 +#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)
81656 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
81657 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
81658 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
81659 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
81660 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
81661 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
81662 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
81663 +#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)
81664 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
81665 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
81666 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
81667 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
81668 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
81669 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
81670 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
81671 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
81672 +#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)
81673 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
81674 +#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
81675 +
81676 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
81677 +
81678 +#endif
81679 +
81680 +#endif
81681 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
81682 new file mode 100644
81683 index 0000000..b02ba9d
81684 --- /dev/null
81685 +++ b/include/linux/grmsg.h
81686 @@ -0,0 +1,117 @@
81687 +#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"
81688 +#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"
81689 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
81690 +#define GR_STOPMOD_MSG "denied modification of module state by "
81691 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
81692 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
81693 +#define GR_IOPERM_MSG "denied use of ioperm() by "
81694 +#define GR_IOPL_MSG "denied use of iopl() by "
81695 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
81696 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
81697 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
81698 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
81699 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
81700 +#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"
81701 +#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"
81702 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
81703 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
81704 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
81705 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
81706 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
81707 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
81708 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
81709 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
81710 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
81711 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
81712 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
81713 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
81714 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
81715 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
81716 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
81717 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
81718 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
81719 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
81720 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
81721 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
81722 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
81723 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
81724 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
81725 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
81726 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
81727 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
81728 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
81729 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
81730 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
81731 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
81732 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
81733 +#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
81734 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
81735 +#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
81736 +#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
81737 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
81738 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
81739 +#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"
81740 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
81741 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
81742 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
81743 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
81744 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
81745 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
81746 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
81747 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
81748 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
81749 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
81750 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
81751 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
81752 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
81753 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
81754 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
81755 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
81756 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
81757 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
81758 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
81759 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
81760 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
81761 +#define GR_NICE_CHROOT_MSG "denied priority change by "
81762 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
81763 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
81764 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
81765 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
81766 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
81767 +#define GR_TIME_MSG "time set by "
81768 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
81769 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
81770 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
81771 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
81772 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
81773 +#define GR_BIND_MSG "denied bind() by "
81774 +#define GR_CONNECT_MSG "denied connect() by "
81775 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
81776 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
81777 +#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"
81778 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
81779 +#define GR_CAP_ACL_MSG "use of %s denied for "
81780 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
81781 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
81782 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
81783 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
81784 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
81785 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
81786 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
81787 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
81788 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
81789 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
81790 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
81791 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
81792 +#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
81793 +#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
81794 +#define GR_VM86_MSG "denied use of vm86 by "
81795 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
81796 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
81797 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
81798 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
81799 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
81800 +#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 "
81801 +#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 "
81802 +#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
81803 +#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
81804 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
81805 new file mode 100644
81806 index 0000000..c3b0738
81807 --- /dev/null
81808 +++ b/include/linux/grsecurity.h
81809 @@ -0,0 +1,244 @@
81810 +#ifndef GR_SECURITY_H
81811 +#define GR_SECURITY_H
81812 +#include <linux/fs.h>
81813 +#include <linux/fs_struct.h>
81814 +#include <linux/binfmts.h>
81815 +#include <linux/gracl.h>
81816 +
81817 +/* notify of brain-dead configs */
81818 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81819 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
81820 +#endif
81821 +#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81822 +#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
81823 +#endif
81824 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
81825 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
81826 +#endif
81827 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
81828 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
81829 +#endif
81830 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
81831 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
81832 +#endif
81833 +
81834 +int gr_handle_new_usb(void);
81835 +
81836 +void gr_handle_brute_attach(int dumpable);
81837 +void gr_handle_brute_check(void);
81838 +void gr_handle_kernel_exploit(void);
81839 +
81840 +char gr_roletype_to_char(void);
81841 +
81842 +int gr_proc_is_restricted(void);
81843 +
81844 +int gr_acl_enable_at_secure(void);
81845 +
81846 +int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
81847 +int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
81848 +
81849 +int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
81850 +
81851 +void gr_del_task_from_ip_table(struct task_struct *p);
81852 +
81853 +int gr_pid_is_chrooted(struct task_struct *p);
81854 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
81855 +int gr_handle_chroot_nice(void);
81856 +int gr_handle_chroot_sysctl(const int op);
81857 +int gr_handle_chroot_setpriority(struct task_struct *p,
81858 + const int niceval);
81859 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
81860 +int gr_chroot_fhandle(void);
81861 +int gr_handle_chroot_chroot(const struct dentry *dentry,
81862 + const struct vfsmount *mnt);
81863 +void gr_handle_chroot_chdir(const struct path *path);
81864 +int gr_handle_chroot_chmod(const struct dentry *dentry,
81865 + const struct vfsmount *mnt, const int mode);
81866 +int gr_handle_chroot_mknod(const struct dentry *dentry,
81867 + const struct vfsmount *mnt, const int mode);
81868 +int gr_handle_chroot_mount(const struct dentry *dentry,
81869 + const struct vfsmount *mnt,
81870 + const char *dev_name);
81871 +int gr_handle_chroot_pivot(void);
81872 +int gr_handle_chroot_unix(const pid_t pid);
81873 +
81874 +int gr_handle_rawio(const struct inode *inode);
81875 +
81876 +void gr_handle_ioperm(void);
81877 +void gr_handle_iopl(void);
81878 +void gr_handle_msr_write(void);
81879 +
81880 +umode_t gr_acl_umask(void);
81881 +
81882 +int gr_tpe_allow(const struct file *file);
81883 +
81884 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
81885 +void gr_clear_chroot_entries(struct task_struct *task);
81886 +
81887 +void gr_log_forkfail(const int retval);
81888 +void gr_log_timechange(void);
81889 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
81890 +void gr_log_chdir(const struct dentry *dentry,
81891 + const struct vfsmount *mnt);
81892 +void gr_log_chroot_exec(const struct dentry *dentry,
81893 + const struct vfsmount *mnt);
81894 +void gr_log_remount(const char *devname, const int retval);
81895 +void gr_log_unmount(const char *devname, const int retval);
81896 +void gr_log_mount(const char *from, struct path *to, const int retval);
81897 +void gr_log_textrel(struct vm_area_struct *vma);
81898 +void gr_log_ptgnustack(struct file *file);
81899 +void gr_log_rwxmmap(struct file *file);
81900 +void gr_log_rwxmprotect(struct vm_area_struct *vma);
81901 +
81902 +int gr_handle_follow_link(const struct inode *parent,
81903 + const struct inode *inode,
81904 + const struct dentry *dentry,
81905 + const struct vfsmount *mnt);
81906 +int gr_handle_fifo(const struct dentry *dentry,
81907 + const struct vfsmount *mnt,
81908 + const struct dentry *dir, const int flag,
81909 + const int acc_mode);
81910 +int gr_handle_hardlink(const struct dentry *dentry,
81911 + const struct vfsmount *mnt,
81912 + struct inode *inode,
81913 + const int mode, const struct filename *to);
81914 +
81915 +int gr_is_capable(const int cap);
81916 +int gr_is_capable_nolog(const int cap);
81917 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
81918 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
81919 +
81920 +void gr_copy_label(struct task_struct *tsk);
81921 +void gr_handle_crash(struct task_struct *task, const int sig);
81922 +int gr_handle_signal(const struct task_struct *p, const int sig);
81923 +int gr_check_crash_uid(const kuid_t uid);
81924 +int gr_check_protected_task(const struct task_struct *task);
81925 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
81926 +int gr_acl_handle_mmap(const struct file *file,
81927 + const unsigned long prot);
81928 +int gr_acl_handle_mprotect(const struct file *file,
81929 + const unsigned long prot);
81930 +int gr_check_hidden_task(const struct task_struct *tsk);
81931 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
81932 + const struct vfsmount *mnt);
81933 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
81934 + const struct vfsmount *mnt);
81935 +__u32 gr_acl_handle_access(const struct dentry *dentry,
81936 + const struct vfsmount *mnt, const int fmode);
81937 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
81938 + const struct vfsmount *mnt, umode_t *mode);
81939 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
81940 + const struct vfsmount *mnt);
81941 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
81942 + const struct vfsmount *mnt);
81943 +__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
81944 + const struct vfsmount *mnt);
81945 +int gr_handle_ptrace(struct task_struct *task, const long request);
81946 +int gr_handle_proc_ptrace(struct task_struct *task);
81947 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
81948 + const struct vfsmount *mnt);
81949 +int gr_check_crash_exec(const struct file *filp);
81950 +int gr_acl_is_enabled(void);
81951 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
81952 + const kgid_t gid);
81953 +int gr_set_proc_label(const struct dentry *dentry,
81954 + const struct vfsmount *mnt,
81955 + const int unsafe_flags);
81956 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
81957 + const struct vfsmount *mnt);
81958 +__u32 gr_acl_handle_open(const struct dentry *dentry,
81959 + const struct vfsmount *mnt, int acc_mode);
81960 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
81961 + const struct dentry *p_dentry,
81962 + const struct vfsmount *p_mnt,
81963 + int open_flags, int acc_mode, const int imode);
81964 +void gr_handle_create(const struct dentry *dentry,
81965 + const struct vfsmount *mnt);
81966 +void gr_handle_proc_create(const struct dentry *dentry,
81967 + const struct inode *inode);
81968 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
81969 + const struct dentry *parent_dentry,
81970 + const struct vfsmount *parent_mnt,
81971 + const int mode);
81972 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
81973 + const struct dentry *parent_dentry,
81974 + const struct vfsmount *parent_mnt);
81975 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
81976 + const struct vfsmount *mnt);
81977 +void gr_handle_delete(const ino_t ino, const dev_t dev);
81978 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
81979 + const struct vfsmount *mnt);
81980 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
81981 + const struct dentry *parent_dentry,
81982 + const struct vfsmount *parent_mnt,
81983 + const struct filename *from);
81984 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
81985 + const struct dentry *parent_dentry,
81986 + const struct vfsmount *parent_mnt,
81987 + const struct dentry *old_dentry,
81988 + const struct vfsmount *old_mnt, const struct filename *to);
81989 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
81990 +int gr_acl_handle_rename(struct dentry *new_dentry,
81991 + struct dentry *parent_dentry,
81992 + const struct vfsmount *parent_mnt,
81993 + struct dentry *old_dentry,
81994 + struct inode *old_parent_inode,
81995 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
81996 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
81997 + struct dentry *old_dentry,
81998 + struct dentry *new_dentry,
81999 + struct vfsmount *mnt, const __u8 replace, unsigned int flags);
82000 +__u32 gr_check_link(const struct dentry *new_dentry,
82001 + const struct dentry *parent_dentry,
82002 + const struct vfsmount *parent_mnt,
82003 + const struct dentry *old_dentry,
82004 + const struct vfsmount *old_mnt);
82005 +int gr_acl_handle_filldir(const struct file *file, const char *name,
82006 + const unsigned int namelen, const ino_t ino);
82007 +
82008 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
82009 + const struct vfsmount *mnt);
82010 +void gr_acl_handle_exit(void);
82011 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
82012 +int gr_acl_handle_procpidmem(const struct task_struct *task);
82013 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
82014 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
82015 +void gr_audit_ptrace(struct task_struct *task);
82016 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
82017 +void gr_put_exec_file(struct task_struct *task);
82018 +
82019 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
82020 +
82021 +#ifdef CONFIG_GRKERNSEC_RESLOG
82022 +extern void gr_log_resource(const struct task_struct *task, const int res,
82023 + const unsigned long wanted, const int gt);
82024 +#else
82025 +static inline void gr_log_resource(const struct task_struct *task, const int res,
82026 + const unsigned long wanted, const int gt)
82027 +{
82028 +}
82029 +#endif
82030 +
82031 +#ifdef CONFIG_GRKERNSEC
82032 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
82033 +void gr_handle_vm86(void);
82034 +void gr_handle_mem_readwrite(u64 from, u64 to);
82035 +
82036 +void gr_log_badprocpid(const char *entry);
82037 +
82038 +extern int grsec_enable_dmesg;
82039 +extern int grsec_disable_privio;
82040 +
82041 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
82042 +extern kgid_t grsec_proc_gid;
82043 +#endif
82044 +
82045 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82046 +extern int grsec_enable_chroot_findtask;
82047 +#endif
82048 +#ifdef CONFIG_GRKERNSEC_SETXID
82049 +extern int grsec_enable_setxid;
82050 +#endif
82051 +#endif
82052 +
82053 +#endif
82054 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
82055 new file mode 100644
82056 index 0000000..e7ffaaf
82057 --- /dev/null
82058 +++ b/include/linux/grsock.h
82059 @@ -0,0 +1,19 @@
82060 +#ifndef __GRSOCK_H
82061 +#define __GRSOCK_H
82062 +
82063 +extern void gr_attach_curr_ip(const struct sock *sk);
82064 +extern int gr_handle_sock_all(const int family, const int type,
82065 + const int protocol);
82066 +extern int gr_handle_sock_server(const struct sockaddr *sck);
82067 +extern int gr_handle_sock_server_other(const struct sock *sck);
82068 +extern int gr_handle_sock_client(const struct sockaddr *sck);
82069 +extern int gr_search_connect(struct socket * sock,
82070 + struct sockaddr_in * addr);
82071 +extern int gr_search_bind(struct socket * sock,
82072 + struct sockaddr_in * addr);
82073 +extern int gr_search_listen(struct socket * sock);
82074 +extern int gr_search_accept(struct socket * sock);
82075 +extern int gr_search_socket(const int domain, const int type,
82076 + const int protocol);
82077 +
82078 +#endif
82079 diff --git a/include/linux/hash.h b/include/linux/hash.h
82080 index d0494c3..69b7715 100644
82081 --- a/include/linux/hash.h
82082 +++ b/include/linux/hash.h
82083 @@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
82084 struct fast_hash_ops {
82085 u32 (*hash)(const void *data, u32 len, u32 seed);
82086 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
82087 -};
82088 +} __no_const;
82089
82090 /**
82091 * arch_fast_hash - Caclulates a hash over a given buffer that can have
82092 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
82093 index 9286a46..373f27f 100644
82094 --- a/include/linux/highmem.h
82095 +++ b/include/linux/highmem.h
82096 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
82097 kunmap_atomic(kaddr);
82098 }
82099
82100 +static inline void sanitize_highpage(struct page *page)
82101 +{
82102 + void *kaddr;
82103 + unsigned long flags;
82104 +
82105 + local_irq_save(flags);
82106 + kaddr = kmap_atomic(page);
82107 + clear_page(kaddr);
82108 + kunmap_atomic(kaddr);
82109 + local_irq_restore(flags);
82110 +}
82111 +
82112 static inline void zero_user_segments(struct page *page,
82113 unsigned start1, unsigned end1,
82114 unsigned start2, unsigned end2)
82115 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
82116 index 1c7b89a..7dda400 100644
82117 --- a/include/linux/hwmon-sysfs.h
82118 +++ b/include/linux/hwmon-sysfs.h
82119 @@ -25,7 +25,8 @@
82120 struct sensor_device_attribute{
82121 struct device_attribute dev_attr;
82122 int index;
82123 -};
82124 +} __do_const;
82125 +typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
82126 #define to_sensor_dev_attr(_dev_attr) \
82127 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
82128
82129 @@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
82130 struct device_attribute dev_attr;
82131 u8 index;
82132 u8 nr;
82133 -};
82134 +} __do_const;
82135 +typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
82136 #define to_sensor_dev_attr_2(_dev_attr) \
82137 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
82138
82139 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
82140 index b556e0a..c10a515 100644
82141 --- a/include/linux/i2c.h
82142 +++ b/include/linux/i2c.h
82143 @@ -378,6 +378,7 @@ struct i2c_algorithm {
82144 /* To determine what the adapter supports */
82145 u32 (*functionality) (struct i2c_adapter *);
82146 };
82147 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
82148
82149 /**
82150 * struct i2c_bus_recovery_info - I2C bus recovery information
82151 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
82152 index d23c3c2..eb63c81 100644
82153 --- a/include/linux/i2o.h
82154 +++ b/include/linux/i2o.h
82155 @@ -565,7 +565,7 @@ struct i2o_controller {
82156 struct i2o_device *exec; /* Executive */
82157 #if BITS_PER_LONG == 64
82158 spinlock_t context_list_lock; /* lock for context_list */
82159 - atomic_t context_list_counter; /* needed for unique contexts */
82160 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
82161 struct list_head context_list; /* list of context id's
82162 and pointers */
82163 #endif
82164 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
82165 index aff7ad8..3942bbd 100644
82166 --- a/include/linux/if_pppox.h
82167 +++ b/include/linux/if_pppox.h
82168 @@ -76,7 +76,7 @@ struct pppox_proto {
82169 int (*ioctl)(struct socket *sock, unsigned int cmd,
82170 unsigned long arg);
82171 struct module *owner;
82172 -};
82173 +} __do_const;
82174
82175 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
82176 extern void unregister_pppox_proto(int proto_num);
82177 diff --git a/include/linux/init.h b/include/linux/init.h
82178 index 2df8e8d..3e1280d 100644
82179 --- a/include/linux/init.h
82180 +++ b/include/linux/init.h
82181 @@ -37,9 +37,17 @@
82182 * section.
82183 */
82184
82185 +#define add_init_latent_entropy __latent_entropy
82186 +
82187 +#ifdef CONFIG_MEMORY_HOTPLUG
82188 +#define add_meminit_latent_entropy
82189 +#else
82190 +#define add_meminit_latent_entropy __latent_entropy
82191 +#endif
82192 +
82193 /* These are for everybody (although not all archs will actually
82194 discard it in modules) */
82195 -#define __init __section(.init.text) __cold notrace
82196 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
82197 #define __initdata __section(.init.data)
82198 #define __initconst __constsection(.init.rodata)
82199 #define __exitdata __section(.exit.data)
82200 @@ -100,7 +108,7 @@
82201 #define __cpuexitconst
82202
82203 /* Used for MEMORY_HOTPLUG */
82204 -#define __meminit __section(.meminit.text) __cold notrace
82205 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
82206 #define __meminitdata __section(.meminit.data)
82207 #define __meminitconst __constsection(.meminit.rodata)
82208 #define __memexit __section(.memexit.text) __exitused __cold notrace
82209 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
82210 index 77fc43f..73caf92 100644
82211 --- a/include/linux/init_task.h
82212 +++ b/include/linux/init_task.h
82213 @@ -158,6 +158,12 @@ extern struct task_group root_task_group;
82214
82215 #define INIT_TASK_COMM "swapper"
82216
82217 +#ifdef CONFIG_X86
82218 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
82219 +#else
82220 +#define INIT_TASK_THREAD_INFO
82221 +#endif
82222 +
82223 #ifdef CONFIG_RT_MUTEXES
82224 # define INIT_RT_MUTEXES(tsk) \
82225 .pi_waiters = RB_ROOT, \
82226 @@ -205,6 +211,7 @@ extern struct task_group root_task_group;
82227 RCU_POINTER_INITIALIZER(cred, &init_cred), \
82228 .comm = INIT_TASK_COMM, \
82229 .thread = INIT_THREAD, \
82230 + INIT_TASK_THREAD_INFO \
82231 .fs = &init_fs, \
82232 .files = &init_files, \
82233 .signal = &init_signals, \
82234 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
82235 index 69517a2..6b12d37 100644
82236 --- a/include/linux/interrupt.h
82237 +++ b/include/linux/interrupt.h
82238 @@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
82239
82240 struct softirq_action
82241 {
82242 - void (*action)(struct softirq_action *);
82243 -};
82244 + void (*action)(void);
82245 +} __no_const;
82246
82247 asmlinkage void do_softirq(void);
82248 asmlinkage void __do_softirq(void);
82249 @@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
82250 }
82251 #endif
82252
82253 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
82254 +extern void open_softirq(int nr, void (*action)(void));
82255 extern void softirq_init(void);
82256 extern void __raise_softirq_irqoff(unsigned int nr);
82257
82258 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
82259 index e6a7c9f..5804745 100644
82260 --- a/include/linux/iommu.h
82261 +++ b/include/linux/iommu.h
82262 @@ -133,7 +133,7 @@ struct iommu_ops {
82263 u32 (*domain_get_windows)(struct iommu_domain *domain);
82264
82265 unsigned long pgsize_bitmap;
82266 -};
82267 +} __do_const;
82268
82269 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
82270 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
82271 diff --git a/include/linux/ioport.h b/include/linux/ioport.h
82272 index 2c525022..345b106 100644
82273 --- a/include/linux/ioport.h
82274 +++ b/include/linux/ioport.h
82275 @@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
82276 int adjust_resource(struct resource *res, resource_size_t start,
82277 resource_size_t size);
82278 resource_size_t resource_alignment(struct resource *res);
82279 -static inline resource_size_t resource_size(const struct resource *res)
82280 +static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
82281 {
82282 return res->end - res->start + 1;
82283 }
82284 diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
82285 index 35e7eca..6afb7ad 100644
82286 --- a/include/linux/ipc_namespace.h
82287 +++ b/include/linux/ipc_namespace.h
82288 @@ -69,7 +69,7 @@ struct ipc_namespace {
82289 struct user_namespace *user_ns;
82290
82291 unsigned int proc_inum;
82292 -};
82293 +} __randomize_layout;
82294
82295 extern struct ipc_namespace init_ipc_ns;
82296 extern atomic_t nr_ipc_ns;
82297 diff --git a/include/linux/irq.h b/include/linux/irq.h
82298 index 03f48d9..e86af0c 100644
82299 --- a/include/linux/irq.h
82300 +++ b/include/linux/irq.h
82301 @@ -352,7 +352,8 @@ struct irq_chip {
82302 void (*irq_release_resources)(struct irq_data *data);
82303
82304 unsigned long flags;
82305 -};
82306 +} __do_const;
82307 +typedef struct irq_chip __no_const irq_chip_no_const;
82308
82309 /*
82310 * irq_chip specific flags
82311 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
82312 index 13eed92..3261c86 100644
82313 --- a/include/linux/irqchip/arm-gic.h
82314 +++ b/include/linux/irqchip/arm-gic.h
82315 @@ -91,9 +91,11 @@
82316
82317 #ifndef __ASSEMBLY__
82318
82319 +#include <linux/irq.h>
82320 +
82321 struct device_node;
82322
82323 -extern struct irq_chip gic_arch_extn;
82324 +extern irq_chip_no_const gic_arch_extn;
82325
82326 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
82327 u32 offset, struct device_node *);
82328 diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
82329 index c367cbd..c9b79e6 100644
82330 --- a/include/linux/jiffies.h
82331 +++ b/include/linux/jiffies.h
82332 @@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
82333 /*
82334 * Convert various time units to each other:
82335 */
82336 -extern unsigned int jiffies_to_msecs(const unsigned long j);
82337 -extern unsigned int jiffies_to_usecs(const unsigned long j);
82338 +extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
82339 +extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
82340
82341 -static inline u64 jiffies_to_nsecs(const unsigned long j)
82342 +static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
82343 {
82344 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
82345 }
82346
82347 -extern unsigned long msecs_to_jiffies(const unsigned int m);
82348 -extern unsigned long usecs_to_jiffies(const unsigned int u);
82349 +extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
82350 +extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
82351 extern unsigned long timespec_to_jiffies(const struct timespec *value);
82352 extern void jiffies_to_timespec(const unsigned long jiffies,
82353 - struct timespec *value);
82354 -extern unsigned long timeval_to_jiffies(const struct timeval *value);
82355 + struct timespec *value) __intentional_overflow(-1);
82356 +extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
82357 extern void jiffies_to_timeval(const unsigned long jiffies,
82358 struct timeval *value);
82359
82360 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
82361 index 6883e19..e854fcb 100644
82362 --- a/include/linux/kallsyms.h
82363 +++ b/include/linux/kallsyms.h
82364 @@ -15,7 +15,8 @@
82365
82366 struct module;
82367
82368 -#ifdef CONFIG_KALLSYMS
82369 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
82370 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
82371 /* Lookup the address for a symbol. Returns 0 if not found. */
82372 unsigned long kallsyms_lookup_name(const char *name);
82373
82374 @@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
82375 /* Stupid that this does nothing, but I didn't create this mess. */
82376 #define __print_symbol(fmt, addr)
82377 #endif /*CONFIG_KALLSYMS*/
82378 +#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
82379 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
82380 +extern unsigned long kallsyms_lookup_name(const char *name);
82381 +extern void __print_symbol(const char *fmt, unsigned long address);
82382 +extern int sprint_backtrace(char *buffer, unsigned long address);
82383 +extern int sprint_symbol(char *buffer, unsigned long address);
82384 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
82385 +const char *kallsyms_lookup(unsigned long addr,
82386 + unsigned long *symbolsize,
82387 + unsigned long *offset,
82388 + char **modname, char *namebuf);
82389 +extern int kallsyms_lookup_size_offset(unsigned long addr,
82390 + unsigned long *symbolsize,
82391 + unsigned long *offset);
82392 +#endif
82393
82394 /* This macro allows us to keep printk typechecking */
82395 static __printf(1, 2)
82396 diff --git a/include/linux/key-type.h b/include/linux/key-type.h
82397 index ff9f1d3..6712be5 100644
82398 --- a/include/linux/key-type.h
82399 +++ b/include/linux/key-type.h
82400 @@ -152,7 +152,7 @@ struct key_type {
82401 /* internal fields */
82402 struct list_head link; /* link in types list */
82403 struct lock_class_key lock_class; /* key->sem lock class */
82404 -};
82405 +} __do_const;
82406
82407 extern struct key_type key_type_keyring;
82408
82409 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
82410 index e465bb1..19f605f 100644
82411 --- a/include/linux/kgdb.h
82412 +++ b/include/linux/kgdb.h
82413 @@ -52,7 +52,7 @@ extern int kgdb_connected;
82414 extern int kgdb_io_module_registered;
82415
82416 extern atomic_t kgdb_setting_breakpoint;
82417 -extern atomic_t kgdb_cpu_doing_single_step;
82418 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
82419
82420 extern struct task_struct *kgdb_usethread;
82421 extern struct task_struct *kgdb_contthread;
82422 @@ -254,7 +254,7 @@ struct kgdb_arch {
82423 void (*correct_hw_break)(void);
82424
82425 void (*enable_nmi)(bool on);
82426 -};
82427 +} __do_const;
82428
82429 /**
82430 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
82431 @@ -279,7 +279,7 @@ struct kgdb_io {
82432 void (*pre_exception) (void);
82433 void (*post_exception) (void);
82434 int is_console;
82435 -};
82436 +} __do_const;
82437
82438 extern struct kgdb_arch arch_kgdb_ops;
82439
82440 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
82441 index 0555cc6..40116ce 100644
82442 --- a/include/linux/kmod.h
82443 +++ b/include/linux/kmod.h
82444 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
82445 * usually useless though. */
82446 extern __printf(2, 3)
82447 int __request_module(bool wait, const char *name, ...);
82448 +extern __printf(3, 4)
82449 +int ___request_module(bool wait, char *param_name, const char *name, ...);
82450 #define request_module(mod...) __request_module(true, mod)
82451 #define request_module_nowait(mod...) __request_module(false, mod)
82452 #define try_then_request_module(x, mod...) \
82453 @@ -57,6 +59,9 @@ struct subprocess_info {
82454 struct work_struct work;
82455 struct completion *complete;
82456 char *path;
82457 +#ifdef CONFIG_GRKERNSEC
82458 + char *origpath;
82459 +#endif
82460 char **argv;
82461 char **envp;
82462 int wait;
82463 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
82464 index 2d61b90..a1d0a13 100644
82465 --- a/include/linux/kobject.h
82466 +++ b/include/linux/kobject.h
82467 @@ -118,7 +118,7 @@ struct kobj_type {
82468 struct attribute **default_attrs;
82469 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
82470 const void *(*namespace)(struct kobject *kobj);
82471 -};
82472 +} __do_const;
82473
82474 struct kobj_uevent_env {
82475 char *argv[3];
82476 @@ -142,6 +142,7 @@ struct kobj_attribute {
82477 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
82478 const char *buf, size_t count);
82479 };
82480 +typedef struct kobj_attribute __no_const kobj_attribute_no_const;
82481
82482 extern const struct sysfs_ops kobj_sysfs_ops;
82483
82484 @@ -169,7 +170,7 @@ struct kset {
82485 spinlock_t list_lock;
82486 struct kobject kobj;
82487 const struct kset_uevent_ops *uevent_ops;
82488 -};
82489 +} __randomize_layout;
82490
82491 extern void kset_init(struct kset *kset);
82492 extern int __must_check kset_register(struct kset *kset);
82493 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
82494 index df32d25..fb52e27 100644
82495 --- a/include/linux/kobject_ns.h
82496 +++ b/include/linux/kobject_ns.h
82497 @@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
82498 const void *(*netlink_ns)(struct sock *sk);
82499 const void *(*initial_ns)(void);
82500 void (*drop_ns)(void *);
82501 -};
82502 +} __do_const;
82503
82504 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
82505 int kobj_ns_type_registered(enum kobj_ns_type type);
82506 diff --git a/include/linux/kref.h b/include/linux/kref.h
82507 index 484604d..0f6c5b6 100644
82508 --- a/include/linux/kref.h
82509 +++ b/include/linux/kref.h
82510 @@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
82511 static inline int kref_sub(struct kref *kref, unsigned int count,
82512 void (*release)(struct kref *kref))
82513 {
82514 - WARN_ON(release == NULL);
82515 + BUG_ON(release == NULL);
82516
82517 if (atomic_sub_and_test((int) count, &kref->refcount)) {
82518 release(kref);
82519 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
82520 index a6059bd..8126d5c 100644
82521 --- a/include/linux/kvm_host.h
82522 +++ b/include/linux/kvm_host.h
82523 @@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
82524 {
82525 }
82526 #endif
82527 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82528 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82529 struct module *module);
82530 void kvm_exit(void);
82531
82532 @@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
82533 struct kvm_guest_debug *dbg);
82534 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
82535
82536 -int kvm_arch_init(void *opaque);
82537 +int kvm_arch_init(const void *opaque);
82538 void kvm_arch_exit(void);
82539
82540 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
82541 diff --git a/include/linux/libata.h b/include/linux/libata.h
82542 index bd5fefe..2a8a8d2 100644
82543 --- a/include/linux/libata.h
82544 +++ b/include/linux/libata.h
82545 @@ -976,7 +976,7 @@ struct ata_port_operations {
82546 * fields must be pointers.
82547 */
82548 const struct ata_port_operations *inherits;
82549 -};
82550 +} __do_const;
82551
82552 struct ata_port_info {
82553 unsigned long flags;
82554 diff --git a/include/linux/linkage.h b/include/linux/linkage.h
82555 index a6a42dd..6c5ebce 100644
82556 --- a/include/linux/linkage.h
82557 +++ b/include/linux/linkage.h
82558 @@ -36,6 +36,7 @@
82559 #endif
82560
82561 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
82562 +#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
82563 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
82564
82565 /*
82566 diff --git a/include/linux/list.h b/include/linux/list.h
82567 index f33f831..1ffe5e2 100644
82568 --- a/include/linux/list.h
82569 +++ b/include/linux/list.h
82570 @@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
82571 extern void list_del(struct list_head *entry);
82572 #endif
82573
82574 +extern void __pax_list_add(struct list_head *new,
82575 + struct list_head *prev,
82576 + struct list_head *next);
82577 +static inline void pax_list_add(struct list_head *new, struct list_head *head)
82578 +{
82579 + __pax_list_add(new, head, head->next);
82580 +}
82581 +static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
82582 +{
82583 + __pax_list_add(new, head->prev, head);
82584 +}
82585 +extern void pax_list_del(struct list_head *entry);
82586 +
82587 /**
82588 * list_replace - replace old entry by new one
82589 * @old : the element to be replaced
82590 @@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
82591 INIT_LIST_HEAD(entry);
82592 }
82593
82594 +extern void pax_list_del_init(struct list_head *entry);
82595 +
82596 /**
82597 * list_move - delete from one list and add as another's head
82598 * @list: the entry to move
82599 diff --git a/include/linux/lockref.h b/include/linux/lockref.h
82600 index 4bfde0e..d6e2e09 100644
82601 --- a/include/linux/lockref.h
82602 +++ b/include/linux/lockref.h
82603 @@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
82604 return ((int)l->count < 0);
82605 }
82606
82607 +static inline unsigned int __lockref_read(struct lockref *lockref)
82608 +{
82609 + return lockref->count;
82610 +}
82611 +
82612 +static inline void __lockref_set(struct lockref *lockref, unsigned int count)
82613 +{
82614 + lockref->count = count;
82615 +}
82616 +
82617 +static inline void __lockref_inc(struct lockref *lockref)
82618 +{
82619 +
82620 +#ifdef CONFIG_PAX_REFCOUNT
82621 + atomic_inc((atomic_t *)&lockref->count);
82622 +#else
82623 + lockref->count++;
82624 +#endif
82625 +
82626 +}
82627 +
82628 +static inline void __lockref_dec(struct lockref *lockref)
82629 +{
82630 +
82631 +#ifdef CONFIG_PAX_REFCOUNT
82632 + atomic_dec((atomic_t *)&lockref->count);
82633 +#else
82634 + lockref->count--;
82635 +#endif
82636 +
82637 +}
82638 +
82639 #endif /* __LINUX_LOCKREF_H */
82640 diff --git a/include/linux/math64.h b/include/linux/math64.h
82641 index c45c089..298841c 100644
82642 --- a/include/linux/math64.h
82643 +++ b/include/linux/math64.h
82644 @@ -15,7 +15,7 @@
82645 * This is commonly provided by 32bit archs to provide an optimized 64bit
82646 * divide.
82647 */
82648 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82649 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82650 {
82651 *remainder = dividend % divisor;
82652 return dividend / divisor;
82653 @@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
82654 /**
82655 * div64_u64 - unsigned 64bit divide with 64bit divisor
82656 */
82657 -static inline u64 div64_u64(u64 dividend, u64 divisor)
82658 +static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
82659 {
82660 return dividend / divisor;
82661 }
82662 @@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
82663 #define div64_ul(x, y) div_u64((x), (y))
82664
82665 #ifndef div_u64_rem
82666 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82667 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82668 {
82669 *remainder = do_div(dividend, divisor);
82670 return dividend;
82671 @@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
82672 #endif
82673
82674 #ifndef div64_u64
82675 -extern u64 div64_u64(u64 dividend, u64 divisor);
82676 +extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
82677 #endif
82678
82679 #ifndef div64_s64
82680 @@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
82681 * divide.
82682 */
82683 #ifndef div_u64
82684 -static inline u64 div_u64(u64 dividend, u32 divisor)
82685 +static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
82686 {
82687 u32 remainder;
82688 return div_u64_rem(dividend, divisor, &remainder);
82689 diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
82690 index 3d385c8..deacb6a 100644
82691 --- a/include/linux/mempolicy.h
82692 +++ b/include/linux/mempolicy.h
82693 @@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
82694 }
82695
82696 #define vma_policy(vma) ((vma)->vm_policy)
82697 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82698 +{
82699 + vma->vm_policy = pol;
82700 +}
82701
82702 static inline void mpol_get(struct mempolicy *pol)
82703 {
82704 @@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
82705 }
82706
82707 #define vma_policy(vma) NULL
82708 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82709 +{
82710 +}
82711
82712 static inline int
82713 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
82714 diff --git a/include/linux/mm.h b/include/linux/mm.h
82715 index b464611..77cbfc1 100644
82716 --- a/include/linux/mm.h
82717 +++ b/include/linux/mm.h
82718 @@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
82719 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
82720 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
82721 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
82722 +
82723 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
82724 +#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
82725 +#endif
82726 +
82727 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
82728
82729 #ifdef CONFIG_MEM_SOFT_DIRTY
82730 @@ -238,8 +243,8 @@ struct vm_operations_struct {
82731 /* called by access_process_vm when get_user_pages() fails, typically
82732 * for use by special VMAs that can switch between memory and hardware
82733 */
82734 - int (*access)(struct vm_area_struct *vma, unsigned long addr,
82735 - void *buf, int len, int write);
82736 + ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
82737 + void *buf, size_t len, int write);
82738
82739 /* Called by the /proc/PID/maps code to ask the vma whether it
82740 * has a special name. Returning non-NULL will also cause this
82741 @@ -275,6 +280,7 @@ struct vm_operations_struct {
82742 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
82743 unsigned long size, pgoff_t pgoff);
82744 };
82745 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
82746
82747 struct mmu_gather;
82748 struct inode;
82749 @@ -1165,8 +1171,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
82750 unsigned long *pfn);
82751 int follow_phys(struct vm_area_struct *vma, unsigned long address,
82752 unsigned int flags, unsigned long *prot, resource_size_t *phys);
82753 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82754 - void *buf, int len, int write);
82755 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82756 + void *buf, size_t len, int write);
82757
82758 static inline void unmap_shared_mapping_range(struct address_space *mapping,
82759 loff_t const holebegin, loff_t const holelen)
82760 @@ -1206,9 +1212,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
82761 }
82762 #endif
82763
82764 -extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
82765 -extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
82766 - void *buf, int len, int write);
82767 +extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
82768 +extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
82769 + void *buf, size_t len, int write);
82770
82771 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
82772 unsigned long start, unsigned long nr_pages,
82773 @@ -1240,34 +1246,6 @@ int set_page_dirty_lock(struct page *page);
82774 int clear_page_dirty_for_io(struct page *page);
82775 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
82776
82777 -/* Is the vma a continuation of the stack vma above it? */
82778 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
82779 -{
82780 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
82781 -}
82782 -
82783 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
82784 - unsigned long addr)
82785 -{
82786 - return (vma->vm_flags & VM_GROWSDOWN) &&
82787 - (vma->vm_start == addr) &&
82788 - !vma_growsdown(vma->vm_prev, addr);
82789 -}
82790 -
82791 -/* Is the vma a continuation of the stack vma below it? */
82792 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
82793 -{
82794 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
82795 -}
82796 -
82797 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
82798 - unsigned long addr)
82799 -{
82800 - return (vma->vm_flags & VM_GROWSUP) &&
82801 - (vma->vm_end == addr) &&
82802 - !vma_growsup(vma->vm_next, addr);
82803 -}
82804 -
82805 extern struct task_struct *task_of_stack(struct task_struct *task,
82806 struct vm_area_struct *vma, bool in_group);
82807
82808 @@ -1385,8 +1363,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
82809 {
82810 return 0;
82811 }
82812 +
82813 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
82814 + unsigned long address)
82815 +{
82816 + return 0;
82817 +}
82818 #else
82819 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82820 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82821 #endif
82822
82823 #ifdef __PAGETABLE_PMD_FOLDED
82824 @@ -1395,8 +1380,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
82825 {
82826 return 0;
82827 }
82828 +
82829 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
82830 + unsigned long address)
82831 +{
82832 + return 0;
82833 +}
82834 #else
82835 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
82836 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
82837 #endif
82838
82839 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
82840 @@ -1414,11 +1406,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
82841 NULL: pud_offset(pgd, address);
82842 }
82843
82844 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
82845 +{
82846 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
82847 + NULL: pud_offset(pgd, address);
82848 +}
82849 +
82850 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
82851 {
82852 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
82853 NULL: pmd_offset(pud, address);
82854 }
82855 +
82856 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
82857 +{
82858 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
82859 + NULL: pmd_offset(pud, address);
82860 +}
82861 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
82862
82863 #if USE_SPLIT_PTE_PTLOCKS
82864 @@ -1801,12 +1805,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
82865 bool *need_rmap_locks);
82866 extern void exit_mmap(struct mm_struct *);
82867
82868 +#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
82869 +extern void gr_learn_resource(const struct task_struct *task, const int res,
82870 + const unsigned long wanted, const int gt);
82871 +#else
82872 +static inline void gr_learn_resource(const struct task_struct *task, const int res,
82873 + const unsigned long wanted, const int gt)
82874 +{
82875 +}
82876 +#endif
82877 +
82878 static inline int check_data_rlimit(unsigned long rlim,
82879 unsigned long new,
82880 unsigned long start,
82881 unsigned long end_data,
82882 unsigned long start_data)
82883 {
82884 + gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
82885 if (rlim < RLIM_INFINITY) {
82886 if (((new - start) + (end_data - start_data)) > rlim)
82887 return -ENOSPC;
82888 @@ -1831,7 +1846,7 @@ extern int install_special_mapping(struct mm_struct *mm,
82889 unsigned long addr, unsigned long len,
82890 unsigned long flags, struct page **pages);
82891
82892 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
82893 +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
82894
82895 extern unsigned long mmap_region(struct file *file, unsigned long addr,
82896 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
82897 @@ -1839,6 +1854,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
82898 unsigned long len, unsigned long prot, unsigned long flags,
82899 unsigned long pgoff, unsigned long *populate);
82900 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
82901 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
82902
82903 #ifdef CONFIG_MMU
82904 extern int __mm_populate(unsigned long addr, unsigned long len,
82905 @@ -1867,10 +1883,11 @@ struct vm_unmapped_area_info {
82906 unsigned long high_limit;
82907 unsigned long align_mask;
82908 unsigned long align_offset;
82909 + unsigned long threadstack_offset;
82910 };
82911
82912 -extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
82913 -extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
82914 +extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
82915 +extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
82916
82917 /*
82918 * Search for an unmapped address range.
82919 @@ -1882,7 +1899,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
82920 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
82921 */
82922 static inline unsigned long
82923 -vm_unmapped_area(struct vm_unmapped_area_info *info)
82924 +vm_unmapped_area(const struct vm_unmapped_area_info *info)
82925 {
82926 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
82927 return unmapped_area(info);
82928 @@ -1944,6 +1961,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
82929 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
82930 struct vm_area_struct **pprev);
82931
82932 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
82933 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
82934 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
82935 +
82936 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
82937 NULL if none. Assume start_addr < end_addr. */
82938 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
82939 @@ -1973,10 +1994,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
82940 }
82941
82942 #ifdef CONFIG_MMU
82943 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
82944 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
82945 void vma_set_page_prot(struct vm_area_struct *vma);
82946 #else
82947 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
82948 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
82949 {
82950 return __pgprot(0);
82951 }
82952 @@ -2038,6 +2059,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
82953 static inline void vm_stat_account(struct mm_struct *mm,
82954 unsigned long flags, struct file *file, long pages)
82955 {
82956 +
82957 +#ifdef CONFIG_PAX_RANDMMAP
82958 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
82959 +#endif
82960 +
82961 mm->total_vm += pages;
82962 }
82963 #endif /* CONFIG_PROC_FS */
82964 @@ -2126,7 +2152,7 @@ extern int unpoison_memory(unsigned long pfn);
82965 extern int sysctl_memory_failure_early_kill;
82966 extern int sysctl_memory_failure_recovery;
82967 extern void shake_page(struct page *p, int access);
82968 -extern atomic_long_t num_poisoned_pages;
82969 +extern atomic_long_unchecked_t num_poisoned_pages;
82970 extern int soft_offline_page(struct page *page, int flags);
82971
82972 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
82973 @@ -2161,5 +2187,11 @@ void __init setup_nr_node_ids(void);
82974 static inline void setup_nr_node_ids(void) {}
82975 #endif
82976
82977 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
82978 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
82979 +#else
82980 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
82981 +#endif
82982 +
82983 #endif /* __KERNEL__ */
82984 #endif /* _LINUX_MM_H */
82985 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
82986 index 6e0b286..90d9c0d 100644
82987 --- a/include/linux/mm_types.h
82988 +++ b/include/linux/mm_types.h
82989 @@ -308,7 +308,9 @@ struct vm_area_struct {
82990 #ifdef CONFIG_NUMA
82991 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
82992 #endif
82993 -};
82994 +
82995 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
82996 +} __randomize_layout;
82997
82998 struct core_thread {
82999 struct task_struct *task;
83000 @@ -454,7 +456,25 @@ struct mm_struct {
83001 bool tlb_flush_pending;
83002 #endif
83003 struct uprobes_state uprobes_state;
83004 -};
83005 +
83006 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
83007 + unsigned long pax_flags;
83008 +#endif
83009 +
83010 +#ifdef CONFIG_PAX_DLRESOLVE
83011 + unsigned long call_dl_resolve;
83012 +#endif
83013 +
83014 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
83015 + unsigned long call_syscall;
83016 +#endif
83017 +
83018 +#ifdef CONFIG_PAX_ASLR
83019 + unsigned long delta_mmap; /* randomized offset */
83020 + unsigned long delta_stack; /* randomized offset */
83021 +#endif
83022 +
83023 +} __randomize_layout;
83024
83025 static inline void mm_init_cpumask(struct mm_struct *mm)
83026 {
83027 diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
83028 index c5d5278..f0b68c8 100644
83029 --- a/include/linux/mmiotrace.h
83030 +++ b/include/linux/mmiotrace.h
83031 @@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
83032 /* Called from ioremap.c */
83033 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
83034 void __iomem *addr);
83035 -extern void mmiotrace_iounmap(volatile void __iomem *addr);
83036 +extern void mmiotrace_iounmap(const volatile void __iomem *addr);
83037
83038 /* For anyone to insert markers. Remember trailing newline. */
83039 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
83040 @@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
83041 {
83042 }
83043
83044 -static inline void mmiotrace_iounmap(volatile void __iomem *addr)
83045 +static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
83046 {
83047 }
83048
83049 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
83050 index ffe66e3..b310722 100644
83051 --- a/include/linux/mmzone.h
83052 +++ b/include/linux/mmzone.h
83053 @@ -527,7 +527,7 @@ struct zone {
83054
83055 ZONE_PADDING(_pad3_)
83056 /* Zone statistics */
83057 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83058 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83059 } ____cacheline_internodealigned_in_smp;
83060
83061 enum zone_flags {
83062 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
83063 index 44eeef0..a92d3f9 100644
83064 --- a/include/linux/mod_devicetable.h
83065 +++ b/include/linux/mod_devicetable.h
83066 @@ -139,7 +139,7 @@ struct usb_device_id {
83067 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
83068 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
83069
83070 -#define HID_ANY_ID (~0)
83071 +#define HID_ANY_ID (~0U)
83072 #define HID_BUS_ANY 0xffff
83073 #define HID_GROUP_ANY 0x0000
83074
83075 @@ -475,7 +475,7 @@ struct dmi_system_id {
83076 const char *ident;
83077 struct dmi_strmatch matches[4];
83078 void *driver_data;
83079 -};
83080 +} __do_const;
83081 /*
83082 * struct dmi_device_id appears during expansion of
83083 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
83084 diff --git a/include/linux/module.h b/include/linux/module.h
83085 index 71f282a..b2387e2 100644
83086 --- a/include/linux/module.h
83087 +++ b/include/linux/module.h
83088 @@ -17,9 +17,11 @@
83089 #include <linux/moduleparam.h>
83090 #include <linux/jump_label.h>
83091 #include <linux/export.h>
83092 +#include <linux/fs.h>
83093
83094 #include <linux/percpu.h>
83095 #include <asm/module.h>
83096 +#include <asm/pgtable.h>
83097
83098 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
83099 #define MODULE_SIG_STRING "~Module signature appended~\n"
83100 @@ -42,7 +44,7 @@ struct module_kobject {
83101 struct kobject *drivers_dir;
83102 struct module_param_attrs *mp;
83103 struct completion *kobj_completion;
83104 -};
83105 +} __randomize_layout;
83106
83107 struct module_attribute {
83108 struct attribute attr;
83109 @@ -54,12 +56,13 @@ struct module_attribute {
83110 int (*test)(struct module *);
83111 void (*free)(struct module *);
83112 };
83113 +typedef struct module_attribute __no_const module_attribute_no_const;
83114
83115 struct module_version_attribute {
83116 struct module_attribute mattr;
83117 const char *module_name;
83118 const char *version;
83119 -} __attribute__ ((__aligned__(sizeof(void *))));
83120 +} __do_const __attribute__ ((__aligned__(sizeof(void *))));
83121
83122 extern ssize_t __modver_version_show(struct module_attribute *,
83123 struct module_kobject *, char *);
83124 @@ -235,7 +238,7 @@ struct module {
83125
83126 /* Sysfs stuff. */
83127 struct module_kobject mkobj;
83128 - struct module_attribute *modinfo_attrs;
83129 + module_attribute_no_const *modinfo_attrs;
83130 const char *version;
83131 const char *srcversion;
83132 struct kobject *holders_dir;
83133 @@ -284,19 +287,16 @@ struct module {
83134 int (*init)(void);
83135
83136 /* If this is non-NULL, vfree after init() returns */
83137 - void *module_init;
83138 + void *module_init_rx, *module_init_rw;
83139
83140 /* Here is the actual code + data, vfree'd on unload. */
83141 - void *module_core;
83142 + void *module_core_rx, *module_core_rw;
83143
83144 /* Here are the sizes of the init and core sections */
83145 - unsigned int init_size, core_size;
83146 + unsigned int init_size_rw, core_size_rw;
83147
83148 /* The size of the executable code in each section. */
83149 - unsigned int init_text_size, core_text_size;
83150 -
83151 - /* Size of RO sections of the module (text+rodata) */
83152 - unsigned int init_ro_size, core_ro_size;
83153 + unsigned int init_size_rx, core_size_rx;
83154
83155 /* Arch-specific module values */
83156 struct mod_arch_specific arch;
83157 @@ -352,6 +352,10 @@ struct module {
83158 #ifdef CONFIG_EVENT_TRACING
83159 struct ftrace_event_call **trace_events;
83160 unsigned int num_trace_events;
83161 + struct file_operations trace_id;
83162 + struct file_operations trace_enable;
83163 + struct file_operations trace_format;
83164 + struct file_operations trace_filter;
83165 #endif
83166 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
83167 unsigned int num_ftrace_callsites;
83168 @@ -375,7 +379,7 @@ struct module {
83169 ctor_fn_t *ctors;
83170 unsigned int num_ctors;
83171 #endif
83172 -};
83173 +} __randomize_layout;
83174 #ifndef MODULE_ARCH_INIT
83175 #define MODULE_ARCH_INIT {}
83176 #endif
83177 @@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
83178 bool is_module_percpu_address(unsigned long addr);
83179 bool is_module_text_address(unsigned long addr);
83180
83181 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
83182 +{
83183 +
83184 +#ifdef CONFIG_PAX_KERNEXEC
83185 + if (ktla_ktva(addr) >= (unsigned long)start &&
83186 + ktla_ktva(addr) < (unsigned long)start + size)
83187 + return 1;
83188 +#endif
83189 +
83190 + return ((void *)addr >= start && (void *)addr < start + size);
83191 +}
83192 +
83193 +static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
83194 +{
83195 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
83196 +}
83197 +
83198 +static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
83199 +{
83200 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
83201 +}
83202 +
83203 +static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
83204 +{
83205 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
83206 +}
83207 +
83208 +static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
83209 +{
83210 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
83211 +}
83212 +
83213 static inline bool within_module_core(unsigned long addr,
83214 const struct module *mod)
83215 {
83216 - return (unsigned long)mod->module_core <= addr &&
83217 - addr < (unsigned long)mod->module_core + mod->core_size;
83218 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
83219 }
83220
83221 static inline bool within_module_init(unsigned long addr,
83222 const struct module *mod)
83223 {
83224 - return (unsigned long)mod->module_init <= addr &&
83225 - addr < (unsigned long)mod->module_init + mod->init_size;
83226 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
83227 }
83228
83229 static inline bool within_module(unsigned long addr, const struct module *mod)
83230 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
83231 index 7eeb9bb..68f37e0 100644
83232 --- a/include/linux/moduleloader.h
83233 +++ b/include/linux/moduleloader.h
83234 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
83235 sections. Returns NULL on failure. */
83236 void *module_alloc(unsigned long size);
83237
83238 +#ifdef CONFIG_PAX_KERNEXEC
83239 +void *module_alloc_exec(unsigned long size);
83240 +#else
83241 +#define module_alloc_exec(x) module_alloc(x)
83242 +#endif
83243 +
83244 /* Free memory returned from module_alloc. */
83245 void module_free(struct module *mod, void *module_region);
83246
83247 +#ifdef CONFIG_PAX_KERNEXEC
83248 +void module_free_exec(struct module *mod, void *module_region);
83249 +#else
83250 +#define module_free_exec(x, y) module_free((x), (y))
83251 +#endif
83252 +
83253 /*
83254 * Apply the given relocation to the (simplified) ELF. Return -error
83255 * or 0.
83256 @@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
83257 unsigned int relsec,
83258 struct module *me)
83259 {
83260 +#ifdef CONFIG_MODULES
83261 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83262 module_name(me));
83263 +#endif
83264 return -ENOEXEC;
83265 }
83266 #endif
83267 @@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
83268 unsigned int relsec,
83269 struct module *me)
83270 {
83271 +#ifdef CONFIG_MODULES
83272 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83273 module_name(me));
83274 +#endif
83275 return -ENOEXEC;
83276 }
83277 #endif
83278 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
83279 index 1c9effa..1160bdd 100644
83280 --- a/include/linux/moduleparam.h
83281 +++ b/include/linux/moduleparam.h
83282 @@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
83283 * @len is usually just sizeof(string).
83284 */
83285 #define module_param_string(name, string, len, perm) \
83286 - static const struct kparam_string __param_string_##name \
83287 + static const struct kparam_string __param_string_##name __used \
83288 = { len, string }; \
83289 __module_param_call(MODULE_PARAM_PREFIX, name, \
83290 &param_ops_string, \
83291 @@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
83292 */
83293 #define module_param_array_named(name, array, type, nump, perm) \
83294 param_check_##type(name, &(array)[0]); \
83295 - static const struct kparam_array __param_arr_##name \
83296 + static const struct kparam_array __param_arr_##name __used \
83297 = { .max = ARRAY_SIZE(array), .num = nump, \
83298 .ops = &param_ops_##type, \
83299 .elemsize = sizeof(array[0]), .elem = array }; \
83300 diff --git a/include/linux/mount.h b/include/linux/mount.h
83301 index c2c561d..a5f2a8c 100644
83302 --- a/include/linux/mount.h
83303 +++ b/include/linux/mount.h
83304 @@ -66,7 +66,7 @@ struct vfsmount {
83305 struct dentry *mnt_root; /* root of the mounted tree */
83306 struct super_block *mnt_sb; /* pointer to superblock */
83307 int mnt_flags;
83308 -};
83309 +} __randomize_layout;
83310
83311 struct file; /* forward dec */
83312 struct path;
83313 diff --git a/include/linux/namei.h b/include/linux/namei.h
83314 index 492de72..1bddcd4 100644
83315 --- a/include/linux/namei.h
83316 +++ b/include/linux/namei.h
83317 @@ -19,7 +19,7 @@ struct nameidata {
83318 unsigned seq, m_seq;
83319 int last_type;
83320 unsigned depth;
83321 - char *saved_names[MAX_NESTED_LINKS + 1];
83322 + const char *saved_names[MAX_NESTED_LINKS + 1];
83323 };
83324
83325 /*
83326 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
83327
83328 extern void nd_jump_link(struct nameidata *nd, struct path *path);
83329
83330 -static inline void nd_set_link(struct nameidata *nd, char *path)
83331 +static inline void nd_set_link(struct nameidata *nd, const char *path)
83332 {
83333 nd->saved_names[nd->depth] = path;
83334 }
83335
83336 -static inline char *nd_get_link(struct nameidata *nd)
83337 +static inline const char *nd_get_link(const struct nameidata *nd)
83338 {
83339 return nd->saved_names[nd->depth];
83340 }
83341 diff --git a/include/linux/net.h b/include/linux/net.h
83342 index 17d8339..81656c0 100644
83343 --- a/include/linux/net.h
83344 +++ b/include/linux/net.h
83345 @@ -192,7 +192,7 @@ struct net_proto_family {
83346 int (*create)(struct net *net, struct socket *sock,
83347 int protocol, int kern);
83348 struct module *owner;
83349 -};
83350 +} __do_const;
83351
83352 struct iovec;
83353 struct kvec;
83354 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
83355 index 74fd5d3..86a1e4f 100644
83356 --- a/include/linux/netdevice.h
83357 +++ b/include/linux/netdevice.h
83358 @@ -1156,6 +1156,7 @@ struct net_device_ops {
83359 bool (*ndo_gso_check) (struct sk_buff *skb,
83360 struct net_device *dev);
83361 };
83362 +typedef struct net_device_ops __no_const net_device_ops_no_const;
83363
83364 /**
83365 * enum net_device_priv_flags - &struct net_device priv_flags
83366 @@ -1498,10 +1499,10 @@ struct net_device {
83367
83368 struct net_device_stats stats;
83369
83370 - atomic_long_t rx_dropped;
83371 - atomic_long_t tx_dropped;
83372 + atomic_long_unchecked_t rx_dropped;
83373 + atomic_long_unchecked_t tx_dropped;
83374
83375 - atomic_t carrier_changes;
83376 + atomic_unchecked_t carrier_changes;
83377
83378 #ifdef CONFIG_WIRELESS_EXT
83379 const struct iw_handler_def * wireless_handlers;
83380 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
83381 index 2517ece..0bbfcfb 100644
83382 --- a/include/linux/netfilter.h
83383 +++ b/include/linux/netfilter.h
83384 @@ -85,7 +85,7 @@ struct nf_sockopt_ops {
83385 #endif
83386 /* Use the module struct to lock set/get code in place */
83387 struct module *owner;
83388 -};
83389 +} __do_const;
83390
83391 /* Function to register/unregister hook points. */
83392 int nf_register_hook(struct nf_hook_ops *reg);
83393 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
83394 index e955d47..04a5338 100644
83395 --- a/include/linux/netfilter/nfnetlink.h
83396 +++ b/include/linux/netfilter/nfnetlink.h
83397 @@ -19,7 +19,7 @@ struct nfnl_callback {
83398 const struct nlattr * const cda[]);
83399 const struct nla_policy *policy; /* netlink attribute policy */
83400 const u_int16_t attr_count; /* number of nlattr's */
83401 -};
83402 +} __do_const;
83403
83404 struct nfnetlink_subsystem {
83405 const char *name;
83406 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
83407 new file mode 100644
83408 index 0000000..33f4af8
83409 --- /dev/null
83410 +++ b/include/linux/netfilter/xt_gradm.h
83411 @@ -0,0 +1,9 @@
83412 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
83413 +#define _LINUX_NETFILTER_XT_GRADM_H 1
83414 +
83415 +struct xt_gradm_mtinfo {
83416 + __u16 flags;
83417 + __u16 invflags;
83418 +};
83419 +
83420 +#endif
83421 diff --git a/include/linux/nls.h b/include/linux/nls.h
83422 index 520681b..2b7fabb 100644
83423 --- a/include/linux/nls.h
83424 +++ b/include/linux/nls.h
83425 @@ -31,7 +31,7 @@ struct nls_table {
83426 const unsigned char *charset2upper;
83427 struct module *owner;
83428 struct nls_table *next;
83429 -};
83430 +} __do_const;
83431
83432 /* this value hold the maximum octet of charset */
83433 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
83434 @@ -46,7 +46,7 @@ enum utf16_endian {
83435 /* nls_base.c */
83436 extern int __register_nls(struct nls_table *, struct module *);
83437 extern int unregister_nls(struct nls_table *);
83438 -extern struct nls_table *load_nls(char *);
83439 +extern struct nls_table *load_nls(const char *);
83440 extern void unload_nls(struct nls_table *);
83441 extern struct nls_table *load_nls_default(void);
83442 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
83443 diff --git a/include/linux/notifier.h b/include/linux/notifier.h
83444 index d14a4c3..a078786 100644
83445 --- a/include/linux/notifier.h
83446 +++ b/include/linux/notifier.h
83447 @@ -54,7 +54,8 @@ struct notifier_block {
83448 notifier_fn_t notifier_call;
83449 struct notifier_block __rcu *next;
83450 int priority;
83451 -};
83452 +} __do_const;
83453 +typedef struct notifier_block __no_const notifier_block_no_const;
83454
83455 struct atomic_notifier_head {
83456 spinlock_t lock;
83457 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
83458 index b2a0f15..4d7da32 100644
83459 --- a/include/linux/oprofile.h
83460 +++ b/include/linux/oprofile.h
83461 @@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
83462 int oprofilefs_create_ro_ulong(struct dentry * root,
83463 char const * name, ulong * val);
83464
83465 -/** Create a file for read-only access to an atomic_t. */
83466 +/** Create a file for read-only access to an atomic_unchecked_t. */
83467 int oprofilefs_create_ro_atomic(struct dentry * root,
83468 - char const * name, atomic_t * val);
83469 + char const * name, atomic_unchecked_t * val);
83470
83471 /** create a directory */
83472 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
83473 diff --git a/include/linux/padata.h b/include/linux/padata.h
83474 index 4386946..f50c615 100644
83475 --- a/include/linux/padata.h
83476 +++ b/include/linux/padata.h
83477 @@ -129,7 +129,7 @@ struct parallel_data {
83478 struct padata_serial_queue __percpu *squeue;
83479 atomic_t reorder_objects;
83480 atomic_t refcnt;
83481 - atomic_t seq_nr;
83482 + atomic_unchecked_t seq_nr;
83483 struct padata_cpumask cpumask;
83484 spinlock_t lock ____cacheline_aligned;
83485 unsigned int processed;
83486 diff --git a/include/linux/path.h b/include/linux/path.h
83487 index d137218..be0c176 100644
83488 --- a/include/linux/path.h
83489 +++ b/include/linux/path.h
83490 @@ -1,13 +1,15 @@
83491 #ifndef _LINUX_PATH_H
83492 #define _LINUX_PATH_H
83493
83494 +#include <linux/compiler.h>
83495 +
83496 struct dentry;
83497 struct vfsmount;
83498
83499 struct path {
83500 struct vfsmount *mnt;
83501 struct dentry *dentry;
83502 -};
83503 +} __randomize_layout;
83504
83505 extern void path_get(const struct path *);
83506 extern void path_put(const struct path *);
83507 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
83508 index 2706ee9..e691f7c 100644
83509 --- a/include/linux/pci_hotplug.h
83510 +++ b/include/linux/pci_hotplug.h
83511 @@ -71,7 +71,8 @@ struct hotplug_slot_ops {
83512 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
83513 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
83514 int (*reset_slot) (struct hotplug_slot *slot, int probe);
83515 -};
83516 +} __do_const;
83517 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
83518
83519 /**
83520 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
83521 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
83522 index 893a0d0..d5f996e 100644
83523 --- a/include/linux/perf_event.h
83524 +++ b/include/linux/perf_event.h
83525 @@ -341,8 +341,8 @@ struct perf_event {
83526
83527 enum perf_event_active_state state;
83528 unsigned int attach_state;
83529 - local64_t count;
83530 - atomic64_t child_count;
83531 + local64_t count; /* PaX: fix it one day */
83532 + atomic64_unchecked_t child_count;
83533
83534 /*
83535 * These are the total time in nanoseconds that the event
83536 @@ -393,8 +393,8 @@ struct perf_event {
83537 * These accumulate total time (in nanoseconds) that children
83538 * events have been enabled and running, respectively.
83539 */
83540 - atomic64_t child_total_time_enabled;
83541 - atomic64_t child_total_time_running;
83542 + atomic64_unchecked_t child_total_time_enabled;
83543 + atomic64_unchecked_t child_total_time_running;
83544
83545 /*
83546 * Protect attach/detach and child_list:
83547 @@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
83548 entry->ip[entry->nr++] = ip;
83549 }
83550
83551 -extern int sysctl_perf_event_paranoid;
83552 +extern int sysctl_perf_event_legitimately_concerned;
83553 extern int sysctl_perf_event_mlock;
83554 extern int sysctl_perf_event_sample_rate;
83555 extern int sysctl_perf_cpu_time_max_percent;
83556 @@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
83557 loff_t *ppos);
83558
83559
83560 +static inline bool perf_paranoid_any(void)
83561 +{
83562 + return sysctl_perf_event_legitimately_concerned > 2;
83563 +}
83564 +
83565 static inline bool perf_paranoid_tracepoint_raw(void)
83566 {
83567 - return sysctl_perf_event_paranoid > -1;
83568 + return sysctl_perf_event_legitimately_concerned > -1;
83569 }
83570
83571 static inline bool perf_paranoid_cpu(void)
83572 {
83573 - return sysctl_perf_event_paranoid > 0;
83574 + return sysctl_perf_event_legitimately_concerned > 0;
83575 }
83576
83577 static inline bool perf_paranoid_kernel(void)
83578 {
83579 - return sysctl_perf_event_paranoid > 1;
83580 + return sysctl_perf_event_legitimately_concerned > 1;
83581 }
83582
83583 extern void perf_event_init(void);
83584 @@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
83585 struct device_attribute attr;
83586 u64 id;
83587 const char *event_str;
83588 -};
83589 +} __do_const;
83590
83591 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
83592 static struct perf_pmu_events_attr _var = { \
83593 diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
83594 index 1997ffc..4f1f44d 100644
83595 --- a/include/linux/pid_namespace.h
83596 +++ b/include/linux/pid_namespace.h
83597 @@ -44,7 +44,7 @@ struct pid_namespace {
83598 int hide_pid;
83599 int reboot; /* group exit code if this pidns was rebooted */
83600 unsigned int proc_inum;
83601 -};
83602 +} __randomize_layout;
83603
83604 extern struct pid_namespace init_pid_ns;
83605
83606 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
83607 index eb8b8ac..62649e1 100644
83608 --- a/include/linux/pipe_fs_i.h
83609 +++ b/include/linux/pipe_fs_i.h
83610 @@ -47,10 +47,10 @@ struct pipe_inode_info {
83611 struct mutex mutex;
83612 wait_queue_head_t wait;
83613 unsigned int nrbufs, curbuf, buffers;
83614 - unsigned int readers;
83615 - unsigned int writers;
83616 - unsigned int files;
83617 - unsigned int waiting_writers;
83618 + atomic_t readers;
83619 + atomic_t writers;
83620 + atomic_t files;
83621 + atomic_t waiting_writers;
83622 unsigned int r_counter;
83623 unsigned int w_counter;
83624 struct page *tmp_page;
83625 diff --git a/include/linux/pm.h b/include/linux/pm.h
83626 index 383fd68..7a11504 100644
83627 --- a/include/linux/pm.h
83628 +++ b/include/linux/pm.h
83629 @@ -621,6 +621,7 @@ struct dev_pm_domain {
83630 struct dev_pm_ops ops;
83631 void (*detach)(struct device *dev, bool power_off);
83632 };
83633 +typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
83634
83635 /*
83636 * The PM_EVENT_ messages are also used by drivers implementing the legacy
83637 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
83638 index 2e0e06d..824cc9b 100644
83639 --- a/include/linux/pm_domain.h
83640 +++ b/include/linux/pm_domain.h
83641 @@ -36,11 +36,11 @@ struct gpd_dev_ops {
83642 int (*save_state)(struct device *dev);
83643 int (*restore_state)(struct device *dev);
83644 bool (*active_wakeup)(struct device *dev);
83645 -};
83646 +} __no_const;
83647
83648 struct gpd_cpuidle_data {
83649 unsigned int saved_exit_latency;
83650 - struct cpuidle_state *idle_state;
83651 + cpuidle_state_no_const *idle_state;
83652 };
83653
83654 struct generic_pm_domain {
83655 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
83656 index 367f49b..d2f5a14 100644
83657 --- a/include/linux/pm_runtime.h
83658 +++ b/include/linux/pm_runtime.h
83659 @@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
83660
83661 static inline void pm_runtime_mark_last_busy(struct device *dev)
83662 {
83663 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
83664 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
83665 }
83666
83667 #else /* !CONFIG_PM_RUNTIME */
83668 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
83669 index 195aafc..49a7bc2 100644
83670 --- a/include/linux/pnp.h
83671 +++ b/include/linux/pnp.h
83672 @@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
83673 struct pnp_fixup {
83674 char id[7];
83675 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
83676 -};
83677 +} __do_const;
83678
83679 /* config parameters */
83680 #define PNP_CONFIG_NORMAL 0x0001
83681 diff --git a/include/linux/poison.h b/include/linux/poison.h
83682 index 2110a81..13a11bb 100644
83683 --- a/include/linux/poison.h
83684 +++ b/include/linux/poison.h
83685 @@ -19,8 +19,8 @@
83686 * under normal circumstances, used to verify that nobody uses
83687 * non-initialized list entries.
83688 */
83689 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
83690 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
83691 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
83692 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
83693
83694 /********** include/linux/timer.h **********/
83695 /*
83696 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
83697 index d8b187c3..9a9257a 100644
83698 --- a/include/linux/power/smartreflex.h
83699 +++ b/include/linux/power/smartreflex.h
83700 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
83701 int (*notify)(struct omap_sr *sr, u32 status);
83702 u8 notify_flags;
83703 u8 class_type;
83704 -};
83705 +} __do_const;
83706
83707 /**
83708 * struct omap_sr_nvalue_table - Smartreflex n-target value info
83709 diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
83710 index 4ea1d37..80f4b33 100644
83711 --- a/include/linux/ppp-comp.h
83712 +++ b/include/linux/ppp-comp.h
83713 @@ -84,7 +84,7 @@ struct compressor {
83714 struct module *owner;
83715 /* Extra skb space needed by the compressor algorithm */
83716 unsigned int comp_extra;
83717 -};
83718 +} __do_const;
83719
83720 /*
83721 * The return value from decompress routine is the length of the
83722 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
83723 index de83b4e..c4b997d 100644
83724 --- a/include/linux/preempt.h
83725 +++ b/include/linux/preempt.h
83726 @@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
83727 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
83728 #endif
83729
83730 +#define raw_preempt_count_add(val) __preempt_count_add(val)
83731 +#define raw_preempt_count_sub(val) __preempt_count_sub(val)
83732 +
83733 #define __preempt_count_inc() __preempt_count_add(1)
83734 #define __preempt_count_dec() __preempt_count_sub(1)
83735
83736 #define preempt_count_inc() preempt_count_add(1)
83737 +#define raw_preempt_count_inc() raw_preempt_count_add(1)
83738 #define preempt_count_dec() preempt_count_sub(1)
83739 +#define raw_preempt_count_dec() raw_preempt_count_sub(1)
83740
83741 #ifdef CONFIG_PREEMPT_COUNT
83742
83743 @@ -41,6 +46,12 @@ do { \
83744 barrier(); \
83745 } while (0)
83746
83747 +#define raw_preempt_disable() \
83748 +do { \
83749 + raw_preempt_count_inc(); \
83750 + barrier(); \
83751 +} while (0)
83752 +
83753 #define sched_preempt_enable_no_resched() \
83754 do { \
83755 barrier(); \
83756 @@ -49,6 +60,12 @@ do { \
83757
83758 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
83759
83760 +#define raw_preempt_enable_no_resched() \
83761 +do { \
83762 + barrier(); \
83763 + raw_preempt_count_dec(); \
83764 +} while (0)
83765 +
83766 #ifdef CONFIG_PREEMPT
83767 #define preempt_enable() \
83768 do { \
83769 @@ -113,8 +130,10 @@ do { \
83770 * region.
83771 */
83772 #define preempt_disable() barrier()
83773 +#define raw_preempt_disable() barrier()
83774 #define sched_preempt_enable_no_resched() barrier()
83775 #define preempt_enable_no_resched() barrier()
83776 +#define raw_preempt_enable_no_resched() barrier()
83777 #define preempt_enable() barrier()
83778 #define preempt_check_resched() do { } while (0)
83779
83780 @@ -128,11 +147,13 @@ do { \
83781 /*
83782 * Modules have no business playing preemption tricks.
83783 */
83784 +#ifndef CONFIG_PAX_KERNEXEC
83785 #undef sched_preempt_enable_no_resched
83786 #undef preempt_enable_no_resched
83787 #undef preempt_enable_no_resched_notrace
83788 #undef preempt_check_resched
83789 #endif
83790 +#endif
83791
83792 #define preempt_set_need_resched() \
83793 do { \
83794 diff --git a/include/linux/printk.h b/include/linux/printk.h
83795 index d78125f..7f36596 100644
83796 --- a/include/linux/printk.h
83797 +++ b/include/linux/printk.h
83798 @@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
83799 void early_printk(const char *s, ...) { }
83800 #endif
83801
83802 +extern int kptr_restrict;
83803 +
83804 #ifdef CONFIG_PRINTK
83805 asmlinkage __printf(5, 0)
83806 int vprintk_emit(int facility, int level,
83807 @@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
83808
83809 extern int printk_delay_msec;
83810 extern int dmesg_restrict;
83811 -extern int kptr_restrict;
83812
83813 extern void wake_up_klogd(void);
83814
83815 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
83816 index b97bf2e..f14c92d4 100644
83817 --- a/include/linux/proc_fs.h
83818 +++ b/include/linux/proc_fs.h
83819 @@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
83820 extern struct proc_dir_entry *proc_symlink(const char *,
83821 struct proc_dir_entry *, const char *);
83822 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
83823 +extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
83824 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
83825 struct proc_dir_entry *, void *);
83826 +extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
83827 + struct proc_dir_entry *, void *);
83828 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
83829 struct proc_dir_entry *);
83830
83831 @@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
83832 return proc_create_data(name, mode, parent, proc_fops, NULL);
83833 }
83834
83835 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
83836 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
83837 +{
83838 +#ifdef CONFIG_GRKERNSEC_PROC_USER
83839 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
83840 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
83841 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
83842 +#else
83843 + return proc_create_data(name, mode, parent, proc_fops, NULL);
83844 +#endif
83845 +}
83846 +
83847 +
83848 extern void proc_set_size(struct proc_dir_entry *, loff_t);
83849 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
83850 extern void *PDE_DATA(const struct inode *);
83851 @@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
83852 struct proc_dir_entry *parent,const char *dest) { return NULL;}
83853 static inline struct proc_dir_entry *proc_mkdir(const char *name,
83854 struct proc_dir_entry *parent) {return NULL;}
83855 +static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
83856 + struct proc_dir_entry *parent) { return NULL; }
83857 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
83858 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83859 +static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
83860 + umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83861 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
83862 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
83863 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
83864 @@ -79,7 +99,7 @@ struct net;
83865 static inline struct proc_dir_entry *proc_net_mkdir(
83866 struct net *net, const char *name, struct proc_dir_entry *parent)
83867 {
83868 - return proc_mkdir_data(name, 0, parent, net);
83869 + return proc_mkdir_data_restrict(name, 0, parent, net);
83870 }
83871
83872 #endif /* _LINUX_PROC_FS_H */
83873 diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
83874 index 34a1e10..70f6bde 100644
83875 --- a/include/linux/proc_ns.h
83876 +++ b/include/linux/proc_ns.h
83877 @@ -14,7 +14,7 @@ struct proc_ns_operations {
83878 void (*put)(void *ns);
83879 int (*install)(struct nsproxy *nsproxy, void *ns);
83880 unsigned int (*inum)(void *ns);
83881 -};
83882 +} __do_const __randomize_layout;
83883
83884 struct proc_ns {
83885 void *ns;
83886 diff --git a/include/linux/quota.h b/include/linux/quota.h
83887 index 80d345a..9e89a9a 100644
83888 --- a/include/linux/quota.h
83889 +++ b/include/linux/quota.h
83890 @@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
83891
83892 extern bool qid_eq(struct kqid left, struct kqid right);
83893 extern bool qid_lt(struct kqid left, struct kqid right);
83894 -extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
83895 +extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
83896 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
83897 extern bool qid_valid(struct kqid qid);
83898
83899 diff --git a/include/linux/random.h b/include/linux/random.h
83900 index b05856e..0a9f14e 100644
83901 --- a/include/linux/random.h
83902 +++ b/include/linux/random.h
83903 @@ -9,9 +9,19 @@
83904 #include <uapi/linux/random.h>
83905
83906 extern void add_device_randomness(const void *, unsigned int);
83907 +
83908 +static inline void add_latent_entropy(void)
83909 +{
83910 +
83911 +#ifdef LATENT_ENTROPY_PLUGIN
83912 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
83913 +#endif
83914 +
83915 +}
83916 +
83917 extern void add_input_randomness(unsigned int type, unsigned int code,
83918 - unsigned int value);
83919 -extern void add_interrupt_randomness(int irq, int irq_flags);
83920 + unsigned int value) __latent_entropy;
83921 +extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
83922
83923 extern void get_random_bytes(void *buf, int nbytes);
83924 extern void get_random_bytes_arch(void *buf, int nbytes);
83925 @@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
83926 extern const struct file_operations random_fops, urandom_fops;
83927 #endif
83928
83929 -unsigned int get_random_int(void);
83930 +unsigned int __intentional_overflow(-1) get_random_int(void);
83931 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
83932
83933 -u32 prandom_u32(void);
83934 +u32 prandom_u32(void) __intentional_overflow(-1);
83935 void prandom_bytes(void *buf, size_t nbytes);
83936 void prandom_seed(u32 seed);
83937 void prandom_reseed_late(void);
83938 @@ -37,6 +47,11 @@ struct rnd_state {
83939 u32 prandom_u32_state(struct rnd_state *state);
83940 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
83941
83942 +static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
83943 +{
83944 + return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
83945 +}
83946 +
83947 /**
83948 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
83949 * @ep_ro: right open interval endpoint
83950 @@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
83951 *
83952 * Returns: pseudo-random number in interval [0, ep_ro)
83953 */
83954 -static inline u32 prandom_u32_max(u32 ep_ro)
83955 +static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
83956 {
83957 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
83958 }
83959 diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
83960 index 378c5ee..aa84a47 100644
83961 --- a/include/linux/rbtree_augmented.h
83962 +++ b/include/linux/rbtree_augmented.h
83963 @@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
83964 old->rbaugmented = rbcompute(old); \
83965 } \
83966 rbstatic const struct rb_augment_callbacks rbname = { \
83967 - rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
83968 + .propagate = rbname ## _propagate, \
83969 + .copy = rbname ## _copy, \
83970 + .rotate = rbname ## _rotate \
83971 };
83972
83973
83974 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
83975 index 372ad5e..d4373f8 100644
83976 --- a/include/linux/rculist.h
83977 +++ b/include/linux/rculist.h
83978 @@ -29,8 +29,8 @@
83979 */
83980 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
83981 {
83982 - ACCESS_ONCE(list->next) = list;
83983 - ACCESS_ONCE(list->prev) = list;
83984 + ACCESS_ONCE_RW(list->next) = list;
83985 + ACCESS_ONCE_RW(list->prev) = list;
83986 }
83987
83988 /*
83989 @@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
83990 struct list_head *prev, struct list_head *next);
83991 #endif
83992
83993 +void __pax_list_add_rcu(struct list_head *new,
83994 + struct list_head *prev, struct list_head *next);
83995 +
83996 /**
83997 * list_add_rcu - add a new entry to rcu-protected list
83998 * @new: new entry to be added
83999 @@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
84000 __list_add_rcu(new, head, head->next);
84001 }
84002
84003 +static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
84004 +{
84005 + __pax_list_add_rcu(new, head, head->next);
84006 +}
84007 +
84008 /**
84009 * list_add_tail_rcu - add a new entry to rcu-protected list
84010 * @new: new entry to be added
84011 @@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
84012 __list_add_rcu(new, head->prev, head);
84013 }
84014
84015 +static inline void pax_list_add_tail_rcu(struct list_head *new,
84016 + struct list_head *head)
84017 +{
84018 + __pax_list_add_rcu(new, head->prev, head);
84019 +}
84020 +
84021 /**
84022 * list_del_rcu - deletes entry from list without re-initialization
84023 * @entry: the element to delete from the list.
84024 @@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
84025 entry->prev = LIST_POISON2;
84026 }
84027
84028 +extern void pax_list_del_rcu(struct list_head *entry);
84029 +
84030 /**
84031 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
84032 * @n: the element to delete from the hash list.
84033 diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
84034 index 53ff1a7..c40f0ab 100644
84035 --- a/include/linux/rcupdate.h
84036 +++ b/include/linux/rcupdate.h
84037 @@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
84038 #define rcu_note_voluntary_context_switch(t) \
84039 do { \
84040 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
84041 - ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
84042 + ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
84043 } while (0)
84044 #else /* #ifdef CONFIG_TASKS_RCU */
84045 #define TASKS_RCU(x) do { } while (0)
84046 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
84047 index 67fc8fc..a90f7d8 100644
84048 --- a/include/linux/reboot.h
84049 +++ b/include/linux/reboot.h
84050 @@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
84051 */
84052
84053 extern void migrate_to_reboot_cpu(void);
84054 -extern void machine_restart(char *cmd);
84055 -extern void machine_halt(void);
84056 -extern void machine_power_off(void);
84057 +extern void machine_restart(char *cmd) __noreturn;
84058 +extern void machine_halt(void) __noreturn;
84059 +extern void machine_power_off(void) __noreturn;
84060
84061 extern void machine_shutdown(void);
84062 struct pt_regs;
84063 @@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
84064 */
84065
84066 extern void kernel_restart_prepare(char *cmd);
84067 -extern void kernel_restart(char *cmd);
84068 -extern void kernel_halt(void);
84069 -extern void kernel_power_off(void);
84070 +extern void kernel_restart(char *cmd) __noreturn;
84071 +extern void kernel_halt(void) __noreturn;
84072 +extern void kernel_power_off(void) __noreturn;
84073
84074 extern int C_A_D; /* for sysctl */
84075 void ctrl_alt_del(void);
84076 @@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
84077 * Emergency restart, callable from an interrupt handler.
84078 */
84079
84080 -extern void emergency_restart(void);
84081 +extern void emergency_restart(void) __noreturn;
84082 #include <asm/emergency-restart.h>
84083
84084 #endif /* _LINUX_REBOOT_H */
84085 diff --git a/include/linux/regset.h b/include/linux/regset.h
84086 index 8e0c9fe..ac4d221 100644
84087 --- a/include/linux/regset.h
84088 +++ b/include/linux/regset.h
84089 @@ -161,7 +161,8 @@ struct user_regset {
84090 unsigned int align;
84091 unsigned int bias;
84092 unsigned int core_note_type;
84093 -};
84094 +} __do_const;
84095 +typedef struct user_regset __no_const user_regset_no_const;
84096
84097 /**
84098 * struct user_regset_view - available regsets
84099 diff --git a/include/linux/relay.h b/include/linux/relay.h
84100 index d7c8359..818daf5 100644
84101 --- a/include/linux/relay.h
84102 +++ b/include/linux/relay.h
84103 @@ -157,7 +157,7 @@ struct rchan_callbacks
84104 * The callback should return 0 if successful, negative if not.
84105 */
84106 int (*remove_buf_file)(struct dentry *dentry);
84107 -};
84108 +} __no_const;
84109
84110 /*
84111 * CONFIG_RELAY kernel API, kernel/relay.c
84112 diff --git a/include/linux/rio.h b/include/linux/rio.h
84113 index 6bda06f..bf39a9b 100644
84114 --- a/include/linux/rio.h
84115 +++ b/include/linux/rio.h
84116 @@ -358,7 +358,7 @@ struct rio_ops {
84117 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
84118 u64 rstart, u32 size, u32 flags);
84119 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
84120 -};
84121 +} __no_const;
84122
84123 #define RIO_RESOURCE_MEM 0x00000100
84124 #define RIO_RESOURCE_DOORBELL 0x00000200
84125 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
84126 index c0c2bce..4813524 100644
84127 --- a/include/linux/rmap.h
84128 +++ b/include/linux/rmap.h
84129 @@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
84130 void anon_vma_init(void); /* create anon_vma_cachep */
84131 int anon_vma_prepare(struct vm_area_struct *);
84132 void unlink_anon_vmas(struct vm_area_struct *);
84133 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
84134 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
84135 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
84136 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
84137
84138 static inline void anon_vma_merge(struct vm_area_struct *vma,
84139 struct vm_area_struct *next)
84140 diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
84141 index ed8f9e7..999bc96 100644
84142 --- a/include/linux/scatterlist.h
84143 +++ b/include/linux/scatterlist.h
84144 @@ -1,6 +1,7 @@
84145 #ifndef _LINUX_SCATTERLIST_H
84146 #define _LINUX_SCATTERLIST_H
84147
84148 +#include <linux/sched.h>
84149 #include <linux/string.h>
84150 #include <linux/bug.h>
84151 #include <linux/mm.h>
84152 @@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
84153 #ifdef CONFIG_DEBUG_SG
84154 BUG_ON(!virt_addr_valid(buf));
84155 #endif
84156 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84157 + if (object_starts_on_stack(buf)) {
84158 + void *adjbuf = buf - current->stack + current->lowmem_stack;
84159 + sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
84160 + } else
84161 +#endif
84162 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
84163 }
84164
84165 diff --git a/include/linux/sched.h b/include/linux/sched.h
84166 index 5e344bb..0743255 100644
84167 --- a/include/linux/sched.h
84168 +++ b/include/linux/sched.h
84169 @@ -133,6 +133,7 @@ struct fs_struct;
84170 struct perf_event_context;
84171 struct blk_plug;
84172 struct filename;
84173 +struct linux_binprm;
84174
84175 #define VMACACHE_BITS 2
84176 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
84177 @@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
84178 extern int in_sched_functions(unsigned long addr);
84179
84180 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
84181 -extern signed long schedule_timeout(signed long timeout);
84182 +extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
84183 extern signed long schedule_timeout_interruptible(signed long timeout);
84184 extern signed long schedule_timeout_killable(signed long timeout);
84185 extern signed long schedule_timeout_uninterruptible(signed long timeout);
84186 @@ -387,6 +388,19 @@ struct nsproxy;
84187 struct user_namespace;
84188
84189 #ifdef CONFIG_MMU
84190 +
84191 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
84192 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
84193 +#else
84194 +static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
84195 +{
84196 + return 0;
84197 +}
84198 +#endif
84199 +
84200 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
84201 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
84202 +
84203 extern void arch_pick_mmap_layout(struct mm_struct *mm);
84204 extern unsigned long
84205 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
84206 @@ -685,6 +699,17 @@ struct signal_struct {
84207 #ifdef CONFIG_TASKSTATS
84208 struct taskstats *stats;
84209 #endif
84210 +
84211 +#ifdef CONFIG_GRKERNSEC
84212 + u32 curr_ip;
84213 + u32 saved_ip;
84214 + u32 gr_saddr;
84215 + u32 gr_daddr;
84216 + u16 gr_sport;
84217 + u16 gr_dport;
84218 + u8 used_accept:1;
84219 +#endif
84220 +
84221 #ifdef CONFIG_AUDIT
84222 unsigned audit_tty;
84223 unsigned audit_tty_log_passwd;
84224 @@ -711,7 +736,7 @@ struct signal_struct {
84225 struct mutex cred_guard_mutex; /* guard against foreign influences on
84226 * credential calculations
84227 * (notably. ptrace) */
84228 -};
84229 +} __randomize_layout;
84230
84231 /*
84232 * Bits in flags field of signal_struct.
84233 @@ -764,6 +789,14 @@ struct user_struct {
84234 struct key *session_keyring; /* UID's default session keyring */
84235 #endif
84236
84237 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
84238 + unsigned char kernel_banned;
84239 +#endif
84240 +#ifdef CONFIG_GRKERNSEC_BRUTE
84241 + unsigned char suid_banned;
84242 + unsigned long suid_ban_expires;
84243 +#endif
84244 +
84245 /* Hash table maintenance information */
84246 struct hlist_node uidhash_node;
84247 kuid_t uid;
84248 @@ -771,7 +804,7 @@ struct user_struct {
84249 #ifdef CONFIG_PERF_EVENTS
84250 atomic_long_t locked_vm;
84251 #endif
84252 -};
84253 +} __randomize_layout;
84254
84255 extern int uids_sysfs_init(void);
84256
84257 @@ -1235,6 +1268,9 @@ enum perf_event_task_context {
84258 struct task_struct {
84259 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
84260 void *stack;
84261 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84262 + void *lowmem_stack;
84263 +#endif
84264 atomic_t usage;
84265 unsigned int flags; /* per process flags, defined below */
84266 unsigned int ptrace;
84267 @@ -1362,8 +1398,8 @@ struct task_struct {
84268 struct list_head thread_node;
84269
84270 struct completion *vfork_done; /* for vfork() */
84271 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
84272 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84273 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
84274 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84275
84276 cputime_t utime, stime, utimescaled, stimescaled;
84277 cputime_t gtime;
84278 @@ -1388,11 +1424,6 @@ struct task_struct {
84279 struct task_cputime cputime_expires;
84280 struct list_head cpu_timers[3];
84281
84282 -/* process credentials */
84283 - const struct cred __rcu *real_cred; /* objective and real subjective task
84284 - * credentials (COW) */
84285 - const struct cred __rcu *cred; /* effective (overridable) subjective task
84286 - * credentials (COW) */
84287 char comm[TASK_COMM_LEN]; /* executable name excluding path
84288 - access with [gs]et_task_comm (which lock
84289 it with task_lock())
84290 @@ -1410,6 +1441,10 @@ struct task_struct {
84291 #endif
84292 /* CPU-specific state of this task */
84293 struct thread_struct thread;
84294 +/* thread_info moved to task_struct */
84295 +#ifdef CONFIG_X86
84296 + struct thread_info tinfo;
84297 +#endif
84298 /* filesystem information */
84299 struct fs_struct *fs;
84300 /* open file information */
84301 @@ -1484,6 +1519,10 @@ struct task_struct {
84302 gfp_t lockdep_reclaim_gfp;
84303 #endif
84304
84305 +/* process credentials */
84306 + const struct cred __rcu *real_cred; /* objective and real subjective task
84307 + * credentials (COW) */
84308 +
84309 /* journalling filesystem info */
84310 void *journal_info;
84311
84312 @@ -1522,6 +1561,10 @@ struct task_struct {
84313 /* cg_list protected by css_set_lock and tsk->alloc_lock */
84314 struct list_head cg_list;
84315 #endif
84316 +
84317 + const struct cred __rcu *cred; /* effective (overridable) subjective task
84318 + * credentials (COW) */
84319 +
84320 #ifdef CONFIG_FUTEX
84321 struct robust_list_head __user *robust_list;
84322 #ifdef CONFIG_COMPAT
84323 @@ -1635,7 +1678,7 @@ struct task_struct {
84324 * Number of functions that haven't been traced
84325 * because of depth overrun.
84326 */
84327 - atomic_t trace_overrun;
84328 + atomic_unchecked_t trace_overrun;
84329 /* Pause for the tracing */
84330 atomic_t tracing_graph_pause;
84331 #endif
84332 @@ -1661,7 +1704,78 @@ struct task_struct {
84333 unsigned int sequential_io;
84334 unsigned int sequential_io_avg;
84335 #endif
84336 -};
84337 +
84338 +#ifdef CONFIG_GRKERNSEC
84339 + /* grsecurity */
84340 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84341 + u64 exec_id;
84342 +#endif
84343 +#ifdef CONFIG_GRKERNSEC_SETXID
84344 + const struct cred *delayed_cred;
84345 +#endif
84346 + struct dentry *gr_chroot_dentry;
84347 + struct acl_subject_label *acl;
84348 + struct acl_subject_label *tmpacl;
84349 + struct acl_role_label *role;
84350 + struct file *exec_file;
84351 + unsigned long brute_expires;
84352 + u16 acl_role_id;
84353 + u8 inherited;
84354 + /* is this the task that authenticated to the special role */
84355 + u8 acl_sp_role;
84356 + u8 is_writable;
84357 + u8 brute;
84358 + u8 gr_is_chrooted;
84359 +#endif
84360 +
84361 +} __randomize_layout;
84362 +
84363 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
84364 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
84365 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
84366 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
84367 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
84368 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
84369 +
84370 +#ifdef CONFIG_PAX_SOFTMODE
84371 +extern int pax_softmode;
84372 +#endif
84373 +
84374 +extern int pax_check_flags(unsigned long *);
84375 +#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
84376 +
84377 +/* if tsk != current then task_lock must be held on it */
84378 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84379 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
84380 +{
84381 + if (likely(tsk->mm))
84382 + return tsk->mm->pax_flags;
84383 + else
84384 + return 0UL;
84385 +}
84386 +
84387 +/* if tsk != current then task_lock must be held on it */
84388 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
84389 +{
84390 + if (likely(tsk->mm)) {
84391 + tsk->mm->pax_flags = flags;
84392 + return 0;
84393 + }
84394 + return -EINVAL;
84395 +}
84396 +#endif
84397 +
84398 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84399 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
84400 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
84401 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
84402 +#endif
84403 +
84404 +struct path;
84405 +extern char *pax_get_path(const struct path *path, char *buf, int buflen);
84406 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
84407 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
84408 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
84409
84410 /* Future-safe accessor for struct task_struct's cpus_allowed. */
84411 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
84412 @@ -1743,7 +1857,7 @@ struct pid_namespace;
84413 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
84414 struct pid_namespace *ns);
84415
84416 -static inline pid_t task_pid_nr(struct task_struct *tsk)
84417 +static inline pid_t task_pid_nr(const struct task_struct *tsk)
84418 {
84419 return tsk->pid;
84420 }
84421 @@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
84422
84423 extern void sched_clock_init(void);
84424
84425 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84426 +static inline void populate_stack(void)
84427 +{
84428 + struct task_struct *curtask = current;
84429 + int c;
84430 + int *ptr = curtask->stack;
84431 + int *end = curtask->stack + THREAD_SIZE;
84432 +
84433 + while (ptr < end) {
84434 + c = *(volatile int *)ptr;
84435 + ptr += PAGE_SIZE/sizeof(int);
84436 + }
84437 +}
84438 +#else
84439 +static inline void populate_stack(void)
84440 +{
84441 +}
84442 +#endif
84443 +
84444 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
84445 static inline void sched_clock_tick(void)
84446 {
84447 @@ -2239,7 +2372,9 @@ void yield(void);
84448 extern struct exec_domain default_exec_domain;
84449
84450 union thread_union {
84451 +#ifndef CONFIG_X86
84452 struct thread_info thread_info;
84453 +#endif
84454 unsigned long stack[THREAD_SIZE/sizeof(long)];
84455 };
84456
84457 @@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
84458 */
84459
84460 extern struct task_struct *find_task_by_vpid(pid_t nr);
84461 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
84462 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
84463 struct pid_namespace *ns);
84464
84465 @@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
84466 extern void exit_itimers(struct signal_struct *);
84467 extern void flush_itimer_signals(void);
84468
84469 -extern void do_group_exit(int);
84470 +extern __noreturn void do_group_exit(int);
84471
84472 extern int do_execve(struct filename *,
84473 const char __user * const __user *,
84474 @@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
84475 #define task_stack_end_corrupted(task) \
84476 (*(end_of_stack(task)) != STACK_END_MAGIC)
84477
84478 -static inline int object_is_on_stack(void *obj)
84479 +static inline int object_starts_on_stack(const void *obj)
84480 {
84481 - void *stack = task_stack_page(current);
84482 + const void *stack = task_stack_page(current);
84483
84484 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
84485 }
84486 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
84487 index 596a0e0..bea77ec 100644
84488 --- a/include/linux/sched/sysctl.h
84489 +++ b/include/linux/sched/sysctl.h
84490 @@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
84491 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
84492
84493 extern int sysctl_max_map_count;
84494 +extern unsigned long sysctl_heap_stack_gap;
84495
84496 extern unsigned int sysctl_sched_latency;
84497 extern unsigned int sysctl_sched_min_granularity;
84498 diff --git a/include/linux/security.h b/include/linux/security.h
84499 index ba96471..74fb3f6 100644
84500 --- a/include/linux/security.h
84501 +++ b/include/linux/security.h
84502 @@ -27,6 +27,7 @@
84503 #include <linux/slab.h>
84504 #include <linux/err.h>
84505 #include <linux/string.h>
84506 +#include <linux/grsecurity.h>
84507
84508 struct linux_binprm;
84509 struct cred;
84510 @@ -116,8 +117,6 @@ struct seq_file;
84511
84512 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
84513
84514 -void reset_security_ops(void);
84515 -
84516 #ifdef CONFIG_MMU
84517 extern unsigned long mmap_min_addr;
84518 extern unsigned long dac_mmap_min_addr;
84519 @@ -1729,7 +1728,7 @@ struct security_operations {
84520 struct audit_context *actx);
84521 void (*audit_rule_free) (void *lsmrule);
84522 #endif /* CONFIG_AUDIT */
84523 -};
84524 +} __randomize_layout;
84525
84526 /* prototypes */
84527 extern int security_init(void);
84528 diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
84529 index dc368b8..e895209 100644
84530 --- a/include/linux/semaphore.h
84531 +++ b/include/linux/semaphore.h
84532 @@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
84533 }
84534
84535 extern void down(struct semaphore *sem);
84536 -extern int __must_check down_interruptible(struct semaphore *sem);
84537 +extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
84538 extern int __must_check down_killable(struct semaphore *sem);
84539 extern int __must_check down_trylock(struct semaphore *sem);
84540 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
84541 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
84542 index 52e0097..383f21d 100644
84543 --- a/include/linux/seq_file.h
84544 +++ b/include/linux/seq_file.h
84545 @@ -27,6 +27,9 @@ struct seq_file {
84546 struct mutex lock;
84547 const struct seq_operations *op;
84548 int poll_event;
84549 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84550 + u64 exec_id;
84551 +#endif
84552 #ifdef CONFIG_USER_NS
84553 struct user_namespace *user_ns;
84554 #endif
84555 @@ -39,6 +42,7 @@ struct seq_operations {
84556 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
84557 int (*show) (struct seq_file *m, void *v);
84558 };
84559 +typedef struct seq_operations __no_const seq_operations_no_const;
84560
84561 #define SEQ_SKIP 1
84562
84563 @@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
84564
84565 char *mangle_path(char *s, const char *p, const char *esc);
84566 int seq_open(struct file *, const struct seq_operations *);
84567 +int seq_open_restrict(struct file *, const struct seq_operations *);
84568 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
84569 loff_t seq_lseek(struct file *, loff_t, int);
84570 int seq_release(struct inode *, struct file *);
84571 @@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
84572 }
84573
84574 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
84575 +int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
84576 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
84577 int single_release(struct inode *, struct file *);
84578 void *__seq_open_private(struct file *, const struct seq_operations *, int);
84579 diff --git a/include/linux/shm.h b/include/linux/shm.h
84580 index 6fb8016..ab4465e 100644
84581 --- a/include/linux/shm.h
84582 +++ b/include/linux/shm.h
84583 @@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
84584 /* The task created the shm object. NULL if the task is dead. */
84585 struct task_struct *shm_creator;
84586 struct list_head shm_clist; /* list by creator */
84587 +#ifdef CONFIG_GRKERNSEC
84588 + u64 shm_createtime;
84589 + pid_t shm_lapid;
84590 +#endif
84591 };
84592
84593 /* shm_mode upper byte flags */
84594 diff --git a/include/linux/signal.h b/include/linux/signal.h
84595 index ab1e039..ad4229e 100644
84596 --- a/include/linux/signal.h
84597 +++ b/include/linux/signal.h
84598 @@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
84599 * know it'll be handled, so that they don't get converted to
84600 * SIGKILL or just silently dropped.
84601 */
84602 - kernel_sigaction(sig, (__force __sighandler_t)2);
84603 + kernel_sigaction(sig, (__force_user __sighandler_t)2);
84604 }
84605
84606 static inline void disallow_signal(int sig)
84607 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
84608 index 6c8b6f6..5a0f4bd 100644
84609 --- a/include/linux/skbuff.h
84610 +++ b/include/linux/skbuff.h
84611 @@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
84612 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
84613 int node);
84614 struct sk_buff *build_skb(void *data, unsigned int frag_size);
84615 -static inline struct sk_buff *alloc_skb(unsigned int size,
84616 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
84617 gfp_t priority)
84618 {
84619 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
84620 @@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
84621 return skb->inner_transport_header - skb->inner_network_header;
84622 }
84623
84624 -static inline int skb_network_offset(const struct sk_buff *skb)
84625 +static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
84626 {
84627 return skb_network_header(skb) - skb->data;
84628 }
84629 @@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
84630 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
84631 */
84632 #ifndef NET_SKB_PAD
84633 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
84634 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
84635 #endif
84636
84637 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
84638 @@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
84639 int *err);
84640 unsigned int datagram_poll(struct file *file, struct socket *sock,
84641 struct poll_table_struct *wait);
84642 -int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84643 +int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84644 struct iovec *to, int size);
84645 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
84646 struct iovec *iov);
84647 @@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
84648 nf_bridge_put(skb->nf_bridge);
84649 skb->nf_bridge = NULL;
84650 #endif
84651 +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
84652 + skb->nf_trace = 0;
84653 +#endif
84654 }
84655
84656 static inline void nf_reset_trace(struct sk_buff *skb)
84657 diff --git a/include/linux/slab.h b/include/linux/slab.h
84658 index c265bec..4867d28 100644
84659 --- a/include/linux/slab.h
84660 +++ b/include/linux/slab.h
84661 @@ -14,15 +14,29 @@
84662 #include <linux/gfp.h>
84663 #include <linux/types.h>
84664 #include <linux/workqueue.h>
84665 -
84666 +#include <linux/err.h>
84667
84668 /*
84669 * Flags to pass to kmem_cache_create().
84670 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
84671 */
84672 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
84673 +
84674 +#ifdef CONFIG_PAX_USERCOPY_SLABS
84675 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
84676 +#else
84677 +#define SLAB_USERCOPY 0x00000000UL
84678 +#endif
84679 +
84680 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
84681 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
84682 +
84683 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
84684 +#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
84685 +#else
84686 +#define SLAB_NO_SANITIZE 0x00000000UL
84687 +#endif
84688 +
84689 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
84690 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
84691 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
84692 @@ -98,10 +112,13 @@
84693 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
84694 * Both make kfree a no-op.
84695 */
84696 -#define ZERO_SIZE_PTR ((void *)16)
84697 +#define ZERO_SIZE_PTR \
84698 +({ \
84699 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
84700 + (void *)(-MAX_ERRNO-1L); \
84701 +})
84702
84703 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
84704 - (unsigned long)ZERO_SIZE_PTR)
84705 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
84706
84707 #include <linux/kmemleak.h>
84708
84709 @@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
84710 void kfree(const void *);
84711 void kzfree(const void *);
84712 size_t ksize(const void *);
84713 +const char *check_heap_object(const void *ptr, unsigned long n);
84714 +bool is_usercopy_object(const void *ptr);
84715
84716 /*
84717 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
84718 @@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
84719 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84720 #endif
84721
84722 +#ifdef CONFIG_PAX_USERCOPY_SLABS
84723 +extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
84724 +#endif
84725 +
84726 /*
84727 * Figure out which kmalloc slab an allocation of a certain size
84728 * belongs to.
84729 @@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84730 * 2 = 120 .. 192 bytes
84731 * n = 2^(n-1) .. 2^n -1
84732 */
84733 -static __always_inline int kmalloc_index(size_t size)
84734 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
84735 {
84736 if (!size)
84737 return 0;
84738 @@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
84739 }
84740 #endif /* !CONFIG_SLOB */
84741
84742 -void *__kmalloc(size_t size, gfp_t flags);
84743 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
84744 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
84745
84746 #ifdef CONFIG_NUMA
84747 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
84748 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
84749 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
84750 #else
84751 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
84752 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
84753 index b869d16..1453c73 100644
84754 --- a/include/linux/slab_def.h
84755 +++ b/include/linux/slab_def.h
84756 @@ -40,7 +40,7 @@ struct kmem_cache {
84757 /* 4) cache creation/removal */
84758 const char *name;
84759 struct list_head list;
84760 - int refcount;
84761 + atomic_t refcount;
84762 int object_size;
84763 int align;
84764
84765 @@ -56,10 +56,14 @@ struct kmem_cache {
84766 unsigned long node_allocs;
84767 unsigned long node_frees;
84768 unsigned long node_overflow;
84769 - atomic_t allochit;
84770 - atomic_t allocmiss;
84771 - atomic_t freehit;
84772 - atomic_t freemiss;
84773 + atomic_unchecked_t allochit;
84774 + atomic_unchecked_t allocmiss;
84775 + atomic_unchecked_t freehit;
84776 + atomic_unchecked_t freemiss;
84777 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
84778 + atomic_unchecked_t sanitized;
84779 + atomic_unchecked_t not_sanitized;
84780 +#endif
84781
84782 /*
84783 * If debugging is enabled, then the allocator can add additional
84784 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
84785 index d82abd4..408c3a0 100644
84786 --- a/include/linux/slub_def.h
84787 +++ b/include/linux/slub_def.h
84788 @@ -74,7 +74,7 @@ struct kmem_cache {
84789 struct kmem_cache_order_objects max;
84790 struct kmem_cache_order_objects min;
84791 gfp_t allocflags; /* gfp flags to use on each alloc */
84792 - int refcount; /* Refcount for slab cache destroy */
84793 + atomic_t refcount; /* Refcount for slab cache destroy */
84794 void (*ctor)(void *);
84795 int inuse; /* Offset to metadata */
84796 int align; /* Alignment */
84797 diff --git a/include/linux/smp.h b/include/linux/smp.h
84798 index 93dff5f..933c561 100644
84799 --- a/include/linux/smp.h
84800 +++ b/include/linux/smp.h
84801 @@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
84802 #endif
84803
84804 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
84805 +#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
84806 #define put_cpu() preempt_enable()
84807 +#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
84808
84809 /*
84810 * Callback to arch code if there's nosmp or maxcpus=0 on the
84811 diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
84812 index 46cca4c..3323536 100644
84813 --- a/include/linux/sock_diag.h
84814 +++ b/include/linux/sock_diag.h
84815 @@ -11,7 +11,7 @@ struct sock;
84816 struct sock_diag_handler {
84817 __u8 family;
84818 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
84819 -};
84820 +} __do_const;
84821
84822 int sock_diag_register(const struct sock_diag_handler *h);
84823 void sock_diag_unregister(const struct sock_diag_handler *h);
84824 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
84825 index 680f9a3..f13aeb0 100644
84826 --- a/include/linux/sonet.h
84827 +++ b/include/linux/sonet.h
84828 @@ -7,7 +7,7 @@
84829 #include <uapi/linux/sonet.h>
84830
84831 struct k_sonet_stats {
84832 -#define __HANDLE_ITEM(i) atomic_t i
84833 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
84834 __SONET_ITEMS
84835 #undef __HANDLE_ITEM
84836 };
84837 diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
84838 index 07d8e53..dc934c9 100644
84839 --- a/include/linux/sunrpc/addr.h
84840 +++ b/include/linux/sunrpc/addr.h
84841 @@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
84842 {
84843 switch (sap->sa_family) {
84844 case AF_INET:
84845 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
84846 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
84847 case AF_INET6:
84848 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
84849 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
84850 }
84851 return 0;
84852 }
84853 @@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
84854 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
84855 const struct sockaddr *src)
84856 {
84857 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
84858 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
84859 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
84860
84861 dsin->sin_family = ssin->sin_family;
84862 @@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
84863 if (sa->sa_family != AF_INET6)
84864 return 0;
84865
84866 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
84867 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
84868 }
84869
84870 #endif /* _LINUX_SUNRPC_ADDR_H */
84871 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
84872 index 70736b9..37f33db 100644
84873 --- a/include/linux/sunrpc/clnt.h
84874 +++ b/include/linux/sunrpc/clnt.h
84875 @@ -97,7 +97,7 @@ struct rpc_procinfo {
84876 unsigned int p_timer; /* Which RTT timer to use */
84877 u32 p_statidx; /* Which procedure to account */
84878 const char * p_name; /* name of procedure */
84879 -};
84880 +} __do_const;
84881
84882 #ifdef __KERNEL__
84883
84884 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
84885 index 2167846..0648fc3 100644
84886 --- a/include/linux/sunrpc/svc.h
84887 +++ b/include/linux/sunrpc/svc.h
84888 @@ -416,7 +416,7 @@ struct svc_procedure {
84889 unsigned int pc_count; /* call count */
84890 unsigned int pc_cachetype; /* cache info (NFS) */
84891 unsigned int pc_xdrressize; /* maximum size of XDR reply */
84892 -};
84893 +} __do_const;
84894
84895 /*
84896 * Function prototypes.
84897 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
84898 index 975da75..318c083 100644
84899 --- a/include/linux/sunrpc/svc_rdma.h
84900 +++ b/include/linux/sunrpc/svc_rdma.h
84901 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
84902 extern unsigned int svcrdma_max_requests;
84903 extern unsigned int svcrdma_max_req_size;
84904
84905 -extern atomic_t rdma_stat_recv;
84906 -extern atomic_t rdma_stat_read;
84907 -extern atomic_t rdma_stat_write;
84908 -extern atomic_t rdma_stat_sq_starve;
84909 -extern atomic_t rdma_stat_rq_starve;
84910 -extern atomic_t rdma_stat_rq_poll;
84911 -extern atomic_t rdma_stat_rq_prod;
84912 -extern atomic_t rdma_stat_sq_poll;
84913 -extern atomic_t rdma_stat_sq_prod;
84914 +extern atomic_unchecked_t rdma_stat_recv;
84915 +extern atomic_unchecked_t rdma_stat_read;
84916 +extern atomic_unchecked_t rdma_stat_write;
84917 +extern atomic_unchecked_t rdma_stat_sq_starve;
84918 +extern atomic_unchecked_t rdma_stat_rq_starve;
84919 +extern atomic_unchecked_t rdma_stat_rq_poll;
84920 +extern atomic_unchecked_t rdma_stat_rq_prod;
84921 +extern atomic_unchecked_t rdma_stat_sq_poll;
84922 +extern atomic_unchecked_t rdma_stat_sq_prod;
84923
84924 #define RPCRDMA_VERSION 1
84925
84926 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
84927 index 8d71d65..f79586e 100644
84928 --- a/include/linux/sunrpc/svcauth.h
84929 +++ b/include/linux/sunrpc/svcauth.h
84930 @@ -120,7 +120,7 @@ struct auth_ops {
84931 int (*release)(struct svc_rqst *rq);
84932 void (*domain_release)(struct auth_domain *);
84933 int (*set_client)(struct svc_rqst *rq);
84934 -};
84935 +} __do_const;
84936
84937 #define SVC_GARBAGE 1
84938 #define SVC_SYSERR 2
84939 diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
84940 index e7a018e..49f8b17 100644
84941 --- a/include/linux/swiotlb.h
84942 +++ b/include/linux/swiotlb.h
84943 @@ -60,7 +60,8 @@ extern void
84944
84945 extern void
84946 swiotlb_free_coherent(struct device *hwdev, size_t size,
84947 - void *vaddr, dma_addr_t dma_handle);
84948 + void *vaddr, dma_addr_t dma_handle,
84949 + struct dma_attrs *attrs);
84950
84951 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
84952 unsigned long offset, size_t size,
84953 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
84954 index bda9b81..629e06e 100644
84955 --- a/include/linux/syscalls.h
84956 +++ b/include/linux/syscalls.h
84957 @@ -99,10 +99,16 @@ union bpf_attr;
84958 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
84959
84960 #define __SC_DECL(t, a) t a
84961 +#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))
84962 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
84963 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
84964 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
84965 -#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
84966 +#define __SC_LONG(t, a) __typeof( \
84967 + __builtin_choose_expr( \
84968 + sizeof(t) > sizeof(int), \
84969 + (t) 0, \
84970 + __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
84971 + )) a
84972 #define __SC_CAST(t, a) (t) a
84973 #define __SC_ARGS(t, a) a
84974 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
84975 @@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
84976 asmlinkage long sys_fsync(unsigned int fd);
84977 asmlinkage long sys_fdatasync(unsigned int fd);
84978 asmlinkage long sys_bdflush(int func, long data);
84979 -asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
84980 - char __user *type, unsigned long flags,
84981 +asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
84982 + const char __user *type, unsigned long flags,
84983 void __user *data);
84984 -asmlinkage long sys_umount(char __user *name, int flags);
84985 -asmlinkage long sys_oldumount(char __user *name);
84986 +asmlinkage long sys_umount(const char __user *name, int flags);
84987 +asmlinkage long sys_oldumount(const char __user *name);
84988 asmlinkage long sys_truncate(const char __user *path, long length);
84989 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
84990 asmlinkage long sys_stat(const char __user *filename,
84991 @@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
84992 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
84993 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
84994 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
84995 - struct sockaddr __user *, int);
84996 + struct sockaddr __user *, int) __intentional_overflow(0);
84997 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
84998 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
84999 unsigned int vlen, unsigned flags);
85000 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
85001 index 27b3b0b..e093dd9 100644
85002 --- a/include/linux/syscore_ops.h
85003 +++ b/include/linux/syscore_ops.h
85004 @@ -16,7 +16,7 @@ struct syscore_ops {
85005 int (*suspend)(void);
85006 void (*resume)(void);
85007 void (*shutdown)(void);
85008 -};
85009 +} __do_const;
85010
85011 extern void register_syscore_ops(struct syscore_ops *ops);
85012 extern void unregister_syscore_ops(struct syscore_ops *ops);
85013 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
85014 index b7361f8..341a15a 100644
85015 --- a/include/linux/sysctl.h
85016 +++ b/include/linux/sysctl.h
85017 @@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
85018
85019 extern int proc_dostring(struct ctl_table *, int,
85020 void __user *, size_t *, loff_t *);
85021 +extern int proc_dostring_modpriv(struct ctl_table *, int,
85022 + void __user *, size_t *, loff_t *);
85023 extern int proc_dointvec(struct ctl_table *, int,
85024 void __user *, size_t *, loff_t *);
85025 extern int proc_dointvec_minmax(struct ctl_table *, int,
85026 @@ -113,7 +115,8 @@ struct ctl_table
85027 struct ctl_table_poll *poll;
85028 void *extra1;
85029 void *extra2;
85030 -};
85031 +} __do_const __randomize_layout;
85032 +typedef struct ctl_table __no_const ctl_table_no_const;
85033
85034 struct ctl_node {
85035 struct rb_node node;
85036 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
85037 index f97d0db..c1187dc 100644
85038 --- a/include/linux/sysfs.h
85039 +++ b/include/linux/sysfs.h
85040 @@ -34,7 +34,8 @@ struct attribute {
85041 struct lock_class_key *key;
85042 struct lock_class_key skey;
85043 #endif
85044 -};
85045 +} __do_const;
85046 +typedef struct attribute __no_const attribute_no_const;
85047
85048 /**
85049 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
85050 @@ -63,7 +64,8 @@ struct attribute_group {
85051 struct attribute *, int);
85052 struct attribute **attrs;
85053 struct bin_attribute **bin_attrs;
85054 -};
85055 +} __do_const;
85056 +typedef struct attribute_group __no_const attribute_group_no_const;
85057
85058 /**
85059 * Use these macros to make defining attributes easier. See include/linux/device.h
85060 @@ -128,7 +130,8 @@ struct bin_attribute {
85061 char *, loff_t, size_t);
85062 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
85063 struct vm_area_struct *vma);
85064 -};
85065 +} __do_const;
85066 +typedef struct bin_attribute __no_const bin_attribute_no_const;
85067
85068 /**
85069 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
85070 diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
85071 index 387fa7d..3fcde6b 100644
85072 --- a/include/linux/sysrq.h
85073 +++ b/include/linux/sysrq.h
85074 @@ -16,6 +16,7 @@
85075
85076 #include <linux/errno.h>
85077 #include <linux/types.h>
85078 +#include <linux/compiler.h>
85079
85080 /* Possible values of bitmask for enabling sysrq functions */
85081 /* 0x0001 is reserved for enable everything */
85082 @@ -33,7 +34,7 @@ struct sysrq_key_op {
85083 char *help_msg;
85084 char *action_msg;
85085 int enable_mask;
85086 -};
85087 +} __do_const;
85088
85089 #ifdef CONFIG_MAGIC_SYSRQ
85090
85091 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
85092 index ff307b5..f1a4468 100644
85093 --- a/include/linux/thread_info.h
85094 +++ b/include/linux/thread_info.h
85095 @@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
85096 #error "no set_restore_sigmask() provided and default one won't work"
85097 #endif
85098
85099 +extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
85100 +
85101 +static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
85102 +{
85103 + __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
85104 +}
85105 +
85106 #endif /* __KERNEL__ */
85107
85108 #endif /* _LINUX_THREAD_INFO_H */
85109 diff --git a/include/linux/tty.h b/include/linux/tty.h
85110 index 5171ef8..1048d83e 100644
85111 --- a/include/linux/tty.h
85112 +++ b/include/linux/tty.h
85113 @@ -202,7 +202,7 @@ struct tty_port {
85114 const struct tty_port_operations *ops; /* Port operations */
85115 spinlock_t lock; /* Lock protecting tty field */
85116 int blocked_open; /* Waiting to open */
85117 - int count; /* Usage count */
85118 + atomic_t count; /* Usage count */
85119 wait_queue_head_t open_wait; /* Open waiters */
85120 wait_queue_head_t close_wait; /* Close waiters */
85121 wait_queue_head_t delta_msr_wait; /* Modem status change */
85122 @@ -290,7 +290,7 @@ struct tty_struct {
85123 /* If the tty has a pending do_SAK, queue it here - akpm */
85124 struct work_struct SAK_work;
85125 struct tty_port *port;
85126 -};
85127 +} __randomize_layout;
85128
85129 /* Each of a tty's open files has private_data pointing to tty_file_private */
85130 struct tty_file_private {
85131 @@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
85132 struct tty_struct *tty, struct file *filp);
85133 static inline int tty_port_users(struct tty_port *port)
85134 {
85135 - return port->count + port->blocked_open;
85136 + return atomic_read(&port->count) + port->blocked_open;
85137 }
85138
85139 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
85140 diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
85141 index 92e337c..f46757b 100644
85142 --- a/include/linux/tty_driver.h
85143 +++ b/include/linux/tty_driver.h
85144 @@ -291,7 +291,7 @@ struct tty_operations {
85145 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
85146 #endif
85147 const struct file_operations *proc_fops;
85148 -};
85149 +} __do_const __randomize_layout;
85150
85151 struct tty_driver {
85152 int magic; /* magic number for this structure */
85153 @@ -325,7 +325,7 @@ struct tty_driver {
85154
85155 const struct tty_operations *ops;
85156 struct list_head tty_drivers;
85157 -};
85158 +} __randomize_layout;
85159
85160 extern struct list_head tty_drivers;
85161
85162 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
85163 index 00c9d68..bc0188b 100644
85164 --- a/include/linux/tty_ldisc.h
85165 +++ b/include/linux/tty_ldisc.h
85166 @@ -215,7 +215,7 @@ struct tty_ldisc_ops {
85167
85168 struct module *owner;
85169
85170 - int refcount;
85171 + atomic_t refcount;
85172 };
85173
85174 struct tty_ldisc {
85175 diff --git a/include/linux/types.h b/include/linux/types.h
85176 index a0bb704..f511c77 100644
85177 --- a/include/linux/types.h
85178 +++ b/include/linux/types.h
85179 @@ -177,10 +177,26 @@ typedef struct {
85180 int counter;
85181 } atomic_t;
85182
85183 +#ifdef CONFIG_PAX_REFCOUNT
85184 +typedef struct {
85185 + int counter;
85186 +} atomic_unchecked_t;
85187 +#else
85188 +typedef atomic_t atomic_unchecked_t;
85189 +#endif
85190 +
85191 #ifdef CONFIG_64BIT
85192 typedef struct {
85193 long counter;
85194 } atomic64_t;
85195 +
85196 +#ifdef CONFIG_PAX_REFCOUNT
85197 +typedef struct {
85198 + long counter;
85199 +} atomic64_unchecked_t;
85200 +#else
85201 +typedef atomic64_t atomic64_unchecked_t;
85202 +#endif
85203 #endif
85204
85205 struct list_head {
85206 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
85207 index ecd3319..8a36ded 100644
85208 --- a/include/linux/uaccess.h
85209 +++ b/include/linux/uaccess.h
85210 @@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
85211 long ret; \
85212 mm_segment_t old_fs = get_fs(); \
85213 \
85214 - set_fs(KERNEL_DS); \
85215 pagefault_disable(); \
85216 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
85217 - pagefault_enable(); \
85218 + set_fs(KERNEL_DS); \
85219 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
85220 set_fs(old_fs); \
85221 + pagefault_enable(); \
85222 ret; \
85223 })
85224
85225 diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
85226 index 2d1f9b6..d7a9fce 100644
85227 --- a/include/linux/uidgid.h
85228 +++ b/include/linux/uidgid.h
85229 @@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
85230
85231 #endif /* CONFIG_USER_NS */
85232
85233 +#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
85234 +#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
85235 +#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
85236 +#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
85237 +
85238 #endif /* _LINUX_UIDGID_H */
85239 diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
85240 index baa8171..9ca98ba 100644
85241 --- a/include/linux/uio_driver.h
85242 +++ b/include/linux/uio_driver.h
85243 @@ -67,7 +67,7 @@ struct uio_device {
85244 struct module *owner;
85245 struct device *dev;
85246 int minor;
85247 - atomic_t event;
85248 + atomic_unchecked_t event;
85249 struct fasync_struct *async_queue;
85250 wait_queue_head_t wait;
85251 struct uio_info *info;
85252 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
85253 index 99c1b4d..562e6f3 100644
85254 --- a/include/linux/unaligned/access_ok.h
85255 +++ b/include/linux/unaligned/access_ok.h
85256 @@ -4,34 +4,34 @@
85257 #include <linux/kernel.h>
85258 #include <asm/byteorder.h>
85259
85260 -static inline u16 get_unaligned_le16(const void *p)
85261 +static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
85262 {
85263 - return le16_to_cpup((__le16 *)p);
85264 + return le16_to_cpup((const __le16 *)p);
85265 }
85266
85267 -static inline u32 get_unaligned_le32(const void *p)
85268 +static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
85269 {
85270 - return le32_to_cpup((__le32 *)p);
85271 + return le32_to_cpup((const __le32 *)p);
85272 }
85273
85274 -static inline u64 get_unaligned_le64(const void *p)
85275 +static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
85276 {
85277 - return le64_to_cpup((__le64 *)p);
85278 + return le64_to_cpup((const __le64 *)p);
85279 }
85280
85281 -static inline u16 get_unaligned_be16(const void *p)
85282 +static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
85283 {
85284 - return be16_to_cpup((__be16 *)p);
85285 + return be16_to_cpup((const __be16 *)p);
85286 }
85287
85288 -static inline u32 get_unaligned_be32(const void *p)
85289 +static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
85290 {
85291 - return be32_to_cpup((__be32 *)p);
85292 + return be32_to_cpup((const __be32 *)p);
85293 }
85294
85295 -static inline u64 get_unaligned_be64(const void *p)
85296 +static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
85297 {
85298 - return be64_to_cpup((__be64 *)p);
85299 + return be64_to_cpup((const __be64 *)p);
85300 }
85301
85302 static inline void put_unaligned_le16(u16 val, void *p)
85303 diff --git a/include/linux/usb.h b/include/linux/usb.h
85304 index 447a7e2..9cea7e9 100644
85305 --- a/include/linux/usb.h
85306 +++ b/include/linux/usb.h
85307 @@ -571,7 +571,7 @@ struct usb_device {
85308 int maxchild;
85309
85310 u32 quirks;
85311 - atomic_t urbnum;
85312 + atomic_unchecked_t urbnum;
85313
85314 unsigned long active_duration;
85315
85316 @@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
85317
85318 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
85319 __u8 request, __u8 requesttype, __u16 value, __u16 index,
85320 - void *data, __u16 size, int timeout);
85321 + void *data, __u16 size, int timeout) __intentional_overflow(-1);
85322 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
85323 void *data, int len, int *actual_length, int timeout);
85324 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
85325 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
85326 index d5952bb..9a626d4 100644
85327 --- a/include/linux/usb/renesas_usbhs.h
85328 +++ b/include/linux/usb/renesas_usbhs.h
85329 @@ -39,7 +39,7 @@ enum {
85330 */
85331 struct renesas_usbhs_driver_callback {
85332 int (*notify_hotplug)(struct platform_device *pdev);
85333 -};
85334 +} __no_const;
85335
85336 /*
85337 * callback functions for platform
85338 diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
85339 index 9f3579f..3b2afa5 100644
85340 --- a/include/linux/user_namespace.h
85341 +++ b/include/linux/user_namespace.h
85342 @@ -38,7 +38,7 @@ struct user_namespace {
85343 struct key *persistent_keyring_register;
85344 struct rw_semaphore persistent_keyring_register_sem;
85345 #endif
85346 -};
85347 +} __randomize_layout;
85348
85349 extern struct user_namespace init_user_ns;
85350
85351 diff --git a/include/linux/utsname.h b/include/linux/utsname.h
85352 index 239e277..22a5cf5 100644
85353 --- a/include/linux/utsname.h
85354 +++ b/include/linux/utsname.h
85355 @@ -24,7 +24,7 @@ struct uts_namespace {
85356 struct new_utsname name;
85357 struct user_namespace *user_ns;
85358 unsigned int proc_inum;
85359 -};
85360 +} __randomize_layout;
85361 extern struct uts_namespace init_uts_ns;
85362
85363 #ifdef CONFIG_UTS_NS
85364 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
85365 index 6f8fbcf..4efc177 100644
85366 --- a/include/linux/vermagic.h
85367 +++ b/include/linux/vermagic.h
85368 @@ -25,9 +25,42 @@
85369 #define MODULE_ARCH_VERMAGIC ""
85370 #endif
85371
85372 +#ifdef CONFIG_PAX_REFCOUNT
85373 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
85374 +#else
85375 +#define MODULE_PAX_REFCOUNT ""
85376 +#endif
85377 +
85378 +#ifdef CONSTIFY_PLUGIN
85379 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
85380 +#else
85381 +#define MODULE_CONSTIFY_PLUGIN ""
85382 +#endif
85383 +
85384 +#ifdef STACKLEAK_PLUGIN
85385 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
85386 +#else
85387 +#define MODULE_STACKLEAK_PLUGIN ""
85388 +#endif
85389 +
85390 +#ifdef RANDSTRUCT_PLUGIN
85391 +#include <generated/randomize_layout_hash.h>
85392 +#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
85393 +#else
85394 +#define MODULE_RANDSTRUCT_PLUGIN
85395 +#endif
85396 +
85397 +#ifdef CONFIG_GRKERNSEC
85398 +#define MODULE_GRSEC "GRSEC "
85399 +#else
85400 +#define MODULE_GRSEC ""
85401 +#endif
85402 +
85403 #define VERMAGIC_STRING \
85404 UTS_RELEASE " " \
85405 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
85406 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
85407 - MODULE_ARCH_VERMAGIC
85408 + MODULE_ARCH_VERMAGIC \
85409 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
85410 + MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
85411
85412 diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
85413 index b483abd..af305ad 100644
85414 --- a/include/linux/vga_switcheroo.h
85415 +++ b/include/linux/vga_switcheroo.h
85416 @@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
85417
85418 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
85419
85420 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
85421 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
85422 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
85423 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
85424 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
85425 #else
85426
85427 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
85428 @@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
85429
85430 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
85431
85432 -static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85433 +static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85434 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85435 -static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85436 +static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85437
85438 #endif
85439 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
85440 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
85441 index b87696f..1d11de7 100644
85442 --- a/include/linux/vmalloc.h
85443 +++ b/include/linux/vmalloc.h
85444 @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
85445 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
85446 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
85447 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
85448 +
85449 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
85450 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
85451 +#endif
85452 +
85453 /* bits [20..32] reserved for arch specific ioremap internals */
85454
85455 /*
85456 @@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
85457 unsigned long flags, pgprot_t prot);
85458 extern void vunmap(const void *addr);
85459
85460 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85461 +extern void unmap_process_stacks(struct task_struct *task);
85462 +#endif
85463 +
85464 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
85465 unsigned long uaddr, void *kaddr,
85466 unsigned long size);
85467 @@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
85468
85469 /* for /dev/kmem */
85470 extern long vread(char *buf, char *addr, unsigned long count);
85471 -extern long vwrite(char *buf, char *addr, unsigned long count);
85472 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
85473
85474 /*
85475 * Internals. Dont't use..
85476 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
85477 index 82e7db7..f8ce3d0 100644
85478 --- a/include/linux/vmstat.h
85479 +++ b/include/linux/vmstat.h
85480 @@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
85481 /*
85482 * Zone based page accounting with per cpu differentials.
85483 */
85484 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85485 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85486
85487 static inline void zone_page_state_add(long x, struct zone *zone,
85488 enum zone_stat_item item)
85489 {
85490 - atomic_long_add(x, &zone->vm_stat[item]);
85491 - atomic_long_add(x, &vm_stat[item]);
85492 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
85493 + atomic_long_add_unchecked(x, &vm_stat[item]);
85494 }
85495
85496 -static inline unsigned long global_page_state(enum zone_stat_item item)
85497 +static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
85498 {
85499 - long x = atomic_long_read(&vm_stat[item]);
85500 + long x = atomic_long_read_unchecked(&vm_stat[item]);
85501 #ifdef CONFIG_SMP
85502 if (x < 0)
85503 x = 0;
85504 @@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
85505 return x;
85506 }
85507
85508 -static inline unsigned long zone_page_state(struct zone *zone,
85509 +static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
85510 enum zone_stat_item item)
85511 {
85512 - long x = atomic_long_read(&zone->vm_stat[item]);
85513 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85514 #ifdef CONFIG_SMP
85515 if (x < 0)
85516 x = 0;
85517 @@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
85518 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
85519 enum zone_stat_item item)
85520 {
85521 - long x = atomic_long_read(&zone->vm_stat[item]);
85522 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85523
85524 #ifdef CONFIG_SMP
85525 int cpu;
85526 @@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
85527
85528 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
85529 {
85530 - atomic_long_inc(&zone->vm_stat[item]);
85531 - atomic_long_inc(&vm_stat[item]);
85532 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
85533 + atomic_long_inc_unchecked(&vm_stat[item]);
85534 }
85535
85536 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
85537 {
85538 - atomic_long_dec(&zone->vm_stat[item]);
85539 - atomic_long_dec(&vm_stat[item]);
85540 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
85541 + atomic_long_dec_unchecked(&vm_stat[item]);
85542 }
85543
85544 static inline void __inc_zone_page_state(struct page *page,
85545 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
85546 index 91b0a68..0e9adf6 100644
85547 --- a/include/linux/xattr.h
85548 +++ b/include/linux/xattr.h
85549 @@ -28,7 +28,7 @@ struct xattr_handler {
85550 size_t size, int handler_flags);
85551 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
85552 size_t size, int flags, int handler_flags);
85553 -};
85554 +} __do_const;
85555
85556 struct xattr {
85557 const char *name;
85558 @@ -37,6 +37,9 @@ struct xattr {
85559 };
85560
85561 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
85562 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
85563 +ssize_t pax_getxattr(struct dentry *, void *, size_t);
85564 +#endif
85565 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
85566 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
85567 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
85568 diff --git a/include/linux/zlib.h b/include/linux/zlib.h
85569 index 92dbbd3..13ab0b3 100644
85570 --- a/include/linux/zlib.h
85571 +++ b/include/linux/zlib.h
85572 @@ -31,6 +31,7 @@
85573 #define _ZLIB_H
85574
85575 #include <linux/zconf.h>
85576 +#include <linux/compiler.h>
85577
85578 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
85579 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
85580 @@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
85581
85582 /* basic functions */
85583
85584 -extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
85585 +extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
85586 /*
85587 Returns the number of bytes that needs to be allocated for a per-
85588 stream workspace with the specified parameters. A pointer to this
85589 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
85590 index eb76cfd..9fd0e7c 100644
85591 --- a/include/media/v4l2-dev.h
85592 +++ b/include/media/v4l2-dev.h
85593 @@ -75,7 +75,7 @@ struct v4l2_file_operations {
85594 int (*mmap) (struct file *, struct vm_area_struct *);
85595 int (*open) (struct file *);
85596 int (*release) (struct file *);
85597 -};
85598 +} __do_const;
85599
85600 /*
85601 * Newer version of video_device, handled by videodev2.c
85602 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
85603 index ffb69da..040393e 100644
85604 --- a/include/media/v4l2-device.h
85605 +++ b/include/media/v4l2-device.h
85606 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
85607 this function returns 0. If the name ends with a digit (e.g. cx18),
85608 then the name will be set to cx18-0 since cx180 looks really odd. */
85609 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
85610 - atomic_t *instance);
85611 + atomic_unchecked_t *instance);
85612
85613 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
85614 Since the parent disappears this ensures that v4l2_dev doesn't have an
85615 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
85616 index 2a25dec..bf6dd8a 100644
85617 --- a/include/net/9p/transport.h
85618 +++ b/include/net/9p/transport.h
85619 @@ -62,7 +62,7 @@ struct p9_trans_module {
85620 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
85621 int (*zc_request)(struct p9_client *, struct p9_req_t *,
85622 char *, char *, int , int, int, int);
85623 -};
85624 +} __do_const;
85625
85626 void v9fs_register_trans(struct p9_trans_module *m);
85627 void v9fs_unregister_trans(struct p9_trans_module *m);
85628 diff --git a/include/net/af_unix.h b/include/net/af_unix.h
85629 index a175ba4..196eb8242 100644
85630 --- a/include/net/af_unix.h
85631 +++ b/include/net/af_unix.h
85632 @@ -36,7 +36,7 @@ struct unix_skb_parms {
85633 u32 secid; /* Security ID */
85634 #endif
85635 u32 consumed;
85636 -};
85637 +} __randomize_layout;
85638
85639 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
85640 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
85641 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
85642 index ead99f0..6263c4b 100644
85643 --- a/include/net/bluetooth/l2cap.h
85644 +++ b/include/net/bluetooth/l2cap.h
85645 @@ -608,7 +608,7 @@ struct l2cap_ops {
85646 unsigned char *kdata,
85647 struct iovec *iov,
85648 int len);
85649 -};
85650 +} __do_const;
85651
85652 struct l2cap_conn {
85653 struct hci_conn *hcon;
85654 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
85655 index f2ae33d..c457cf0 100644
85656 --- a/include/net/caif/cfctrl.h
85657 +++ b/include/net/caif/cfctrl.h
85658 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
85659 void (*radioset_rsp)(void);
85660 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
85661 struct cflayer *client_layer);
85662 -};
85663 +} __no_const;
85664
85665 /* Link Setup Parameters for CAIF-Links. */
85666 struct cfctrl_link_param {
85667 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
85668 struct cfctrl {
85669 struct cfsrvl serv;
85670 struct cfctrl_rsp res;
85671 - atomic_t req_seq_no;
85672 - atomic_t rsp_seq_no;
85673 + atomic_unchecked_t req_seq_no;
85674 + atomic_unchecked_t rsp_seq_no;
85675 struct list_head list;
85676 /* Protects from simultaneous access to first_req list */
85677 spinlock_t info_list_lock;
85678 diff --git a/include/net/flow.h b/include/net/flow.h
85679 index 8109a15..504466d 100644
85680 --- a/include/net/flow.h
85681 +++ b/include/net/flow.h
85682 @@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
85683
85684 void flow_cache_flush(struct net *net);
85685 void flow_cache_flush_deferred(struct net *net);
85686 -extern atomic_t flow_cache_genid;
85687 +extern atomic_unchecked_t flow_cache_genid;
85688
85689 #endif
85690 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
85691 index af10c2c..a431cc5 100644
85692 --- a/include/net/genetlink.h
85693 +++ b/include/net/genetlink.h
85694 @@ -120,7 +120,7 @@ struct genl_ops {
85695 u8 cmd;
85696 u8 internal_flags;
85697 u8 flags;
85698 -};
85699 +} __do_const;
85700
85701 int __genl_register_family(struct genl_family *family);
85702
85703 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
85704 index 734d9b5..48a9a4b 100644
85705 --- a/include/net/gro_cells.h
85706 +++ b/include/net/gro_cells.h
85707 @@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
85708 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
85709
85710 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
85711 - atomic_long_inc(&dev->rx_dropped);
85712 + atomic_long_inc_unchecked(&dev->rx_dropped);
85713 kfree_skb(skb);
85714 return;
85715 }
85716 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
85717 index 848e85c..051c7de 100644
85718 --- a/include/net/inet_connection_sock.h
85719 +++ b/include/net/inet_connection_sock.h
85720 @@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
85721 int (*bind_conflict)(const struct sock *sk,
85722 const struct inet_bind_bucket *tb, bool relax);
85723 void (*mtu_reduced)(struct sock *sk);
85724 -};
85725 +} __do_const;
85726
85727 /** inet_connection_sock - INET connection oriented sock
85728 *
85729 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
85730 index 80479ab..0c3f647 100644
85731 --- a/include/net/inetpeer.h
85732 +++ b/include/net/inetpeer.h
85733 @@ -47,7 +47,7 @@ struct inet_peer {
85734 */
85735 union {
85736 struct {
85737 - atomic_t rid; /* Frag reception counter */
85738 + atomic_unchecked_t rid; /* Frag reception counter */
85739 };
85740 struct rcu_head rcu;
85741 struct inet_peer *gc_next;
85742 diff --git a/include/net/ip.h b/include/net/ip.h
85743 index 0bb6207..a8878af 100644
85744 --- a/include/net/ip.h
85745 +++ b/include/net/ip.h
85746 @@ -316,7 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
85747 }
85748 }
85749
85750 -u32 ip_idents_reserve(u32 hash, int segs);
85751 +u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
85752 void __ip_select_ident(struct iphdr *iph, int segs);
85753
85754 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
85755 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
85756 index dc9d2a2..d985691 100644
85757 --- a/include/net/ip_fib.h
85758 +++ b/include/net/ip_fib.h
85759 @@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
85760
85761 #define FIB_RES_SADDR(net, res) \
85762 ((FIB_RES_NH(res).nh_saddr_genid == \
85763 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
85764 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
85765 FIB_RES_NH(res).nh_saddr : \
85766 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
85767 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
85768 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
85769 index 615b20b..fd4cbd8 100644
85770 --- a/include/net/ip_vs.h
85771 +++ b/include/net/ip_vs.h
85772 @@ -534,7 +534,7 @@ struct ip_vs_conn {
85773 struct ip_vs_conn *control; /* Master control connection */
85774 atomic_t n_control; /* Number of controlled ones */
85775 struct ip_vs_dest *dest; /* real server */
85776 - atomic_t in_pkts; /* incoming packet counter */
85777 + atomic_unchecked_t in_pkts; /* incoming packet counter */
85778
85779 /* Packet transmitter for different forwarding methods. If it
85780 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
85781 @@ -682,7 +682,7 @@ struct ip_vs_dest {
85782 __be16 port; /* port number of the server */
85783 union nf_inet_addr addr; /* IP address of the server */
85784 volatile unsigned int flags; /* dest status flags */
85785 - atomic_t conn_flags; /* flags to copy to conn */
85786 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
85787 atomic_t weight; /* server weight */
85788
85789 atomic_t refcnt; /* reference counter */
85790 @@ -928,11 +928,11 @@ struct netns_ipvs {
85791 /* ip_vs_lblc */
85792 int sysctl_lblc_expiration;
85793 struct ctl_table_header *lblc_ctl_header;
85794 - struct ctl_table *lblc_ctl_table;
85795 + ctl_table_no_const *lblc_ctl_table;
85796 /* ip_vs_lblcr */
85797 int sysctl_lblcr_expiration;
85798 struct ctl_table_header *lblcr_ctl_header;
85799 - struct ctl_table *lblcr_ctl_table;
85800 + ctl_table_no_const *lblcr_ctl_table;
85801 /* ip_vs_est */
85802 struct list_head est_list; /* estimator list */
85803 spinlock_t est_lock;
85804 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
85805 index 8d4f588..2e37ad2 100644
85806 --- a/include/net/irda/ircomm_tty.h
85807 +++ b/include/net/irda/ircomm_tty.h
85808 @@ -33,6 +33,7 @@
85809 #include <linux/termios.h>
85810 #include <linux/timer.h>
85811 #include <linux/tty.h> /* struct tty_struct */
85812 +#include <asm/local.h>
85813
85814 #include <net/irda/irias_object.h>
85815 #include <net/irda/ircomm_core.h>
85816 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
85817 index 714cc9a..ea05f3e 100644
85818 --- a/include/net/iucv/af_iucv.h
85819 +++ b/include/net/iucv/af_iucv.h
85820 @@ -149,7 +149,7 @@ struct iucv_skb_cb {
85821 struct iucv_sock_list {
85822 struct hlist_head head;
85823 rwlock_t lock;
85824 - atomic_t autobind_name;
85825 + atomic_unchecked_t autobind_name;
85826 };
85827
85828 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
85829 diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
85830 index f3be818..bf46196 100644
85831 --- a/include/net/llc_c_ac.h
85832 +++ b/include/net/llc_c_ac.h
85833 @@ -87,7 +87,7 @@
85834 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
85835 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
85836
85837 -typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85838 +typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85839
85840 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
85841 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
85842 diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
85843 index 3948cf1..83b28c4 100644
85844 --- a/include/net/llc_c_ev.h
85845 +++ b/include/net/llc_c_ev.h
85846 @@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
85847 return (struct llc_conn_state_ev *)skb->cb;
85848 }
85849
85850 -typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85851 -typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85852 +typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85853 +typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85854
85855 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
85856 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
85857 diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
85858 index 0e79cfb..f46db31 100644
85859 --- a/include/net/llc_c_st.h
85860 +++ b/include/net/llc_c_st.h
85861 @@ -37,7 +37,7 @@ struct llc_conn_state_trans {
85862 u8 next_state;
85863 llc_conn_ev_qfyr_t *ev_qualifiers;
85864 llc_conn_action_t *ev_actions;
85865 -};
85866 +} __do_const;
85867
85868 struct llc_conn_state {
85869 u8 current_state;
85870 diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
85871 index a61b98c..aade1eb 100644
85872 --- a/include/net/llc_s_ac.h
85873 +++ b/include/net/llc_s_ac.h
85874 @@ -23,7 +23,7 @@
85875 #define SAP_ACT_TEST_IND 9
85876
85877 /* All action functions must look like this */
85878 -typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
85879 +typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
85880
85881 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
85882 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
85883 diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
85884 index 567c681..cd73ac02 100644
85885 --- a/include/net/llc_s_st.h
85886 +++ b/include/net/llc_s_st.h
85887 @@ -20,7 +20,7 @@ struct llc_sap_state_trans {
85888 llc_sap_ev_t ev;
85889 u8 next_state;
85890 llc_sap_action_t *ev_actions;
85891 -};
85892 +} __do_const;
85893
85894 struct llc_sap_state {
85895 u8 curr_state;
85896 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
85897 index 0ad1f47..aaea45b 100644
85898 --- a/include/net/mac80211.h
85899 +++ b/include/net/mac80211.h
85900 @@ -4648,7 +4648,7 @@ struct rate_control_ops {
85901 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
85902
85903 u32 (*get_expected_throughput)(void *priv_sta);
85904 -};
85905 +} __do_const;
85906
85907 static inline int rate_supported(struct ieee80211_sta *sta,
85908 enum ieee80211_band band,
85909 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
85910 index f60558d..e5ed9bd 100644
85911 --- a/include/net/neighbour.h
85912 +++ b/include/net/neighbour.h
85913 @@ -163,7 +163,7 @@ struct neigh_ops {
85914 void (*error_report)(struct neighbour *, struct sk_buff *);
85915 int (*output)(struct neighbour *, struct sk_buff *);
85916 int (*connected_output)(struct neighbour *, struct sk_buff *);
85917 -};
85918 +} __do_const;
85919
85920 struct pneigh_entry {
85921 struct pneigh_entry *next;
85922 @@ -217,7 +217,7 @@ struct neigh_table {
85923 struct neigh_statistics __percpu *stats;
85924 struct neigh_hash_table __rcu *nht;
85925 struct pneigh_entry **phash_buckets;
85926 -};
85927 +} __randomize_layout;
85928
85929 static inline int neigh_parms_family(struct neigh_parms *p)
85930 {
85931 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
85932 index e0d6466..e2f3003 100644
85933 --- a/include/net/net_namespace.h
85934 +++ b/include/net/net_namespace.h
85935 @@ -129,8 +129,8 @@ struct net {
85936 struct netns_ipvs *ipvs;
85937 #endif
85938 struct sock *diag_nlsk;
85939 - atomic_t fnhe_genid;
85940 -};
85941 + atomic_unchecked_t fnhe_genid;
85942 +} __randomize_layout;
85943
85944 #include <linux/seq_file_net.h>
85945
85946 @@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
85947 #define __net_init __init
85948 #define __net_exit __exit_refok
85949 #define __net_initdata __initdata
85950 +#ifdef CONSTIFY_PLUGIN
85951 #define __net_initconst __initconst
85952 +#else
85953 +#define __net_initconst __initdata
85954 +#endif
85955 #endif
85956
85957 struct pernet_operations {
85958 @@ -296,7 +300,7 @@ struct pernet_operations {
85959 void (*exit_batch)(struct list_head *net_exit_list);
85960 int *id;
85961 size_t size;
85962 -};
85963 +} __do_const;
85964
85965 /*
85966 * Use these carefully. If you implement a network device and it
85967 @@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
85968
85969 static inline int rt_genid_ipv4(struct net *net)
85970 {
85971 - return atomic_read(&net->ipv4.rt_genid);
85972 + return atomic_read_unchecked(&net->ipv4.rt_genid);
85973 }
85974
85975 static inline void rt_genid_bump_ipv4(struct net *net)
85976 {
85977 - atomic_inc(&net->ipv4.rt_genid);
85978 + atomic_inc_unchecked(&net->ipv4.rt_genid);
85979 }
85980
85981 extern void (*__fib6_flush_trees)(struct net *net);
85982 @@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
85983
85984 static inline int fnhe_genid(struct net *net)
85985 {
85986 - return atomic_read(&net->fnhe_genid);
85987 + return atomic_read_unchecked(&net->fnhe_genid);
85988 }
85989
85990 static inline void fnhe_genid_bump(struct net *net)
85991 {
85992 - atomic_inc(&net->fnhe_genid);
85993 + atomic_inc_unchecked(&net->fnhe_genid);
85994 }
85995
85996 #endif /* __NET_NET_NAMESPACE_H */
85997 diff --git a/include/net/netlink.h b/include/net/netlink.h
85998 index 7b903e1..ad9ca4b 100644
85999 --- a/include/net/netlink.h
86000 +++ b/include/net/netlink.h
86001 @@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
86002 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
86003 {
86004 if (mark)
86005 - skb_trim(skb, (unsigned char *) mark - skb->data);
86006 + skb_trim(skb, (const unsigned char *) mark - skb->data);
86007 }
86008
86009 /**
86010 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
86011 index 29d6a94..235d3d84 100644
86012 --- a/include/net/netns/conntrack.h
86013 +++ b/include/net/netns/conntrack.h
86014 @@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
86015 struct nf_proto_net {
86016 #ifdef CONFIG_SYSCTL
86017 struct ctl_table_header *ctl_table_header;
86018 - struct ctl_table *ctl_table;
86019 + ctl_table_no_const *ctl_table;
86020 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
86021 struct ctl_table_header *ctl_compat_header;
86022 - struct ctl_table *ctl_compat_table;
86023 + ctl_table_no_const *ctl_compat_table;
86024 #endif
86025 #endif
86026 unsigned int users;
86027 @@ -60,7 +60,7 @@ struct nf_ip_net {
86028 struct nf_icmp_net icmpv6;
86029 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
86030 struct ctl_table_header *ctl_table_header;
86031 - struct ctl_table *ctl_table;
86032 + ctl_table_no_const *ctl_table;
86033 #endif
86034 };
86035
86036 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
86037 index 24945ce..f19e42f 100644
86038 --- a/include/net/netns/ipv4.h
86039 +++ b/include/net/netns/ipv4.h
86040 @@ -83,7 +83,7 @@ struct netns_ipv4 {
86041
86042 struct ping_group_range ping_group_range;
86043
86044 - atomic_t dev_addr_genid;
86045 + atomic_unchecked_t dev_addr_genid;
86046
86047 #ifdef CONFIG_SYSCTL
86048 unsigned long *sysctl_local_reserved_ports;
86049 @@ -97,6 +97,6 @@ struct netns_ipv4 {
86050 struct fib_rules_ops *mr_rules_ops;
86051 #endif
86052 #endif
86053 - atomic_t rt_genid;
86054 + atomic_unchecked_t rt_genid;
86055 };
86056 #endif
86057 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
86058 index 69ae41f..4f94868 100644
86059 --- a/include/net/netns/ipv6.h
86060 +++ b/include/net/netns/ipv6.h
86061 @@ -75,8 +75,8 @@ struct netns_ipv6 {
86062 struct fib_rules_ops *mr6_rules_ops;
86063 #endif
86064 #endif
86065 - atomic_t dev_addr_genid;
86066 - atomic_t fib6_sernum;
86067 + atomic_unchecked_t dev_addr_genid;
86068 + atomic_unchecked_t fib6_sernum;
86069 };
86070
86071 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
86072 diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
86073 index 9da7982..099321b9 100644
86074 --- a/include/net/netns/xfrm.h
86075 +++ b/include/net/netns/xfrm.h
86076 @@ -78,7 +78,7 @@ struct netns_xfrm {
86077
86078 /* flow cache part */
86079 struct flow_cache flow_cache_global;
86080 - atomic_t flow_cache_genid;
86081 + atomic_unchecked_t flow_cache_genid;
86082 struct list_head flow_cache_gc_list;
86083 spinlock_t flow_cache_gc_lock;
86084 struct work_struct flow_cache_gc_work;
86085 diff --git a/include/net/ping.h b/include/net/ping.h
86086 index 026479b..d9b2829 100644
86087 --- a/include/net/ping.h
86088 +++ b/include/net/ping.h
86089 @@ -54,7 +54,7 @@ struct ping_iter_state {
86090
86091 extern struct proto ping_prot;
86092 #if IS_ENABLED(CONFIG_IPV6)
86093 -extern struct pingv6_ops pingv6_ops;
86094 +extern struct pingv6_ops *pingv6_ops;
86095 #endif
86096
86097 struct pingfakehdr {
86098 diff --git a/include/net/protocol.h b/include/net/protocol.h
86099 index d6fcc1f..ca277058 100644
86100 --- a/include/net/protocol.h
86101 +++ b/include/net/protocol.h
86102 @@ -49,7 +49,7 @@ struct net_protocol {
86103 * socket lookup?
86104 */
86105 icmp_strict_tag_validation:1;
86106 -};
86107 +} __do_const;
86108
86109 #if IS_ENABLED(CONFIG_IPV6)
86110 struct inet6_protocol {
86111 @@ -62,7 +62,7 @@ struct inet6_protocol {
86112 u8 type, u8 code, int offset,
86113 __be32 info);
86114 unsigned int flags; /* INET6_PROTO_xxx */
86115 -};
86116 +} __do_const;
86117
86118 #define INET6_PROTO_NOPOLICY 0x1
86119 #define INET6_PROTO_FINAL 0x2
86120 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
86121 index e21b9f9..0191ef0 100644
86122 --- a/include/net/rtnetlink.h
86123 +++ b/include/net/rtnetlink.h
86124 @@ -93,7 +93,7 @@ struct rtnl_link_ops {
86125 int (*fill_slave_info)(struct sk_buff *skb,
86126 const struct net_device *dev,
86127 const struct net_device *slave_dev);
86128 -};
86129 +} __do_const;
86130
86131 int __rtnl_link_register(struct rtnl_link_ops *ops);
86132 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
86133 diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
86134 index 4a5b9a3..ca27d73 100644
86135 --- a/include/net/sctp/checksum.h
86136 +++ b/include/net/sctp/checksum.h
86137 @@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
86138 unsigned int offset)
86139 {
86140 struct sctphdr *sh = sctp_hdr(skb);
86141 - __le32 ret, old = sh->checksum;
86142 - const struct skb_checksum_ops ops = {
86143 + __le32 ret, old = sh->checksum;
86144 + static const struct skb_checksum_ops ops = {
86145 .update = sctp_csum_update,
86146 .combine = sctp_csum_combine,
86147 };
86148 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
86149 index 72a31db..aaa63d9 100644
86150 --- a/include/net/sctp/sm.h
86151 +++ b/include/net/sctp/sm.h
86152 @@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
86153 typedef struct {
86154 sctp_state_fn_t *fn;
86155 const char *name;
86156 -} sctp_sm_table_entry_t;
86157 +} __do_const sctp_sm_table_entry_t;
86158
86159 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
86160 * currently in use.
86161 @@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
86162 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
86163
86164 /* Extern declarations for major data structures. */
86165 -extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86166 +extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86167
86168
86169 /* Get the size of a DATA chunk payload. */
86170 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
86171 index 4ff3f67..89ae38e 100644
86172 --- a/include/net/sctp/structs.h
86173 +++ b/include/net/sctp/structs.h
86174 @@ -509,7 +509,7 @@ struct sctp_pf {
86175 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
86176 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
86177 struct sctp_af *af;
86178 -};
86179 +} __do_const;
86180
86181
86182 /* Structure to track chunk fragments that have been acked, but peer
86183 diff --git a/include/net/sock.h b/include/net/sock.h
86184 index 7db3db1..a915cca 100644
86185 --- a/include/net/sock.h
86186 +++ b/include/net/sock.h
86187 @@ -355,7 +355,7 @@ struct sock {
86188 unsigned int sk_napi_id;
86189 unsigned int sk_ll_usec;
86190 #endif
86191 - atomic_t sk_drops;
86192 + atomic_unchecked_t sk_drops;
86193 int sk_rcvbuf;
86194
86195 struct sk_filter __rcu *sk_filter;
86196 @@ -1048,7 +1048,7 @@ struct proto {
86197 void (*destroy_cgroup)(struct mem_cgroup *memcg);
86198 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
86199 #endif
86200 -};
86201 +} __randomize_layout;
86202
86203 /*
86204 * Bits in struct cg_proto.flags
86205 @@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
86206 return ret >> PAGE_SHIFT;
86207 }
86208
86209 -static inline long
86210 +static inline long __intentional_overflow(-1)
86211 sk_memory_allocated(const struct sock *sk)
86212 {
86213 struct proto *prot = sk->sk_prot;
86214 @@ -1380,7 +1380,7 @@ struct sock_iocb {
86215 struct scm_cookie *scm;
86216 struct msghdr *msg, async_msg;
86217 struct kiocb *kiocb;
86218 -};
86219 +} __randomize_layout;
86220
86221 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
86222 {
86223 @@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
86224 }
86225
86226 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
86227 - char __user *from, char *to,
86228 + char __user *from, unsigned char *to,
86229 int copy, int offset)
86230 {
86231 if (skb->ip_summed == CHECKSUM_NONE) {
86232 @@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
86233 }
86234 }
86235
86236 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86237 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86238
86239 /**
86240 * sk_page_frag - return an appropriate page_frag
86241 diff --git a/include/net/tcp.h b/include/net/tcp.h
86242 index 4062b4f..9ff45e7 100644
86243 --- a/include/net/tcp.h
86244 +++ b/include/net/tcp.h
86245 @@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
86246 void tcp_xmit_retransmit_queue(struct sock *);
86247 void tcp_simple_retransmit(struct sock *);
86248 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
86249 -int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86250 +int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86251
86252 void tcp_send_probe0(struct sock *);
86253 void tcp_send_partial(struct sock *);
86254 @@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
86255 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
86256 */
86257 struct tcp_skb_cb {
86258 - __u32 seq; /* Starting sequence number */
86259 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
86260 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
86261 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
86262 union {
86263 /* Note : tcp_tw_isn is used in input path only
86264 * (isn chosen by tcp_timewait_state_process())
86265 @@ -718,7 +718,7 @@ struct tcp_skb_cb {
86266
86267 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
86268 /* 1 byte hole */
86269 - __u32 ack_seq; /* Sequence number ACK'd */
86270 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
86271 union {
86272 struct inet_skb_parm h4;
86273 #if IS_ENABLED(CONFIG_IPV6)
86274 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
86275 index dc4865e..152ee4c 100644
86276 --- a/include/net/xfrm.h
86277 +++ b/include/net/xfrm.h
86278 @@ -285,7 +285,6 @@ struct xfrm_dst;
86279 struct xfrm_policy_afinfo {
86280 unsigned short family;
86281 struct dst_ops *dst_ops;
86282 - void (*garbage_collect)(struct net *net);
86283 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
86284 const xfrm_address_t *saddr,
86285 const xfrm_address_t *daddr);
86286 @@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
86287 struct net_device *dev,
86288 const struct flowi *fl);
86289 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
86290 -};
86291 +} __do_const;
86292
86293 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
86294 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
86295 @@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
86296 int (*transport_finish)(struct sk_buff *skb,
86297 int async);
86298 void (*local_error)(struct sk_buff *skb, u32 mtu);
86299 -};
86300 +} __do_const;
86301
86302 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
86303 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
86304 @@ -437,7 +436,7 @@ struct xfrm_mode {
86305 struct module *owner;
86306 unsigned int encap;
86307 int flags;
86308 -};
86309 +} __do_const;
86310
86311 /* Flags for xfrm_mode. */
86312 enum {
86313 @@ -534,7 +533,7 @@ struct xfrm_policy {
86314 struct timer_list timer;
86315
86316 struct flow_cache_object flo;
86317 - atomic_t genid;
86318 + atomic_unchecked_t genid;
86319 u32 priority;
86320 u32 index;
86321 struct xfrm_mark mark;
86322 @@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
86323 }
86324
86325 void xfrm_garbage_collect(struct net *net);
86326 +void xfrm_garbage_collect_deferred(struct net *net);
86327
86328 #else
86329
86330 @@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
86331 static inline void xfrm_garbage_collect(struct net *net)
86332 {
86333 }
86334 +static inline void xfrm_garbage_collect_deferred(struct net *net)
86335 +{
86336 +}
86337 #endif
86338
86339 static __inline__
86340 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
86341 index 1017e0b..227aa4d 100644
86342 --- a/include/rdma/iw_cm.h
86343 +++ b/include/rdma/iw_cm.h
86344 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
86345 int backlog);
86346
86347 int (*destroy_listen)(struct iw_cm_id *cm_id);
86348 -};
86349 +} __no_const;
86350
86351 /**
86352 * iw_create_cm_id - Create an IW CM identifier.
86353 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
86354 index 52beadf..598734c 100644
86355 --- a/include/scsi/libfc.h
86356 +++ b/include/scsi/libfc.h
86357 @@ -771,6 +771,7 @@ struct libfc_function_template {
86358 */
86359 void (*disc_stop_final) (struct fc_lport *);
86360 };
86361 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
86362
86363 /**
86364 * struct fc_disc - Discovery context
86365 @@ -875,7 +876,7 @@ struct fc_lport {
86366 struct fc_vport *vport;
86367
86368 /* Operational Information */
86369 - struct libfc_function_template tt;
86370 + libfc_function_template_no_const tt;
86371 u8 link_up;
86372 u8 qfull;
86373 enum fc_lport_state state;
86374 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
86375 index 27ecee7..5f42632 100644
86376 --- a/include/scsi/scsi_device.h
86377 +++ b/include/scsi/scsi_device.h
86378 @@ -186,9 +186,9 @@ struct scsi_device {
86379 unsigned int max_device_blocked; /* what device_blocked counts down from */
86380 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
86381
86382 - atomic_t iorequest_cnt;
86383 - atomic_t iodone_cnt;
86384 - atomic_t ioerr_cnt;
86385 + atomic_unchecked_t iorequest_cnt;
86386 + atomic_unchecked_t iodone_cnt;
86387 + atomic_unchecked_t ioerr_cnt;
86388
86389 struct device sdev_gendev,
86390 sdev_dev;
86391 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
86392 index 007a0bc..7188db8 100644
86393 --- a/include/scsi/scsi_transport_fc.h
86394 +++ b/include/scsi/scsi_transport_fc.h
86395 @@ -756,7 +756,8 @@ struct fc_function_template {
86396 unsigned long show_host_system_hostname:1;
86397
86398 unsigned long disable_target_scan:1;
86399 -};
86400 +} __do_const;
86401 +typedef struct fc_function_template __no_const fc_function_template_no_const;
86402
86403
86404 /**
86405 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
86406 index ae6c3b8..fd748ac 100644
86407 --- a/include/sound/compress_driver.h
86408 +++ b/include/sound/compress_driver.h
86409 @@ -128,7 +128,7 @@ struct snd_compr_ops {
86410 struct snd_compr_caps *caps);
86411 int (*get_codec_caps) (struct snd_compr_stream *stream,
86412 struct snd_compr_codec_caps *codec);
86413 -};
86414 +} __no_const;
86415
86416 /**
86417 * struct snd_compr: Compressed device
86418 diff --git a/include/sound/soc.h b/include/sound/soc.h
86419 index 7ba7130..d46594d 100644
86420 --- a/include/sound/soc.h
86421 +++ b/include/sound/soc.h
86422 @@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
86423 enum snd_soc_dapm_type, int);
86424
86425 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
86426 -};
86427 +} __do_const;
86428
86429 /* SoC platform interface */
86430 struct snd_soc_platform_driver {
86431 @@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
86432 const struct snd_compr_ops *compr_ops;
86433
86434 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
86435 -};
86436 +} __do_const;
86437
86438 struct snd_soc_dai_link_component {
86439 const char *name;
86440 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
86441 index 23c518a..d6ef510 100644
86442 --- a/include/target/target_core_base.h
86443 +++ b/include/target/target_core_base.h
86444 @@ -764,7 +764,7 @@ struct se_device {
86445 atomic_long_t write_bytes;
86446 /* Active commands on this virtual SE device */
86447 atomic_t simple_cmds;
86448 - atomic_t dev_ordered_id;
86449 + atomic_unchecked_t dev_ordered_id;
86450 atomic_t dev_ordered_sync;
86451 atomic_t dev_qf_count;
86452 int export_count;
86453 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
86454 new file mode 100644
86455 index 0000000..fb634b7
86456 --- /dev/null
86457 +++ b/include/trace/events/fs.h
86458 @@ -0,0 +1,53 @@
86459 +#undef TRACE_SYSTEM
86460 +#define TRACE_SYSTEM fs
86461 +
86462 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
86463 +#define _TRACE_FS_H
86464 +
86465 +#include <linux/fs.h>
86466 +#include <linux/tracepoint.h>
86467 +
86468 +TRACE_EVENT(do_sys_open,
86469 +
86470 + TP_PROTO(const char *filename, int flags, int mode),
86471 +
86472 + TP_ARGS(filename, flags, mode),
86473 +
86474 + TP_STRUCT__entry(
86475 + __string( filename, filename )
86476 + __field( int, flags )
86477 + __field( int, mode )
86478 + ),
86479 +
86480 + TP_fast_assign(
86481 + __assign_str(filename, filename);
86482 + __entry->flags = flags;
86483 + __entry->mode = mode;
86484 + ),
86485 +
86486 + TP_printk("\"%s\" %x %o",
86487 + __get_str(filename), __entry->flags, __entry->mode)
86488 +);
86489 +
86490 +TRACE_EVENT(open_exec,
86491 +
86492 + TP_PROTO(const char *filename),
86493 +
86494 + TP_ARGS(filename),
86495 +
86496 + TP_STRUCT__entry(
86497 + __string( filename, filename )
86498 + ),
86499 +
86500 + TP_fast_assign(
86501 + __assign_str(filename, filename);
86502 + ),
86503 +
86504 + TP_printk("\"%s\"",
86505 + __get_str(filename))
86506 +);
86507 +
86508 +#endif /* _TRACE_FS_H */
86509 +
86510 +/* This part must be outside protection */
86511 +#include <trace/define_trace.h>
86512 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
86513 index 3608beb..df39d8a 100644
86514 --- a/include/trace/events/irq.h
86515 +++ b/include/trace/events/irq.h
86516 @@ -36,7 +36,7 @@ struct softirq_action;
86517 */
86518 TRACE_EVENT(irq_handler_entry,
86519
86520 - TP_PROTO(int irq, struct irqaction *action),
86521 + TP_PROTO(int irq, const struct irqaction *action),
86522
86523 TP_ARGS(irq, action),
86524
86525 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
86526 */
86527 TRACE_EVENT(irq_handler_exit,
86528
86529 - TP_PROTO(int irq, struct irqaction *action, int ret),
86530 + TP_PROTO(int irq, const struct irqaction *action, int ret),
86531
86532 TP_ARGS(irq, action, ret),
86533
86534 diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
86535 index 7caf44c..23c6f27 100644
86536 --- a/include/uapi/linux/a.out.h
86537 +++ b/include/uapi/linux/a.out.h
86538 @@ -39,6 +39,14 @@ enum machine_type {
86539 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
86540 };
86541
86542 +/* Constants for the N_FLAGS field */
86543 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86544 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
86545 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
86546 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
86547 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86548 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86549 +
86550 #if !defined (N_MAGIC)
86551 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
86552 #endif
86553 diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
86554 index 22b6ad3..aeba37e 100644
86555 --- a/include/uapi/linux/bcache.h
86556 +++ b/include/uapi/linux/bcache.h
86557 @@ -5,6 +5,7 @@
86558 * Bcache on disk data structures
86559 */
86560
86561 +#include <linux/compiler.h>
86562 #include <asm/types.h>
86563
86564 #define BITMASK(name, type, field, offset, size) \
86565 @@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
86566 /* Btree keys - all units are in sectors */
86567
86568 struct bkey {
86569 - __u64 high;
86570 - __u64 low;
86571 + __u64 high __intentional_overflow(-1);
86572 + __u64 low __intentional_overflow(-1);
86573 __u64 ptr[];
86574 };
86575
86576 diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
86577 index d876736..ccce5c0 100644
86578 --- a/include/uapi/linux/byteorder/little_endian.h
86579 +++ b/include/uapi/linux/byteorder/little_endian.h
86580 @@ -42,51 +42,51 @@
86581
86582 static inline __le64 __cpu_to_le64p(const __u64 *p)
86583 {
86584 - return (__force __le64)*p;
86585 + return (__force const __le64)*p;
86586 }
86587 -static inline __u64 __le64_to_cpup(const __le64 *p)
86588 +static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
86589 {
86590 - return (__force __u64)*p;
86591 + return (__force const __u64)*p;
86592 }
86593 static inline __le32 __cpu_to_le32p(const __u32 *p)
86594 {
86595 - return (__force __le32)*p;
86596 + return (__force const __le32)*p;
86597 }
86598 static inline __u32 __le32_to_cpup(const __le32 *p)
86599 {
86600 - return (__force __u32)*p;
86601 + return (__force const __u32)*p;
86602 }
86603 static inline __le16 __cpu_to_le16p(const __u16 *p)
86604 {
86605 - return (__force __le16)*p;
86606 + return (__force const __le16)*p;
86607 }
86608 static inline __u16 __le16_to_cpup(const __le16 *p)
86609 {
86610 - return (__force __u16)*p;
86611 + return (__force const __u16)*p;
86612 }
86613 static inline __be64 __cpu_to_be64p(const __u64 *p)
86614 {
86615 - return (__force __be64)__swab64p(p);
86616 + return (__force const __be64)__swab64p(p);
86617 }
86618 static inline __u64 __be64_to_cpup(const __be64 *p)
86619 {
86620 - return __swab64p((__u64 *)p);
86621 + return __swab64p((const __u64 *)p);
86622 }
86623 static inline __be32 __cpu_to_be32p(const __u32 *p)
86624 {
86625 - return (__force __be32)__swab32p(p);
86626 + return (__force const __be32)__swab32p(p);
86627 }
86628 -static inline __u32 __be32_to_cpup(const __be32 *p)
86629 +static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
86630 {
86631 - return __swab32p((__u32 *)p);
86632 + return __swab32p((const __u32 *)p);
86633 }
86634 static inline __be16 __cpu_to_be16p(const __u16 *p)
86635 {
86636 - return (__force __be16)__swab16p(p);
86637 + return (__force const __be16)__swab16p(p);
86638 }
86639 static inline __u16 __be16_to_cpup(const __be16 *p)
86640 {
86641 - return __swab16p((__u16 *)p);
86642 + return __swab16p((const __u16 *)p);
86643 }
86644 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
86645 #define __le64_to_cpus(x) do { (void)(x); } while (0)
86646 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
86647 index ea9bf25..5140c61 100644
86648 --- a/include/uapi/linux/elf.h
86649 +++ b/include/uapi/linux/elf.h
86650 @@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
86651 #define PT_GNU_EH_FRAME 0x6474e550
86652
86653 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
86654 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
86655 +
86656 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
86657 +
86658 +/* Constants for the e_flags field */
86659 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86660 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
86661 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
86662 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
86663 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86664 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86665
86666 /*
86667 * Extended Numbering
86668 @@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
86669 #define DT_DEBUG 21
86670 #define DT_TEXTREL 22
86671 #define DT_JMPREL 23
86672 +#define DT_FLAGS 30
86673 + #define DF_TEXTREL 0x00000004
86674 #define DT_ENCODING 32
86675 #define OLD_DT_LOOS 0x60000000
86676 #define DT_LOOS 0x6000000d
86677 @@ -240,6 +253,19 @@ typedef struct elf64_hdr {
86678 #define PF_W 0x2
86679 #define PF_X 0x1
86680
86681 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
86682 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
86683 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
86684 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
86685 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
86686 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
86687 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
86688 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
86689 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
86690 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
86691 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
86692 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
86693 +
86694 typedef struct elf32_phdr{
86695 Elf32_Word p_type;
86696 Elf32_Off p_offset;
86697 @@ -332,6 +358,8 @@ typedef struct elf64_shdr {
86698 #define EI_OSABI 7
86699 #define EI_PAD 8
86700
86701 +#define EI_PAX 14
86702 +
86703 #define ELFMAG0 0x7f /* EI_MAG */
86704 #define ELFMAG1 'E'
86705 #define ELFMAG2 'L'
86706 diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
86707 index aa169c4..6a2771d 100644
86708 --- a/include/uapi/linux/personality.h
86709 +++ b/include/uapi/linux/personality.h
86710 @@ -30,6 +30,7 @@ enum {
86711 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
86712 ADDR_NO_RANDOMIZE | \
86713 ADDR_COMPAT_LAYOUT | \
86714 + ADDR_LIMIT_3GB | \
86715 MMAP_PAGE_ZERO)
86716
86717 /*
86718 diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
86719 index 7530e74..e714828 100644
86720 --- a/include/uapi/linux/screen_info.h
86721 +++ b/include/uapi/linux/screen_info.h
86722 @@ -43,7 +43,8 @@ struct screen_info {
86723 __u16 pages; /* 0x32 */
86724 __u16 vesa_attributes; /* 0x34 */
86725 __u32 capabilities; /* 0x36 */
86726 - __u8 _reserved[6]; /* 0x3a */
86727 + __u16 vesapm_size; /* 0x3a */
86728 + __u8 _reserved[4]; /* 0x3c */
86729 } __attribute__((packed));
86730
86731 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
86732 diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
86733 index 0e011eb..82681b1 100644
86734 --- a/include/uapi/linux/swab.h
86735 +++ b/include/uapi/linux/swab.h
86736 @@ -43,7 +43,7 @@
86737 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
86738 */
86739
86740 -static inline __attribute_const__ __u16 __fswab16(__u16 val)
86741 +static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
86742 {
86743 #ifdef __HAVE_BUILTIN_BSWAP16__
86744 return __builtin_bswap16(val);
86745 @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
86746 #endif
86747 }
86748
86749 -static inline __attribute_const__ __u32 __fswab32(__u32 val)
86750 +static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
86751 {
86752 #ifdef __HAVE_BUILTIN_BSWAP32__
86753 return __builtin_bswap32(val);
86754 @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
86755 #endif
86756 }
86757
86758 -static inline __attribute_const__ __u64 __fswab64(__u64 val)
86759 +static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
86760 {
86761 #ifdef __HAVE_BUILTIN_BSWAP64__
86762 return __builtin_bswap64(val);
86763 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
86764 index 43aaba1..1c30b48 100644
86765 --- a/include/uapi/linux/sysctl.h
86766 +++ b/include/uapi/linux/sysctl.h
86767 @@ -155,8 +155,6 @@ enum
86768 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
86769 };
86770
86771 -
86772 -
86773 /* CTL_VM names: */
86774 enum
86775 {
86776 diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
86777 index 1590c49..5eab462 100644
86778 --- a/include/uapi/linux/xattr.h
86779 +++ b/include/uapi/linux/xattr.h
86780 @@ -73,5 +73,9 @@
86781 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
86782 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
86783
86784 +/* User namespace */
86785 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
86786 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
86787 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
86788
86789 #endif /* _UAPI_LINUX_XATTR_H */
86790 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
86791 index f9466fa..f4e2b81 100644
86792 --- a/include/video/udlfb.h
86793 +++ b/include/video/udlfb.h
86794 @@ -53,10 +53,10 @@ struct dlfb_data {
86795 u32 pseudo_palette[256];
86796 int blank_mode; /*one of FB_BLANK_ */
86797 /* blit-only rendering path metrics, exposed through sysfs */
86798 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86799 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
86800 - atomic_t bytes_sent; /* to usb, after compression including overhead */
86801 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
86802 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86803 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
86804 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
86805 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
86806 };
86807
86808 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
86809 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
86810 index 30f5362..8ed8ac9 100644
86811 --- a/include/video/uvesafb.h
86812 +++ b/include/video/uvesafb.h
86813 @@ -122,6 +122,7 @@ struct uvesafb_par {
86814 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
86815 u8 pmi_setpal; /* PMI for palette changes */
86816 u16 *pmi_base; /* protected mode interface location */
86817 + u8 *pmi_code; /* protected mode code location */
86818 void *pmi_start;
86819 void *pmi_pal;
86820 u8 *vbe_state_orig; /*
86821 diff --git a/init/Kconfig b/init/Kconfig
86822 index 2081a4d..98d1149 100644
86823 --- a/init/Kconfig
86824 +++ b/init/Kconfig
86825 @@ -1150,6 +1150,7 @@ endif # CGROUPS
86826
86827 config CHECKPOINT_RESTORE
86828 bool "Checkpoint/restore support" if EXPERT
86829 + depends on !GRKERNSEC
86830 default n
86831 help
86832 Enables additional kernel features in a sake of checkpoint/restore.
86833 @@ -1659,7 +1660,7 @@ config SLUB_DEBUG
86834
86835 config COMPAT_BRK
86836 bool "Disable heap randomization"
86837 - default y
86838 + default n
86839 help
86840 Randomizing heap placement makes heap exploits harder, but it
86841 also breaks ancient binaries (including anything libc5 based).
86842 @@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
86843 config STOP_MACHINE
86844 bool
86845 default y
86846 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
86847 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
86848 help
86849 Need stop_machine() primitive.
86850
86851 diff --git a/init/Makefile b/init/Makefile
86852 index 7bc47ee..6da2dc7 100644
86853 --- a/init/Makefile
86854 +++ b/init/Makefile
86855 @@ -2,6 +2,9 @@
86856 # Makefile for the linux kernel.
86857 #
86858
86859 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
86860 +asflags-y := $(GCC_PLUGINS_AFLAGS)
86861 +
86862 obj-y := main.o version.o mounts.o
86863 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
86864 obj-y += noinitramfs.o
86865 diff --git a/init/do_mounts.c b/init/do_mounts.c
86866 index 9b3565c..3f90cf9 100644
86867 --- a/init/do_mounts.c
86868 +++ b/init/do_mounts.c
86869 @@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
86870 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
86871 {
86872 struct super_block *s;
86873 - int err = sys_mount(name, "/root", fs, flags, data);
86874 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
86875 if (err)
86876 return err;
86877
86878 - sys_chdir("/root");
86879 + sys_chdir((const char __force_user *)"/root");
86880 s = current->fs->pwd.dentry->d_sb;
86881 ROOT_DEV = s->s_dev;
86882 printk(KERN_INFO
86883 @@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
86884 va_start(args, fmt);
86885 vsprintf(buf, fmt, args);
86886 va_end(args);
86887 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
86888 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
86889 if (fd >= 0) {
86890 sys_ioctl(fd, FDEJECT, 0);
86891 sys_close(fd);
86892 }
86893 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
86894 - fd = sys_open("/dev/console", O_RDWR, 0);
86895 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
86896 if (fd >= 0) {
86897 sys_ioctl(fd, TCGETS, (long)&termios);
86898 termios.c_lflag &= ~ICANON;
86899 sys_ioctl(fd, TCSETSF, (long)&termios);
86900 - sys_read(fd, &c, 1);
86901 + sys_read(fd, (char __user *)&c, 1);
86902 termios.c_lflag |= ICANON;
86903 sys_ioctl(fd, TCSETSF, (long)&termios);
86904 sys_close(fd);
86905 @@ -590,8 +590,8 @@ void __init prepare_namespace(void)
86906 mount_root();
86907 out:
86908 devtmpfs_mount("dev");
86909 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
86910 - sys_chroot(".");
86911 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
86912 + sys_chroot((const char __force_user *)".");
86913 }
86914
86915 static bool is_tmpfs;
86916 diff --git a/init/do_mounts.h b/init/do_mounts.h
86917 index f5b978a..69dbfe8 100644
86918 --- a/init/do_mounts.h
86919 +++ b/init/do_mounts.h
86920 @@ -15,15 +15,15 @@ extern int root_mountflags;
86921
86922 static inline int create_dev(char *name, dev_t dev)
86923 {
86924 - sys_unlink(name);
86925 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
86926 + sys_unlink((char __force_user *)name);
86927 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
86928 }
86929
86930 #if BITS_PER_LONG == 32
86931 static inline u32 bstat(char *name)
86932 {
86933 struct stat64 stat;
86934 - if (sys_stat64(name, &stat) != 0)
86935 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
86936 return 0;
86937 if (!S_ISBLK(stat.st_mode))
86938 return 0;
86939 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
86940 static inline u32 bstat(char *name)
86941 {
86942 struct stat stat;
86943 - if (sys_newstat(name, &stat) != 0)
86944 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
86945 return 0;
86946 if (!S_ISBLK(stat.st_mode))
86947 return 0;
86948 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
86949 index 3e0878e..8a9d7a0 100644
86950 --- a/init/do_mounts_initrd.c
86951 +++ b/init/do_mounts_initrd.c
86952 @@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
86953 {
86954 sys_unshare(CLONE_FS | CLONE_FILES);
86955 /* stdin/stdout/stderr for /linuxrc */
86956 - sys_open("/dev/console", O_RDWR, 0);
86957 + sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
86958 sys_dup(0);
86959 sys_dup(0);
86960 /* move initrd over / and chdir/chroot in initrd root */
86961 - sys_chdir("/root");
86962 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
86963 - sys_chroot(".");
86964 + sys_chdir((const char __force_user *)"/root");
86965 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
86966 + sys_chroot((const char __force_user *)".");
86967 sys_setsid();
86968 return 0;
86969 }
86970 @@ -59,8 +59,8 @@ static void __init handle_initrd(void)
86971 create_dev("/dev/root.old", Root_RAM0);
86972 /* mount initrd on rootfs' /root */
86973 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
86974 - sys_mkdir("/old", 0700);
86975 - sys_chdir("/old");
86976 + sys_mkdir((const char __force_user *)"/old", 0700);
86977 + sys_chdir((const char __force_user *)"/old");
86978
86979 /* try loading default modules from initrd */
86980 load_default_modules();
86981 @@ -80,31 +80,31 @@ static void __init handle_initrd(void)
86982 current->flags &= ~PF_FREEZER_SKIP;
86983
86984 /* move initrd to rootfs' /old */
86985 - sys_mount("..", ".", NULL, MS_MOVE, NULL);
86986 + sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
86987 /* switch root and cwd back to / of rootfs */
86988 - sys_chroot("..");
86989 + sys_chroot((const char __force_user *)"..");
86990
86991 if (new_decode_dev(real_root_dev) == Root_RAM0) {
86992 - sys_chdir("/old");
86993 + sys_chdir((const char __force_user *)"/old");
86994 return;
86995 }
86996
86997 - sys_chdir("/");
86998 + sys_chdir((const char __force_user *)"/");
86999 ROOT_DEV = new_decode_dev(real_root_dev);
87000 mount_root();
87001
87002 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
87003 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
87004 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
87005 if (!error)
87006 printk("okay\n");
87007 else {
87008 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
87009 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
87010 if (error == -ENOENT)
87011 printk("/initrd does not exist. Ignored.\n");
87012 else
87013 printk("failed\n");
87014 printk(KERN_NOTICE "Unmounting old root\n");
87015 - sys_umount("/old", MNT_DETACH);
87016 + sys_umount((char __force_user *)"/old", MNT_DETACH);
87017 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
87018 if (fd < 0) {
87019 error = fd;
87020 @@ -127,11 +127,11 @@ int __init initrd_load(void)
87021 * mounted in the normal path.
87022 */
87023 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
87024 - sys_unlink("/initrd.image");
87025 + sys_unlink((const char __force_user *)"/initrd.image");
87026 handle_initrd();
87027 return 1;
87028 }
87029 }
87030 - sys_unlink("/initrd.image");
87031 + sys_unlink((const char __force_user *)"/initrd.image");
87032 return 0;
87033 }
87034 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
87035 index 8cb6db5..d729f50 100644
87036 --- a/init/do_mounts_md.c
87037 +++ b/init/do_mounts_md.c
87038 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
87039 partitioned ? "_d" : "", minor,
87040 md_setup_args[ent].device_names);
87041
87042 - fd = sys_open(name, 0, 0);
87043 + fd = sys_open((char __force_user *)name, 0, 0);
87044 if (fd < 0) {
87045 printk(KERN_ERR "md: open failed - cannot start "
87046 "array %s\n", name);
87047 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
87048 * array without it
87049 */
87050 sys_close(fd);
87051 - fd = sys_open(name, 0, 0);
87052 + fd = sys_open((char __force_user *)name, 0, 0);
87053 sys_ioctl(fd, BLKRRPART, 0);
87054 }
87055 sys_close(fd);
87056 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
87057
87058 wait_for_device_probe();
87059
87060 - fd = sys_open("/dev/md0", 0, 0);
87061 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
87062 if (fd >= 0) {
87063 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
87064 sys_close(fd);
87065 diff --git a/init/init_task.c b/init/init_task.c
87066 index ba0a7f36..2bcf1d5 100644
87067 --- a/init/init_task.c
87068 +++ b/init/init_task.c
87069 @@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
87070 * Initial thread structure. Alignment of this is handled by a special
87071 * linker map entry.
87072 */
87073 +#ifdef CONFIG_X86
87074 +union thread_union init_thread_union __init_task_data;
87075 +#else
87076 union thread_union init_thread_union __init_task_data =
87077 { INIT_THREAD_INFO(init_task) };
87078 +#endif
87079 diff --git a/init/initramfs.c b/init/initramfs.c
87080 index ad1bd77..dca2c1b 100644
87081 --- a/init/initramfs.c
87082 +++ b/init/initramfs.c
87083 @@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
87084
87085 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
87086 while (count) {
87087 - ssize_t rv = sys_write(fd, p, count);
87088 + ssize_t rv = sys_write(fd, (char __force_user *)p, count);
87089
87090 if (rv < 0) {
87091 if (rv == -EINTR || rv == -EAGAIN)
87092 @@ -107,7 +107,7 @@ static void __init free_hash(void)
87093 }
87094 }
87095
87096 -static long __init do_utime(char *filename, time_t mtime)
87097 +static long __init do_utime(char __force_user *filename, time_t mtime)
87098 {
87099 struct timespec t[2];
87100
87101 @@ -142,7 +142,7 @@ static void __init dir_utime(void)
87102 struct dir_entry *de, *tmp;
87103 list_for_each_entry_safe(de, tmp, &dir_list, list) {
87104 list_del(&de->list);
87105 - do_utime(de->name, de->mtime);
87106 + do_utime((char __force_user *)de->name, de->mtime);
87107 kfree(de->name);
87108 kfree(de);
87109 }
87110 @@ -304,7 +304,7 @@ static int __init maybe_link(void)
87111 if (nlink >= 2) {
87112 char *old = find_link(major, minor, ino, mode, collected);
87113 if (old)
87114 - return (sys_link(old, collected) < 0) ? -1 : 1;
87115 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
87116 }
87117 return 0;
87118 }
87119 @@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
87120 {
87121 struct stat st;
87122
87123 - if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
87124 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
87125 if (S_ISDIR(st.st_mode))
87126 - sys_rmdir(path);
87127 + sys_rmdir((char __force_user *)path);
87128 else
87129 - sys_unlink(path);
87130 + sys_unlink((char __force_user *)path);
87131 }
87132 }
87133
87134 @@ -338,7 +338,7 @@ static int __init do_name(void)
87135 int openflags = O_WRONLY|O_CREAT;
87136 if (ml != 1)
87137 openflags |= O_TRUNC;
87138 - wfd = sys_open(collected, openflags, mode);
87139 + wfd = sys_open((char __force_user *)collected, openflags, mode);
87140
87141 if (wfd >= 0) {
87142 sys_fchown(wfd, uid, gid);
87143 @@ -350,17 +350,17 @@ static int __init do_name(void)
87144 }
87145 }
87146 } else if (S_ISDIR(mode)) {
87147 - sys_mkdir(collected, mode);
87148 - sys_chown(collected, uid, gid);
87149 - sys_chmod(collected, mode);
87150 + sys_mkdir((char __force_user *)collected, mode);
87151 + sys_chown((char __force_user *)collected, uid, gid);
87152 + sys_chmod((char __force_user *)collected, mode);
87153 dir_add(collected, mtime);
87154 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
87155 S_ISFIFO(mode) || S_ISSOCK(mode)) {
87156 if (maybe_link() == 0) {
87157 - sys_mknod(collected, mode, rdev);
87158 - sys_chown(collected, uid, gid);
87159 - sys_chmod(collected, mode);
87160 - do_utime(collected, mtime);
87161 + sys_mknod((char __force_user *)collected, mode, rdev);
87162 + sys_chown((char __force_user *)collected, uid, gid);
87163 + sys_chmod((char __force_user *)collected, mode);
87164 + do_utime((char __force_user *)collected, mtime);
87165 }
87166 }
87167 return 0;
87168 @@ -372,7 +372,7 @@ static int __init do_copy(void)
87169 if (xwrite(wfd, victim, body_len) != body_len)
87170 error("write error");
87171 sys_close(wfd);
87172 - do_utime(vcollected, mtime);
87173 + do_utime((char __force_user *)vcollected, mtime);
87174 kfree(vcollected);
87175 eat(body_len);
87176 state = SkipIt;
87177 @@ -390,9 +390,9 @@ static int __init do_symlink(void)
87178 {
87179 collected[N_ALIGN(name_len) + body_len] = '\0';
87180 clean_path(collected, 0);
87181 - sys_symlink(collected + N_ALIGN(name_len), collected);
87182 - sys_lchown(collected, uid, gid);
87183 - do_utime(collected, mtime);
87184 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
87185 + sys_lchown((char __force_user *)collected, uid, gid);
87186 + do_utime((char __force_user *)collected, mtime);
87187 state = SkipIt;
87188 next_state = Reset;
87189 return 0;
87190 diff --git a/init/main.c b/init/main.c
87191 index 321d0ce..91b53e5 100644
87192 --- a/init/main.c
87193 +++ b/init/main.c
87194 @@ -98,6 +98,8 @@ extern void radix_tree_init(void);
87195 static inline void mark_rodata_ro(void) { }
87196 #endif
87197
87198 +extern void grsecurity_init(void);
87199 +
87200 /*
87201 * Debug helper: via this flag we know that we are in 'early bootup code'
87202 * where only the boot processor is running with IRQ disabled. This means
87203 @@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
87204
87205 __setup("reset_devices", set_reset_devices);
87206
87207 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
87208 +kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
87209 +static int __init setup_grsec_proc_gid(char *str)
87210 +{
87211 + grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
87212 + return 1;
87213 +}
87214 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
87215 +#endif
87216 +
87217 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
87218 +unsigned long pax_user_shadow_base __read_only;
87219 +EXPORT_SYMBOL(pax_user_shadow_base);
87220 +extern char pax_enter_kernel_user[];
87221 +extern char pax_exit_kernel_user[];
87222 +#endif
87223 +
87224 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
87225 +static int __init setup_pax_nouderef(char *str)
87226 +{
87227 +#ifdef CONFIG_X86_32
87228 + unsigned int cpu;
87229 + struct desc_struct *gdt;
87230 +
87231 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
87232 + gdt = get_cpu_gdt_table(cpu);
87233 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
87234 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
87235 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
87236 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
87237 + }
87238 + loadsegment(ds, __KERNEL_DS);
87239 + loadsegment(es, __KERNEL_DS);
87240 + loadsegment(ss, __KERNEL_DS);
87241 +#else
87242 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
87243 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
87244 + clone_pgd_mask = ~(pgdval_t)0UL;
87245 + pax_user_shadow_base = 0UL;
87246 + setup_clear_cpu_cap(X86_FEATURE_PCID);
87247 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
87248 +#endif
87249 +
87250 + return 0;
87251 +}
87252 +early_param("pax_nouderef", setup_pax_nouderef);
87253 +
87254 +#ifdef CONFIG_X86_64
87255 +static int __init setup_pax_weakuderef(char *str)
87256 +{
87257 + if (clone_pgd_mask != ~(pgdval_t)0UL)
87258 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
87259 + return 1;
87260 +}
87261 +__setup("pax_weakuderef", setup_pax_weakuderef);
87262 +#endif
87263 +#endif
87264 +
87265 +#ifdef CONFIG_PAX_SOFTMODE
87266 +int pax_softmode;
87267 +
87268 +static int __init setup_pax_softmode(char *str)
87269 +{
87270 + get_option(&str, &pax_softmode);
87271 + return 1;
87272 +}
87273 +__setup("pax_softmode=", setup_pax_softmode);
87274 +#endif
87275 +
87276 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
87277 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
87278 static const char *panic_later, *panic_param;
87279 @@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
87280 struct blacklist_entry *entry;
87281 char *fn_name;
87282
87283 - fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
87284 + fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
87285 if (!fn_name)
87286 return false;
87287
87288 @@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
87289 {
87290 int count = preempt_count();
87291 int ret;
87292 - char msgbuf[64];
87293 + const char *msg1 = "", *msg2 = "";
87294
87295 if (initcall_blacklisted(fn))
87296 return -EPERM;
87297 @@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
87298 else
87299 ret = fn();
87300
87301 - msgbuf[0] = 0;
87302 -
87303 if (preempt_count() != count) {
87304 - sprintf(msgbuf, "preemption imbalance ");
87305 + msg1 = " preemption imbalance";
87306 preempt_count_set(count);
87307 }
87308 if (irqs_disabled()) {
87309 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
87310 + msg2 = " disabled interrupts";
87311 local_irq_enable();
87312 }
87313 - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
87314 + WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
87315
87316 + add_latent_entropy();
87317 return ret;
87318 }
87319
87320 @@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
87321 {
87322 argv_init[0] = init_filename;
87323 return do_execve(getname_kernel(init_filename),
87324 - (const char __user *const __user *)argv_init,
87325 - (const char __user *const __user *)envp_init);
87326 + (const char __user *const __force_user *)argv_init,
87327 + (const char __user *const __force_user *)envp_init);
87328 }
87329
87330 static int try_to_run_init_process(const char *init_filename)
87331 @@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
87332 return ret;
87333 }
87334
87335 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87336 +extern int gr_init_ran;
87337 +#endif
87338 +
87339 static noinline void __init kernel_init_freeable(void);
87340
87341 static int __ref kernel_init(void *unused)
87342 @@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
87343 ramdisk_execute_command, ret);
87344 }
87345
87346 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87347 + /* if no initrd was used, be extra sure we enforce chroot restrictions */
87348 + gr_init_ran = 1;
87349 +#endif
87350 +
87351 /*
87352 * We try each of these until one succeeds.
87353 *
87354 @@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
87355 do_basic_setup();
87356
87357 /* Open the /dev/console on the rootfs, this should never fail */
87358 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
87359 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
87360 pr_err("Warning: unable to open an initial console.\n");
87361
87362 (void) sys_dup(0);
87363 @@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
87364 if (!ramdisk_execute_command)
87365 ramdisk_execute_command = "/init";
87366
87367 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
87368 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
87369 ramdisk_execute_command = NULL;
87370 prepare_namespace();
87371 }
87372
87373 + grsecurity_init();
87374 +
87375 /*
87376 * Ok, we have completed the initial bootup, and
87377 * we're essentially up and running. Get rid of the
87378 diff --git a/ipc/compat.c b/ipc/compat.c
87379 index 9b3c85f..1c4d897 100644
87380 --- a/ipc/compat.c
87381 +++ b/ipc/compat.c
87382 @@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
87383 COMPAT_SHMLBA);
87384 if (err < 0)
87385 return err;
87386 - return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
87387 + return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
87388 }
87389 case SHMDT:
87390 return sys_shmdt(compat_ptr(ptr));
87391 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
87392 index e8075b2..76f2c6a 100644
87393 --- a/ipc/ipc_sysctl.c
87394 +++ b/ipc/ipc_sysctl.c
87395 @@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
87396 static int proc_ipc_dointvec(struct ctl_table *table, int write,
87397 void __user *buffer, size_t *lenp, loff_t *ppos)
87398 {
87399 - struct ctl_table ipc_table;
87400 + ctl_table_no_const ipc_table;
87401
87402 memcpy(&ipc_table, table, sizeof(ipc_table));
87403 ipc_table.data = get_ipc(table);
87404 @@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
87405 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
87406 void __user *buffer, size_t *lenp, loff_t *ppos)
87407 {
87408 - struct ctl_table ipc_table;
87409 + ctl_table_no_const ipc_table;
87410
87411 memcpy(&ipc_table, table, sizeof(ipc_table));
87412 ipc_table.data = get_ipc(table);
87413 @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
87414 static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87415 void __user *buffer, size_t *lenp, loff_t *ppos)
87416 {
87417 - struct ctl_table ipc_table;
87418 + ctl_table_no_const ipc_table;
87419 size_t lenp_bef = *lenp;
87420 int rc;
87421
87422 @@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87423 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
87424 void __user *buffer, size_t *lenp, loff_t *ppos)
87425 {
87426 - struct ctl_table ipc_table;
87427 + ctl_table_no_const ipc_table;
87428 memcpy(&ipc_table, table, sizeof(ipc_table));
87429 ipc_table.data = get_ipc(table);
87430
87431 @@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
87432 static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
87433 void __user *buffer, size_t *lenp, loff_t *ppos)
87434 {
87435 - struct ctl_table ipc_table;
87436 + ctl_table_no_const ipc_table;
87437 int oldval;
87438 int rc;
87439
87440 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
87441 index 68d4e95..1477ded 100644
87442 --- a/ipc/mq_sysctl.c
87443 +++ b/ipc/mq_sysctl.c
87444 @@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
87445 static int proc_mq_dointvec(struct ctl_table *table, int write,
87446 void __user *buffer, size_t *lenp, loff_t *ppos)
87447 {
87448 - struct ctl_table mq_table;
87449 + ctl_table_no_const mq_table;
87450 memcpy(&mq_table, table, sizeof(mq_table));
87451 mq_table.data = get_mq(table);
87452
87453 @@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
87454 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
87455 void __user *buffer, size_t *lenp, loff_t *ppos)
87456 {
87457 - struct ctl_table mq_table;
87458 + ctl_table_no_const mq_table;
87459 memcpy(&mq_table, table, sizeof(mq_table));
87460 mq_table.data = get_mq(table);
87461
87462 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
87463 index 4fcf39a..d3cc2ec 100644
87464 --- a/ipc/mqueue.c
87465 +++ b/ipc/mqueue.c
87466 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
87467 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
87468 info->attr.mq_msgsize);
87469
87470 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
87471 spin_lock(&mq_lock);
87472 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
87473 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
87474 diff --git a/ipc/shm.c b/ipc/shm.c
87475 index 0145479..3d27947 100644
87476 --- a/ipc/shm.c
87477 +++ b/ipc/shm.c
87478 @@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
87479 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
87480 #endif
87481
87482 +#ifdef CONFIG_GRKERNSEC
87483 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87484 + const u64 shm_createtime, const kuid_t cuid,
87485 + const int shmid);
87486 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87487 + const u64 shm_createtime);
87488 +#endif
87489 +
87490 void shm_init_ns(struct ipc_namespace *ns)
87491 {
87492 ns->shm_ctlmax = SHMMAX;
87493 @@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
87494 shp->shm_lprid = 0;
87495 shp->shm_atim = shp->shm_dtim = 0;
87496 shp->shm_ctim = get_seconds();
87497 +#ifdef CONFIG_GRKERNSEC
87498 + shp->shm_createtime = ktime_get_ns();
87499 +#endif
87500 shp->shm_segsz = size;
87501 shp->shm_nattch = 0;
87502 shp->shm_file = file;
87503 @@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87504 f_mode = FMODE_READ | FMODE_WRITE;
87505 }
87506 if (shmflg & SHM_EXEC) {
87507 +
87508 +#ifdef CONFIG_PAX_MPROTECT
87509 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
87510 + goto out;
87511 +#endif
87512 +
87513 prot |= PROT_EXEC;
87514 acc_mode |= S_IXUGO;
87515 }
87516 @@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87517 if (err)
87518 goto out_unlock;
87519
87520 +#ifdef CONFIG_GRKERNSEC
87521 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
87522 + shp->shm_perm.cuid, shmid) ||
87523 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
87524 + err = -EACCES;
87525 + goto out_unlock;
87526 + }
87527 +#endif
87528 +
87529 ipc_lock_object(&shp->shm_perm);
87530
87531 /* check if shm_destroy() is tearing down shp */
87532 @@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87533 path = shp->shm_file->f_path;
87534 path_get(&path);
87535 shp->shm_nattch++;
87536 +#ifdef CONFIG_GRKERNSEC
87537 + shp->shm_lapid = current->pid;
87538 +#endif
87539 size = i_size_read(path.dentry->d_inode);
87540 ipc_unlock_object(&shp->shm_perm);
87541 rcu_read_unlock();
87542 diff --git a/ipc/util.c b/ipc/util.c
87543 index 88adc32..3867c68 100644
87544 --- a/ipc/util.c
87545 +++ b/ipc/util.c
87546 @@ -71,6 +71,8 @@ struct ipc_proc_iface {
87547 int (*show)(struct seq_file *, void *);
87548 };
87549
87550 +extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
87551 +
87552 static void ipc_memory_notifier(struct work_struct *work)
87553 {
87554 ipcns_notify(IPCNS_MEMCHANGED);
87555 @@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
87556 granted_mode >>= 6;
87557 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
87558 granted_mode >>= 3;
87559 +
87560 + if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
87561 + return -1;
87562 +
87563 /* is there some bit set in requested_mode but not in granted_mode? */
87564 if ((requested_mode & ~granted_mode & 0007) &&
87565 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
87566 diff --git a/kernel/audit.c b/kernel/audit.c
87567 index c6df990..fde80b4 100644
87568 --- a/kernel/audit.c
87569 +++ b/kernel/audit.c
87570 @@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
87571 3) suppressed due to audit_rate_limit
87572 4) suppressed due to audit_backlog_limit
87573 */
87574 -static atomic_t audit_lost = ATOMIC_INIT(0);
87575 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
87576
87577 /* The netlink socket. */
87578 static struct sock *audit_sock;
87579 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
87580 unsigned long now;
87581 int print;
87582
87583 - atomic_inc(&audit_lost);
87584 + atomic_inc_unchecked(&audit_lost);
87585
87586 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
87587
87588 @@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
87589 if (print) {
87590 if (printk_ratelimit())
87591 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
87592 - atomic_read(&audit_lost),
87593 + atomic_read_unchecked(&audit_lost),
87594 audit_rate_limit,
87595 audit_backlog_limit);
87596 audit_panic(message);
87597 @@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
87598 s.pid = audit_pid;
87599 s.rate_limit = audit_rate_limit;
87600 s.backlog_limit = audit_backlog_limit;
87601 - s.lost = atomic_read(&audit_lost);
87602 + s.lost = atomic_read_unchecked(&audit_lost);
87603 s.backlog = skb_queue_len(&audit_skb_queue);
87604 s.version = AUDIT_VERSION_LATEST;
87605 s.backlog_wait_time = audit_backlog_wait_time;
87606 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
87607 index e420a0c..38137fa 100644
87608 --- a/kernel/auditsc.c
87609 +++ b/kernel/auditsc.c
87610 @@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
87611 }
87612
87613 /* global counter which is incremented every time something logs in */
87614 -static atomic_t session_id = ATOMIC_INIT(0);
87615 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
87616
87617 static int audit_set_loginuid_perm(kuid_t loginuid)
87618 {
87619 @@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
87620
87621 /* are we setting or clearing? */
87622 if (uid_valid(loginuid))
87623 - sessionid = (unsigned int)atomic_inc_return(&session_id);
87624 + sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
87625
87626 task->sessionid = sessionid;
87627 task->loginuid = loginuid;
87628 diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
87629 index d6594e4..597264b 100644
87630 --- a/kernel/bpf/core.c
87631 +++ b/kernel/bpf/core.c
87632 @@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87633 * random section of illegal instructions.
87634 */
87635 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
87636 - hdr = module_alloc(size);
87637 + hdr = module_alloc_exec(size);
87638 if (hdr == NULL)
87639 return NULL;
87640
87641 /* Fill space with illegal/arch-dep instructions. */
87642 bpf_fill_ill_insns(hdr, size);
87643
87644 + pax_open_kernel();
87645 hdr->pages = size / PAGE_SIZE;
87646 + pax_close_kernel();
87647 +
87648 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
87649 PAGE_SIZE - sizeof(*hdr));
87650 start = (prandom_u32() % hole) & ~(alignment - 1);
87651 @@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87652
87653 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
87654 {
87655 - module_free(NULL, hdr);
87656 + module_free_exec(NULL, hdr);
87657 }
87658 #endif /* CONFIG_BPF_JIT */
87659
87660 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
87661 index ba61c8c..c60c486 100644
87662 --- a/kernel/bpf/syscall.c
87663 +++ b/kernel/bpf/syscall.c
87664 @@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
87665 int err;
87666
87667 /* the syscall is limited to root temporarily. This restriction will be
87668 - * lifted when security audit is clean. Note that eBPF+tracing must have
87669 - * this restriction, since it may pass kernel data to user space
87670 + * lifted by upstream when a half-assed security audit is clean. Note
87671 + * that eBPF+tracing must have this restriction, since it may pass
87672 + * kernel data to user space
87673 */
87674 if (!capable(CAP_SYS_ADMIN))
87675 return -EPERM;
87676 +#ifdef CONFIG_GRKERNSEC
87677 + return -EPERM;
87678 +#endif
87679
87680 if (!access_ok(VERIFY_READ, uattr, 1))
87681 return -EFAULT;
87682 diff --git a/kernel/capability.c b/kernel/capability.c
87683 index 989f5bf..d317ca0 100644
87684 --- a/kernel/capability.c
87685 +++ b/kernel/capability.c
87686 @@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
87687 * before modification is attempted and the application
87688 * fails.
87689 */
87690 + if (tocopy > ARRAY_SIZE(kdata))
87691 + return -EFAULT;
87692 +
87693 if (copy_to_user(dataptr, kdata, tocopy
87694 * sizeof(struct __user_cap_data_struct))) {
87695 return -EFAULT;
87696 @@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
87697 int ret;
87698
87699 rcu_read_lock();
87700 - ret = security_capable(__task_cred(t), ns, cap);
87701 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
87702 + gr_task_is_capable(t, __task_cred(t), cap);
87703 rcu_read_unlock();
87704
87705 - return (ret == 0);
87706 + return ret;
87707 }
87708
87709 /**
87710 @@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
87711 int ret;
87712
87713 rcu_read_lock();
87714 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
87715 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
87716 rcu_read_unlock();
87717
87718 - return (ret == 0);
87719 + return ret;
87720 }
87721
87722 /**
87723 @@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
87724 BUG();
87725 }
87726
87727 - if (security_capable(current_cred(), ns, cap) == 0) {
87728 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
87729 current->flags |= PF_SUPERPRIV;
87730 return true;
87731 }
87732 @@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
87733 }
87734 EXPORT_SYMBOL(ns_capable);
87735
87736 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
87737 +{
87738 + if (unlikely(!cap_valid(cap))) {
87739 + printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
87740 + BUG();
87741 + }
87742 +
87743 + if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
87744 + current->flags |= PF_SUPERPRIV;
87745 + return true;
87746 + }
87747 + return false;
87748 +}
87749 +EXPORT_SYMBOL(ns_capable_nolog);
87750 +
87751 /**
87752 * file_ns_capable - Determine if the file's opener had a capability in effect
87753 * @file: The file we want to check
87754 @@ -427,6 +446,12 @@ bool capable(int cap)
87755 }
87756 EXPORT_SYMBOL(capable);
87757
87758 +bool capable_nolog(int cap)
87759 +{
87760 + return ns_capable_nolog(&init_user_ns, cap);
87761 +}
87762 +EXPORT_SYMBOL(capable_nolog);
87763 +
87764 /**
87765 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
87766 * @inode: The inode in question
87767 @@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
87768 kgid_has_mapping(ns, inode->i_gid);
87769 }
87770 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
87771 +
87772 +bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
87773 +{
87774 + struct user_namespace *ns = current_user_ns();
87775 +
87776 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
87777 + kgid_has_mapping(ns, inode->i_gid);
87778 +}
87779 +EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
87780 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
87781 index 136ecea..45157a6 100644
87782 --- a/kernel/cgroup.c
87783 +++ b/kernel/cgroup.c
87784 @@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
87785 if (!pathbuf || !agentbuf)
87786 goto out;
87787
87788 + if (agentbuf[0] == '\0')
87789 + goto out;
87790 +
87791 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
87792 if (!path)
87793 goto out;
87794 @@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
87795 struct task_struct *task;
87796 int count = 0;
87797
87798 - seq_printf(seq, "css_set %p\n", cset);
87799 + seq_printf(seq, "css_set %pK\n", cset);
87800
87801 list_for_each_entry(task, &cset->tasks, cg_list) {
87802 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
87803 diff --git a/kernel/compat.c b/kernel/compat.c
87804 index ebb3c36..1df606e 100644
87805 --- a/kernel/compat.c
87806 +++ b/kernel/compat.c
87807 @@ -13,6 +13,7 @@
87808
87809 #include <linux/linkage.h>
87810 #include <linux/compat.h>
87811 +#include <linux/module.h>
87812 #include <linux/errno.h>
87813 #include <linux/time.h>
87814 #include <linux/signal.h>
87815 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
87816 mm_segment_t oldfs;
87817 long ret;
87818
87819 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
87820 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
87821 oldfs = get_fs();
87822 set_fs(KERNEL_DS);
87823 ret = hrtimer_nanosleep_restart(restart);
87824 @@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
87825 oldfs = get_fs();
87826 set_fs(KERNEL_DS);
87827 ret = hrtimer_nanosleep(&tu,
87828 - rmtp ? (struct timespec __user *)&rmt : NULL,
87829 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
87830 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
87831 set_fs(oldfs);
87832
87833 @@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
87834 mm_segment_t old_fs = get_fs();
87835
87836 set_fs(KERNEL_DS);
87837 - ret = sys_sigpending((old_sigset_t __user *) &s);
87838 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
87839 set_fs(old_fs);
87840 if (ret == 0)
87841 ret = put_user(s, set);
87842 @@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
87843 mm_segment_t old_fs = get_fs();
87844
87845 set_fs(KERNEL_DS);
87846 - ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
87847 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
87848 set_fs(old_fs);
87849
87850 if (!ret) {
87851 @@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
87852 set_fs (KERNEL_DS);
87853 ret = sys_wait4(pid,
87854 (stat_addr ?
87855 - (unsigned int __user *) &status : NULL),
87856 - options, (struct rusage __user *) &r);
87857 + (unsigned int __force_user *) &status : NULL),
87858 + options, (struct rusage __force_user *) &r);
87859 set_fs (old_fs);
87860
87861 if (ret > 0) {
87862 @@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
87863 memset(&info, 0, sizeof(info));
87864
87865 set_fs(KERNEL_DS);
87866 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
87867 - uru ? (struct rusage __user *)&ru : NULL);
87868 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
87869 + uru ? (struct rusage __force_user *)&ru : NULL);
87870 set_fs(old_fs);
87871
87872 if ((ret < 0) || (info.si_signo == 0))
87873 @@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
87874 oldfs = get_fs();
87875 set_fs(KERNEL_DS);
87876 err = sys_timer_settime(timer_id, flags,
87877 - (struct itimerspec __user *) &newts,
87878 - (struct itimerspec __user *) &oldts);
87879 + (struct itimerspec __force_user *) &newts,
87880 + (struct itimerspec __force_user *) &oldts);
87881 set_fs(oldfs);
87882 if (!err && old && put_compat_itimerspec(old, &oldts))
87883 return -EFAULT;
87884 @@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
87885 oldfs = get_fs();
87886 set_fs(KERNEL_DS);
87887 err = sys_timer_gettime(timer_id,
87888 - (struct itimerspec __user *) &ts);
87889 + (struct itimerspec __force_user *) &ts);
87890 set_fs(oldfs);
87891 if (!err && put_compat_itimerspec(setting, &ts))
87892 return -EFAULT;
87893 @@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
87894 oldfs = get_fs();
87895 set_fs(KERNEL_DS);
87896 err = sys_clock_settime(which_clock,
87897 - (struct timespec __user *) &ts);
87898 + (struct timespec __force_user *) &ts);
87899 set_fs(oldfs);
87900 return err;
87901 }
87902 @@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
87903 oldfs = get_fs();
87904 set_fs(KERNEL_DS);
87905 err = sys_clock_gettime(which_clock,
87906 - (struct timespec __user *) &ts);
87907 + (struct timespec __force_user *) &ts);
87908 set_fs(oldfs);
87909 if (!err && compat_put_timespec(&ts, tp))
87910 return -EFAULT;
87911 @@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
87912
87913 oldfs = get_fs();
87914 set_fs(KERNEL_DS);
87915 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
87916 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
87917 set_fs(oldfs);
87918
87919 err = compat_put_timex(utp, &txc);
87920 @@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
87921 oldfs = get_fs();
87922 set_fs(KERNEL_DS);
87923 err = sys_clock_getres(which_clock,
87924 - (struct timespec __user *) &ts);
87925 + (struct timespec __force_user *) &ts);
87926 set_fs(oldfs);
87927 if (!err && tp && compat_put_timespec(&ts, tp))
87928 return -EFAULT;
87929 @@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
87930 struct timespec tu;
87931 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
87932
87933 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
87934 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
87935 oldfs = get_fs();
87936 set_fs(KERNEL_DS);
87937 err = clock_nanosleep_restart(restart);
87938 @@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
87939 oldfs = get_fs();
87940 set_fs(KERNEL_DS);
87941 err = sys_clock_nanosleep(which_clock, flags,
87942 - (struct timespec __user *) &in,
87943 - (struct timespec __user *) &out);
87944 + (struct timespec __force_user *) &in,
87945 + (struct timespec __force_user *) &out);
87946 set_fs(oldfs);
87947
87948 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
87949 @@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
87950 mm_segment_t old_fs = get_fs();
87951
87952 set_fs(KERNEL_DS);
87953 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
87954 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
87955 set_fs(old_fs);
87956 if (compat_put_timespec(&t, interval))
87957 return -EFAULT;
87958 diff --git a/kernel/configs.c b/kernel/configs.c
87959 index c18b1f1..b9a0132 100644
87960 --- a/kernel/configs.c
87961 +++ b/kernel/configs.c
87962 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
87963 struct proc_dir_entry *entry;
87964
87965 /* create the current config file */
87966 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
87967 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
87968 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
87969 + &ikconfig_file_ops);
87970 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
87971 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
87972 + &ikconfig_file_ops);
87973 +#endif
87974 +#else
87975 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
87976 &ikconfig_file_ops);
87977 +#endif
87978 +
87979 if (!entry)
87980 return -ENOMEM;
87981
87982 diff --git a/kernel/cred.c b/kernel/cred.c
87983 index e0573a4..26c0fd3 100644
87984 --- a/kernel/cred.c
87985 +++ b/kernel/cred.c
87986 @@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
87987 validate_creds(cred);
87988 alter_cred_subscribers(cred, -1);
87989 put_cred(cred);
87990 +
87991 +#ifdef CONFIG_GRKERNSEC_SETXID
87992 + cred = (struct cred *) tsk->delayed_cred;
87993 + if (cred != NULL) {
87994 + tsk->delayed_cred = NULL;
87995 + validate_creds(cred);
87996 + alter_cred_subscribers(cred, -1);
87997 + put_cred(cred);
87998 + }
87999 +#endif
88000 }
88001
88002 /**
88003 @@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
88004 * Always returns 0 thus allowing this function to be tail-called at the end
88005 * of, say, sys_setgid().
88006 */
88007 -int commit_creds(struct cred *new)
88008 +static int __commit_creds(struct cred *new)
88009 {
88010 struct task_struct *task = current;
88011 const struct cred *old = task->real_cred;
88012 @@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
88013
88014 get_cred(new); /* we will require a ref for the subj creds too */
88015
88016 + gr_set_role_label(task, new->uid, new->gid);
88017 +
88018 /* dumpability changes */
88019 if (!uid_eq(old->euid, new->euid) ||
88020 !gid_eq(old->egid, new->egid) ||
88021 @@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
88022 put_cred(old);
88023 return 0;
88024 }
88025 +#ifdef CONFIG_GRKERNSEC_SETXID
88026 +extern int set_user(struct cred *new);
88027 +
88028 +void gr_delayed_cred_worker(void)
88029 +{
88030 + const struct cred *new = current->delayed_cred;
88031 + struct cred *ncred;
88032 +
88033 + current->delayed_cred = NULL;
88034 +
88035 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
88036 + // from doing get_cred on it when queueing this
88037 + put_cred(new);
88038 + return;
88039 + } else if (new == NULL)
88040 + return;
88041 +
88042 + ncred = prepare_creds();
88043 + if (!ncred)
88044 + goto die;
88045 + // uids
88046 + ncred->uid = new->uid;
88047 + ncred->euid = new->euid;
88048 + ncred->suid = new->suid;
88049 + ncred->fsuid = new->fsuid;
88050 + // gids
88051 + ncred->gid = new->gid;
88052 + ncred->egid = new->egid;
88053 + ncred->sgid = new->sgid;
88054 + ncred->fsgid = new->fsgid;
88055 + // groups
88056 + set_groups(ncred, new->group_info);
88057 + // caps
88058 + ncred->securebits = new->securebits;
88059 + ncred->cap_inheritable = new->cap_inheritable;
88060 + ncred->cap_permitted = new->cap_permitted;
88061 + ncred->cap_effective = new->cap_effective;
88062 + ncred->cap_bset = new->cap_bset;
88063 +
88064 + if (set_user(ncred)) {
88065 + abort_creds(ncred);
88066 + goto die;
88067 + }
88068 +
88069 + // from doing get_cred on it when queueing this
88070 + put_cred(new);
88071 +
88072 + __commit_creds(ncred);
88073 + return;
88074 +die:
88075 + // from doing get_cred on it when queueing this
88076 + put_cred(new);
88077 + do_group_exit(SIGKILL);
88078 +}
88079 +#endif
88080 +
88081 +int commit_creds(struct cred *new)
88082 +{
88083 +#ifdef CONFIG_GRKERNSEC_SETXID
88084 + int ret;
88085 + int schedule_it = 0;
88086 + struct task_struct *t;
88087 + unsigned oldsecurebits = current_cred()->securebits;
88088 +
88089 + /* we won't get called with tasklist_lock held for writing
88090 + and interrupts disabled as the cred struct in that case is
88091 + init_cred
88092 + */
88093 + if (grsec_enable_setxid && !current_is_single_threaded() &&
88094 + uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
88095 + !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
88096 + schedule_it = 1;
88097 + }
88098 + ret = __commit_creds(new);
88099 + if (schedule_it) {
88100 + rcu_read_lock();
88101 + read_lock(&tasklist_lock);
88102 + for (t = next_thread(current); t != current;
88103 + t = next_thread(t)) {
88104 + /* we'll check if the thread has uid 0 in
88105 + * the delayed worker routine
88106 + */
88107 + if (task_securebits(t) == oldsecurebits &&
88108 + t->delayed_cred == NULL) {
88109 + t->delayed_cred = get_cred(new);
88110 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
88111 + set_tsk_need_resched(t);
88112 + }
88113 + }
88114 + read_unlock(&tasklist_lock);
88115 + rcu_read_unlock();
88116 + }
88117 +
88118 + return ret;
88119 +#else
88120 + return __commit_creds(new);
88121 +#endif
88122 +}
88123 +
88124 EXPORT_SYMBOL(commit_creds);
88125
88126 /**
88127 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
88128 index 1adf62b..7736e06 100644
88129 --- a/kernel/debug/debug_core.c
88130 +++ b/kernel/debug/debug_core.c
88131 @@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
88132 */
88133 static atomic_t masters_in_kgdb;
88134 static atomic_t slaves_in_kgdb;
88135 -static atomic_t kgdb_break_tasklet_var;
88136 +static atomic_unchecked_t kgdb_break_tasklet_var;
88137 atomic_t kgdb_setting_breakpoint;
88138
88139 struct task_struct *kgdb_usethread;
88140 @@ -134,7 +134,7 @@ int kgdb_single_step;
88141 static pid_t kgdb_sstep_pid;
88142
88143 /* to keep track of the CPU which is doing the single stepping*/
88144 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88145 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88146
88147 /*
88148 * If you are debugging a problem where roundup (the collection of
88149 @@ -549,7 +549,7 @@ return_normal:
88150 * kernel will only try for the value of sstep_tries before
88151 * giving up and continuing on.
88152 */
88153 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
88154 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
88155 (kgdb_info[cpu].task &&
88156 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
88157 atomic_set(&kgdb_active, -1);
88158 @@ -647,8 +647,8 @@ cpu_master_loop:
88159 }
88160
88161 kgdb_restore:
88162 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
88163 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
88164 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
88165 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
88166 if (kgdb_info[sstep_cpu].task)
88167 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
88168 else
88169 @@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
88170 static void kgdb_tasklet_bpt(unsigned long ing)
88171 {
88172 kgdb_breakpoint();
88173 - atomic_set(&kgdb_break_tasklet_var, 0);
88174 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
88175 }
88176
88177 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
88178
88179 void kgdb_schedule_breakpoint(void)
88180 {
88181 - if (atomic_read(&kgdb_break_tasklet_var) ||
88182 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
88183 atomic_read(&kgdb_active) != -1 ||
88184 atomic_read(&kgdb_setting_breakpoint))
88185 return;
88186 - atomic_inc(&kgdb_break_tasklet_var);
88187 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
88188 tasklet_schedule(&kgdb_tasklet_breakpoint);
88189 }
88190 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
88191 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
88192 index 379650b..30c5180 100644
88193 --- a/kernel/debug/kdb/kdb_main.c
88194 +++ b/kernel/debug/kdb/kdb_main.c
88195 @@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
88196 continue;
88197
88198 kdb_printf("%-20s%8u 0x%p ", mod->name,
88199 - mod->core_size, (void *)mod);
88200 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
88201 #ifdef CONFIG_MODULE_UNLOAD
88202 kdb_printf("%4ld ", module_refcount(mod));
88203 #endif
88204 @@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
88205 kdb_printf(" (Loading)");
88206 else
88207 kdb_printf(" (Live)");
88208 - kdb_printf(" 0x%p", mod->module_core);
88209 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
88210
88211 #ifdef CONFIG_MODULE_UNLOAD
88212 {
88213 diff --git a/kernel/events/core.c b/kernel/events/core.c
88214 index 1cd5eef..e8b5af9 100644
88215 --- a/kernel/events/core.c
88216 +++ b/kernel/events/core.c
88217 @@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
88218 * 0 - disallow raw tracepoint access for unpriv
88219 * 1 - disallow cpu events for unpriv
88220 * 2 - disallow kernel profiling for unpriv
88221 + * 3 - disallow all unpriv perf event use
88222 */
88223 -int sysctl_perf_event_paranoid __read_mostly = 1;
88224 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88225 +int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
88226 +#elif defined(CONFIG_GRKERNSEC_HIDESYM)
88227 +int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
88228 +#else
88229 +int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
88230 +#endif
88231
88232 /* Minimum for 512 kiB + 1 user control page */
88233 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
88234 @@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
88235
88236 tmp *= sysctl_perf_cpu_time_max_percent;
88237 do_div(tmp, 100);
88238 - ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
88239 + ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
88240 }
88241
88242 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
88243 @@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
88244 }
88245 }
88246
88247 -static atomic64_t perf_event_id;
88248 +static atomic64_unchecked_t perf_event_id;
88249
88250 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
88251 enum event_type_t event_type);
88252 @@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
88253
88254 static inline u64 perf_event_count(struct perf_event *event)
88255 {
88256 - return local64_read(&event->count) + atomic64_read(&event->child_count);
88257 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
88258 }
88259
88260 static u64 perf_event_read(struct perf_event *event)
88261 @@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
88262 mutex_lock(&event->child_mutex);
88263 total += perf_event_read(event);
88264 *enabled += event->total_time_enabled +
88265 - atomic64_read(&event->child_total_time_enabled);
88266 + atomic64_read_unchecked(&event->child_total_time_enabled);
88267 *running += event->total_time_running +
88268 - atomic64_read(&event->child_total_time_running);
88269 + atomic64_read_unchecked(&event->child_total_time_running);
88270
88271 list_for_each_entry(child, &event->child_list, child_list) {
88272 total += perf_event_read(child);
88273 @@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
88274 userpg->offset -= local64_read(&event->hw.prev_count);
88275
88276 userpg->time_enabled = enabled +
88277 - atomic64_read(&event->child_total_time_enabled);
88278 + atomic64_read_unchecked(&event->child_total_time_enabled);
88279
88280 userpg->time_running = running +
88281 - atomic64_read(&event->child_total_time_running);
88282 + atomic64_read_unchecked(&event->child_total_time_running);
88283
88284 arch_perf_update_userpage(userpg, now);
88285
88286 @@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
88287
88288 /* Data. */
88289 sp = perf_user_stack_pointer(regs);
88290 - rem = __output_copy_user(handle, (void *) sp, dump_size);
88291 + rem = __output_copy_user(handle, (void __user *) sp, dump_size);
88292 dyn_size = dump_size - rem;
88293
88294 perf_output_skip(handle, rem);
88295 @@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
88296 values[n++] = perf_event_count(event);
88297 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
88298 values[n++] = enabled +
88299 - atomic64_read(&event->child_total_time_enabled);
88300 + atomic64_read_unchecked(&event->child_total_time_enabled);
88301 }
88302 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
88303 values[n++] = running +
88304 - atomic64_read(&event->child_total_time_running);
88305 + atomic64_read_unchecked(&event->child_total_time_running);
88306 }
88307 if (read_format & PERF_FORMAT_ID)
88308 values[n++] = primary_event_id(event);
88309 @@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
88310 event->parent = parent_event;
88311
88312 event->ns = get_pid_ns(task_active_pid_ns(current));
88313 - event->id = atomic64_inc_return(&perf_event_id);
88314 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
88315
88316 event->state = PERF_EVENT_STATE_INACTIVE;
88317
88318 @@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
88319 if (flags & ~PERF_FLAG_ALL)
88320 return -EINVAL;
88321
88322 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88323 + if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
88324 + return -EACCES;
88325 +#endif
88326 +
88327 err = perf_copy_attr(attr_uptr, &attr);
88328 if (err)
88329 return err;
88330 @@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
88331 /*
88332 * Add back the child's count to the parent's count:
88333 */
88334 - atomic64_add(child_val, &parent_event->child_count);
88335 - atomic64_add(child_event->total_time_enabled,
88336 + atomic64_add_unchecked(child_val, &parent_event->child_count);
88337 + atomic64_add_unchecked(child_event->total_time_enabled,
88338 &parent_event->child_total_time_enabled);
88339 - atomic64_add(child_event->total_time_running,
88340 + atomic64_add_unchecked(child_event->total_time_running,
88341 &parent_event->child_total_time_running);
88342
88343 /*
88344 diff --git a/kernel/events/internal.h b/kernel/events/internal.h
88345 index 569b2187..19940d9 100644
88346 --- a/kernel/events/internal.h
88347 +++ b/kernel/events/internal.h
88348 @@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
88349 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
88350 }
88351
88352 -#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
88353 +#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
88354 static inline unsigned long \
88355 func_name(struct perf_output_handle *handle, \
88356 - const void *buf, unsigned long len) \
88357 + const void user *buf, unsigned long len) \
88358 { \
88359 unsigned long size, written; \
88360 \
88361 @@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
88362 return 0;
88363 }
88364
88365 -DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
88366 +DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
88367
88368 static inline unsigned long
88369 memcpy_skip(void *dst, const void *src, unsigned long n)
88370 @@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
88371 return 0;
88372 }
88373
88374 -DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
88375 +DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
88376
88377 #ifndef arch_perf_out_copy_user
88378 #define arch_perf_out_copy_user arch_perf_out_copy_user
88379 @@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
88380 }
88381 #endif
88382
88383 -DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
88384 +DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
88385
88386 /* Callchain handling */
88387 extern struct perf_callchain_entry *
88388 diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
88389 index ed8f2cd..fe8030c 100644
88390 --- a/kernel/events/uprobes.c
88391 +++ b/kernel/events/uprobes.c
88392 @@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
88393 {
88394 struct page *page;
88395 uprobe_opcode_t opcode;
88396 - int result;
88397 + long result;
88398
88399 pagefault_disable();
88400 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
88401 diff --git a/kernel/exit.c b/kernel/exit.c
88402 index 5d30019..934add5 100644
88403 --- a/kernel/exit.c
88404 +++ b/kernel/exit.c
88405 @@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
88406 struct task_struct *leader;
88407 int zap_leader;
88408 repeat:
88409 +#ifdef CONFIG_NET
88410 + gr_del_task_from_ip_table(p);
88411 +#endif
88412 +
88413 /* don't need to get the RCU readlock here - the process is dead and
88414 * can't be modifying its own credentials. But shut RCU-lockdep up */
88415 rcu_read_lock();
88416 @@ -670,6 +674,8 @@ void do_exit(long code)
88417 int group_dead;
88418 TASKS_RCU(int tasks_rcu_i);
88419
88420 + set_fs(USER_DS);
88421 +
88422 profile_task_exit(tsk);
88423
88424 WARN_ON(blk_needs_flush_plug(tsk));
88425 @@ -686,7 +692,6 @@ void do_exit(long code)
88426 * mm_release()->clear_child_tid() from writing to a user-controlled
88427 * kernel address.
88428 */
88429 - set_fs(USER_DS);
88430
88431 ptrace_event(PTRACE_EVENT_EXIT, code);
88432
88433 @@ -744,6 +749,9 @@ void do_exit(long code)
88434 tsk->exit_code = code;
88435 taskstats_exit(tsk, group_dead);
88436
88437 + gr_acl_handle_psacct(tsk, code);
88438 + gr_acl_handle_exit();
88439 +
88440 exit_mm(tsk);
88441
88442 if (group_dead)
88443 @@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
88444 * Take down every thread in the group. This is called by fatal signals
88445 * as well as by sys_exit_group (below).
88446 */
88447 -void
88448 +__noreturn void
88449 do_group_exit(int exit_code)
88450 {
88451 struct signal_struct *sig = current->signal;
88452 diff --git a/kernel/fork.c b/kernel/fork.c
88453 index 9b7d746..5b898ab 100644
88454 --- a/kernel/fork.c
88455 +++ b/kernel/fork.c
88456 @@ -183,6 +183,48 @@ void thread_info_cache_init(void)
88457 # endif
88458 #endif
88459
88460 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88461 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88462 + int node, void **lowmem_stack)
88463 +{
88464 + struct page *pages[THREAD_SIZE / PAGE_SIZE];
88465 + void *ret = NULL;
88466 + unsigned int i;
88467 +
88468 + *lowmem_stack = alloc_thread_info_node(tsk, node);
88469 + if (*lowmem_stack == NULL)
88470 + goto out;
88471 +
88472 + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
88473 + pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
88474 +
88475 + /* use VM_IOREMAP to gain THREAD_SIZE alignment */
88476 + ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
88477 + if (ret == NULL) {
88478 + free_thread_info(*lowmem_stack);
88479 + *lowmem_stack = NULL;
88480 + }
88481 +
88482 +out:
88483 + return ret;
88484 +}
88485 +
88486 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88487 +{
88488 + unmap_process_stacks(tsk);
88489 +}
88490 +#else
88491 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88492 + int node, void **lowmem_stack)
88493 +{
88494 + return alloc_thread_info_node(tsk, node);
88495 +}
88496 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88497 +{
88498 + free_thread_info(ti);
88499 +}
88500 +#endif
88501 +
88502 /* SLAB cache for signal_struct structures (tsk->signal) */
88503 static struct kmem_cache *signal_cachep;
88504
88505 @@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
88506 /* SLAB cache for mm_struct structures (tsk->mm) */
88507 static struct kmem_cache *mm_cachep;
88508
88509 -static void account_kernel_stack(struct thread_info *ti, int account)
88510 +static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
88511 {
88512 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88513 + struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
88514 +#else
88515 struct zone *zone = page_zone(virt_to_page(ti));
88516 +#endif
88517
88518 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
88519 }
88520
88521 void free_task(struct task_struct *tsk)
88522 {
88523 - account_kernel_stack(tsk->stack, -1);
88524 + account_kernel_stack(tsk, tsk->stack, -1);
88525 arch_release_thread_info(tsk->stack);
88526 - free_thread_info(tsk->stack);
88527 + gr_free_thread_info(tsk, tsk->stack);
88528 rt_mutex_debug_task_free(tsk);
88529 ftrace_graph_exit_task(tsk);
88530 put_seccomp_filter(tsk);
88531 @@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88532 {
88533 struct task_struct *tsk;
88534 struct thread_info *ti;
88535 + void *lowmem_stack;
88536 int node = tsk_fork_get_node(orig);
88537 int err;
88538
88539 @@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88540 if (!tsk)
88541 return NULL;
88542
88543 - ti = alloc_thread_info_node(tsk, node);
88544 + ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
88545 if (!ti)
88546 goto free_tsk;
88547
88548 @@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88549 goto free_ti;
88550
88551 tsk->stack = ti;
88552 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88553 + tsk->lowmem_stack = lowmem_stack;
88554 +#endif
88555 #ifdef CONFIG_SECCOMP
88556 /*
88557 * We must handle setting up seccomp filters once we're under
88558 @@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88559 set_task_stack_end_magic(tsk);
88560
88561 #ifdef CONFIG_CC_STACKPROTECTOR
88562 - tsk->stack_canary = get_random_int();
88563 + tsk->stack_canary = pax_get_random_long();
88564 #endif
88565
88566 /*
88567 @@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88568 tsk->splice_pipe = NULL;
88569 tsk->task_frag.page = NULL;
88570
88571 - account_kernel_stack(ti, 1);
88572 + account_kernel_stack(tsk, ti, 1);
88573
88574 return tsk;
88575
88576 free_ti:
88577 - free_thread_info(ti);
88578 + gr_free_thread_info(tsk, ti);
88579 free_tsk:
88580 free_task_struct(tsk);
88581 return NULL;
88582 }
88583
88584 #ifdef CONFIG_MMU
88585 -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88586 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
88587 +{
88588 + struct vm_area_struct *tmp;
88589 + unsigned long charge;
88590 + struct file *file;
88591 + int retval;
88592 +
88593 + charge = 0;
88594 + if (mpnt->vm_flags & VM_ACCOUNT) {
88595 + unsigned long len = vma_pages(mpnt);
88596 +
88597 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88598 + goto fail_nomem;
88599 + charge = len;
88600 + }
88601 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88602 + if (!tmp)
88603 + goto fail_nomem;
88604 + *tmp = *mpnt;
88605 + tmp->vm_mm = mm;
88606 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
88607 + retval = vma_dup_policy(mpnt, tmp);
88608 + if (retval)
88609 + goto fail_nomem_policy;
88610 + if (anon_vma_fork(tmp, mpnt))
88611 + goto fail_nomem_anon_vma_fork;
88612 + tmp->vm_flags &= ~VM_LOCKED;
88613 + tmp->vm_next = tmp->vm_prev = NULL;
88614 + tmp->vm_mirror = NULL;
88615 + file = tmp->vm_file;
88616 + if (file) {
88617 + struct inode *inode = file_inode(file);
88618 + struct address_space *mapping = file->f_mapping;
88619 +
88620 + get_file(file);
88621 + if (tmp->vm_flags & VM_DENYWRITE)
88622 + atomic_dec(&inode->i_writecount);
88623 + mutex_lock(&mapping->i_mmap_mutex);
88624 + if (tmp->vm_flags & VM_SHARED)
88625 + atomic_inc(&mapping->i_mmap_writable);
88626 + flush_dcache_mmap_lock(mapping);
88627 + /* insert tmp into the share list, just after mpnt */
88628 + if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88629 + vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
88630 + else
88631 + vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
88632 + flush_dcache_mmap_unlock(mapping);
88633 + mutex_unlock(&mapping->i_mmap_mutex);
88634 + }
88635 +
88636 + /*
88637 + * Clear hugetlb-related page reserves for children. This only
88638 + * affects MAP_PRIVATE mappings. Faults generated by the child
88639 + * are not guaranteed to succeed, even if read-only
88640 + */
88641 + if (is_vm_hugetlb_page(tmp))
88642 + reset_vma_resv_huge_pages(tmp);
88643 +
88644 + return tmp;
88645 +
88646 +fail_nomem_anon_vma_fork:
88647 + mpol_put(vma_policy(tmp));
88648 +fail_nomem_policy:
88649 + kmem_cache_free(vm_area_cachep, tmp);
88650 +fail_nomem:
88651 + vm_unacct_memory(charge);
88652 + return NULL;
88653 +}
88654 +
88655 +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88656 {
88657 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
88658 struct rb_node **rb_link, *rb_parent;
88659 int retval;
88660 - unsigned long charge;
88661
88662 uprobe_start_dup_mmap();
88663 down_write(&oldmm->mmap_sem);
88664 @@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88665
88666 prev = NULL;
88667 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
88668 - struct file *file;
88669 -
88670 if (mpnt->vm_flags & VM_DONTCOPY) {
88671 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
88672 -vma_pages(mpnt));
88673 continue;
88674 }
88675 - charge = 0;
88676 - if (mpnt->vm_flags & VM_ACCOUNT) {
88677 - unsigned long len = vma_pages(mpnt);
88678 -
88679 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88680 - goto fail_nomem;
88681 - charge = len;
88682 - }
88683 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88684 - if (!tmp)
88685 - goto fail_nomem;
88686 - *tmp = *mpnt;
88687 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
88688 - retval = vma_dup_policy(mpnt, tmp);
88689 - if (retval)
88690 - goto fail_nomem_policy;
88691 - tmp->vm_mm = mm;
88692 - if (anon_vma_fork(tmp, mpnt))
88693 - goto fail_nomem_anon_vma_fork;
88694 - tmp->vm_flags &= ~VM_LOCKED;
88695 - tmp->vm_next = tmp->vm_prev = NULL;
88696 - file = tmp->vm_file;
88697 - if (file) {
88698 - struct inode *inode = file_inode(file);
88699 - struct address_space *mapping = file->f_mapping;
88700 -
88701 - get_file(file);
88702 - if (tmp->vm_flags & VM_DENYWRITE)
88703 - atomic_dec(&inode->i_writecount);
88704 - mutex_lock(&mapping->i_mmap_mutex);
88705 - if (tmp->vm_flags & VM_SHARED)
88706 - atomic_inc(&mapping->i_mmap_writable);
88707 - flush_dcache_mmap_lock(mapping);
88708 - /* insert tmp into the share list, just after mpnt */
88709 - if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88710 - vma_nonlinear_insert(tmp,
88711 - &mapping->i_mmap_nonlinear);
88712 - else
88713 - vma_interval_tree_insert_after(tmp, mpnt,
88714 - &mapping->i_mmap);
88715 - flush_dcache_mmap_unlock(mapping);
88716 - mutex_unlock(&mapping->i_mmap_mutex);
88717 + tmp = dup_vma(mm, oldmm, mpnt);
88718 + if (!tmp) {
88719 + retval = -ENOMEM;
88720 + goto out;
88721 }
88722
88723 /*
88724 @@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88725 if (retval)
88726 goto out;
88727 }
88728 +
88729 +#ifdef CONFIG_PAX_SEGMEXEC
88730 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
88731 + struct vm_area_struct *mpnt_m;
88732 +
88733 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
88734 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
88735 +
88736 + if (!mpnt->vm_mirror)
88737 + continue;
88738 +
88739 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
88740 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
88741 + mpnt->vm_mirror = mpnt_m;
88742 + } else {
88743 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
88744 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
88745 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
88746 + mpnt->vm_mirror->vm_mirror = mpnt;
88747 + }
88748 + }
88749 + BUG_ON(mpnt_m);
88750 + }
88751 +#endif
88752 +
88753 /* a new mm has just been created */
88754 arch_dup_mmap(oldmm, mm);
88755 retval = 0;
88756 @@ -486,14 +589,6 @@ out:
88757 up_write(&oldmm->mmap_sem);
88758 uprobe_end_dup_mmap();
88759 return retval;
88760 -fail_nomem_anon_vma_fork:
88761 - mpol_put(vma_policy(tmp));
88762 -fail_nomem_policy:
88763 - kmem_cache_free(vm_area_cachep, tmp);
88764 -fail_nomem:
88765 - retval = -ENOMEM;
88766 - vm_unacct_memory(charge);
88767 - goto out;
88768 }
88769
88770 static inline int mm_alloc_pgd(struct mm_struct *mm)
88771 @@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
88772 return ERR_PTR(err);
88773
88774 mm = get_task_mm(task);
88775 - if (mm && mm != current->mm &&
88776 - !ptrace_may_access(task, mode)) {
88777 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
88778 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
88779 mmput(mm);
88780 mm = ERR_PTR(-EACCES);
88781 }
88782 @@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
88783 spin_unlock(&fs->lock);
88784 return -EAGAIN;
88785 }
88786 - fs->users++;
88787 + atomic_inc(&fs->users);
88788 spin_unlock(&fs->lock);
88789 return 0;
88790 }
88791 tsk->fs = copy_fs_struct(fs);
88792 if (!tsk->fs)
88793 return -ENOMEM;
88794 + /* Carry through gr_chroot_dentry and is_chrooted instead
88795 + of recomputing it here. Already copied when the task struct
88796 + is duplicated. This allows pivot_root to not be treated as
88797 + a chroot
88798 + */
88799 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
88800 +
88801 return 0;
88802 }
88803
88804 @@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
88805 * parts of the process environment (as per the clone
88806 * flags). The actual kick-off is left to the caller.
88807 */
88808 -static struct task_struct *copy_process(unsigned long clone_flags,
88809 +static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
88810 unsigned long stack_start,
88811 unsigned long stack_size,
88812 int __user *child_tidptr,
88813 @@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88814 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
88815 #endif
88816 retval = -EAGAIN;
88817 +
88818 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
88819 +
88820 if (atomic_read(&p->real_cred->user->processes) >=
88821 task_rlimit(p, RLIMIT_NPROC)) {
88822 if (p->real_cred->user != INIT_USER &&
88823 @@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88824 goto bad_fork_free_pid;
88825 }
88826
88827 + /* synchronizes with gr_set_acls()
88828 + we need to call this past the point of no return for fork()
88829 + */
88830 + gr_copy_label(p);
88831 +
88832 if (likely(p->pid)) {
88833 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
88834
88835 @@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
88836 bad_fork_free:
88837 free_task(p);
88838 fork_out:
88839 + gr_log_forkfail(retval);
88840 +
88841 return ERR_PTR(retval);
88842 }
88843
88844 @@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
88845
88846 p = copy_process(clone_flags, stack_start, stack_size,
88847 child_tidptr, NULL, trace);
88848 + add_latent_entropy();
88849 /*
88850 * Do this prior waking up the new thread - the thread pointer
88851 * might get invalid after that point, if the thread exits quickly.
88852 @@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
88853 if (clone_flags & CLONE_PARENT_SETTID)
88854 put_user(nr, parent_tidptr);
88855
88856 + gr_handle_brute_check();
88857 +
88858 if (clone_flags & CLONE_VFORK) {
88859 p->vfork_done = &vfork;
88860 init_completion(&vfork);
88861 @@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
88862 mm_cachep = kmem_cache_create("mm_struct",
88863 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
88864 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
88865 - vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
88866 + vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
88867 mmap_init();
88868 nsproxy_cache_init();
88869 }
88870 @@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
88871 return 0;
88872
88873 /* don't need lock here; in the worst case we'll do useless copy */
88874 - if (fs->users == 1)
88875 + if (atomic_read(&fs->users) == 1)
88876 return 0;
88877
88878 *new_fsp = copy_fs_struct(fs);
88879 @@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
88880 fs = current->fs;
88881 spin_lock(&fs->lock);
88882 current->fs = new_fs;
88883 - if (--fs->users)
88884 + gr_set_chroot_entries(current, &current->fs->root);
88885 + if (atomic_dec_return(&fs->users))
88886 new_fs = NULL;
88887 else
88888 new_fs = fs;
88889 diff --git a/kernel/futex.c b/kernel/futex.c
88890 index 63678b5..512f9af 100644
88891 --- a/kernel/futex.c
88892 +++ b/kernel/futex.c
88893 @@ -201,7 +201,7 @@ struct futex_pi_state {
88894 atomic_t refcount;
88895
88896 union futex_key key;
88897 -};
88898 +} __randomize_layout;
88899
88900 /**
88901 * struct futex_q - The hashed futex queue entry, one per waiting task
88902 @@ -235,7 +235,7 @@ struct futex_q {
88903 struct rt_mutex_waiter *rt_waiter;
88904 union futex_key *requeue_pi_key;
88905 u32 bitset;
88906 -};
88907 +} __randomize_layout;
88908
88909 static const struct futex_q futex_q_init = {
88910 /* list gets initialized in queue_me()*/
88911 @@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
88912 struct page *page, *page_head;
88913 int err, ro = 0;
88914
88915 +#ifdef CONFIG_PAX_SEGMEXEC
88916 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
88917 + return -EFAULT;
88918 +#endif
88919 +
88920 /*
88921 * The futex address must be "naturally" aligned.
88922 */
88923 @@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
88924
88925 static int get_futex_value_locked(u32 *dest, u32 __user *from)
88926 {
88927 - int ret;
88928 + unsigned long ret;
88929
88930 pagefault_disable();
88931 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
88932 @@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
88933 {
88934 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
88935 u32 curval;
88936 + mm_segment_t oldfs;
88937
88938 /*
88939 * This will fail and we want it. Some arch implementations do
88940 @@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
88941 * implementation, the non-functional ones will return
88942 * -ENOSYS.
88943 */
88944 + oldfs = get_fs();
88945 + set_fs(USER_DS);
88946 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
88947 futex_cmpxchg_enabled = 1;
88948 + set_fs(oldfs);
88949 #endif
88950 }
88951
88952 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
88953 index 55c8c93..9ba7ad6 100644
88954 --- a/kernel/futex_compat.c
88955 +++ b/kernel/futex_compat.c
88956 @@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
88957 return 0;
88958 }
88959
88960 -static void __user *futex_uaddr(struct robust_list __user *entry,
88961 +static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
88962 compat_long_t futex_offset)
88963 {
88964 compat_uptr_t base = ptr_to_compat(entry);
88965 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
88966 index b358a80..fc25240 100644
88967 --- a/kernel/gcov/base.c
88968 +++ b/kernel/gcov/base.c
88969 @@ -114,11 +114,6 @@ void gcov_enable_events(void)
88970 }
88971
88972 #ifdef CONFIG_MODULES
88973 -static inline int within(void *addr, void *start, unsigned long size)
88974 -{
88975 - return ((addr >= start) && (addr < start + size));
88976 -}
88977 -
88978 /* Update list and generate events when modules are unloaded. */
88979 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
88980 void *data)
88981 @@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
88982
88983 /* Remove entries located in module from linked list. */
88984 while ((info = gcov_info_next(info))) {
88985 - if (within(info, mod->module_core, mod->core_size)) {
88986 + if (within_module_core_rw((unsigned long)info, mod)) {
88987 gcov_info_unlink(prev, info);
88988 if (gcov_events_enabled)
88989 gcov_event(GCOV_REMOVE, info);
88990 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
88991 index 9019f15..9a3c42e 100644
88992 --- a/kernel/jump_label.c
88993 +++ b/kernel/jump_label.c
88994 @@ -14,6 +14,7 @@
88995 #include <linux/err.h>
88996 #include <linux/static_key.h>
88997 #include <linux/jump_label_ratelimit.h>
88998 +#include <linux/mm.h>
88999
89000 #ifdef HAVE_JUMP_LABEL
89001
89002 @@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
89003
89004 size = (((unsigned long)stop - (unsigned long)start)
89005 / sizeof(struct jump_entry));
89006 + pax_open_kernel();
89007 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
89008 + pax_close_kernel();
89009 }
89010
89011 static void jump_label_update(struct static_key *key, int enable);
89012 @@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
89013 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
89014 struct jump_entry *iter;
89015
89016 + pax_open_kernel();
89017 for (iter = iter_start; iter < iter_stop; iter++) {
89018 if (within_module_init(iter->code, mod))
89019 iter->code = 0;
89020 }
89021 + pax_close_kernel();
89022 }
89023
89024 static int
89025 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
89026 index 5c5987f..bc502b0 100644
89027 --- a/kernel/kallsyms.c
89028 +++ b/kernel/kallsyms.c
89029 @@ -11,6 +11,9 @@
89030 * Changed the compression method from stem compression to "table lookup"
89031 * compression (see scripts/kallsyms.c for a more complete description)
89032 */
89033 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89034 +#define __INCLUDED_BY_HIDESYM 1
89035 +#endif
89036 #include <linux/kallsyms.h>
89037 #include <linux/module.h>
89038 #include <linux/init.h>
89039 @@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
89040
89041 static inline int is_kernel_inittext(unsigned long addr)
89042 {
89043 + if (system_state != SYSTEM_BOOTING)
89044 + return 0;
89045 +
89046 if (addr >= (unsigned long)_sinittext
89047 && addr <= (unsigned long)_einittext)
89048 return 1;
89049 return 0;
89050 }
89051
89052 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89053 +#ifdef CONFIG_MODULES
89054 +static inline int is_module_text(unsigned long addr)
89055 +{
89056 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
89057 + return 1;
89058 +
89059 + addr = ktla_ktva(addr);
89060 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
89061 +}
89062 +#else
89063 +static inline int is_module_text(unsigned long addr)
89064 +{
89065 + return 0;
89066 +}
89067 +#endif
89068 +#endif
89069 +
89070 static inline int is_kernel_text(unsigned long addr)
89071 {
89072 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
89073 @@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
89074
89075 static inline int is_kernel(unsigned long addr)
89076 {
89077 +
89078 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89079 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
89080 + return 1;
89081 +
89082 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
89083 +#else
89084 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
89085 +#endif
89086 +
89087 return 1;
89088 return in_gate_area_no_mm(addr);
89089 }
89090
89091 static int is_ksym_addr(unsigned long addr)
89092 {
89093 +
89094 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89095 + if (is_module_text(addr))
89096 + return 0;
89097 +#endif
89098 +
89099 if (all_var)
89100 return is_kernel(addr);
89101
89102 @@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
89103
89104 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
89105 {
89106 - iter->name[0] = '\0';
89107 iter->nameoff = get_symbol_offset(new_pos);
89108 iter->pos = new_pos;
89109 }
89110 @@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
89111 {
89112 struct kallsym_iter *iter = m->private;
89113
89114 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89115 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
89116 + return 0;
89117 +#endif
89118 +
89119 /* Some debugging symbols have no name. Ignore them. */
89120 if (!iter->name[0])
89121 return 0;
89122 @@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
89123 */
89124 type = iter->exported ? toupper(iter->type) :
89125 tolower(iter->type);
89126 +
89127 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
89128 type, iter->name, iter->module_name);
89129 } else
89130 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
89131 index 0aa69ea..a7fcafb 100644
89132 --- a/kernel/kcmp.c
89133 +++ b/kernel/kcmp.c
89134 @@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
89135 struct task_struct *task1, *task2;
89136 int ret;
89137
89138 +#ifdef CONFIG_GRKERNSEC
89139 + return -ENOSYS;
89140 +#endif
89141 +
89142 rcu_read_lock();
89143
89144 /*
89145 diff --git a/kernel/kexec.c b/kernel/kexec.c
89146 index 2abf9f6..c40cf85 100644
89147 --- a/kernel/kexec.c
89148 +++ b/kernel/kexec.c
89149 @@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
89150 compat_ulong_t, flags)
89151 {
89152 struct compat_kexec_segment in;
89153 - struct kexec_segment out, __user *ksegments;
89154 + struct kexec_segment out;
89155 + struct kexec_segment __user *ksegments;
89156 unsigned long i, result;
89157
89158 /* Don't allow clients that don't understand the native
89159 diff --git a/kernel/kmod.c b/kernel/kmod.c
89160 index 80f7a6d..3c476d3 100644
89161 --- a/kernel/kmod.c
89162 +++ b/kernel/kmod.c
89163 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
89164 kfree(info->argv);
89165 }
89166
89167 -static int call_modprobe(char *module_name, int wait)
89168 +static int call_modprobe(char *module_name, char *module_param, int wait)
89169 {
89170 struct subprocess_info *info;
89171 static char *envp[] = {
89172 @@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
89173 NULL
89174 };
89175
89176 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
89177 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
89178 if (!argv)
89179 goto out;
89180
89181 @@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
89182 argv[1] = "-q";
89183 argv[2] = "--";
89184 argv[3] = module_name; /* check free_modprobe_argv() */
89185 - argv[4] = NULL;
89186 + argv[4] = module_param;
89187 + argv[5] = NULL;
89188
89189 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
89190 NULL, free_modprobe_argv, NULL);
89191 @@ -129,9 +130,8 @@ out:
89192 * If module auto-loading support is disabled then this function
89193 * becomes a no-operation.
89194 */
89195 -int __request_module(bool wait, const char *fmt, ...)
89196 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
89197 {
89198 - va_list args;
89199 char module_name[MODULE_NAME_LEN];
89200 unsigned int max_modprobes;
89201 int ret;
89202 @@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
89203 if (!modprobe_path[0])
89204 return 0;
89205
89206 - va_start(args, fmt);
89207 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
89208 - va_end(args);
89209 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
89210 if (ret >= MODULE_NAME_LEN)
89211 return -ENAMETOOLONG;
89212
89213 @@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
89214 if (ret)
89215 return ret;
89216
89217 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89218 + if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89219 + /* hack to workaround consolekit/udisks stupidity */
89220 + read_lock(&tasklist_lock);
89221 + if (!strcmp(current->comm, "mount") &&
89222 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
89223 + read_unlock(&tasklist_lock);
89224 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
89225 + return -EPERM;
89226 + }
89227 + read_unlock(&tasklist_lock);
89228 + }
89229 +#endif
89230 +
89231 /* If modprobe needs a service that is in a module, we get a recursive
89232 * loop. Limit the number of running kmod threads to max_threads/2 or
89233 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
89234 @@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
89235
89236 trace_module_request(module_name, wait, _RET_IP_);
89237
89238 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89239 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89240
89241 atomic_dec(&kmod_concurrent);
89242 return ret;
89243 }
89244 +
89245 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
89246 +{
89247 + va_list args;
89248 + int ret;
89249 +
89250 + va_start(args, fmt);
89251 + ret = ____request_module(wait, module_param, fmt, args);
89252 + va_end(args);
89253 +
89254 + return ret;
89255 +}
89256 +
89257 +int __request_module(bool wait, const char *fmt, ...)
89258 +{
89259 + va_list args;
89260 + int ret;
89261 +
89262 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89263 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89264 + char module_param[MODULE_NAME_LEN];
89265 +
89266 + memset(module_param, 0, sizeof(module_param));
89267 +
89268 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
89269 +
89270 + va_start(args, fmt);
89271 + ret = ____request_module(wait, module_param, fmt, args);
89272 + va_end(args);
89273 +
89274 + return ret;
89275 + }
89276 +#endif
89277 +
89278 + va_start(args, fmt);
89279 + ret = ____request_module(wait, NULL, fmt, args);
89280 + va_end(args);
89281 +
89282 + return ret;
89283 +}
89284 +
89285 EXPORT_SYMBOL(__request_module);
89286 #endif /* CONFIG_MODULES */
89287
89288 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
89289 {
89290 +#ifdef CONFIG_GRKERNSEC
89291 + kfree(info->path);
89292 + info->path = info->origpath;
89293 +#endif
89294 if (info->cleanup)
89295 (*info->cleanup)(info);
89296 kfree(info);
89297 @@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
89298 */
89299 set_user_nice(current, 0);
89300
89301 +#ifdef CONFIG_GRKERNSEC
89302 + /* this is race-free as far as userland is concerned as we copied
89303 + out the path to be used prior to this point and are now operating
89304 + on that copy
89305 + */
89306 + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
89307 + strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
89308 + strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
89309 + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
89310 + retval = -EPERM;
89311 + goto out;
89312 + }
89313 +#endif
89314 +
89315 retval = -ENOMEM;
89316 new = prepare_kernel_cred(current);
89317 if (!new)
89318 @@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
89319 commit_creds(new);
89320
89321 retval = do_execve(getname_kernel(sub_info->path),
89322 - (const char __user *const __user *)sub_info->argv,
89323 - (const char __user *const __user *)sub_info->envp);
89324 + (const char __user *const __force_user *)sub_info->argv,
89325 + (const char __user *const __force_user *)sub_info->envp);
89326 out:
89327 sub_info->retval = retval;
89328 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
89329 @@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
89330 *
89331 * Thus the __user pointer cast is valid here.
89332 */
89333 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
89334 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
89335
89336 /*
89337 * If ret is 0, either ____call_usermodehelper failed and the
89338 @@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
89339 goto out;
89340
89341 INIT_WORK(&sub_info->work, __call_usermodehelper);
89342 +#ifdef CONFIG_GRKERNSEC
89343 + sub_info->origpath = path;
89344 + sub_info->path = kstrdup(path, gfp_mask);
89345 +#else
89346 sub_info->path = path;
89347 +#endif
89348 sub_info->argv = argv;
89349 sub_info->envp = envp;
89350
89351 @@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
89352 static int proc_cap_handler(struct ctl_table *table, int write,
89353 void __user *buffer, size_t *lenp, loff_t *ppos)
89354 {
89355 - struct ctl_table t;
89356 + ctl_table_no_const t;
89357 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
89358 kernel_cap_t new_cap;
89359 int err, i;
89360 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
89361 index 3995f54..e247879 100644
89362 --- a/kernel/kprobes.c
89363 +++ b/kernel/kprobes.c
89364 @@ -31,6 +31,9 @@
89365 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
89366 * <prasanna@in.ibm.com> added function-return probes.
89367 */
89368 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89369 +#define __INCLUDED_BY_HIDESYM 1
89370 +#endif
89371 #include <linux/kprobes.h>
89372 #include <linux/hash.h>
89373 #include <linux/init.h>
89374 @@ -122,12 +125,12 @@ enum kprobe_slot_state {
89375
89376 static void *alloc_insn_page(void)
89377 {
89378 - return module_alloc(PAGE_SIZE);
89379 + return module_alloc_exec(PAGE_SIZE);
89380 }
89381
89382 static void free_insn_page(void *page)
89383 {
89384 - module_free(NULL, page);
89385 + module_free_exec(NULL, page);
89386 }
89387
89388 struct kprobe_insn_cache kprobe_insn_slots = {
89389 @@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
89390 kprobe_type = "k";
89391
89392 if (sym)
89393 - seq_printf(pi, "%p %s %s+0x%x %s ",
89394 + seq_printf(pi, "%pK %s %s+0x%x %s ",
89395 p->addr, kprobe_type, sym, offset,
89396 (modname ? modname : " "));
89397 else
89398 - seq_printf(pi, "%p %s %p ",
89399 + seq_printf(pi, "%pK %s %pK ",
89400 p->addr, kprobe_type, p->addr);
89401
89402 if (!pp)
89403 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
89404 index 6683cce..daf8999 100644
89405 --- a/kernel/ksysfs.c
89406 +++ b/kernel/ksysfs.c
89407 @@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
89408 {
89409 if (count+1 > UEVENT_HELPER_PATH_LEN)
89410 return -ENOENT;
89411 + if (!capable(CAP_SYS_ADMIN))
89412 + return -EPERM;
89413 memcpy(uevent_helper, buf, count);
89414 uevent_helper[count] = '\0';
89415 if (count && uevent_helper[count-1] == '\n')
89416 @@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
89417 return count;
89418 }
89419
89420 -static struct bin_attribute notes_attr = {
89421 +static bin_attribute_no_const notes_attr __read_only = {
89422 .attr = {
89423 .name = "notes",
89424 .mode = S_IRUGO,
89425 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
89426 index 88d0d44..e9ce0ee 100644
89427 --- a/kernel/locking/lockdep.c
89428 +++ b/kernel/locking/lockdep.c
89429 @@ -599,6 +599,10 @@ static int static_obj(void *obj)
89430 end = (unsigned long) &_end,
89431 addr = (unsigned long) obj;
89432
89433 +#ifdef CONFIG_PAX_KERNEXEC
89434 + start = ktla_ktva(start);
89435 +#endif
89436 +
89437 /*
89438 * static variable?
89439 */
89440 @@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
89441 if (!static_obj(lock->key)) {
89442 debug_locks_off();
89443 printk("INFO: trying to register non-static key.\n");
89444 + printk("lock:%pS key:%pS.\n", lock, lock->key);
89445 printk("the code is fine but needs lockdep annotation.\n");
89446 printk("turning off the locking correctness validator.\n");
89447 dump_stack();
89448 @@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
89449 if (!class)
89450 return 0;
89451 }
89452 - atomic_inc((atomic_t *)&class->ops);
89453 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
89454 if (very_verbose(class)) {
89455 printk("\nacquire class [%p] %s", class->key, class->name);
89456 if (class->name_version > 1)
89457 diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
89458 index ef43ac4..2720dfa 100644
89459 --- a/kernel/locking/lockdep_proc.c
89460 +++ b/kernel/locking/lockdep_proc.c
89461 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
89462 return 0;
89463 }
89464
89465 - seq_printf(m, "%p", class->key);
89466 + seq_printf(m, "%pK", class->key);
89467 #ifdef CONFIG_DEBUG_LOCKDEP
89468 seq_printf(m, " OPS:%8ld", class->ops);
89469 #endif
89470 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
89471
89472 list_for_each_entry(entry, &class->locks_after, entry) {
89473 if (entry->distance == 1) {
89474 - seq_printf(m, " -> [%p] ", entry->class->key);
89475 + seq_printf(m, " -> [%pK] ", entry->class->key);
89476 print_name(m, entry->class);
89477 seq_puts(m, "\n");
89478 }
89479 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
89480 if (!class->key)
89481 continue;
89482
89483 - seq_printf(m, "[%p] ", class->key);
89484 + seq_printf(m, "[%pK] ", class->key);
89485 print_name(m, class);
89486 seq_puts(m, "\n");
89487 }
89488 @@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89489 if (!i)
89490 seq_line(m, '-', 40-namelen, namelen);
89491
89492 - snprintf(ip, sizeof(ip), "[<%p>]",
89493 + snprintf(ip, sizeof(ip), "[<%pK>]",
89494 (void *)class->contention_point[i]);
89495 seq_printf(m, "%40s %14lu %29s %pS\n",
89496 name, stats->contention_point[i],
89497 @@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89498 if (!i)
89499 seq_line(m, '-', 40-namelen, namelen);
89500
89501 - snprintf(ip, sizeof(ip), "[<%p>]",
89502 + snprintf(ip, sizeof(ip), "[<%pK>]",
89503 (void *)class->contending_point[i]);
89504 seq_printf(m, "%40s %14lu %29s %pS\n",
89505 name, stats->contending_point[i],
89506 diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
89507 index 9887a90..0cd2b1d 100644
89508 --- a/kernel/locking/mcs_spinlock.c
89509 +++ b/kernel/locking/mcs_spinlock.c
89510 @@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
89511
89512 prev = decode_cpu(old);
89513 node->prev = prev;
89514 - ACCESS_ONCE(prev->next) = node;
89515 + ACCESS_ONCE_RW(prev->next) = node;
89516
89517 /*
89518 * Normally @prev is untouchable after the above store; because at that
89519 @@ -172,8 +172,8 @@ unqueue:
89520 * it will wait in Step-A.
89521 */
89522
89523 - ACCESS_ONCE(next->prev) = prev;
89524 - ACCESS_ONCE(prev->next) = next;
89525 + ACCESS_ONCE_RW(next->prev) = prev;
89526 + ACCESS_ONCE_RW(prev->next) = next;
89527
89528 return false;
89529 }
89530 @@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
89531 node = this_cpu_ptr(&osq_node);
89532 next = xchg(&node->next, NULL);
89533 if (next) {
89534 - ACCESS_ONCE(next->locked) = 1;
89535 + ACCESS_ONCE_RW(next->locked) = 1;
89536 return;
89537 }
89538
89539 next = osq_wait_next(lock, node, NULL);
89540 if (next)
89541 - ACCESS_ONCE(next->locked) = 1;
89542 + ACCESS_ONCE_RW(next->locked) = 1;
89543 }
89544
89545 #endif
89546 diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
89547 index 4d60986..5d351c1 100644
89548 --- a/kernel/locking/mcs_spinlock.h
89549 +++ b/kernel/locking/mcs_spinlock.h
89550 @@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
89551 */
89552 return;
89553 }
89554 - ACCESS_ONCE(prev->next) = node;
89555 + ACCESS_ONCE_RW(prev->next) = node;
89556
89557 /* Wait until the lock holder passes the lock down. */
89558 arch_mcs_spin_lock_contended(&node->locked);
89559 diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
89560 index 5cf6731..ce3bc5a 100644
89561 --- a/kernel/locking/mutex-debug.c
89562 +++ b/kernel/locking/mutex-debug.c
89563 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
89564 }
89565
89566 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89567 - struct thread_info *ti)
89568 + struct task_struct *task)
89569 {
89570 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
89571
89572 /* Mark the current thread as blocked on the lock: */
89573 - ti->task->blocked_on = waiter;
89574 + task->blocked_on = waiter;
89575 }
89576
89577 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89578 - struct thread_info *ti)
89579 + struct task_struct *task)
89580 {
89581 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
89582 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
89583 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
89584 - ti->task->blocked_on = NULL;
89585 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
89586 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
89587 + task->blocked_on = NULL;
89588
89589 list_del_init(&waiter->list);
89590 waiter->task = NULL;
89591 diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
89592 index 0799fd3..d06ae3b 100644
89593 --- a/kernel/locking/mutex-debug.h
89594 +++ b/kernel/locking/mutex-debug.h
89595 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
89596 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
89597 extern void debug_mutex_add_waiter(struct mutex *lock,
89598 struct mutex_waiter *waiter,
89599 - struct thread_info *ti);
89600 + struct task_struct *task);
89601 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89602 - struct thread_info *ti);
89603 + struct task_struct *task);
89604 extern void debug_mutex_unlock(struct mutex *lock);
89605 extern void debug_mutex_init(struct mutex *lock, const char *name,
89606 struct lock_class_key *key);
89607 diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
89608 index dadbf88..4500507 100644
89609 --- a/kernel/locking/mutex.c
89610 +++ b/kernel/locking/mutex.c
89611 @@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89612 goto skip_wait;
89613
89614 debug_mutex_lock_common(lock, &waiter);
89615 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
89616 + debug_mutex_add_waiter(lock, &waiter, task);
89617
89618 /* add waiting tasks to the end of the waitqueue (FIFO): */
89619 list_add_tail(&waiter.list, &lock->wait_list);
89620 @@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89621 schedule_preempt_disabled();
89622 spin_lock_mutex(&lock->wait_lock, flags);
89623 }
89624 - mutex_remove_waiter(lock, &waiter, current_thread_info());
89625 + mutex_remove_waiter(lock, &waiter, task);
89626 /* set it to 0 if there are no waiters left: */
89627 if (likely(list_empty(&lock->wait_list)))
89628 atomic_set(&lock->count, 0);
89629 @@ -600,7 +600,7 @@ skip_wait:
89630 return 0;
89631
89632 err:
89633 - mutex_remove_waiter(lock, &waiter, task_thread_info(task));
89634 + mutex_remove_waiter(lock, &waiter, task);
89635 spin_unlock_mutex(&lock->wait_lock, flags);
89636 debug_mutex_free_waiter(&waiter);
89637 mutex_release(&lock->dep_map, 1, ip);
89638 diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
89639 index 1d96dd0..994ff19 100644
89640 --- a/kernel/locking/rtmutex-tester.c
89641 +++ b/kernel/locking/rtmutex-tester.c
89642 @@ -22,7 +22,7 @@
89643 #define MAX_RT_TEST_MUTEXES 8
89644
89645 static spinlock_t rttest_lock;
89646 -static atomic_t rttest_event;
89647 +static atomic_unchecked_t rttest_event;
89648
89649 struct test_thread_data {
89650 int opcode;
89651 @@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89652
89653 case RTTEST_LOCKCONT:
89654 td->mutexes[td->opdata] = 1;
89655 - td->event = atomic_add_return(1, &rttest_event);
89656 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89657 return 0;
89658
89659 case RTTEST_RESET:
89660 @@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89661 return 0;
89662
89663 case RTTEST_RESETEVENT:
89664 - atomic_set(&rttest_event, 0);
89665 + atomic_set_unchecked(&rttest_event, 0);
89666 return 0;
89667
89668 default:
89669 @@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89670 return ret;
89671
89672 td->mutexes[id] = 1;
89673 - td->event = atomic_add_return(1, &rttest_event);
89674 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89675 rt_mutex_lock(&mutexes[id]);
89676 - td->event = atomic_add_return(1, &rttest_event);
89677 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89678 td->mutexes[id] = 4;
89679 return 0;
89680
89681 @@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89682 return ret;
89683
89684 td->mutexes[id] = 1;
89685 - td->event = atomic_add_return(1, &rttest_event);
89686 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89687 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
89688 - td->event = atomic_add_return(1, &rttest_event);
89689 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89690 td->mutexes[id] = ret ? 0 : 4;
89691 return ret ? -EINTR : 0;
89692
89693 @@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89694 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
89695 return ret;
89696
89697 - td->event = atomic_add_return(1, &rttest_event);
89698 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89699 rt_mutex_unlock(&mutexes[id]);
89700 - td->event = atomic_add_return(1, &rttest_event);
89701 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89702 td->mutexes[id] = 0;
89703 return 0;
89704
89705 @@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89706 break;
89707
89708 td->mutexes[dat] = 2;
89709 - td->event = atomic_add_return(1, &rttest_event);
89710 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89711 break;
89712
89713 default:
89714 @@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89715 return;
89716
89717 td->mutexes[dat] = 3;
89718 - td->event = atomic_add_return(1, &rttest_event);
89719 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89720 break;
89721
89722 case RTTEST_LOCKNOWAIT:
89723 @@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89724 return;
89725
89726 td->mutexes[dat] = 1;
89727 - td->event = atomic_add_return(1, &rttest_event);
89728 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89729 return;
89730
89731 default:
89732 diff --git a/kernel/module.c b/kernel/module.c
89733 index 88cec1d..d097c28 100644
89734 --- a/kernel/module.c
89735 +++ b/kernel/module.c
89736 @@ -60,6 +60,7 @@
89737 #include <linux/jump_label.h>
89738 #include <linux/pfn.h>
89739 #include <linux/bsearch.h>
89740 +#include <linux/grsecurity.h>
89741 #include <uapi/linux/module.h>
89742 #include "module-internal.h"
89743
89744 @@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
89745
89746 /* Bounds of module allocation, for speeding __module_address.
89747 * Protected by module_mutex. */
89748 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
89749 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
89750 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
89751
89752 int register_module_notifier(struct notifier_block * nb)
89753 {
89754 @@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89755 return true;
89756
89757 list_for_each_entry_rcu(mod, &modules, list) {
89758 - struct symsearch arr[] = {
89759 + struct symsearch modarr[] = {
89760 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
89761 NOT_GPL_ONLY, false },
89762 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
89763 @@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89764 if (mod->state == MODULE_STATE_UNFORMED)
89765 continue;
89766
89767 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
89768 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
89769 return true;
89770 }
89771 return false;
89772 @@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
89773 if (!pcpusec->sh_size)
89774 return 0;
89775
89776 - if (align > PAGE_SIZE) {
89777 + if (align-1 >= PAGE_SIZE) {
89778 pr_warn("%s: per-cpu alignment %li > %li\n",
89779 mod->name, align, PAGE_SIZE);
89780 align = PAGE_SIZE;
89781 @@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
89782 static ssize_t show_coresize(struct module_attribute *mattr,
89783 struct module_kobject *mk, char *buffer)
89784 {
89785 - return sprintf(buffer, "%u\n", mk->mod->core_size);
89786 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
89787 }
89788
89789 static struct module_attribute modinfo_coresize =
89790 @@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
89791 static ssize_t show_initsize(struct module_attribute *mattr,
89792 struct module_kobject *mk, char *buffer)
89793 {
89794 - return sprintf(buffer, "%u\n", mk->mod->init_size);
89795 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
89796 }
89797
89798 static struct module_attribute modinfo_initsize =
89799 @@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
89800 goto bad_version;
89801 }
89802
89803 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89804 + /*
89805 + * avoid potentially printing jibberish on attempted load
89806 + * of a module randomized with a different seed
89807 + */
89808 + pr_warn("no symbol version for %s\n", symname);
89809 +#else
89810 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
89811 +#endif
89812 return 0;
89813
89814 bad_version:
89815 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89816 + /*
89817 + * avoid potentially printing jibberish on attempted load
89818 + * of a module randomized with a different seed
89819 + */
89820 + printk("attempted module disagrees about version of symbol %s\n",
89821 + symname);
89822 +#else
89823 printk("%s: disagrees about version of symbol %s\n",
89824 mod->name, symname);
89825 +#endif
89826 return 0;
89827 }
89828
89829 @@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
89830 */
89831 #ifdef CONFIG_SYSFS
89832
89833 -#ifdef CONFIG_KALLSYMS
89834 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
89835 static inline bool sect_empty(const Elf_Shdr *sect)
89836 {
89837 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
89838 @@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
89839 {
89840 unsigned int notes, loaded, i;
89841 struct module_notes_attrs *notes_attrs;
89842 - struct bin_attribute *nattr;
89843 + bin_attribute_no_const *nattr;
89844
89845 /* failed to create section attributes, so can't create notes */
89846 if (!mod->sect_attrs)
89847 @@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
89848 static int module_add_modinfo_attrs(struct module *mod)
89849 {
89850 struct module_attribute *attr;
89851 - struct module_attribute *temp_attr;
89852 + module_attribute_no_const *temp_attr;
89853 int error = 0;
89854 int i;
89855
89856 @@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
89857
89858 static void unset_module_core_ro_nx(struct module *mod)
89859 {
89860 - set_page_attributes(mod->module_core + mod->core_text_size,
89861 - mod->module_core + mod->core_size,
89862 + set_page_attributes(mod->module_core_rw,
89863 + mod->module_core_rw + mod->core_size_rw,
89864 set_memory_x);
89865 - set_page_attributes(mod->module_core,
89866 - mod->module_core + mod->core_ro_size,
89867 + set_page_attributes(mod->module_core_rx,
89868 + mod->module_core_rx + mod->core_size_rx,
89869 set_memory_rw);
89870 }
89871
89872 static void unset_module_init_ro_nx(struct module *mod)
89873 {
89874 - set_page_attributes(mod->module_init + mod->init_text_size,
89875 - mod->module_init + mod->init_size,
89876 + set_page_attributes(mod->module_init_rw,
89877 + mod->module_init_rw + mod->init_size_rw,
89878 set_memory_x);
89879 - set_page_attributes(mod->module_init,
89880 - mod->module_init + mod->init_ro_size,
89881 + set_page_attributes(mod->module_init_rx,
89882 + mod->module_init_rx + mod->init_size_rx,
89883 set_memory_rw);
89884 }
89885
89886 @@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
89887 list_for_each_entry_rcu(mod, &modules, list) {
89888 if (mod->state == MODULE_STATE_UNFORMED)
89889 continue;
89890 - if ((mod->module_core) && (mod->core_text_size)) {
89891 - set_page_attributes(mod->module_core,
89892 - mod->module_core + mod->core_text_size,
89893 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
89894 + set_page_attributes(mod->module_core_rx,
89895 + mod->module_core_rx + mod->core_size_rx,
89896 set_memory_rw);
89897 }
89898 - if ((mod->module_init) && (mod->init_text_size)) {
89899 - set_page_attributes(mod->module_init,
89900 - mod->module_init + mod->init_text_size,
89901 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
89902 + set_page_attributes(mod->module_init_rx,
89903 + mod->module_init_rx + mod->init_size_rx,
89904 set_memory_rw);
89905 }
89906 }
89907 @@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
89908 list_for_each_entry_rcu(mod, &modules, list) {
89909 if (mod->state == MODULE_STATE_UNFORMED)
89910 continue;
89911 - if ((mod->module_core) && (mod->core_text_size)) {
89912 - set_page_attributes(mod->module_core,
89913 - mod->module_core + mod->core_text_size,
89914 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
89915 + set_page_attributes(mod->module_core_rx,
89916 + mod->module_core_rx + mod->core_size_rx,
89917 set_memory_ro);
89918 }
89919 - if ((mod->module_init) && (mod->init_text_size)) {
89920 - set_page_attributes(mod->module_init,
89921 - mod->module_init + mod->init_text_size,
89922 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
89923 + set_page_attributes(mod->module_init_rx,
89924 + mod->module_init_rx + mod->init_size_rx,
89925 set_memory_ro);
89926 }
89927 }
89928 @@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
89929
89930 /* This may be NULL, but that's OK */
89931 unset_module_init_ro_nx(mod);
89932 - module_free(mod, mod->module_init);
89933 + module_free(mod, mod->module_init_rw);
89934 + module_free_exec(mod, mod->module_init_rx);
89935 kfree(mod->args);
89936 percpu_modfree(mod);
89937
89938 /* Free lock-classes: */
89939 - lockdep_free_key_range(mod->module_core, mod->core_size);
89940 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
89941 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
89942
89943 /* Finally, free the core (containing the module structure) */
89944 unset_module_core_ro_nx(mod);
89945 - module_free(mod, mod->module_core);
89946 + module_free_exec(mod, mod->module_core_rx);
89947 + module_free(mod, mod->module_core_rw);
89948
89949 #ifdef CONFIG_MPU
89950 update_protections(current->mm);
89951 @@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
89952 int ret = 0;
89953 const struct kernel_symbol *ksym;
89954
89955 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89956 + int is_fs_load = 0;
89957 + int register_filesystem_found = 0;
89958 + char *p;
89959 +
89960 + p = strstr(mod->args, "grsec_modharden_fs");
89961 + if (p) {
89962 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
89963 + /* copy \0 as well */
89964 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
89965 + is_fs_load = 1;
89966 + }
89967 +#endif
89968 +
89969 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
89970 const char *name = info->strtab + sym[i].st_name;
89971
89972 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89973 + /* it's a real shame this will never get ripped and copied
89974 + upstream! ;(
89975 + */
89976 + if (is_fs_load && !strcmp(name, "register_filesystem"))
89977 + register_filesystem_found = 1;
89978 +#endif
89979 +
89980 switch (sym[i].st_shndx) {
89981 case SHN_COMMON:
89982 /* Ignore common symbols */
89983 @@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
89984 ksym = resolve_symbol_wait(mod, info, name);
89985 /* Ok if resolved. */
89986 if (ksym && !IS_ERR(ksym)) {
89987 + pax_open_kernel();
89988 sym[i].st_value = ksym->value;
89989 + pax_close_kernel();
89990 break;
89991 }
89992
89993 @@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
89994 secbase = (unsigned long)mod_percpu(mod);
89995 else
89996 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
89997 + pax_open_kernel();
89998 sym[i].st_value += secbase;
89999 + pax_close_kernel();
90000 break;
90001 }
90002 }
90003
90004 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90005 + if (is_fs_load && !register_filesystem_found) {
90006 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
90007 + ret = -EPERM;
90008 + }
90009 +#endif
90010 +
90011 return ret;
90012 }
90013
90014 @@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
90015 || s->sh_entsize != ~0UL
90016 || strstarts(sname, ".init"))
90017 continue;
90018 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
90019 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90020 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
90021 + else
90022 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
90023 pr_debug("\t%s\n", sname);
90024 }
90025 - switch (m) {
90026 - case 0: /* executable */
90027 - mod->core_size = debug_align(mod->core_size);
90028 - mod->core_text_size = mod->core_size;
90029 - break;
90030 - case 1: /* RO: text and ro-data */
90031 - mod->core_size = debug_align(mod->core_size);
90032 - mod->core_ro_size = mod->core_size;
90033 - break;
90034 - case 3: /* whole core */
90035 - mod->core_size = debug_align(mod->core_size);
90036 - break;
90037 - }
90038 }
90039
90040 pr_debug("Init section allocation order:\n");
90041 @@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
90042 || s->sh_entsize != ~0UL
90043 || !strstarts(sname, ".init"))
90044 continue;
90045 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
90046 - | INIT_OFFSET_MASK);
90047 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90048 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
90049 + else
90050 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
90051 + s->sh_entsize |= INIT_OFFSET_MASK;
90052 pr_debug("\t%s\n", sname);
90053 }
90054 - switch (m) {
90055 - case 0: /* executable */
90056 - mod->init_size = debug_align(mod->init_size);
90057 - mod->init_text_size = mod->init_size;
90058 - break;
90059 - case 1: /* RO: text and ro-data */
90060 - mod->init_size = debug_align(mod->init_size);
90061 - mod->init_ro_size = mod->init_size;
90062 - break;
90063 - case 3: /* whole init */
90064 - mod->init_size = debug_align(mod->init_size);
90065 - break;
90066 - }
90067 }
90068 }
90069
90070 @@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90071
90072 /* Put symbol section at end of init part of module. */
90073 symsect->sh_flags |= SHF_ALLOC;
90074 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
90075 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
90076 info->index.sym) | INIT_OFFSET_MASK;
90077 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
90078
90079 @@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90080 }
90081
90082 /* Append room for core symbols at end of core part. */
90083 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
90084 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
90085 - mod->core_size += strtab_size;
90086 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
90087 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
90088 + mod->core_size_rx += strtab_size;
90089
90090 /* Put string table section at end of init part of module. */
90091 strsect->sh_flags |= SHF_ALLOC;
90092 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
90093 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
90094 info->index.str) | INIT_OFFSET_MASK;
90095 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
90096 }
90097 @@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90098 /* Make sure we get permanent strtab: don't use info->strtab. */
90099 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
90100
90101 + pax_open_kernel();
90102 +
90103 /* Set types up while we still have access to sections. */
90104 for (i = 0; i < mod->num_symtab; i++)
90105 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
90106
90107 - mod->core_symtab = dst = mod->module_core + info->symoffs;
90108 - mod->core_strtab = s = mod->module_core + info->stroffs;
90109 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
90110 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
90111 src = mod->symtab;
90112 for (ndst = i = 0; i < mod->num_symtab; i++) {
90113 if (i == 0 ||
90114 @@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90115 }
90116 }
90117 mod->core_num_syms = ndst;
90118 +
90119 + pax_close_kernel();
90120 }
90121 #else
90122 static inline void layout_symtab(struct module *mod, struct load_info *info)
90123 @@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
90124 return vmalloc_exec(size);
90125 }
90126
90127 -static void *module_alloc_update_bounds(unsigned long size)
90128 +static void *module_alloc_update_bounds_rw(unsigned long size)
90129 {
90130 void *ret = module_alloc(size);
90131
90132 if (ret) {
90133 mutex_lock(&module_mutex);
90134 /* Update module bounds. */
90135 - if ((unsigned long)ret < module_addr_min)
90136 - module_addr_min = (unsigned long)ret;
90137 - if ((unsigned long)ret + size > module_addr_max)
90138 - module_addr_max = (unsigned long)ret + size;
90139 + if ((unsigned long)ret < module_addr_min_rw)
90140 + module_addr_min_rw = (unsigned long)ret;
90141 + if ((unsigned long)ret + size > module_addr_max_rw)
90142 + module_addr_max_rw = (unsigned long)ret + size;
90143 + mutex_unlock(&module_mutex);
90144 + }
90145 + return ret;
90146 +}
90147 +
90148 +static void *module_alloc_update_bounds_rx(unsigned long size)
90149 +{
90150 + void *ret = module_alloc_exec(size);
90151 +
90152 + if (ret) {
90153 + mutex_lock(&module_mutex);
90154 + /* Update module bounds. */
90155 + if ((unsigned long)ret < module_addr_min_rx)
90156 + module_addr_min_rx = (unsigned long)ret;
90157 + if ((unsigned long)ret + size > module_addr_max_rx)
90158 + module_addr_max_rx = (unsigned long)ret + size;
90159 mutex_unlock(&module_mutex);
90160 }
90161 return ret;
90162 @@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90163 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
90164
90165 if (info->index.sym == 0) {
90166 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90167 + /*
90168 + * avoid potentially printing jibberish on attempted load
90169 + * of a module randomized with a different seed
90170 + */
90171 + pr_warn("module has no symbols (stripped?)\n");
90172 +#else
90173 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
90174 +#endif
90175 return ERR_PTR(-ENOEXEC);
90176 }
90177
90178 @@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90179 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90180 {
90181 const char *modmagic = get_modinfo(info, "vermagic");
90182 + const char *license = get_modinfo(info, "license");
90183 int err;
90184
90185 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
90186 + if (!license || !license_is_gpl_compatible(license))
90187 + return -ENOEXEC;
90188 +#endif
90189 +
90190 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
90191 modmagic = NULL;
90192
90193 @@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90194 }
90195
90196 /* Set up license info based on the info section */
90197 - set_license(mod, get_modinfo(info, "license"));
90198 + set_license(mod, license);
90199
90200 return 0;
90201 }
90202 @@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
90203 void *ptr;
90204
90205 /* Do the allocs. */
90206 - ptr = module_alloc_update_bounds(mod->core_size);
90207 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
90208 /*
90209 * The pointer to this block is stored in the module structure
90210 * which is inside the block. Just mark it as not being a
90211 @@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
90212 if (!ptr)
90213 return -ENOMEM;
90214
90215 - memset(ptr, 0, mod->core_size);
90216 - mod->module_core = ptr;
90217 + memset(ptr, 0, mod->core_size_rw);
90218 + mod->module_core_rw = ptr;
90219
90220 - if (mod->init_size) {
90221 - ptr = module_alloc_update_bounds(mod->init_size);
90222 + if (mod->init_size_rw) {
90223 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
90224 /*
90225 * The pointer to this block is stored in the module structure
90226 * which is inside the block. This block doesn't need to be
90227 @@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
90228 */
90229 kmemleak_ignore(ptr);
90230 if (!ptr) {
90231 - module_free(mod, mod->module_core);
90232 + module_free(mod, mod->module_core_rw);
90233 return -ENOMEM;
90234 }
90235 - memset(ptr, 0, mod->init_size);
90236 - mod->module_init = ptr;
90237 + memset(ptr, 0, mod->init_size_rw);
90238 + mod->module_init_rw = ptr;
90239 } else
90240 - mod->module_init = NULL;
90241 + mod->module_init_rw = NULL;
90242 +
90243 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
90244 + kmemleak_not_leak(ptr);
90245 + if (!ptr) {
90246 + if (mod->module_init_rw)
90247 + module_free(mod, mod->module_init_rw);
90248 + module_free(mod, mod->module_core_rw);
90249 + return -ENOMEM;
90250 + }
90251 +
90252 + pax_open_kernel();
90253 + memset(ptr, 0, mod->core_size_rx);
90254 + pax_close_kernel();
90255 + mod->module_core_rx = ptr;
90256 +
90257 + if (mod->init_size_rx) {
90258 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
90259 + kmemleak_ignore(ptr);
90260 + if (!ptr && mod->init_size_rx) {
90261 + module_free_exec(mod, mod->module_core_rx);
90262 + if (mod->module_init_rw)
90263 + module_free(mod, mod->module_init_rw);
90264 + module_free(mod, mod->module_core_rw);
90265 + return -ENOMEM;
90266 + }
90267 +
90268 + pax_open_kernel();
90269 + memset(ptr, 0, mod->init_size_rx);
90270 + pax_close_kernel();
90271 + mod->module_init_rx = ptr;
90272 + } else
90273 + mod->module_init_rx = NULL;
90274
90275 /* Transfer each section which specifies SHF_ALLOC */
90276 pr_debug("final section addresses:\n");
90277 @@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
90278 if (!(shdr->sh_flags & SHF_ALLOC))
90279 continue;
90280
90281 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
90282 - dest = mod->module_init
90283 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90284 - else
90285 - dest = mod->module_core + shdr->sh_entsize;
90286 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
90287 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90288 + dest = mod->module_init_rw
90289 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90290 + else
90291 + dest = mod->module_init_rx
90292 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90293 + } else {
90294 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90295 + dest = mod->module_core_rw + shdr->sh_entsize;
90296 + else
90297 + dest = mod->module_core_rx + shdr->sh_entsize;
90298 + }
90299 +
90300 + if (shdr->sh_type != SHT_NOBITS) {
90301 +
90302 +#ifdef CONFIG_PAX_KERNEXEC
90303 +#ifdef CONFIG_X86_64
90304 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
90305 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
90306 +#endif
90307 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
90308 + pax_open_kernel();
90309 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90310 + pax_close_kernel();
90311 + } else
90312 +#endif
90313
90314 - if (shdr->sh_type != SHT_NOBITS)
90315 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90316 + }
90317 /* Update sh_addr to point to copy in image. */
90318 - shdr->sh_addr = (unsigned long)dest;
90319 +
90320 +#ifdef CONFIG_PAX_KERNEXEC
90321 + if (shdr->sh_flags & SHF_EXECINSTR)
90322 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
90323 + else
90324 +#endif
90325 +
90326 + shdr->sh_addr = (unsigned long)dest;
90327 pr_debug("\t0x%lx %s\n",
90328 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
90329 }
90330 @@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
90331 * Do it before processing of module parameters, so the module
90332 * can provide parameter accessor functions of its own.
90333 */
90334 - if (mod->module_init)
90335 - flush_icache_range((unsigned long)mod->module_init,
90336 - (unsigned long)mod->module_init
90337 - + mod->init_size);
90338 - flush_icache_range((unsigned long)mod->module_core,
90339 - (unsigned long)mod->module_core + mod->core_size);
90340 + if (mod->module_init_rx)
90341 + flush_icache_range((unsigned long)mod->module_init_rx,
90342 + (unsigned long)mod->module_init_rx
90343 + + mod->init_size_rx);
90344 + flush_icache_range((unsigned long)mod->module_core_rx,
90345 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
90346
90347 set_fs(old_fs);
90348 }
90349 @@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
90350 static void module_deallocate(struct module *mod, struct load_info *info)
90351 {
90352 percpu_modfree(mod);
90353 - module_free(mod, mod->module_init);
90354 - module_free(mod, mod->module_core);
90355 + module_free_exec(mod, mod->module_init_rx);
90356 + module_free_exec(mod, mod->module_core_rx);
90357 + module_free(mod, mod->module_init_rw);
90358 + module_free(mod, mod->module_core_rw);
90359 }
90360
90361 int __weak module_finalize(const Elf_Ehdr *hdr,
90362 @@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
90363 static int post_relocation(struct module *mod, const struct load_info *info)
90364 {
90365 /* Sort exception table now relocations are done. */
90366 + pax_open_kernel();
90367 sort_extable(mod->extable, mod->extable + mod->num_exentries);
90368 + pax_close_kernel();
90369
90370 /* Copy relocated percpu area over. */
90371 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
90372 @@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
90373 mod->strtab = mod->core_strtab;
90374 #endif
90375 unset_module_init_ro_nx(mod);
90376 - module_free(mod, mod->module_init);
90377 - mod->module_init = NULL;
90378 - mod->init_size = 0;
90379 - mod->init_ro_size = 0;
90380 - mod->init_text_size = 0;
90381 + module_free(mod, mod->module_init_rw);
90382 + module_free_exec(mod, mod->module_init_rx);
90383 + mod->module_init_rw = NULL;
90384 + mod->module_init_rx = NULL;
90385 + mod->init_size_rw = 0;
90386 + mod->init_size_rx = 0;
90387 mutex_unlock(&module_mutex);
90388 wake_up_all(&module_wq);
90389
90390 @@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
90391 module_bug_finalize(info->hdr, info->sechdrs, mod);
90392
90393 /* Set RO and NX regions for core */
90394 - set_section_ro_nx(mod->module_core,
90395 - mod->core_text_size,
90396 - mod->core_ro_size,
90397 - mod->core_size);
90398 + set_section_ro_nx(mod->module_core_rx,
90399 + mod->core_size_rx,
90400 + mod->core_size_rx,
90401 + mod->core_size_rx);
90402
90403 /* Set RO and NX regions for init */
90404 - set_section_ro_nx(mod->module_init,
90405 - mod->init_text_size,
90406 - mod->init_ro_size,
90407 - mod->init_size);
90408 + set_section_ro_nx(mod->module_init_rx,
90409 + mod->init_size_rx,
90410 + mod->init_size_rx,
90411 + mod->init_size_rx);
90412
90413 /* Mark state as coming so strong_try_module_get() ignores us,
90414 * but kallsyms etc. can see us. */
90415 @@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
90416 if (err)
90417 goto free_unload;
90418
90419 + /* Now copy in args */
90420 + mod->args = strndup_user(uargs, ~0UL >> 1);
90421 + if (IS_ERR(mod->args)) {
90422 + err = PTR_ERR(mod->args);
90423 + goto free_unload;
90424 + }
90425 +
90426 /* Set up MODINFO_ATTR fields */
90427 setup_modinfo(mod, info);
90428
90429 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90430 + {
90431 + char *p, *p2;
90432 +
90433 + if (strstr(mod->args, "grsec_modharden_netdev")) {
90434 + 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);
90435 + err = -EPERM;
90436 + goto free_modinfo;
90437 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
90438 + p += sizeof("grsec_modharden_normal") - 1;
90439 + p2 = strstr(p, "_");
90440 + if (p2) {
90441 + *p2 = '\0';
90442 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
90443 + *p2 = '_';
90444 + }
90445 + err = -EPERM;
90446 + goto free_modinfo;
90447 + }
90448 + }
90449 +#endif
90450 +
90451 /* Fix up syms, so that st_value is a pointer to location. */
90452 err = simplify_symbols(mod, info);
90453 if (err < 0)
90454 @@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
90455
90456 flush_module_icache(mod);
90457
90458 - /* Now copy in args */
90459 - mod->args = strndup_user(uargs, ~0UL >> 1);
90460 - if (IS_ERR(mod->args)) {
90461 - err = PTR_ERR(mod->args);
90462 - goto free_arch_cleanup;
90463 - }
90464 -
90465 dynamic_debug_setup(info->debug, info->num_debug);
90466
90467 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
90468 @@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
90469 ddebug_cleanup:
90470 dynamic_debug_remove(info->debug);
90471 synchronize_sched();
90472 - kfree(mod->args);
90473 - free_arch_cleanup:
90474 module_arch_cleanup(mod);
90475 free_modinfo:
90476 free_modinfo(mod);
90477 + kfree(mod->args);
90478 free_unload:
90479 module_unload_free(mod);
90480 unlink_mod:
90481 @@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
90482 unsigned long nextval;
90483
90484 /* At worse, next value is at end of module */
90485 - if (within_module_init(addr, mod))
90486 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
90487 + if (within_module_init_rx(addr, mod))
90488 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
90489 + else if (within_module_init_rw(addr, mod))
90490 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
90491 + else if (within_module_core_rx(addr, mod))
90492 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
90493 + else if (within_module_core_rw(addr, mod))
90494 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
90495 else
90496 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
90497 + return NULL;
90498
90499 /* Scan for closest preceding symbol, and next symbol. (ELF
90500 starts real symbols at 1). */
90501 @@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
90502 return 0;
90503
90504 seq_printf(m, "%s %u",
90505 - mod->name, mod->init_size + mod->core_size);
90506 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
90507 print_unload_info(m, mod);
90508
90509 /* Informative for users. */
90510 @@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
90511 mod->state == MODULE_STATE_COMING ? "Loading":
90512 "Live");
90513 /* Used by oprofile and other similar tools. */
90514 - seq_printf(m, " 0x%pK", mod->module_core);
90515 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
90516
90517 /* Taints info */
90518 if (mod->taints)
90519 @@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
90520
90521 static int __init proc_modules_init(void)
90522 {
90523 +#ifndef CONFIG_GRKERNSEC_HIDESYM
90524 +#ifdef CONFIG_GRKERNSEC_PROC_USER
90525 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90526 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90527 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
90528 +#else
90529 proc_create("modules", 0, NULL, &proc_modules_operations);
90530 +#endif
90531 +#else
90532 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90533 +#endif
90534 return 0;
90535 }
90536 module_init(proc_modules_init);
90537 @@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
90538 {
90539 struct module *mod;
90540
90541 - if (addr < module_addr_min || addr > module_addr_max)
90542 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
90543 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
90544 return NULL;
90545
90546 list_for_each_entry_rcu(mod, &modules, list) {
90547 @@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
90548 */
90549 struct module *__module_text_address(unsigned long addr)
90550 {
90551 - struct module *mod = __module_address(addr);
90552 + struct module *mod;
90553 +
90554 +#ifdef CONFIG_X86_32
90555 + addr = ktla_ktva(addr);
90556 +#endif
90557 +
90558 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
90559 + return NULL;
90560 +
90561 + mod = __module_address(addr);
90562 +
90563 if (mod) {
90564 /* Make sure it's within the text section. */
90565 - if (!within(addr, mod->module_init, mod->init_text_size)
90566 - && !within(addr, mod->module_core, mod->core_text_size))
90567 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
90568 mod = NULL;
90569 }
90570 return mod;
90571 diff --git a/kernel/notifier.c b/kernel/notifier.c
90572 index 4803da6..1c5eea6 100644
90573 --- a/kernel/notifier.c
90574 +++ b/kernel/notifier.c
90575 @@ -5,6 +5,7 @@
90576 #include <linux/rcupdate.h>
90577 #include <linux/vmalloc.h>
90578 #include <linux/reboot.h>
90579 +#include <linux/mm.h>
90580
90581 /*
90582 * Notifier list for kernel code which wants to be called
90583 @@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
90584 while ((*nl) != NULL) {
90585 if (n->priority > (*nl)->priority)
90586 break;
90587 - nl = &((*nl)->next);
90588 + nl = (struct notifier_block **)&((*nl)->next);
90589 }
90590 - n->next = *nl;
90591 + pax_open_kernel();
90592 + *(const void **)&n->next = *nl;
90593 rcu_assign_pointer(*nl, n);
90594 + pax_close_kernel();
90595 return 0;
90596 }
90597
90598 @@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
90599 return 0;
90600 if (n->priority > (*nl)->priority)
90601 break;
90602 - nl = &((*nl)->next);
90603 + nl = (struct notifier_block **)&((*nl)->next);
90604 }
90605 - n->next = *nl;
90606 + pax_open_kernel();
90607 + *(const void **)&n->next = *nl;
90608 rcu_assign_pointer(*nl, n);
90609 + pax_close_kernel();
90610 return 0;
90611 }
90612
90613 @@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
90614 {
90615 while ((*nl) != NULL) {
90616 if ((*nl) == n) {
90617 + pax_open_kernel();
90618 rcu_assign_pointer(*nl, n->next);
90619 + pax_close_kernel();
90620 return 0;
90621 }
90622 - nl = &((*nl)->next);
90623 + nl = (struct notifier_block **)&((*nl)->next);
90624 }
90625 return -ENOENT;
90626 }
90627 diff --git a/kernel/padata.c b/kernel/padata.c
90628 index 161402f..598814c 100644
90629 --- a/kernel/padata.c
90630 +++ b/kernel/padata.c
90631 @@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
90632 * seq_nr mod. number of cpus in use.
90633 */
90634
90635 - seq_nr = atomic_inc_return(&pd->seq_nr);
90636 + seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
90637 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
90638
90639 return padata_index_to_cpu(pd, cpu_index);
90640 @@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
90641 padata_init_pqueues(pd);
90642 padata_init_squeues(pd);
90643 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
90644 - atomic_set(&pd->seq_nr, -1);
90645 + atomic_set_unchecked(&pd->seq_nr, -1);
90646 atomic_set(&pd->reorder_objects, 0);
90647 atomic_set(&pd->refcnt, 0);
90648 pd->pinst = pinst;
90649 diff --git a/kernel/panic.c b/kernel/panic.c
90650 index cf80672..f6771b2 100644
90651 --- a/kernel/panic.c
90652 +++ b/kernel/panic.c
90653 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
90654 /*
90655 * Stop ourself in panic -- architecture code may override this
90656 */
90657 -void __weak panic_smp_self_stop(void)
90658 +void __weak __noreturn panic_smp_self_stop(void)
90659 {
90660 while (1)
90661 cpu_relax();
90662 @@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
90663 disable_trace_on_warning();
90664
90665 pr_warn("------------[ cut here ]------------\n");
90666 - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
90667 + pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
90668 raw_smp_processor_id(), current->pid, file, line, caller);
90669
90670 if (args)
90671 @@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
90672 */
90673 __visible void __stack_chk_fail(void)
90674 {
90675 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
90676 + dump_stack();
90677 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
90678 __builtin_return_address(0));
90679 }
90680 EXPORT_SYMBOL(__stack_chk_fail);
90681 diff --git a/kernel/pid.c b/kernel/pid.c
90682 index 82430c8..53d7793 100644
90683 --- a/kernel/pid.c
90684 +++ b/kernel/pid.c
90685 @@ -33,6 +33,7 @@
90686 #include <linux/rculist.h>
90687 #include <linux/bootmem.h>
90688 #include <linux/hash.h>
90689 +#include <linux/security.h>
90690 #include <linux/pid_namespace.h>
90691 #include <linux/init_task.h>
90692 #include <linux/syscalls.h>
90693 @@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
90694
90695 int pid_max = PID_MAX_DEFAULT;
90696
90697 -#define RESERVED_PIDS 300
90698 +#define RESERVED_PIDS 500
90699
90700 int pid_max_min = RESERVED_PIDS + 1;
90701 int pid_max_max = PID_MAX_LIMIT;
90702 @@ -447,10 +448,18 @@ EXPORT_SYMBOL(pid_task);
90703 */
90704 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
90705 {
90706 + struct task_struct *task;
90707 +
90708 rcu_lockdep_assert(rcu_read_lock_held(),
90709 "find_task_by_pid_ns() needs rcu_read_lock()"
90710 " protection");
90711 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90712 +
90713 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90714 +
90715 + if (gr_pid_is_chrooted(task))
90716 + return NULL;
90717 +
90718 + return task;
90719 }
90720
90721 struct task_struct *find_task_by_vpid(pid_t vnr)
90722 @@ -458,6 +467,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
90723 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
90724 }
90725
90726 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
90727 +{
90728 + rcu_lockdep_assert(rcu_read_lock_held(),
90729 + "find_task_by_pid_ns() needs rcu_read_lock()"
90730 + " protection");
90731 + return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
90732 +}
90733 +
90734 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
90735 {
90736 struct pid *pid;
90737 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
90738 index db95d8e..a0ca23f 100644
90739 --- a/kernel/pid_namespace.c
90740 +++ b/kernel/pid_namespace.c
90741 @@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
90742 void __user *buffer, size_t *lenp, loff_t *ppos)
90743 {
90744 struct pid_namespace *pid_ns = task_active_pid_ns(current);
90745 - struct ctl_table tmp = *table;
90746 + ctl_table_no_const tmp = *table;
90747
90748 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
90749 return -EPERM;
90750 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
90751 index bbef57f..5f94462 100644
90752 --- a/kernel/power/Kconfig
90753 +++ b/kernel/power/Kconfig
90754 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
90755 config HIBERNATION
90756 bool "Hibernation (aka 'suspend to disk')"
90757 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
90758 + depends on !GRKERNSEC_KMEM
90759 + depends on !PAX_MEMORY_SANITIZE
90760 select HIBERNATE_CALLBACKS
90761 select LZO_COMPRESS
90762 select LZO_DECOMPRESS
90763 diff --git a/kernel/power/process.c b/kernel/power/process.c
90764 index 5a6ec86..3a8c884 100644
90765 --- a/kernel/power/process.c
90766 +++ b/kernel/power/process.c
90767 @@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
90768 unsigned int elapsed_msecs;
90769 bool wakeup = false;
90770 int sleep_usecs = USEC_PER_MSEC;
90771 + bool timedout = false;
90772
90773 do_gettimeofday(&start);
90774
90775 @@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
90776
90777 while (true) {
90778 todo = 0;
90779 + if (time_after(jiffies, end_time))
90780 + timedout = true;
90781 read_lock(&tasklist_lock);
90782 for_each_process_thread(g, p) {
90783 if (p == current || !freeze_task(p))
90784 continue;
90785
90786 - if (!freezer_should_skip(p))
90787 + if (!freezer_should_skip(p)) {
90788 todo++;
90789 + if (timedout) {
90790 + printk(KERN_ERR "Task refusing to freeze:\n");
90791 + sched_show_task(p);
90792 + }
90793 + }
90794 }
90795 read_unlock(&tasklist_lock);
90796
90797 @@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
90798 todo += wq_busy;
90799 }
90800
90801 - if (!todo || time_after(jiffies, end_time))
90802 + if (!todo || timedout)
90803 break;
90804
90805 if (pm_wakeup_pending()) {
90806 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
90807 index ced2b84..ffc4791 100644
90808 --- a/kernel/printk/printk.c
90809 +++ b/kernel/printk/printk.c
90810 @@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
90811 if (from_file && type != SYSLOG_ACTION_OPEN)
90812 return 0;
90813
90814 +#ifdef CONFIG_GRKERNSEC_DMESG
90815 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
90816 + return -EPERM;
90817 +#endif
90818 +
90819 if (syslog_action_restricted(type)) {
90820 if (capable(CAP_SYSLOG))
90821 return 0;
90822 diff --git a/kernel/profile.c b/kernel/profile.c
90823 index 54bf5ba..df6e0a2 100644
90824 --- a/kernel/profile.c
90825 +++ b/kernel/profile.c
90826 @@ -37,7 +37,7 @@ struct profile_hit {
90827 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
90828 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
90829
90830 -static atomic_t *prof_buffer;
90831 +static atomic_unchecked_t *prof_buffer;
90832 static unsigned long prof_len, prof_shift;
90833
90834 int prof_on __read_mostly;
90835 @@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
90836 hits[i].pc = 0;
90837 continue;
90838 }
90839 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90840 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90841 hits[i].hits = hits[i].pc = 0;
90842 }
90843 }
90844 @@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90845 * Add the current hit(s) and flush the write-queue out
90846 * to the global buffer:
90847 */
90848 - atomic_add(nr_hits, &prof_buffer[pc]);
90849 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
90850 for (i = 0; i < NR_PROFILE_HIT; ++i) {
90851 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90852 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90853 hits[i].pc = hits[i].hits = 0;
90854 }
90855 out:
90856 @@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90857 {
90858 unsigned long pc;
90859 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
90860 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90861 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90862 }
90863 #endif /* !CONFIG_SMP */
90864
90865 @@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
90866 return -EFAULT;
90867 buf++; p++; count--; read++;
90868 }
90869 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
90870 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
90871 if (copy_to_user(buf, (void *)pnt, count))
90872 return -EFAULT;
90873 read += count;
90874 @@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
90875 }
90876 #endif
90877 profile_discard_flip_buffers();
90878 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
90879 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
90880 return count;
90881 }
90882
90883 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
90884 index 54e7522..5b82dd6 100644
90885 --- a/kernel/ptrace.c
90886 +++ b/kernel/ptrace.c
90887 @@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
90888 if (seize)
90889 flags |= PT_SEIZED;
90890 rcu_read_lock();
90891 - if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
90892 + if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
90893 flags |= PT_PTRACE_CAP;
90894 rcu_read_unlock();
90895 task->ptrace = flags;
90896 @@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
90897 break;
90898 return -EIO;
90899 }
90900 - if (copy_to_user(dst, buf, retval))
90901 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
90902 return -EFAULT;
90903 copied += retval;
90904 src += retval;
90905 @@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
90906 bool seized = child->ptrace & PT_SEIZED;
90907 int ret = -EIO;
90908 siginfo_t siginfo, *si;
90909 - void __user *datavp = (void __user *) data;
90910 + void __user *datavp = (__force void __user *) data;
90911 unsigned long __user *datalp = datavp;
90912 unsigned long flags;
90913
90914 @@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
90915 goto out;
90916 }
90917
90918 + if (gr_handle_ptrace(child, request)) {
90919 + ret = -EPERM;
90920 + goto out_put_task_struct;
90921 + }
90922 +
90923 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
90924 ret = ptrace_attach(child, request, addr, data);
90925 /*
90926 * Some architectures need to do book-keeping after
90927 * a ptrace attach.
90928 */
90929 - if (!ret)
90930 + if (!ret) {
90931 arch_ptrace_attach(child);
90932 + gr_audit_ptrace(child);
90933 + }
90934 goto out_put_task_struct;
90935 }
90936
90937 @@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
90938 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
90939 if (copied != sizeof(tmp))
90940 return -EIO;
90941 - return put_user(tmp, (unsigned long __user *)data);
90942 + return put_user(tmp, (__force unsigned long __user *)data);
90943 }
90944
90945 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
90946 @@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
90947 }
90948
90949 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
90950 - compat_long_t, addr, compat_long_t, data)
90951 + compat_ulong_t, addr, compat_ulong_t, data)
90952 {
90953 struct task_struct *child;
90954 long ret;
90955 @@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
90956 goto out;
90957 }
90958
90959 + if (gr_handle_ptrace(child, request)) {
90960 + ret = -EPERM;
90961 + goto out_put_task_struct;
90962 + }
90963 +
90964 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
90965 ret = ptrace_attach(child, request, addr, data);
90966 /*
90967 * Some architectures need to do book-keeping after
90968 * a ptrace attach.
90969 */
90970 - if (!ret)
90971 + if (!ret) {
90972 arch_ptrace_attach(child);
90973 + gr_audit_ptrace(child);
90974 + }
90975 goto out_put_task_struct;
90976 }
90977
90978 diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
90979 index 240fa90..5fa56bd 100644
90980 --- a/kernel/rcu/rcutorture.c
90981 +++ b/kernel/rcu/rcutorture.c
90982 @@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
90983 rcu_torture_count) = { 0 };
90984 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
90985 rcu_torture_batch) = { 0 };
90986 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
90987 -static atomic_t n_rcu_torture_alloc;
90988 -static atomic_t n_rcu_torture_alloc_fail;
90989 -static atomic_t n_rcu_torture_free;
90990 -static atomic_t n_rcu_torture_mberror;
90991 -static atomic_t n_rcu_torture_error;
90992 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
90993 +static atomic_unchecked_t n_rcu_torture_alloc;
90994 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
90995 +static atomic_unchecked_t n_rcu_torture_free;
90996 +static atomic_unchecked_t n_rcu_torture_mberror;
90997 +static atomic_unchecked_t n_rcu_torture_error;
90998 static long n_rcu_torture_barrier_error;
90999 static long n_rcu_torture_boost_ktrerror;
91000 static long n_rcu_torture_boost_rterror;
91001 @@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
91002 static long n_rcu_torture_timers;
91003 static long n_barrier_attempts;
91004 static long n_barrier_successes;
91005 -static atomic_long_t n_cbfloods;
91006 +static atomic_long_unchecked_t n_cbfloods;
91007 static struct list_head rcu_torture_removed;
91008
91009 static int rcu_torture_writer_state;
91010 @@ -211,11 +211,11 @@ rcu_torture_alloc(void)
91011
91012 spin_lock_bh(&rcu_torture_lock);
91013 if (list_empty(&rcu_torture_freelist)) {
91014 - atomic_inc(&n_rcu_torture_alloc_fail);
91015 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
91016 spin_unlock_bh(&rcu_torture_lock);
91017 return NULL;
91018 }
91019 - atomic_inc(&n_rcu_torture_alloc);
91020 + atomic_inc_unchecked(&n_rcu_torture_alloc);
91021 p = rcu_torture_freelist.next;
91022 list_del_init(p);
91023 spin_unlock_bh(&rcu_torture_lock);
91024 @@ -228,7 +228,7 @@ rcu_torture_alloc(void)
91025 static void
91026 rcu_torture_free(struct rcu_torture *p)
91027 {
91028 - atomic_inc(&n_rcu_torture_free);
91029 + atomic_inc_unchecked(&n_rcu_torture_free);
91030 spin_lock_bh(&rcu_torture_lock);
91031 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
91032 spin_unlock_bh(&rcu_torture_lock);
91033 @@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
91034 i = rp->rtort_pipe_count;
91035 if (i > RCU_TORTURE_PIPE_LEN)
91036 i = RCU_TORTURE_PIPE_LEN;
91037 - atomic_inc(&rcu_torture_wcount[i]);
91038 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
91039 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
91040 rp->rtort_mbtest = 0;
91041 return true;
91042 @@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
91043 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
91044 do {
91045 schedule_timeout_interruptible(cbflood_inter_holdoff);
91046 - atomic_long_inc(&n_cbfloods);
91047 + atomic_long_inc_unchecked(&n_cbfloods);
91048 WARN_ON(signal_pending(current));
91049 for (i = 0; i < cbflood_n_burst; i++) {
91050 for (j = 0; j < cbflood_n_per_burst; j++) {
91051 @@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
91052 i = old_rp->rtort_pipe_count;
91053 if (i > RCU_TORTURE_PIPE_LEN)
91054 i = RCU_TORTURE_PIPE_LEN;
91055 - atomic_inc(&rcu_torture_wcount[i]);
91056 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
91057 old_rp->rtort_pipe_count++;
91058 switch (synctype[torture_random(&rand) % nsynctypes]) {
91059 case RTWS_DEF_FREE:
91060 @@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
91061 return;
91062 }
91063 if (p->rtort_mbtest == 0)
91064 - atomic_inc(&n_rcu_torture_mberror);
91065 + atomic_inc_unchecked(&n_rcu_torture_mberror);
91066 spin_lock(&rand_lock);
91067 cur_ops->read_delay(&rand);
91068 n_rcu_torture_timers++;
91069 @@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
91070 continue;
91071 }
91072 if (p->rtort_mbtest == 0)
91073 - atomic_inc(&n_rcu_torture_mberror);
91074 + atomic_inc_unchecked(&n_rcu_torture_mberror);
91075 cur_ops->read_delay(&rand);
91076 preempt_disable();
91077 pipe_count = p->rtort_pipe_count;
91078 @@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
91079 rcu_torture_current,
91080 rcu_torture_current_version,
91081 list_empty(&rcu_torture_freelist),
91082 - atomic_read(&n_rcu_torture_alloc),
91083 - atomic_read(&n_rcu_torture_alloc_fail),
91084 - atomic_read(&n_rcu_torture_free));
91085 + atomic_read_unchecked(&n_rcu_torture_alloc),
91086 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
91087 + atomic_read_unchecked(&n_rcu_torture_free));
91088 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
91089 - atomic_read(&n_rcu_torture_mberror),
91090 + atomic_read_unchecked(&n_rcu_torture_mberror),
91091 n_rcu_torture_boost_ktrerror,
91092 n_rcu_torture_boost_rterror);
91093 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
91094 @@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
91095 n_barrier_successes,
91096 n_barrier_attempts,
91097 n_rcu_torture_barrier_error);
91098 - pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
91099 + pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
91100
91101 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91102 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
91103 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
91104 n_rcu_torture_barrier_error != 0 ||
91105 n_rcu_torture_boost_ktrerror != 0 ||
91106 n_rcu_torture_boost_rterror != 0 ||
91107 n_rcu_torture_boost_failure != 0 ||
91108 i > 1) {
91109 pr_cont("%s", "!!! ");
91110 - atomic_inc(&n_rcu_torture_error);
91111 + atomic_inc_unchecked(&n_rcu_torture_error);
91112 WARN_ON_ONCE(1);
91113 }
91114 pr_cont("Reader Pipe: ");
91115 @@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
91116 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91117 pr_cont("Free-Block Circulation: ");
91118 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91119 - pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
91120 + pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
91121 }
91122 pr_cont("\n");
91123
91124 @@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
91125
91126 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
91127
91128 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91129 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91130 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
91131 else if (torture_onoff_failures())
91132 rcu_torture_print_module_parms(cur_ops,
91133 @@ -1684,18 +1684,18 @@ rcu_torture_init(void)
91134
91135 rcu_torture_current = NULL;
91136 rcu_torture_current_version = 0;
91137 - atomic_set(&n_rcu_torture_alloc, 0);
91138 - atomic_set(&n_rcu_torture_alloc_fail, 0);
91139 - atomic_set(&n_rcu_torture_free, 0);
91140 - atomic_set(&n_rcu_torture_mberror, 0);
91141 - atomic_set(&n_rcu_torture_error, 0);
91142 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
91143 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
91144 + atomic_set_unchecked(&n_rcu_torture_free, 0);
91145 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
91146 + atomic_set_unchecked(&n_rcu_torture_error, 0);
91147 n_rcu_torture_barrier_error = 0;
91148 n_rcu_torture_boost_ktrerror = 0;
91149 n_rcu_torture_boost_rterror = 0;
91150 n_rcu_torture_boost_failure = 0;
91151 n_rcu_torture_boosts = 0;
91152 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
91153 - atomic_set(&rcu_torture_wcount[i], 0);
91154 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
91155 for_each_possible_cpu(cpu) {
91156 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91157 per_cpu(rcu_torture_count, cpu)[i] = 0;
91158 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
91159 index c0623fc..329c091 100644
91160 --- a/kernel/rcu/tiny.c
91161 +++ b/kernel/rcu/tiny.c
91162 @@ -42,7 +42,7 @@
91163 /* Forward declarations for tiny_plugin.h. */
91164 struct rcu_ctrlblk;
91165 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
91166 -static void rcu_process_callbacks(struct softirq_action *unused);
91167 +static void rcu_process_callbacks(void);
91168 static void __call_rcu(struct rcu_head *head,
91169 void (*func)(struct rcu_head *rcu),
91170 struct rcu_ctrlblk *rcp);
91171 @@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
91172 false));
91173 }
91174
91175 -static void rcu_process_callbacks(struct softirq_action *unused)
91176 +static __latent_entropy void rcu_process_callbacks(void)
91177 {
91178 __rcu_process_callbacks(&rcu_sched_ctrlblk);
91179 __rcu_process_callbacks(&rcu_bh_ctrlblk);
91180 diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
91181 index 858c565..7efd915 100644
91182 --- a/kernel/rcu/tiny_plugin.h
91183 +++ b/kernel/rcu/tiny_plugin.h
91184 @@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
91185 dump_stack();
91186 }
91187 if (*rcp->curtail && ULONG_CMP_GE(j, js))
91188 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
91189 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
91190 3 * rcu_jiffies_till_stall_check() + 3;
91191 else if (ULONG_CMP_GE(j, js))
91192 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91193 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91194 }
91195
91196 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
91197 {
91198 rcp->ticks_this_gp = 0;
91199 rcp->gp_start = jiffies;
91200 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91201 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91202 }
91203
91204 static void check_cpu_stalls(void)
91205 diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
91206 index 9815447..2cdf92a 100644
91207 --- a/kernel/rcu/tree.c
91208 +++ b/kernel/rcu/tree.c
91209 @@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
91210 */
91211 rdtp = this_cpu_ptr(&rcu_dynticks);
91212 smp_mb__before_atomic(); /* Earlier stuff before QS. */
91213 - atomic_add(2, &rdtp->dynticks); /* QS. */
91214 + atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
91215 smp_mb__after_atomic(); /* Later stuff after QS. */
91216 break;
91217 }
91218 @@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
91219 rcu_prepare_for_idle(smp_processor_id());
91220 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91221 smp_mb__before_atomic(); /* See above. */
91222 - atomic_inc(&rdtp->dynticks);
91223 + atomic_inc_unchecked(&rdtp->dynticks);
91224 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
91225 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91226 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91227 rcu_dynticks_task_enter();
91228
91229 /*
91230 @@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
91231 {
91232 rcu_dynticks_task_exit();
91233 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
91234 - atomic_inc(&rdtp->dynticks);
91235 + atomic_inc_unchecked(&rdtp->dynticks);
91236 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91237 smp_mb__after_atomic(); /* See above. */
91238 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91239 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91240 rcu_cleanup_after_idle(smp_processor_id());
91241 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
91242 if (!user && !is_idle_task(current)) {
91243 @@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
91244 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
91245
91246 if (rdtp->dynticks_nmi_nesting == 0 &&
91247 - (atomic_read(&rdtp->dynticks) & 0x1))
91248 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
91249 return;
91250 rdtp->dynticks_nmi_nesting++;
91251 smp_mb__before_atomic(); /* Force delay from prior write. */
91252 - atomic_inc(&rdtp->dynticks);
91253 + atomic_inc_unchecked(&rdtp->dynticks);
91254 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91255 smp_mb__after_atomic(); /* See above. */
91256 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91257 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91258 }
91259
91260 /**
91261 @@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
91262 return;
91263 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91264 smp_mb__before_atomic(); /* See above. */
91265 - atomic_inc(&rdtp->dynticks);
91266 + atomic_inc_unchecked(&rdtp->dynticks);
91267 smp_mb__after_atomic(); /* Force delay to next write. */
91268 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91269 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91270 }
91271
91272 /**
91273 @@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
91274 */
91275 bool notrace __rcu_is_watching(void)
91276 {
91277 - return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91278 + return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91279 }
91280
91281 /**
91282 @@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
91283 static int dyntick_save_progress_counter(struct rcu_data *rdp,
91284 bool *isidle, unsigned long *maxj)
91285 {
91286 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
91287 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91288 rcu_sysidle_check_cpu(rdp, isidle, maxj);
91289 if ((rdp->dynticks_snap & 0x1) == 0) {
91290 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
91291 @@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91292 int *rcrmp;
91293 unsigned int snap;
91294
91295 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
91296 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91297 snap = (unsigned int)rdp->dynticks_snap;
91298
91299 /*
91300 @@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91301 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
91302 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
91303 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
91304 - ACCESS_ONCE(rdp->cond_resched_completed) =
91305 + ACCESS_ONCE_RW(rdp->cond_resched_completed) =
91306 ACCESS_ONCE(rdp->mynode->completed);
91307 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
91308 - ACCESS_ONCE(*rcrmp) =
91309 + ACCESS_ONCE_RW(*rcrmp) =
91310 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
91311 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
91312 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
91313 @@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
91314 rsp->gp_start = j;
91315 smp_wmb(); /* Record start time before stall time. */
91316 j1 = rcu_jiffies_till_stall_check();
91317 - ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
91318 + ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
91319 rsp->jiffies_resched = j + j1 / 2;
91320 }
91321
91322 @@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
91323 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91324 return;
91325 }
91326 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91327 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91328 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91329
91330 /*
91331 @@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
91332
91333 raw_spin_lock_irqsave(&rnp->lock, flags);
91334 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
91335 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
91336 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
91337 3 * rcu_jiffies_till_stall_check() + 3;
91338 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91339
91340 @@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
91341 struct rcu_state *rsp;
91342
91343 for_each_rcu_flavor(rsp)
91344 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91345 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91346 }
91347
91348 /*
91349 @@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
91350 raw_spin_unlock_irq(&rnp->lock);
91351 return 0;
91352 }
91353 - ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91354 + ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91355
91356 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
91357 /*
91358 @@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
91359 rdp = this_cpu_ptr(rsp->rda);
91360 rcu_preempt_check_blocked_tasks(rnp);
91361 rnp->qsmask = rnp->qsmaskinit;
91362 - ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
91363 + ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
91364 WARN_ON_ONCE(rnp->completed != rsp->completed);
91365 - ACCESS_ONCE(rnp->completed) = rsp->completed;
91366 + ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
91367 if (rnp == rdp->mynode)
91368 (void)__note_gp_changes(rsp, rnp, rdp);
91369 rcu_preempt_boost_start_gp(rnp);
91370 @@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
91371 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
91372 raw_spin_lock_irq(&rnp->lock);
91373 smp_mb__after_unlock_lock();
91374 - ACCESS_ONCE(rsp->gp_flags) =
91375 + ACCESS_ONCE_RW(rsp->gp_flags) =
91376 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
91377 raw_spin_unlock_irq(&rnp->lock);
91378 }
91379 @@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91380 rcu_for_each_node_breadth_first(rsp, rnp) {
91381 raw_spin_lock_irq(&rnp->lock);
91382 smp_mb__after_unlock_lock();
91383 - ACCESS_ONCE(rnp->completed) = rsp->gpnum;
91384 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
91385 rdp = this_cpu_ptr(rsp->rda);
91386 if (rnp == rdp->mynode)
91387 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
91388 @@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91389 rcu_nocb_gp_set(rnp, nocb);
91390
91391 /* Declare grace period done. */
91392 - ACCESS_ONCE(rsp->completed) = rsp->gpnum;
91393 + ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
91394 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
91395 rsp->fqs_state = RCU_GP_IDLE;
91396 rdp = this_cpu_ptr(rsp->rda);
91397 /* Advance CBs to reduce false positives below. */
91398 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
91399 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
91400 - ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91401 + ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91402 trace_rcu_grace_period(rsp->name,
91403 ACCESS_ONCE(rsp->gpnum),
91404 TPS("newreq"));
91405 @@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
91406 */
91407 return false;
91408 }
91409 - ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91410 + ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91411 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
91412 TPS("newreq"));
91413
91414 @@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
91415 rsp->qlen += rdp->qlen;
91416 rdp->n_cbs_orphaned += rdp->qlen;
91417 rdp->qlen_lazy = 0;
91418 - ACCESS_ONCE(rdp->qlen) = 0;
91419 + ACCESS_ONCE_RW(rdp->qlen) = 0;
91420 }
91421
91422 /*
91423 @@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
91424 }
91425 smp_mb(); /* List handling before counting for rcu_barrier(). */
91426 rdp->qlen_lazy -= count_lazy;
91427 - ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
91428 + ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
91429 rdp->n_cbs_invoked += count;
91430
91431 /* Reinstate batch limit if we have worked down the excess. */
91432 @@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
91433 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91434 return; /* Someone beat us to it. */
91435 }
91436 - ACCESS_ONCE(rsp->gp_flags) =
91437 + ACCESS_ONCE_RW(rsp->gp_flags) =
91438 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
91439 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91440 rcu_gp_kthread_wake(rsp);
91441 @@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
91442 /*
91443 * Do RCU core processing for the current CPU.
91444 */
91445 -static void rcu_process_callbacks(struct softirq_action *unused)
91446 +static void rcu_process_callbacks(void)
91447 {
91448 struct rcu_state *rsp;
91449
91450 @@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91451 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
91452 if (debug_rcu_head_queue(head)) {
91453 /* Probable double call_rcu(), so leak the callback. */
91454 - ACCESS_ONCE(head->func) = rcu_leak_callback;
91455 + ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
91456 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
91457 return;
91458 }
91459 @@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91460 local_irq_restore(flags);
91461 return;
91462 }
91463 - ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
91464 + ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
91465 if (lazy)
91466 rdp->qlen_lazy++;
91467 else
91468 @@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
91469 * counter wrap on a 32-bit system. Quite a few more CPUs would of
91470 * course be required on a 64-bit system.
91471 */
91472 - if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
91473 + if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
91474 (ulong)atomic_long_read(&rsp->expedited_done) +
91475 ULONG_MAX / 8)) {
91476 synchronize_sched();
91477 - atomic_long_inc(&rsp->expedited_wrap);
91478 + atomic_long_inc_unchecked(&rsp->expedited_wrap);
91479 return;
91480 }
91481
91482 @@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
91483 * Take a ticket. Note that atomic_inc_return() implies a
91484 * full memory barrier.
91485 */
91486 - snap = atomic_long_inc_return(&rsp->expedited_start);
91487 + snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
91488 firstsnap = snap;
91489 if (!try_get_online_cpus()) {
91490 /* CPU hotplug operation in flight, fall back to normal GP. */
91491 wait_rcu_gp(call_rcu_sched);
91492 - atomic_long_inc(&rsp->expedited_normal);
91493 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91494 return;
91495 }
91496 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
91497 @@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
91498 synchronize_sched_expedited_cpu_stop,
91499 NULL) == -EAGAIN) {
91500 put_online_cpus();
91501 - atomic_long_inc(&rsp->expedited_tryfail);
91502 + atomic_long_inc_unchecked(&rsp->expedited_tryfail);
91503
91504 /* Check to see if someone else did our work for us. */
91505 s = atomic_long_read(&rsp->expedited_done);
91506 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91507 /* ensure test happens before caller kfree */
91508 smp_mb__before_atomic(); /* ^^^ */
91509 - atomic_long_inc(&rsp->expedited_workdone1);
91510 + atomic_long_inc_unchecked(&rsp->expedited_workdone1);
91511 return;
91512 }
91513
91514 @@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
91515 udelay(trycount * num_online_cpus());
91516 } else {
91517 wait_rcu_gp(call_rcu_sched);
91518 - atomic_long_inc(&rsp->expedited_normal);
91519 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91520 return;
91521 }
91522
91523 @@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
91524 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91525 /* ensure test happens before caller kfree */
91526 smp_mb__before_atomic(); /* ^^^ */
91527 - atomic_long_inc(&rsp->expedited_workdone2);
91528 + atomic_long_inc_unchecked(&rsp->expedited_workdone2);
91529 return;
91530 }
91531
91532 @@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
91533 if (!try_get_online_cpus()) {
91534 /* CPU hotplug operation in flight, use normal GP. */
91535 wait_rcu_gp(call_rcu_sched);
91536 - atomic_long_inc(&rsp->expedited_normal);
91537 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91538 return;
91539 }
91540 - snap = atomic_long_read(&rsp->expedited_start);
91541 + snap = atomic_long_read_unchecked(&rsp->expedited_start);
91542 smp_mb(); /* ensure read is before try_stop_cpus(). */
91543 }
91544 - atomic_long_inc(&rsp->expedited_stoppedcpus);
91545 + atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
91546
91547 /*
91548 * Everyone up to our most recent fetch is covered by our grace
91549 @@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
91550 * than we did already did their update.
91551 */
91552 do {
91553 - atomic_long_inc(&rsp->expedited_done_tries);
91554 + atomic_long_inc_unchecked(&rsp->expedited_done_tries);
91555 s = atomic_long_read(&rsp->expedited_done);
91556 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
91557 /* ensure test happens before caller kfree */
91558 smp_mb__before_atomic(); /* ^^^ */
91559 - atomic_long_inc(&rsp->expedited_done_lost);
91560 + atomic_long_inc_unchecked(&rsp->expedited_done_lost);
91561 break;
91562 }
91563 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
91564 - atomic_long_inc(&rsp->expedited_done_exit);
91565 + atomic_long_inc_unchecked(&rsp->expedited_done_exit);
91566
91567 put_online_cpus();
91568 }
91569 @@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91570 * ACCESS_ONCE() to prevent the compiler from speculating
91571 * the increment to precede the early-exit check.
91572 */
91573 - ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91574 + ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91575 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
91576 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
91577 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
91578 @@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91579
91580 /* Increment ->n_barrier_done to prevent duplicate work. */
91581 smp_mb(); /* Keep increment after above mechanism. */
91582 - ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91583 + ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91584 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
91585 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
91586 smp_mb(); /* Keep increment before caller's subsequent code. */
91587 @@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
91588 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
91589 init_callback_list(rdp);
91590 rdp->qlen_lazy = 0;
91591 - ACCESS_ONCE(rdp->qlen) = 0;
91592 + ACCESS_ONCE_RW(rdp->qlen) = 0;
91593 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
91594 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
91595 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
91596 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
91597 rdp->cpu = cpu;
91598 rdp->rsp = rsp;
91599 rcu_boot_init_nocb_percpu_data(rdp);
91600 @@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
91601 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
91602 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
91603 rcu_sysidle_init_percpu_data(rdp->dynticks);
91604 - atomic_set(&rdp->dynticks->dynticks,
91605 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
91606 + atomic_set_unchecked(&rdp->dynticks->dynticks,
91607 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
91608 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
91609
91610 /* Add CPU to rcu_node bitmasks. */
91611 diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
91612 index bbdc45d..c882ccb 100644
91613 --- a/kernel/rcu/tree.h
91614 +++ b/kernel/rcu/tree.h
91615 @@ -87,11 +87,11 @@ struct rcu_dynticks {
91616 long long dynticks_nesting; /* Track irq/process nesting level. */
91617 /* Process level is worth LLONG_MAX/2. */
91618 int dynticks_nmi_nesting; /* Track NMI nesting level. */
91619 - atomic_t dynticks; /* Even value for idle, else odd. */
91620 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
91621 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
91622 long long dynticks_idle_nesting;
91623 /* irq/process nesting level from idle. */
91624 - atomic_t dynticks_idle; /* Even value for idle, else odd. */
91625 + atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
91626 /* "Idle" excludes userspace execution. */
91627 unsigned long dynticks_idle_jiffies;
91628 /* End of last non-NMI non-idle period. */
91629 @@ -466,17 +466,17 @@ struct rcu_state {
91630 /* _rcu_barrier(). */
91631 /* End of fields guarded by barrier_mutex. */
91632
91633 - atomic_long_t expedited_start; /* Starting ticket. */
91634 - atomic_long_t expedited_done; /* Done ticket. */
91635 - atomic_long_t expedited_wrap; /* # near-wrap incidents. */
91636 - atomic_long_t expedited_tryfail; /* # acquisition failures. */
91637 - atomic_long_t expedited_workdone1; /* # done by others #1. */
91638 - atomic_long_t expedited_workdone2; /* # done by others #2. */
91639 - atomic_long_t expedited_normal; /* # fallbacks to normal. */
91640 - atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
91641 - atomic_long_t expedited_done_tries; /* # tries to update _done. */
91642 - atomic_long_t expedited_done_lost; /* # times beaten to _done. */
91643 - atomic_long_t expedited_done_exit; /* # times exited _done loop. */
91644 + atomic_long_unchecked_t expedited_start; /* Starting ticket. */
91645 + atomic_long_t expedited_done; /* Done ticket. */
91646 + atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
91647 + atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
91648 + atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
91649 + atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
91650 + atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
91651 + atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
91652 + atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
91653 + atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
91654 + atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
91655
91656 unsigned long jiffies_force_qs; /* Time at which to invoke */
91657 /* force_quiescent_state(). */
91658 diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
91659 index c1d7f27..a64bf49 100644
91660 --- a/kernel/rcu/tree_plugin.h
91661 +++ b/kernel/rcu/tree_plugin.h
91662 @@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
91663 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
91664 {
91665 return !rcu_preempted_readers_exp(rnp) &&
91666 - ACCESS_ONCE(rnp->expmask) == 0;
91667 + ACCESS_ONCE_RW(rnp->expmask) == 0;
91668 }
91669
91670 /*
91671 @@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
91672
91673 /* Clean up and exit. */
91674 smp_mb(); /* ensure expedited GP seen before counter increment. */
91675 - ACCESS_ONCE(sync_rcu_preempt_exp_count) =
91676 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
91677 sync_rcu_preempt_exp_count + 1;
91678 unlock_mb_ret:
91679 mutex_unlock(&sync_rcu_preempt_exp_mutex);
91680 @@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
91681 free_cpumask_var(cm);
91682 }
91683
91684 -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
91685 +static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
91686 .store = &rcu_cpu_kthread_task,
91687 .thread_should_run = rcu_cpu_kthread_should_run,
91688 .thread_fn = rcu_cpu_kthread,
91689 @@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
91690 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
91691 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
91692 cpu, ticks_value, ticks_title,
91693 - atomic_read(&rdtp->dynticks) & 0xfff,
91694 + atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
91695 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
91696 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
91697 fast_no_hz);
91698 @@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
91699 return;
91700 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
91701 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
91702 - ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
91703 + ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
91704 wake_up(&rdp_leader->nocb_wq);
91705 }
91706 }
91707 @@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
91708
91709 /* Enqueue the callback on the nocb list and update counts. */
91710 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
91711 - ACCESS_ONCE(*old_rhpp) = rhp;
91712 + ACCESS_ONCE_RW(*old_rhpp) = rhp;
91713 atomic_long_add(rhcount, &rdp->nocb_q_count);
91714 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
91715 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
91716 @@ -2286,7 +2286,7 @@ wait_again:
91717 continue; /* No CBs here, try next follower. */
91718
91719 /* Move callbacks to wait-for-GP list, which is empty. */
91720 - ACCESS_ONCE(rdp->nocb_head) = NULL;
91721 + ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
91722 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
91723 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
91724 rdp->nocb_gp_count_lazy =
91725 @@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
91726 list = ACCESS_ONCE(rdp->nocb_follower_head);
91727 BUG_ON(!list);
91728 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
91729 - ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
91730 + ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
91731 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
91732 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
91733 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
91734 @@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
91735 list = next;
91736 }
91737 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
91738 - ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91739 - ACCESS_ONCE(rdp->nocb_p_count_lazy) =
91740 + ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91741 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
91742 rdp->nocb_p_count_lazy - cl;
91743 rdp->n_nocbs_invoked += c;
91744 }
91745 @@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
91746 if (!rcu_nocb_need_deferred_wakeup(rdp))
91747 return;
91748 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
91749 - ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91750 + ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91751 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
91752 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
91753 }
91754 @@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
91755 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
91756 "rcuo%c/%d", rsp->abbr, cpu);
91757 BUG_ON(IS_ERR(t));
91758 - ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
91759 + ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
91760 }
91761
91762 /*
91763 @@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
91764
91765 /* Record start of fully idle period. */
91766 j = jiffies;
91767 - ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
91768 + ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
91769 smp_mb__before_atomic();
91770 - atomic_inc(&rdtp->dynticks_idle);
91771 + atomic_inc_unchecked(&rdtp->dynticks_idle);
91772 smp_mb__after_atomic();
91773 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
91774 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
91775 }
91776
91777 /*
91778 @@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
91779
91780 /* Record end of idle period. */
91781 smp_mb__before_atomic();
91782 - atomic_inc(&rdtp->dynticks_idle);
91783 + atomic_inc_unchecked(&rdtp->dynticks_idle);
91784 smp_mb__after_atomic();
91785 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
91786 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
91787
91788 /*
91789 * If we are the timekeeping CPU, we are permitted to be non-idle
91790 @@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
91791 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
91792
91793 /* Pick up current idle and NMI-nesting counter and check. */
91794 - cur = atomic_read(&rdtp->dynticks_idle);
91795 + cur = atomic_read_unchecked(&rdtp->dynticks_idle);
91796 if (cur & 0x1) {
91797 *isidle = false; /* We are not idle! */
91798 return;
91799 @@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
91800 case RCU_SYSIDLE_NOT:
91801
91802 /* First time all are idle, so note a short idle period. */
91803 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91804 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91805 break;
91806
91807 case RCU_SYSIDLE_SHORT:
91808 @@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
91809 {
91810 smp_mb();
91811 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
91812 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
91813 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
91814 }
91815
91816 /*
91817 @@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
91818 smp_mb(); /* grace period precedes setting inuse. */
91819
91820 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
91821 - ACCESS_ONCE(rshp->inuse) = 0;
91822 + ACCESS_ONCE_RW(rshp->inuse) = 0;
91823 }
91824
91825 /*
91826 @@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
91827 static void rcu_dynticks_task_enter(void)
91828 {
91829 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91830 - ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
91831 + ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
91832 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91833 }
91834
91835 @@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
91836 static void rcu_dynticks_task_exit(void)
91837 {
91838 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91839 - ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
91840 + ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
91841 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91842 }
91843 diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
91844 index 5cdc62e..cc52e88 100644
91845 --- a/kernel/rcu/tree_trace.c
91846 +++ b/kernel/rcu/tree_trace.c
91847 @@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
91848 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
91849 rdp->passed_quiesce, rdp->qs_pending);
91850 seq_printf(m, " dt=%d/%llx/%d df=%lu",
91851 - atomic_read(&rdp->dynticks->dynticks),
91852 + atomic_read_unchecked(&rdp->dynticks->dynticks),
91853 rdp->dynticks->dynticks_nesting,
91854 rdp->dynticks->dynticks_nmi_nesting,
91855 rdp->dynticks_fqs);
91856 @@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
91857 struct rcu_state *rsp = (struct rcu_state *)m->private;
91858
91859 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",
91860 - atomic_long_read(&rsp->expedited_start),
91861 + atomic_long_read_unchecked(&rsp->expedited_start),
91862 atomic_long_read(&rsp->expedited_done),
91863 - atomic_long_read(&rsp->expedited_wrap),
91864 - atomic_long_read(&rsp->expedited_tryfail),
91865 - atomic_long_read(&rsp->expedited_workdone1),
91866 - atomic_long_read(&rsp->expedited_workdone2),
91867 - atomic_long_read(&rsp->expedited_normal),
91868 - atomic_long_read(&rsp->expedited_stoppedcpus),
91869 - atomic_long_read(&rsp->expedited_done_tries),
91870 - atomic_long_read(&rsp->expedited_done_lost),
91871 - atomic_long_read(&rsp->expedited_done_exit));
91872 + atomic_long_read_unchecked(&rsp->expedited_wrap),
91873 + atomic_long_read_unchecked(&rsp->expedited_tryfail),
91874 + atomic_long_read_unchecked(&rsp->expedited_workdone1),
91875 + atomic_long_read_unchecked(&rsp->expedited_workdone2),
91876 + atomic_long_read_unchecked(&rsp->expedited_normal),
91877 + atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
91878 + atomic_long_read_unchecked(&rsp->expedited_done_tries),
91879 + atomic_long_read_unchecked(&rsp->expedited_done_lost),
91880 + atomic_long_read_unchecked(&rsp->expedited_done_exit));
91881 return 0;
91882 }
91883
91884 diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
91885 index 3ef8ba5..8c5ebfb6 100644
91886 --- a/kernel/rcu/update.c
91887 +++ b/kernel/rcu/update.c
91888 @@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
91889 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
91890 */
91891 if (till_stall_check < 3) {
91892 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
91893 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
91894 till_stall_check = 3;
91895 } else if (till_stall_check > 300) {
91896 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
91897 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
91898 till_stall_check = 300;
91899 }
91900 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
91901 @@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
91902 !ACCESS_ONCE(t->on_rq) ||
91903 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
91904 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
91905 - ACCESS_ONCE(t->rcu_tasks_holdout) = false;
91906 + ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
91907 list_del_init(&t->rcu_tasks_holdout_list);
91908 put_task_struct(t);
91909 return;
91910 @@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
91911 !is_idle_task(t)) {
91912 get_task_struct(t);
91913 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
91914 - ACCESS_ONCE(t->rcu_tasks_holdout) = true;
91915 + ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
91916 list_add(&t->rcu_tasks_holdout_list,
91917 &rcu_tasks_holdouts);
91918 }
91919 @@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
91920 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
91921 BUG_ON(IS_ERR(t));
91922 smp_mb(); /* Ensure others see full kthread. */
91923 - ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
91924 + ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
91925 mutex_unlock(&rcu_tasks_kthread_mutex);
91926 }
91927
91928 diff --git a/kernel/resource.c b/kernel/resource.c
91929 index 0bcebff..e7cd5b2 100644
91930 --- a/kernel/resource.c
91931 +++ b/kernel/resource.c
91932 @@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
91933
91934 static int __init ioresources_init(void)
91935 {
91936 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
91937 +#ifdef CONFIG_GRKERNSEC_PROC_USER
91938 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
91939 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
91940 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
91941 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
91942 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
91943 +#endif
91944 +#else
91945 proc_create("ioports", 0, NULL, &proc_ioports_operations);
91946 proc_create("iomem", 0, NULL, &proc_iomem_operations);
91947 +#endif
91948 return 0;
91949 }
91950 __initcall(ioresources_init);
91951 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
91952 index 8a2e230..6020954 100644
91953 --- a/kernel/sched/auto_group.c
91954 +++ b/kernel/sched/auto_group.c
91955 @@ -11,7 +11,7 @@
91956
91957 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
91958 static struct autogroup autogroup_default;
91959 -static atomic_t autogroup_seq_nr;
91960 +static atomic_unchecked_t autogroup_seq_nr;
91961
91962 void __init autogroup_init(struct task_struct *init_task)
91963 {
91964 @@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
91965
91966 kref_init(&ag->kref);
91967 init_rwsem(&ag->lock);
91968 - ag->id = atomic_inc_return(&autogroup_seq_nr);
91969 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
91970 ag->tg = tg;
91971 #ifdef CONFIG_RT_GROUP_SCHED
91972 /*
91973 diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
91974 index a63f4dc..349bbb0 100644
91975 --- a/kernel/sched/completion.c
91976 +++ b/kernel/sched/completion.c
91977 @@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
91978 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
91979 * or number of jiffies left till timeout) if completed.
91980 */
91981 -long __sched
91982 +long __sched __intentional_overflow(-1)
91983 wait_for_completion_interruptible_timeout(struct completion *x,
91984 unsigned long timeout)
91985 {
91986 @@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
91987 *
91988 * Return: -ERESTARTSYS if interrupted, 0 if completed.
91989 */
91990 -int __sched wait_for_completion_killable(struct completion *x)
91991 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
91992 {
91993 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
91994 if (t == -ERESTARTSYS)
91995 @@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
91996 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
91997 * or number of jiffies left till timeout) if completed.
91998 */
91999 -long __sched
92000 +long __sched __intentional_overflow(-1)
92001 wait_for_completion_killable_timeout(struct completion *x,
92002 unsigned long timeout)
92003 {
92004 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
92005 index 89e7283..072bc26 100644
92006 --- a/kernel/sched/core.c
92007 +++ b/kernel/sched/core.c
92008 @@ -1885,7 +1885,7 @@ void set_numabalancing_state(bool enabled)
92009 int sysctl_numa_balancing(struct ctl_table *table, int write,
92010 void __user *buffer, size_t *lenp, loff_t *ppos)
92011 {
92012 - struct ctl_table t;
92013 + ctl_table_no_const t;
92014 int err;
92015 int state = numabalancing_enabled;
92016
92017 @@ -2348,8 +2348,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
92018 next->active_mm = oldmm;
92019 atomic_inc(&oldmm->mm_count);
92020 enter_lazy_tlb(oldmm, next);
92021 - } else
92022 + } else {
92023 switch_mm(oldmm, mm, next);
92024 + populate_stack();
92025 + }
92026
92027 if (!prev->mm) {
92028 prev->active_mm = NULL;
92029 @@ -3160,6 +3162,8 @@ int can_nice(const struct task_struct *p, const int nice)
92030 /* convert nice value [19,-20] to rlimit style value [1,40] */
92031 int nice_rlim = nice_to_rlimit(nice);
92032
92033 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
92034 +
92035 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
92036 capable(CAP_SYS_NICE));
92037 }
92038 @@ -3186,7 +3190,8 @@ SYSCALL_DEFINE1(nice, int, increment)
92039 nice = task_nice(current) + increment;
92040
92041 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
92042 - if (increment < 0 && !can_nice(current, nice))
92043 + if (increment < 0 && (!can_nice(current, nice) ||
92044 + gr_handle_chroot_nice()))
92045 return -EPERM;
92046
92047 retval = security_task_setnice(current, nice);
92048 @@ -3465,6 +3470,7 @@ recheck:
92049 if (policy != p->policy && !rlim_rtprio)
92050 return -EPERM;
92051
92052 + gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
92053 /* can't increase priority */
92054 if (attr->sched_priority > p->rt_priority &&
92055 attr->sched_priority > rlim_rtprio)
92056 @@ -4885,6 +4891,7 @@ void idle_task_exit(void)
92057
92058 if (mm != &init_mm) {
92059 switch_mm(mm, &init_mm, current);
92060 + populate_stack();
92061 finish_arch_post_lock_switch();
92062 }
92063 mmdrop(mm);
92064 @@ -4980,7 +4987,7 @@ static void migrate_tasks(unsigned int dead_cpu)
92065
92066 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
92067
92068 -static struct ctl_table sd_ctl_dir[] = {
92069 +static ctl_table_no_const sd_ctl_dir[] __read_only = {
92070 {
92071 .procname = "sched_domain",
92072 .mode = 0555,
92073 @@ -4997,17 +5004,17 @@ static struct ctl_table sd_ctl_root[] = {
92074 {}
92075 };
92076
92077 -static struct ctl_table *sd_alloc_ctl_entry(int n)
92078 +static ctl_table_no_const *sd_alloc_ctl_entry(int n)
92079 {
92080 - struct ctl_table *entry =
92081 + ctl_table_no_const *entry =
92082 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
92083
92084 return entry;
92085 }
92086
92087 -static void sd_free_ctl_entry(struct ctl_table **tablep)
92088 +static void sd_free_ctl_entry(ctl_table_no_const *tablep)
92089 {
92090 - struct ctl_table *entry;
92091 + ctl_table_no_const *entry;
92092
92093 /*
92094 * In the intermediate directories, both the child directory and
92095 @@ -5015,22 +5022,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
92096 * will always be set. In the lowest directory the names are
92097 * static strings and all have proc handlers.
92098 */
92099 - for (entry = *tablep; entry->mode; entry++) {
92100 - if (entry->child)
92101 - sd_free_ctl_entry(&entry->child);
92102 + for (entry = tablep; entry->mode; entry++) {
92103 + if (entry->child) {
92104 + sd_free_ctl_entry(entry->child);
92105 + pax_open_kernel();
92106 + entry->child = NULL;
92107 + pax_close_kernel();
92108 + }
92109 if (entry->proc_handler == NULL)
92110 kfree(entry->procname);
92111 }
92112
92113 - kfree(*tablep);
92114 - *tablep = NULL;
92115 + kfree(tablep);
92116 }
92117
92118 static int min_load_idx = 0;
92119 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
92120
92121 static void
92122 -set_table_entry(struct ctl_table *entry,
92123 +set_table_entry(ctl_table_no_const *entry,
92124 const char *procname, void *data, int maxlen,
92125 umode_t mode, proc_handler *proc_handler,
92126 bool load_idx)
92127 @@ -5050,7 +5060,7 @@ set_table_entry(struct ctl_table *entry,
92128 static struct ctl_table *
92129 sd_alloc_ctl_domain_table(struct sched_domain *sd)
92130 {
92131 - struct ctl_table *table = sd_alloc_ctl_entry(14);
92132 + ctl_table_no_const *table = sd_alloc_ctl_entry(14);
92133
92134 if (table == NULL)
92135 return NULL;
92136 @@ -5088,9 +5098,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
92137 return table;
92138 }
92139
92140 -static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
92141 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
92142 {
92143 - struct ctl_table *entry, *table;
92144 + ctl_table_no_const *entry, *table;
92145 struct sched_domain *sd;
92146 int domain_num = 0, i;
92147 char buf[32];
92148 @@ -5117,11 +5127,13 @@ static struct ctl_table_header *sd_sysctl_header;
92149 static void register_sched_domain_sysctl(void)
92150 {
92151 int i, cpu_num = num_possible_cpus();
92152 - struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
92153 + ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
92154 char buf[32];
92155
92156 WARN_ON(sd_ctl_dir[0].child);
92157 + pax_open_kernel();
92158 sd_ctl_dir[0].child = entry;
92159 + pax_close_kernel();
92160
92161 if (entry == NULL)
92162 return;
92163 @@ -5144,8 +5156,12 @@ static void unregister_sched_domain_sysctl(void)
92164 if (sd_sysctl_header)
92165 unregister_sysctl_table(sd_sysctl_header);
92166 sd_sysctl_header = NULL;
92167 - if (sd_ctl_dir[0].child)
92168 - sd_free_ctl_entry(&sd_ctl_dir[0].child);
92169 + if (sd_ctl_dir[0].child) {
92170 + sd_free_ctl_entry(sd_ctl_dir[0].child);
92171 + pax_open_kernel();
92172 + sd_ctl_dir[0].child = NULL;
92173 + pax_close_kernel();
92174 + }
92175 }
92176 #else
92177 static void register_sched_domain_sysctl(void)
92178 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
92179 index ef2b104..69961f6 100644
92180 --- a/kernel/sched/fair.c
92181 +++ b/kernel/sched/fair.c
92182 @@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
92183
92184 static void reset_ptenuma_scan(struct task_struct *p)
92185 {
92186 - ACCESS_ONCE(p->mm->numa_scan_seq)++;
92187 + ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
92188 p->mm->numa_scan_offset = 0;
92189 }
92190
92191 @@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
92192 * run_rebalance_domains is triggered when needed from the scheduler tick.
92193 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
92194 */
92195 -static void run_rebalance_domains(struct softirq_action *h)
92196 +static __latent_entropy void run_rebalance_domains(void)
92197 {
92198 struct rq *this_rq = this_rq();
92199 enum cpu_idle_type idle = this_rq->idle_balance ?
92200 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
92201 index 2df8ef0..aae070f 100644
92202 --- a/kernel/sched/sched.h
92203 +++ b/kernel/sched/sched.h
92204 @@ -1140,7 +1140,7 @@ struct sched_class {
92205 #ifdef CONFIG_FAIR_GROUP_SCHED
92206 void (*task_move_group) (struct task_struct *p, int on_rq);
92207 #endif
92208 -};
92209 +} __do_const;
92210
92211 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
92212 {
92213 diff --git a/kernel/signal.c b/kernel/signal.c
92214 index 8f0876f..1153a5a 100644
92215 --- a/kernel/signal.c
92216 +++ b/kernel/signal.c
92217 @@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
92218
92219 int print_fatal_signals __read_mostly;
92220
92221 -static void __user *sig_handler(struct task_struct *t, int sig)
92222 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
92223 {
92224 return t->sighand->action[sig - 1].sa.sa_handler;
92225 }
92226
92227 -static int sig_handler_ignored(void __user *handler, int sig)
92228 +static int sig_handler_ignored(__sighandler_t handler, int sig)
92229 {
92230 /* Is it explicitly or implicitly ignored? */
92231 return handler == SIG_IGN ||
92232 @@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
92233
92234 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
92235 {
92236 - void __user *handler;
92237 + __sighandler_t handler;
92238
92239 handler = sig_handler(t, sig);
92240
92241 @@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
92242 atomic_inc(&user->sigpending);
92243 rcu_read_unlock();
92244
92245 + if (!override_rlimit)
92246 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
92247 +
92248 if (override_rlimit ||
92249 atomic_read(&user->sigpending) <=
92250 task_rlimit(t, RLIMIT_SIGPENDING)) {
92251 @@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
92252
92253 int unhandled_signal(struct task_struct *tsk, int sig)
92254 {
92255 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
92256 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
92257 if (is_global_init(tsk))
92258 return 1;
92259 if (handler != SIG_IGN && handler != SIG_DFL)
92260 @@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
92261 }
92262 }
92263
92264 + /* allow glibc communication via tgkill to other threads in our
92265 + thread group */
92266 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
92267 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
92268 + && gr_handle_signal(t, sig))
92269 + return -EPERM;
92270 +
92271 return security_task_kill(t, info, sig, 0);
92272 }
92273
92274 @@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92275 return send_signal(sig, info, p, 1);
92276 }
92277
92278 -static int
92279 +int
92280 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92281 {
92282 return send_signal(sig, info, t, 0);
92283 @@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92284 unsigned long int flags;
92285 int ret, blocked, ignored;
92286 struct k_sigaction *action;
92287 + int is_unhandled = 0;
92288
92289 spin_lock_irqsave(&t->sighand->siglock, flags);
92290 action = &t->sighand->action[sig-1];
92291 @@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92292 }
92293 if (action->sa.sa_handler == SIG_DFL)
92294 t->signal->flags &= ~SIGNAL_UNKILLABLE;
92295 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
92296 + is_unhandled = 1;
92297 ret = specific_send_sig_info(sig, info, t);
92298 spin_unlock_irqrestore(&t->sighand->siglock, flags);
92299
92300 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
92301 + normal operation */
92302 + if (is_unhandled) {
92303 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
92304 + gr_handle_crash(t, sig);
92305 + }
92306 +
92307 return ret;
92308 }
92309
92310 @@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92311 ret = check_kill_permission(sig, info, p);
92312 rcu_read_unlock();
92313
92314 - if (!ret && sig)
92315 + if (!ret && sig) {
92316 ret = do_send_sig_info(sig, info, p, true);
92317 + if (!ret)
92318 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
92319 + }
92320
92321 return ret;
92322 }
92323 @@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
92324 int error = -ESRCH;
92325
92326 rcu_read_lock();
92327 - p = find_task_by_vpid(pid);
92328 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
92329 + /* allow glibc communication via tgkill to other threads in our
92330 + thread group */
92331 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
92332 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
92333 + p = find_task_by_vpid_unrestricted(pid);
92334 + else
92335 +#endif
92336 + p = find_task_by_vpid(pid);
92337 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
92338 error = check_kill_permission(sig, info, p);
92339 /*
92340 @@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
92341 }
92342 seg = get_fs();
92343 set_fs(KERNEL_DS);
92344 - ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
92345 - (stack_t __force __user *) &uoss,
92346 + ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
92347 + (stack_t __force_user *) &uoss,
92348 compat_user_stack_pointer());
92349 set_fs(seg);
92350 if (ret >= 0 && uoss_ptr) {
92351 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
92352 index eb89e18..a4e6792 100644
92353 --- a/kernel/smpboot.c
92354 +++ b/kernel/smpboot.c
92355 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
92356 }
92357 smpboot_unpark_thread(plug_thread, cpu);
92358 }
92359 - list_add(&plug_thread->list, &hotplug_threads);
92360 + pax_list_add(&plug_thread->list, &hotplug_threads);
92361 out:
92362 mutex_unlock(&smpboot_threads_lock);
92363 return ret;
92364 @@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
92365 {
92366 get_online_cpus();
92367 mutex_lock(&smpboot_threads_lock);
92368 - list_del(&plug_thread->list);
92369 + pax_list_del(&plug_thread->list);
92370 smpboot_destroy_threads(plug_thread);
92371 mutex_unlock(&smpboot_threads_lock);
92372 put_online_cpus();
92373 diff --git a/kernel/softirq.c b/kernel/softirq.c
92374 index 0699add..d365ad8 100644
92375 --- a/kernel/softirq.c
92376 +++ b/kernel/softirq.c
92377 @@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
92378 EXPORT_SYMBOL(irq_stat);
92379 #endif
92380
92381 -static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
92382 +static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
92383
92384 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
92385
92386 @@ -266,7 +266,7 @@ restart:
92387 kstat_incr_softirqs_this_cpu(vec_nr);
92388
92389 trace_softirq_entry(vec_nr);
92390 - h->action(h);
92391 + h->action();
92392 trace_softirq_exit(vec_nr);
92393 if (unlikely(prev_count != preempt_count())) {
92394 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
92395 @@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
92396 or_softirq_pending(1UL << nr);
92397 }
92398
92399 -void open_softirq(int nr, void (*action)(struct softirq_action *))
92400 +void __init open_softirq(int nr, void (*action)(void))
92401 {
92402 softirq_vec[nr].action = action;
92403 }
92404 @@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
92405 }
92406 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
92407
92408 -static void tasklet_action(struct softirq_action *a)
92409 +static void tasklet_action(void)
92410 {
92411 struct tasklet_struct *list;
92412
92413 @@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
92414 }
92415 }
92416
92417 -static void tasklet_hi_action(struct softirq_action *a)
92418 +static __latent_entropy void tasklet_hi_action(void)
92419 {
92420 struct tasklet_struct *list;
92421
92422 @@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
92423 .notifier_call = cpu_callback
92424 };
92425
92426 -static struct smp_hotplug_thread softirq_threads = {
92427 +static struct smp_hotplug_thread softirq_threads __read_only = {
92428 .store = &ksoftirqd,
92429 .thread_should_run = ksoftirqd_should_run,
92430 .thread_fn = run_ksoftirqd,
92431 diff --git a/kernel/sys.c b/kernel/sys.c
92432 index 1eaa2f0..d80d27c 100644
92433 --- a/kernel/sys.c
92434 +++ b/kernel/sys.c
92435 @@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
92436 error = -EACCES;
92437 goto out;
92438 }
92439 +
92440 + if (gr_handle_chroot_setpriority(p, niceval)) {
92441 + error = -EACCES;
92442 + goto out;
92443 + }
92444 +
92445 no_nice = security_task_setnice(p, niceval);
92446 if (no_nice) {
92447 error = no_nice;
92448 @@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
92449 goto error;
92450 }
92451
92452 + if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
92453 + goto error;
92454 +
92455 + if (!gid_eq(new->gid, old->gid)) {
92456 + /* make sure we generate a learn log for what will
92457 + end up being a role transition after a full-learning
92458 + policy is generated
92459 + CAP_SETGID is required to perform a transition
92460 + we may not log a CAP_SETGID check above, e.g.
92461 + in the case where new rgid = old egid
92462 + */
92463 + gr_learn_cap(current, new, CAP_SETGID);
92464 + }
92465 +
92466 if (rgid != (gid_t) -1 ||
92467 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
92468 new->sgid = new->egid;
92469 @@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
92470 old = current_cred();
92471
92472 retval = -EPERM;
92473 +
92474 + if (gr_check_group_change(kgid, kgid, kgid))
92475 + goto error;
92476 +
92477 if (ns_capable(old->user_ns, CAP_SETGID))
92478 new->gid = new->egid = new->sgid = new->fsgid = kgid;
92479 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
92480 @@ -405,7 +429,7 @@ error:
92481 /*
92482 * change the user struct in a credentials set to match the new UID
92483 */
92484 -static int set_user(struct cred *new)
92485 +int set_user(struct cred *new)
92486 {
92487 struct user_struct *new_user;
92488
92489 @@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
92490 goto error;
92491 }
92492
92493 + if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
92494 + goto error;
92495 +
92496 if (!uid_eq(new->uid, old->uid)) {
92497 + /* make sure we generate a learn log for what will
92498 + end up being a role transition after a full-learning
92499 + policy is generated
92500 + CAP_SETUID is required to perform a transition
92501 + we may not log a CAP_SETUID check above, e.g.
92502 + in the case where new ruid = old euid
92503 + */
92504 + gr_learn_cap(current, new, CAP_SETUID);
92505 retval = set_user(new);
92506 if (retval < 0)
92507 goto error;
92508 @@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
92509 old = current_cred();
92510
92511 retval = -EPERM;
92512 +
92513 + if (gr_check_crash_uid(kuid))
92514 + goto error;
92515 + if (gr_check_user_change(kuid, kuid, kuid))
92516 + goto error;
92517 +
92518 if (ns_capable(old->user_ns, CAP_SETUID)) {
92519 new->suid = new->uid = kuid;
92520 if (!uid_eq(kuid, old->uid)) {
92521 @@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
92522 goto error;
92523 }
92524
92525 + if (gr_check_user_change(kruid, keuid, INVALID_UID))
92526 + goto error;
92527 +
92528 if (ruid != (uid_t) -1) {
92529 new->uid = kruid;
92530 if (!uid_eq(kruid, old->uid)) {
92531 @@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
92532 goto error;
92533 }
92534
92535 + if (gr_check_group_change(krgid, kegid, INVALID_GID))
92536 + goto error;
92537 +
92538 if (rgid != (gid_t) -1)
92539 new->gid = krgid;
92540 if (egid != (gid_t) -1)
92541 @@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
92542 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
92543 ns_capable(old->user_ns, CAP_SETUID)) {
92544 if (!uid_eq(kuid, old->fsuid)) {
92545 + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
92546 + goto error;
92547 +
92548 new->fsuid = kuid;
92549 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
92550 goto change_okay;
92551 }
92552 }
92553
92554 +error:
92555 abort_creds(new);
92556 return old_fsuid;
92557
92558 @@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
92559 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
92560 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
92561 ns_capable(old->user_ns, CAP_SETGID)) {
92562 + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
92563 + goto error;
92564 +
92565 if (!gid_eq(kgid, old->fsgid)) {
92566 new->fsgid = kgid;
92567 goto change_okay;
92568 }
92569 }
92570
92571 +error:
92572 abort_creds(new);
92573 return old_fsgid;
92574
92575 @@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
92576 return -EFAULT;
92577
92578 down_read(&uts_sem);
92579 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
92580 + error = __copy_to_user(name->sysname, &utsname()->sysname,
92581 __OLD_UTS_LEN);
92582 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
92583 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
92584 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
92585 __OLD_UTS_LEN);
92586 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
92587 - error |= __copy_to_user(&name->release, &utsname()->release,
92588 + error |= __copy_to_user(name->release, &utsname()->release,
92589 __OLD_UTS_LEN);
92590 error |= __put_user(0, name->release + __OLD_UTS_LEN);
92591 - error |= __copy_to_user(&name->version, &utsname()->version,
92592 + error |= __copy_to_user(name->version, &utsname()->version,
92593 __OLD_UTS_LEN);
92594 error |= __put_user(0, name->version + __OLD_UTS_LEN);
92595 - error |= __copy_to_user(&name->machine, &utsname()->machine,
92596 + error |= __copy_to_user(name->machine, &utsname()->machine,
92597 __OLD_UTS_LEN);
92598 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
92599 up_read(&uts_sem);
92600 @@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
92601 */
92602 new_rlim->rlim_cur = 1;
92603 }
92604 + /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
92605 + is changed to a lower value. Since tasks can be created by the same
92606 + user in between this limit change and an execve by this task, force
92607 + a recheck only for this task by setting PF_NPROC_EXCEEDED
92608 + */
92609 + if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
92610 + tsk->flags |= PF_NPROC_EXCEEDED;
92611 }
92612 if (!retval) {
92613 if (old_rlim)
92614 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
92615 index 15f2511..181b356 100644
92616 --- a/kernel/sysctl.c
92617 +++ b/kernel/sysctl.c
92618 @@ -94,7 +94,6 @@
92619
92620
92621 #if defined(CONFIG_SYSCTL)
92622 -
92623 /* External variables not in a header file. */
92624 extern int max_threads;
92625 extern int suid_dumpable;
92626 @@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
92627
92628 /* Constants used for minimum and maximum */
92629 #ifdef CONFIG_LOCKUP_DETECTOR
92630 -static int sixty = 60;
92631 +static int sixty __read_only = 60;
92632 #endif
92633
92634 -static int __maybe_unused neg_one = -1;
92635 +static int __maybe_unused neg_one __read_only = -1;
92636
92637 -static int zero;
92638 -static int __maybe_unused one = 1;
92639 -static int __maybe_unused two = 2;
92640 -static int __maybe_unused four = 4;
92641 -static unsigned long one_ul = 1;
92642 -static int one_hundred = 100;
92643 +static int zero __read_only = 0;
92644 +static int __maybe_unused one __read_only = 1;
92645 +static int __maybe_unused two __read_only = 2;
92646 +static int __maybe_unused three __read_only = 3;
92647 +static int __maybe_unused four __read_only = 4;
92648 +static unsigned long one_ul __read_only = 1;
92649 +static int one_hundred __read_only = 100;
92650 #ifdef CONFIG_PRINTK
92651 -static int ten_thousand = 10000;
92652 +static int ten_thousand __read_only = 10000;
92653 #endif
92654
92655 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
92656 @@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
92657 void __user *buffer, size_t *lenp, loff_t *ppos);
92658 #endif
92659
92660 -#ifdef CONFIG_PRINTK
92661 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92662 void __user *buffer, size_t *lenp, loff_t *ppos);
92663 -#endif
92664
92665 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
92666 void __user *buffer, size_t *lenp, loff_t *ppos);
92667 @@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
92668
92669 #endif
92670
92671 +extern struct ctl_table grsecurity_table[];
92672 +
92673 static struct ctl_table kern_table[];
92674 static struct ctl_table vm_table[];
92675 static struct ctl_table fs_table[];
92676 @@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
92677 int sysctl_legacy_va_layout;
92678 #endif
92679
92680 +#ifdef CONFIG_PAX_SOFTMODE
92681 +static struct ctl_table pax_table[] = {
92682 + {
92683 + .procname = "softmode",
92684 + .data = &pax_softmode,
92685 + .maxlen = sizeof(unsigned int),
92686 + .mode = 0600,
92687 + .proc_handler = &proc_dointvec,
92688 + },
92689 +
92690 + { }
92691 +};
92692 +#endif
92693 +
92694 /* The default sysctl tables: */
92695
92696 static struct ctl_table sysctl_base_table[] = {
92697 @@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
92698 #endif
92699
92700 static struct ctl_table kern_table[] = {
92701 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
92702 + {
92703 + .procname = "grsecurity",
92704 + .mode = 0500,
92705 + .child = grsecurity_table,
92706 + },
92707 +#endif
92708 +
92709 +#ifdef CONFIG_PAX_SOFTMODE
92710 + {
92711 + .procname = "pax",
92712 + .mode = 0500,
92713 + .child = pax_table,
92714 + },
92715 +#endif
92716 +
92717 {
92718 .procname = "sched_child_runs_first",
92719 .data = &sysctl_sched_child_runs_first,
92720 @@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
92721 .data = &modprobe_path,
92722 .maxlen = KMOD_PATH_LEN,
92723 .mode = 0644,
92724 - .proc_handler = proc_dostring,
92725 + .proc_handler = proc_dostring_modpriv,
92726 },
92727 {
92728 .procname = "modules_disabled",
92729 @@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
92730 .extra1 = &zero,
92731 .extra2 = &one,
92732 },
92733 +#endif
92734 {
92735 .procname = "kptr_restrict",
92736 .data = &kptr_restrict,
92737 .maxlen = sizeof(int),
92738 .mode = 0644,
92739 .proc_handler = proc_dointvec_minmax_sysadmin,
92740 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92741 + .extra1 = &two,
92742 +#else
92743 .extra1 = &zero,
92744 +#endif
92745 .extra2 = &two,
92746 },
92747 -#endif
92748 {
92749 .procname = "ngroups_max",
92750 .data = &ngroups_max,
92751 @@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
92752 */
92753 {
92754 .procname = "perf_event_paranoid",
92755 - .data = &sysctl_perf_event_paranoid,
92756 - .maxlen = sizeof(sysctl_perf_event_paranoid),
92757 + .data = &sysctl_perf_event_legitimately_concerned,
92758 + .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
92759 .mode = 0644,
92760 - .proc_handler = proc_dointvec,
92761 + /* go ahead, be a hero */
92762 + .proc_handler = proc_dointvec_minmax_sysadmin,
92763 + .extra1 = &neg_one,
92764 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
92765 + .extra2 = &three,
92766 +#else
92767 + .extra2 = &two,
92768 +#endif
92769 },
92770 {
92771 .procname = "perf_event_mlock_kb",
92772 @@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
92773 .proc_handler = proc_dointvec_minmax,
92774 .extra1 = &zero,
92775 },
92776 + {
92777 + .procname = "heap_stack_gap",
92778 + .data = &sysctl_heap_stack_gap,
92779 + .maxlen = sizeof(sysctl_heap_stack_gap),
92780 + .mode = 0644,
92781 + .proc_handler = proc_doulongvec_minmax,
92782 + },
92783 #else
92784 {
92785 .procname = "nr_trim_pages",
92786 @@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
92787 (char __user *)buffer, lenp, ppos);
92788 }
92789
92790 +int proc_dostring_modpriv(struct ctl_table *table, int write,
92791 + void __user *buffer, size_t *lenp, loff_t *ppos)
92792 +{
92793 + if (write && !capable(CAP_SYS_MODULE))
92794 + return -EPERM;
92795 +
92796 + return _proc_do_string(table->data, table->maxlen, write,
92797 + buffer, lenp, ppos);
92798 +}
92799 +
92800 static size_t proc_skip_spaces(char **buf)
92801 {
92802 size_t ret;
92803 @@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
92804 len = strlen(tmp);
92805 if (len > *size)
92806 len = *size;
92807 + if (len > sizeof(tmp))
92808 + len = sizeof(tmp);
92809 if (copy_to_user(*buf, tmp, len))
92810 return -EFAULT;
92811 *size -= len;
92812 @@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
92813 static int proc_taint(struct ctl_table *table, int write,
92814 void __user *buffer, size_t *lenp, loff_t *ppos)
92815 {
92816 - struct ctl_table t;
92817 + ctl_table_no_const t;
92818 unsigned long tmptaint = get_taint();
92819 int err;
92820
92821 @@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
92822 return err;
92823 }
92824
92825 -#ifdef CONFIG_PRINTK
92826 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92827 void __user *buffer, size_t *lenp, loff_t *ppos)
92828 {
92829 @@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92830
92831 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
92832 }
92833 -#endif
92834
92835 struct do_proc_dointvec_minmax_conv_param {
92836 int *min;
92837 @@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
92838 return -ENOSYS;
92839 }
92840
92841 +int proc_dostring_modpriv(struct ctl_table *table, int write,
92842 + void __user *buffer, size_t *lenp, loff_t *ppos)
92843 +{
92844 + return -ENOSYS;
92845 +}
92846 +
92847 int proc_dointvec(struct ctl_table *table, int write,
92848 void __user *buffer, size_t *lenp, loff_t *ppos)
92849 {
92850 @@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
92851 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
92852 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
92853 EXPORT_SYMBOL(proc_dostring);
92854 +EXPORT_SYMBOL(proc_dostring_modpriv);
92855 EXPORT_SYMBOL(proc_doulongvec_minmax);
92856 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
92857 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
92858 index b312fcc7..753d72d 100644
92859 --- a/kernel/taskstats.c
92860 +++ b/kernel/taskstats.c
92861 @@ -28,9 +28,12 @@
92862 #include <linux/fs.h>
92863 #include <linux/file.h>
92864 #include <linux/pid_namespace.h>
92865 +#include <linux/grsecurity.h>
92866 #include <net/genetlink.h>
92867 #include <linux/atomic.h>
92868
92869 +extern int gr_is_taskstats_denied(int pid);
92870 +
92871 /*
92872 * Maximum length of a cpumask that can be specified in
92873 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
92874 @@ -576,6 +579,9 @@ err:
92875
92876 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
92877 {
92878 + if (gr_is_taskstats_denied(current->pid))
92879 + return -EACCES;
92880 +
92881 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
92882 return cmd_attr_register_cpumask(info);
92883 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
92884 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
92885 index a7077d3..dd48a49 100644
92886 --- a/kernel/time/alarmtimer.c
92887 +++ b/kernel/time/alarmtimer.c
92888 @@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
92889 struct platform_device *pdev;
92890 int error = 0;
92891 int i;
92892 - struct k_clock alarm_clock = {
92893 + static struct k_clock alarm_clock = {
92894 .clock_getres = alarm_clock_getres,
92895 .clock_get = alarm_clock_get,
92896 .timer_create = alarm_timer_create,
92897 diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
92898 index 37e50aa..57a9501 100644
92899 --- a/kernel/time/hrtimer.c
92900 +++ b/kernel/time/hrtimer.c
92901 @@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
92902 local_irq_restore(flags);
92903 }
92904
92905 -static void run_hrtimer_softirq(struct softirq_action *h)
92906 +static __latent_entropy void run_hrtimer_softirq(void)
92907 {
92908 hrtimer_peek_ahead_timers();
92909 }
92910 diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
92911 index a16b678..8c5bd9d 100644
92912 --- a/kernel/time/posix-cpu-timers.c
92913 +++ b/kernel/time/posix-cpu-timers.c
92914 @@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
92915
92916 static __init int init_posix_cpu_timers(void)
92917 {
92918 - struct k_clock process = {
92919 + static struct k_clock process = {
92920 .clock_getres = process_cpu_clock_getres,
92921 .clock_get = process_cpu_clock_get,
92922 .timer_create = process_cpu_timer_create,
92923 .nsleep = process_cpu_nsleep,
92924 .nsleep_restart = process_cpu_nsleep_restart,
92925 };
92926 - struct k_clock thread = {
92927 + static struct k_clock thread = {
92928 .clock_getres = thread_cpu_clock_getres,
92929 .clock_get = thread_cpu_clock_get,
92930 .timer_create = thread_cpu_timer_create,
92931 diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
92932 index 31ea01f..7fc61ef 100644
92933 --- a/kernel/time/posix-timers.c
92934 +++ b/kernel/time/posix-timers.c
92935 @@ -43,6 +43,7 @@
92936 #include <linux/hash.h>
92937 #include <linux/posix-clock.h>
92938 #include <linux/posix-timers.h>
92939 +#include <linux/grsecurity.h>
92940 #include <linux/syscalls.h>
92941 #include <linux/wait.h>
92942 #include <linux/workqueue.h>
92943 @@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
92944 * which we beg off on and pass to do_sys_settimeofday().
92945 */
92946
92947 -static struct k_clock posix_clocks[MAX_CLOCKS];
92948 +static struct k_clock *posix_clocks[MAX_CLOCKS];
92949
92950 /*
92951 * These ones are defined below.
92952 @@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
92953 */
92954 static __init int init_posix_timers(void)
92955 {
92956 - struct k_clock clock_realtime = {
92957 + static struct k_clock clock_realtime = {
92958 .clock_getres = hrtimer_get_res,
92959 .clock_get = posix_clock_realtime_get,
92960 .clock_set = posix_clock_realtime_set,
92961 @@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
92962 .timer_get = common_timer_get,
92963 .timer_del = common_timer_del,
92964 };
92965 - struct k_clock clock_monotonic = {
92966 + static struct k_clock clock_monotonic = {
92967 .clock_getres = hrtimer_get_res,
92968 .clock_get = posix_ktime_get_ts,
92969 .nsleep = common_nsleep,
92970 @@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
92971 .timer_get = common_timer_get,
92972 .timer_del = common_timer_del,
92973 };
92974 - struct k_clock clock_monotonic_raw = {
92975 + static struct k_clock clock_monotonic_raw = {
92976 .clock_getres = hrtimer_get_res,
92977 .clock_get = posix_get_monotonic_raw,
92978 };
92979 - struct k_clock clock_realtime_coarse = {
92980 + static struct k_clock clock_realtime_coarse = {
92981 .clock_getres = posix_get_coarse_res,
92982 .clock_get = posix_get_realtime_coarse,
92983 };
92984 - struct k_clock clock_monotonic_coarse = {
92985 + static struct k_clock clock_monotonic_coarse = {
92986 .clock_getres = posix_get_coarse_res,
92987 .clock_get = posix_get_monotonic_coarse,
92988 };
92989 - struct k_clock clock_tai = {
92990 + static struct k_clock clock_tai = {
92991 .clock_getres = hrtimer_get_res,
92992 .clock_get = posix_get_tai,
92993 .nsleep = common_nsleep,
92994 @@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
92995 .timer_get = common_timer_get,
92996 .timer_del = common_timer_del,
92997 };
92998 - struct k_clock clock_boottime = {
92999 + static struct k_clock clock_boottime = {
93000 .clock_getres = hrtimer_get_res,
93001 .clock_get = posix_get_boottime,
93002 .nsleep = common_nsleep,
93003 @@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
93004 return;
93005 }
93006
93007 - posix_clocks[clock_id] = *new_clock;
93008 + posix_clocks[clock_id] = new_clock;
93009 }
93010 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
93011
93012 @@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
93013 return (id & CLOCKFD_MASK) == CLOCKFD ?
93014 &clock_posix_dynamic : &clock_posix_cpu;
93015
93016 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
93017 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
93018 return NULL;
93019 - return &posix_clocks[id];
93020 + return posix_clocks[id];
93021 }
93022
93023 static int common_timer_create(struct k_itimer *new_timer)
93024 @@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
93025 struct k_clock *kc = clockid_to_kclock(which_clock);
93026 struct k_itimer *new_timer;
93027 int error, new_timer_id;
93028 - sigevent_t event;
93029 + sigevent_t event = { };
93030 int it_id_set = IT_ID_NOT_SET;
93031
93032 if (!kc)
93033 @@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
93034 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
93035 return -EFAULT;
93036
93037 + /* only the CLOCK_REALTIME clock can be set, all other clocks
93038 + have their clock_set fptr set to a nosettime dummy function
93039 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
93040 + call common_clock_set, which calls do_sys_settimeofday, which
93041 + we hook
93042 + */
93043 +
93044 return kc->clock_set(which_clock, &new_tp);
93045 }
93046
93047 diff --git a/kernel/time/time.c b/kernel/time/time.c
93048 index a9ae20f..d3fbde7 100644
93049 --- a/kernel/time/time.c
93050 +++ b/kernel/time/time.c
93051 @@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
93052 return error;
93053
93054 if (tz) {
93055 + /* we log in do_settimeofday called below, so don't log twice
93056 + */
93057 + if (!tv)
93058 + gr_log_timechange();
93059 +
93060 sys_tz = *tz;
93061 update_vsyscall_tz();
93062 if (firsttime) {
93063 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
93064 index ec1791f..6a086cd 100644
93065 --- a/kernel/time/timekeeping.c
93066 +++ b/kernel/time/timekeeping.c
93067 @@ -15,6 +15,7 @@
93068 #include <linux/init.h>
93069 #include <linux/mm.h>
93070 #include <linux/sched.h>
93071 +#include <linux/grsecurity.h>
93072 #include <linux/syscore_ops.h>
93073 #include <linux/clocksource.h>
93074 #include <linux/jiffies.h>
93075 @@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
93076 if (!timespec_valid_strict(tv))
93077 return -EINVAL;
93078
93079 + gr_log_timechange();
93080 +
93081 raw_spin_lock_irqsave(&timekeeper_lock, flags);
93082 write_seqcount_begin(&tk_core.seq);
93083
93084 diff --git a/kernel/time/timer.c b/kernel/time/timer.c
93085 index 3260ffd..c93cd5e 100644
93086 --- a/kernel/time/timer.c
93087 +++ b/kernel/time/timer.c
93088 @@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
93089 /*
93090 * This function runs timers and the timer-tq in bottom half context.
93091 */
93092 -static void run_timer_softirq(struct softirq_action *h)
93093 +static __latent_entropy void run_timer_softirq(void)
93094 {
93095 struct tvec_base *base = __this_cpu_read(tvec_bases);
93096
93097 @@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
93098 *
93099 * In all cases the return value is guaranteed to be non-negative.
93100 */
93101 -signed long __sched schedule_timeout(signed long timeout)
93102 +signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
93103 {
93104 struct timer_list timer;
93105 unsigned long expire;
93106 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
93107 index 61ed862..3b52c65 100644
93108 --- a/kernel/time/timer_list.c
93109 +++ b/kernel/time/timer_list.c
93110 @@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
93111
93112 static void print_name_offset(struct seq_file *m, void *sym)
93113 {
93114 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93115 + SEQ_printf(m, "<%p>", NULL);
93116 +#else
93117 char symname[KSYM_NAME_LEN];
93118
93119 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
93120 SEQ_printf(m, "<%pK>", sym);
93121 else
93122 SEQ_printf(m, "%s", symname);
93123 +#endif
93124 }
93125
93126 static void
93127 @@ -119,7 +123,11 @@ next_one:
93128 static void
93129 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
93130 {
93131 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93132 + SEQ_printf(m, " .base: %p\n", NULL);
93133 +#else
93134 SEQ_printf(m, " .base: %pK\n", base);
93135 +#endif
93136 SEQ_printf(m, " .index: %d\n",
93137 base->index);
93138 SEQ_printf(m, " .resolution: %Lu nsecs\n",
93139 @@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
93140 {
93141 struct proc_dir_entry *pe;
93142
93143 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
93144 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
93145 +#else
93146 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
93147 +#endif
93148 if (!pe)
93149 return -ENOMEM;
93150 return 0;
93151 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
93152 index 1fb08f2..ca4bb1e 100644
93153 --- a/kernel/time/timer_stats.c
93154 +++ b/kernel/time/timer_stats.c
93155 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
93156 static unsigned long nr_entries;
93157 static struct entry entries[MAX_ENTRIES];
93158
93159 -static atomic_t overflow_count;
93160 +static atomic_unchecked_t overflow_count;
93161
93162 /*
93163 * The entries are in a hash-table, for fast lookup:
93164 @@ -140,7 +140,7 @@ static void reset_entries(void)
93165 nr_entries = 0;
93166 memset(entries, 0, sizeof(entries));
93167 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
93168 - atomic_set(&overflow_count, 0);
93169 + atomic_set_unchecked(&overflow_count, 0);
93170 }
93171
93172 static struct entry *alloc_entry(void)
93173 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93174 if (likely(entry))
93175 entry->count++;
93176 else
93177 - atomic_inc(&overflow_count);
93178 + atomic_inc_unchecked(&overflow_count);
93179
93180 out_unlock:
93181 raw_spin_unlock_irqrestore(lock, flags);
93182 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93183
93184 static void print_name_offset(struct seq_file *m, unsigned long addr)
93185 {
93186 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93187 + seq_printf(m, "<%p>", NULL);
93188 +#else
93189 char symname[KSYM_NAME_LEN];
93190
93191 if (lookup_symbol_name(addr, symname) < 0)
93192 - seq_printf(m, "<%p>", (void *)addr);
93193 + seq_printf(m, "<%pK>", (void *)addr);
93194 else
93195 seq_printf(m, "%s", symname);
93196 +#endif
93197 }
93198
93199 static int tstats_show(struct seq_file *m, void *v)
93200 @@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
93201
93202 seq_puts(m, "Timer Stats Version: v0.3\n");
93203 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
93204 - if (atomic_read(&overflow_count))
93205 - seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
93206 + if (atomic_read_unchecked(&overflow_count))
93207 + seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
93208 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
93209
93210 for (i = 0; i < nr_entries; i++) {
93211 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
93212 {
93213 struct proc_dir_entry *pe;
93214
93215 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
93216 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
93217 +#else
93218 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
93219 +#endif
93220 if (!pe)
93221 return -ENOMEM;
93222 return 0;
93223 diff --git a/kernel/torture.c b/kernel/torture.c
93224 index dd70993..0bf694b 100644
93225 --- a/kernel/torture.c
93226 +++ b/kernel/torture.c
93227 @@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
93228 mutex_lock(&fullstop_mutex);
93229 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
93230 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
93231 - ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
93232 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
93233 } else {
93234 pr_warn("Concurrent rmmod and shutdown illegal!\n");
93235 }
93236 @@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
93237 if (!torture_must_stop()) {
93238 if (stutter > 1) {
93239 schedule_timeout_interruptible(stutter - 1);
93240 - ACCESS_ONCE(stutter_pause_test) = 2;
93241 + ACCESS_ONCE_RW(stutter_pause_test) = 2;
93242 }
93243 schedule_timeout_interruptible(1);
93244 - ACCESS_ONCE(stutter_pause_test) = 1;
93245 + ACCESS_ONCE_RW(stutter_pause_test) = 1;
93246 }
93247 if (!torture_must_stop())
93248 schedule_timeout_interruptible(stutter);
93249 - ACCESS_ONCE(stutter_pause_test) = 0;
93250 + ACCESS_ONCE_RW(stutter_pause_test) = 0;
93251 torture_shutdown_absorb("torture_stutter");
93252 } while (!torture_must_stop());
93253 torture_kthread_stopping("torture_stutter");
93254 @@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
93255 schedule_timeout_uninterruptible(10);
93256 return true;
93257 }
93258 - ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
93259 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
93260 mutex_unlock(&fullstop_mutex);
93261 torture_shutdown_cleanup();
93262 torture_shuffle_cleanup();
93263 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
93264 index c1bd4ad..4b861dc 100644
93265 --- a/kernel/trace/blktrace.c
93266 +++ b/kernel/trace/blktrace.c
93267 @@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
93268 struct blk_trace *bt = filp->private_data;
93269 char buf[16];
93270
93271 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
93272 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
93273
93274 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
93275 }
93276 @@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
93277 return 1;
93278
93279 bt = buf->chan->private_data;
93280 - atomic_inc(&bt->dropped);
93281 + atomic_inc_unchecked(&bt->dropped);
93282 return 0;
93283 }
93284
93285 @@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
93286
93287 bt->dir = dir;
93288 bt->dev = dev;
93289 - atomic_set(&bt->dropped, 0);
93290 + atomic_set_unchecked(&bt->dropped, 0);
93291 INIT_LIST_HEAD(&bt->running_list);
93292
93293 ret = -EIO;
93294 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
93295 index 31c90fe..051ce98 100644
93296 --- a/kernel/trace/ftrace.c
93297 +++ b/kernel/trace/ftrace.c
93298 @@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
93299 if (unlikely(ftrace_disabled))
93300 return 0;
93301
93302 + ret = ftrace_arch_code_modify_prepare();
93303 + FTRACE_WARN_ON(ret);
93304 + if (ret)
93305 + return 0;
93306 +
93307 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
93308 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
93309 if (ret) {
93310 ftrace_bug(ret, ip);
93311 - return 0;
93312 }
93313 - return 1;
93314 + return ret ? 0 : 1;
93315 }
93316
93317 /*
93318 @@ -4492,8 +4497,10 @@ static int ftrace_process_locs(struct module *mod,
93319 if (!count)
93320 return 0;
93321
93322 + pax_open_kernel();
93323 sort(start, count, sizeof(*start),
93324 ftrace_cmp_ips, ftrace_swap_ips);
93325 + pax_close_kernel();
93326
93327 start_pg = ftrace_allocate_pages(count);
93328 if (!start_pg)
93329 @@ -5340,7 +5347,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
93330
93331 if (t->ret_stack == NULL) {
93332 atomic_set(&t->tracing_graph_pause, 0);
93333 - atomic_set(&t->trace_overrun, 0);
93334 + atomic_set_unchecked(&t->trace_overrun, 0);
93335 t->curr_ret_stack = -1;
93336 /* Make sure the tasks see the -1 first: */
93337 smp_wmb();
93338 @@ -5553,7 +5560,7 @@ static void
93339 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
93340 {
93341 atomic_set(&t->tracing_graph_pause, 0);
93342 - atomic_set(&t->trace_overrun, 0);
93343 + atomic_set_unchecked(&t->trace_overrun, 0);
93344 t->ftrace_timestamp = 0;
93345 /* make curr_ret_stack visible before we add the ret_stack */
93346 smp_wmb();
93347 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
93348 index a56e07c..d46f0ba 100644
93349 --- a/kernel/trace/ring_buffer.c
93350 +++ b/kernel/trace/ring_buffer.c
93351 @@ -352,9 +352,9 @@ struct buffer_data_page {
93352 */
93353 struct buffer_page {
93354 struct list_head list; /* list of buffer pages */
93355 - local_t write; /* index for next write */
93356 + local_unchecked_t write; /* index for next write */
93357 unsigned read; /* index for next read */
93358 - local_t entries; /* entries on this page */
93359 + local_unchecked_t entries; /* entries on this page */
93360 unsigned long real_end; /* real end of data */
93361 struct buffer_data_page *page; /* Actual data page */
93362 };
93363 @@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
93364 unsigned long last_overrun;
93365 local_t entries_bytes;
93366 local_t entries;
93367 - local_t overrun;
93368 - local_t commit_overrun;
93369 + local_unchecked_t overrun;
93370 + local_unchecked_t commit_overrun;
93371 local_t dropped_events;
93372 local_t committing;
93373 local_t commits;
93374 @@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93375 *
93376 * We add a counter to the write field to denote this.
93377 */
93378 - old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
93379 - old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
93380 + old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
93381 + old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
93382
93383 /*
93384 * Just make sure we have seen our old_write and synchronize
93385 @@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93386 * cmpxchg to only update if an interrupt did not already
93387 * do it for us. If the cmpxchg fails, we don't care.
93388 */
93389 - (void)local_cmpxchg(&next_page->write, old_write, val);
93390 - (void)local_cmpxchg(&next_page->entries, old_entries, eval);
93391 + (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
93392 + (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
93393
93394 /*
93395 * No need to worry about races with clearing out the commit.
93396 @@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
93397
93398 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
93399 {
93400 - return local_read(&bpage->entries) & RB_WRITE_MASK;
93401 + return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
93402 }
93403
93404 static inline unsigned long rb_page_write(struct buffer_page *bpage)
93405 {
93406 - return local_read(&bpage->write) & RB_WRITE_MASK;
93407 + return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
93408 }
93409
93410 static int
93411 @@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
93412 * bytes consumed in ring buffer from here.
93413 * Increment overrun to account for the lost events.
93414 */
93415 - local_add(page_entries, &cpu_buffer->overrun);
93416 + local_add_unchecked(page_entries, &cpu_buffer->overrun);
93417 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93418 }
93419
93420 @@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
93421 * it is our responsibility to update
93422 * the counters.
93423 */
93424 - local_add(entries, &cpu_buffer->overrun);
93425 + local_add_unchecked(entries, &cpu_buffer->overrun);
93426 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93427
93428 /*
93429 @@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93430 if (tail == BUF_PAGE_SIZE)
93431 tail_page->real_end = 0;
93432
93433 - local_sub(length, &tail_page->write);
93434 + local_sub_unchecked(length, &tail_page->write);
93435 return;
93436 }
93437
93438 @@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93439 rb_event_set_padding(event);
93440
93441 /* Set the write back to the previous setting */
93442 - local_sub(length, &tail_page->write);
93443 + local_sub_unchecked(length, &tail_page->write);
93444 return;
93445 }
93446
93447 @@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93448
93449 /* Set write to end of buffer */
93450 length = (tail + length) - BUF_PAGE_SIZE;
93451 - local_sub(length, &tail_page->write);
93452 + local_sub_unchecked(length, &tail_page->write);
93453 }
93454
93455 /*
93456 @@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93457 * about it.
93458 */
93459 if (unlikely(next_page == commit_page)) {
93460 - local_inc(&cpu_buffer->commit_overrun);
93461 + local_inc_unchecked(&cpu_buffer->commit_overrun);
93462 goto out_reset;
93463 }
93464
93465 @@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93466 cpu_buffer->tail_page) &&
93467 (cpu_buffer->commit_page ==
93468 cpu_buffer->reader_page))) {
93469 - local_inc(&cpu_buffer->commit_overrun);
93470 + local_inc_unchecked(&cpu_buffer->commit_overrun);
93471 goto out_reset;
93472 }
93473 }
93474 @@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93475 length += RB_LEN_TIME_EXTEND;
93476
93477 tail_page = cpu_buffer->tail_page;
93478 - write = local_add_return(length, &tail_page->write);
93479 + write = local_add_return_unchecked(length, &tail_page->write);
93480
93481 /* set write to only the index of the write */
93482 write &= RB_WRITE_MASK;
93483 @@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93484 kmemcheck_annotate_bitfield(event, bitfield);
93485 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
93486
93487 - local_inc(&tail_page->entries);
93488 + local_inc_unchecked(&tail_page->entries);
93489
93490 /*
93491 * If this is the first commit on the page, then update
93492 @@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93493
93494 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
93495 unsigned long write_mask =
93496 - local_read(&bpage->write) & ~RB_WRITE_MASK;
93497 + local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
93498 unsigned long event_length = rb_event_length(event);
93499 /*
93500 * This is on the tail page. It is possible that
93501 @@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93502 */
93503 old_index += write_mask;
93504 new_index += write_mask;
93505 - index = local_cmpxchg(&bpage->write, old_index, new_index);
93506 + index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
93507 if (index == old_index) {
93508 /* update counters */
93509 local_sub(event_length, &cpu_buffer->entries_bytes);
93510 @@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93511
93512 /* Do the likely case first */
93513 if (likely(bpage->page == (void *)addr)) {
93514 - local_dec(&bpage->entries);
93515 + local_dec_unchecked(&bpage->entries);
93516 return;
93517 }
93518
93519 @@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93520 start = bpage;
93521 do {
93522 if (bpage->page == (void *)addr) {
93523 - local_dec(&bpage->entries);
93524 + local_dec_unchecked(&bpage->entries);
93525 return;
93526 }
93527 rb_inc_page(cpu_buffer, &bpage);
93528 @@ -3173,7 +3173,7 @@ static inline unsigned long
93529 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
93530 {
93531 return local_read(&cpu_buffer->entries) -
93532 - (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
93533 + (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
93534 }
93535
93536 /**
93537 @@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
93538 return 0;
93539
93540 cpu_buffer = buffer->buffers[cpu];
93541 - ret = local_read(&cpu_buffer->overrun);
93542 + ret = local_read_unchecked(&cpu_buffer->overrun);
93543
93544 return ret;
93545 }
93546 @@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
93547 return 0;
93548
93549 cpu_buffer = buffer->buffers[cpu];
93550 - ret = local_read(&cpu_buffer->commit_overrun);
93551 + ret = local_read_unchecked(&cpu_buffer->commit_overrun);
93552
93553 return ret;
93554 }
93555 @@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
93556 /* if you care about this being correct, lock the buffer */
93557 for_each_buffer_cpu(buffer, cpu) {
93558 cpu_buffer = buffer->buffers[cpu];
93559 - overruns += local_read(&cpu_buffer->overrun);
93560 + overruns += local_read_unchecked(&cpu_buffer->overrun);
93561 }
93562
93563 return overruns;
93564 @@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93565 /*
93566 * Reset the reader page to size zero.
93567 */
93568 - local_set(&cpu_buffer->reader_page->write, 0);
93569 - local_set(&cpu_buffer->reader_page->entries, 0);
93570 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93571 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93572 local_set(&cpu_buffer->reader_page->page->commit, 0);
93573 cpu_buffer->reader_page->real_end = 0;
93574
93575 @@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93576 * want to compare with the last_overrun.
93577 */
93578 smp_mb();
93579 - overwrite = local_read(&(cpu_buffer->overrun));
93580 + overwrite = local_read_unchecked(&(cpu_buffer->overrun));
93581
93582 /*
93583 * Here's the tricky part.
93584 @@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93585
93586 cpu_buffer->head_page
93587 = list_entry(cpu_buffer->pages, struct buffer_page, list);
93588 - local_set(&cpu_buffer->head_page->write, 0);
93589 - local_set(&cpu_buffer->head_page->entries, 0);
93590 + local_set_unchecked(&cpu_buffer->head_page->write, 0);
93591 + local_set_unchecked(&cpu_buffer->head_page->entries, 0);
93592 local_set(&cpu_buffer->head_page->page->commit, 0);
93593
93594 cpu_buffer->head_page->read = 0;
93595 @@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93596
93597 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
93598 INIT_LIST_HEAD(&cpu_buffer->new_pages);
93599 - local_set(&cpu_buffer->reader_page->write, 0);
93600 - local_set(&cpu_buffer->reader_page->entries, 0);
93601 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93602 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93603 local_set(&cpu_buffer->reader_page->page->commit, 0);
93604 cpu_buffer->reader_page->read = 0;
93605
93606 local_set(&cpu_buffer->entries_bytes, 0);
93607 - local_set(&cpu_buffer->overrun, 0);
93608 - local_set(&cpu_buffer->commit_overrun, 0);
93609 + local_set_unchecked(&cpu_buffer->overrun, 0);
93610 + local_set_unchecked(&cpu_buffer->commit_overrun, 0);
93611 local_set(&cpu_buffer->dropped_events, 0);
93612 local_set(&cpu_buffer->entries, 0);
93613 local_set(&cpu_buffer->committing, 0);
93614 @@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
93615 rb_init_page(bpage);
93616 bpage = reader->page;
93617 reader->page = *data_page;
93618 - local_set(&reader->write, 0);
93619 - local_set(&reader->entries, 0);
93620 + local_set_unchecked(&reader->write, 0);
93621 + local_set_unchecked(&reader->entries, 0);
93622 reader->read = 0;
93623 *data_page = bpage;
93624
93625 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
93626 index 426962b..e8e2d9a 100644
93627 --- a/kernel/trace/trace.c
93628 +++ b/kernel/trace/trace.c
93629 @@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
93630 return 0;
93631 }
93632
93633 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
93634 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
93635 {
93636 /* do nothing if flag is already set */
93637 if (!!(trace_flags & mask) == !!enabled)
93638 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
93639 index 385391f..8d2250f 100644
93640 --- a/kernel/trace/trace.h
93641 +++ b/kernel/trace/trace.h
93642 @@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
93643 void trace_printk_init_buffers(void);
93644 void trace_printk_start_comm(void);
93645 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
93646 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
93647 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
93648
93649 /*
93650 * Normal trace_printk() and friends allocates special buffers
93651 diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
93652 index 57b67b1..66082a9 100644
93653 --- a/kernel/trace/trace_clock.c
93654 +++ b/kernel/trace/trace_clock.c
93655 @@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
93656 return now;
93657 }
93658
93659 -static atomic64_t trace_counter;
93660 +static atomic64_unchecked_t trace_counter;
93661
93662 /*
93663 * trace_clock_counter(): simply an atomic counter.
93664 @@ -133,5 +133,5 @@ static atomic64_t trace_counter;
93665 */
93666 u64 notrace trace_clock_counter(void)
93667 {
93668 - return atomic64_add_return(1, &trace_counter);
93669 + return atomic64_inc_return_unchecked(&trace_counter);
93670 }
93671 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
93672 index 1b0df1e..4ebb965 100644
93673 --- a/kernel/trace/trace_events.c
93674 +++ b/kernel/trace/trace_events.c
93675 @@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
93676 return 0;
93677 }
93678
93679 -struct ftrace_module_file_ops;
93680 static void __add_event_to_tracers(struct ftrace_event_call *call);
93681
93682 /* Add an additional event_call dynamically */
93683 diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
93684 index f0a0c98..3692dc8 100644
93685 --- a/kernel/trace/trace_functions_graph.c
93686 +++ b/kernel/trace/trace_functions_graph.c
93687 @@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
93688
93689 /* The return trace stack is full */
93690 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
93691 - atomic_inc(&current->trace_overrun);
93692 + atomic_inc_unchecked(&current->trace_overrun);
93693 return -EBUSY;
93694 }
93695
93696 @@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
93697 *ret = current->ret_stack[index].ret;
93698 trace->func = current->ret_stack[index].func;
93699 trace->calltime = current->ret_stack[index].calltime;
93700 - trace->overrun = atomic_read(&current->trace_overrun);
93701 + trace->overrun = atomic_read_unchecked(&current->trace_overrun);
93702 trace->depth = index;
93703 }
93704
93705 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
93706 index 0abd9b8..6a663a2 100644
93707 --- a/kernel/trace/trace_mmiotrace.c
93708 +++ b/kernel/trace/trace_mmiotrace.c
93709 @@ -24,7 +24,7 @@ struct header_iter {
93710 static struct trace_array *mmio_trace_array;
93711 static bool overrun_detected;
93712 static unsigned long prev_overruns;
93713 -static atomic_t dropped_count;
93714 +static atomic_unchecked_t dropped_count;
93715
93716 static void mmio_reset_data(struct trace_array *tr)
93717 {
93718 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
93719
93720 static unsigned long count_overruns(struct trace_iterator *iter)
93721 {
93722 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
93723 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
93724 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
93725
93726 if (over > prev_overruns)
93727 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
93728 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
93729 sizeof(*entry), 0, pc);
93730 if (!event) {
93731 - atomic_inc(&dropped_count);
93732 + atomic_inc_unchecked(&dropped_count);
93733 return;
93734 }
93735 entry = ring_buffer_event_data(event);
93736 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
93737 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
93738 sizeof(*entry), 0, pc);
93739 if (!event) {
93740 - atomic_inc(&dropped_count);
93741 + atomic_inc_unchecked(&dropped_count);
93742 return;
93743 }
93744 entry = ring_buffer_event_data(event);
93745 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
93746 index c6977d5..d243785 100644
93747 --- a/kernel/trace/trace_output.c
93748 +++ b/kernel/trace/trace_output.c
93749 @@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
93750 goto out;
93751 }
93752
93753 + pax_open_kernel();
93754 if (event->funcs->trace == NULL)
93755 - event->funcs->trace = trace_nop_print;
93756 + *(void **)&event->funcs->trace = trace_nop_print;
93757 if (event->funcs->raw == NULL)
93758 - event->funcs->raw = trace_nop_print;
93759 + *(void **)&event->funcs->raw = trace_nop_print;
93760 if (event->funcs->hex == NULL)
93761 - event->funcs->hex = trace_nop_print;
93762 + *(void **)&event->funcs->hex = trace_nop_print;
93763 if (event->funcs->binary == NULL)
93764 - event->funcs->binary = trace_nop_print;
93765 + *(void **)&event->funcs->binary = trace_nop_print;
93766 + pax_close_kernel();
93767
93768 key = event->type & (EVENT_HASHSIZE - 1);
93769
93770 diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
93771 index 1f24ed9..10407ec 100644
93772 --- a/kernel/trace/trace_seq.c
93773 +++ b/kernel/trace/trace_seq.c
93774 @@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
93775
93776 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
93777 if (!IS_ERR(p)) {
93778 - p = mangle_path(s->buffer + s->len, p, "\n");
93779 + p = mangle_path(s->buffer + s->len, p, "\n\\");
93780 if (p) {
93781 s->len = p - s->buffer;
93782 return 1;
93783 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
93784 index 16eddb3..758b308 100644
93785 --- a/kernel/trace/trace_stack.c
93786 +++ b/kernel/trace/trace_stack.c
93787 @@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
93788 return;
93789
93790 /* we do not handle interrupt stacks yet */
93791 - if (!object_is_on_stack(stack))
93792 + if (!object_starts_on_stack(stack))
93793 return;
93794
93795 local_irq_save(flags);
93796 diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
93797 index 29228c4..301bc8c 100644
93798 --- a/kernel/trace/trace_syscalls.c
93799 +++ b/kernel/trace/trace_syscalls.c
93800 @@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
93801 int num;
93802
93803 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93804 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93805 + return -EINVAL;
93806
93807 mutex_lock(&syscall_trace_lock);
93808 if (!sys_perf_refcount_enter)
93809 @@ -622,6 +624,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
93810 int num;
93811
93812 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93813 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93814 + return;
93815
93816 mutex_lock(&syscall_trace_lock);
93817 sys_perf_refcount_enter--;
93818 @@ -674,6 +678,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
93819 int num;
93820
93821 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93822 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93823 + return -EINVAL;
93824
93825 mutex_lock(&syscall_trace_lock);
93826 if (!sys_perf_refcount_exit)
93827 @@ -694,6 +700,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
93828 int num;
93829
93830 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93831 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93832 + return;
93833
93834 mutex_lock(&syscall_trace_lock);
93835 sys_perf_refcount_exit--;
93836 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
93837 index a2e37c5..4fa859b 100644
93838 --- a/kernel/user_namespace.c
93839 +++ b/kernel/user_namespace.c
93840 @@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
93841 !kgid_has_mapping(parent_ns, group))
93842 return -EPERM;
93843
93844 +#ifdef CONFIG_GRKERNSEC
93845 + /*
93846 + * This doesn't really inspire confidence:
93847 + * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
93848 + * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
93849 + * Increases kernel attack surface in areas developers
93850 + * previously cared little about ("low importance due
93851 + * to requiring "root" capability")
93852 + * To be removed when this code receives *proper* review
93853 + */
93854 + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
93855 + !capable(CAP_SETGID))
93856 + return -EPERM;
93857 +#endif
93858 +
93859 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
93860 if (!ns)
93861 return -ENOMEM;
93862 @@ -974,7 +989,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
93863 if (atomic_read(&current->mm->mm_users) > 1)
93864 return -EINVAL;
93865
93866 - if (current->fs->users != 1)
93867 + if (atomic_read(&current->fs->users) != 1)
93868 return -EINVAL;
93869
93870 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
93871 diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
93872 index c8eac43..4b5f08f 100644
93873 --- a/kernel/utsname_sysctl.c
93874 +++ b/kernel/utsname_sysctl.c
93875 @@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
93876 static int proc_do_uts_string(struct ctl_table *table, int write,
93877 void __user *buffer, size_t *lenp, loff_t *ppos)
93878 {
93879 - struct ctl_table uts_table;
93880 + ctl_table_no_const uts_table;
93881 int r;
93882 memcpy(&uts_table, table, sizeof(uts_table));
93883 uts_table.data = get_uts(table, write);
93884 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
93885 index 70bf118..4be3c37 100644
93886 --- a/kernel/watchdog.c
93887 +++ b/kernel/watchdog.c
93888 @@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
93889 static void watchdog_nmi_disable(unsigned int cpu) { return; }
93890 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
93891
93892 -static struct smp_hotplug_thread watchdog_threads = {
93893 +static struct smp_hotplug_thread watchdog_threads __read_only = {
93894 .store = &softlockup_watchdog,
93895 .thread_should_run = watchdog_should_run,
93896 .thread_fn = watchdog,
93897 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
93898 index 09b685d..d3565e3 100644
93899 --- a/kernel/workqueue.c
93900 +++ b/kernel/workqueue.c
93901 @@ -4508,7 +4508,7 @@ static void rebind_workers(struct worker_pool *pool)
93902 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
93903 worker_flags |= WORKER_REBOUND;
93904 worker_flags &= ~WORKER_UNBOUND;
93905 - ACCESS_ONCE(worker->flags) = worker_flags;
93906 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
93907 }
93908
93909 spin_unlock_irq(&pool->lock);
93910 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
93911 index 4e35a5d..8a1f3f0 100644
93912 --- a/lib/Kconfig.debug
93913 +++ b/lib/Kconfig.debug
93914 @@ -894,7 +894,7 @@ config DEBUG_MUTEXES
93915
93916 config DEBUG_WW_MUTEX_SLOWPATH
93917 bool "Wait/wound mutex debugging: Slowpath testing"
93918 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93919 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93920 select DEBUG_LOCK_ALLOC
93921 select DEBUG_SPINLOCK
93922 select DEBUG_MUTEXES
93923 @@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
93924
93925 config DEBUG_LOCK_ALLOC
93926 bool "Lock debugging: detect incorrect freeing of live locks"
93927 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93928 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93929 select DEBUG_SPINLOCK
93930 select DEBUG_MUTEXES
93931 select LOCKDEP
93932 @@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
93933
93934 config PROVE_LOCKING
93935 bool "Lock debugging: prove locking correctness"
93936 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93937 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93938 select LOCKDEP
93939 select DEBUG_SPINLOCK
93940 select DEBUG_MUTEXES
93941 @@ -976,7 +976,7 @@ config LOCKDEP
93942
93943 config LOCK_STAT
93944 bool "Lock usage statistics"
93945 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93946 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93947 select LOCKDEP
93948 select DEBUG_SPINLOCK
93949 select DEBUG_MUTEXES
93950 @@ -1449,6 +1449,7 @@ config LATENCYTOP
93951 depends on DEBUG_KERNEL
93952 depends on STACKTRACE_SUPPORT
93953 depends on PROC_FS
93954 + depends on !GRKERNSEC_HIDESYM
93955 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
93956 select KALLSYMS
93957 select KALLSYMS_ALL
93958 @@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
93959 config DEBUG_STRICT_USER_COPY_CHECKS
93960 bool "Strict user copy size checks"
93961 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
93962 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
93963 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
93964 help
93965 Enabling this option turns a certain set of sanity checks for user
93966 copy operations into compile time failures.
93967 @@ -1593,7 +1594,7 @@ endmenu # runtime tests
93968
93969 config PROVIDE_OHCI1394_DMA_INIT
93970 bool "Remote debugging over FireWire early on boot"
93971 - depends on PCI && X86
93972 + depends on PCI && X86 && !GRKERNSEC
93973 help
93974 If you want to debug problems which hang or crash the kernel early
93975 on boot and the crashing machine has a FireWire port, you can use
93976 diff --git a/lib/Makefile b/lib/Makefile
93977 index 0211d2b..93f5cc3 100644
93978 --- a/lib/Makefile
93979 +++ b/lib/Makefile
93980 @@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
93981 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
93982 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
93983 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
93984 -obj-$(CONFIG_DEBUG_LIST) += list_debug.o
93985 +obj-y += list_debug.o
93986 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
93987
93988 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
93989 diff --git a/lib/average.c b/lib/average.c
93990 index 114d1be..ab0350c 100644
93991 --- a/lib/average.c
93992 +++ b/lib/average.c
93993 @@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
93994 {
93995 unsigned long internal = ACCESS_ONCE(avg->internal);
93996
93997 - ACCESS_ONCE(avg->internal) = internal ?
93998 + ACCESS_ONCE_RW(avg->internal) = internal ?
93999 (((internal << avg->weight) - internal) +
94000 (val << avg->factor)) >> avg->weight :
94001 (val << avg->factor);
94002 diff --git a/lib/bitmap.c b/lib/bitmap.c
94003 index b499ab6..fbdb76c 100644
94004 --- a/lib/bitmap.c
94005 +++ b/lib/bitmap.c
94006 @@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
94007 {
94008 int c, old_c, totaldigits, ndigits, nchunks, nbits;
94009 u32 chunk;
94010 - const char __user __force *ubuf = (const char __user __force *)buf;
94011 + const char __user *ubuf = (const char __force_user *)buf;
94012
94013 bitmap_zero(maskp, nmaskbits);
94014
94015 @@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
94016 {
94017 if (!access_ok(VERIFY_READ, ubuf, ulen))
94018 return -EFAULT;
94019 - return __bitmap_parse((const char __force *)ubuf,
94020 + return __bitmap_parse((const char __force_kernel *)ubuf,
94021 ulen, 1, maskp, nmaskbits);
94022
94023 }
94024 @@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
94025 {
94026 unsigned a, b;
94027 int c, old_c, totaldigits;
94028 - const char __user __force *ubuf = (const char __user __force *)buf;
94029 + const char __user *ubuf = (const char __force_user *)buf;
94030 int exp_digit, in_range;
94031
94032 totaldigits = c = 0;
94033 @@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
94034 {
94035 if (!access_ok(VERIFY_READ, ubuf, ulen))
94036 return -EFAULT;
94037 - return __bitmap_parselist((const char __force *)ubuf,
94038 + return __bitmap_parselist((const char __force_kernel *)ubuf,
94039 ulen, 1, maskp, nmaskbits);
94040 }
94041 EXPORT_SYMBOL(bitmap_parselist_user);
94042 diff --git a/lib/bug.c b/lib/bug.c
94043 index d1d7c78..b354235 100644
94044 --- a/lib/bug.c
94045 +++ b/lib/bug.c
94046 @@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
94047 return BUG_TRAP_TYPE_NONE;
94048
94049 bug = find_bug(bugaddr);
94050 + if (!bug)
94051 + return BUG_TRAP_TYPE_NONE;
94052
94053 file = NULL;
94054 line = 0;
94055 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
94056 index 547f7f9..a6d4ba0 100644
94057 --- a/lib/debugobjects.c
94058 +++ b/lib/debugobjects.c
94059 @@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
94060 if (limit > 4)
94061 return;
94062
94063 - is_on_stack = object_is_on_stack(addr);
94064 + is_on_stack = object_starts_on_stack(addr);
94065 if (is_on_stack == onstack)
94066 return;
94067
94068 diff --git a/lib/div64.c b/lib/div64.c
94069 index 4382ad7..08aa558 100644
94070 --- a/lib/div64.c
94071 +++ b/lib/div64.c
94072 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
94073 EXPORT_SYMBOL(__div64_32);
94074
94075 #ifndef div_s64_rem
94076 -s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94077 +s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94078 {
94079 u64 quotient;
94080
94081 @@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
94082 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
94083 */
94084 #ifndef div64_u64
94085 -u64 div64_u64(u64 dividend, u64 divisor)
94086 +u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
94087 {
94088 u32 high = divisor >> 32;
94089 u64 quot;
94090 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
94091 index add80cc..0d27550 100644
94092 --- a/lib/dma-debug.c
94093 +++ b/lib/dma-debug.c
94094 @@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
94095
94096 void dma_debug_add_bus(struct bus_type *bus)
94097 {
94098 - struct notifier_block *nb;
94099 + notifier_block_no_const *nb;
94100
94101 if (global_disable)
94102 return;
94103 @@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
94104
94105 static void check_for_stack(struct device *dev, void *addr)
94106 {
94107 - if (object_is_on_stack(addr))
94108 + if (object_starts_on_stack(addr))
94109 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
94110 "stack [addr=%p]\n", addr);
94111 }
94112 diff --git a/lib/hash.c b/lib/hash.c
94113 index fea973f..386626f 100644
94114 --- a/lib/hash.c
94115 +++ b/lib/hash.c
94116 @@ -14,7 +14,7 @@
94117 #include <linux/hash.h>
94118 #include <linux/cache.h>
94119
94120 -static struct fast_hash_ops arch_hash_ops __read_mostly = {
94121 +static struct fast_hash_ops arch_hash_ops __read_only = {
94122 .hash = jhash,
94123 .hash2 = jhash2,
94124 };
94125 diff --git a/lib/inflate.c b/lib/inflate.c
94126 index 013a761..c28f3fc 100644
94127 --- a/lib/inflate.c
94128 +++ b/lib/inflate.c
94129 @@ -269,7 +269,7 @@ static void free(void *where)
94130 malloc_ptr = free_mem_ptr;
94131 }
94132 #else
94133 -#define malloc(a) kmalloc(a, GFP_KERNEL)
94134 +#define malloc(a) kmalloc((a), GFP_KERNEL)
94135 #define free(a) kfree(a)
94136 #endif
94137
94138 diff --git a/lib/ioremap.c b/lib/ioremap.c
94139 index 0c9216c..863bd89 100644
94140 --- a/lib/ioremap.c
94141 +++ b/lib/ioremap.c
94142 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
94143 unsigned long next;
94144
94145 phys_addr -= addr;
94146 - pmd = pmd_alloc(&init_mm, pud, addr);
94147 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
94148 if (!pmd)
94149 return -ENOMEM;
94150 do {
94151 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
94152 unsigned long next;
94153
94154 phys_addr -= addr;
94155 - pud = pud_alloc(&init_mm, pgd, addr);
94156 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
94157 if (!pud)
94158 return -ENOMEM;
94159 do {
94160 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
94161 index bd2bea9..6b3c95e 100644
94162 --- a/lib/is_single_threaded.c
94163 +++ b/lib/is_single_threaded.c
94164 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
94165 struct task_struct *p, *t;
94166 bool ret;
94167
94168 + if (!mm)
94169 + return true;
94170 +
94171 if (atomic_read(&task->signal->live) != 1)
94172 return false;
94173
94174 diff --git a/lib/kobject.c b/lib/kobject.c
94175 index 58751bb..93a1853 100644
94176 --- a/lib/kobject.c
94177 +++ b/lib/kobject.c
94178 @@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
94179
94180
94181 static DEFINE_SPINLOCK(kobj_ns_type_lock);
94182 -static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
94183 +static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
94184
94185 -int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94186 +int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94187 {
94188 enum kobj_ns_type type = ops->type;
94189 int error;
94190 diff --git a/lib/list_debug.c b/lib/list_debug.c
94191 index c24c2f7..f0296f4 100644
94192 --- a/lib/list_debug.c
94193 +++ b/lib/list_debug.c
94194 @@ -11,7 +11,9 @@
94195 #include <linux/bug.h>
94196 #include <linux/kernel.h>
94197 #include <linux/rculist.h>
94198 +#include <linux/mm.h>
94199
94200 +#ifdef CONFIG_DEBUG_LIST
94201 /*
94202 * Insert a new entry between two known consecutive entries.
94203 *
94204 @@ -19,21 +21,40 @@
94205 * the prev/next entries already!
94206 */
94207
94208 +static bool __list_add_debug(struct list_head *new,
94209 + struct list_head *prev,
94210 + struct list_head *next)
94211 +{
94212 + if (unlikely(next->prev != prev)) {
94213 + printk(KERN_ERR "list_add corruption. next->prev should be "
94214 + "prev (%p), but was %p. (next=%p).\n",
94215 + prev, next->prev, next);
94216 + BUG();
94217 + return false;
94218 + }
94219 + if (unlikely(prev->next != next)) {
94220 + printk(KERN_ERR "list_add corruption. prev->next should be "
94221 + "next (%p), but was %p. (prev=%p).\n",
94222 + next, prev->next, prev);
94223 + BUG();
94224 + return false;
94225 + }
94226 + if (unlikely(new == prev || new == next)) {
94227 + printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
94228 + new, prev, next);
94229 + BUG();
94230 + return false;
94231 + }
94232 + return true;
94233 +}
94234 +
94235 void __list_add(struct list_head *new,
94236 - struct list_head *prev,
94237 - struct list_head *next)
94238 + struct list_head *prev,
94239 + struct list_head *next)
94240 {
94241 - WARN(next->prev != prev,
94242 - "list_add corruption. next->prev should be "
94243 - "prev (%p), but was %p. (next=%p).\n",
94244 - prev, next->prev, next);
94245 - WARN(prev->next != next,
94246 - "list_add corruption. prev->next should be "
94247 - "next (%p), but was %p. (prev=%p).\n",
94248 - next, prev->next, prev);
94249 - WARN(new == prev || new == next,
94250 - "list_add double add: new=%p, prev=%p, next=%p.\n",
94251 - new, prev, next);
94252 + if (!__list_add_debug(new, prev, next))
94253 + return;
94254 +
94255 next->prev = new;
94256 new->next = next;
94257 new->prev = prev;
94258 @@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
94259 }
94260 EXPORT_SYMBOL(__list_add);
94261
94262 -void __list_del_entry(struct list_head *entry)
94263 +static bool __list_del_entry_debug(struct list_head *entry)
94264 {
94265 struct list_head *prev, *next;
94266
94267 prev = entry->prev;
94268 next = entry->next;
94269
94270 - if (WARN(next == LIST_POISON1,
94271 - "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94272 - entry, LIST_POISON1) ||
94273 - WARN(prev == LIST_POISON2,
94274 - "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94275 - entry, LIST_POISON2) ||
94276 - WARN(prev->next != entry,
94277 - "list_del corruption. prev->next should be %p, "
94278 - "but was %p\n", entry, prev->next) ||
94279 - WARN(next->prev != entry,
94280 - "list_del corruption. next->prev should be %p, "
94281 - "but was %p\n", entry, next->prev))
94282 + if (unlikely(next == LIST_POISON1)) {
94283 + printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94284 + entry, LIST_POISON1);
94285 + BUG();
94286 + return false;
94287 + }
94288 + if (unlikely(prev == LIST_POISON2)) {
94289 + printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94290 + entry, LIST_POISON2);
94291 + BUG();
94292 + return false;
94293 + }
94294 + if (unlikely(entry->prev->next != entry)) {
94295 + printk(KERN_ERR "list_del corruption. prev->next should be %p, "
94296 + "but was %p\n", entry, prev->next);
94297 + BUG();
94298 + return false;
94299 + }
94300 + if (unlikely(entry->next->prev != entry)) {
94301 + printk(KERN_ERR "list_del corruption. next->prev should be %p, "
94302 + "but was %p\n", entry, next->prev);
94303 + BUG();
94304 + return false;
94305 + }
94306 + return true;
94307 +}
94308 +
94309 +void __list_del_entry(struct list_head *entry)
94310 +{
94311 + if (!__list_del_entry_debug(entry))
94312 return;
94313
94314 - __list_del(prev, next);
94315 + __list_del(entry->prev, entry->next);
94316 }
94317 EXPORT_SYMBOL(__list_del_entry);
94318
94319 @@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
94320 void __list_add_rcu(struct list_head *new,
94321 struct list_head *prev, struct list_head *next)
94322 {
94323 - WARN(next->prev != prev,
94324 - "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
94325 - prev, next->prev, next);
94326 - WARN(prev->next != next,
94327 - "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
94328 - next, prev->next, prev);
94329 + if (!__list_add_debug(new, prev, next))
94330 + return;
94331 +
94332 new->next = next;
94333 new->prev = prev;
94334 rcu_assign_pointer(list_next_rcu(prev), new);
94335 next->prev = new;
94336 }
94337 EXPORT_SYMBOL(__list_add_rcu);
94338 +#endif
94339 +
94340 +void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
94341 +{
94342 +#ifdef CONFIG_DEBUG_LIST
94343 + if (!__list_add_debug(new, prev, next))
94344 + return;
94345 +#endif
94346 +
94347 + pax_open_kernel();
94348 + next->prev = new;
94349 + new->next = next;
94350 + new->prev = prev;
94351 + prev->next = new;
94352 + pax_close_kernel();
94353 +}
94354 +EXPORT_SYMBOL(__pax_list_add);
94355 +
94356 +void pax_list_del(struct list_head *entry)
94357 +{
94358 +#ifdef CONFIG_DEBUG_LIST
94359 + if (!__list_del_entry_debug(entry))
94360 + return;
94361 +#endif
94362 +
94363 + pax_open_kernel();
94364 + __list_del(entry->prev, entry->next);
94365 + entry->next = LIST_POISON1;
94366 + entry->prev = LIST_POISON2;
94367 + pax_close_kernel();
94368 +}
94369 +EXPORT_SYMBOL(pax_list_del);
94370 +
94371 +void pax_list_del_init(struct list_head *entry)
94372 +{
94373 + pax_open_kernel();
94374 + __list_del(entry->prev, entry->next);
94375 + INIT_LIST_HEAD(entry);
94376 + pax_close_kernel();
94377 +}
94378 +EXPORT_SYMBOL(pax_list_del_init);
94379 +
94380 +void __pax_list_add_rcu(struct list_head *new,
94381 + struct list_head *prev, struct list_head *next)
94382 +{
94383 +#ifdef CONFIG_DEBUG_LIST
94384 + if (!__list_add_debug(new, prev, next))
94385 + return;
94386 +#endif
94387 +
94388 + pax_open_kernel();
94389 + new->next = next;
94390 + new->prev = prev;
94391 + rcu_assign_pointer(list_next_rcu(prev), new);
94392 + next->prev = new;
94393 + pax_close_kernel();
94394 +}
94395 +EXPORT_SYMBOL(__pax_list_add_rcu);
94396 +
94397 +void pax_list_del_rcu(struct list_head *entry)
94398 +{
94399 +#ifdef CONFIG_DEBUG_LIST
94400 + if (!__list_del_entry_debug(entry))
94401 + return;
94402 +#endif
94403 +
94404 + pax_open_kernel();
94405 + __list_del(entry->prev, entry->next);
94406 + entry->next = LIST_POISON1;
94407 + entry->prev = LIST_POISON2;
94408 + pax_close_kernel();
94409 +}
94410 +EXPORT_SYMBOL(pax_list_del_rcu);
94411 diff --git a/lib/lockref.c b/lib/lockref.c
94412 index d2233de..fa1a2f6 100644
94413 --- a/lib/lockref.c
94414 +++ b/lib/lockref.c
94415 @@ -48,13 +48,13 @@
94416 void lockref_get(struct lockref *lockref)
94417 {
94418 CMPXCHG_LOOP(
94419 - new.count++;
94420 + __lockref_inc(&new);
94421 ,
94422 return;
94423 );
94424
94425 spin_lock(&lockref->lock);
94426 - lockref->count++;
94427 + __lockref_inc(lockref);
94428 spin_unlock(&lockref->lock);
94429 }
94430 EXPORT_SYMBOL(lockref_get);
94431 @@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94432 int retval;
94433
94434 CMPXCHG_LOOP(
94435 - new.count++;
94436 + __lockref_inc(&new);
94437 if (!old.count)
94438 return 0;
94439 ,
94440 @@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94441 spin_lock(&lockref->lock);
94442 retval = 0;
94443 if (lockref->count) {
94444 - lockref->count++;
94445 + __lockref_inc(lockref);
94446 retval = 1;
94447 }
94448 spin_unlock(&lockref->lock);
94449 @@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
94450 int lockref_get_or_lock(struct lockref *lockref)
94451 {
94452 CMPXCHG_LOOP(
94453 - new.count++;
94454 + __lockref_inc(&new);
94455 if (!old.count)
94456 break;
94457 ,
94458 @@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
94459 spin_lock(&lockref->lock);
94460 if (!lockref->count)
94461 return 0;
94462 - lockref->count++;
94463 + __lockref_inc(lockref);
94464 spin_unlock(&lockref->lock);
94465 return 1;
94466 }
94467 @@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
94468 int lockref_put_or_lock(struct lockref *lockref)
94469 {
94470 CMPXCHG_LOOP(
94471 - new.count--;
94472 + __lockref_dec(&new);
94473 if (old.count <= 1)
94474 break;
94475 ,
94476 @@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
94477 spin_lock(&lockref->lock);
94478 if (lockref->count <= 1)
94479 return 0;
94480 - lockref->count--;
94481 + __lockref_dec(lockref);
94482 spin_unlock(&lockref->lock);
94483 return 1;
94484 }
94485 @@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94486 int retval;
94487
94488 CMPXCHG_LOOP(
94489 - new.count++;
94490 + __lockref_inc(&new);
94491 if ((int)old.count < 0)
94492 return 0;
94493 ,
94494 @@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94495 spin_lock(&lockref->lock);
94496 retval = 0;
94497 if ((int) lockref->count >= 0) {
94498 - lockref->count++;
94499 + __lockref_inc(lockref);
94500 retval = 1;
94501 }
94502 spin_unlock(&lockref->lock);
94503 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
94504 index 6111bcb..02e816b 100644
94505 --- a/lib/percpu-refcount.c
94506 +++ b/lib/percpu-refcount.c
94507 @@ -31,7 +31,7 @@
94508 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
94509 */
94510
94511 -#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
94512 +#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
94513
94514 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
94515
94516 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
94517 index 3291a8e..346a91e 100644
94518 --- a/lib/radix-tree.c
94519 +++ b/lib/radix-tree.c
94520 @@ -67,7 +67,7 @@ struct radix_tree_preload {
94521 int nr;
94522 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
94523 };
94524 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
94525 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
94526
94527 static inline void *ptr_to_indirect(void *ptr)
94528 {
94529 diff --git a/lib/random32.c b/lib/random32.c
94530 index 0bee183..526f12f 100644
94531 --- a/lib/random32.c
94532 +++ b/lib/random32.c
94533 @@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
94534 }
94535 #endif
94536
94537 -static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
94538 +static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
94539
94540 /**
94541 * prandom_u32_state - seeded pseudo-random number generator.
94542 diff --git a/lib/rbtree.c b/lib/rbtree.c
94543 index c16c81a..4dcbda1 100644
94544 --- a/lib/rbtree.c
94545 +++ b/lib/rbtree.c
94546 @@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
94547 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
94548
94549 static const struct rb_augment_callbacks dummy_callbacks = {
94550 - dummy_propagate, dummy_copy, dummy_rotate
94551 + .propagate = dummy_propagate,
94552 + .copy = dummy_copy,
94553 + .rotate = dummy_rotate
94554 };
94555
94556 void rb_insert_color(struct rb_node *node, struct rb_root *root)
94557 diff --git a/lib/show_mem.c b/lib/show_mem.c
94558 index 5e25627..3ed9d7f 100644
94559 --- a/lib/show_mem.c
94560 +++ b/lib/show_mem.c
94561 @@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
94562 quicklist_total_size());
94563 #endif
94564 #ifdef CONFIG_MEMORY_FAILURE
94565 - printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
94566 + printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
94567 #endif
94568 }
94569 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
94570 index bb2b201..46abaf9 100644
94571 --- a/lib/strncpy_from_user.c
94572 +++ b/lib/strncpy_from_user.c
94573 @@ -21,7 +21,7 @@
94574 */
94575 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
94576 {
94577 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94578 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94579 long res = 0;
94580
94581 /*
94582 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
94583 index a28df52..3d55877 100644
94584 --- a/lib/strnlen_user.c
94585 +++ b/lib/strnlen_user.c
94586 @@ -26,7 +26,7 @@
94587 */
94588 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
94589 {
94590 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94591 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94592 long align, res = 0;
94593 unsigned long c;
94594
94595 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
94596 index 4abda07..b9d3765 100644
94597 --- a/lib/swiotlb.c
94598 +++ b/lib/swiotlb.c
94599 @@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
94600
94601 void
94602 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
94603 - dma_addr_t dev_addr)
94604 + dma_addr_t dev_addr, struct dma_attrs *attrs)
94605 {
94606 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
94607
94608 diff --git a/lib/usercopy.c b/lib/usercopy.c
94609 index 4f5b1dd..7cab418 100644
94610 --- a/lib/usercopy.c
94611 +++ b/lib/usercopy.c
94612 @@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
94613 WARN(1, "Buffer overflow detected!\n");
94614 }
94615 EXPORT_SYMBOL(copy_from_user_overflow);
94616 +
94617 +void copy_to_user_overflow(void)
94618 +{
94619 + WARN(1, "Buffer overflow detected!\n");
94620 +}
94621 +EXPORT_SYMBOL(copy_to_user_overflow);
94622 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
94623 index ec337f6..8484eb2 100644
94624 --- a/lib/vsprintf.c
94625 +++ b/lib/vsprintf.c
94626 @@ -16,6 +16,9 @@
94627 * - scnprintf and vscnprintf
94628 */
94629
94630 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94631 +#define __INCLUDED_BY_HIDESYM 1
94632 +#endif
94633 #include <stdarg.h>
94634 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
94635 #include <linux/types.h>
94636 @@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
94637 #ifdef CONFIG_KALLSYMS
94638 if (*fmt == 'B')
94639 sprint_backtrace(sym, value);
94640 - else if (*fmt != 'f' && *fmt != 's')
94641 + else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
94642 sprint_symbol(sym, value);
94643 else
94644 sprint_symbol_no_offset(sym, value);
94645 @@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
94646 return number(buf, end, num, spec);
94647 }
94648
94649 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94650 +int kptr_restrict __read_mostly = 2;
94651 +#else
94652 int kptr_restrict __read_mostly;
94653 +#endif
94654
94655 /*
94656 * Show a '%p' thing. A kernel extension is that the '%p' is followed
94657 @@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
94658 *
94659 * - 'F' For symbolic function descriptor pointers with offset
94660 * - 'f' For simple symbolic function names without offset
94661 + * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
94662 * - 'S' For symbolic direct pointers with offset
94663 * - 's' For symbolic direct pointers without offset
94664 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
94665 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
94666 * - 'B' For backtraced symbolic direct pointers with offset
94667 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
94668 @@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94669
94670 if (!ptr && *fmt != 'K') {
94671 /*
94672 - * Print (null) with the same width as a pointer so it makes
94673 + * Print (nil) with the same width as a pointer so it makes
94674 * tabular output look nice.
94675 */
94676 if (spec.field_width == -1)
94677 spec.field_width = default_width;
94678 - return string(buf, end, "(null)", spec);
94679 + return string(buf, end, "(nil)", spec);
94680 }
94681
94682 switch (*fmt) {
94683 @@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94684 /* Fallthrough */
94685 case 'S':
94686 case 's':
94687 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94688 + break;
94689 +#else
94690 + return symbol_string(buf, end, ptr, spec, fmt);
94691 +#endif
94692 + case 'X':
94693 + ptr = dereference_function_descriptor(ptr);
94694 + case 'A':
94695 case 'B':
94696 return symbol_string(buf, end, ptr, spec, fmt);
94697 case 'R':
94698 @@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94699 va_end(va);
94700 return buf;
94701 }
94702 + case 'P':
94703 + break;
94704 case 'K':
94705 /*
94706 * %pK cannot be used in IRQ context because its test
94707 @@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94708 ((const struct file *)ptr)->f_path.dentry,
94709 spec, fmt);
94710 }
94711 +
94712 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94713 + /* 'P' = approved pointers to copy to userland,
94714 + as in the /proc/kallsyms case, as we make it display nothing
94715 + for non-root users, and the real contents for root users
94716 + 'X' = approved simple symbols
94717 + Also ignore 'K' pointers, since we force their NULLing for non-root users
94718 + above
94719 + */
94720 + if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
94721 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
94722 + dump_stack();
94723 + ptr = NULL;
94724 + }
94725 +#endif
94726 +
94727 spec.flags |= SMALL;
94728 if (spec.field_width == -1) {
94729 spec.field_width = default_width;
94730 @@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94731 typeof(type) value; \
94732 if (sizeof(type) == 8) { \
94733 args = PTR_ALIGN(args, sizeof(u32)); \
94734 - *(u32 *)&value = *(u32 *)args; \
94735 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
94736 + *(u32 *)&value = *(const u32 *)args; \
94737 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
94738 } else { \
94739 args = PTR_ALIGN(args, sizeof(type)); \
94740 - value = *(typeof(type) *)args; \
94741 + value = *(const typeof(type) *)args; \
94742 } \
94743 args += sizeof(type); \
94744 value; \
94745 @@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94746 case FORMAT_TYPE_STR: {
94747 const char *str_arg = args;
94748 args += strlen(str_arg) + 1;
94749 - str = string(str, end, (char *)str_arg, spec);
94750 + str = string(str, end, str_arg, spec);
94751 break;
94752 }
94753
94754 diff --git a/localversion-grsec b/localversion-grsec
94755 new file mode 100644
94756 index 0000000..7cd6065
94757 --- /dev/null
94758 +++ b/localversion-grsec
94759 @@ -0,0 +1 @@
94760 +-grsec
94761 diff --git a/mm/Kconfig b/mm/Kconfig
94762 index 1d1ae6b..0f05885 100644
94763 --- a/mm/Kconfig
94764 +++ b/mm/Kconfig
94765 @@ -341,10 +341,11 @@ config KSM
94766 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
94767
94768 config DEFAULT_MMAP_MIN_ADDR
94769 - int "Low address space to protect from user allocation"
94770 + int "Low address space to protect from user allocation"
94771 depends on MMU
94772 - default 4096
94773 - help
94774 + default 32768 if ALPHA || ARM || PARISC || SPARC32
94775 + default 65536
94776 + help
94777 This is the portion of low virtual memory which should be protected
94778 from userspace allocation. Keeping a user from writing to low pages
94779 can help reduce the impact of kernel NULL pointer bugs.
94780 @@ -375,7 +376,7 @@ config MEMORY_FAILURE
94781
94782 config HWPOISON_INJECT
94783 tristate "HWPoison pages injector"
94784 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
94785 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
94786 select PROC_PAGE_MONITOR
94787
94788 config NOMMU_INITIAL_TRIM_EXCESS
94789 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
94790 index 0ae0df5..82ac56b 100644
94791 --- a/mm/backing-dev.c
94792 +++ b/mm/backing-dev.c
94793 @@ -12,7 +12,7 @@
94794 #include <linux/device.h>
94795 #include <trace/events/writeback.h>
94796
94797 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
94798 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
94799
94800 struct backing_dev_info default_backing_dev_info = {
94801 .name = "default",
94802 @@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
94803 return err;
94804
94805 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
94806 - atomic_long_inc_return(&bdi_seq));
94807 + atomic_long_inc_return_unchecked(&bdi_seq));
94808 if (err) {
94809 bdi_destroy(bdi);
94810 return err;
94811 diff --git a/mm/filemap.c b/mm/filemap.c
94812 index 14b4642..d71ba82 100644
94813 --- a/mm/filemap.c
94814 +++ b/mm/filemap.c
94815 @@ -2101,7 +2101,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
94816 struct address_space *mapping = file->f_mapping;
94817
94818 if (!mapping->a_ops->readpage)
94819 - return -ENOEXEC;
94820 + return -ENODEV;
94821 file_accessed(file);
94822 vma->vm_ops = &generic_file_vm_ops;
94823 return 0;
94824 @@ -2279,6 +2279,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
94825 *pos = i_size_read(inode);
94826
94827 if (limit != RLIM_INFINITY) {
94828 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
94829 if (*pos >= limit) {
94830 send_sig(SIGXFSZ, current, 0);
94831 return -EFBIG;
94832 diff --git a/mm/fremap.c b/mm/fremap.c
94833 index 72b8fa3..c5b39f1 100644
94834 --- a/mm/fremap.c
94835 +++ b/mm/fremap.c
94836 @@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
94837 retry:
94838 vma = find_vma(mm, start);
94839
94840 +#ifdef CONFIG_PAX_SEGMEXEC
94841 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
94842 + goto out;
94843 +#endif
94844 +
94845 /*
94846 * Make sure the vma is shared, that it supports prefaulting,
94847 * and that the remapped range is valid and fully within
94848 diff --git a/mm/gup.c b/mm/gup.c
94849 index cd62c8c..3bb2053 100644
94850 --- a/mm/gup.c
94851 +++ b/mm/gup.c
94852 @@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
94853 unsigned int fault_flags = 0;
94854 int ret;
94855
94856 - /* For mlock, just skip the stack guard page. */
94857 - if ((*flags & FOLL_MLOCK) &&
94858 - (stack_guard_page_start(vma, address) ||
94859 - stack_guard_page_end(vma, address + PAGE_SIZE)))
94860 - return -ENOENT;
94861 if (*flags & FOLL_WRITE)
94862 fault_flags |= FAULT_FLAG_WRITE;
94863 if (nonblocking)
94864 @@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94865 if (!(gup_flags & FOLL_FORCE))
94866 gup_flags |= FOLL_NUMA;
94867
94868 - do {
94869 + while (nr_pages) {
94870 struct page *page;
94871 unsigned int foll_flags = gup_flags;
94872 unsigned int page_increm;
94873
94874 /* first iteration or cross vma bound */
94875 if (!vma || start >= vma->vm_end) {
94876 - vma = find_extend_vma(mm, start);
94877 + vma = find_vma(mm, start);
94878 if (!vma && in_gate_area(mm, start)) {
94879 int ret;
94880 ret = get_gate_page(mm, start & PAGE_MASK,
94881 @@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94882 goto next_page;
94883 }
94884
94885 - if (!vma || check_vma_flags(vma, gup_flags))
94886 + if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
94887 return i ? : -EFAULT;
94888 if (is_vm_hugetlb_page(vma)) {
94889 i = follow_hugetlb_page(mm, vma, pages, vmas,
94890 @@ -518,7 +513,7 @@ next_page:
94891 i += page_increm;
94892 start += page_increm * PAGE_SIZE;
94893 nr_pages -= page_increm;
94894 - } while (nr_pages);
94895 + }
94896 return i;
94897 }
94898 EXPORT_SYMBOL(__get_user_pages);
94899 diff --git a/mm/highmem.c b/mm/highmem.c
94900 index 123bcd3..0de52ba 100644
94901 --- a/mm/highmem.c
94902 +++ b/mm/highmem.c
94903 @@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
94904 * So no dangers, even with speculative execution.
94905 */
94906 page = pte_page(pkmap_page_table[i]);
94907 + pax_open_kernel();
94908 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
94909 -
94910 + pax_close_kernel();
94911 set_page_address(page, NULL);
94912 need_flush = 1;
94913 }
94914 @@ -259,9 +260,11 @@ start:
94915 }
94916 }
94917 vaddr = PKMAP_ADDR(last_pkmap_nr);
94918 +
94919 + pax_open_kernel();
94920 set_pte_at(&init_mm, vaddr,
94921 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
94922 -
94923 + pax_close_kernel();
94924 pkmap_count[last_pkmap_nr] = 1;
94925 set_page_address(page, (void *)vaddr);
94926
94927 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
94928 index 9fd7227..5628939 100644
94929 --- a/mm/hugetlb.c
94930 +++ b/mm/hugetlb.c
94931 @@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
94932 struct ctl_table *table, int write,
94933 void __user *buffer, size_t *length, loff_t *ppos)
94934 {
94935 + ctl_table_no_const t;
94936 struct hstate *h = &default_hstate;
94937 unsigned long tmp = h->max_huge_pages;
94938 int ret;
94939 @@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
94940 if (!hugepages_supported())
94941 return -ENOTSUPP;
94942
94943 - table->data = &tmp;
94944 - table->maxlen = sizeof(unsigned long);
94945 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
94946 + t = *table;
94947 + t.data = &tmp;
94948 + t.maxlen = sizeof(unsigned long);
94949 + ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
94950 if (ret)
94951 goto out;
94952
94953 @@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
94954 struct hstate *h = &default_hstate;
94955 unsigned long tmp;
94956 int ret;
94957 + ctl_table_no_const hugetlb_table;
94958
94959 if (!hugepages_supported())
94960 return -ENOTSUPP;
94961 @@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
94962 if (write && hstate_is_gigantic(h))
94963 return -EINVAL;
94964
94965 - table->data = &tmp;
94966 - table->maxlen = sizeof(unsigned long);
94967 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
94968 + hugetlb_table = *table;
94969 + hugetlb_table.data = &tmp;
94970 + hugetlb_table.maxlen = sizeof(unsigned long);
94971 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
94972 if (ret)
94973 goto out;
94974
94975 @@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
94976 mutex_unlock(&mapping->i_mmap_mutex);
94977 }
94978
94979 +#ifdef CONFIG_PAX_SEGMEXEC
94980 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
94981 +{
94982 + struct mm_struct *mm = vma->vm_mm;
94983 + struct vm_area_struct *vma_m;
94984 + unsigned long address_m;
94985 + pte_t *ptep_m;
94986 +
94987 + vma_m = pax_find_mirror_vma(vma);
94988 + if (!vma_m)
94989 + return;
94990 +
94991 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
94992 + address_m = address + SEGMEXEC_TASK_SIZE;
94993 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
94994 + get_page(page_m);
94995 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
94996 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
94997 +}
94998 +#endif
94999 +
95000 /*
95001 * Hugetlb_cow() should be called with page lock of the original hugepage held.
95002 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
95003 @@ -2903,6 +2928,11 @@ retry_avoidcopy:
95004 make_huge_pte(vma, new_page, 1));
95005 page_remove_rmap(old_page);
95006 hugepage_add_new_anon_rmap(new_page, vma, address);
95007 +
95008 +#ifdef CONFIG_PAX_SEGMEXEC
95009 + pax_mirror_huge_pte(vma, address, new_page);
95010 +#endif
95011 +
95012 /* Make the old page be freed below */
95013 new_page = old_page;
95014 }
95015 @@ -3063,6 +3093,10 @@ retry:
95016 && (vma->vm_flags & VM_SHARED)));
95017 set_huge_pte_at(mm, address, ptep, new_pte);
95018
95019 +#ifdef CONFIG_PAX_SEGMEXEC
95020 + pax_mirror_huge_pte(vma, address, page);
95021 +#endif
95022 +
95023 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
95024 /* Optimization, do the COW without a second fault */
95025 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
95026 @@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95027 struct hstate *h = hstate_vma(vma);
95028 struct address_space *mapping;
95029
95030 +#ifdef CONFIG_PAX_SEGMEXEC
95031 + struct vm_area_struct *vma_m;
95032 +#endif
95033 +
95034 address &= huge_page_mask(h);
95035
95036 ptep = huge_pte_offset(mm, address);
95037 @@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95038 VM_FAULT_SET_HINDEX(hstate_index(h));
95039 }
95040
95041 +#ifdef CONFIG_PAX_SEGMEXEC
95042 + vma_m = pax_find_mirror_vma(vma);
95043 + if (vma_m) {
95044 + unsigned long address_m;
95045 +
95046 + if (vma->vm_start > vma_m->vm_start) {
95047 + address_m = address;
95048 + address -= SEGMEXEC_TASK_SIZE;
95049 + vma = vma_m;
95050 + h = hstate_vma(vma);
95051 + } else
95052 + address_m = address + SEGMEXEC_TASK_SIZE;
95053 +
95054 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
95055 + return VM_FAULT_OOM;
95056 + address_m &= HPAGE_MASK;
95057 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
95058 + }
95059 +#endif
95060 +
95061 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
95062 if (!ptep)
95063 return VM_FAULT_OOM;
95064 diff --git a/mm/internal.h b/mm/internal.h
95065 index a4f90ba..fbdc32b 100644
95066 --- a/mm/internal.h
95067 +++ b/mm/internal.h
95068 @@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
95069
95070 extern int __isolate_free_page(struct page *page, unsigned int order);
95071 extern void __free_pages_bootmem(struct page *page, unsigned int order);
95072 +extern void free_compound_page(struct page *page);
95073 extern void prep_compound_page(struct page *page, unsigned long order);
95074 #ifdef CONFIG_MEMORY_FAILURE
95075 extern bool is_free_buddy_page(struct page *page);
95076 @@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
95077
95078 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
95079 unsigned long, unsigned long,
95080 - unsigned long, unsigned long);
95081 + unsigned long, unsigned long) __intentional_overflow(-1);
95082
95083 extern void set_pageblock_order(void);
95084 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
95085 diff --git a/mm/iov_iter.c b/mm/iov_iter.c
95086 index e34a3cb..a810efe 100644
95087 --- a/mm/iov_iter.c
95088 +++ b/mm/iov_iter.c
95089 @@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
95090
95091 while (bytes) {
95092 char __user *buf = iov->iov_base + base;
95093 - int copy = min(bytes, iov->iov_len - base);
95094 + size_t copy = min(bytes, iov->iov_len - base);
95095
95096 base = 0;
95097 left = __copy_from_user_inatomic(vaddr, buf, copy);
95098 @@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
95099
95100 kaddr = kmap_atomic(page);
95101 if (likely(i->nr_segs == 1)) {
95102 - int left;
95103 + size_t left;
95104 char __user *buf = i->iov->iov_base + i->iov_offset;
95105 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
95106 copied = bytes - left;
95107 @@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
95108 * zero-length segments (without overruning the iovec).
95109 */
95110 while (bytes || unlikely(i->count && !iov->iov_len)) {
95111 - int copy;
95112 + size_t copy;
95113
95114 copy = min(bytes, iov->iov_len - base);
95115 BUG_ON(!i->count || i->count < copy);
95116 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
95117 index 3cda50c..032ba634 100644
95118 --- a/mm/kmemleak.c
95119 +++ b/mm/kmemleak.c
95120 @@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
95121
95122 for (i = 0; i < object->trace_len; i++) {
95123 void *ptr = (void *)object->trace[i];
95124 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
95125 + seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
95126 }
95127 }
95128
95129 @@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
95130 return -ENOMEM;
95131 }
95132
95133 - dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
95134 + dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
95135 &kmemleak_fops);
95136 if (!dentry)
95137 pr_warning("Failed to create the debugfs kmemleak file\n");
95138 diff --git a/mm/maccess.c b/mm/maccess.c
95139 index d53adf9..03a24bf 100644
95140 --- a/mm/maccess.c
95141 +++ b/mm/maccess.c
95142 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
95143 set_fs(KERNEL_DS);
95144 pagefault_disable();
95145 ret = __copy_from_user_inatomic(dst,
95146 - (__force const void __user *)src, size);
95147 + (const void __force_user *)src, size);
95148 pagefault_enable();
95149 set_fs(old_fs);
95150
95151 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
95152
95153 set_fs(KERNEL_DS);
95154 pagefault_disable();
95155 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
95156 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
95157 pagefault_enable();
95158 set_fs(old_fs);
95159
95160 diff --git a/mm/madvise.c b/mm/madvise.c
95161 index 0938b30..199abe8 100644
95162 --- a/mm/madvise.c
95163 +++ b/mm/madvise.c
95164 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
95165 pgoff_t pgoff;
95166 unsigned long new_flags = vma->vm_flags;
95167
95168 +#ifdef CONFIG_PAX_SEGMEXEC
95169 + struct vm_area_struct *vma_m;
95170 +#endif
95171 +
95172 switch (behavior) {
95173 case MADV_NORMAL:
95174 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
95175 @@ -126,6 +130,13 @@ success:
95176 /*
95177 * vm_flags is protected by the mmap_sem held in write mode.
95178 */
95179 +
95180 +#ifdef CONFIG_PAX_SEGMEXEC
95181 + vma_m = pax_find_mirror_vma(vma);
95182 + if (vma_m)
95183 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
95184 +#endif
95185 +
95186 vma->vm_flags = new_flags;
95187
95188 out:
95189 @@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95190 struct vm_area_struct **prev,
95191 unsigned long start, unsigned long end)
95192 {
95193 +
95194 +#ifdef CONFIG_PAX_SEGMEXEC
95195 + struct vm_area_struct *vma_m;
95196 +#endif
95197 +
95198 *prev = vma;
95199 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
95200 return -EINVAL;
95201 @@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95202 zap_page_range(vma, start, end - start, &details);
95203 } else
95204 zap_page_range(vma, start, end - start, NULL);
95205 +
95206 +#ifdef CONFIG_PAX_SEGMEXEC
95207 + vma_m = pax_find_mirror_vma(vma);
95208 + if (vma_m) {
95209 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
95210 + struct zap_details details = {
95211 + .nonlinear_vma = vma_m,
95212 + .last_index = ULONG_MAX,
95213 + };
95214 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
95215 + } else
95216 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
95217 + }
95218 +#endif
95219 +
95220 return 0;
95221 }
95222
95223 @@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
95224 if (end < start)
95225 return error;
95226
95227 +#ifdef CONFIG_PAX_SEGMEXEC
95228 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95229 + if (end > SEGMEXEC_TASK_SIZE)
95230 + return error;
95231 + } else
95232 +#endif
95233 +
95234 + if (end > TASK_SIZE)
95235 + return error;
95236 +
95237 error = 0;
95238 if (end == start)
95239 return error;
95240 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
95241 index 8639f6b..b623882a 100644
95242 --- a/mm/memory-failure.c
95243 +++ b/mm/memory-failure.c
95244 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
95245
95246 int sysctl_memory_failure_recovery __read_mostly = 1;
95247
95248 -atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95249 +atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95250
95251 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
95252
95253 @@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
95254 pfn, t->comm, t->pid);
95255 si.si_signo = SIGBUS;
95256 si.si_errno = 0;
95257 - si.si_addr = (void *)addr;
95258 + si.si_addr = (void __user *)addr;
95259 #ifdef __ARCH_SI_TRAPNO
95260 si.si_trapno = trapno;
95261 #endif
95262 @@ -791,7 +791,7 @@ static struct page_state {
95263 unsigned long res;
95264 char *msg;
95265 int (*action)(struct page *p, unsigned long pfn);
95266 -} error_states[] = {
95267 +} __do_const error_states[] = {
95268 { reserved, reserved, "reserved kernel", me_kernel },
95269 /*
95270 * free pages are specially detected outside this table:
95271 @@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95272 nr_pages = 1 << compound_order(hpage);
95273 else /* normal page or thp */
95274 nr_pages = 1;
95275 - atomic_long_add(nr_pages, &num_poisoned_pages);
95276 + atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
95277
95278 /*
95279 * We need/can do nothing about count=0 pages.
95280 @@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95281 if (PageHWPoison(hpage)) {
95282 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
95283 || (p != hpage && TestSetPageHWPoison(hpage))) {
95284 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95285 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95286 unlock_page(hpage);
95287 return 0;
95288 }
95289 @@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95290 */
95291 if (!PageHWPoison(p)) {
95292 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
95293 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95294 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95295 put_page(hpage);
95296 res = 0;
95297 goto out;
95298 }
95299 if (hwpoison_filter(p)) {
95300 if (TestClearPageHWPoison(p))
95301 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95302 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95303 unlock_page(hpage);
95304 put_page(hpage);
95305 return 0;
95306 @@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
95307 return 0;
95308 }
95309 if (TestClearPageHWPoison(p))
95310 - atomic_long_dec(&num_poisoned_pages);
95311 + atomic_long_dec_unchecked(&num_poisoned_pages);
95312 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
95313 return 0;
95314 }
95315 @@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
95316 */
95317 if (TestClearPageHWPoison(page)) {
95318 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
95319 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95320 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95321 freeit = 1;
95322 if (PageHuge(page))
95323 clear_page_hwpoison_huge_page(page);
95324 @@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
95325 if (PageHuge(page)) {
95326 set_page_hwpoison_huge_page(hpage);
95327 dequeue_hwpoisoned_huge_page(hpage);
95328 - atomic_long_add(1 << compound_order(hpage),
95329 + atomic_long_add_unchecked(1 << compound_order(hpage),
95330 &num_poisoned_pages);
95331 } else {
95332 SetPageHWPoison(page);
95333 - atomic_long_inc(&num_poisoned_pages);
95334 + atomic_long_inc_unchecked(&num_poisoned_pages);
95335 }
95336 }
95337 return ret;
95338 @@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
95339 put_page(page);
95340 pr_info("soft_offline: %#lx: invalidated\n", pfn);
95341 SetPageHWPoison(page);
95342 - atomic_long_inc(&num_poisoned_pages);
95343 + atomic_long_inc_unchecked(&num_poisoned_pages);
95344 return 0;
95345 }
95346
95347 @@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
95348 if (!is_free_buddy_page(page))
95349 pr_info("soft offline: %#lx: page leaked\n",
95350 pfn);
95351 - atomic_long_inc(&num_poisoned_pages);
95352 + atomic_long_inc_unchecked(&num_poisoned_pages);
95353 }
95354 } else {
95355 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
95356 @@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
95357 if (PageHuge(page)) {
95358 set_page_hwpoison_huge_page(hpage);
95359 dequeue_hwpoisoned_huge_page(hpage);
95360 - atomic_long_add(1 << compound_order(hpage),
95361 + atomic_long_add_unchecked(1 << compound_order(hpage),
95362 &num_poisoned_pages);
95363 } else {
95364 SetPageHWPoison(page);
95365 - atomic_long_inc(&num_poisoned_pages);
95366 + atomic_long_inc_unchecked(&num_poisoned_pages);
95367 }
95368 }
95369 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
95370 diff --git a/mm/memory.c b/mm/memory.c
95371 index d5f2ae9..4d678b2 100644
95372 --- a/mm/memory.c
95373 +++ b/mm/memory.c
95374 @@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95375 free_pte_range(tlb, pmd, addr);
95376 } while (pmd++, addr = next, addr != end);
95377
95378 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
95379 start &= PUD_MASK;
95380 if (start < floor)
95381 return;
95382 @@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95383 pmd = pmd_offset(pud, start);
95384 pud_clear(pud);
95385 pmd_free_tlb(tlb, pmd, start);
95386 +#endif
95387 +
95388 }
95389
95390 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95391 @@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95392 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
95393 } while (pud++, addr = next, addr != end);
95394
95395 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
95396 start &= PGDIR_MASK;
95397 if (start < floor)
95398 return;
95399 @@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95400 pud = pud_offset(pgd, start);
95401 pgd_clear(pgd);
95402 pud_free_tlb(tlb, pud, start);
95403 +#endif
95404 +
95405 }
95406
95407 /*
95408 @@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
95409 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
95410 */
95411 if (vma->vm_ops)
95412 - printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
95413 + printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
95414 vma->vm_ops->fault);
95415 if (vma->vm_file)
95416 - printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
95417 + printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
95418 vma->vm_file->f_op->mmap);
95419 dump_stack();
95420 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
95421 @@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
95422 page_add_file_rmap(page);
95423 set_pte_at(mm, addr, pte, mk_pte(page, prot));
95424
95425 +#ifdef CONFIG_PAX_SEGMEXEC
95426 + pax_mirror_file_pte(vma, addr, page, ptl);
95427 +#endif
95428 +
95429 retval = 0;
95430 pte_unmap_unlock(pte, ptl);
95431 return retval;
95432 @@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
95433 if (!page_count(page))
95434 return -EINVAL;
95435 if (!(vma->vm_flags & VM_MIXEDMAP)) {
95436 +
95437 +#ifdef CONFIG_PAX_SEGMEXEC
95438 + struct vm_area_struct *vma_m;
95439 +#endif
95440 +
95441 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
95442 BUG_ON(vma->vm_flags & VM_PFNMAP);
95443 vma->vm_flags |= VM_MIXEDMAP;
95444 +
95445 +#ifdef CONFIG_PAX_SEGMEXEC
95446 + vma_m = pax_find_mirror_vma(vma);
95447 + if (vma_m)
95448 + vma_m->vm_flags |= VM_MIXEDMAP;
95449 +#endif
95450 +
95451 }
95452 return insert_page(vma, addr, page, vma->vm_page_prot);
95453 }
95454 @@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
95455 unsigned long pfn)
95456 {
95457 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
95458 + BUG_ON(vma->vm_mirror);
95459
95460 if (addr < vma->vm_start || addr >= vma->vm_end)
95461 return -EFAULT;
95462 @@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
95463
95464 BUG_ON(pud_huge(*pud));
95465
95466 - pmd = pmd_alloc(mm, pud, addr);
95467 + pmd = (mm == &init_mm) ?
95468 + pmd_alloc_kernel(mm, pud, addr) :
95469 + pmd_alloc(mm, pud, addr);
95470 if (!pmd)
95471 return -ENOMEM;
95472 do {
95473 @@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
95474 unsigned long next;
95475 int err;
95476
95477 - pud = pud_alloc(mm, pgd, addr);
95478 + pud = (mm == &init_mm) ?
95479 + pud_alloc_kernel(mm, pgd, addr) :
95480 + pud_alloc(mm, pgd, addr);
95481 if (!pud)
95482 return -ENOMEM;
95483 do {
95484 @@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
95485 return ret;
95486 }
95487
95488 +#ifdef CONFIG_PAX_SEGMEXEC
95489 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
95490 +{
95491 + struct mm_struct *mm = vma->vm_mm;
95492 + spinlock_t *ptl;
95493 + pte_t *pte, entry;
95494 +
95495 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
95496 + entry = *pte;
95497 + if (!pte_present(entry)) {
95498 + if (!pte_none(entry)) {
95499 + BUG_ON(pte_file(entry));
95500 + free_swap_and_cache(pte_to_swp_entry(entry));
95501 + pte_clear_not_present_full(mm, address, pte, 0);
95502 + }
95503 + } else {
95504 + struct page *page;
95505 +
95506 + flush_cache_page(vma, address, pte_pfn(entry));
95507 + entry = ptep_clear_flush(vma, address, pte);
95508 + BUG_ON(pte_dirty(entry));
95509 + page = vm_normal_page(vma, address, entry);
95510 + if (page) {
95511 + update_hiwater_rss(mm);
95512 + if (PageAnon(page))
95513 + dec_mm_counter_fast(mm, MM_ANONPAGES);
95514 + else
95515 + dec_mm_counter_fast(mm, MM_FILEPAGES);
95516 + page_remove_rmap(page);
95517 + page_cache_release(page);
95518 + }
95519 + }
95520 + pte_unmap_unlock(pte, ptl);
95521 +}
95522 +
95523 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
95524 + *
95525 + * the ptl of the lower mapped page is held on entry and is not released on exit
95526 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
95527 + */
95528 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95529 +{
95530 + struct mm_struct *mm = vma->vm_mm;
95531 + unsigned long address_m;
95532 + spinlock_t *ptl_m;
95533 + struct vm_area_struct *vma_m;
95534 + pmd_t *pmd_m;
95535 + pte_t *pte_m, entry_m;
95536 +
95537 + BUG_ON(!page_m || !PageAnon(page_m));
95538 +
95539 + vma_m = pax_find_mirror_vma(vma);
95540 + if (!vma_m)
95541 + return;
95542 +
95543 + BUG_ON(!PageLocked(page_m));
95544 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95545 + address_m = address + SEGMEXEC_TASK_SIZE;
95546 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95547 + pte_m = pte_offset_map(pmd_m, address_m);
95548 + ptl_m = pte_lockptr(mm, pmd_m);
95549 + if (ptl != ptl_m) {
95550 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95551 + if (!pte_none(*pte_m))
95552 + goto out;
95553 + }
95554 +
95555 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95556 + page_cache_get(page_m);
95557 + page_add_anon_rmap(page_m, vma_m, address_m);
95558 + inc_mm_counter_fast(mm, MM_ANONPAGES);
95559 + set_pte_at(mm, address_m, pte_m, entry_m);
95560 + update_mmu_cache(vma_m, address_m, pte_m);
95561 +out:
95562 + if (ptl != ptl_m)
95563 + spin_unlock(ptl_m);
95564 + pte_unmap(pte_m);
95565 + unlock_page(page_m);
95566 +}
95567 +
95568 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95569 +{
95570 + struct mm_struct *mm = vma->vm_mm;
95571 + unsigned long address_m;
95572 + spinlock_t *ptl_m;
95573 + struct vm_area_struct *vma_m;
95574 + pmd_t *pmd_m;
95575 + pte_t *pte_m, entry_m;
95576 +
95577 + BUG_ON(!page_m || PageAnon(page_m));
95578 +
95579 + vma_m = pax_find_mirror_vma(vma);
95580 + if (!vma_m)
95581 + return;
95582 +
95583 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95584 + address_m = address + SEGMEXEC_TASK_SIZE;
95585 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95586 + pte_m = pte_offset_map(pmd_m, address_m);
95587 + ptl_m = pte_lockptr(mm, pmd_m);
95588 + if (ptl != ptl_m) {
95589 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95590 + if (!pte_none(*pte_m))
95591 + goto out;
95592 + }
95593 +
95594 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95595 + page_cache_get(page_m);
95596 + page_add_file_rmap(page_m);
95597 + inc_mm_counter_fast(mm, MM_FILEPAGES);
95598 + set_pte_at(mm, address_m, pte_m, entry_m);
95599 + update_mmu_cache(vma_m, address_m, pte_m);
95600 +out:
95601 + if (ptl != ptl_m)
95602 + spin_unlock(ptl_m);
95603 + pte_unmap(pte_m);
95604 +}
95605 +
95606 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
95607 +{
95608 + struct mm_struct *mm = vma->vm_mm;
95609 + unsigned long address_m;
95610 + spinlock_t *ptl_m;
95611 + struct vm_area_struct *vma_m;
95612 + pmd_t *pmd_m;
95613 + pte_t *pte_m, entry_m;
95614 +
95615 + vma_m = pax_find_mirror_vma(vma);
95616 + if (!vma_m)
95617 + return;
95618 +
95619 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95620 + address_m = address + SEGMEXEC_TASK_SIZE;
95621 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95622 + pte_m = pte_offset_map(pmd_m, address_m);
95623 + ptl_m = pte_lockptr(mm, pmd_m);
95624 + if (ptl != ptl_m) {
95625 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95626 + if (!pte_none(*pte_m))
95627 + goto out;
95628 + }
95629 +
95630 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
95631 + set_pte_at(mm, address_m, pte_m, entry_m);
95632 +out:
95633 + if (ptl != ptl_m)
95634 + spin_unlock(ptl_m);
95635 + pte_unmap(pte_m);
95636 +}
95637 +
95638 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
95639 +{
95640 + struct page *page_m;
95641 + pte_t entry;
95642 +
95643 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
95644 + goto out;
95645 +
95646 + entry = *pte;
95647 + page_m = vm_normal_page(vma, address, entry);
95648 + if (!page_m)
95649 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
95650 + else if (PageAnon(page_m)) {
95651 + if (pax_find_mirror_vma(vma)) {
95652 + pte_unmap_unlock(pte, ptl);
95653 + lock_page(page_m);
95654 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
95655 + if (pte_same(entry, *pte))
95656 + pax_mirror_anon_pte(vma, address, page_m, ptl);
95657 + else
95658 + unlock_page(page_m);
95659 + }
95660 + } else
95661 + pax_mirror_file_pte(vma, address, page_m, ptl);
95662 +
95663 +out:
95664 + pte_unmap_unlock(pte, ptl);
95665 +}
95666 +#endif
95667 +
95668 /*
95669 * This routine handles present pages, when users try to write
95670 * to a shared page. It is done by copying the page to a new address
95671 @@ -2218,6 +2425,12 @@ gotten:
95672 */
95673 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95674 if (likely(pte_same(*page_table, orig_pte))) {
95675 +
95676 +#ifdef CONFIG_PAX_SEGMEXEC
95677 + if (pax_find_mirror_vma(vma))
95678 + BUG_ON(!trylock_page(new_page));
95679 +#endif
95680 +
95681 if (old_page) {
95682 if (!PageAnon(old_page)) {
95683 dec_mm_counter_fast(mm, MM_FILEPAGES);
95684 @@ -2271,6 +2484,10 @@ gotten:
95685 page_remove_rmap(old_page);
95686 }
95687
95688 +#ifdef CONFIG_PAX_SEGMEXEC
95689 + pax_mirror_anon_pte(vma, address, new_page, ptl);
95690 +#endif
95691 +
95692 /* Free the old page.. */
95693 new_page = old_page;
95694 ret |= VM_FAULT_WRITE;
95695 @@ -2545,6 +2762,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95696 swap_free(entry);
95697 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
95698 try_to_free_swap(page);
95699 +
95700 +#ifdef CONFIG_PAX_SEGMEXEC
95701 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
95702 +#endif
95703 +
95704 unlock_page(page);
95705 if (page != swapcache) {
95706 /*
95707 @@ -2568,6 +2790,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95708
95709 /* No need to invalidate - it was non-present before */
95710 update_mmu_cache(vma, address, page_table);
95711 +
95712 +#ifdef CONFIG_PAX_SEGMEXEC
95713 + pax_mirror_anon_pte(vma, address, page, ptl);
95714 +#endif
95715 +
95716 unlock:
95717 pte_unmap_unlock(page_table, ptl);
95718 out:
95719 @@ -2587,40 +2814,6 @@ out_release:
95720 }
95721
95722 /*
95723 - * This is like a special single-page "expand_{down|up}wards()",
95724 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
95725 - * doesn't hit another vma.
95726 - */
95727 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
95728 -{
95729 - address &= PAGE_MASK;
95730 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
95731 - struct vm_area_struct *prev = vma->vm_prev;
95732 -
95733 - /*
95734 - * Is there a mapping abutting this one below?
95735 - *
95736 - * That's only ok if it's the same stack mapping
95737 - * that has gotten split..
95738 - */
95739 - if (prev && prev->vm_end == address)
95740 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
95741 -
95742 - expand_downwards(vma, address - PAGE_SIZE);
95743 - }
95744 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
95745 - struct vm_area_struct *next = vma->vm_next;
95746 -
95747 - /* As VM_GROWSDOWN but s/below/above/ */
95748 - if (next && next->vm_start == address + PAGE_SIZE)
95749 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
95750 -
95751 - expand_upwards(vma, address + PAGE_SIZE);
95752 - }
95753 - return 0;
95754 -}
95755 -
95756 -/*
95757 * We enter with non-exclusive mmap_sem (to exclude vma changes,
95758 * but allow concurrent faults), and pte mapped but not yet locked.
95759 * We return with mmap_sem still held, but pte unmapped and unlocked.
95760 @@ -2630,27 +2823,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95761 unsigned int flags)
95762 {
95763 struct mem_cgroup *memcg;
95764 - struct page *page;
95765 + struct page *page = NULL;
95766 spinlock_t *ptl;
95767 pte_t entry;
95768
95769 - pte_unmap(page_table);
95770 -
95771 - /* Check if we need to add a guard page to the stack */
95772 - if (check_stack_guard_page(vma, address) < 0)
95773 - return VM_FAULT_SIGBUS;
95774 -
95775 - /* Use the zero-page for reads */
95776 if (!(flags & FAULT_FLAG_WRITE)) {
95777 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
95778 vma->vm_page_prot));
95779 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95780 + ptl = pte_lockptr(mm, pmd);
95781 + spin_lock(ptl);
95782 if (!pte_none(*page_table))
95783 goto unlock;
95784 goto setpte;
95785 }
95786
95787 /* Allocate our own private page. */
95788 + pte_unmap(page_table);
95789 +
95790 if (unlikely(anon_vma_prepare(vma)))
95791 goto oom;
95792 page = alloc_zeroed_user_highpage_movable(vma, address);
95793 @@ -2674,6 +2863,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95794 if (!pte_none(*page_table))
95795 goto release;
95796
95797 +#ifdef CONFIG_PAX_SEGMEXEC
95798 + if (pax_find_mirror_vma(vma))
95799 + BUG_ON(!trylock_page(page));
95800 +#endif
95801 +
95802 inc_mm_counter_fast(mm, MM_ANONPAGES);
95803 page_add_new_anon_rmap(page, vma, address);
95804 mem_cgroup_commit_charge(page, memcg, false);
95805 @@ -2683,6 +2877,12 @@ setpte:
95806
95807 /* No need to invalidate - it was non-present before */
95808 update_mmu_cache(vma, address, page_table);
95809 +
95810 +#ifdef CONFIG_PAX_SEGMEXEC
95811 + if (page)
95812 + pax_mirror_anon_pte(vma, address, page, ptl);
95813 +#endif
95814 +
95815 unlock:
95816 pte_unmap_unlock(page_table, ptl);
95817 return 0;
95818 @@ -2913,6 +3113,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95819 return ret;
95820 }
95821 do_set_pte(vma, address, fault_page, pte, false, false);
95822 +
95823 +#ifdef CONFIG_PAX_SEGMEXEC
95824 + pax_mirror_file_pte(vma, address, fault_page, ptl);
95825 +#endif
95826 +
95827 unlock_page(fault_page);
95828 unlock_out:
95829 pte_unmap_unlock(pte, ptl);
95830 @@ -2955,7 +3160,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95831 page_cache_release(fault_page);
95832 goto uncharge_out;
95833 }
95834 +
95835 +#ifdef CONFIG_PAX_SEGMEXEC
95836 + if (pax_find_mirror_vma(vma))
95837 + BUG_ON(!trylock_page(new_page));
95838 +#endif
95839 +
95840 do_set_pte(vma, address, new_page, pte, true, true);
95841 +
95842 +#ifdef CONFIG_PAX_SEGMEXEC
95843 + pax_mirror_anon_pte(vma, address, new_page, ptl);
95844 +#endif
95845 +
95846 mem_cgroup_commit_charge(new_page, memcg, false);
95847 lru_cache_add_active_or_unevictable(new_page, vma);
95848 pte_unmap_unlock(pte, ptl);
95849 @@ -3005,6 +3221,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95850 return ret;
95851 }
95852 do_set_pte(vma, address, fault_page, pte, true, false);
95853 +
95854 +#ifdef CONFIG_PAX_SEGMEXEC
95855 + pax_mirror_file_pte(vma, address, fault_page, ptl);
95856 +#endif
95857 +
95858 pte_unmap_unlock(pte, ptl);
95859
95860 if (set_page_dirty(fault_page))
95861 @@ -3246,6 +3467,12 @@ static int handle_pte_fault(struct mm_struct *mm,
95862 if (flags & FAULT_FLAG_WRITE)
95863 flush_tlb_fix_spurious_fault(vma, address);
95864 }
95865 +
95866 +#ifdef CONFIG_PAX_SEGMEXEC
95867 + pax_mirror_pte(vma, address, pte, pmd, ptl);
95868 + return 0;
95869 +#endif
95870 +
95871 unlock:
95872 pte_unmap_unlock(pte, ptl);
95873 return 0;
95874 @@ -3265,9 +3492,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95875 pmd_t *pmd;
95876 pte_t *pte;
95877
95878 +#ifdef CONFIG_PAX_SEGMEXEC
95879 + struct vm_area_struct *vma_m;
95880 +#endif
95881 +
95882 if (unlikely(is_vm_hugetlb_page(vma)))
95883 return hugetlb_fault(mm, vma, address, flags);
95884
95885 +#ifdef CONFIG_PAX_SEGMEXEC
95886 + vma_m = pax_find_mirror_vma(vma);
95887 + if (vma_m) {
95888 + unsigned long address_m;
95889 + pgd_t *pgd_m;
95890 + pud_t *pud_m;
95891 + pmd_t *pmd_m;
95892 +
95893 + if (vma->vm_start > vma_m->vm_start) {
95894 + address_m = address;
95895 + address -= SEGMEXEC_TASK_SIZE;
95896 + vma = vma_m;
95897 + } else
95898 + address_m = address + SEGMEXEC_TASK_SIZE;
95899 +
95900 + pgd_m = pgd_offset(mm, address_m);
95901 + pud_m = pud_alloc(mm, pgd_m, address_m);
95902 + if (!pud_m)
95903 + return VM_FAULT_OOM;
95904 + pmd_m = pmd_alloc(mm, pud_m, address_m);
95905 + if (!pmd_m)
95906 + return VM_FAULT_OOM;
95907 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
95908 + return VM_FAULT_OOM;
95909 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
95910 + }
95911 +#endif
95912 +
95913 pgd = pgd_offset(mm, address);
95914 pud = pud_alloc(mm, pgd, address);
95915 if (!pud)
95916 @@ -3401,6 +3660,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
95917 spin_unlock(&mm->page_table_lock);
95918 return 0;
95919 }
95920 +
95921 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
95922 +{
95923 + pud_t *new = pud_alloc_one(mm, address);
95924 + if (!new)
95925 + return -ENOMEM;
95926 +
95927 + smp_wmb(); /* See comment in __pte_alloc */
95928 +
95929 + spin_lock(&mm->page_table_lock);
95930 + if (pgd_present(*pgd)) /* Another has populated it */
95931 + pud_free(mm, new);
95932 + else
95933 + pgd_populate_kernel(mm, pgd, new);
95934 + spin_unlock(&mm->page_table_lock);
95935 + return 0;
95936 +}
95937 #endif /* __PAGETABLE_PUD_FOLDED */
95938
95939 #ifndef __PAGETABLE_PMD_FOLDED
95940 @@ -3431,6 +3707,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
95941 spin_unlock(&mm->page_table_lock);
95942 return 0;
95943 }
95944 +
95945 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
95946 +{
95947 + pmd_t *new = pmd_alloc_one(mm, address);
95948 + if (!new)
95949 + return -ENOMEM;
95950 +
95951 + smp_wmb(); /* See comment in __pte_alloc */
95952 +
95953 + spin_lock(&mm->page_table_lock);
95954 +#ifndef __ARCH_HAS_4LEVEL_HACK
95955 + if (pud_present(*pud)) /* Another has populated it */
95956 + pmd_free(mm, new);
95957 + else
95958 + pud_populate_kernel(mm, pud, new);
95959 +#else
95960 + if (pgd_present(*pud)) /* Another has populated it */
95961 + pmd_free(mm, new);
95962 + else
95963 + pgd_populate_kernel(mm, pud, new);
95964 +#endif /* __ARCH_HAS_4LEVEL_HACK */
95965 + spin_unlock(&mm->page_table_lock);
95966 + return 0;
95967 +}
95968 #endif /* __PAGETABLE_PMD_FOLDED */
95969
95970 static int __follow_pte(struct mm_struct *mm, unsigned long address,
95971 @@ -3540,8 +3840,8 @@ out:
95972 return ret;
95973 }
95974
95975 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
95976 - void *buf, int len, int write)
95977 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
95978 + void *buf, size_t len, int write)
95979 {
95980 resource_size_t phys_addr;
95981 unsigned long prot = 0;
95982 @@ -3567,8 +3867,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
95983 * Access another process' address space as given in mm. If non-NULL, use the
95984 * given task for page fault accounting.
95985 */
95986 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95987 - unsigned long addr, void *buf, int len, int write)
95988 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95989 + unsigned long addr, void *buf, size_t len, int write)
95990 {
95991 struct vm_area_struct *vma;
95992 void *old_buf = buf;
95993 @@ -3576,7 +3876,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95994 down_read(&mm->mmap_sem);
95995 /* ignore errors, just check how much was successfully transferred */
95996 while (len) {
95997 - int bytes, ret, offset;
95998 + ssize_t bytes, ret, offset;
95999 void *maddr;
96000 struct page *page = NULL;
96001
96002 @@ -3637,8 +3937,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96003 *
96004 * The caller must hold a reference on @mm.
96005 */
96006 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96007 - void *buf, int len, int write)
96008 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
96009 + void *buf, size_t len, int write)
96010 {
96011 return __access_remote_vm(NULL, mm, addr, buf, len, write);
96012 }
96013 @@ -3648,11 +3948,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96014 * Source/target buffer must be kernel space,
96015 * Do not walk the page table directly, use get_user_pages
96016 */
96017 -int access_process_vm(struct task_struct *tsk, unsigned long addr,
96018 - void *buf, int len, int write)
96019 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
96020 + void *buf, size_t len, int write)
96021 {
96022 struct mm_struct *mm;
96023 - int ret;
96024 + ssize_t ret;
96025
96026 mm = get_task_mm(tsk);
96027 if (!mm)
96028 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
96029 index e58725a..e0be017 100644
96030 --- a/mm/mempolicy.c
96031 +++ b/mm/mempolicy.c
96032 @@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96033 unsigned long vmstart;
96034 unsigned long vmend;
96035
96036 +#ifdef CONFIG_PAX_SEGMEXEC
96037 + struct vm_area_struct *vma_m;
96038 +#endif
96039 +
96040 vma = find_vma(mm, start);
96041 if (!vma || vma->vm_start > start)
96042 return -EFAULT;
96043 @@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96044 err = vma_replace_policy(vma, new_pol);
96045 if (err)
96046 goto out;
96047 +
96048 +#ifdef CONFIG_PAX_SEGMEXEC
96049 + vma_m = pax_find_mirror_vma(vma);
96050 + if (vma_m) {
96051 + err = vma_replace_policy(vma_m, new_pol);
96052 + if (err)
96053 + goto out;
96054 + }
96055 +#endif
96056 +
96057 }
96058
96059 out:
96060 @@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
96061
96062 if (end < start)
96063 return -EINVAL;
96064 +
96065 +#ifdef CONFIG_PAX_SEGMEXEC
96066 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
96067 + if (end > SEGMEXEC_TASK_SIZE)
96068 + return -EINVAL;
96069 + } else
96070 +#endif
96071 +
96072 + if (end > TASK_SIZE)
96073 + return -EINVAL;
96074 +
96075 if (end == start)
96076 return 0;
96077
96078 @@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96079 */
96080 tcred = __task_cred(task);
96081 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96082 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96083 - !capable(CAP_SYS_NICE)) {
96084 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96085 rcu_read_unlock();
96086 err = -EPERM;
96087 goto out_put;
96088 @@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96089 goto out;
96090 }
96091
96092 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96093 + if (mm != current->mm &&
96094 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
96095 + mmput(mm);
96096 + err = -EPERM;
96097 + goto out;
96098 + }
96099 +#endif
96100 +
96101 err = do_migrate_pages(mm, old, new,
96102 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
96103
96104 diff --git a/mm/migrate.c b/mm/migrate.c
96105 index 0143995..b294728 100644
96106 --- a/mm/migrate.c
96107 +++ b/mm/migrate.c
96108 @@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
96109 */
96110 tcred = __task_cred(task);
96111 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96112 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96113 - !capable(CAP_SYS_NICE)) {
96114 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96115 rcu_read_unlock();
96116 err = -EPERM;
96117 goto out;
96118 diff --git a/mm/mlock.c b/mm/mlock.c
96119 index 73cf098..ab547c7 100644
96120 --- a/mm/mlock.c
96121 +++ b/mm/mlock.c
96122 @@ -14,6 +14,7 @@
96123 #include <linux/pagevec.h>
96124 #include <linux/mempolicy.h>
96125 #include <linux/syscalls.h>
96126 +#include <linux/security.h>
96127 #include <linux/sched.h>
96128 #include <linux/export.h>
96129 #include <linux/rmap.h>
96130 @@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
96131 {
96132 unsigned long nstart, end, tmp;
96133 struct vm_area_struct * vma, * prev;
96134 - int error;
96135 + int error = 0;
96136
96137 VM_BUG_ON(start & ~PAGE_MASK);
96138 VM_BUG_ON(len != PAGE_ALIGN(len));
96139 @@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
96140 return -EINVAL;
96141 if (end == start)
96142 return 0;
96143 + if (end > TASK_SIZE)
96144 + return -EINVAL;
96145 +
96146 vma = find_vma(current->mm, start);
96147 if (!vma || vma->vm_start > start)
96148 return -ENOMEM;
96149 @@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
96150 for (nstart = start ; ; ) {
96151 vm_flags_t newflags;
96152
96153 +#ifdef CONFIG_PAX_SEGMEXEC
96154 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96155 + break;
96156 +#endif
96157 +
96158 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
96159
96160 newflags = vma->vm_flags & ~VM_LOCKED;
96161 @@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
96162 locked += current->mm->locked_vm;
96163
96164 /* check against resource limits */
96165 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
96166 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
96167 error = do_mlock(start, len, 1);
96168
96169 @@ -783,6 +793,11 @@ static int do_mlockall(int flags)
96170 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
96171 vm_flags_t newflags;
96172
96173 +#ifdef CONFIG_PAX_SEGMEXEC
96174 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96175 + break;
96176 +#endif
96177 +
96178 newflags = vma->vm_flags & ~VM_LOCKED;
96179 if (flags & MCL_CURRENT)
96180 newflags |= VM_LOCKED;
96181 @@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
96182 lock_limit >>= PAGE_SHIFT;
96183
96184 ret = -ENOMEM;
96185 +
96186 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
96187 +
96188 down_write(&current->mm->mmap_sem);
96189 -
96190 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
96191 capable(CAP_IPC_LOCK))
96192 ret = do_mlockall(flags);
96193 diff --git a/mm/mmap.c b/mm/mmap.c
96194 index ae91989..d8308c7 100644
96195 --- a/mm/mmap.c
96196 +++ b/mm/mmap.c
96197 @@ -41,6 +41,7 @@
96198 #include <linux/notifier.h>
96199 #include <linux/memory.h>
96200 #include <linux/printk.h>
96201 +#include <linux/random.h>
96202
96203 #include <asm/uaccess.h>
96204 #include <asm/cacheflush.h>
96205 @@ -57,6 +58,16 @@
96206 #define arch_rebalance_pgtables(addr, len) (addr)
96207 #endif
96208
96209 +static inline void verify_mm_writelocked(struct mm_struct *mm)
96210 +{
96211 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
96212 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
96213 + up_read(&mm->mmap_sem);
96214 + BUG();
96215 + }
96216 +#endif
96217 +}
96218 +
96219 static void unmap_region(struct mm_struct *mm,
96220 struct vm_area_struct *vma, struct vm_area_struct *prev,
96221 unsigned long start, unsigned long end);
96222 @@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
96223 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
96224 *
96225 */
96226 -pgprot_t protection_map[16] = {
96227 +pgprot_t protection_map[16] __read_only = {
96228 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
96229 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
96230 };
96231
96232 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
96233 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
96234 {
96235 - return __pgprot(pgprot_val(protection_map[vm_flags &
96236 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
96237 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
96238 pgprot_val(arch_vm_get_page_prot(vm_flags)));
96239 +
96240 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96241 + if (!(__supported_pte_mask & _PAGE_NX) &&
96242 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
96243 + (vm_flags & (VM_READ | VM_WRITE)))
96244 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
96245 +#endif
96246 +
96247 + return prot;
96248 }
96249 EXPORT_SYMBOL(vm_get_page_prot);
96250
96251 @@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
96252 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
96253 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
96254 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
96255 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
96256 /*
96257 * Make sure vm_committed_as in one cacheline and not cacheline shared with
96258 * other variables. It can be updated by several CPUs frequently.
96259 @@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
96260 struct vm_area_struct *next = vma->vm_next;
96261
96262 might_sleep();
96263 + BUG_ON(vma->vm_mirror);
96264 if (vma->vm_ops && vma->vm_ops->close)
96265 vma->vm_ops->close(vma);
96266 if (vma->vm_file)
96267 @@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
96268
96269 SYSCALL_DEFINE1(brk, unsigned long, brk)
96270 {
96271 + unsigned long rlim;
96272 unsigned long retval;
96273 unsigned long newbrk, oldbrk;
96274 struct mm_struct *mm = current->mm;
96275 @@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
96276 * segment grow beyond its set limit the in case where the limit is
96277 * not page aligned -Ram Gupta
96278 */
96279 - if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
96280 + rlim = rlimit(RLIMIT_DATA);
96281 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96282 + /* force a minimum 16MB brk heap on setuid/setgid binaries */
96283 + if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
96284 + rlim = 4096 * PAGE_SIZE;
96285 +#endif
96286 + if (check_data_rlimit(rlim, brk, mm->start_brk,
96287 mm->end_data, mm->start_data))
96288 goto out;
96289
96290 @@ -976,6 +1005,12 @@ static int
96291 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
96292 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96293 {
96294 +
96295 +#ifdef CONFIG_PAX_SEGMEXEC
96296 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
96297 + return 0;
96298 +#endif
96299 +
96300 if (is_mergeable_vma(vma, file, vm_flags) &&
96301 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96302 if (vma->vm_pgoff == vm_pgoff)
96303 @@ -995,6 +1030,12 @@ static int
96304 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
96305 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96306 {
96307 +
96308 +#ifdef CONFIG_PAX_SEGMEXEC
96309 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
96310 + return 0;
96311 +#endif
96312 +
96313 if (is_mergeable_vma(vma, file, vm_flags) &&
96314 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96315 pgoff_t vm_pglen;
96316 @@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96317 struct vm_area_struct *area, *next;
96318 int err;
96319
96320 +#ifdef CONFIG_PAX_SEGMEXEC
96321 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
96322 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
96323 +
96324 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
96325 +#endif
96326 +
96327 /*
96328 * We later require that vma->vm_flags == vm_flags,
96329 * so this tests vma->vm_flags & VM_SPECIAL, too.
96330 @@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96331 if (next && next->vm_end == end) /* cases 6, 7, 8 */
96332 next = next->vm_next;
96333
96334 +#ifdef CONFIG_PAX_SEGMEXEC
96335 + if (prev)
96336 + prev_m = pax_find_mirror_vma(prev);
96337 + if (area)
96338 + area_m = pax_find_mirror_vma(area);
96339 + if (next)
96340 + next_m = pax_find_mirror_vma(next);
96341 +#endif
96342 +
96343 /*
96344 * Can it merge with the predecessor?
96345 */
96346 @@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96347 /* cases 1, 6 */
96348 err = vma_adjust(prev, prev->vm_start,
96349 next->vm_end, prev->vm_pgoff, NULL);
96350 - } else /* cases 2, 5, 7 */
96351 +
96352 +#ifdef CONFIG_PAX_SEGMEXEC
96353 + if (!err && prev_m)
96354 + err = vma_adjust(prev_m, prev_m->vm_start,
96355 + next_m->vm_end, prev_m->vm_pgoff, NULL);
96356 +#endif
96357 +
96358 + } else { /* cases 2, 5, 7 */
96359 err = vma_adjust(prev, prev->vm_start,
96360 end, prev->vm_pgoff, NULL);
96361 +
96362 +#ifdef CONFIG_PAX_SEGMEXEC
96363 + if (!err && prev_m)
96364 + err = vma_adjust(prev_m, prev_m->vm_start,
96365 + end_m, prev_m->vm_pgoff, NULL);
96366 +#endif
96367 +
96368 + }
96369 if (err)
96370 return NULL;
96371 khugepaged_enter_vma_merge(prev, vm_flags);
96372 @@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96373 mpol_equal(policy, vma_policy(next)) &&
96374 can_vma_merge_before(next, vm_flags,
96375 anon_vma, file, pgoff+pglen)) {
96376 - if (prev && addr < prev->vm_end) /* case 4 */
96377 + if (prev && addr < prev->vm_end) { /* case 4 */
96378 err = vma_adjust(prev, prev->vm_start,
96379 addr, prev->vm_pgoff, NULL);
96380 - else /* cases 3, 8 */
96381 +
96382 +#ifdef CONFIG_PAX_SEGMEXEC
96383 + if (!err && prev_m)
96384 + err = vma_adjust(prev_m, prev_m->vm_start,
96385 + addr_m, prev_m->vm_pgoff, NULL);
96386 +#endif
96387 +
96388 + } else { /* cases 3, 8 */
96389 err = vma_adjust(area, addr, next->vm_end,
96390 next->vm_pgoff - pglen, NULL);
96391 +
96392 +#ifdef CONFIG_PAX_SEGMEXEC
96393 + if (!err && area_m)
96394 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
96395 + next_m->vm_pgoff - pglen, NULL);
96396 +#endif
96397 +
96398 + }
96399 if (err)
96400 return NULL;
96401 khugepaged_enter_vma_merge(area, vm_flags);
96402 @@ -1208,8 +1295,10 @@ none:
96403 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96404 struct file *file, long pages)
96405 {
96406 - const unsigned long stack_flags
96407 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
96408 +
96409 +#ifdef CONFIG_PAX_RANDMMAP
96410 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96411 +#endif
96412
96413 mm->total_vm += pages;
96414
96415 @@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96416 mm->shared_vm += pages;
96417 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
96418 mm->exec_vm += pages;
96419 - } else if (flags & stack_flags)
96420 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
96421 mm->stack_vm += pages;
96422 }
96423 #endif /* CONFIG_PROC_FS */
96424 @@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
96425 locked += mm->locked_vm;
96426 lock_limit = rlimit(RLIMIT_MEMLOCK);
96427 lock_limit >>= PAGE_SHIFT;
96428 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96429 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
96430 return -EAGAIN;
96431 }
96432 @@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96433 * (the exception is when the underlying filesystem is noexec
96434 * mounted, in which case we dont add PROT_EXEC.)
96435 */
96436 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
96437 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
96438 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
96439 prot |= PROT_EXEC;
96440
96441 @@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96442 /* Obtain the address to map to. we verify (or select) it and ensure
96443 * that it represents a valid section of the address space.
96444 */
96445 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
96446 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
96447 if (addr & ~PAGE_MASK)
96448 return addr;
96449
96450 @@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96451 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
96452 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
96453
96454 +#ifdef CONFIG_PAX_MPROTECT
96455 + if (mm->pax_flags & MF_PAX_MPROTECT) {
96456 +
96457 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
96458 + if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
96459 + mm->binfmt->handle_mmap)
96460 + mm->binfmt->handle_mmap(file);
96461 +#endif
96462 +
96463 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
96464 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
96465 + gr_log_rwxmmap(file);
96466 +
96467 +#ifdef CONFIG_PAX_EMUPLT
96468 + vm_flags &= ~VM_EXEC;
96469 +#else
96470 + return -EPERM;
96471 +#endif
96472 +
96473 + }
96474 +
96475 + if (!(vm_flags & VM_EXEC))
96476 + vm_flags &= ~VM_MAYEXEC;
96477 +#else
96478 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
96479 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
96480 +#endif
96481 + else
96482 + vm_flags &= ~VM_MAYWRITE;
96483 + }
96484 +#endif
96485 +
96486 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96487 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
96488 + vm_flags &= ~VM_PAGEEXEC;
96489 +#endif
96490 +
96491 if (flags & MAP_LOCKED)
96492 if (!can_do_mlock())
96493 return -EPERM;
96494 @@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96495 vm_flags |= VM_NORESERVE;
96496 }
96497
96498 + if (!gr_acl_handle_mmap(file, prot))
96499 + return -EACCES;
96500 +
96501 addr = mmap_region(file, addr, len, vm_flags, pgoff);
96502 if (!IS_ERR_VALUE(addr) &&
96503 ((vm_flags & VM_LOCKED) ||
96504 @@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
96505 vm_flags_t vm_flags = vma->vm_flags;
96506
96507 /* If it was private or non-writable, the write bit is already clear */
96508 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
96509 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
96510 return 0;
96511
96512 /* The backer wishes to know when pages are first written to? */
96513 @@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96514 struct rb_node **rb_link, *rb_parent;
96515 unsigned long charged = 0;
96516
96517 +#ifdef CONFIG_PAX_SEGMEXEC
96518 + struct vm_area_struct *vma_m = NULL;
96519 +#endif
96520 +
96521 + /*
96522 + * mm->mmap_sem is required to protect against another thread
96523 + * changing the mappings in case we sleep.
96524 + */
96525 + verify_mm_writelocked(mm);
96526 +
96527 /* Check against address space limit. */
96528 +
96529 +#ifdef CONFIG_PAX_RANDMMAP
96530 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96531 +#endif
96532 +
96533 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
96534 unsigned long nr_pages;
96535
96536 @@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96537
96538 /* Clear old maps */
96539 error = -ENOMEM;
96540 -munmap_back:
96541 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
96542 if (do_munmap(mm, addr, len))
96543 return -ENOMEM;
96544 - goto munmap_back;
96545 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
96546 }
96547
96548 /*
96549 @@ -1595,6 +1739,16 @@ munmap_back:
96550 goto unacct_error;
96551 }
96552
96553 +#ifdef CONFIG_PAX_SEGMEXEC
96554 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
96555 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
96556 + if (!vma_m) {
96557 + error = -ENOMEM;
96558 + goto free_vma;
96559 + }
96560 + }
96561 +#endif
96562 +
96563 vma->vm_mm = mm;
96564 vma->vm_start = addr;
96565 vma->vm_end = addr + len;
96566 @@ -1625,6 +1779,13 @@ munmap_back:
96567 if (error)
96568 goto unmap_and_free_vma;
96569
96570 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96571 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
96572 + vma->vm_flags |= VM_PAGEEXEC;
96573 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
96574 + }
96575 +#endif
96576 +
96577 /* Can addr have changed??
96578 *
96579 * Answer: Yes, several device drivers can do it in their
96580 @@ -1643,6 +1804,12 @@ munmap_back:
96581 }
96582
96583 vma_link(mm, vma, prev, rb_link, rb_parent);
96584 +
96585 +#ifdef CONFIG_PAX_SEGMEXEC
96586 + if (vma_m)
96587 + BUG_ON(pax_mirror_vma(vma_m, vma));
96588 +#endif
96589 +
96590 /* Once vma denies write, undo our temporary denial count */
96591 if (file) {
96592 if (vm_flags & VM_SHARED)
96593 @@ -1655,6 +1822,7 @@ out:
96594 perf_event_mmap(vma);
96595
96596 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
96597 + track_exec_limit(mm, addr, addr + len, vm_flags);
96598 if (vm_flags & VM_LOCKED) {
96599 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
96600 vma == get_gate_vma(current->mm)))
96601 @@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
96602 if (vm_flags & VM_DENYWRITE)
96603 allow_write_access(file);
96604 free_vma:
96605 +
96606 +#ifdef CONFIG_PAX_SEGMEXEC
96607 + if (vma_m)
96608 + kmem_cache_free(vm_area_cachep, vma_m);
96609 +#endif
96610 +
96611 kmem_cache_free(vm_area_cachep, vma);
96612 unacct_error:
96613 if (charged)
96614 @@ -1699,7 +1873,63 @@ unacct_error:
96615 return error;
96616 }
96617
96618 -unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96619 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
96620 +unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
96621 +{
96622 + if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
96623 + return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
96624 +
96625 + return 0;
96626 +}
96627 +#endif
96628 +
96629 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
96630 +{
96631 + if (!vma) {
96632 +#ifdef CONFIG_STACK_GROWSUP
96633 + if (addr > sysctl_heap_stack_gap)
96634 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
96635 + else
96636 + vma = find_vma(current->mm, 0);
96637 + if (vma && (vma->vm_flags & VM_GROWSUP))
96638 + return false;
96639 +#endif
96640 + return true;
96641 + }
96642 +
96643 + if (addr + len > vma->vm_start)
96644 + return false;
96645 +
96646 + if (vma->vm_flags & VM_GROWSDOWN)
96647 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
96648 +#ifdef CONFIG_STACK_GROWSUP
96649 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
96650 + return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
96651 +#endif
96652 + else if (offset)
96653 + return offset <= vma->vm_start - addr - len;
96654 +
96655 + return true;
96656 +}
96657 +
96658 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
96659 +{
96660 + if (vma->vm_start < len)
96661 + return -ENOMEM;
96662 +
96663 + if (!(vma->vm_flags & VM_GROWSDOWN)) {
96664 + if (offset <= vma->vm_start - len)
96665 + return vma->vm_start - len - offset;
96666 + else
96667 + return -ENOMEM;
96668 + }
96669 +
96670 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
96671 + return vma->vm_start - len - sysctl_heap_stack_gap;
96672 + return -ENOMEM;
96673 +}
96674 +
96675 +unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
96676 {
96677 /*
96678 * We implement the search by looking for an rbtree node that
96679 @@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96680 }
96681 }
96682
96683 - gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
96684 + gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
96685 check_current:
96686 /* Check if current node has a suitable gap */
96687 if (gap_start > high_limit)
96688 return -ENOMEM;
96689 +
96690 + if (gap_end - gap_start > info->threadstack_offset)
96691 + gap_start += info->threadstack_offset;
96692 + else
96693 + gap_start = gap_end;
96694 +
96695 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96696 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96697 + gap_start += sysctl_heap_stack_gap;
96698 + else
96699 + gap_start = gap_end;
96700 + }
96701 + if (vma->vm_flags & VM_GROWSDOWN) {
96702 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96703 + gap_end -= sysctl_heap_stack_gap;
96704 + else
96705 + gap_end = gap_start;
96706 + }
96707 if (gap_end >= low_limit && gap_end - gap_start >= length)
96708 goto found;
96709
96710 @@ -1801,7 +2049,7 @@ found:
96711 return gap_start;
96712 }
96713
96714 -unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
96715 +unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
96716 {
96717 struct mm_struct *mm = current->mm;
96718 struct vm_area_struct *vma;
96719 @@ -1855,6 +2103,24 @@ check_current:
96720 gap_end = vma->vm_start;
96721 if (gap_end < low_limit)
96722 return -ENOMEM;
96723 +
96724 + if (gap_end - gap_start > info->threadstack_offset)
96725 + gap_end -= info->threadstack_offset;
96726 + else
96727 + gap_end = gap_start;
96728 +
96729 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96730 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96731 + gap_start += sysctl_heap_stack_gap;
96732 + else
96733 + gap_start = gap_end;
96734 + }
96735 + if (vma->vm_flags & VM_GROWSDOWN) {
96736 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96737 + gap_end -= sysctl_heap_stack_gap;
96738 + else
96739 + gap_end = gap_start;
96740 + }
96741 if (gap_start <= high_limit && gap_end - gap_start >= length)
96742 goto found;
96743
96744 @@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96745 struct mm_struct *mm = current->mm;
96746 struct vm_area_struct *vma;
96747 struct vm_unmapped_area_info info;
96748 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96749
96750 if (len > TASK_SIZE - mmap_min_addr)
96751 return -ENOMEM;
96752 @@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96753 if (flags & MAP_FIXED)
96754 return addr;
96755
96756 +#ifdef CONFIG_PAX_RANDMMAP
96757 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96758 +#endif
96759 +
96760 if (addr) {
96761 addr = PAGE_ALIGN(addr);
96762 vma = find_vma(mm, addr);
96763 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96764 - (!vma || addr + len <= vma->vm_start))
96765 + check_heap_stack_gap(vma, addr, len, offset))
96766 return addr;
96767 }
96768
96769 @@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96770 info.low_limit = mm->mmap_base;
96771 info.high_limit = TASK_SIZE;
96772 info.align_mask = 0;
96773 + info.threadstack_offset = offset;
96774 return vm_unmapped_area(&info);
96775 }
96776 #endif
96777 @@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96778 struct mm_struct *mm = current->mm;
96779 unsigned long addr = addr0;
96780 struct vm_unmapped_area_info info;
96781 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96782
96783 /* requested length too big for entire address space */
96784 if (len > TASK_SIZE - mmap_min_addr)
96785 @@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96786 if (flags & MAP_FIXED)
96787 return addr;
96788
96789 +#ifdef CONFIG_PAX_RANDMMAP
96790 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96791 +#endif
96792 +
96793 /* requesting a specific address */
96794 if (addr) {
96795 addr = PAGE_ALIGN(addr);
96796 vma = find_vma(mm, addr);
96797 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96798 - (!vma || addr + len <= vma->vm_start))
96799 + check_heap_stack_gap(vma, addr, len, offset))
96800 return addr;
96801 }
96802
96803 @@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96804 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
96805 info.high_limit = mm->mmap_base;
96806 info.align_mask = 0;
96807 + info.threadstack_offset = offset;
96808 addr = vm_unmapped_area(&info);
96809
96810 /*
96811 @@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96812 VM_BUG_ON(addr != -ENOMEM);
96813 info.flags = 0;
96814 info.low_limit = TASK_UNMAPPED_BASE;
96815 +
96816 +#ifdef CONFIG_PAX_RANDMMAP
96817 + if (mm->pax_flags & MF_PAX_RANDMMAP)
96818 + info.low_limit += mm->delta_mmap;
96819 +#endif
96820 +
96821 info.high_limit = TASK_SIZE;
96822 addr = vm_unmapped_area(&info);
96823 }
96824 @@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
96825 return vma;
96826 }
96827
96828 +#ifdef CONFIG_PAX_SEGMEXEC
96829 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
96830 +{
96831 + struct vm_area_struct *vma_m;
96832 +
96833 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
96834 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
96835 + BUG_ON(vma->vm_mirror);
96836 + return NULL;
96837 + }
96838 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
96839 + vma_m = vma->vm_mirror;
96840 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
96841 + BUG_ON(vma->vm_file != vma_m->vm_file);
96842 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
96843 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
96844 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
96845 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
96846 + return vma_m;
96847 +}
96848 +#endif
96849 +
96850 /*
96851 * Verify that the stack growth is acceptable and
96852 * update accounting. This is shared with both the
96853 @@ -2106,6 +2412,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96854 return -ENOMEM;
96855
96856 /* Stack limit test */
96857 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
96858 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
96859 return -ENOMEM;
96860
96861 @@ -2116,6 +2423,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96862 locked = mm->locked_vm + grow;
96863 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
96864 limit >>= PAGE_SHIFT;
96865 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96866 if (locked > limit && !capable(CAP_IPC_LOCK))
96867 return -ENOMEM;
96868 }
96869 @@ -2145,37 +2453,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96870 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
96871 * vma is the last one with address > vma->vm_end. Have to extend vma.
96872 */
96873 +#ifndef CONFIG_IA64
96874 +static
96875 +#endif
96876 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
96877 {
96878 int error;
96879 + bool locknext;
96880
96881 if (!(vma->vm_flags & VM_GROWSUP))
96882 return -EFAULT;
96883
96884 + /* Also guard against wrapping around to address 0. */
96885 + if (address < PAGE_ALIGN(address+1))
96886 + address = PAGE_ALIGN(address+1);
96887 + else
96888 + return -ENOMEM;
96889 +
96890 /*
96891 * We must make sure the anon_vma is allocated
96892 * so that the anon_vma locking is not a noop.
96893 */
96894 if (unlikely(anon_vma_prepare(vma)))
96895 return -ENOMEM;
96896 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
96897 + if (locknext && anon_vma_prepare(vma->vm_next))
96898 + return -ENOMEM;
96899 vma_lock_anon_vma(vma);
96900 + if (locknext)
96901 + vma_lock_anon_vma(vma->vm_next);
96902
96903 /*
96904 * vma->vm_start/vm_end cannot change under us because the caller
96905 * is required to hold the mmap_sem in read mode. We need the
96906 - * anon_vma lock to serialize against concurrent expand_stacks.
96907 - * Also guard against wrapping around to address 0.
96908 + * anon_vma locks to serialize against concurrent expand_stacks
96909 + * and expand_upwards.
96910 */
96911 - if (address < PAGE_ALIGN(address+4))
96912 - address = PAGE_ALIGN(address+4);
96913 - else {
96914 - vma_unlock_anon_vma(vma);
96915 - return -ENOMEM;
96916 - }
96917 error = 0;
96918
96919 /* Somebody else might have raced and expanded it already */
96920 - if (address > vma->vm_end) {
96921 + 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)
96922 + error = -ENOMEM;
96923 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
96924 unsigned long size, grow;
96925
96926 size = address - vma->vm_start;
96927 @@ -2210,6 +2529,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
96928 }
96929 }
96930 }
96931 + if (locknext)
96932 + vma_unlock_anon_vma(vma->vm_next);
96933 vma_unlock_anon_vma(vma);
96934 khugepaged_enter_vma_merge(vma, vma->vm_flags);
96935 validate_mm(vma->vm_mm);
96936 @@ -2224,6 +2545,8 @@ int expand_downwards(struct vm_area_struct *vma,
96937 unsigned long address)
96938 {
96939 int error;
96940 + bool lockprev = false;
96941 + struct vm_area_struct *prev;
96942
96943 /*
96944 * We must make sure the anon_vma is allocated
96945 @@ -2237,6 +2560,15 @@ int expand_downwards(struct vm_area_struct *vma,
96946 if (error)
96947 return error;
96948
96949 + prev = vma->vm_prev;
96950 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
96951 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
96952 +#endif
96953 + if (lockprev && anon_vma_prepare(prev))
96954 + return -ENOMEM;
96955 + if (lockprev)
96956 + vma_lock_anon_vma(prev);
96957 +
96958 vma_lock_anon_vma(vma);
96959
96960 /*
96961 @@ -2246,9 +2578,17 @@ int expand_downwards(struct vm_area_struct *vma,
96962 */
96963
96964 /* Somebody else might have raced and expanded it already */
96965 - if (address < vma->vm_start) {
96966 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
96967 + error = -ENOMEM;
96968 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
96969 unsigned long size, grow;
96970
96971 +#ifdef CONFIG_PAX_SEGMEXEC
96972 + struct vm_area_struct *vma_m;
96973 +
96974 + vma_m = pax_find_mirror_vma(vma);
96975 +#endif
96976 +
96977 size = vma->vm_end - address;
96978 grow = (vma->vm_start - address) >> PAGE_SHIFT;
96979
96980 @@ -2273,13 +2613,27 @@ int expand_downwards(struct vm_area_struct *vma,
96981 vma->vm_pgoff -= grow;
96982 anon_vma_interval_tree_post_update_vma(vma);
96983 vma_gap_update(vma);
96984 +
96985 +#ifdef CONFIG_PAX_SEGMEXEC
96986 + if (vma_m) {
96987 + anon_vma_interval_tree_pre_update_vma(vma_m);
96988 + vma_m->vm_start -= grow << PAGE_SHIFT;
96989 + vma_m->vm_pgoff -= grow;
96990 + anon_vma_interval_tree_post_update_vma(vma_m);
96991 + vma_gap_update(vma_m);
96992 + }
96993 +#endif
96994 +
96995 spin_unlock(&vma->vm_mm->page_table_lock);
96996
96997 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
96998 perf_event_mmap(vma);
96999 }
97000 }
97001 }
97002 vma_unlock_anon_vma(vma);
97003 + if (lockprev)
97004 + vma_unlock_anon_vma(prev);
97005 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97006 validate_mm(vma->vm_mm);
97007 return error;
97008 @@ -2377,6 +2731,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
97009 do {
97010 long nrpages = vma_pages(vma);
97011
97012 +#ifdef CONFIG_PAX_SEGMEXEC
97013 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
97014 + vma = remove_vma(vma);
97015 + continue;
97016 + }
97017 +#endif
97018 +
97019 if (vma->vm_flags & VM_ACCOUNT)
97020 nr_accounted += nrpages;
97021 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
97022 @@ -2421,6 +2782,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
97023 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
97024 vma->vm_prev = NULL;
97025 do {
97026 +
97027 +#ifdef CONFIG_PAX_SEGMEXEC
97028 + if (vma->vm_mirror) {
97029 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
97030 + vma->vm_mirror->vm_mirror = NULL;
97031 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
97032 + vma->vm_mirror = NULL;
97033 + }
97034 +#endif
97035 +
97036 vma_rb_erase(vma, &mm->mm_rb);
97037 mm->map_count--;
97038 tail_vma = vma;
97039 @@ -2448,14 +2819,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97040 struct vm_area_struct *new;
97041 int err = -ENOMEM;
97042
97043 +#ifdef CONFIG_PAX_SEGMEXEC
97044 + struct vm_area_struct *vma_m, *new_m = NULL;
97045 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
97046 +#endif
97047 +
97048 if (is_vm_hugetlb_page(vma) && (addr &
97049 ~(huge_page_mask(hstate_vma(vma)))))
97050 return -EINVAL;
97051
97052 +#ifdef CONFIG_PAX_SEGMEXEC
97053 + vma_m = pax_find_mirror_vma(vma);
97054 +#endif
97055 +
97056 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97057 if (!new)
97058 goto out_err;
97059
97060 +#ifdef CONFIG_PAX_SEGMEXEC
97061 + if (vma_m) {
97062 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97063 + if (!new_m) {
97064 + kmem_cache_free(vm_area_cachep, new);
97065 + goto out_err;
97066 + }
97067 + }
97068 +#endif
97069 +
97070 /* most fields are the same, copy all, and then fixup */
97071 *new = *vma;
97072
97073 @@ -2468,6 +2858,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97074 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
97075 }
97076
97077 +#ifdef CONFIG_PAX_SEGMEXEC
97078 + if (vma_m) {
97079 + *new_m = *vma_m;
97080 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
97081 + new_m->vm_mirror = new;
97082 + new->vm_mirror = new_m;
97083 +
97084 + if (new_below)
97085 + new_m->vm_end = addr_m;
97086 + else {
97087 + new_m->vm_start = addr_m;
97088 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
97089 + }
97090 + }
97091 +#endif
97092 +
97093 err = vma_dup_policy(vma, new);
97094 if (err)
97095 goto out_free_vma;
97096 @@ -2488,6 +2894,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97097 else
97098 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
97099
97100 +#ifdef CONFIG_PAX_SEGMEXEC
97101 + if (!err && vma_m) {
97102 + struct mempolicy *pol = vma_policy(new);
97103 +
97104 + if (anon_vma_clone(new_m, vma_m))
97105 + goto out_free_mpol;
97106 +
97107 + mpol_get(pol);
97108 + set_vma_policy(new_m, pol);
97109 +
97110 + if (new_m->vm_file)
97111 + get_file(new_m->vm_file);
97112 +
97113 + if (new_m->vm_ops && new_m->vm_ops->open)
97114 + new_m->vm_ops->open(new_m);
97115 +
97116 + if (new_below)
97117 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
97118 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
97119 + else
97120 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
97121 +
97122 + if (err) {
97123 + if (new_m->vm_ops && new_m->vm_ops->close)
97124 + new_m->vm_ops->close(new_m);
97125 + if (new_m->vm_file)
97126 + fput(new_m->vm_file);
97127 + mpol_put(pol);
97128 + }
97129 + }
97130 +#endif
97131 +
97132 /* Success. */
97133 if (!err)
97134 return 0;
97135 @@ -2497,10 +2935,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97136 new->vm_ops->close(new);
97137 if (new->vm_file)
97138 fput(new->vm_file);
97139 - unlink_anon_vmas(new);
97140 out_free_mpol:
97141 mpol_put(vma_policy(new));
97142 out_free_vma:
97143 +
97144 +#ifdef CONFIG_PAX_SEGMEXEC
97145 + if (new_m) {
97146 + unlink_anon_vmas(new_m);
97147 + kmem_cache_free(vm_area_cachep, new_m);
97148 + }
97149 +#endif
97150 +
97151 + unlink_anon_vmas(new);
97152 kmem_cache_free(vm_area_cachep, new);
97153 out_err:
97154 return err;
97155 @@ -2513,6 +2959,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97156 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97157 unsigned long addr, int new_below)
97158 {
97159 +
97160 +#ifdef CONFIG_PAX_SEGMEXEC
97161 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97162 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
97163 + if (mm->map_count >= sysctl_max_map_count-1)
97164 + return -ENOMEM;
97165 + } else
97166 +#endif
97167 +
97168 if (mm->map_count >= sysctl_max_map_count)
97169 return -ENOMEM;
97170
97171 @@ -2524,11 +2979,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97172 * work. This now handles partial unmappings.
97173 * Jeremy Fitzhardinge <jeremy@goop.org>
97174 */
97175 +#ifdef CONFIG_PAX_SEGMEXEC
97176 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97177 {
97178 + int ret = __do_munmap(mm, start, len);
97179 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
97180 + return ret;
97181 +
97182 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
97183 +}
97184 +
97185 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97186 +#else
97187 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97188 +#endif
97189 +{
97190 unsigned long end;
97191 struct vm_area_struct *vma, *prev, *last;
97192
97193 + /*
97194 + * mm->mmap_sem is required to protect against another thread
97195 + * changing the mappings in case we sleep.
97196 + */
97197 + verify_mm_writelocked(mm);
97198 +
97199 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
97200 return -EINVAL;
97201
97202 @@ -2604,6 +3078,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97203 /* Fix up all other VM information */
97204 remove_vma_list(mm, vma);
97205
97206 + track_exec_limit(mm, start, end, 0UL);
97207 +
97208 return 0;
97209 }
97210
97211 @@ -2612,6 +3088,13 @@ int vm_munmap(unsigned long start, size_t len)
97212 int ret;
97213 struct mm_struct *mm = current->mm;
97214
97215 +
97216 +#ifdef CONFIG_PAX_SEGMEXEC
97217 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
97218 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
97219 + return -EINVAL;
97220 +#endif
97221 +
97222 down_write(&mm->mmap_sem);
97223 ret = do_munmap(mm, start, len);
97224 up_write(&mm->mmap_sem);
97225 @@ -2625,16 +3108,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
97226 return vm_munmap(addr, len);
97227 }
97228
97229 -static inline void verify_mm_writelocked(struct mm_struct *mm)
97230 -{
97231 -#ifdef CONFIG_DEBUG_VM
97232 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97233 - WARN_ON(1);
97234 - up_read(&mm->mmap_sem);
97235 - }
97236 -#endif
97237 -}
97238 -
97239 /*
97240 * this is really a simplified "do_mmap". it only handles
97241 * anonymous maps. eventually we may be able to do some
97242 @@ -2648,6 +3121,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97243 struct rb_node **rb_link, *rb_parent;
97244 pgoff_t pgoff = addr >> PAGE_SHIFT;
97245 int error;
97246 + unsigned long charged;
97247
97248 len = PAGE_ALIGN(len);
97249 if (!len)
97250 @@ -2655,10 +3129,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97251
97252 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
97253
97254 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
97255 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
97256 + flags &= ~VM_EXEC;
97257 +
97258 +#ifdef CONFIG_PAX_MPROTECT
97259 + if (mm->pax_flags & MF_PAX_MPROTECT)
97260 + flags &= ~VM_MAYEXEC;
97261 +#endif
97262 +
97263 + }
97264 +#endif
97265 +
97266 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
97267 if (error & ~PAGE_MASK)
97268 return error;
97269
97270 + charged = len >> PAGE_SHIFT;
97271 +
97272 error = mlock_future_check(mm, mm->def_flags, len);
97273 if (error)
97274 return error;
97275 @@ -2672,21 +3160,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97276 /*
97277 * Clear old maps. this also does some error checking for us
97278 */
97279 - munmap_back:
97280 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97281 if (do_munmap(mm, addr, len))
97282 return -ENOMEM;
97283 - goto munmap_back;
97284 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97285 }
97286
97287 /* Check against address space limits *after* clearing old maps... */
97288 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
97289 + if (!may_expand_vm(mm, charged))
97290 return -ENOMEM;
97291
97292 if (mm->map_count > sysctl_max_map_count)
97293 return -ENOMEM;
97294
97295 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
97296 + if (security_vm_enough_memory_mm(mm, charged))
97297 return -ENOMEM;
97298
97299 /* Can we just expand an old private anonymous mapping? */
97300 @@ -2700,7 +3187,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97301 */
97302 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97303 if (!vma) {
97304 - vm_unacct_memory(len >> PAGE_SHIFT);
97305 + vm_unacct_memory(charged);
97306 return -ENOMEM;
97307 }
97308
97309 @@ -2714,10 +3201,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97310 vma_link(mm, vma, prev, rb_link, rb_parent);
97311 out:
97312 perf_event_mmap(vma);
97313 - mm->total_vm += len >> PAGE_SHIFT;
97314 + mm->total_vm += charged;
97315 if (flags & VM_LOCKED)
97316 - mm->locked_vm += (len >> PAGE_SHIFT);
97317 + mm->locked_vm += charged;
97318 vma->vm_flags |= VM_SOFTDIRTY;
97319 + track_exec_limit(mm, addr, addr + len, flags);
97320 return addr;
97321 }
97322
97323 @@ -2779,6 +3267,7 @@ void exit_mmap(struct mm_struct *mm)
97324 while (vma) {
97325 if (vma->vm_flags & VM_ACCOUNT)
97326 nr_accounted += vma_pages(vma);
97327 + vma->vm_mirror = NULL;
97328 vma = remove_vma(vma);
97329 }
97330 vm_unacct_memory(nr_accounted);
97331 @@ -2796,6 +3285,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97332 struct vm_area_struct *prev;
97333 struct rb_node **rb_link, *rb_parent;
97334
97335 +#ifdef CONFIG_PAX_SEGMEXEC
97336 + struct vm_area_struct *vma_m = NULL;
97337 +#endif
97338 +
97339 + if (security_mmap_addr(vma->vm_start))
97340 + return -EPERM;
97341 +
97342 /*
97343 * The vm_pgoff of a purely anonymous vma should be irrelevant
97344 * until its first write fault, when page's anon_vma and index
97345 @@ -2819,7 +3315,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97346 security_vm_enough_memory_mm(mm, vma_pages(vma)))
97347 return -ENOMEM;
97348
97349 +#ifdef CONFIG_PAX_SEGMEXEC
97350 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
97351 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97352 + if (!vma_m)
97353 + return -ENOMEM;
97354 + }
97355 +#endif
97356 +
97357 vma_link(mm, vma, prev, rb_link, rb_parent);
97358 +
97359 +#ifdef CONFIG_PAX_SEGMEXEC
97360 + if (vma_m)
97361 + BUG_ON(pax_mirror_vma(vma_m, vma));
97362 +#endif
97363 +
97364 return 0;
97365 }
97366
97367 @@ -2838,6 +3348,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97368 struct rb_node **rb_link, *rb_parent;
97369 bool faulted_in_anon_vma = true;
97370
97371 + BUG_ON(vma->vm_mirror);
97372 +
97373 /*
97374 * If anonymous vma has not yet been faulted, update new pgoff
97375 * to match new location, to increase its chance of merging.
97376 @@ -2902,6 +3414,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97377 return NULL;
97378 }
97379
97380 +#ifdef CONFIG_PAX_SEGMEXEC
97381 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
97382 +{
97383 + struct vm_area_struct *prev_m;
97384 + struct rb_node **rb_link_m, *rb_parent_m;
97385 + struct mempolicy *pol_m;
97386 +
97387 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
97388 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
97389 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
97390 + *vma_m = *vma;
97391 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
97392 + if (anon_vma_clone(vma_m, vma))
97393 + return -ENOMEM;
97394 + pol_m = vma_policy(vma_m);
97395 + mpol_get(pol_m);
97396 + set_vma_policy(vma_m, pol_m);
97397 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
97398 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
97399 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
97400 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
97401 + if (vma_m->vm_file)
97402 + get_file(vma_m->vm_file);
97403 + if (vma_m->vm_ops && vma_m->vm_ops->open)
97404 + vma_m->vm_ops->open(vma_m);
97405 + BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
97406 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
97407 + vma_m->vm_mirror = vma;
97408 + vma->vm_mirror = vma_m;
97409 + return 0;
97410 +}
97411 +#endif
97412 +
97413 /*
97414 * Return true if the calling process may expand its vm space by the passed
97415 * number of pages
97416 @@ -2913,6 +3458,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
97417
97418 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
97419
97420 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
97421 if (cur + npages > lim)
97422 return 0;
97423 return 1;
97424 @@ -2995,6 +3541,22 @@ static struct vm_area_struct *__install_special_mapping(
97425 vma->vm_start = addr;
97426 vma->vm_end = addr + len;
97427
97428 +#ifdef CONFIG_PAX_MPROTECT
97429 + if (mm->pax_flags & MF_PAX_MPROTECT) {
97430 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
97431 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
97432 + return ERR_PTR(-EPERM);
97433 + if (!(vm_flags & VM_EXEC))
97434 + vm_flags &= ~VM_MAYEXEC;
97435 +#else
97436 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97437 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97438 +#endif
97439 + else
97440 + vm_flags &= ~VM_MAYWRITE;
97441 + }
97442 +#endif
97443 +
97444 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
97445 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97446
97447 diff --git a/mm/mprotect.c b/mm/mprotect.c
97448 index ace9345..63320dc 100644
97449 --- a/mm/mprotect.c
97450 +++ b/mm/mprotect.c
97451 @@ -24,10 +24,18 @@
97452 #include <linux/migrate.h>
97453 #include <linux/perf_event.h>
97454 #include <linux/ksm.h>
97455 +#include <linux/sched/sysctl.h>
97456 +
97457 +#ifdef CONFIG_PAX_MPROTECT
97458 +#include <linux/elf.h>
97459 +#include <linux/binfmts.h>
97460 +#endif
97461 +
97462 #include <asm/uaccess.h>
97463 #include <asm/pgtable.h>
97464 #include <asm/cacheflush.h>
97465 #include <asm/tlbflush.h>
97466 +#include <asm/mmu_context.h>
97467
97468 /*
97469 * For a prot_numa update we only hold mmap_sem for read so there is a
97470 @@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
97471 return pages;
97472 }
97473
97474 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97475 +/* called while holding the mmap semaphor for writing except stack expansion */
97476 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
97477 +{
97478 + unsigned long oldlimit, newlimit = 0UL;
97479 +
97480 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
97481 + return;
97482 +
97483 + spin_lock(&mm->page_table_lock);
97484 + oldlimit = mm->context.user_cs_limit;
97485 + if ((prot & VM_EXEC) && oldlimit < end)
97486 + /* USER_CS limit moved up */
97487 + newlimit = end;
97488 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
97489 + /* USER_CS limit moved down */
97490 + newlimit = start;
97491 +
97492 + if (newlimit) {
97493 + mm->context.user_cs_limit = newlimit;
97494 +
97495 +#ifdef CONFIG_SMP
97496 + wmb();
97497 + cpus_clear(mm->context.cpu_user_cs_mask);
97498 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
97499 +#endif
97500 +
97501 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
97502 + }
97503 + spin_unlock(&mm->page_table_lock);
97504 + if (newlimit == end) {
97505 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
97506 +
97507 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
97508 + if (is_vm_hugetlb_page(vma))
97509 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
97510 + else
97511 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
97512 + }
97513 +}
97514 +#endif
97515 +
97516 int
97517 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97518 unsigned long start, unsigned long end, unsigned long newflags)
97519 @@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97520 int error;
97521 int dirty_accountable = 0;
97522
97523 +#ifdef CONFIG_PAX_SEGMEXEC
97524 + struct vm_area_struct *vma_m = NULL;
97525 + unsigned long start_m, end_m;
97526 +
97527 + start_m = start + SEGMEXEC_TASK_SIZE;
97528 + end_m = end + SEGMEXEC_TASK_SIZE;
97529 +#endif
97530 +
97531 if (newflags == oldflags) {
97532 *pprev = vma;
97533 return 0;
97534 }
97535
97536 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
97537 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
97538 +
97539 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
97540 + return -ENOMEM;
97541 +
97542 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
97543 + return -ENOMEM;
97544 + }
97545 +
97546 /*
97547 * If we make a private mapping writable we increase our commit;
97548 * but (without finer accounting) cannot reduce our commit if we
97549 @@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97550 }
97551 }
97552
97553 +#ifdef CONFIG_PAX_SEGMEXEC
97554 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
97555 + if (start != vma->vm_start) {
97556 + error = split_vma(mm, vma, start, 1);
97557 + if (error)
97558 + goto fail;
97559 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
97560 + *pprev = (*pprev)->vm_next;
97561 + }
97562 +
97563 + if (end != vma->vm_end) {
97564 + error = split_vma(mm, vma, end, 0);
97565 + if (error)
97566 + goto fail;
97567 + }
97568 +
97569 + if (pax_find_mirror_vma(vma)) {
97570 + error = __do_munmap(mm, start_m, end_m - start_m);
97571 + if (error)
97572 + goto fail;
97573 + } else {
97574 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97575 + if (!vma_m) {
97576 + error = -ENOMEM;
97577 + goto fail;
97578 + }
97579 + vma->vm_flags = newflags;
97580 + error = pax_mirror_vma(vma_m, vma);
97581 + if (error) {
97582 + vma->vm_flags = oldflags;
97583 + goto fail;
97584 + }
97585 + }
97586 + }
97587 +#endif
97588 +
97589 /*
97590 * First try to merge with previous and/or next vma.
97591 */
97592 @@ -314,7 +418,19 @@ success:
97593 * vm_flags and vm_page_prot are protected by the mmap_sem
97594 * held in write mode.
97595 */
97596 +
97597 +#ifdef CONFIG_PAX_SEGMEXEC
97598 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
97599 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
97600 +#endif
97601 +
97602 vma->vm_flags = newflags;
97603 +
97604 +#ifdef CONFIG_PAX_MPROTECT
97605 + if (mm->binfmt && mm->binfmt->handle_mprotect)
97606 + mm->binfmt->handle_mprotect(vma, newflags);
97607 +#endif
97608 +
97609 dirty_accountable = vma_wants_writenotify(vma);
97610 vma_set_page_prot(vma);
97611
97612 @@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97613 end = start + len;
97614 if (end <= start)
97615 return -ENOMEM;
97616 +
97617 +#ifdef CONFIG_PAX_SEGMEXEC
97618 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
97619 + if (end > SEGMEXEC_TASK_SIZE)
97620 + return -EINVAL;
97621 + } else
97622 +#endif
97623 +
97624 + if (end > TASK_SIZE)
97625 + return -EINVAL;
97626 +
97627 if (!arch_validate_prot(prot))
97628 return -EINVAL;
97629
97630 @@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97631 /*
97632 * Does the application expect PROT_READ to imply PROT_EXEC:
97633 */
97634 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97635 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97636 prot |= PROT_EXEC;
97637
97638 vm_flags = calc_vm_prot_bits(prot);
97639 @@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97640 if (start > vma->vm_start)
97641 prev = vma;
97642
97643 +#ifdef CONFIG_PAX_MPROTECT
97644 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
97645 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
97646 +#endif
97647 +
97648 for (nstart = start ; ; ) {
97649 unsigned long newflags;
97650
97651 @@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97652
97653 /* newflags >> 4 shift VM_MAY% in place of VM_% */
97654 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
97655 + if (prot & (PROT_WRITE | PROT_EXEC))
97656 + gr_log_rwxmprotect(vma);
97657 +
97658 + error = -EACCES;
97659 + goto out;
97660 + }
97661 +
97662 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
97663 error = -EACCES;
97664 goto out;
97665 }
97666 @@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97667 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
97668 if (error)
97669 goto out;
97670 +
97671 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
97672 +
97673 nstart = tmp;
97674
97675 if (nstart < prev->vm_end)
97676 diff --git a/mm/mremap.c b/mm/mremap.c
97677 index b147f66..98a695a 100644
97678 --- a/mm/mremap.c
97679 +++ b/mm/mremap.c
97680 @@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
97681 continue;
97682 pte = ptep_get_and_clear(mm, old_addr, old_pte);
97683 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
97684 +
97685 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97686 + if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
97687 + pte = pte_exprotect(pte);
97688 +#endif
97689 +
97690 pte = move_soft_dirty_pte(pte);
97691 set_pte_at(mm, new_addr, new_pte, pte);
97692 }
97693 @@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
97694 if (is_vm_hugetlb_page(vma))
97695 goto Einval;
97696
97697 +#ifdef CONFIG_PAX_SEGMEXEC
97698 + if (pax_find_mirror_vma(vma))
97699 + goto Einval;
97700 +#endif
97701 +
97702 /* We can't remap across vm area boundaries */
97703 if (old_len > vma->vm_end - addr)
97704 goto Efault;
97705 @@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
97706 unsigned long ret = -EINVAL;
97707 unsigned long charged = 0;
97708 unsigned long map_flags;
97709 + unsigned long pax_task_size = TASK_SIZE;
97710
97711 if (new_addr & ~PAGE_MASK)
97712 goto out;
97713
97714 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
97715 +#ifdef CONFIG_PAX_SEGMEXEC
97716 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
97717 + pax_task_size = SEGMEXEC_TASK_SIZE;
97718 +#endif
97719 +
97720 + pax_task_size -= PAGE_SIZE;
97721 +
97722 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
97723 goto out;
97724
97725 /* Check if the location we're moving into overlaps the
97726 * old location at all, and fail if it does.
97727 */
97728 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
97729 - goto out;
97730 -
97731 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
97732 + if (addr + old_len > new_addr && new_addr + new_len > addr)
97733 goto out;
97734
97735 ret = do_munmap(mm, new_addr, new_len);
97736 @@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97737 unsigned long ret = -EINVAL;
97738 unsigned long charged = 0;
97739 bool locked = false;
97740 + unsigned long pax_task_size = TASK_SIZE;
97741
97742 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
97743 return ret;
97744 @@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97745 if (!new_len)
97746 return ret;
97747
97748 +#ifdef CONFIG_PAX_SEGMEXEC
97749 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
97750 + pax_task_size = SEGMEXEC_TASK_SIZE;
97751 +#endif
97752 +
97753 + pax_task_size -= PAGE_SIZE;
97754 +
97755 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
97756 + old_len > pax_task_size || addr > pax_task_size-old_len)
97757 + return ret;
97758 +
97759 down_write(&current->mm->mmap_sem);
97760
97761 if (flags & MREMAP_FIXED) {
97762 @@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97763 new_addr = addr;
97764 }
97765 ret = addr;
97766 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
97767 goto out;
97768 }
97769 }
97770 @@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97771 goto out;
97772 }
97773
97774 + map_flags = vma->vm_flags;
97775 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
97776 + if (!(ret & ~PAGE_MASK)) {
97777 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
97778 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
97779 + }
97780 }
97781 out:
97782 if (ret & ~PAGE_MASK)
97783 diff --git a/mm/nommu.c b/mm/nommu.c
97784 index bd1808e..b63d87c 100644
97785 --- a/mm/nommu.c
97786 +++ b/mm/nommu.c
97787 @@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
97788 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
97789 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
97790 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
97791 -int heap_stack_gap = 0;
97792
97793 atomic_long_t mmap_pages_allocated;
97794
97795 @@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
97796 EXPORT_SYMBOL(find_vma);
97797
97798 /*
97799 - * find a VMA
97800 - * - we don't extend stack VMAs under NOMMU conditions
97801 - */
97802 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
97803 -{
97804 - return find_vma(mm, addr);
97805 -}
97806 -
97807 -/*
97808 * expand a stack to a given address
97809 * - not supported under NOMMU conditions
97810 */
97811 @@ -1572,6 +1562,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97812
97813 /* most fields are the same, copy all, and then fixup */
97814 *new = *vma;
97815 + INIT_LIST_HEAD(&new->anon_vma_chain);
97816 *region = *vma->vm_region;
97817 new->vm_region = region;
97818
97819 @@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
97820 }
97821 EXPORT_SYMBOL(generic_file_remap_pages);
97822
97823 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97824 - unsigned long addr, void *buf, int len, int write)
97825 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97826 + unsigned long addr, void *buf, size_t len, int write)
97827 {
97828 struct vm_area_struct *vma;
97829
97830 @@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97831 *
97832 * The caller must hold a reference on @mm.
97833 */
97834 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97835 - void *buf, int len, int write)
97836 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97837 + void *buf, size_t len, int write)
97838 {
97839 return __access_remote_vm(NULL, mm, addr, buf, len, write);
97840 }
97841 @@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97842 * Access another process' address space.
97843 * - source/target buffer must be kernel space
97844 */
97845 -int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
97846 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
97847 {
97848 struct mm_struct *mm;
97849
97850 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
97851 index 19ceae8..70848ee 100644
97852 --- a/mm/page-writeback.c
97853 +++ b/mm/page-writeback.c
97854 @@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
97855 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
97856 * - the bdi dirty thresh drops quickly due to change of JBOD workload
97857 */
97858 -static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
97859 +static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
97860 unsigned long thresh,
97861 unsigned long bg_thresh,
97862 unsigned long dirty,
97863 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
97864 index 616a2c9..0e755f6 100644
97865 --- a/mm/page_alloc.c
97866 +++ b/mm/page_alloc.c
97867 @@ -59,6 +59,7 @@
97868 #include <linux/page-debug-flags.h>
97869 #include <linux/hugetlb.h>
97870 #include <linux/sched/rt.h>
97871 +#include <linux/random.h>
97872
97873 #include <asm/sections.h>
97874 #include <asm/tlbflush.h>
97875 @@ -356,7 +357,7 @@ out:
97876 * This usage means that zero-order pages may not be compound.
97877 */
97878
97879 -static void free_compound_page(struct page *page)
97880 +void free_compound_page(struct page *page)
97881 {
97882 __free_pages_ok(page, compound_order(page));
97883 }
97884 @@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
97885 int i;
97886 int bad = 0;
97887
97888 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
97889 + unsigned long index = 1UL << order;
97890 +#endif
97891 +
97892 trace_mm_page_free(page, order);
97893 kmemcheck_free_shadow(page, order);
97894
97895 @@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
97896 debug_check_no_obj_freed(page_address(page),
97897 PAGE_SIZE << order);
97898 }
97899 +
97900 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
97901 + for (; index; --index)
97902 + sanitize_highpage(page + index - 1);
97903 +#endif
97904 +
97905 arch_free_page(page, order);
97906 kernel_map_pages(page, 1 << order, 0);
97907
97908 @@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
97909 local_irq_restore(flags);
97910 }
97911
97912 +#ifdef CONFIG_PAX_LATENT_ENTROPY
97913 +bool __meminitdata extra_latent_entropy;
97914 +
97915 +static int __init setup_pax_extra_latent_entropy(char *str)
97916 +{
97917 + extra_latent_entropy = true;
97918 + return 0;
97919 +}
97920 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
97921 +
97922 +volatile u64 latent_entropy __latent_entropy;
97923 +EXPORT_SYMBOL(latent_entropy);
97924 +#endif
97925 +
97926 void __init __free_pages_bootmem(struct page *page, unsigned int order)
97927 {
97928 unsigned int nr_pages = 1 << order;
97929 @@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
97930 __ClearPageReserved(p);
97931 set_page_count(p, 0);
97932
97933 +#ifdef CONFIG_PAX_LATENT_ENTROPY
97934 + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
97935 + u64 hash = 0;
97936 + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
97937 + const u64 *data = lowmem_page_address(page);
97938 +
97939 + for (index = 0; index < end; index++)
97940 + hash ^= hash + data[index];
97941 + latent_entropy ^= hash;
97942 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
97943 + }
97944 +#endif
97945 +
97946 page_zone(page)->managed_pages += nr_pages;
97947 set_page_refcounted(page);
97948 __free_pages(page, order);
97949 @@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
97950 arch_alloc_page(page, order);
97951 kernel_map_pages(page, 1 << order, 1);
97952
97953 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
97954 if (gfp_flags & __GFP_ZERO)
97955 prep_zero_page(page, order, gfp_flags);
97956 +#endif
97957
97958 if (order && (gfp_flags & __GFP_COMP))
97959 prep_compound_page(page, order);
97960 @@ -1602,7 +1642,7 @@ again:
97961 }
97962
97963 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
97964 - if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
97965 + if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
97966 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
97967 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
97968
97969 @@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
97970 do {
97971 mod_zone_page_state(zone, NR_ALLOC_BATCH,
97972 high_wmark_pages(zone) - low_wmark_pages(zone) -
97973 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
97974 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
97975 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
97976 } while (zone++ != preferred_zone);
97977 }
97978 @@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
97979
97980 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
97981 high_wmark_pages(zone) - low_wmark_pages(zone) -
97982 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
97983 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
97984
97985 setup_zone_migrate_reserve(zone);
97986 spin_unlock_irqrestore(&zone->lock, flags);
97987 diff --git a/mm/percpu.c b/mm/percpu.c
97988 index 014bab6..db5a76f 100644
97989 --- a/mm/percpu.c
97990 +++ b/mm/percpu.c
97991 @@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
97992 static unsigned int pcpu_high_unit_cpu __read_mostly;
97993
97994 /* the address of the first chunk which starts with the kernel static area */
97995 -void *pcpu_base_addr __read_mostly;
97996 +void *pcpu_base_addr __read_only;
97997 EXPORT_SYMBOL_GPL(pcpu_base_addr);
97998
97999 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
98000 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
98001 index 5077afc..846c9ef 100644
98002 --- a/mm/process_vm_access.c
98003 +++ b/mm/process_vm_access.c
98004 @@ -13,6 +13,7 @@
98005 #include <linux/uio.h>
98006 #include <linux/sched.h>
98007 #include <linux/highmem.h>
98008 +#include <linux/security.h>
98009 #include <linux/ptrace.h>
98010 #include <linux/slab.h>
98011 #include <linux/syscalls.h>
98012 @@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98013 ssize_t iov_len;
98014 size_t total_len = iov_iter_count(iter);
98015
98016 + return -ENOSYS; // PaX: until properly audited
98017 +
98018 /*
98019 * Work out how many pages of struct pages we're going to need
98020 * when eventually calling get_user_pages
98021 */
98022 for (i = 0; i < riovcnt; i++) {
98023 iov_len = rvec[i].iov_len;
98024 - if (iov_len > 0) {
98025 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
98026 - + iov_len)
98027 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
98028 - / PAGE_SIZE + 1;
98029 - nr_pages = max(nr_pages, nr_pages_iov);
98030 - }
98031 + if (iov_len <= 0)
98032 + continue;
98033 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
98034 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
98035 + nr_pages = max(nr_pages, nr_pages_iov);
98036 }
98037
98038 if (nr_pages == 0)
98039 @@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98040 goto free_proc_pages;
98041 }
98042
98043 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
98044 + rc = -EPERM;
98045 + goto put_task_struct;
98046 + }
98047 +
98048 mm = mm_access(task, PTRACE_MODE_ATTACH);
98049 if (!mm || IS_ERR(mm)) {
98050 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
98051 diff --git a/mm/rmap.c b/mm/rmap.c
98052 index 3e4c721..a5e3e39 100644
98053 --- a/mm/rmap.c
98054 +++ b/mm/rmap.c
98055 @@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98056 struct anon_vma *anon_vma = vma->anon_vma;
98057 struct anon_vma_chain *avc;
98058
98059 +#ifdef CONFIG_PAX_SEGMEXEC
98060 + struct anon_vma_chain *avc_m = NULL;
98061 +#endif
98062 +
98063 might_sleep();
98064 if (unlikely(!anon_vma)) {
98065 struct mm_struct *mm = vma->vm_mm;
98066 @@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98067 if (!avc)
98068 goto out_enomem;
98069
98070 +#ifdef CONFIG_PAX_SEGMEXEC
98071 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
98072 + if (!avc_m)
98073 + goto out_enomem_free_avc;
98074 +#endif
98075 +
98076 anon_vma = find_mergeable_anon_vma(vma);
98077 allocated = NULL;
98078 if (!anon_vma) {
98079 @@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98080 /* page_table_lock to protect against threads */
98081 spin_lock(&mm->page_table_lock);
98082 if (likely(!vma->anon_vma)) {
98083 +
98084 +#ifdef CONFIG_PAX_SEGMEXEC
98085 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
98086 +
98087 + if (vma_m) {
98088 + BUG_ON(vma_m->anon_vma);
98089 + vma_m->anon_vma = anon_vma;
98090 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
98091 + avc_m = NULL;
98092 + }
98093 +#endif
98094 +
98095 vma->anon_vma = anon_vma;
98096 anon_vma_chain_link(vma, avc, anon_vma);
98097 allocated = NULL;
98098 @@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98099
98100 if (unlikely(allocated))
98101 put_anon_vma(allocated);
98102 +
98103 +#ifdef CONFIG_PAX_SEGMEXEC
98104 + if (unlikely(avc_m))
98105 + anon_vma_chain_free(avc_m);
98106 +#endif
98107 +
98108 if (unlikely(avc))
98109 anon_vma_chain_free(avc);
98110 }
98111 return 0;
98112
98113 out_enomem_free_avc:
98114 +
98115 +#ifdef CONFIG_PAX_SEGMEXEC
98116 + if (avc_m)
98117 + anon_vma_chain_free(avc_m);
98118 +#endif
98119 +
98120 anon_vma_chain_free(avc);
98121 out_enomem:
98122 return -ENOMEM;
98123 @@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
98124 * Attach the anon_vmas from src to dst.
98125 * Returns 0 on success, -ENOMEM on failure.
98126 */
98127 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98128 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
98129 {
98130 struct anon_vma_chain *avc, *pavc;
98131 struct anon_vma *root = NULL;
98132 @@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98133 * the corresponding VMA in the parent process is attached to.
98134 * Returns 0 on success, non-zero on failure.
98135 */
98136 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
98137 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
98138 {
98139 struct anon_vma_chain *avc;
98140 struct anon_vma *anon_vma;
98141 @@ -376,8 +410,10 @@ static void anon_vma_ctor(void *data)
98142 void __init anon_vma_init(void)
98143 {
98144 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
98145 - 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
98146 - anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
98147 + 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
98148 + anon_vma_ctor);
98149 + anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
98150 + SLAB_PANIC|SLAB_NO_SANITIZE);
98151 }
98152
98153 /*
98154 diff --git a/mm/shmem.c b/mm/shmem.c
98155 index 185836b..d7255a1 100644
98156 --- a/mm/shmem.c
98157 +++ b/mm/shmem.c
98158 @@ -33,7 +33,7 @@
98159 #include <linux/swap.h>
98160 #include <linux/aio.h>
98161
98162 -static struct vfsmount *shm_mnt;
98163 +struct vfsmount *shm_mnt;
98164
98165 #ifdef CONFIG_SHMEM
98166 /*
98167 @@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
98168 #define BOGO_DIRENT_SIZE 20
98169
98170 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
98171 -#define SHORT_SYMLINK_LEN 128
98172 +#define SHORT_SYMLINK_LEN 64
98173
98174 /*
98175 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
98176 @@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
98177 static int shmem_xattr_validate(const char *name)
98178 {
98179 struct { const char *prefix; size_t len; } arr[] = {
98180 +
98181 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98182 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
98183 +#endif
98184 +
98185 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
98186 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
98187 };
98188 @@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
98189 if (err)
98190 return err;
98191
98192 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98193 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
98194 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
98195 + return -EOPNOTSUPP;
98196 + if (size > 8)
98197 + return -EINVAL;
98198 + }
98199 +#endif
98200 +
98201 return simple_xattr_set(&info->xattrs, name, value, size, flags);
98202 }
98203
98204 @@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
98205 int err = -ENOMEM;
98206
98207 /* Round up to L1_CACHE_BYTES to resist false sharing */
98208 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
98209 - L1_CACHE_BYTES), GFP_KERNEL);
98210 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
98211 if (!sbinfo)
98212 return -ENOMEM;
98213
98214 diff --git a/mm/slab.c b/mm/slab.c
98215 index f34e053..78a3839 100644
98216 --- a/mm/slab.c
98217 +++ b/mm/slab.c
98218 @@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98219 if ((x)->max_freeable < i) \
98220 (x)->max_freeable = i; \
98221 } while (0)
98222 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
98223 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
98224 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
98225 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
98226 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
98227 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
98228 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
98229 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
98230 +#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
98231 +#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
98232 #else
98233 #define STATS_INC_ACTIVE(x) do { } while (0)
98234 #define STATS_DEC_ACTIVE(x) do { } while (0)
98235 @@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98236 #define STATS_INC_ALLOCMISS(x) do { } while (0)
98237 #define STATS_INC_FREEHIT(x) do { } while (0)
98238 #define STATS_INC_FREEMISS(x) do { } while (0)
98239 +#define STATS_INC_SANITIZED(x) do { } while (0)
98240 +#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
98241 #endif
98242
98243 #if DEBUG
98244 @@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
98245 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
98246 */
98247 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
98248 - const struct page *page, void *obj)
98249 + const struct page *page, const void *obj)
98250 {
98251 u32 offset = (obj - page->s_mem);
98252 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
98253 @@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
98254 * structures first. Without this, further allocations will bug.
98255 */
98256 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
98257 - kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
98258 + kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
98259 slab_state = PARTIAL_NODE;
98260
98261 slab_early_init = 0;
98262 @@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
98263
98264 cachep = find_mergeable(size, align, flags, name, ctor);
98265 if (cachep) {
98266 - cachep->refcount++;
98267 + atomic_inc(&cachep->refcount);
98268
98269 /*
98270 * Adjust the object sizes so that we clear
98271 @@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
98272 struct array_cache *ac = cpu_cache_get(cachep);
98273
98274 check_irq_off();
98275 +
98276 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98277 + if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
98278 + STATS_INC_NOT_SANITIZED(cachep);
98279 + else {
98280 + memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
98281 +
98282 + if (cachep->ctor)
98283 + cachep->ctor(objp);
98284 +
98285 + STATS_INC_SANITIZED(cachep);
98286 + }
98287 +#endif
98288 +
98289 kmemleak_free_recursive(objp, cachep->flags);
98290 objp = cache_free_debugcheck(cachep, objp, caller);
98291
98292 @@ -3557,6 +3575,7 @@ void kfree(const void *objp)
98293
98294 if (unlikely(ZERO_OR_NULL_PTR(objp)))
98295 return;
98296 + VM_BUG_ON(!virt_addr_valid(objp));
98297 local_irq_save(flags);
98298 kfree_debugcheck(objp);
98299 c = virt_to_cache(objp);
98300 @@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
98301 }
98302 /* cpu stats */
98303 {
98304 - unsigned long allochit = atomic_read(&cachep->allochit);
98305 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
98306 - unsigned long freehit = atomic_read(&cachep->freehit);
98307 - unsigned long freemiss = atomic_read(&cachep->freemiss);
98308 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
98309 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
98310 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
98311 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
98312
98313 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
98314 allochit, allocmiss, freehit, freemiss);
98315 }
98316 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98317 + {
98318 + unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
98319 + unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
98320 +
98321 + seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
98322 + }
98323 +#endif
98324 #endif
98325 }
98326
98327 @@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
98328 static int __init slab_proc_init(void)
98329 {
98330 #ifdef CONFIG_DEBUG_SLAB_LEAK
98331 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
98332 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
98333 #endif
98334 return 0;
98335 }
98336 module_init(slab_proc_init);
98337 #endif
98338
98339 +bool is_usercopy_object(const void *ptr)
98340 +{
98341 + struct page *page;
98342 + struct kmem_cache *cachep;
98343 +
98344 + if (ZERO_OR_NULL_PTR(ptr))
98345 + return false;
98346 +
98347 + if (!slab_is_available())
98348 + return false;
98349 +
98350 + if (!virt_addr_valid(ptr))
98351 + return false;
98352 +
98353 + page = virt_to_head_page(ptr);
98354 +
98355 + if (!PageSlab(page))
98356 + return false;
98357 +
98358 + cachep = page->slab_cache;
98359 + return cachep->flags & SLAB_USERCOPY;
98360 +}
98361 +
98362 +#ifdef CONFIG_PAX_USERCOPY
98363 +const char *check_heap_object(const void *ptr, unsigned long n)
98364 +{
98365 + struct page *page;
98366 + struct kmem_cache *cachep;
98367 + unsigned int objnr;
98368 + unsigned long offset;
98369 +
98370 + if (ZERO_OR_NULL_PTR(ptr))
98371 + return "<null>";
98372 +
98373 + if (!virt_addr_valid(ptr))
98374 + return NULL;
98375 +
98376 + page = virt_to_head_page(ptr);
98377 +
98378 + if (!PageSlab(page))
98379 + return NULL;
98380 +
98381 + cachep = page->slab_cache;
98382 + if (!(cachep->flags & SLAB_USERCOPY))
98383 + return cachep->name;
98384 +
98385 + objnr = obj_to_index(cachep, page, ptr);
98386 + BUG_ON(objnr >= cachep->num);
98387 + offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
98388 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
98389 + return NULL;
98390 +
98391 + return cachep->name;
98392 +}
98393 +#endif
98394 +
98395 /**
98396 * ksize - get the actual amount of memory allocated for a given object
98397 * @objp: Pointer to the object
98398 diff --git a/mm/slab.h b/mm/slab.h
98399 index ab019e6..fbcac34 100644
98400 --- a/mm/slab.h
98401 +++ b/mm/slab.h
98402 @@ -22,7 +22,7 @@ struct kmem_cache {
98403 unsigned int align; /* Alignment as calculated */
98404 unsigned long flags; /* Active flags on the slab */
98405 const char *name; /* Slab name for sysfs */
98406 - int refcount; /* Use counter */
98407 + atomic_t refcount; /* Use counter */
98408 void (*ctor)(void *); /* Called on object slot creation */
98409 struct list_head list; /* List of all slab caches on the system */
98410 };
98411 @@ -66,6 +66,20 @@ extern struct list_head slab_caches;
98412 /* The slab cache that manages slab cache information */
98413 extern struct kmem_cache *kmem_cache;
98414
98415 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98416 +#ifdef CONFIG_X86_64
98417 +#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
98418 +#else
98419 +#define PAX_MEMORY_SANITIZE_VALUE '\xff'
98420 +#endif
98421 +enum pax_sanitize_mode {
98422 + PAX_SANITIZE_SLAB_OFF = 0,
98423 + PAX_SANITIZE_SLAB_FAST,
98424 + PAX_SANITIZE_SLAB_FULL,
98425 +};
98426 +extern enum pax_sanitize_mode pax_sanitize_slab;
98427 +#endif
98428 +
98429 unsigned long calculate_alignment(unsigned long flags,
98430 unsigned long align, unsigned long size);
98431
98432 @@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
98433
98434 /* Legal flag mask for kmem_cache_create(), for various configurations */
98435 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
98436 - SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
98437 + SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
98438 + SLAB_USERCOPY | SLAB_NO_SANITIZE)
98439
98440 #if defined(CONFIG_DEBUG_SLAB)
98441 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
98442 @@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
98443 return s;
98444
98445 page = virt_to_head_page(x);
98446 +
98447 + BUG_ON(!PageSlab(page));
98448 +
98449 cachep = page->slab_cache;
98450 if (slab_equal_or_root(cachep, s))
98451 return cachep;
98452 diff --git a/mm/slab_common.c b/mm/slab_common.c
98453 index dcdab81..3576646 100644
98454 --- a/mm/slab_common.c
98455 +++ b/mm/slab_common.c
98456 @@ -25,11 +25,35 @@
98457
98458 #include "slab.h"
98459
98460 -enum slab_state slab_state;
98461 +enum slab_state slab_state __read_only;
98462 LIST_HEAD(slab_caches);
98463 DEFINE_MUTEX(slab_mutex);
98464 struct kmem_cache *kmem_cache;
98465
98466 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98467 +enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
98468 +static int __init pax_sanitize_slab_setup(char *str)
98469 +{
98470 + if (!str)
98471 + return 0;
98472 +
98473 + if (!strcmp(str, "0") || !strcmp(str, "off")) {
98474 + pr_info("PaX slab sanitization: %s\n", "disabled");
98475 + pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
98476 + } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
98477 + pr_info("PaX slab sanitization: %s\n", "fast");
98478 + pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
98479 + } else if (!strcmp(str, "full")) {
98480 + pr_info("PaX slab sanitization: %s\n", "full");
98481 + pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
98482 + } else
98483 + pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
98484 +
98485 + return 0;
98486 +}
98487 +early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
98488 +#endif
98489 +
98490 /*
98491 * Set of flags that will prevent slab merging
98492 */
98493 @@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
98494 * Merge control. If this is set then no merging of slab caches will occur.
98495 * (Could be removed. This was introduced to pacify the merge skeptics.)
98496 */
98497 -static int slab_nomerge;
98498 +static int slab_nomerge = 1;
98499
98500 static int __init setup_slab_nomerge(char *str)
98501 {
98502 @@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
98503 /*
98504 * We may have set a slab to be unmergeable during bootstrap.
98505 */
98506 - if (s->refcount < 0)
98507 + if (atomic_read(&s->refcount) < 0)
98508 return 1;
98509
98510 return 0;
98511 @@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
98512 if (err)
98513 goto out_free_cache;
98514
98515 - s->refcount = 1;
98516 + atomic_set(&s->refcount, 1);
98517 list_add(&s->list, &slab_caches);
98518 out:
98519 if (err)
98520 @@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
98521 */
98522 flags &= CACHE_CREATE_MASK;
98523
98524 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98525 + if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
98526 + flags |= SLAB_NO_SANITIZE;
98527 + else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
98528 + flags &= ~SLAB_NO_SANITIZE;
98529 +#endif
98530 +
98531 s = __kmem_cache_alias(name, size, align, flags, ctor);
98532 if (s)
98533 goto out_unlock;
98534 @@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98535
98536 mutex_lock(&slab_mutex);
98537
98538 - s->refcount--;
98539 - if (s->refcount)
98540 + if (!atomic_dec_and_test(&s->refcount))
98541 goto out_unlock;
98542
98543 if (memcg_cleanup_cache_params(s) != 0)
98544 @@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98545 rcu_barrier();
98546
98547 memcg_free_cache_params(s);
98548 -#ifdef SLAB_SUPPORTS_SYSFS
98549 +#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
98550 sysfs_slab_remove(s);
98551 #else
98552 slab_kmem_cache_release(s);
98553 @@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
98554 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
98555 name, size, err);
98556
98557 - s->refcount = -1; /* Exempt from merging for now */
98558 + atomic_set(&s->refcount, -1); /* Exempt from merging for now */
98559 }
98560
98561 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98562 @@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98563
98564 create_boot_cache(s, name, size, flags);
98565 list_add(&s->list, &slab_caches);
98566 - s->refcount = 1;
98567 + atomic_set(&s->refcount, 1);
98568 return s;
98569 }
98570
98571 @@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
98572 EXPORT_SYMBOL(kmalloc_dma_caches);
98573 #endif
98574
98575 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98576 +struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
98577 +EXPORT_SYMBOL(kmalloc_usercopy_caches);
98578 +#endif
98579 +
98580 /*
98581 * Conversion table for small slabs sizes / 8 to the index in the
98582 * kmalloc array. This is necessary for slabs < 192 since we have non power
98583 @@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
98584 return kmalloc_dma_caches[index];
98585
98586 #endif
98587 +
98588 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98589 + if (unlikely((flags & GFP_USERCOPY)))
98590 + return kmalloc_usercopy_caches[index];
98591 +
98592 +#endif
98593 +
98594 return kmalloc_caches[index];
98595 }
98596
98597 @@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
98598 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
98599 if (!kmalloc_caches[i]) {
98600 kmalloc_caches[i] = create_kmalloc_cache(NULL,
98601 - 1 << i, flags);
98602 + 1 << i, SLAB_USERCOPY | flags);
98603 }
98604
98605 /*
98606 @@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
98607 * earlier power of two caches
98608 */
98609 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
98610 - kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
98611 + kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
98612
98613 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
98614 - kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
98615 + kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
98616 }
98617
98618 /* Kmalloc array is now usable */
98619 @@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
98620 }
98621 }
98622 #endif
98623 +
98624 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98625 + for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
98626 + struct kmem_cache *s = kmalloc_caches[i];
98627 +
98628 + if (s) {
98629 + int size = kmalloc_size(i);
98630 + char *n = kasprintf(GFP_NOWAIT,
98631 + "usercopy-kmalloc-%d", size);
98632 +
98633 + BUG_ON(!n);
98634 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
98635 + size, SLAB_USERCOPY | flags);
98636 + }
98637 + }
98638 +#endif
98639 +
98640 }
98641 #endif /* !CONFIG_SLOB */
98642
98643 @@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
98644 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
98645 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
98646 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
98647 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98648 + seq_puts(m, " : pax <sanitized> <not_sanitized>");
98649 +#endif
98650 #endif
98651 seq_putc(m, '\n');
98652 }
98653 diff --git a/mm/slob.c b/mm/slob.c
98654 index 96a8620..3e7e663 100644
98655 --- a/mm/slob.c
98656 +++ b/mm/slob.c
98657 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
98658 /*
98659 * Return the size of a slob block.
98660 */
98661 -static slobidx_t slob_units(slob_t *s)
98662 +static slobidx_t slob_units(const slob_t *s)
98663 {
98664 if (s->units > 0)
98665 return s->units;
98666 @@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
98667 /*
98668 * Return the next free slob block pointer after this one.
98669 */
98670 -static slob_t *slob_next(slob_t *s)
98671 +static slob_t *slob_next(const slob_t *s)
98672 {
98673 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
98674 slobidx_t next;
98675 @@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
98676 /*
98677 * Returns true if s is the last free block in its page.
98678 */
98679 -static int slob_last(slob_t *s)
98680 +static int slob_last(const slob_t *s)
98681 {
98682 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
98683 }
98684
98685 -static void *slob_new_pages(gfp_t gfp, int order, int node)
98686 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
98687 {
98688 - void *page;
98689 + struct page *page;
98690
98691 #ifdef CONFIG_NUMA
98692 if (node != NUMA_NO_NODE)
98693 @@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
98694 if (!page)
98695 return NULL;
98696
98697 - return page_address(page);
98698 + __SetPageSlab(page);
98699 + return page;
98700 }
98701
98702 -static void slob_free_pages(void *b, int order)
98703 +static void slob_free_pages(struct page *sp, int order)
98704 {
98705 if (current->reclaim_state)
98706 current->reclaim_state->reclaimed_slab += 1 << order;
98707 - free_pages((unsigned long)b, order);
98708 + __ClearPageSlab(sp);
98709 + page_mapcount_reset(sp);
98710 + sp->private = 0;
98711 + __free_pages(sp, order);
98712 }
98713
98714 /*
98715 @@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98716
98717 /* Not enough space: must allocate a new page */
98718 if (!b) {
98719 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98720 - if (!b)
98721 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98722 + if (!sp)
98723 return NULL;
98724 - sp = virt_to_page(b);
98725 - __SetPageSlab(sp);
98726 + b = page_address(sp);
98727
98728 spin_lock_irqsave(&slob_lock, flags);
98729 sp->units = SLOB_UNITS(PAGE_SIZE);
98730 sp->freelist = b;
98731 + sp->private = 0;
98732 INIT_LIST_HEAD(&sp->lru);
98733 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
98734 set_slob_page_free(sp, slob_list);
98735 @@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98736 /*
98737 * slob_free: entry point into the slob allocator.
98738 */
98739 -static void slob_free(void *block, int size)
98740 +static void slob_free(struct kmem_cache *c, void *block, int size)
98741 {
98742 struct page *sp;
98743 slob_t *prev, *next, *b = (slob_t *)block;
98744 @@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
98745 if (slob_page_free(sp))
98746 clear_slob_page_free(sp);
98747 spin_unlock_irqrestore(&slob_lock, flags);
98748 - __ClearPageSlab(sp);
98749 - page_mapcount_reset(sp);
98750 - slob_free_pages(b, 0);
98751 + slob_free_pages(sp, 0);
98752 return;
98753 }
98754
98755 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98756 + if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
98757 + memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
98758 +#endif
98759 +
98760 if (!slob_page_free(sp)) {
98761 /* This slob page is about to become partially free. Easy! */
98762 sp->units = units;
98763 @@ -424,11 +431,10 @@ out:
98764 */
98765
98766 static __always_inline void *
98767 -__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98768 +__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
98769 {
98770 - unsigned int *m;
98771 - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98772 - void *ret;
98773 + slob_t *m;
98774 + void *ret = NULL;
98775
98776 gfp &= gfp_allowed_mask;
98777
98778 @@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98779
98780 if (!m)
98781 return NULL;
98782 - *m = size;
98783 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
98784 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
98785 + m[0].units = size;
98786 + m[1].units = align;
98787 ret = (void *)m + align;
98788
98789 trace_kmalloc_node(caller, ret,
98790 size, size + align, gfp, node);
98791 } else {
98792 unsigned int order = get_order(size);
98793 + struct page *page;
98794
98795 if (likely(order))
98796 gfp |= __GFP_COMP;
98797 - ret = slob_new_pages(gfp, order, node);
98798 + page = slob_new_pages(gfp, order, node);
98799 + if (page) {
98800 + ret = page_address(page);
98801 + page->private = size;
98802 + }
98803
98804 trace_kmalloc_node(caller, ret,
98805 size, PAGE_SIZE << order, gfp, node);
98806 }
98807
98808 - kmemleak_alloc(ret, size, 1, gfp);
98809 + return ret;
98810 +}
98811 +
98812 +static __always_inline void *
98813 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98814 +{
98815 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98816 + void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
98817 +
98818 + if (!ZERO_OR_NULL_PTR(ret))
98819 + kmemleak_alloc(ret, size, 1, gfp);
98820 return ret;
98821 }
98822
98823 @@ -491,34 +515,112 @@ void kfree(const void *block)
98824 return;
98825 kmemleak_free(block);
98826
98827 + VM_BUG_ON(!virt_addr_valid(block));
98828 sp = virt_to_page(block);
98829 - if (PageSlab(sp)) {
98830 + VM_BUG_ON(!PageSlab(sp));
98831 + if (!sp->private) {
98832 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98833 - unsigned int *m = (unsigned int *)(block - align);
98834 - slob_free(m, *m + align);
98835 - } else
98836 + slob_t *m = (slob_t *)(block - align);
98837 + slob_free(NULL, m, m[0].units + align);
98838 + } else {
98839 + __ClearPageSlab(sp);
98840 + page_mapcount_reset(sp);
98841 + sp->private = 0;
98842 __free_pages(sp, compound_order(sp));
98843 + }
98844 }
98845 EXPORT_SYMBOL(kfree);
98846
98847 +bool is_usercopy_object(const void *ptr)
98848 +{
98849 + if (!slab_is_available())
98850 + return false;
98851 +
98852 + // PAX: TODO
98853 +
98854 + return false;
98855 +}
98856 +
98857 +#ifdef CONFIG_PAX_USERCOPY
98858 +const char *check_heap_object(const void *ptr, unsigned long n)
98859 +{
98860 + struct page *page;
98861 + const slob_t *free;
98862 + const void *base;
98863 + unsigned long flags;
98864 +
98865 + if (ZERO_OR_NULL_PTR(ptr))
98866 + return "<null>";
98867 +
98868 + if (!virt_addr_valid(ptr))
98869 + return NULL;
98870 +
98871 + page = virt_to_head_page(ptr);
98872 + if (!PageSlab(page))
98873 + return NULL;
98874 +
98875 + if (page->private) {
98876 + base = page;
98877 + if (base <= ptr && n <= page->private - (ptr - base))
98878 + return NULL;
98879 + return "<slob>";
98880 + }
98881 +
98882 + /* some tricky double walking to find the chunk */
98883 + spin_lock_irqsave(&slob_lock, flags);
98884 + base = (void *)((unsigned long)ptr & PAGE_MASK);
98885 + free = page->freelist;
98886 +
98887 + while (!slob_last(free) && (void *)free <= ptr) {
98888 + base = free + slob_units(free);
98889 + free = slob_next(free);
98890 + }
98891 +
98892 + while (base < (void *)free) {
98893 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
98894 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
98895 + int offset;
98896 +
98897 + if (ptr < base + align)
98898 + break;
98899 +
98900 + offset = ptr - base - align;
98901 + if (offset >= m) {
98902 + base += size;
98903 + continue;
98904 + }
98905 +
98906 + if (n > m - offset)
98907 + break;
98908 +
98909 + spin_unlock_irqrestore(&slob_lock, flags);
98910 + return NULL;
98911 + }
98912 +
98913 + spin_unlock_irqrestore(&slob_lock, flags);
98914 + return "<slob>";
98915 +}
98916 +#endif
98917 +
98918 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
98919 size_t ksize(const void *block)
98920 {
98921 struct page *sp;
98922 int align;
98923 - unsigned int *m;
98924 + slob_t *m;
98925
98926 BUG_ON(!block);
98927 if (unlikely(block == ZERO_SIZE_PTR))
98928 return 0;
98929
98930 sp = virt_to_page(block);
98931 - if (unlikely(!PageSlab(sp)))
98932 - return PAGE_SIZE << compound_order(sp);
98933 + VM_BUG_ON(!PageSlab(sp));
98934 + if (sp->private)
98935 + return sp->private;
98936
98937 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98938 - m = (unsigned int *)(block - align);
98939 - return SLOB_UNITS(*m) * SLOB_UNIT;
98940 + m = (slob_t *)(block - align);
98941 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
98942 }
98943 EXPORT_SYMBOL(ksize);
98944
98945 @@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
98946
98947 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
98948 {
98949 - void *b;
98950 + void *b = NULL;
98951
98952 flags &= gfp_allowed_mask;
98953
98954 lockdep_trace_alloc(flags);
98955
98956 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98957 + b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
98958 +#else
98959 if (c->size < PAGE_SIZE) {
98960 b = slob_alloc(c->size, flags, c->align, node);
98961 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
98962 SLOB_UNITS(c->size) * SLOB_UNIT,
98963 flags, node);
98964 } else {
98965 - b = slob_new_pages(flags, get_order(c->size), node);
98966 + struct page *sp;
98967 +
98968 + sp = slob_new_pages(flags, get_order(c->size), node);
98969 + if (sp) {
98970 + b = page_address(sp);
98971 + sp->private = c->size;
98972 + }
98973 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
98974 PAGE_SIZE << get_order(c->size),
98975 flags, node);
98976 }
98977 +#endif
98978
98979 if (b && c->ctor)
98980 c->ctor(b);
98981 @@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
98982 EXPORT_SYMBOL(kmem_cache_alloc_node);
98983 #endif
98984
98985 -static void __kmem_cache_free(void *b, int size)
98986 +static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
98987 {
98988 - if (size < PAGE_SIZE)
98989 - slob_free(b, size);
98990 + struct page *sp;
98991 +
98992 + sp = virt_to_page(b);
98993 + BUG_ON(!PageSlab(sp));
98994 + if (!sp->private)
98995 + slob_free(c, b, size);
98996 else
98997 - slob_free_pages(b, get_order(size));
98998 + slob_free_pages(sp, get_order(size));
98999 }
99000
99001 static void kmem_rcu_free(struct rcu_head *head)
99002 @@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
99003 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
99004 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
99005
99006 - __kmem_cache_free(b, slob_rcu->size);
99007 + __kmem_cache_free(NULL, b, slob_rcu->size);
99008 }
99009
99010 void kmem_cache_free(struct kmem_cache *c, void *b)
99011 {
99012 + int size = c->size;
99013 +
99014 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99015 + if (size + c->align < PAGE_SIZE) {
99016 + size += c->align;
99017 + b -= c->align;
99018 + }
99019 +#endif
99020 +
99021 kmemleak_free_recursive(b, c->flags);
99022 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
99023 struct slob_rcu *slob_rcu;
99024 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
99025 - slob_rcu->size = c->size;
99026 + slob_rcu = b + (size - sizeof(struct slob_rcu));
99027 + slob_rcu->size = size;
99028 call_rcu(&slob_rcu->head, kmem_rcu_free);
99029 } else {
99030 - __kmem_cache_free(b, c->size);
99031 + __kmem_cache_free(c, b, size);
99032 }
99033
99034 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99035 + trace_kfree(_RET_IP_, b);
99036 +#else
99037 trace_kmem_cache_free(_RET_IP_, b);
99038 +#endif
99039 +
99040 }
99041 EXPORT_SYMBOL(kmem_cache_free);
99042
99043 diff --git a/mm/slub.c b/mm/slub.c
99044 index ae7b9f1..7b3fdbe 100644
99045 --- a/mm/slub.c
99046 +++ b/mm/slub.c
99047 @@ -197,7 +197,7 @@ struct track {
99048
99049 enum track_item { TRACK_ALLOC, TRACK_FREE };
99050
99051 -#ifdef CONFIG_SYSFS
99052 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99053 static int sysfs_slab_add(struct kmem_cache *);
99054 static int sysfs_slab_alias(struct kmem_cache *, const char *);
99055 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
99056 @@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
99057 if (!t->addr)
99058 return;
99059
99060 - pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
99061 + pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
99062 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
99063 #ifdef CONFIG_STACKTRACE
99064 {
99065 @@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
99066
99067 slab_free_hook(s, x);
99068
99069 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99070 + if (!(s->flags & SLAB_NO_SANITIZE)) {
99071 + memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
99072 + if (s->ctor)
99073 + s->ctor(x);
99074 + }
99075 +#endif
99076 +
99077 redo:
99078 /*
99079 * Determine the currently cpus per cpu slab.
99080 @@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
99081 s->inuse = size;
99082
99083 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
99084 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99085 + (!(flags & SLAB_NO_SANITIZE)) ||
99086 +#endif
99087 s->ctor)) {
99088 /*
99089 * Relocate free pointer after the object if it is not
99090 @@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
99091 EXPORT_SYMBOL(__kmalloc_node);
99092 #endif
99093
99094 +bool is_usercopy_object(const void *ptr)
99095 +{
99096 + struct page *page;
99097 + struct kmem_cache *s;
99098 +
99099 + if (ZERO_OR_NULL_PTR(ptr))
99100 + return false;
99101 +
99102 + if (!slab_is_available())
99103 + return false;
99104 +
99105 + if (!virt_addr_valid(ptr))
99106 + return false;
99107 +
99108 + page = virt_to_head_page(ptr);
99109 +
99110 + if (!PageSlab(page))
99111 + return false;
99112 +
99113 + s = page->slab_cache;
99114 + return s->flags & SLAB_USERCOPY;
99115 +}
99116 +
99117 +#ifdef CONFIG_PAX_USERCOPY
99118 +const char *check_heap_object(const void *ptr, unsigned long n)
99119 +{
99120 + struct page *page;
99121 + struct kmem_cache *s;
99122 + unsigned long offset;
99123 +
99124 + if (ZERO_OR_NULL_PTR(ptr))
99125 + return "<null>";
99126 +
99127 + if (!virt_addr_valid(ptr))
99128 + return NULL;
99129 +
99130 + page = virt_to_head_page(ptr);
99131 +
99132 + if (!PageSlab(page))
99133 + return NULL;
99134 +
99135 + s = page->slab_cache;
99136 + if (!(s->flags & SLAB_USERCOPY))
99137 + return s->name;
99138 +
99139 + offset = (ptr - page_address(page)) % s->size;
99140 + if (offset <= s->object_size && n <= s->object_size - offset)
99141 + return NULL;
99142 +
99143 + return s->name;
99144 +}
99145 +#endif
99146 +
99147 size_t ksize(const void *object)
99148 {
99149 struct page *page;
99150 @@ -3329,6 +3393,7 @@ void kfree(const void *x)
99151 if (unlikely(ZERO_OR_NULL_PTR(x)))
99152 return;
99153
99154 + VM_BUG_ON(!virt_addr_valid(x));
99155 page = virt_to_head_page(x);
99156 if (unlikely(!PageSlab(page))) {
99157 BUG_ON(!PageCompound(page));
99158 @@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99159 int i;
99160 struct kmem_cache *c;
99161
99162 - s->refcount++;
99163 + atomic_inc(&s->refcount);
99164
99165 /*
99166 * Adjust the object sizes so that we clear
99167 @@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99168 }
99169
99170 if (sysfs_slab_alias(s, name)) {
99171 - s->refcount--;
99172 + atomic_dec(&s->refcount);
99173 s = NULL;
99174 }
99175 }
99176 @@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
99177 }
99178 #endif
99179
99180 -#ifdef CONFIG_SYSFS
99181 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99182 static int count_inuse(struct page *page)
99183 {
99184 return page->inuse;
99185 @@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
99186 len += sprintf(buf + len, "%7ld ", l->count);
99187
99188 if (l->addr)
99189 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99190 + len += sprintf(buf + len, "%pS", NULL);
99191 +#else
99192 len += sprintf(buf + len, "%pS", (void *)l->addr);
99193 +#endif
99194 else
99195 len += sprintf(buf + len, "<not-available>");
99196
99197 @@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
99198 validate_slab_cache(kmalloc_caches[9]);
99199 }
99200 #else
99201 -#ifdef CONFIG_SYSFS
99202 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99203 static void resiliency_test(void) {};
99204 #endif
99205 #endif
99206
99207 -#ifdef CONFIG_SYSFS
99208 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99209 enum slab_stat_type {
99210 SL_ALL, /* All slabs */
99211 SL_PARTIAL, /* Only partially allocated slabs */
99212 @@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
99213 {
99214 if (!s->ctor)
99215 return 0;
99216 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99217 + return sprintf(buf, "%pS\n", NULL);
99218 +#else
99219 return sprintf(buf, "%pS\n", s->ctor);
99220 +#endif
99221 }
99222 SLAB_ATTR_RO(ctor);
99223
99224 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
99225 {
99226 - return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
99227 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
99228 }
99229 SLAB_ATTR_RO(aliases);
99230
99231 @@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
99232 SLAB_ATTR_RO(cache_dma);
99233 #endif
99234
99235 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99236 +static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
99237 +{
99238 + return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
99239 +}
99240 +SLAB_ATTR_RO(usercopy);
99241 +#endif
99242 +
99243 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99244 +static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
99245 +{
99246 + return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
99247 +}
99248 +SLAB_ATTR_RO(sanitize);
99249 +#endif
99250 +
99251 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
99252 {
99253 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
99254 @@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
99255 * as well as cause other issues like converting a mergeable
99256 * cache into an umergeable one.
99257 */
99258 - if (s->refcount > 1)
99259 + if (atomic_read(&s->refcount) > 1)
99260 return -EINVAL;
99261
99262 s->flags &= ~SLAB_TRACE;
99263 @@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
99264 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
99265 size_t length)
99266 {
99267 - if (s->refcount > 1)
99268 + if (atomic_read(&s->refcount) > 1)
99269 return -EINVAL;
99270
99271 s->flags &= ~SLAB_FAILSLAB;
99272 @@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
99273 #ifdef CONFIG_ZONE_DMA
99274 &cache_dma_attr.attr,
99275 #endif
99276 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99277 + &usercopy_attr.attr,
99278 +#endif
99279 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99280 + &sanitize_attr.attr,
99281 +#endif
99282 #ifdef CONFIG_NUMA
99283 &remote_node_defrag_ratio_attr.attr,
99284 #endif
99285 @@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
99286 return name;
99287 }
99288
99289 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99290 static int sysfs_slab_add(struct kmem_cache *s)
99291 {
99292 int err;
99293 @@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
99294 kobject_del(&s->kobj);
99295 kobject_put(&s->kobj);
99296 }
99297 +#endif
99298
99299 /*
99300 * Need to buffer aliases during bootup until sysfs becomes
99301 @@ -5154,6 +5251,7 @@ struct saved_alias {
99302
99303 static struct saved_alias *alias_list;
99304
99305 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99306 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99307 {
99308 struct saved_alias *al;
99309 @@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99310 alias_list = al;
99311 return 0;
99312 }
99313 +#endif
99314
99315 static int __init slab_sysfs_init(void)
99316 {
99317 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
99318 index 4cba9c2..b4f9fcc 100644
99319 --- a/mm/sparse-vmemmap.c
99320 +++ b/mm/sparse-vmemmap.c
99321 @@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
99322 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99323 if (!p)
99324 return NULL;
99325 - pud_populate(&init_mm, pud, p);
99326 + pud_populate_kernel(&init_mm, pud, p);
99327 }
99328 return pud;
99329 }
99330 @@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
99331 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99332 if (!p)
99333 return NULL;
99334 - pgd_populate(&init_mm, pgd, p);
99335 + pgd_populate_kernel(&init_mm, pgd, p);
99336 }
99337 return pgd;
99338 }
99339 diff --git a/mm/sparse.c b/mm/sparse.c
99340 index d1b48b6..6e8590e 100644
99341 --- a/mm/sparse.c
99342 +++ b/mm/sparse.c
99343 @@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
99344
99345 for (i = 0; i < PAGES_PER_SECTION; i++) {
99346 if (PageHWPoison(&memmap[i])) {
99347 - atomic_long_sub(1, &num_poisoned_pages);
99348 + atomic_long_sub_unchecked(1, &num_poisoned_pages);
99349 ClearPageHWPoison(&memmap[i]);
99350 }
99351 }
99352 diff --git a/mm/swap.c b/mm/swap.c
99353 index 8a12b33..7068e78 100644
99354 --- a/mm/swap.c
99355 +++ b/mm/swap.c
99356 @@ -31,6 +31,7 @@
99357 #include <linux/memcontrol.h>
99358 #include <linux/gfp.h>
99359 #include <linux/uio.h>
99360 +#include <linux/hugetlb.h>
99361
99362 #include "internal.h"
99363
99364 @@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
99365
99366 __page_cache_release(page);
99367 dtor = get_compound_page_dtor(page);
99368 + if (!PageHuge(page))
99369 + BUG_ON(dtor != free_compound_page);
99370 (*dtor)(page);
99371 }
99372
99373 diff --git a/mm/swapfile.c b/mm/swapfile.c
99374 index 8798b2e..348f9dd 100644
99375 --- a/mm/swapfile.c
99376 +++ b/mm/swapfile.c
99377 @@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
99378
99379 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
99380 /* Activity counter to indicate that a swapon or swapoff has occurred */
99381 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
99382 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
99383
99384 static inline unsigned char swap_count(unsigned char ent)
99385 {
99386 @@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
99387 spin_unlock(&swap_lock);
99388
99389 err = 0;
99390 - atomic_inc(&proc_poll_event);
99391 + atomic_inc_unchecked(&proc_poll_event);
99392 wake_up_interruptible(&proc_poll_wait);
99393
99394 out_dput:
99395 @@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
99396
99397 poll_wait(file, &proc_poll_wait, wait);
99398
99399 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
99400 - seq->poll_event = atomic_read(&proc_poll_event);
99401 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
99402 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99403 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
99404 }
99405
99406 @@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
99407 return ret;
99408
99409 seq = file->private_data;
99410 - seq->poll_event = atomic_read(&proc_poll_event);
99411 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99412 return 0;
99413 }
99414
99415 @@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
99416 (frontswap_map) ? "FS" : "");
99417
99418 mutex_unlock(&swapon_mutex);
99419 - atomic_inc(&proc_poll_event);
99420 + atomic_inc_unchecked(&proc_poll_event);
99421 wake_up_interruptible(&proc_poll_wait);
99422
99423 if (S_ISREG(inode->i_mode))
99424 diff --git a/mm/util.c b/mm/util.c
99425 index fec39d4..3e60325 100644
99426 --- a/mm/util.c
99427 +++ b/mm/util.c
99428 @@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
99429 void arch_pick_mmap_layout(struct mm_struct *mm)
99430 {
99431 mm->mmap_base = TASK_UNMAPPED_BASE;
99432 +
99433 +#ifdef CONFIG_PAX_RANDMMAP
99434 + if (mm->pax_flags & MF_PAX_RANDMMAP)
99435 + mm->mmap_base += mm->delta_mmap;
99436 +#endif
99437 +
99438 mm->get_unmapped_area = arch_get_unmapped_area;
99439 }
99440 #endif
99441 @@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
99442 if (!mm->arg_end)
99443 goto out_mm; /* Shh! No looking before we're done */
99444
99445 + if (gr_acl_handle_procpidmem(task))
99446 + goto out_mm;
99447 +
99448 len = mm->arg_end - mm->arg_start;
99449
99450 if (len > buflen)
99451 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
99452 index 90520af..24231aa 100644
99453 --- a/mm/vmalloc.c
99454 +++ b/mm/vmalloc.c
99455 @@ -40,6 +40,21 @@ struct vfree_deferred {
99456 };
99457 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
99458
99459 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99460 +struct stack_deferred_llist {
99461 + struct llist_head list;
99462 + void *stack;
99463 + void *lowmem_stack;
99464 +};
99465 +
99466 +struct stack_deferred {
99467 + struct stack_deferred_llist list;
99468 + struct work_struct wq;
99469 +};
99470 +
99471 +static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
99472 +#endif
99473 +
99474 static void __vunmap(const void *, int);
99475
99476 static void free_work(struct work_struct *w)
99477 @@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
99478 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
99479 struct llist_node *llnode = llist_del_all(&p->list);
99480 while (llnode) {
99481 - void *p = llnode;
99482 + void *x = llnode;
99483 llnode = llist_next(llnode);
99484 - __vunmap(p, 1);
99485 + __vunmap(x, 1);
99486 }
99487 }
99488
99489 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99490 +static void unmap_work(struct work_struct *w)
99491 +{
99492 + struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
99493 + struct llist_node *llnode = llist_del_all(&p->list.list);
99494 + while (llnode) {
99495 + struct stack_deferred_llist *x =
99496 + llist_entry((struct llist_head *)llnode,
99497 + struct stack_deferred_llist, list);
99498 + void *stack = ACCESS_ONCE(x->stack);
99499 + void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
99500 + llnode = llist_next(llnode);
99501 + __vunmap(stack, 0);
99502 + free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
99503 + }
99504 +}
99505 +#endif
99506 +
99507 /*** Page table manipulation functions ***/
99508
99509 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99510 @@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99511
99512 pte = pte_offset_kernel(pmd, addr);
99513 do {
99514 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99515 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99516 +
99517 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99518 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
99519 + BUG_ON(!pte_exec(*pte));
99520 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
99521 + continue;
99522 + }
99523 +#endif
99524 +
99525 + {
99526 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99527 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99528 + }
99529 } while (pte++, addr += PAGE_SIZE, addr != end);
99530 }
99531
99532 @@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
99533 pte = pte_alloc_kernel(pmd, addr);
99534 if (!pte)
99535 return -ENOMEM;
99536 +
99537 + pax_open_kernel();
99538 do {
99539 struct page *page = pages[*nr];
99540
99541 - if (WARN_ON(!pte_none(*pte)))
99542 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99543 + if (pgprot_val(prot) & _PAGE_NX)
99544 +#endif
99545 +
99546 + if (!pte_none(*pte)) {
99547 + pax_close_kernel();
99548 + WARN_ON(1);
99549 return -EBUSY;
99550 - if (WARN_ON(!page))
99551 + }
99552 + if (!page) {
99553 + pax_close_kernel();
99554 + WARN_ON(1);
99555 return -ENOMEM;
99556 + }
99557 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
99558 (*nr)++;
99559 } while (pte++, addr += PAGE_SIZE, addr != end);
99560 + pax_close_kernel();
99561 return 0;
99562 }
99563
99564 @@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
99565 pmd_t *pmd;
99566 unsigned long next;
99567
99568 - pmd = pmd_alloc(&init_mm, pud, addr);
99569 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
99570 if (!pmd)
99571 return -ENOMEM;
99572 do {
99573 @@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
99574 pud_t *pud;
99575 unsigned long next;
99576
99577 - pud = pud_alloc(&init_mm, pgd, addr);
99578 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
99579 if (!pud)
99580 return -ENOMEM;
99581 do {
99582 @@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
99583 if (addr >= MODULES_VADDR && addr < MODULES_END)
99584 return 1;
99585 #endif
99586 +
99587 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99588 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
99589 + return 1;
99590 +#endif
99591 +
99592 return is_vmalloc_addr(x);
99593 }
99594
99595 @@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
99596
99597 if (!pgd_none(*pgd)) {
99598 pud_t *pud = pud_offset(pgd, addr);
99599 +#ifdef CONFIG_X86
99600 + if (!pud_large(*pud))
99601 +#endif
99602 if (!pud_none(*pud)) {
99603 pmd_t *pmd = pmd_offset(pud, addr);
99604 +#ifdef CONFIG_X86
99605 + if (!pmd_large(*pmd))
99606 +#endif
99607 if (!pmd_none(*pmd)) {
99608 pte_t *ptep, pte;
99609
99610 @@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
99611 for_each_possible_cpu(i) {
99612 struct vmap_block_queue *vbq;
99613 struct vfree_deferred *p;
99614 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99615 + struct stack_deferred *p2;
99616 +#endif
99617
99618 vbq = &per_cpu(vmap_block_queue, i);
99619 spin_lock_init(&vbq->lock);
99620 INIT_LIST_HEAD(&vbq->free);
99621 +
99622 p = &per_cpu(vfree_deferred, i);
99623 init_llist_head(&p->list);
99624 INIT_WORK(&p->wq, free_work);
99625 +
99626 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99627 + p2 = &per_cpu(stack_deferred, i);
99628 + init_llist_head(&p2->list.list);
99629 + INIT_WORK(&p2->wq, unmap_work);
99630 +#endif
99631 }
99632
99633 /* Import existing vmlist entries. */
99634 @@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
99635 struct vm_struct *area;
99636
99637 BUG_ON(in_interrupt());
99638 +
99639 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99640 + if (flags & VM_KERNEXEC) {
99641 + if (start != VMALLOC_START || end != VMALLOC_END)
99642 + return NULL;
99643 + start = (unsigned long)MODULES_EXEC_VADDR;
99644 + end = (unsigned long)MODULES_EXEC_END;
99645 + }
99646 +#endif
99647 +
99648 if (flags & VM_IOREMAP)
99649 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
99650
99651 @@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
99652 }
99653 EXPORT_SYMBOL(vunmap);
99654
99655 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99656 +void unmap_process_stacks(struct task_struct *task)
99657 +{
99658 + if (unlikely(in_interrupt())) {
99659 + struct stack_deferred *p = &__get_cpu_var(stack_deferred);
99660 + struct stack_deferred_llist *list = task->stack;
99661 + list->stack = task->stack;
99662 + list->lowmem_stack = task->lowmem_stack;
99663 + if (llist_add((struct llist_node *)&list->list, &p->list.list))
99664 + schedule_work(&p->wq);
99665 + } else {
99666 + __vunmap(task->stack, 0);
99667 + free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
99668 + }
99669 +}
99670 +#endif
99671 +
99672 /**
99673 * vmap - map an array of pages into virtually contiguous space
99674 * @pages: array of page pointers
99675 @@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
99676 if (count > totalram_pages)
99677 return NULL;
99678
99679 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99680 + if (!(pgprot_val(prot) & _PAGE_NX))
99681 + flags |= VM_KERNEXEC;
99682 +#endif
99683 +
99684 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
99685 __builtin_return_address(0));
99686 if (!area)
99687 @@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
99688 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
99689 goto fail;
99690
99691 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99692 + if (!(pgprot_val(prot) & _PAGE_NX))
99693 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
99694 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
99695 + else
99696 +#endif
99697 +
99698 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
99699 start, end, node, gfp_mask, caller);
99700 if (!area)
99701 @@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
99702 * For tight control over page level allocator and protection flags
99703 * use __vmalloc() instead.
99704 */
99705 -
99706 void *vmalloc_exec(unsigned long size)
99707 {
99708 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
99709 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
99710 NUMA_NO_NODE, __builtin_return_address(0));
99711 }
99712
99713 @@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
99714 {
99715 struct vm_struct *area;
99716
99717 + BUG_ON(vma->vm_mirror);
99718 +
99719 size = PAGE_ALIGN(size);
99720
99721 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
99722 @@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
99723 v->addr, v->addr + v->size, v->size);
99724
99725 if (v->caller)
99726 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99727 + seq_printf(m, " %pK", v->caller);
99728 +#else
99729 seq_printf(m, " %pS", v->caller);
99730 +#endif
99731
99732 if (v->nr_pages)
99733 seq_printf(m, " pages=%d", v->nr_pages);
99734 diff --git a/mm/vmstat.c b/mm/vmstat.c
99735 index 1b12d39..57b29b2 100644
99736 --- a/mm/vmstat.c
99737 +++ b/mm/vmstat.c
99738 @@ -22,6 +22,7 @@
99739 #include <linux/writeback.h>
99740 #include <linux/compaction.h>
99741 #include <linux/mm_inline.h>
99742 +#include <linux/grsecurity.h>
99743
99744 #include "internal.h"
99745
99746 @@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
99747 *
99748 * vm_stat contains the global counters
99749 */
99750 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99751 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99752 EXPORT_SYMBOL(vm_stat);
99753
99754 #ifdef CONFIG_SMP
99755 @@ -433,7 +434,7 @@ static int fold_diff(int *diff)
99756
99757 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99758 if (diff[i]) {
99759 - atomic_long_add(diff[i], &vm_stat[i]);
99760 + atomic_long_add_unchecked(diff[i], &vm_stat[i]);
99761 changes++;
99762 }
99763 return changes;
99764 @@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
99765 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
99766 if (v) {
99767
99768 - atomic_long_add(v, &zone->vm_stat[i]);
99769 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99770 global_diff[i] += v;
99771 #ifdef CONFIG_NUMA
99772 /* 3 seconds idle till flush */
99773 @@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
99774
99775 v = p->vm_stat_diff[i];
99776 p->vm_stat_diff[i] = 0;
99777 - atomic_long_add(v, &zone->vm_stat[i]);
99778 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99779 global_diff[i] += v;
99780 }
99781 }
99782 @@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
99783 if (pset->vm_stat_diff[i]) {
99784 int v = pset->vm_stat_diff[i];
99785 pset->vm_stat_diff[i] = 0;
99786 - atomic_long_add(v, &zone->vm_stat[i]);
99787 - atomic_long_add(v, &vm_stat[i]);
99788 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99789 + atomic_long_add_unchecked(v, &vm_stat[i]);
99790 }
99791 }
99792 #endif
99793 @@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
99794 stat_items_size += sizeof(struct vm_event_state);
99795 #endif
99796
99797 - v = kmalloc(stat_items_size, GFP_KERNEL);
99798 + v = kzalloc(stat_items_size, GFP_KERNEL);
99799 m->private = v;
99800 if (!v)
99801 return ERR_PTR(-ENOMEM);
99802 +
99803 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
99804 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99805 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
99806 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
99807 + && !in_group_p(grsec_proc_gid)
99808 +#endif
99809 + )
99810 + return (unsigned long *)m->private + *pos;
99811 +#endif
99812 +#endif
99813 +
99814 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99815 v[i] = global_page_state(i);
99816 v += NR_VM_ZONE_STAT_ITEMS;
99817 @@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
99818 cpu_notifier_register_done();
99819 #endif
99820 #ifdef CONFIG_PROC_FS
99821 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
99822 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
99823 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99824 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
99825 + {
99826 + mode_t gr_mode = S_IRUGO;
99827 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
99828 + gr_mode = S_IRUSR;
99829 +#endif
99830 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
99831 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
99832 + proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99833 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
99834 + }
99835 #endif
99836 return 0;
99837 }
99838 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
99839 index 64c6bed..b79a5de 100644
99840 --- a/net/8021q/vlan.c
99841 +++ b/net/8021q/vlan.c
99842 @@ -481,7 +481,7 @@ out:
99843 return NOTIFY_DONE;
99844 }
99845
99846 -static struct notifier_block vlan_notifier_block __read_mostly = {
99847 +static struct notifier_block vlan_notifier_block = {
99848 .notifier_call = vlan_device_event,
99849 };
99850
99851 @@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
99852 err = -EPERM;
99853 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
99854 break;
99855 - if ((args.u.name_type >= 0) &&
99856 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
99857 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
99858 struct vlan_net *vn;
99859
99860 vn = net_generic(net, vlan_net_id);
99861 diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
99862 index 8ac8a5c..991defc 100644
99863 --- a/net/8021q/vlan_netlink.c
99864 +++ b/net/8021q/vlan_netlink.c
99865 @@ -238,7 +238,7 @@ nla_put_failure:
99866 return -EMSGSIZE;
99867 }
99868
99869 -struct rtnl_link_ops vlan_link_ops __read_mostly = {
99870 +struct rtnl_link_ops vlan_link_ops = {
99871 .kind = "vlan",
99872 .maxtype = IFLA_VLAN_MAX,
99873 .policy = vlan_policy,
99874 diff --git a/net/9p/client.c b/net/9p/client.c
99875 index e86a9bea..e91f70e 100644
99876 --- a/net/9p/client.c
99877 +++ b/net/9p/client.c
99878 @@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
99879 len - inline_len);
99880 } else {
99881 err = copy_from_user(ename + inline_len,
99882 - uidata, len - inline_len);
99883 + (char __force_user *)uidata, len - inline_len);
99884 if (err) {
99885 err = -EFAULT;
99886 goto out_err;
99887 @@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
99888 kernel_buf = 1;
99889 indata = data;
99890 } else
99891 - indata = (__force char *)udata;
99892 + indata = (__force_kernel char *)udata;
99893 /*
99894 * response header len is 11
99895 * PDU Header(7) + IO Size (4)
99896 @@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
99897 kernel_buf = 1;
99898 odata = data;
99899 } else
99900 - odata = (char *)udata;
99901 + odata = (char __force_kernel *)udata;
99902 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
99903 P9_ZC_HDR_SZ, kernel_buf, "dqd",
99904 fid->fid, offset, rsize);
99905 diff --git a/net/9p/mod.c b/net/9p/mod.c
99906 index 6ab36ae..6f1841b 100644
99907 --- a/net/9p/mod.c
99908 +++ b/net/9p/mod.c
99909 @@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
99910 void v9fs_register_trans(struct p9_trans_module *m)
99911 {
99912 spin_lock(&v9fs_trans_lock);
99913 - list_add_tail(&m->list, &v9fs_trans_list);
99914 + pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
99915 spin_unlock(&v9fs_trans_lock);
99916 }
99917 EXPORT_SYMBOL(v9fs_register_trans);
99918 @@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
99919 void v9fs_unregister_trans(struct p9_trans_module *m)
99920 {
99921 spin_lock(&v9fs_trans_lock);
99922 - list_del_init(&m->list);
99923 + pax_list_del_init((struct list_head *)&m->list);
99924 spin_unlock(&v9fs_trans_lock);
99925 }
99926 EXPORT_SYMBOL(v9fs_unregister_trans);
99927 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
99928 index 80d08f6..de63fd1 100644
99929 --- a/net/9p/trans_fd.c
99930 +++ b/net/9p/trans_fd.c
99931 @@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
99932 oldfs = get_fs();
99933 set_fs(get_ds());
99934 /* The cast to a user pointer is valid due to the set_fs() */
99935 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
99936 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
99937 set_fs(oldfs);
99938
99939 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
99940 diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
99941 index af46bc4..f9adfcd 100644
99942 --- a/net/appletalk/atalk_proc.c
99943 +++ b/net/appletalk/atalk_proc.c
99944 @@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
99945 struct proc_dir_entry *p;
99946 int rc = -ENOMEM;
99947
99948 - atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
99949 + atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
99950 if (!atalk_proc_dir)
99951 goto out;
99952
99953 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
99954 index 876fbe8..8bbea9f 100644
99955 --- a/net/atm/atm_misc.c
99956 +++ b/net/atm/atm_misc.c
99957 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
99958 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
99959 return 1;
99960 atm_return(vcc, truesize);
99961 - atomic_inc(&vcc->stats->rx_drop);
99962 + atomic_inc_unchecked(&vcc->stats->rx_drop);
99963 return 0;
99964 }
99965 EXPORT_SYMBOL(atm_charge);
99966 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
99967 }
99968 }
99969 atm_return(vcc, guess);
99970 - atomic_inc(&vcc->stats->rx_drop);
99971 + atomic_inc_unchecked(&vcc->stats->rx_drop);
99972 return NULL;
99973 }
99974 EXPORT_SYMBOL(atm_alloc_charge);
99975 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
99976
99977 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
99978 {
99979 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
99980 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
99981 __SONET_ITEMS
99982 #undef __HANDLE_ITEM
99983 }
99984 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
99985
99986 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
99987 {
99988 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
99989 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
99990 __SONET_ITEMS
99991 #undef __HANDLE_ITEM
99992 }
99993 diff --git a/net/atm/lec.c b/net/atm/lec.c
99994 index 4b98f89..5a2f6cb 100644
99995 --- a/net/atm/lec.c
99996 +++ b/net/atm/lec.c
99997 @@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
99998 }
99999
100000 static struct lane2_ops lane2_ops = {
100001 - lane2_resolve, /* resolve, spec 3.1.3 */
100002 - lane2_associate_req, /* associate_req, spec 3.1.4 */
100003 - NULL /* associate indicator, spec 3.1.5 */
100004 + .resolve = lane2_resolve,
100005 + .associate_req = lane2_associate_req,
100006 + .associate_indicator = NULL
100007 };
100008
100009 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
100010 diff --git a/net/atm/lec.h b/net/atm/lec.h
100011 index 4149db1..f2ab682 100644
100012 --- a/net/atm/lec.h
100013 +++ b/net/atm/lec.h
100014 @@ -48,7 +48,7 @@ struct lane2_ops {
100015 const u8 *tlvs, u32 sizeoftlvs);
100016 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
100017 const u8 *tlvs, u32 sizeoftlvs);
100018 -};
100019 +} __no_const;
100020
100021 /*
100022 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
100023 diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
100024 index d1b2d9a..d549f7f 100644
100025 --- a/net/atm/mpoa_caches.c
100026 +++ b/net/atm/mpoa_caches.c
100027 @@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
100028
100029
100030 static struct in_cache_ops ingress_ops = {
100031 - in_cache_add_entry, /* add_entry */
100032 - in_cache_get, /* get */
100033 - in_cache_get_with_mask, /* get_with_mask */
100034 - in_cache_get_by_vcc, /* get_by_vcc */
100035 - in_cache_put, /* put */
100036 - in_cache_remove_entry, /* remove_entry */
100037 - cache_hit, /* cache_hit */
100038 - clear_count_and_expired, /* clear_count */
100039 - check_resolving_entries, /* check_resolving */
100040 - refresh_entries, /* refresh */
100041 - in_destroy_cache /* destroy_cache */
100042 + .add_entry = in_cache_add_entry,
100043 + .get = in_cache_get,
100044 + .get_with_mask = in_cache_get_with_mask,
100045 + .get_by_vcc = in_cache_get_by_vcc,
100046 + .put = in_cache_put,
100047 + .remove_entry = in_cache_remove_entry,
100048 + .cache_hit = cache_hit,
100049 + .clear_count = clear_count_and_expired,
100050 + .check_resolving = check_resolving_entries,
100051 + .refresh = refresh_entries,
100052 + .destroy_cache = in_destroy_cache
100053 };
100054
100055 static struct eg_cache_ops egress_ops = {
100056 - eg_cache_add_entry, /* add_entry */
100057 - eg_cache_get_by_cache_id, /* get_by_cache_id */
100058 - eg_cache_get_by_tag, /* get_by_tag */
100059 - eg_cache_get_by_vcc, /* get_by_vcc */
100060 - eg_cache_get_by_src_ip, /* get_by_src_ip */
100061 - eg_cache_put, /* put */
100062 - eg_cache_remove_entry, /* remove_entry */
100063 - update_eg_cache_entry, /* update */
100064 - clear_expired, /* clear_expired */
100065 - eg_destroy_cache /* destroy_cache */
100066 + .add_entry = eg_cache_add_entry,
100067 + .get_by_cache_id = eg_cache_get_by_cache_id,
100068 + .get_by_tag = eg_cache_get_by_tag,
100069 + .get_by_vcc = eg_cache_get_by_vcc,
100070 + .get_by_src_ip = eg_cache_get_by_src_ip,
100071 + .put = eg_cache_put,
100072 + .remove_entry = eg_cache_remove_entry,
100073 + .update = update_eg_cache_entry,
100074 + .clear_expired = clear_expired,
100075 + .destroy_cache = eg_destroy_cache
100076 };
100077
100078
100079 diff --git a/net/atm/proc.c b/net/atm/proc.c
100080 index bbb6461..cf04016 100644
100081 --- a/net/atm/proc.c
100082 +++ b/net/atm/proc.c
100083 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
100084 const struct k_atm_aal_stats *stats)
100085 {
100086 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
100087 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
100088 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
100089 - atomic_read(&stats->rx_drop));
100090 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
100091 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
100092 + atomic_read_unchecked(&stats->rx_drop));
100093 }
100094
100095 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
100096 diff --git a/net/atm/resources.c b/net/atm/resources.c
100097 index 0447d5d..3cf4728 100644
100098 --- a/net/atm/resources.c
100099 +++ b/net/atm/resources.c
100100 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
100101 static void copy_aal_stats(struct k_atm_aal_stats *from,
100102 struct atm_aal_stats *to)
100103 {
100104 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100105 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100106 __AAL_STAT_ITEMS
100107 #undef __HANDLE_ITEM
100108 }
100109 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
100110 static void subtract_aal_stats(struct k_atm_aal_stats *from,
100111 struct atm_aal_stats *to)
100112 {
100113 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100114 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
100115 __AAL_STAT_ITEMS
100116 #undef __HANDLE_ITEM
100117 }
100118 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
100119 index 919a5ce..cc6b444 100644
100120 --- a/net/ax25/sysctl_net_ax25.c
100121 +++ b/net/ax25/sysctl_net_ax25.c
100122 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
100123 {
100124 char path[sizeof("net/ax25/") + IFNAMSIZ];
100125 int k;
100126 - struct ctl_table *table;
100127 + ctl_table_no_const *table;
100128
100129 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
100130 if (!table)
100131 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
100132 index 1e80539..676c37a 100644
100133 --- a/net/batman-adv/bat_iv_ogm.c
100134 +++ b/net/batman-adv/bat_iv_ogm.c
100135 @@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
100136
100137 /* randomize initial seqno to avoid collision */
100138 get_random_bytes(&random_seqno, sizeof(random_seqno));
100139 - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100140 + atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100141
100142 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
100143 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
100144 @@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
100145 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
100146
100147 /* change sequence number to network order */
100148 - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
100149 + seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
100150 batadv_ogm_packet->seqno = htonl(seqno);
100151 - atomic_inc(&hard_iface->bat_iv.ogm_seqno);
100152 + atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
100153
100154 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
100155
100156 @@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
100157 return;
100158
100159 /* could be changed by schedule_own_packet() */
100160 - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
100161 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
100162
100163 if (ogm_packet->flags & BATADV_DIRECTLINK)
100164 has_directlink_flag = true;
100165 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
100166 index fc1835c..42f2c2f 100644
100167 --- a/net/batman-adv/fragmentation.c
100168 +++ b/net/batman-adv/fragmentation.c
100169 @@ -251,7 +251,7 @@ batadv_frag_merge_packets(struct hlist_head *chain, struct sk_buff *skb)
100170 kfree(entry);
100171
100172 /* Make room for the rest of the fragments. */
100173 - if (pskb_expand_head(skb_out, 0, size - skb->len, GFP_ATOMIC) < 0) {
100174 + if (pskb_expand_head(skb_out, 0, size - skb_out->len, GFP_ATOMIC) < 0) {
100175 kfree_skb(skb_out);
100176 skb_out = NULL;
100177 goto free;
100178 @@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
100179 frag_header.packet_type = BATADV_UNICAST_FRAG;
100180 frag_header.version = BATADV_COMPAT_VERSION;
100181 frag_header.ttl = BATADV_TTL;
100182 - frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
100183 + frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
100184 frag_header.reserved = 0;
100185 frag_header.no = 0;
100186 frag_header.total_size = htons(skb->len);
100187 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
100188 index 5467955..75ad4e3 100644
100189 --- a/net/batman-adv/soft-interface.c
100190 +++ b/net/batman-adv/soft-interface.c
100191 @@ -296,7 +296,7 @@ send:
100192 primary_if->net_dev->dev_addr);
100193
100194 /* set broadcast sequence number */
100195 - seqno = atomic_inc_return(&bat_priv->bcast_seqno);
100196 + seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
100197 bcast_packet->seqno = htonl(seqno);
100198
100199 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
100200 @@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100201 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
100202
100203 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
100204 - atomic_set(&bat_priv->bcast_seqno, 1);
100205 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
100206 atomic_set(&bat_priv->tt.vn, 0);
100207 atomic_set(&bat_priv->tt.local_changes, 0);
100208 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
100209 @@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100210
100211 /* randomize initial seqno to avoid collision */
100212 get_random_bytes(&random_seqno, sizeof(random_seqno));
100213 - atomic_set(&bat_priv->frag_seqno, random_seqno);
100214 + atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
100215
100216 bat_priv->primary_if = NULL;
100217 bat_priv->num_ifaces = 0;
100218 @@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
100219 return 0;
100220 }
100221
100222 -struct rtnl_link_ops batadv_link_ops __read_mostly = {
100223 +struct rtnl_link_ops batadv_link_ops = {
100224 .kind = "batadv",
100225 .priv_size = sizeof(struct batadv_priv),
100226 .setup = batadv_softif_init_early,
100227 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
100228 index 8854c05..ee5d5497 100644
100229 --- a/net/batman-adv/types.h
100230 +++ b/net/batman-adv/types.h
100231 @@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
100232 struct batadv_hard_iface_bat_iv {
100233 unsigned char *ogm_buff;
100234 int ogm_buff_len;
100235 - atomic_t ogm_seqno;
100236 + atomic_unchecked_t ogm_seqno;
100237 };
100238
100239 /**
100240 @@ -768,7 +768,7 @@ struct batadv_priv {
100241 atomic_t bonding;
100242 atomic_t fragmentation;
100243 atomic_t packet_size_max;
100244 - atomic_t frag_seqno;
100245 + atomic_unchecked_t frag_seqno;
100246 #ifdef CONFIG_BATMAN_ADV_BLA
100247 atomic_t bridge_loop_avoidance;
100248 #endif
100249 @@ -787,7 +787,7 @@ struct batadv_priv {
100250 #endif
100251 uint32_t isolation_mark;
100252 uint32_t isolation_mark_mask;
100253 - atomic_t bcast_seqno;
100254 + atomic_unchecked_t bcast_seqno;
100255 atomic_t bcast_queue_left;
100256 atomic_t batman_queue_left;
100257 char num_ifaces;
100258 diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
100259 index c2e0d14..bfa852b 100644
100260 --- a/net/bluetooth/6lowpan.c
100261 +++ b/net/bluetooth/6lowpan.c
100262 @@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
100263
100264 drop:
100265 dev->stats.rx_dropped++;
100266 - kfree_skb(skb);
100267 return NET_RX_DROP;
100268 }
100269
100270 diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
100271 index 85bcc21..ce82722d 100644
100272 --- a/net/bluetooth/bnep/core.c
100273 +++ b/net/bluetooth/bnep/core.c
100274 @@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
100275
100276 BT_DBG("");
100277
100278 + if (!l2cap_is_socket(sock))
100279 + return -EBADFD;
100280 +
100281 baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
100282 baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
100283
100284 diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
100285 index 67fe5e8..278a194 100644
100286 --- a/net/bluetooth/cmtp/core.c
100287 +++ b/net/bluetooth/cmtp/core.c
100288 @@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
100289
100290 BT_DBG("");
100291
100292 + if (!l2cap_is_socket(sock))
100293 + return -EBADFD;
100294 +
100295 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
100296 if (!session)
100297 return -ENOMEM;
100298 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
100299 index 115f149..f0ba286 100644
100300 --- a/net/bluetooth/hci_sock.c
100301 +++ b/net/bluetooth/hci_sock.c
100302 @@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
100303 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
100304 }
100305
100306 - len = min_t(unsigned int, len, sizeof(uf));
100307 + len = min((size_t)len, sizeof(uf));
100308 if (copy_from_user(&uf, optval, len)) {
100309 err = -EFAULT;
100310 break;
100311 diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
100312 index 1b7d605..02ebd10 100644
100313 --- a/net/bluetooth/hidp/core.c
100314 +++ b/net/bluetooth/hidp/core.c
100315 @@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
100316 {
100317 struct hidp_session *session;
100318 struct l2cap_conn *conn;
100319 - struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
100320 + struct l2cap_chan *chan;
100321 int ret;
100322
100323 ret = hidp_verify_sockets(ctrl_sock, intr_sock);
100324 if (ret)
100325 return ret;
100326
100327 + chan = l2cap_pi(ctrl_sock->sk)->chan;
100328 conn = NULL;
100329 l2cap_chan_lock(chan);
100330 if (chan->conn)
100331 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
100332 index b6f9777..36d3039 100644
100333 --- a/net/bluetooth/l2cap_core.c
100334 +++ b/net/bluetooth/l2cap_core.c
100335 @@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
100336 break;
100337
100338 case L2CAP_CONF_RFC:
100339 - if (olen == sizeof(rfc))
100340 - memcpy(&rfc, (void *)val, olen);
100341 + if (olen != sizeof(rfc))
100342 + break;
100343 +
100344 + memcpy(&rfc, (void *)val, olen);
100345
100346 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
100347 rfc.mode != chan->mode)
100348 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
100349 index 31f106e..323f606 100644
100350 --- a/net/bluetooth/l2cap_sock.c
100351 +++ b/net/bluetooth/l2cap_sock.c
100352 @@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100353 struct sock *sk = sock->sk;
100354 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
100355 struct l2cap_options opts;
100356 - int len, err = 0;
100357 + int err = 0;
100358 + size_t len = optlen;
100359 u32 opt;
100360
100361 BT_DBG("sk %p", sk);
100362 @@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100363 opts.max_tx = chan->max_tx;
100364 opts.txwin_size = chan->tx_win;
100365
100366 - len = min_t(unsigned int, sizeof(opts), optlen);
100367 + len = min(sizeof(opts), len);
100368 if (copy_from_user((char *) &opts, optval, len)) {
100369 err = -EFAULT;
100370 break;
100371 @@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100372 struct bt_security sec;
100373 struct bt_power pwr;
100374 struct l2cap_conn *conn;
100375 - int len, err = 0;
100376 + int err = 0;
100377 + size_t len = optlen;
100378 u32 opt;
100379
100380 BT_DBG("sk %p", sk);
100381 @@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100382
100383 sec.level = BT_SECURITY_LOW;
100384
100385 - len = min_t(unsigned int, sizeof(sec), optlen);
100386 + len = min(sizeof(sec), len);
100387 if (copy_from_user((char *) &sec, optval, len)) {
100388 err = -EFAULT;
100389 break;
100390 @@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100391
100392 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
100393
100394 - len = min_t(unsigned int, sizeof(pwr), optlen);
100395 + len = min(sizeof(pwr), len);
100396 if (copy_from_user((char *) &pwr, optval, len)) {
100397 err = -EFAULT;
100398 break;
100399 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
100400 index 8bbbb5e..6fc0950 100644
100401 --- a/net/bluetooth/rfcomm/sock.c
100402 +++ b/net/bluetooth/rfcomm/sock.c
100403 @@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100404 struct sock *sk = sock->sk;
100405 struct bt_security sec;
100406 int err = 0;
100407 - size_t len;
100408 + size_t len = optlen;
100409 u32 opt;
100410
100411 BT_DBG("sk %p", sk);
100412 @@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100413
100414 sec.level = BT_SECURITY_LOW;
100415
100416 - len = min_t(unsigned int, sizeof(sec), optlen);
100417 + len = min(sizeof(sec), len);
100418 if (copy_from_user((char *) &sec, optval, len)) {
100419 err = -EFAULT;
100420 break;
100421 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
100422 index 8e385a0..a5bdd8e 100644
100423 --- a/net/bluetooth/rfcomm/tty.c
100424 +++ b/net/bluetooth/rfcomm/tty.c
100425 @@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
100426 BT_DBG("tty %p id %d", tty, tty->index);
100427
100428 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
100429 - dev->channel, dev->port.count);
100430 + dev->channel, atomic_read(&dev->port.count));
100431
100432 err = tty_port_open(&dev->port, tty, filp);
100433 if (err)
100434 @@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
100435 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
100436
100437 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
100438 - dev->port.count);
100439 + atomic_read(&dev->port.count));
100440
100441 tty_port_close(&dev->port, tty, filp);
100442 }
100443 diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
100444 index e5ec470..cbfabd1 100644
100445 --- a/net/bridge/br_netlink.c
100446 +++ b/net/bridge/br_netlink.c
100447 @@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
100448 .get_link_af_size = br_get_link_af_size,
100449 };
100450
100451 -struct rtnl_link_ops br_link_ops __read_mostly = {
100452 +struct rtnl_link_ops br_link_ops = {
100453 .kind = "bridge",
100454 .priv_size = sizeof(struct net_bridge),
100455 .setup = br_dev_setup,
100456 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
100457 index d9a8c05..8dadc6c6 100644
100458 --- a/net/bridge/netfilter/ebtables.c
100459 +++ b/net/bridge/netfilter/ebtables.c
100460 @@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100461 tmp.valid_hooks = t->table->valid_hooks;
100462 }
100463 mutex_unlock(&ebt_mutex);
100464 - if (copy_to_user(user, &tmp, *len) != 0) {
100465 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100466 BUGPRINT("c2u Didn't work\n");
100467 ret = -EFAULT;
100468 break;
100469 @@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100470 goto out;
100471 tmp.valid_hooks = t->valid_hooks;
100472
100473 - if (copy_to_user(user, &tmp, *len) != 0) {
100474 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100475 ret = -EFAULT;
100476 break;
100477 }
100478 @@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100479 tmp.entries_size = t->table->entries_size;
100480 tmp.valid_hooks = t->table->valid_hooks;
100481
100482 - if (copy_to_user(user, &tmp, *len) != 0) {
100483 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100484 ret = -EFAULT;
100485 break;
100486 }
100487 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
100488 index f5afda1..dcf770a 100644
100489 --- a/net/caif/cfctrl.c
100490 +++ b/net/caif/cfctrl.c
100491 @@ -10,6 +10,7 @@
100492 #include <linux/spinlock.h>
100493 #include <linux/slab.h>
100494 #include <linux/pkt_sched.h>
100495 +#include <linux/sched.h>
100496 #include <net/caif/caif_layer.h>
100497 #include <net/caif/cfpkt.h>
100498 #include <net/caif/cfctrl.h>
100499 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
100500 memset(&dev_info, 0, sizeof(dev_info));
100501 dev_info.id = 0xff;
100502 cfsrvl_init(&this->serv, 0, &dev_info, false);
100503 - atomic_set(&this->req_seq_no, 1);
100504 - atomic_set(&this->rsp_seq_no, 1);
100505 + atomic_set_unchecked(&this->req_seq_no, 1);
100506 + atomic_set_unchecked(&this->rsp_seq_no, 1);
100507 this->serv.layer.receive = cfctrl_recv;
100508 sprintf(this->serv.layer.name, "ctrl");
100509 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
100510 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
100511 struct cfctrl_request_info *req)
100512 {
100513 spin_lock_bh(&ctrl->info_list_lock);
100514 - atomic_inc(&ctrl->req_seq_no);
100515 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
100516 + atomic_inc_unchecked(&ctrl->req_seq_no);
100517 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
100518 list_add_tail(&req->list, &ctrl->list);
100519 spin_unlock_bh(&ctrl->info_list_lock);
100520 }
100521 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
100522 if (p != first)
100523 pr_warn("Requests are not received in order\n");
100524
100525 - atomic_set(&ctrl->rsp_seq_no,
100526 + atomic_set_unchecked(&ctrl->rsp_seq_no,
100527 p->sequence_no);
100528 list_del(&p->list);
100529 goto out;
100530 diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
100531 index 4589ff67..46d6b8f 100644
100532 --- a/net/caif/chnl_net.c
100533 +++ b/net/caif/chnl_net.c
100534 @@ -516,7 +516,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
100535 };
100536
100537
100538 -static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
100539 +static struct rtnl_link_ops ipcaif_link_ops = {
100540 .kind = "caif",
100541 .priv_size = sizeof(struct chnl_net),
100542 .setup = ipcaif_net_setup,
100543 diff --git a/net/can/af_can.c b/net/can/af_can.c
100544 index ce82337..5d17b4d 100644
100545 --- a/net/can/af_can.c
100546 +++ b/net/can/af_can.c
100547 @@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
100548 };
100549
100550 /* notifier block for netdevice event */
100551 -static struct notifier_block can_netdev_notifier __read_mostly = {
100552 +static struct notifier_block can_netdev_notifier = {
100553 .notifier_call = can_notifier,
100554 };
100555
100556 diff --git a/net/can/bcm.c b/net/can/bcm.c
100557 index dcb75c0..24b1b43 100644
100558 --- a/net/can/bcm.c
100559 +++ b/net/can/bcm.c
100560 @@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
100561 }
100562
100563 /* create /proc/net/can-bcm directory */
100564 - proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
100565 + proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
100566 return 0;
100567 }
100568
100569 diff --git a/net/can/gw.c b/net/can/gw.c
100570 index 050a211..bb9fe33 100644
100571 --- a/net/can/gw.c
100572 +++ b/net/can/gw.c
100573 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
100574 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
100575
100576 static HLIST_HEAD(cgw_list);
100577 -static struct notifier_block notifier;
100578
100579 static struct kmem_cache *cgw_cache __read_mostly;
100580
100581 @@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
100582 return err;
100583 }
100584
100585 +static struct notifier_block notifier = {
100586 + .notifier_call = cgw_notifier
100587 +};
100588 +
100589 static __init int cgw_module_init(void)
100590 {
100591 /* sanitize given module parameter */
100592 @@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
100593 return -ENOMEM;
100594
100595 /* set notifier */
100596 - notifier.notifier_call = cgw_notifier;
100597 register_netdevice_notifier(&notifier);
100598
100599 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
100600 diff --git a/net/can/proc.c b/net/can/proc.c
100601 index 1a19b98..df2b4ec 100644
100602 --- a/net/can/proc.c
100603 +++ b/net/can/proc.c
100604 @@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
100605 void can_init_proc(void)
100606 {
100607 /* create /proc/net/can directory */
100608 - can_dir = proc_mkdir("can", init_net.proc_net);
100609 + can_dir = proc_mkdir_restrict("can", init_net.proc_net);
100610
100611 if (!can_dir) {
100612 printk(KERN_INFO "can: failed to create /proc/net/can . "
100613 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
100614 index 8d1653c..77ad145 100644
100615 --- a/net/ceph/messenger.c
100616 +++ b/net/ceph/messenger.c
100617 @@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
100618 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
100619
100620 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
100621 -static atomic_t addr_str_seq = ATOMIC_INIT(0);
100622 +static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
100623
100624 static struct page *zero_page; /* used in certain error cases */
100625
100626 @@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
100627 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
100628 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
100629
100630 - i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100631 + i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100632 s = addr_str[i];
100633
100634 switch (ss->ss_family) {
100635 diff --git a/net/compat.c b/net/compat.c
100636 index bc8aeef..f9c070c 100644
100637 --- a/net/compat.c
100638 +++ b/net/compat.c
100639 @@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
100640 return -EFAULT;
100641 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
100642 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
100643 - kmsg->msg_name = compat_ptr(tmp1);
100644 - kmsg->msg_iov = compat_ptr(tmp2);
100645 - kmsg->msg_control = compat_ptr(tmp3);
100646 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
100647 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
100648 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
100649 return 0;
100650 }
100651
100652 @@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100653
100654 if (kern_msg->msg_name && kern_msg->msg_namelen) {
100655 if (mode == VERIFY_READ) {
100656 - int err = move_addr_to_kernel(kern_msg->msg_name,
100657 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
100658 kern_msg->msg_namelen,
100659 kern_address);
100660 if (err < 0)
100661 @@ -100,7 +100,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100662 }
100663
100664 tot_len = iov_from_user_compat_to_kern(kern_iov,
100665 - (struct compat_iovec __user *)kern_msg->msg_iov,
100666 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
100667 kern_msg->msg_iovlen);
100668 if (tot_len >= 0)
100669 kern_msg->msg_iov = kern_iov;
100670 @@ -120,20 +120,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100671
100672 #define CMSG_COMPAT_FIRSTHDR(msg) \
100673 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
100674 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
100675 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
100676 (struct compat_cmsghdr __user *)NULL)
100677
100678 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
100679 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
100680 (ucmlen) <= (unsigned long) \
100681 ((mhdr)->msg_controllen - \
100682 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
100683 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
100684
100685 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
100686 struct compat_cmsghdr __user *cmsg, int cmsg_len)
100687 {
100688 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
100689 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
100690 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
100691 msg->msg_controllen)
100692 return NULL;
100693 return (struct compat_cmsghdr __user *)ptr;
100694 @@ -223,7 +223,7 @@ Efault:
100695
100696 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
100697 {
100698 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100699 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100700 struct compat_cmsghdr cmhdr;
100701 struct compat_timeval ctv;
100702 struct compat_timespec cts[3];
100703 @@ -279,7 +279,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
100704
100705 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
100706 {
100707 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100708 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100709 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
100710 int fdnum = scm->fp->count;
100711 struct file **fp = scm->fp->fp;
100712 @@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
100713 return -EFAULT;
100714 old_fs = get_fs();
100715 set_fs(KERNEL_DS);
100716 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
100717 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
100718 set_fs(old_fs);
100719
100720 return err;
100721 @@ -428,7 +428,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
100722 len = sizeof(ktime);
100723 old_fs = get_fs();
100724 set_fs(KERNEL_DS);
100725 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
100726 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
100727 set_fs(old_fs);
100728
100729 if (!err) {
100730 @@ -571,7 +571,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100731 case MCAST_JOIN_GROUP:
100732 case MCAST_LEAVE_GROUP:
100733 {
100734 - struct compat_group_req __user *gr32 = (void *)optval;
100735 + struct compat_group_req __user *gr32 = (void __user *)optval;
100736 struct group_req __user *kgr =
100737 compat_alloc_user_space(sizeof(struct group_req));
100738 u32 interface;
100739 @@ -592,7 +592,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100740 case MCAST_BLOCK_SOURCE:
100741 case MCAST_UNBLOCK_SOURCE:
100742 {
100743 - struct compat_group_source_req __user *gsr32 = (void *)optval;
100744 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
100745 struct group_source_req __user *kgsr = compat_alloc_user_space(
100746 sizeof(struct group_source_req));
100747 u32 interface;
100748 @@ -613,7 +613,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100749 }
100750 case MCAST_MSFILTER:
100751 {
100752 - struct compat_group_filter __user *gf32 = (void *)optval;
100753 + struct compat_group_filter __user *gf32 = (void __user *)optval;
100754 struct group_filter __user *kgf;
100755 u32 interface, fmode, numsrc;
100756
100757 @@ -651,7 +651,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
100758 char __user *optval, int __user *optlen,
100759 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
100760 {
100761 - struct compat_group_filter __user *gf32 = (void *)optval;
100762 + struct compat_group_filter __user *gf32 = (void __user *)optval;
100763 struct group_filter __user *kgf;
100764 int __user *koptlen;
100765 u32 interface, fmode, numsrc;
100766 @@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
100767
100768 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
100769 return -EINVAL;
100770 - if (copy_from_user(a, args, nas[call]))
100771 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
100772 return -EFAULT;
100773 a0 = a[0];
100774 a1 = a[1];
100775 diff --git a/net/core/datagram.c b/net/core/datagram.c
100776 index fdbc9a8..cd6972c 100644
100777 --- a/net/core/datagram.c
100778 +++ b/net/core/datagram.c
100779 @@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
100780 }
100781
100782 kfree_skb(skb);
100783 - atomic_inc(&sk->sk_drops);
100784 + atomic_inc_unchecked(&sk->sk_drops);
100785 sk_mem_reclaim_partial(sk);
100786
100787 return err;
100788 diff --git a/net/core/dev.c b/net/core/dev.c
100789 index 945bbd0..8b1a370 100644
100790 --- a/net/core/dev.c
100791 +++ b/net/core/dev.c
100792 @@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
100793 {
100794 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
100795 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
100796 - atomic_long_inc(&dev->rx_dropped);
100797 + atomic_long_inc_unchecked(&dev->rx_dropped);
100798 kfree_skb(skb);
100799 return NET_RX_DROP;
100800 }
100801 }
100802
100803 if (unlikely(!is_skb_forwardable(dev, skb))) {
100804 - atomic_long_inc(&dev->rx_dropped);
100805 + atomic_long_inc_unchecked(&dev->rx_dropped);
100806 kfree_skb(skb);
100807 return NET_RX_DROP;
100808 }
100809 @@ -2985,7 +2985,7 @@ recursion_alert:
100810 drop:
100811 rcu_read_unlock_bh();
100812
100813 - atomic_long_inc(&dev->tx_dropped);
100814 + atomic_long_inc_unchecked(&dev->tx_dropped);
100815 kfree_skb_list(skb);
100816 return rc;
100817 out:
100818 @@ -3328,7 +3328,7 @@ enqueue:
100819
100820 local_irq_restore(flags);
100821
100822 - atomic_long_inc(&skb->dev->rx_dropped);
100823 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100824 kfree_skb(skb);
100825 return NET_RX_DROP;
100826 }
100827 @@ -3405,7 +3405,7 @@ int netif_rx_ni(struct sk_buff *skb)
100828 }
100829 EXPORT_SYMBOL(netif_rx_ni);
100830
100831 -static void net_tx_action(struct softirq_action *h)
100832 +static __latent_entropy void net_tx_action(void)
100833 {
100834 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100835
100836 @@ -3738,7 +3738,7 @@ ncls:
100837 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
100838 } else {
100839 drop:
100840 - atomic_long_inc(&skb->dev->rx_dropped);
100841 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100842 kfree_skb(skb);
100843 /* Jamal, now you will not able to escape explaining
100844 * me how you were going to use this. :-)
100845 @@ -4502,7 +4502,7 @@ void netif_napi_del(struct napi_struct *napi)
100846 }
100847 EXPORT_SYMBOL(netif_napi_del);
100848
100849 -static void net_rx_action(struct softirq_action *h)
100850 +static __latent_entropy void net_rx_action(void)
100851 {
100852 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100853 unsigned long time_limit = jiffies + 2;
100854 @@ -6548,8 +6548,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
100855 } else {
100856 netdev_stats_to_stats64(storage, &dev->stats);
100857 }
100858 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
100859 - storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
100860 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
100861 + storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
100862 return storage;
100863 }
100864 EXPORT_SYMBOL(dev_get_stats);
100865 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
100866 index 72e899a..79a9409 100644
100867 --- a/net/core/dev_ioctl.c
100868 +++ b/net/core/dev_ioctl.c
100869 @@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
100870 no_module = !dev;
100871 if (no_module && capable(CAP_NET_ADMIN))
100872 no_module = request_module("netdev-%s", name);
100873 - if (no_module && capable(CAP_SYS_MODULE))
100874 + if (no_module && capable(CAP_SYS_MODULE)) {
100875 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
100876 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
100877 +#else
100878 request_module("%s", name);
100879 +#endif
100880 + }
100881 }
100882 EXPORT_SYMBOL(dev_load);
100883
100884 diff --git a/net/core/filter.c b/net/core/filter.c
100885 index 647b122..18a7ff6 100644
100886 --- a/net/core/filter.c
100887 +++ b/net/core/filter.c
100888 @@ -532,7 +532,11 @@ do_pass:
100889
100890 /* Unkown instruction. */
100891 default:
100892 - goto err;
100893 + WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
100894 + fp->code, fp->jt, fp->jf, fp->k);
100895 + kfree(addrs);
100896 + BUG();
100897 + return -EINVAL;
100898 }
100899
100900 insn++;
100901 @@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
100902 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
100903 int pc, ret = 0;
100904
100905 - BUILD_BUG_ON(BPF_MEMWORDS > 16);
100906 + BUILD_BUG_ON(BPF_MEMWORDS != 16);
100907
100908 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
100909 if (!masks)
100910 @@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
100911 if (!fp)
100912 return -ENOMEM;
100913
100914 - memcpy(fp->insns, fprog->filter, fsize);
100915 + memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
100916
100917 fp->len = fprog->len;
100918 /* Since unattached filters are not copied back to user
100919 diff --git a/net/core/flow.c b/net/core/flow.c
100920 index a0348fd..6951c76 100644
100921 --- a/net/core/flow.c
100922 +++ b/net/core/flow.c
100923 @@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
100924 static int flow_entry_valid(struct flow_cache_entry *fle,
100925 struct netns_xfrm *xfrm)
100926 {
100927 - if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
100928 + if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
100929 return 0;
100930 if (fle->object && !fle->object->ops->check(fle->object))
100931 return 0;
100932 @@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
100933 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
100934 fcp->hash_count++;
100935 }
100936 - } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
100937 + } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
100938 flo = fle->object;
100939 if (!flo)
100940 goto ret_object;
100941 @@ -263,7 +263,7 @@ nocache:
100942 }
100943 flo = resolver(net, key, family, dir, flo, ctx);
100944 if (fle) {
100945 - fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
100946 + fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
100947 if (!IS_ERR(flo))
100948 fle->object = flo;
100949 else
100950 diff --git a/net/core/iovec.c b/net/core/iovec.c
100951 index e1ec45a..e5c6f16 100644
100952 --- a/net/core/iovec.c
100953 +++ b/net/core/iovec.c
100954 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
100955 if (m->msg_name && m->msg_namelen) {
100956 if (mode == VERIFY_READ) {
100957 void __user *namep;
100958 - namep = (void __user __force *) m->msg_name;
100959 + namep = (void __force_user *) m->msg_name;
100960 err = move_addr_to_kernel(namep, m->msg_namelen,
100961 address);
100962 if (err < 0)
100963 @@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
100964 }
100965
100966 size = m->msg_iovlen * sizeof(struct iovec);
100967 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
100968 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
100969 return -EFAULT;
100970
100971 m->msg_iov = iov;
100972 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
100973 index ef31fef..8be66d9 100644
100974 --- a/net/core/neighbour.c
100975 +++ b/net/core/neighbour.c
100976 @@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
100977 void __user *buffer, size_t *lenp, loff_t *ppos)
100978 {
100979 int size, ret;
100980 - struct ctl_table tmp = *ctl;
100981 + ctl_table_no_const tmp = *ctl;
100982
100983 tmp.extra1 = &zero;
100984 tmp.extra2 = &unres_qlen_max;
100985 @@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
100986 void __user *buffer,
100987 size_t *lenp, loff_t *ppos)
100988 {
100989 - struct ctl_table tmp = *ctl;
100990 + ctl_table_no_const tmp = *ctl;
100991 int ret;
100992
100993 tmp.extra1 = &zero;
100994 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
100995 index 2bf8329..2eb1423 100644
100996 --- a/net/core/net-procfs.c
100997 +++ b/net/core/net-procfs.c
100998 @@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
100999 struct rtnl_link_stats64 temp;
101000 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
101001
101002 - seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101003 + if (gr_proc_is_restricted())
101004 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101005 + "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101006 + dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
101007 + 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
101008 + else
101009 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101010 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101011 dev->name, stats->rx_bytes, stats->rx_packets,
101012 stats->rx_errors,
101013 @@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
101014 return 0;
101015 }
101016
101017 -static const struct seq_operations dev_seq_ops = {
101018 +const struct seq_operations dev_seq_ops = {
101019 .start = dev_seq_start,
101020 .next = dev_seq_next,
101021 .stop = dev_seq_stop,
101022 @@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
101023
101024 static int softnet_seq_open(struct inode *inode, struct file *file)
101025 {
101026 - return seq_open(file, &softnet_seq_ops);
101027 + return seq_open_restrict(file, &softnet_seq_ops);
101028 }
101029
101030 static const struct file_operations softnet_seq_fops = {
101031 @@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
101032 else
101033 seq_printf(seq, "%04x", ntohs(pt->type));
101034
101035 +#ifdef CONFIG_GRKERNSEC_HIDESYM
101036 + seq_printf(seq, " %-8s %pf\n",
101037 + pt->dev ? pt->dev->name : "", NULL);
101038 +#else
101039 seq_printf(seq, " %-8s %pf\n",
101040 pt->dev ? pt->dev->name : "", pt->func);
101041 +#endif
101042 }
101043
101044 return 0;
101045 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
101046 index 9dd0669..c52fb1b 100644
101047 --- a/net/core/net-sysfs.c
101048 +++ b/net/core/net-sysfs.c
101049 @@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
101050 {
101051 struct net_device *netdev = to_net_dev(dev);
101052 return sprintf(buf, fmt_dec,
101053 - atomic_read(&netdev->carrier_changes));
101054 + atomic_read_unchecked(&netdev->carrier_changes));
101055 }
101056 static DEVICE_ATTR_RO(carrier_changes);
101057
101058 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
101059 index 7f15517..f7d65c0 100644
101060 --- a/net/core/net_namespace.c
101061 +++ b/net/core/net_namespace.c
101062 @@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
101063 int error;
101064 LIST_HEAD(net_exit_list);
101065
101066 - list_add_tail(&ops->list, list);
101067 + pax_list_add_tail((struct list_head *)&ops->list, list);
101068 if (ops->init || (ops->id && ops->size)) {
101069 for_each_net(net) {
101070 error = ops_init(ops, net);
101071 @@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
101072
101073 out_undo:
101074 /* If I have an error cleanup all namespaces I initialized */
101075 - list_del(&ops->list);
101076 + pax_list_del((struct list_head *)&ops->list);
101077 ops_exit_list(ops, &net_exit_list);
101078 ops_free_list(ops, &net_exit_list);
101079 return error;
101080 @@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
101081 struct net *net;
101082 LIST_HEAD(net_exit_list);
101083
101084 - list_del(&ops->list);
101085 + pax_list_del((struct list_head *)&ops->list);
101086 for_each_net(net)
101087 list_add_tail(&net->exit_list, &net_exit_list);
101088 ops_exit_list(ops, &net_exit_list);
101089 @@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
101090 mutex_lock(&net_mutex);
101091 error = register_pernet_operations(&pernet_list, ops);
101092 if (!error && (first_device == &pernet_list))
101093 - first_device = &ops->list;
101094 + first_device = (struct list_head *)&ops->list;
101095 mutex_unlock(&net_mutex);
101096 return error;
101097 }
101098 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
101099 index e6645b4..43e1af9 100644
101100 --- a/net/core/netpoll.c
101101 +++ b/net/core/netpoll.c
101102 @@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101103 struct udphdr *udph;
101104 struct iphdr *iph;
101105 struct ethhdr *eth;
101106 - static atomic_t ip_ident;
101107 + static atomic_unchecked_t ip_ident;
101108 struct ipv6hdr *ip6h;
101109
101110 udp_len = len + sizeof(*udph);
101111 @@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101112 put_unaligned(0x45, (unsigned char *)iph);
101113 iph->tos = 0;
101114 put_unaligned(htons(ip_len), &(iph->tot_len));
101115 - iph->id = htons(atomic_inc_return(&ip_ident));
101116 + iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
101117 iph->frag_off = 0;
101118 iph->ttl = 64;
101119 iph->protocol = IPPROTO_UDP;
101120 diff --git a/net/core/pktgen.c b/net/core/pktgen.c
101121 index 443256b..bbff424 100644
101122 --- a/net/core/pktgen.c
101123 +++ b/net/core/pktgen.c
101124 @@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
101125 pn->net = net;
101126 INIT_LIST_HEAD(&pn->pktgen_threads);
101127 pn->pktgen_exiting = false;
101128 - pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
101129 + pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
101130 if (!pn->proc_dir) {
101131 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
101132 return -ENODEV;
101133 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
101134 index 76321ea..3129bd6 100644
101135 --- a/net/core/rtnetlink.c
101136 +++ b/net/core/rtnetlink.c
101137 @@ -58,7 +58,7 @@ struct rtnl_link {
101138 rtnl_doit_func doit;
101139 rtnl_dumpit_func dumpit;
101140 rtnl_calcit_func calcit;
101141 -};
101142 +} __no_const;
101143
101144 static DEFINE_MUTEX(rtnl_mutex);
101145
101146 @@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
101147 * to use the ops for creating device. So do not
101148 * fill up dellink as well. That disables rtnl_dellink.
101149 */
101150 - if (ops->setup && !ops->dellink)
101151 - ops->dellink = unregister_netdevice_queue;
101152 + if (ops->setup && !ops->dellink) {
101153 + pax_open_kernel();
101154 + *(void **)&ops->dellink = unregister_netdevice_queue;
101155 + pax_close_kernel();
101156 + }
101157
101158 - list_add_tail(&ops->list, &link_ops);
101159 + pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
101160 return 0;
101161 }
101162 EXPORT_SYMBOL_GPL(__rtnl_link_register);
101163 @@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
101164 for_each_net(net) {
101165 __rtnl_kill_links(net, ops);
101166 }
101167 - list_del(&ops->list);
101168 + pax_list_del((struct list_head *)&ops->list);
101169 }
101170 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
101171
101172 @@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
101173 (dev->ifalias &&
101174 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
101175 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
101176 - atomic_read(&dev->carrier_changes)))
101177 + atomic_read_unchecked(&dev->carrier_changes)))
101178 goto nla_put_failure;
101179
101180 if (1) {
101181 diff --git a/net/core/scm.c b/net/core/scm.c
101182 index b442e7e..6f5b5a2 100644
101183 --- a/net/core/scm.c
101184 +++ b/net/core/scm.c
101185 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
101186 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101187 {
101188 struct cmsghdr __user *cm
101189 - = (__force struct cmsghdr __user *)msg->msg_control;
101190 + = (struct cmsghdr __force_user *)msg->msg_control;
101191 struct cmsghdr cmhdr;
101192 int cmlen = CMSG_LEN(len);
101193 int err;
101194 @@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101195 err = -EFAULT;
101196 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
101197 goto out;
101198 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
101199 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
101200 goto out;
101201 cmlen = CMSG_SPACE(len);
101202 if (msg->msg_controllen < cmlen)
101203 @@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
101204 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101205 {
101206 struct cmsghdr __user *cm
101207 - = (__force struct cmsghdr __user*)msg->msg_control;
101208 + = (struct cmsghdr __force_user *)msg->msg_control;
101209
101210 int fdmax = 0;
101211 int fdnum = scm->fp->count;
101212 @@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101213 if (fdnum < fdmax)
101214 fdmax = fdnum;
101215
101216 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
101217 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
101218 i++, cmfptr++)
101219 {
101220 struct socket *sock;
101221 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
101222 index 32e31c2..e981248 100644
101223 --- a/net/core/skbuff.c
101224 +++ b/net/core/skbuff.c
101225 @@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
101226 __wsum skb_checksum(const struct sk_buff *skb, int offset,
101227 int len, __wsum csum)
101228 {
101229 - const struct skb_checksum_ops ops = {
101230 + static const struct skb_checksum_ops ops = {
101231 .update = csum_partial_ext,
101232 .combine = csum_block_add_ext,
101233 };
101234 @@ -3255,12 +3255,14 @@ void __init skb_init(void)
101235 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
101236 sizeof(struct sk_buff),
101237 0,
101238 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101239 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101240 + SLAB_NO_SANITIZE,
101241 NULL);
101242 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
101243 sizeof(struct sk_buff_fclones),
101244 0,
101245 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101246 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101247 + SLAB_NO_SANITIZE,
101248 NULL);
101249 }
101250
101251 diff --git a/net/core/sock.c b/net/core/sock.c
101252 index 15e0c67..0310f4a 100644
101253 --- a/net/core/sock.c
101254 +++ b/net/core/sock.c
101255 @@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101256 struct sk_buff_head *list = &sk->sk_receive_queue;
101257
101258 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
101259 - atomic_inc(&sk->sk_drops);
101260 + atomic_inc_unchecked(&sk->sk_drops);
101261 trace_sock_rcvqueue_full(sk, skb);
101262 return -ENOMEM;
101263 }
101264 @@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101265 return err;
101266
101267 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
101268 - atomic_inc(&sk->sk_drops);
101269 + atomic_inc_unchecked(&sk->sk_drops);
101270 return -ENOBUFS;
101271 }
101272
101273 @@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101274 skb_dst_force(skb);
101275
101276 spin_lock_irqsave(&list->lock, flags);
101277 - skb->dropcount = atomic_read(&sk->sk_drops);
101278 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101279 __skb_queue_tail(list, skb);
101280 spin_unlock_irqrestore(&list->lock, flags);
101281
101282 @@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101283 skb->dev = NULL;
101284
101285 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
101286 - atomic_inc(&sk->sk_drops);
101287 + atomic_inc_unchecked(&sk->sk_drops);
101288 goto discard_and_relse;
101289 }
101290 if (nested)
101291 @@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101292 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
101293 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
101294 bh_unlock_sock(sk);
101295 - atomic_inc(&sk->sk_drops);
101296 + atomic_inc_unchecked(&sk->sk_drops);
101297 goto discard_and_relse;
101298 }
101299
101300 @@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101301 struct timeval tm;
101302 } v;
101303
101304 - int lv = sizeof(int);
101305 - int len;
101306 + unsigned int lv = sizeof(int);
101307 + unsigned int len;
101308
101309 if (get_user(len, optlen))
101310 return -EFAULT;
101311 - if (len < 0)
101312 + if (len > INT_MAX)
101313 return -EINVAL;
101314
101315 memset(&v, 0, sizeof(v));
101316 @@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101317
101318 case SO_PEERNAME:
101319 {
101320 - char address[128];
101321 + char address[_K_SS_MAXSIZE];
101322
101323 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
101324 return -ENOTCONN;
101325 - if (lv < len)
101326 + if (lv < len || sizeof address < len)
101327 return -EINVAL;
101328 if (copy_to_user(optval, address, len))
101329 return -EFAULT;
101330 @@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101331
101332 if (len > lv)
101333 len = lv;
101334 - if (copy_to_user(optval, &v, len))
101335 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
101336 return -EFAULT;
101337 lenout:
101338 if (put_user(len, optlen))
101339 @@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
101340 */
101341 smp_wmb();
101342 atomic_set(&sk->sk_refcnt, 1);
101343 - atomic_set(&sk->sk_drops, 0);
101344 + atomic_set_unchecked(&sk->sk_drops, 0);
101345 }
101346 EXPORT_SYMBOL(sock_init_data);
101347
101348 @@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
101349 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101350 int level, int type)
101351 {
101352 + struct sock_extended_err ee;
101353 struct sock_exterr_skb *serr;
101354 struct sk_buff *skb;
101355 int copied, err;
101356 @@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101357 sock_recv_timestamp(msg, sk, skb);
101358
101359 serr = SKB_EXT_ERR(skb);
101360 - put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
101361 + ee = serr->ee;
101362 + put_cmsg(msg, level, type, sizeof ee, &ee);
101363
101364 msg->msg_flags |= MSG_ERRQUEUE;
101365 err = copied;
101366 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
101367 index ad704c7..ca48aff 100644
101368 --- a/net/core/sock_diag.c
101369 +++ b/net/core/sock_diag.c
101370 @@ -9,26 +9,33 @@
101371 #include <linux/inet_diag.h>
101372 #include <linux/sock_diag.h>
101373
101374 -static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
101375 +static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
101376 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
101377 static DEFINE_MUTEX(sock_diag_table_mutex);
101378
101379 int sock_diag_check_cookie(void *sk, __u32 *cookie)
101380 {
101381 +#ifndef CONFIG_GRKERNSEC_HIDESYM
101382 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
101383 cookie[1] != INET_DIAG_NOCOOKIE) &&
101384 ((u32)(unsigned long)sk != cookie[0] ||
101385 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
101386 return -ESTALE;
101387 else
101388 +#endif
101389 return 0;
101390 }
101391 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
101392
101393 void sock_diag_save_cookie(void *sk, __u32 *cookie)
101394 {
101395 +#ifdef CONFIG_GRKERNSEC_HIDESYM
101396 + cookie[0] = 0;
101397 + cookie[1] = 0;
101398 +#else
101399 cookie[0] = (u32)(unsigned long)sk;
101400 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
101401 +#endif
101402 }
101403 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
101404
101405 @@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
101406 mutex_lock(&sock_diag_table_mutex);
101407 if (sock_diag_handlers[hndl->family])
101408 err = -EBUSY;
101409 - else
101410 + else {
101411 + pax_open_kernel();
101412 sock_diag_handlers[hndl->family] = hndl;
101413 + pax_close_kernel();
101414 + }
101415 mutex_unlock(&sock_diag_table_mutex);
101416
101417 return err;
101418 @@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
101419
101420 mutex_lock(&sock_diag_table_mutex);
101421 BUG_ON(sock_diag_handlers[family] != hnld);
101422 + pax_open_kernel();
101423 sock_diag_handlers[family] = NULL;
101424 + pax_close_kernel();
101425 mutex_unlock(&sock_diag_table_mutex);
101426 }
101427 EXPORT_SYMBOL_GPL(sock_diag_unregister);
101428 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
101429 index cf9cd13..50683950 100644
101430 --- a/net/core/sysctl_net_core.c
101431 +++ b/net/core/sysctl_net_core.c
101432 @@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
101433 {
101434 unsigned int orig_size, size;
101435 int ret, i;
101436 - struct ctl_table tmp = {
101437 + ctl_table_no_const tmp = {
101438 .data = &size,
101439 .maxlen = sizeof(size),
101440 .mode = table->mode
101441 @@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
101442 void __user *buffer, size_t *lenp, loff_t *ppos)
101443 {
101444 char id[IFNAMSIZ];
101445 - struct ctl_table tbl = {
101446 + ctl_table_no_const tbl = {
101447 .data = id,
101448 .maxlen = IFNAMSIZ,
101449 };
101450 @@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
101451 .mode = 0644,
101452 .proc_handler = proc_dointvec
101453 },
101454 -#ifdef CONFIG_BPF_JIT
101455 +#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
101456 {
101457 .procname = "bpf_jit_enable",
101458 .data = &bpf_jit_enable,
101459 @@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
101460
101461 static __net_init int sysctl_core_net_init(struct net *net)
101462 {
101463 - struct ctl_table *tbl;
101464 + ctl_table_no_const *tbl = NULL;
101465
101466 net->core.sysctl_somaxconn = SOMAXCONN;
101467
101468 - tbl = netns_core_table;
101469 if (!net_eq(net, &init_net)) {
101470 - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
101471 + tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
101472 if (tbl == NULL)
101473 goto err_dup;
101474
101475 @@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
101476 if (net->user_ns != &init_user_ns) {
101477 tbl[0].procname = NULL;
101478 }
101479 - }
101480 -
101481 - net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101482 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101483 + } else
101484 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
101485 if (net->core.sysctl_hdr == NULL)
101486 goto err_reg;
101487
101488 return 0;
101489
101490 err_reg:
101491 - if (tbl != netns_core_table)
101492 - kfree(tbl);
101493 + kfree(tbl);
101494 err_dup:
101495 return -ENOMEM;
101496 }
101497 @@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
101498 kfree(tbl);
101499 }
101500
101501 -static __net_initdata struct pernet_operations sysctl_core_ops = {
101502 +static __net_initconst struct pernet_operations sysctl_core_ops = {
101503 .init = sysctl_core_net_init,
101504 .exit = sysctl_core_net_exit,
101505 };
101506 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
101507 index 25733d5..b9360f0 100644
101508 --- a/net/decnet/af_decnet.c
101509 +++ b/net/decnet/af_decnet.c
101510 @@ -466,6 +466,7 @@ static struct proto dn_proto = {
101511 .sysctl_rmem = sysctl_decnet_rmem,
101512 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
101513 .obj_size = sizeof(struct dn_sock),
101514 + .slab_flags = SLAB_USERCOPY,
101515 };
101516
101517 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
101518 diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
101519 index 4400da7..3429972 100644
101520 --- a/net/decnet/dn_dev.c
101521 +++ b/net/decnet/dn_dev.c
101522 @@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
101523 .extra1 = &min_t3,
101524 .extra2 = &max_t3
101525 },
101526 - {0}
101527 + { }
101528 },
101529 };
101530
101531 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
101532 index 5325b54..a0d4d69 100644
101533 --- a/net/decnet/sysctl_net_decnet.c
101534 +++ b/net/decnet/sysctl_net_decnet.c
101535 @@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
101536
101537 if (len > *lenp) len = *lenp;
101538
101539 - if (copy_to_user(buffer, addr, len))
101540 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
101541 return -EFAULT;
101542
101543 *lenp = len;
101544 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
101545
101546 if (len > *lenp) len = *lenp;
101547
101548 - if (copy_to_user(buffer, devname, len))
101549 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
101550 return -EFAULT;
101551
101552 *lenp = len;
101553 diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
101554 index a2c7e4c..3dc9f67 100644
101555 --- a/net/hsr/hsr_netlink.c
101556 +++ b/net/hsr/hsr_netlink.c
101557 @@ -102,7 +102,7 @@ nla_put_failure:
101558 return -EMSGSIZE;
101559 }
101560
101561 -static struct rtnl_link_ops hsr_link_ops __read_mostly = {
101562 +static struct rtnl_link_ops hsr_link_ops = {
101563 .kind = "hsr",
101564 .maxtype = IFLA_HSR_MAX,
101565 .policy = hsr_policy,
101566 diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
101567 index 4413629..dea596a 100644
101568 --- a/net/ieee802154/6lowpan_rtnl.c
101569 +++ b/net/ieee802154/6lowpan_rtnl.c
101570 @@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
101571 dev_put(real_dev);
101572 }
101573
101574 -static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
101575 +static struct rtnl_link_ops lowpan_link_ops = {
101576 .kind = "lowpan",
101577 .priv_size = sizeof(struct lowpan_dev_info),
101578 .setup = lowpan_setup,
101579 diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
101580 index 7cfcd68..84ca5b7 100644
101581 --- a/net/ieee802154/reassembly.c
101582 +++ b/net/ieee802154/reassembly.c
101583 @@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
101584
101585 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101586 {
101587 - struct ctl_table *table;
101588 + ctl_table_no_const *table = NULL;
101589 struct ctl_table_header *hdr;
101590 struct netns_ieee802154_lowpan *ieee802154_lowpan =
101591 net_ieee802154_lowpan(net);
101592
101593 - table = lowpan_frags_ns_ctl_table;
101594 if (!net_eq(net, &init_net)) {
101595 - table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
101596 + table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
101597 GFP_KERNEL);
101598 if (table == NULL)
101599 goto err_alloc;
101600 @@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101601 /* Don't export sysctls to unprivileged users */
101602 if (net->user_ns != &init_user_ns)
101603 table[0].procname = NULL;
101604 - }
101605 -
101606 - hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101607 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101608 + } else
101609 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
101610 if (hdr == NULL)
101611 goto err_reg;
101612
101613 @@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101614 return 0;
101615
101616 err_reg:
101617 - if (!net_eq(net, &init_net))
101618 - kfree(table);
101619 + kfree(table);
101620 err_alloc:
101621 return -ENOMEM;
101622 }
101623 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
101624 index e67da4e..da217942 100644
101625 --- a/net/ipv4/af_inet.c
101626 +++ b/net/ipv4/af_inet.c
101627 @@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
101628 return ip_recv_error(sk, msg, len, addr_len);
101629 #if IS_ENABLED(CONFIG_IPV6)
101630 if (sk->sk_family == AF_INET6)
101631 - return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
101632 + return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
101633 #endif
101634 return -EINVAL;
101635 }
101636 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
101637 index 214882e..ec032f6 100644
101638 --- a/net/ipv4/devinet.c
101639 +++ b/net/ipv4/devinet.c
101640 @@ -69,7 +69,8 @@
101641
101642 static struct ipv4_devconf ipv4_devconf = {
101643 .data = {
101644 - [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101645 + [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101646 + [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101647 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101648 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101649 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101650 @@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
101651
101652 static struct ipv4_devconf ipv4_devconf_dflt = {
101653 .data = {
101654 - [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101655 + [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101656 + [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101657 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101658 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101659 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101660 @@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
101661 idx = 0;
101662 head = &net->dev_index_head[h];
101663 rcu_read_lock();
101664 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101665 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101666 net->dev_base_seq;
101667 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101668 if (idx < s_idx)
101669 @@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
101670 idx = 0;
101671 head = &net->dev_index_head[h];
101672 rcu_read_lock();
101673 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101674 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101675 net->dev_base_seq;
101676 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101677 if (idx < s_idx)
101678 @@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
101679 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
101680 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
101681
101682 -static struct devinet_sysctl_table {
101683 +static const struct devinet_sysctl_table {
101684 struct ctl_table_header *sysctl_header;
101685 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
101686 } devinet_sysctl = {
101687 @@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
101688 int err;
101689 struct ipv4_devconf *all, *dflt;
101690 #ifdef CONFIG_SYSCTL
101691 - struct ctl_table *tbl = ctl_forward_entry;
101692 + ctl_table_no_const *tbl = NULL;
101693 struct ctl_table_header *forw_hdr;
101694 #endif
101695
101696 @@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
101697 goto err_alloc_dflt;
101698
101699 #ifdef CONFIG_SYSCTL
101700 - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
101701 + tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
101702 if (tbl == NULL)
101703 goto err_alloc_ctl;
101704
101705 @@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
101706 goto err_reg_dflt;
101707
101708 err = -ENOMEM;
101709 - forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101710 + if (!net_eq(net, &init_net))
101711 + forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101712 + else
101713 + forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
101714 if (forw_hdr == NULL)
101715 goto err_reg_ctl;
101716 net->ipv4.forw_hdr = forw_hdr;
101717 @@ -2287,8 +2292,7 @@ err_reg_ctl:
101718 err_reg_dflt:
101719 __devinet_sysctl_unregister(all);
101720 err_reg_all:
101721 - if (tbl != ctl_forward_entry)
101722 - kfree(tbl);
101723 + kfree(tbl);
101724 err_alloc_ctl:
101725 #endif
101726 if (dflt != &ipv4_devconf_dflt)
101727 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
101728 index 23104a3..9f5570b 100644
101729 --- a/net/ipv4/fib_frontend.c
101730 +++ b/net/ipv4/fib_frontend.c
101731 @@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
101732 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101733 fib_sync_up(dev);
101734 #endif
101735 - atomic_inc(&net->ipv4.dev_addr_genid);
101736 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101737 rt_cache_flush(dev_net(dev));
101738 break;
101739 case NETDEV_DOWN:
101740 fib_del_ifaddr(ifa, NULL);
101741 - atomic_inc(&net->ipv4.dev_addr_genid);
101742 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101743 if (ifa->ifa_dev->ifa_list == NULL) {
101744 /* Last address was deleted from this interface.
101745 * Disable IP.
101746 @@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
101747 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101748 fib_sync_up(dev);
101749 #endif
101750 - atomic_inc(&net->ipv4.dev_addr_genid);
101751 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101752 rt_cache_flush(net);
101753 break;
101754 case NETDEV_DOWN:
101755 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
101756 index f99f41b..1879da9 100644
101757 --- a/net/ipv4/fib_semantics.c
101758 +++ b/net/ipv4/fib_semantics.c
101759 @@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
101760 nh->nh_saddr = inet_select_addr(nh->nh_dev,
101761 nh->nh_gw,
101762 nh->nh_parent->fib_scope);
101763 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
101764 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
101765
101766 return nh->nh_saddr;
101767 }
101768 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
101769 index 9111a4e..3576905 100644
101770 --- a/net/ipv4/inet_hashtables.c
101771 +++ b/net/ipv4/inet_hashtables.c
101772 @@ -18,6 +18,7 @@
101773 #include <linux/sched.h>
101774 #include <linux/slab.h>
101775 #include <linux/wait.h>
101776 +#include <linux/security.h>
101777
101778 #include <net/inet_connection_sock.h>
101779 #include <net/inet_hashtables.h>
101780 @@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
101781 return inet_ehashfn(net, laddr, lport, faddr, fport);
101782 }
101783
101784 +extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
101785 +
101786 /*
101787 * Allocate and initialize a new local port bind bucket.
101788 * The bindhash mutex for snum's hash chain must be held here.
101789 @@ -554,6 +557,8 @@ ok:
101790 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
101791 spin_unlock(&head->lock);
101792
101793 + gr_update_task_in_ip_table(inet_sk(sk));
101794 +
101795 if (tw) {
101796 inet_twsk_deschedule(tw, death_row);
101797 while (twrefcnt) {
101798 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
101799 index 241afd7..31b95d5 100644
101800 --- a/net/ipv4/inetpeer.c
101801 +++ b/net/ipv4/inetpeer.c
101802 @@ -461,7 +461,7 @@ relookup:
101803 if (p) {
101804 p->daddr = *daddr;
101805 atomic_set(&p->refcnt, 1);
101806 - atomic_set(&p->rid, 0);
101807 + atomic_set_unchecked(&p->rid, 0);
101808 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
101809 p->rate_tokens = 0;
101810 /* 60*HZ is arbitrary, but chosen enough high so that the first
101811 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
101812 index 2811cc1..ad5a534 100644
101813 --- a/net/ipv4/ip_fragment.c
101814 +++ b/net/ipv4/ip_fragment.c
101815 @@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
101816 return 0;
101817
101818 start = qp->rid;
101819 - end = atomic_inc_return(&peer->rid);
101820 + end = atomic_inc_return_unchecked(&peer->rid);
101821 qp->rid = end;
101822
101823 rc = qp->q.fragments && (end - start) > max;
101824 @@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
101825
101826 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101827 {
101828 - struct ctl_table *table;
101829 + ctl_table_no_const *table = NULL;
101830 struct ctl_table_header *hdr;
101831
101832 - table = ip4_frags_ns_ctl_table;
101833 if (!net_eq(net, &init_net)) {
101834 - table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101835 + table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101836 if (table == NULL)
101837 goto err_alloc;
101838
101839 @@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101840 /* Don't export sysctls to unprivileged users */
101841 if (net->user_ns != &init_user_ns)
101842 table[0].procname = NULL;
101843 - }
101844 + hdr = register_net_sysctl(net, "net/ipv4", table);
101845 + } else
101846 + hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
101847
101848 - hdr = register_net_sysctl(net, "net/ipv4", table);
101849 if (hdr == NULL)
101850 goto err_reg;
101851
101852 @@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101853 return 0;
101854
101855 err_reg:
101856 - if (!net_eq(net, &init_net))
101857 - kfree(table);
101858 + kfree(table);
101859 err_alloc:
101860 return -ENOMEM;
101861 }
101862 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
101863 index 12055fd..df852c4 100644
101864 --- a/net/ipv4/ip_gre.c
101865 +++ b/net/ipv4/ip_gre.c
101866 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
101867 module_param(log_ecn_error, bool, 0644);
101868 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
101869
101870 -static struct rtnl_link_ops ipgre_link_ops __read_mostly;
101871 +static struct rtnl_link_ops ipgre_link_ops;
101872 static int ipgre_tunnel_init(struct net_device *dev);
101873
101874 static int ipgre_net_id __read_mostly;
101875 @@ -815,7 +815,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
101876 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
101877 };
101878
101879 -static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
101880 +static struct rtnl_link_ops ipgre_link_ops = {
101881 .kind = "gre",
101882 .maxtype = IFLA_GRE_MAX,
101883 .policy = ipgre_policy,
101884 @@ -829,7 +829,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
101885 .fill_info = ipgre_fill_info,
101886 };
101887
101888 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
101889 +static struct rtnl_link_ops ipgre_tap_ops = {
101890 .kind = "gretap",
101891 .maxtype = IFLA_GRE_MAX,
101892 .policy = ipgre_policy,
101893 diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
101894 index 3d4da2c..40f9c29 100644
101895 --- a/net/ipv4/ip_input.c
101896 +++ b/net/ipv4/ip_input.c
101897 @@ -147,6 +147,10 @@
101898 #include <linux/mroute.h>
101899 #include <linux/netlink.h>
101900
101901 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101902 +extern int grsec_enable_blackhole;
101903 +#endif
101904 +
101905 /*
101906 * Process Router Attention IP option (RFC 2113)
101907 */
101908 @@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
101909 if (!raw) {
101910 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
101911 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
101912 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101913 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
101914 +#endif
101915 icmp_send(skb, ICMP_DEST_UNREACH,
101916 ICMP_PROT_UNREACH, 0);
101917 }
101918 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
101919 index 9daf217..dc6972d 100644
101920 --- a/net/ipv4/ip_sockglue.c
101921 +++ b/net/ipv4/ip_sockglue.c
101922 @@ -1177,7 +1177,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
101923 len = min_t(unsigned int, len, opt->optlen);
101924 if (put_user(len, optlen))
101925 return -EFAULT;
101926 - if (copy_to_user(optval, opt->__data, len))
101927 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
101928 + copy_to_user(optval, opt->__data, len))
101929 return -EFAULT;
101930 return 0;
101931 }
101932 @@ -1308,7 +1309,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
101933 if (sk->sk_type != SOCK_STREAM)
101934 return -ENOPROTOOPT;
101935
101936 - msg.msg_control = (__force void *) optval;
101937 + msg.msg_control = (__force_kernel void *) optval;
101938 msg.msg_controllen = len;
101939 msg.msg_flags = flags;
101940
101941 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
101942 index 1a7e979..fd05aa4 100644
101943 --- a/net/ipv4/ip_vti.c
101944 +++ b/net/ipv4/ip_vti.c
101945 @@ -45,7 +45,7 @@
101946 #include <net/net_namespace.h>
101947 #include <net/netns/generic.h>
101948
101949 -static struct rtnl_link_ops vti_link_ops __read_mostly;
101950 +static struct rtnl_link_ops vti_link_ops;
101951
101952 static int vti_net_id __read_mostly;
101953 static int vti_tunnel_init(struct net_device *dev);
101954 @@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
101955 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
101956 };
101957
101958 -static struct rtnl_link_ops vti_link_ops __read_mostly = {
101959 +static struct rtnl_link_ops vti_link_ops = {
101960 .kind = "vti",
101961 .maxtype = IFLA_VTI_MAX,
101962 .policy = vti_policy,
101963 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
101964 index 648fa14..97864d0 100644
101965 --- a/net/ipv4/ipconfig.c
101966 +++ b/net/ipv4/ipconfig.c
101967 @@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
101968
101969 mm_segment_t oldfs = get_fs();
101970 set_fs(get_ds());
101971 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
101972 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
101973 set_fs(oldfs);
101974 return res;
101975 }
101976 @@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
101977
101978 mm_segment_t oldfs = get_fs();
101979 set_fs(get_ds());
101980 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
101981 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
101982 set_fs(oldfs);
101983 return res;
101984 }
101985 @@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
101986
101987 mm_segment_t oldfs = get_fs();
101988 set_fs(get_ds());
101989 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
101990 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
101991 set_fs(oldfs);
101992 return res;
101993 }
101994 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
101995 index 37096d6..86abb03 100644
101996 --- a/net/ipv4/ipip.c
101997 +++ b/net/ipv4/ipip.c
101998 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
101999 static int ipip_net_id __read_mostly;
102000
102001 static int ipip_tunnel_init(struct net_device *dev);
102002 -static struct rtnl_link_ops ipip_link_ops __read_mostly;
102003 +static struct rtnl_link_ops ipip_link_ops;
102004
102005 static int ipip_err(struct sk_buff *skb, u32 info)
102006 {
102007 @@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
102008 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
102009 };
102010
102011 -static struct rtnl_link_ops ipip_link_ops __read_mostly = {
102012 +static struct rtnl_link_ops ipip_link_ops = {
102013 .kind = "ipip",
102014 .maxtype = IFLA_IPTUN_MAX,
102015 .policy = ipip_policy,
102016 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
102017 index f95b6f9..2ee2097 100644
102018 --- a/net/ipv4/netfilter/arp_tables.c
102019 +++ b/net/ipv4/netfilter/arp_tables.c
102020 @@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
102021 #endif
102022
102023 static int get_info(struct net *net, void __user *user,
102024 - const int *len, int compat)
102025 + int len, int compat)
102026 {
102027 char name[XT_TABLE_MAXNAMELEN];
102028 struct xt_table *t;
102029 int ret;
102030
102031 - if (*len != sizeof(struct arpt_getinfo)) {
102032 - duprintf("length %u != %Zu\n", *len,
102033 + if (len != sizeof(struct arpt_getinfo)) {
102034 + duprintf("length %u != %Zu\n", len,
102035 sizeof(struct arpt_getinfo));
102036 return -EINVAL;
102037 }
102038 @@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
102039 info.size = private->size;
102040 strcpy(info.name, name);
102041
102042 - if (copy_to_user(user, &info, *len) != 0)
102043 + if (copy_to_user(user, &info, len) != 0)
102044 ret = -EFAULT;
102045 else
102046 ret = 0;
102047 @@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
102048
102049 switch (cmd) {
102050 case ARPT_SO_GET_INFO:
102051 - ret = get_info(sock_net(sk), user, len, 1);
102052 + ret = get_info(sock_net(sk), user, *len, 1);
102053 break;
102054 case ARPT_SO_GET_ENTRIES:
102055 ret = compat_get_entries(sock_net(sk), user, len);
102056 @@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
102057
102058 switch (cmd) {
102059 case ARPT_SO_GET_INFO:
102060 - ret = get_info(sock_net(sk), user, len, 0);
102061 + ret = get_info(sock_net(sk), user, *len, 0);
102062 break;
102063
102064 case ARPT_SO_GET_ENTRIES:
102065 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
102066 index 99e810f..3711b81 100644
102067 --- a/net/ipv4/netfilter/ip_tables.c
102068 +++ b/net/ipv4/netfilter/ip_tables.c
102069 @@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
102070 #endif
102071
102072 static int get_info(struct net *net, void __user *user,
102073 - const int *len, int compat)
102074 + int len, int compat)
102075 {
102076 char name[XT_TABLE_MAXNAMELEN];
102077 struct xt_table *t;
102078 int ret;
102079
102080 - if (*len != sizeof(struct ipt_getinfo)) {
102081 - duprintf("length %u != %zu\n", *len,
102082 + if (len != sizeof(struct ipt_getinfo)) {
102083 + duprintf("length %u != %zu\n", len,
102084 sizeof(struct ipt_getinfo));
102085 return -EINVAL;
102086 }
102087 @@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
102088 info.size = private->size;
102089 strcpy(info.name, name);
102090
102091 - if (copy_to_user(user, &info, *len) != 0)
102092 + if (copy_to_user(user, &info, len) != 0)
102093 ret = -EFAULT;
102094 else
102095 ret = 0;
102096 @@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102097
102098 switch (cmd) {
102099 case IPT_SO_GET_INFO:
102100 - ret = get_info(sock_net(sk), user, len, 1);
102101 + ret = get_info(sock_net(sk), user, *len, 1);
102102 break;
102103 case IPT_SO_GET_ENTRIES:
102104 ret = compat_get_entries(sock_net(sk), user, len);
102105 @@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102106
102107 switch (cmd) {
102108 case IPT_SO_GET_INFO:
102109 - ret = get_info(sock_net(sk), user, len, 0);
102110 + ret = get_info(sock_net(sk), user, *len, 0);
102111 break;
102112
102113 case IPT_SO_GET_ENTRIES:
102114 diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102115 index e90f83a..3e6acca 100644
102116 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
102117 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102118 @@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
102119 spin_lock_init(&cn->lock);
102120
102121 #ifdef CONFIG_PROC_FS
102122 - cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
102123 + cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
102124 if (!cn->procdir) {
102125 pr_err("Unable to proc dir entry\n");
102126 return -ENOMEM;
102127 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
102128 index 5d740cc..b2842b9 100644
102129 --- a/net/ipv4/ping.c
102130 +++ b/net/ipv4/ping.c
102131 @@ -59,7 +59,7 @@ struct ping_table {
102132 };
102133
102134 static struct ping_table ping_table;
102135 -struct pingv6_ops pingv6_ops;
102136 +struct pingv6_ops *pingv6_ops;
102137 EXPORT_SYMBOL_GPL(pingv6_ops);
102138
102139 static u16 ping_port_rover;
102140 @@ -350,7 +350,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
102141 return -ENODEV;
102142 }
102143 }
102144 - has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
102145 + has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
102146 scoped);
102147 rcu_read_unlock();
102148
102149 @@ -558,7 +558,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102150 }
102151 #if IS_ENABLED(CONFIG_IPV6)
102152 } else if (skb->protocol == htons(ETH_P_IPV6)) {
102153 - harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
102154 + harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
102155 #endif
102156 }
102157
102158 @@ -576,7 +576,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102159 info, (u8 *)icmph);
102160 #if IS_ENABLED(CONFIG_IPV6)
102161 } else if (family == AF_INET6) {
102162 - pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
102163 + pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
102164 info, (u8 *)icmph);
102165 #endif
102166 }
102167 @@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102168 }
102169
102170 if (inet6_sk(sk)->rxopt.all)
102171 - pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
102172 + pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
102173 if (skb->protocol == htons(ETH_P_IPV6) &&
102174 inet6_sk(sk)->rxopt.all)
102175 - pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
102176 + pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
102177 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
102178 ip_cmsg_recv(msg, skb);
102179 #endif
102180 @@ -1105,7 +1105,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
102181 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102182 0, sock_i_ino(sp),
102183 atomic_read(&sp->sk_refcnt), sp,
102184 - atomic_read(&sp->sk_drops));
102185 + atomic_read_unchecked(&sp->sk_drops));
102186 }
102187
102188 static int ping_v4_seq_show(struct seq_file *seq, void *v)
102189 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
102190 index 739db31..74f0210 100644
102191 --- a/net/ipv4/raw.c
102192 +++ b/net/ipv4/raw.c
102193 @@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
102194 int raw_rcv(struct sock *sk, struct sk_buff *skb)
102195 {
102196 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
102197 - atomic_inc(&sk->sk_drops);
102198 + atomic_inc_unchecked(&sk->sk_drops);
102199 kfree_skb(skb);
102200 return NET_RX_DROP;
102201 }
102202 @@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
102203
102204 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
102205 {
102206 + struct icmp_filter filter;
102207 +
102208 if (optlen > sizeof(struct icmp_filter))
102209 optlen = sizeof(struct icmp_filter);
102210 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
102211 + if (copy_from_user(&filter, optval, optlen))
102212 return -EFAULT;
102213 + raw_sk(sk)->filter = filter;
102214 return 0;
102215 }
102216
102217 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
102218 {
102219 int len, ret = -EFAULT;
102220 + struct icmp_filter filter;
102221
102222 if (get_user(len, optlen))
102223 goto out;
102224 @@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
102225 if (len > sizeof(struct icmp_filter))
102226 len = sizeof(struct icmp_filter);
102227 ret = -EFAULT;
102228 - if (put_user(len, optlen) ||
102229 - copy_to_user(optval, &raw_sk(sk)->filter, len))
102230 + filter = raw_sk(sk)->filter;
102231 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
102232 goto out;
102233 ret = 0;
102234 out: return ret;
102235 @@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
102236 0, 0L, 0,
102237 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
102238 0, sock_i_ino(sp),
102239 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
102240 + atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
102241 }
102242
102243 static int raw_seq_show(struct seq_file *seq, void *v)
102244 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
102245 index 6a2155b..d426880 100644
102246 --- a/net/ipv4/route.c
102247 +++ b/net/ipv4/route.c
102248 @@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
102249
102250 static int rt_cache_seq_open(struct inode *inode, struct file *file)
102251 {
102252 - return seq_open(file, &rt_cache_seq_ops);
102253 + return seq_open_restrict(file, &rt_cache_seq_ops);
102254 }
102255
102256 static const struct file_operations rt_cache_seq_fops = {
102257 @@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
102258
102259 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
102260 {
102261 - return seq_open(file, &rt_cpu_seq_ops);
102262 + return seq_open_restrict(file, &rt_cpu_seq_ops);
102263 }
102264
102265 static const struct file_operations rt_cpu_seq_fops = {
102266 @@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
102267
102268 static int rt_acct_proc_open(struct inode *inode, struct file *file)
102269 {
102270 - return single_open(file, rt_acct_proc_show, NULL);
102271 + return single_open_restrict(file, rt_acct_proc_show, NULL);
102272 }
102273
102274 static const struct file_operations rt_acct_proc_fops = {
102275 @@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
102276
102277 #define IP_IDENTS_SZ 2048u
102278 struct ip_ident_bucket {
102279 - atomic_t id;
102280 + atomic_unchecked_t id;
102281 u32 stamp32;
102282 };
102283
102284 -static struct ip_ident_bucket *ip_idents __read_mostly;
102285 +static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
102286
102287 /* In order to protect privacy, we add a perturbation to identifiers
102288 * if one generator is seldom used. This makes hard for an attacker
102289 @@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
102290 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
102291 delta = prandom_u32_max(now - old);
102292
102293 - return atomic_add_return(segs + delta, &bucket->id) - segs;
102294 + return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
102295 }
102296 EXPORT_SYMBOL(ip_idents_reserve);
102297
102298 @@ -2624,34 +2624,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
102299 .maxlen = sizeof(int),
102300 .mode = 0200,
102301 .proc_handler = ipv4_sysctl_rtcache_flush,
102302 + .extra1 = &init_net,
102303 },
102304 { },
102305 };
102306
102307 static __net_init int sysctl_route_net_init(struct net *net)
102308 {
102309 - struct ctl_table *tbl;
102310 + ctl_table_no_const *tbl = NULL;
102311
102312 - tbl = ipv4_route_flush_table;
102313 if (!net_eq(net, &init_net)) {
102314 - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102315 + tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102316 if (tbl == NULL)
102317 goto err_dup;
102318
102319 /* Don't export sysctls to unprivileged users */
102320 if (net->user_ns != &init_user_ns)
102321 tbl[0].procname = NULL;
102322 - }
102323 - tbl[0].extra1 = net;
102324 + tbl[0].extra1 = net;
102325 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102326 + } else
102327 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
102328
102329 - net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102330 if (net->ipv4.route_hdr == NULL)
102331 goto err_reg;
102332 return 0;
102333
102334 err_reg:
102335 - if (tbl != ipv4_route_flush_table)
102336 - kfree(tbl);
102337 + kfree(tbl);
102338 err_dup:
102339 return -ENOMEM;
102340 }
102341 @@ -2674,8 +2674,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
102342
102343 static __net_init int rt_genid_init(struct net *net)
102344 {
102345 - atomic_set(&net->ipv4.rt_genid, 0);
102346 - atomic_set(&net->fnhe_genid, 0);
102347 + atomic_set_unchecked(&net->ipv4.rt_genid, 0);
102348 + atomic_set_unchecked(&net->fnhe_genid, 0);
102349 get_random_bytes(&net->ipv4.dev_addr_genid,
102350 sizeof(net->ipv4.dev_addr_genid));
102351 return 0;
102352 @@ -2718,11 +2718,7 @@ int __init ip_rt_init(void)
102353 {
102354 int rc = 0;
102355
102356 - ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
102357 - if (!ip_idents)
102358 - panic("IP: failed to allocate ip_idents\n");
102359 -
102360 - prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
102361 + prandom_bytes(ip_idents, sizeof(ip_idents));
102362
102363 #ifdef CONFIG_IP_ROUTE_CLASSID
102364 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
102365 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
102366 index b3c53c8..35cc18d 100644
102367 --- a/net/ipv4/sysctl_net_ipv4.c
102368 +++ b/net/ipv4/sysctl_net_ipv4.c
102369 @@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
102370 container_of(table->data, struct net, ipv4.ip_local_ports.range);
102371 int ret;
102372 int range[2];
102373 - struct ctl_table tmp = {
102374 + ctl_table_no_const tmp = {
102375 .data = &range,
102376 .maxlen = sizeof(range),
102377 .mode = table->mode,
102378 @@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
102379 int ret;
102380 gid_t urange[2];
102381 kgid_t low, high;
102382 - struct ctl_table tmp = {
102383 + ctl_table_no_const tmp = {
102384 .data = &urange,
102385 .maxlen = sizeof(urange),
102386 .mode = table->mode,
102387 @@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
102388 void __user *buffer, size_t *lenp, loff_t *ppos)
102389 {
102390 char val[TCP_CA_NAME_MAX];
102391 - struct ctl_table tbl = {
102392 + ctl_table_no_const tbl = {
102393 .data = val,
102394 .maxlen = TCP_CA_NAME_MAX,
102395 };
102396 @@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
102397 void __user *buffer, size_t *lenp,
102398 loff_t *ppos)
102399 {
102400 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
102401 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
102402 int ret;
102403
102404 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102405 @@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
102406 void __user *buffer, size_t *lenp,
102407 loff_t *ppos)
102408 {
102409 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
102410 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
102411 int ret;
102412
102413 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102414 @@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
102415 void __user *buffer, size_t *lenp,
102416 loff_t *ppos)
102417 {
102418 - struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102419 + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102420 struct tcp_fastopen_context *ctxt;
102421 int ret;
102422 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
102423 @@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
102424
102425 static __net_init int ipv4_sysctl_init_net(struct net *net)
102426 {
102427 - struct ctl_table *table;
102428 + ctl_table_no_const *table = NULL;
102429
102430 - table = ipv4_net_table;
102431 if (!net_eq(net, &init_net)) {
102432 int i;
102433
102434 - table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
102435 + table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
102436 if (table == NULL)
102437 goto err_alloc;
102438
102439 @@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
102440 table[i].data += (void *)net - (void *)&init_net;
102441 }
102442
102443 - net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102444 + if (!net_eq(net, &init_net))
102445 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102446 + else
102447 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
102448 if (net->ipv4.ipv4_hdr == NULL)
102449 goto err_reg;
102450
102451 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
102452 index d107ee2..bcebf11 100644
102453 --- a/net/ipv4/tcp_input.c
102454 +++ b/net/ipv4/tcp_input.c
102455 @@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
102456 * without any lock. We want to make sure compiler wont store
102457 * intermediate values in this location.
102458 */
102459 - ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
102460 + ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
102461 sk->sk_max_pacing_rate);
102462 }
102463
102464 @@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
102465 * simplifies code)
102466 */
102467 static void
102468 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102469 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102470 struct sk_buff *head, struct sk_buff *tail,
102471 u32 start, u32 end)
102472 {
102473 @@ -5506,6 +5506,7 @@ discard:
102474 tcp_paws_reject(&tp->rx_opt, 0))
102475 goto discard_and_undo;
102476
102477 +#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
102478 if (th->syn) {
102479 /* We see SYN without ACK. It is attempt of
102480 * simultaneous connect with crossed SYNs.
102481 @@ -5556,6 +5557,7 @@ discard:
102482 goto discard;
102483 #endif
102484 }
102485 +#endif
102486 /* "fifth, if neither of the SYN or RST bits is set then
102487 * drop the segment and return."
102488 */
102489 @@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
102490 goto discard;
102491
102492 if (th->syn) {
102493 - if (th->fin)
102494 + if (th->fin || th->urg || th->psh)
102495 goto discard;
102496 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
102497 return 1;
102498 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
102499 index ef7089c..a3e65fb 100644
102500 --- a/net/ipv4/tcp_ipv4.c
102501 +++ b/net/ipv4/tcp_ipv4.c
102502 @@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
102503 int sysctl_tcp_low_latency __read_mostly;
102504 EXPORT_SYMBOL(sysctl_tcp_low_latency);
102505
102506 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102507 +extern int grsec_enable_blackhole;
102508 +#endif
102509 +
102510 #ifdef CONFIG_TCP_MD5SIG
102511 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
102512 __be32 daddr, __be32 saddr, const struct tcphdr *th);
102513 @@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
102514 return 0;
102515
102516 reset:
102517 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102518 + if (!grsec_enable_blackhole)
102519 +#endif
102520 tcp_v4_send_reset(rsk, skb);
102521 discard:
102522 kfree_skb(skb);
102523 @@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
102524 TCP_SKB_CB(skb)->sacked = 0;
102525
102526 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
102527 - if (!sk)
102528 + if (!sk) {
102529 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102530 + ret = 1;
102531 +#endif
102532 goto no_tcp_socket;
102533 -
102534 + }
102535 process:
102536 - if (sk->sk_state == TCP_TIME_WAIT)
102537 + if (sk->sk_state == TCP_TIME_WAIT) {
102538 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102539 + ret = 2;
102540 +#endif
102541 goto do_time_wait;
102542 + }
102543
102544 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
102545 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
102546 @@ -1694,6 +1708,10 @@ csum_error:
102547 bad_packet:
102548 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
102549 } else {
102550 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102551 + if (!grsec_enable_blackhole || (ret == 1 &&
102552 + (skb->dev->flags & IFF_LOOPBACK)))
102553 +#endif
102554 tcp_v4_send_reset(NULL, skb);
102555 }
102556
102557 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
102558 index 63d2680..2db9d6b 100644
102559 --- a/net/ipv4/tcp_minisocks.c
102560 +++ b/net/ipv4/tcp_minisocks.c
102561 @@ -27,6 +27,10 @@
102562 #include <net/inet_common.h>
102563 #include <net/xfrm.h>
102564
102565 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102566 +extern int grsec_enable_blackhole;
102567 +#endif
102568 +
102569 int sysctl_tcp_syncookies __read_mostly = 1;
102570 EXPORT_SYMBOL(sysctl_tcp_syncookies);
102571
102572 @@ -739,7 +743,10 @@ embryonic_reset:
102573 * avoid becoming vulnerable to outside attack aiming at
102574 * resetting legit local connections.
102575 */
102576 - req->rsk_ops->send_reset(sk, skb);
102577 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102578 + if (!grsec_enable_blackhole)
102579 +#endif
102580 + req->rsk_ops->send_reset(sk, skb);
102581 } else if (fastopen) { /* received a valid RST pkt */
102582 reqsk_fastopen_remove(sk, req, true);
102583 tcp_reset(sk);
102584 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
102585 index ebf5ff5..4d1ff32 100644
102586 --- a/net/ipv4/tcp_probe.c
102587 +++ b/net/ipv4/tcp_probe.c
102588 @@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
102589 if (cnt + width >= len)
102590 break;
102591
102592 - if (copy_to_user(buf + cnt, tbuf, width))
102593 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
102594 return -EFAULT;
102595 cnt += width;
102596 }
102597 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
102598 index 9b21ae8..4eb67df 100644
102599 --- a/net/ipv4/tcp_timer.c
102600 +++ b/net/ipv4/tcp_timer.c
102601 @@ -22,6 +22,10 @@
102602 #include <linux/gfp.h>
102603 #include <net/tcp.h>
102604
102605 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102606 +extern int grsec_lastack_retries;
102607 +#endif
102608 +
102609 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
102610 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
102611 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
102612 @@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
102613 }
102614 }
102615
102616 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102617 + if ((sk->sk_state == TCP_LAST_ACK) &&
102618 + (grsec_lastack_retries > 0) &&
102619 + (grsec_lastack_retries < retry_until))
102620 + retry_until = grsec_lastack_retries;
102621 +#endif
102622 +
102623 if (retransmits_timed_out(sk, retry_until,
102624 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
102625 /* Has it gone just too far? */
102626 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
102627 index cd0db54..93a6518 100644
102628 --- a/net/ipv4/udp.c
102629 +++ b/net/ipv4/udp.c
102630 @@ -87,6 +87,7 @@
102631 #include <linux/types.h>
102632 #include <linux/fcntl.h>
102633 #include <linux/module.h>
102634 +#include <linux/security.h>
102635 #include <linux/socket.h>
102636 #include <linux/sockios.h>
102637 #include <linux/igmp.h>
102638 @@ -114,6 +115,10 @@
102639 #include <net/busy_poll.h>
102640 #include "udp_impl.h"
102641
102642 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102643 +extern int grsec_enable_blackhole;
102644 +#endif
102645 +
102646 struct udp_table udp_table __read_mostly;
102647 EXPORT_SYMBOL(udp_table);
102648
102649 @@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
102650 return true;
102651 }
102652
102653 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
102654 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
102655 +
102656 /*
102657 * This routine is called by the ICMP module when it gets some
102658 * sort of error condition. If err < 0 then the socket should
102659 @@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102660 dport = usin->sin_port;
102661 if (dport == 0)
102662 return -EINVAL;
102663 +
102664 + err = gr_search_udp_sendmsg(sk, usin);
102665 + if (err)
102666 + return err;
102667 } else {
102668 if (sk->sk_state != TCP_ESTABLISHED)
102669 return -EDESTADDRREQ;
102670 +
102671 + err = gr_search_udp_sendmsg(sk, NULL);
102672 + if (err)
102673 + return err;
102674 +
102675 daddr = inet->inet_daddr;
102676 dport = inet->inet_dport;
102677 /* Open fast path for connected socket.
102678 @@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
102679 IS_UDPLITE(sk));
102680 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102681 IS_UDPLITE(sk));
102682 - atomic_inc(&sk->sk_drops);
102683 + atomic_inc_unchecked(&sk->sk_drops);
102684 __skb_unlink(skb, rcvq);
102685 __skb_queue_tail(&list_kill, skb);
102686 }
102687 @@ -1262,6 +1279,10 @@ try_again:
102688 if (!skb)
102689 goto out;
102690
102691 + err = gr_search_udp_recvmsg(sk, skb);
102692 + if (err)
102693 + goto out_free;
102694 +
102695 ulen = skb->len - sizeof(struct udphdr);
102696 copied = len;
102697 if (copied > ulen)
102698 @@ -1295,7 +1316,7 @@ try_again:
102699 if (unlikely(err)) {
102700 trace_kfree_skb(skb, udp_recvmsg);
102701 if (!peeked) {
102702 - atomic_inc(&sk->sk_drops);
102703 + atomic_inc_unchecked(&sk->sk_drops);
102704 UDP_INC_STATS_USER(sock_net(sk),
102705 UDP_MIB_INERRORS, is_udplite);
102706 }
102707 @@ -1592,7 +1613,7 @@ csum_error:
102708 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
102709 drop:
102710 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
102711 - atomic_inc(&sk->sk_drops);
102712 + atomic_inc_unchecked(&sk->sk_drops);
102713 kfree_skb(skb);
102714 return -1;
102715 }
102716 @@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
102717 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
102718
102719 if (!skb1) {
102720 - atomic_inc(&sk->sk_drops);
102721 + atomic_inc_unchecked(&sk->sk_drops);
102722 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
102723 IS_UDPLITE(sk));
102724 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102725 @@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
102726 goto csum_error;
102727
102728 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
102729 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102730 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102731 +#endif
102732 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
102733
102734 /*
102735 @@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
102736 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102737 0, sock_i_ino(sp),
102738 atomic_read(&sp->sk_refcnt), sp,
102739 - atomic_read(&sp->sk_drops));
102740 + atomic_read_unchecked(&sp->sk_drops));
102741 }
102742
102743 int udp4_seq_show(struct seq_file *seq, void *v)
102744 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
102745 index 6156f68..d6ab46d 100644
102746 --- a/net/ipv4/xfrm4_policy.c
102747 +++ b/net/ipv4/xfrm4_policy.c
102748 @@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
102749 fl4->flowi4_tos = iph->tos;
102750 }
102751
102752 -static inline int xfrm4_garbage_collect(struct dst_ops *ops)
102753 +static int xfrm4_garbage_collect(struct dst_ops *ops)
102754 {
102755 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
102756
102757 - xfrm4_policy_afinfo.garbage_collect(net);
102758 + xfrm_garbage_collect_deferred(net);
102759 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
102760 }
102761
102762 @@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
102763
102764 static int __net_init xfrm4_net_init(struct net *net)
102765 {
102766 - struct ctl_table *table;
102767 + ctl_table_no_const *table = NULL;
102768 struct ctl_table_header *hdr;
102769
102770 - table = xfrm4_policy_table;
102771 if (!net_eq(net, &init_net)) {
102772 - table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102773 + table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102774 if (!table)
102775 goto err_alloc;
102776
102777 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
102778 - }
102779 -
102780 - hdr = register_net_sysctl(net, "net/ipv4", table);
102781 + hdr = register_net_sysctl(net, "net/ipv4", table);
102782 + } else
102783 + hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
102784 if (!hdr)
102785 goto err_reg;
102786
102787 @@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
102788 return 0;
102789
102790 err_reg:
102791 - if (!net_eq(net, &init_net))
102792 - kfree(table);
102793 + kfree(table);
102794 err_alloc:
102795 return -ENOMEM;
102796 }
102797 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
102798 index 0169ccf..50d7b04 100644
102799 --- a/net/ipv6/addrconf.c
102800 +++ b/net/ipv6/addrconf.c
102801 @@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
102802 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102803 .mtu6 = IPV6_MIN_MTU,
102804 .accept_ra = 1,
102805 - .accept_redirects = 1,
102806 + .accept_redirects = 0,
102807 .autoconf = 1,
102808 .force_mld_version = 0,
102809 .mldv1_unsolicited_report_interval = 10 * HZ,
102810 @@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
102811 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102812 .mtu6 = IPV6_MIN_MTU,
102813 .accept_ra = 1,
102814 - .accept_redirects = 1,
102815 + .accept_redirects = 0,
102816 .autoconf = 1,
102817 .force_mld_version = 0,
102818 .mldv1_unsolicited_report_interval = 10 * HZ,
102819 @@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
102820 idx = 0;
102821 head = &net->dev_index_head[h];
102822 rcu_read_lock();
102823 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
102824 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
102825 net->dev_base_seq;
102826 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102827 if (idx < s_idx)
102828 @@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
102829 p.iph.ihl = 5;
102830 p.iph.protocol = IPPROTO_IPV6;
102831 p.iph.ttl = 64;
102832 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
102833 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
102834
102835 if (ops->ndo_do_ioctl) {
102836 mm_segment_t oldfs = get_fs();
102837 @@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
102838 .release = seq_release_net,
102839 };
102840
102841 +extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
102842 +extern void unregister_ipv6_seq_ops_addr(void);
102843 +
102844 static int __net_init if6_proc_net_init(struct net *net)
102845 {
102846 - if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
102847 + register_ipv6_seq_ops_addr(&if6_seq_ops);
102848 + if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
102849 + unregister_ipv6_seq_ops_addr();
102850 return -ENOMEM;
102851 + }
102852 return 0;
102853 }
102854
102855 static void __net_exit if6_proc_net_exit(struct net *net)
102856 {
102857 remove_proc_entry("if_inet6", net->proc_net);
102858 + unregister_ipv6_seq_ops_addr();
102859 }
102860
102861 static struct pernet_operations if6_proc_net_ops = {
102862 @@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
102863 s_ip_idx = ip_idx = cb->args[2];
102864
102865 rcu_read_lock();
102866 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102867 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102868 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
102869 idx = 0;
102870 head = &net->dev_index_head[h];
102871 @@ -4788,7 +4795,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102872 rt_genid_bump_ipv6(net);
102873 break;
102874 }
102875 - atomic_inc(&net->ipv6.dev_addr_genid);
102876 + atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
102877 }
102878
102879 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102880 @@ -4808,7 +4815,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
102881 int *valp = ctl->data;
102882 int val = *valp;
102883 loff_t pos = *ppos;
102884 - struct ctl_table lctl;
102885 + ctl_table_no_const lctl;
102886 int ret;
102887
102888 /*
102889 @@ -4893,7 +4900,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
102890 int *valp = ctl->data;
102891 int val = *valp;
102892 loff_t pos = *ppos;
102893 - struct ctl_table lctl;
102894 + ctl_table_no_const lctl;
102895 int ret;
102896
102897 /*
102898 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
102899 index e8c4400..a4cd5da 100644
102900 --- a/net/ipv6/af_inet6.c
102901 +++ b/net/ipv6/af_inet6.c
102902 @@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
102903 net->ipv6.sysctl.icmpv6_time = 1*HZ;
102904 net->ipv6.sysctl.flowlabel_consistency = 1;
102905 net->ipv6.sysctl.auto_flowlabels = 0;
102906 - atomic_set(&net->ipv6.fib6_sernum, 1);
102907 + atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
102908
102909 err = ipv6_init_mibs(net);
102910 if (err)
102911 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
102912 index 2cdc383..09cffb8 100644
102913 --- a/net/ipv6/datagram.c
102914 +++ b/net/ipv6/datagram.c
102915 @@ -928,5 +928,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
102916 0,
102917 sock_i_ino(sp),
102918 atomic_read(&sp->sk_refcnt), sp,
102919 - atomic_read(&sp->sk_drops));
102920 + atomic_read_unchecked(&sp->sk_drops));
102921 }
102922 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
102923 index 97ae700..18dcae0 100644
102924 --- a/net/ipv6/icmp.c
102925 +++ b/net/ipv6/icmp.c
102926 @@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
102927
102928 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
102929 {
102930 - struct ctl_table *table;
102931 + ctl_table_no_const *table;
102932
102933 table = kmemdup(ipv6_icmp_table_template,
102934 sizeof(ipv6_icmp_table_template),
102935 diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
102936 index b2d1838..0194c04 100644
102937 --- a/net/ipv6/ip6_fib.c
102938 +++ b/net/ipv6/ip6_fib.c
102939 @@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
102940 int new, old;
102941
102942 do {
102943 - old = atomic_read(&net->ipv6.fib6_sernum);
102944 + old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
102945 new = old < INT_MAX ? old + 1 : 1;
102946 - } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
102947 + } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
102948 old, new) != old);
102949 return new;
102950 }
102951 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
102952 index 0e32d2e..98cbe65 100644
102953 --- a/net/ipv6/ip6_gre.c
102954 +++ b/net/ipv6/ip6_gre.c
102955 @@ -71,8 +71,8 @@ struct ip6gre_net {
102956 struct net_device *fb_tunnel_dev;
102957 };
102958
102959 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
102960 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
102961 +static struct rtnl_link_ops ip6gre_link_ops;
102962 +static struct rtnl_link_ops ip6gre_tap_ops;
102963 static int ip6gre_tunnel_init(struct net_device *dev);
102964 static void ip6gre_tunnel_setup(struct net_device *dev);
102965 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
102966 @@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
102967 }
102968
102969
102970 -static struct inet6_protocol ip6gre_protocol __read_mostly = {
102971 +static struct inet6_protocol ip6gre_protocol = {
102972 .handler = ip6gre_rcv,
102973 .err_handler = ip6gre_err,
102974 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
102975 @@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
102976 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
102977 };
102978
102979 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
102980 +static struct rtnl_link_ops ip6gre_link_ops = {
102981 .kind = "ip6gre",
102982 .maxtype = IFLA_GRE_MAX,
102983 .policy = ip6gre_policy,
102984 @@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
102985 .fill_info = ip6gre_fill_info,
102986 };
102987
102988 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
102989 +static struct rtnl_link_ops ip6gre_tap_ops = {
102990 .kind = "ip6gretap",
102991 .maxtype = IFLA_GRE_MAX,
102992 .policy = ip6gre_policy,
102993 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
102994 index 9cb94cf..5678108 100644
102995 --- a/net/ipv6/ip6_tunnel.c
102996 +++ b/net/ipv6/ip6_tunnel.c
102997 @@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
102998
102999 static int ip6_tnl_dev_init(struct net_device *dev);
103000 static void ip6_tnl_dev_setup(struct net_device *dev);
103001 -static struct rtnl_link_ops ip6_link_ops __read_mostly;
103002 +static struct rtnl_link_ops ip6_link_ops;
103003
103004 static int ip6_tnl_net_id __read_mostly;
103005 struct ip6_tnl_net {
103006 @@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
103007 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
103008 };
103009
103010 -static struct rtnl_link_ops ip6_link_ops __read_mostly = {
103011 +static struct rtnl_link_ops ip6_link_ops = {
103012 .kind = "ip6tnl",
103013 .maxtype = IFLA_IPTUN_MAX,
103014 .policy = ip6_tnl_policy,
103015 diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
103016 index bcda14d..49378c9 100644
103017 --- a/net/ipv6/ip6_vti.c
103018 +++ b/net/ipv6/ip6_vti.c
103019 @@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103020
103021 static int vti6_dev_init(struct net_device *dev);
103022 static void vti6_dev_setup(struct net_device *dev);
103023 -static struct rtnl_link_ops vti6_link_ops __read_mostly;
103024 +static struct rtnl_link_ops vti6_link_ops;
103025
103026 static int vti6_net_id __read_mostly;
103027 struct vti6_net {
103028 @@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
103029 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
103030 };
103031
103032 -static struct rtnl_link_ops vti6_link_ops __read_mostly = {
103033 +static struct rtnl_link_ops vti6_link_ops = {
103034 .kind = "vti6",
103035 .maxtype = IFLA_VTI_MAX,
103036 .policy = vti6_policy,
103037 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
103038 index e1a9583..7dd8f4d 100644
103039 --- a/net/ipv6/ipv6_sockglue.c
103040 +++ b/net/ipv6/ipv6_sockglue.c
103041 @@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
103042 if (sk->sk_type != SOCK_STREAM)
103043 return -ENOPROTOOPT;
103044
103045 - msg.msg_control = optval;
103046 + msg.msg_control = (void __force_kernel *)optval;
103047 msg.msg_controllen = len;
103048 msg.msg_flags = flags;
103049
103050 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
103051 index e080fbb..412b3cf 100644
103052 --- a/net/ipv6/netfilter/ip6_tables.c
103053 +++ b/net/ipv6/netfilter/ip6_tables.c
103054 @@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
103055 #endif
103056
103057 static int get_info(struct net *net, void __user *user,
103058 - const int *len, int compat)
103059 + int len, int compat)
103060 {
103061 char name[XT_TABLE_MAXNAMELEN];
103062 struct xt_table *t;
103063 int ret;
103064
103065 - if (*len != sizeof(struct ip6t_getinfo)) {
103066 - duprintf("length %u != %zu\n", *len,
103067 + if (len != sizeof(struct ip6t_getinfo)) {
103068 + duprintf("length %u != %zu\n", len,
103069 sizeof(struct ip6t_getinfo));
103070 return -EINVAL;
103071 }
103072 @@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
103073 info.size = private->size;
103074 strcpy(info.name, name);
103075
103076 - if (copy_to_user(user, &info, *len) != 0)
103077 + if (copy_to_user(user, &info, len) != 0)
103078 ret = -EFAULT;
103079 else
103080 ret = 0;
103081 @@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103082
103083 switch (cmd) {
103084 case IP6T_SO_GET_INFO:
103085 - ret = get_info(sock_net(sk), user, len, 1);
103086 + ret = get_info(sock_net(sk), user, *len, 1);
103087 break;
103088 case IP6T_SO_GET_ENTRIES:
103089 ret = compat_get_entries(sock_net(sk), user, len);
103090 @@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103091
103092 switch (cmd) {
103093 case IP6T_SO_GET_INFO:
103094 - ret = get_info(sock_net(sk), user, len, 0);
103095 + ret = get_info(sock_net(sk), user, *len, 0);
103096 break;
103097
103098 case IP6T_SO_GET_ENTRIES:
103099 diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
103100 index 6f187c8..34b367f 100644
103101 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
103102 +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
103103 @@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
103104
103105 static int nf_ct_frag6_sysctl_register(struct net *net)
103106 {
103107 - struct ctl_table *table;
103108 + ctl_table_no_const *table = NULL;
103109 struct ctl_table_header *hdr;
103110
103111 - table = nf_ct_frag6_sysctl_table;
103112 if (!net_eq(net, &init_net)) {
103113 - table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
103114 + table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
103115 GFP_KERNEL);
103116 if (table == NULL)
103117 goto err_alloc;
103118 @@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103119 table[2].data = &net->nf_frag.frags.high_thresh;
103120 table[2].extra1 = &net->nf_frag.frags.low_thresh;
103121 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
103122 - }
103123 -
103124 - hdr = register_net_sysctl(net, "net/netfilter", table);
103125 + hdr = register_net_sysctl(net, "net/netfilter", table);
103126 + } else
103127 + hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
103128 if (hdr == NULL)
103129 goto err_reg;
103130
103131 @@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103132 return 0;
103133
103134 err_reg:
103135 - if (!net_eq(net, &init_net))
103136 - kfree(table);
103137 + kfree(table);
103138 err_alloc:
103139 return -ENOMEM;
103140 }
103141 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
103142 index 5b7a1ed..d9da205 100644
103143 --- a/net/ipv6/ping.c
103144 +++ b/net/ipv6/ping.c
103145 @@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
103146 };
103147 #endif
103148
103149 +static struct pingv6_ops real_pingv6_ops = {
103150 + .ipv6_recv_error = ipv6_recv_error,
103151 + .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
103152 + .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
103153 + .icmpv6_err_convert = icmpv6_err_convert,
103154 + .ipv6_icmp_error = ipv6_icmp_error,
103155 + .ipv6_chk_addr = ipv6_chk_addr,
103156 +};
103157 +
103158 +static struct pingv6_ops dummy_pingv6_ops = {
103159 + .ipv6_recv_error = dummy_ipv6_recv_error,
103160 + .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
103161 + .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
103162 + .icmpv6_err_convert = dummy_icmpv6_err_convert,
103163 + .ipv6_icmp_error = dummy_ipv6_icmp_error,
103164 + .ipv6_chk_addr = dummy_ipv6_chk_addr,
103165 +};
103166 +
103167 int __init pingv6_init(void)
103168 {
103169 #ifdef CONFIG_PROC_FS
103170 @@ -247,13 +265,7 @@ int __init pingv6_init(void)
103171 if (ret)
103172 return ret;
103173 #endif
103174 - pingv6_ops.ipv6_recv_error = ipv6_recv_error;
103175 - pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
103176 - pingv6_ops.ip6_datagram_recv_specific_ctl =
103177 - ip6_datagram_recv_specific_ctl;
103178 - pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
103179 - pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
103180 - pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
103181 + pingv6_ops = &real_pingv6_ops;
103182 return inet6_register_protosw(&pingv6_protosw);
103183 }
103184
103185 @@ -262,14 +274,9 @@ int __init pingv6_init(void)
103186 */
103187 void pingv6_exit(void)
103188 {
103189 - pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
103190 - pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
103191 - pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
103192 - pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
103193 - pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
103194 - pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
103195 #ifdef CONFIG_PROC_FS
103196 unregister_pernet_subsys(&ping_v6_net_ops);
103197 #endif
103198 + pingv6_ops = &dummy_pingv6_ops;
103199 inet6_unregister_protosw(&pingv6_protosw);
103200 }
103201 diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
103202 index 1752cd0..3c6af41 100644
103203 --- a/net/ipv6/proc.c
103204 +++ b/net/ipv6/proc.c
103205 @@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
103206 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
103207 goto proc_snmp6_fail;
103208
103209 - net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
103210 + net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
103211 if (!net->mib.proc_net_devsnmp6)
103212 goto proc_dev_snmp6_fail;
103213 return 0;
103214 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
103215 index 896af88..6e2ba628 100644
103216 --- a/net/ipv6/raw.c
103217 +++ b/net/ipv6/raw.c
103218 @@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
103219 {
103220 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
103221 skb_checksum_complete(skb)) {
103222 - atomic_inc(&sk->sk_drops);
103223 + atomic_inc_unchecked(&sk->sk_drops);
103224 kfree_skb(skb);
103225 return NET_RX_DROP;
103226 }
103227 @@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103228 struct raw6_sock *rp = raw6_sk(sk);
103229
103230 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
103231 - atomic_inc(&sk->sk_drops);
103232 + atomic_inc_unchecked(&sk->sk_drops);
103233 kfree_skb(skb);
103234 return NET_RX_DROP;
103235 }
103236 @@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103237
103238 if (inet->hdrincl) {
103239 if (skb_checksum_complete(skb)) {
103240 - atomic_inc(&sk->sk_drops);
103241 + atomic_inc_unchecked(&sk->sk_drops);
103242 kfree_skb(skb);
103243 return NET_RX_DROP;
103244 }
103245 @@ -608,7 +608,7 @@ out:
103246 return err;
103247 }
103248
103249 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
103250 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
103251 struct flowi6 *fl6, struct dst_entry **dstp,
103252 unsigned int flags)
103253 {
103254 @@ -914,12 +914,15 @@ do_confirm:
103255 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
103256 char __user *optval, int optlen)
103257 {
103258 + struct icmp6_filter filter;
103259 +
103260 switch (optname) {
103261 case ICMPV6_FILTER:
103262 if (optlen > sizeof(struct icmp6_filter))
103263 optlen = sizeof(struct icmp6_filter);
103264 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
103265 + if (copy_from_user(&filter, optval, optlen))
103266 return -EFAULT;
103267 + raw6_sk(sk)->filter = filter;
103268 return 0;
103269 default:
103270 return -ENOPROTOOPT;
103271 @@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103272 char __user *optval, int __user *optlen)
103273 {
103274 int len;
103275 + struct icmp6_filter filter;
103276
103277 switch (optname) {
103278 case ICMPV6_FILTER:
103279 @@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103280 len = sizeof(struct icmp6_filter);
103281 if (put_user(len, optlen))
103282 return -EFAULT;
103283 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
103284 + filter = raw6_sk(sk)->filter;
103285 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
103286 return -EFAULT;
103287 return 0;
103288 default:
103289 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
103290 index 1a157ca..9fc05f4 100644
103291 --- a/net/ipv6/reassembly.c
103292 +++ b/net/ipv6/reassembly.c
103293 @@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
103294
103295 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103296 {
103297 - struct ctl_table *table;
103298 + ctl_table_no_const *table = NULL;
103299 struct ctl_table_header *hdr;
103300
103301 - table = ip6_frags_ns_ctl_table;
103302 if (!net_eq(net, &init_net)) {
103303 - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103304 + table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103305 if (table == NULL)
103306 goto err_alloc;
103307
103308 @@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103309 /* Don't export sysctls to unprivileged users */
103310 if (net->user_ns != &init_user_ns)
103311 table[0].procname = NULL;
103312 - }
103313 + hdr = register_net_sysctl(net, "net/ipv6", table);
103314 + } else
103315 + hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
103316
103317 - hdr = register_net_sysctl(net, "net/ipv6", table);
103318 if (hdr == NULL)
103319 goto err_reg;
103320
103321 @@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103322 return 0;
103323
103324 err_reg:
103325 - if (!net_eq(net, &init_net))
103326 - kfree(table);
103327 + kfree(table);
103328 err_alloc:
103329 return -ENOMEM;
103330 }
103331 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
103332 index a318dd89..7ecfea6 100644
103333 --- a/net/ipv6/route.c
103334 +++ b/net/ipv6/route.c
103335 @@ -2965,7 +2965,7 @@ struct ctl_table ipv6_route_table_template[] = {
103336
103337 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
103338 {
103339 - struct ctl_table *table;
103340 + ctl_table_no_const *table;
103341
103342 table = kmemdup(ipv6_route_table_template,
103343 sizeof(ipv6_route_table_template),
103344 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
103345 index a24557a..00a9ed1 100644
103346 --- a/net/ipv6/sit.c
103347 +++ b/net/ipv6/sit.c
103348 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
103349 static void ipip6_dev_free(struct net_device *dev);
103350 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
103351 __be32 *v4dst);
103352 -static struct rtnl_link_ops sit_link_ops __read_mostly;
103353 +static struct rtnl_link_ops sit_link_ops;
103354
103355 static int sit_net_id __read_mostly;
103356 struct sit_net {
103357 @@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
103358 unregister_netdevice_queue(dev, head);
103359 }
103360
103361 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
103362 +static struct rtnl_link_ops sit_link_ops = {
103363 .kind = "sit",
103364 .maxtype = IFLA_IPTUN_MAX,
103365 .policy = ipip6_policy,
103366 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
103367 index c5c10fa..2577d51 100644
103368 --- a/net/ipv6/sysctl_net_ipv6.c
103369 +++ b/net/ipv6/sysctl_net_ipv6.c
103370 @@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
103371
103372 static int __net_init ipv6_sysctl_net_init(struct net *net)
103373 {
103374 - struct ctl_table *ipv6_table;
103375 + ctl_table_no_const *ipv6_table;
103376 struct ctl_table *ipv6_route_table;
103377 struct ctl_table *ipv6_icmp_table;
103378 int err;
103379 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
103380 index c277951..c7ee5bf 100644
103381 --- a/net/ipv6/tcp_ipv6.c
103382 +++ b/net/ipv6/tcp_ipv6.c
103383 @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
103384 }
103385 }
103386
103387 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103388 +extern int grsec_enable_blackhole;
103389 +#endif
103390 +
103391 static void tcp_v6_hash(struct sock *sk)
103392 {
103393 if (sk->sk_state != TCP_CLOSE) {
103394 @@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
103395 return 0;
103396
103397 reset:
103398 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103399 + if (!grsec_enable_blackhole)
103400 +#endif
103401 tcp_v6_send_reset(sk, skb);
103402 discard:
103403 if (opt_skb)
103404 @@ -1434,12 +1441,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
103405
103406 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
103407 tcp_v6_iif(skb));
103408 - if (!sk)
103409 + if (!sk) {
103410 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103411 + ret = 1;
103412 +#endif
103413 goto no_tcp_socket;
103414 + }
103415
103416 process:
103417 - if (sk->sk_state == TCP_TIME_WAIT)
103418 + if (sk->sk_state == TCP_TIME_WAIT) {
103419 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103420 + ret = 2;
103421 +#endif
103422 goto do_time_wait;
103423 + }
103424
103425 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
103426 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103427 @@ -1486,6 +1501,10 @@ csum_error:
103428 bad_packet:
103429 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103430 } else {
103431 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103432 + if (!grsec_enable_blackhole || (ret == 1 &&
103433 + (skb->dev->flags & IFF_LOOPBACK)))
103434 +#endif
103435 tcp_v6_send_reset(NULL, skb);
103436 }
103437
103438 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
103439 index f6ba535..b41033f 100644
103440 --- a/net/ipv6/udp.c
103441 +++ b/net/ipv6/udp.c
103442 @@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
103443 udp_ipv6_hash_secret + net_hash_mix(net));
103444 }
103445
103446 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103447 +extern int grsec_enable_blackhole;
103448 +#endif
103449 +
103450 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
103451 {
103452 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
103453 @@ -434,7 +438,7 @@ try_again:
103454 if (unlikely(err)) {
103455 trace_kfree_skb(skb, udpv6_recvmsg);
103456 if (!peeked) {
103457 - atomic_inc(&sk->sk_drops);
103458 + atomic_inc_unchecked(&sk->sk_drops);
103459 if (is_udp4)
103460 UDP_INC_STATS_USER(sock_net(sk),
103461 UDP_MIB_INERRORS,
103462 @@ -701,7 +705,7 @@ csum_error:
103463 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
103464 drop:
103465 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
103466 - atomic_inc(&sk->sk_drops);
103467 + atomic_inc_unchecked(&sk->sk_drops);
103468 kfree_skb(skb);
103469 return -1;
103470 }
103471 @@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
103472 if (likely(skb1 == NULL))
103473 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
103474 if (!skb1) {
103475 - atomic_inc(&sk->sk_drops);
103476 + atomic_inc_unchecked(&sk->sk_drops);
103477 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
103478 IS_UDPLITE(sk));
103479 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103480 @@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
103481 goto csum_error;
103482
103483 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
103484 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103485 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103486 +#endif
103487 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
103488
103489 kfree_skb(skb);
103490 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
103491 index 5f98364..5ca982a 100644
103492 --- a/net/ipv6/xfrm6_policy.c
103493 +++ b/net/ipv6/xfrm6_policy.c
103494 @@ -130,8 +130,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103495 {
103496 struct flowi6 *fl6 = &fl->u.ip6;
103497 int onlyproto = 0;
103498 - u16 offset = skb_network_header_len(skb);
103499 const struct ipv6hdr *hdr = ipv6_hdr(skb);
103500 + u16 offset = sizeof(*hdr);
103501 struct ipv6_opt_hdr *exthdr;
103502 const unsigned char *nh = skb_network_header(skb);
103503 u8 nexthdr = nh[IP6CB(skb)->nhoff];
103504 @@ -217,11 +217,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103505 }
103506 }
103507
103508 -static inline int xfrm6_garbage_collect(struct dst_ops *ops)
103509 +static int xfrm6_garbage_collect(struct dst_ops *ops)
103510 {
103511 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
103512
103513 - xfrm6_policy_afinfo.garbage_collect(net);
103514 + xfrm_garbage_collect_deferred(net);
103515 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
103516 }
103517
103518 @@ -334,19 +334,19 @@ static struct ctl_table xfrm6_policy_table[] = {
103519
103520 static int __net_init xfrm6_net_init(struct net *net)
103521 {
103522 - struct ctl_table *table;
103523 + ctl_table_no_const *table = NULL;
103524 struct ctl_table_header *hdr;
103525
103526 - table = xfrm6_policy_table;
103527 if (!net_eq(net, &init_net)) {
103528 - table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103529 + table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103530 if (!table)
103531 goto err_alloc;
103532
103533 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
103534 - }
103535 + hdr = register_net_sysctl(net, "net/ipv6", table);
103536 + } else
103537 + hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
103538
103539 - hdr = register_net_sysctl(net, "net/ipv6", table);
103540 if (!hdr)
103541 goto err_reg;
103542
103543 @@ -354,8 +354,7 @@ static int __net_init xfrm6_net_init(struct net *net)
103544 return 0;
103545
103546 err_reg:
103547 - if (!net_eq(net, &init_net))
103548 - kfree(table);
103549 + kfree(table);
103550 err_alloc:
103551 return -ENOMEM;
103552 }
103553 diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
103554 index e15c16a..7cf07aa 100644
103555 --- a/net/ipx/ipx_proc.c
103556 +++ b/net/ipx/ipx_proc.c
103557 @@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
103558 struct proc_dir_entry *p;
103559 int rc = -ENOMEM;
103560
103561 - ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
103562 + ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
103563
103564 if (!ipx_proc_dir)
103565 goto out;
103566 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
103567 index 61ceb4c..e788eb8 100644
103568 --- a/net/irda/ircomm/ircomm_tty.c
103569 +++ b/net/irda/ircomm/ircomm_tty.c
103570 @@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103571 add_wait_queue(&port->open_wait, &wait);
103572
103573 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
103574 - __FILE__, __LINE__, tty->driver->name, port->count);
103575 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103576
103577 spin_lock_irqsave(&port->lock, flags);
103578 - port->count--;
103579 + atomic_dec(&port->count);
103580 port->blocked_open++;
103581 spin_unlock_irqrestore(&port->lock, flags);
103582
103583 @@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103584 }
103585
103586 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
103587 - __FILE__, __LINE__, tty->driver->name, port->count);
103588 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103589
103590 schedule();
103591 }
103592 @@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103593
103594 spin_lock_irqsave(&port->lock, flags);
103595 if (!tty_hung_up_p(filp))
103596 - port->count++;
103597 + atomic_inc(&port->count);
103598 port->blocked_open--;
103599 spin_unlock_irqrestore(&port->lock, flags);
103600
103601 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
103602 - __FILE__, __LINE__, tty->driver->name, port->count);
103603 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103604
103605 if (!retval)
103606 port->flags |= ASYNC_NORMAL_ACTIVE;
103607 @@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
103608
103609 /* ++ is not atomic, so this should be protected - Jean II */
103610 spin_lock_irqsave(&self->port.lock, flags);
103611 - self->port.count++;
103612 + atomic_inc(&self->port.count);
103613 spin_unlock_irqrestore(&self->port.lock, flags);
103614 tty_port_tty_set(&self->port, tty);
103615
103616 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
103617 - self->line, self->port.count);
103618 + self->line, atomic_read(&self->port.count));
103619
103620 /* Not really used by us, but lets do it anyway */
103621 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
103622 @@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
103623 tty_kref_put(port->tty);
103624 }
103625 port->tty = NULL;
103626 - port->count = 0;
103627 + atomic_set(&port->count, 0);
103628 spin_unlock_irqrestore(&port->lock, flags);
103629
103630 wake_up_interruptible(&port->open_wait);
103631 @@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
103632 seq_putc(m, '\n');
103633
103634 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
103635 - seq_printf(m, "Open count: %d\n", self->port.count);
103636 + seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
103637 seq_printf(m, "Max data size: %d\n", self->max_data_size);
103638 seq_printf(m, "Max header size: %d\n", self->max_header_size);
103639
103640 diff --git a/net/irda/irproc.c b/net/irda/irproc.c
103641 index b9ac598..f88cc56 100644
103642 --- a/net/irda/irproc.c
103643 +++ b/net/irda/irproc.c
103644 @@ -66,7 +66,7 @@ void __init irda_proc_register(void)
103645 {
103646 int i;
103647
103648 - proc_irda = proc_mkdir("irda", init_net.proc_net);
103649 + proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
103650 if (proc_irda == NULL)
103651 return;
103652
103653 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
103654 index a089b6b..3ca3b60 100644
103655 --- a/net/iucv/af_iucv.c
103656 +++ b/net/iucv/af_iucv.c
103657 @@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
103658 {
103659 char name[12];
103660
103661 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
103662 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103663 while (__iucv_get_sock_by_name(name)) {
103664 sprintf(name, "%08x",
103665 - atomic_inc_return(&iucv_sk_list.autobind_name));
103666 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103667 }
103668 memcpy(iucv->src_name, name, 8);
103669 }
103670 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
103671 index 2a6a1fd..6c112b0 100644
103672 --- a/net/iucv/iucv.c
103673 +++ b/net/iucv/iucv.c
103674 @@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
103675 return NOTIFY_OK;
103676 }
103677
103678 -static struct notifier_block __refdata iucv_cpu_notifier = {
103679 +static struct notifier_block iucv_cpu_notifier = {
103680 .notifier_call = iucv_cpu_notify,
103681 };
103682
103683 diff --git a/net/key/af_key.c b/net/key/af_key.c
103684 index 1847ec4..26ef732 100644
103685 --- a/net/key/af_key.c
103686 +++ b/net/key/af_key.c
103687 @@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
103688 static u32 get_acqseq(void)
103689 {
103690 u32 res;
103691 - static atomic_t acqseq;
103692 + static atomic_unchecked_t acqseq;
103693
103694 do {
103695 - res = atomic_inc_return(&acqseq);
103696 + res = atomic_inc_return_unchecked(&acqseq);
103697 } while (!res);
103698 return res;
103699 }
103700 diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
103701 index edb78e6..8dc654a 100644
103702 --- a/net/l2tp/l2tp_eth.c
103703 +++ b/net/l2tp/l2tp_eth.c
103704 @@ -42,12 +42,12 @@ struct l2tp_eth {
103705 struct sock *tunnel_sock;
103706 struct l2tp_session *session;
103707 struct list_head list;
103708 - atomic_long_t tx_bytes;
103709 - atomic_long_t tx_packets;
103710 - atomic_long_t tx_dropped;
103711 - atomic_long_t rx_bytes;
103712 - atomic_long_t rx_packets;
103713 - atomic_long_t rx_errors;
103714 + atomic_long_unchecked_t tx_bytes;
103715 + atomic_long_unchecked_t tx_packets;
103716 + atomic_long_unchecked_t tx_dropped;
103717 + atomic_long_unchecked_t rx_bytes;
103718 + atomic_long_unchecked_t rx_packets;
103719 + atomic_long_unchecked_t rx_errors;
103720 };
103721
103722 /* via l2tp_session_priv() */
103723 @@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
103724 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
103725
103726 if (likely(ret == NET_XMIT_SUCCESS)) {
103727 - atomic_long_add(len, &priv->tx_bytes);
103728 - atomic_long_inc(&priv->tx_packets);
103729 + atomic_long_add_unchecked(len, &priv->tx_bytes);
103730 + atomic_long_inc_unchecked(&priv->tx_packets);
103731 } else {
103732 - atomic_long_inc(&priv->tx_dropped);
103733 + atomic_long_inc_unchecked(&priv->tx_dropped);
103734 }
103735 return NETDEV_TX_OK;
103736 }
103737 @@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
103738 {
103739 struct l2tp_eth *priv = netdev_priv(dev);
103740
103741 - stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
103742 - stats->tx_packets = atomic_long_read(&priv->tx_packets);
103743 - stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
103744 - stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
103745 - stats->rx_packets = atomic_long_read(&priv->rx_packets);
103746 - stats->rx_errors = atomic_long_read(&priv->rx_errors);
103747 + stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
103748 + stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
103749 + stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
103750 + stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
103751 + stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
103752 + stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
103753 return stats;
103754 }
103755
103756 @@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
103757 nf_reset(skb);
103758
103759 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
103760 - atomic_long_inc(&priv->rx_packets);
103761 - atomic_long_add(data_len, &priv->rx_bytes);
103762 + atomic_long_inc_unchecked(&priv->rx_packets);
103763 + atomic_long_add_unchecked(data_len, &priv->rx_bytes);
103764 } else {
103765 - atomic_long_inc(&priv->rx_errors);
103766 + atomic_long_inc_unchecked(&priv->rx_errors);
103767 }
103768 return;
103769
103770 error:
103771 - atomic_long_inc(&priv->rx_errors);
103772 + atomic_long_inc_unchecked(&priv->rx_errors);
103773 kfree_skb(skb);
103774 }
103775
103776 diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
103777 index 1a3c7e0..80f8b0c 100644
103778 --- a/net/llc/llc_proc.c
103779 +++ b/net/llc/llc_proc.c
103780 @@ -247,7 +247,7 @@ int __init llc_proc_init(void)
103781 int rc = -ENOMEM;
103782 struct proc_dir_entry *p;
103783
103784 - llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
103785 + llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
103786 if (!llc_proc_dir)
103787 goto out;
103788
103789 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
103790 index 343da1e..509873f 100644
103791 --- a/net/mac80211/cfg.c
103792 +++ b/net/mac80211/cfg.c
103793 @@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
103794 ret = ieee80211_vif_use_channel(sdata, chandef,
103795 IEEE80211_CHANCTX_EXCLUSIVE);
103796 }
103797 - } else if (local->open_count == local->monitors) {
103798 + } else if (local_read(&local->open_count) == local->monitors) {
103799 local->_oper_chandef = *chandef;
103800 ieee80211_hw_config(local, 0);
103801 }
103802 @@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
103803 else
103804 local->probe_req_reg--;
103805
103806 - if (!local->open_count)
103807 + if (!local_read(&local->open_count))
103808 break;
103809
103810 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
103811 @@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
103812 if (chanctx_conf) {
103813 *chandef = sdata->vif.bss_conf.chandef;
103814 ret = 0;
103815 - } else if (local->open_count > 0 &&
103816 - local->open_count == local->monitors &&
103817 + } else if (local_read(&local->open_count) > 0 &&
103818 + local_read(&local->open_count) == local->monitors &&
103819 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
103820 if (local->use_chanctx)
103821 *chandef = local->monitor_chandef;
103822 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
103823 index 8c68da3..0695016 100644
103824 --- a/net/mac80211/ieee80211_i.h
103825 +++ b/net/mac80211/ieee80211_i.h
103826 @@ -29,6 +29,7 @@
103827 #include <net/ieee80211_radiotap.h>
103828 #include <net/cfg80211.h>
103829 #include <net/mac80211.h>
103830 +#include <asm/local.h>
103831 #include "key.h"
103832 #include "sta_info.h"
103833 #include "debug.h"
103834 @@ -1057,7 +1058,7 @@ struct ieee80211_local {
103835 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
103836 spinlock_t queue_stop_reason_lock;
103837
103838 - int open_count;
103839 + local_t open_count;
103840 int monitors, cooked_mntrs;
103841 /* number of interfaces with corresponding FIF_ flags */
103842 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
103843 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
103844 index eeae0ab..0f24585 100644
103845 --- a/net/mac80211/iface.c
103846 +++ b/net/mac80211/iface.c
103847 @@ -533,7 +533,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103848 break;
103849 }
103850
103851 - if (local->open_count == 0) {
103852 + if (local_read(&local->open_count) == 0) {
103853 res = drv_start(local);
103854 if (res)
103855 goto err_del_bss;
103856 @@ -580,7 +580,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103857 res = drv_add_interface(local, sdata);
103858 if (res)
103859 goto err_stop;
103860 - } else if (local->monitors == 0 && local->open_count == 0) {
103861 + } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
103862 res = ieee80211_add_virtual_monitor(local);
103863 if (res)
103864 goto err_stop;
103865 @@ -689,7 +689,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103866 atomic_inc(&local->iff_promiscs);
103867
103868 if (coming_up)
103869 - local->open_count++;
103870 + local_inc(&local->open_count);
103871
103872 if (hw_reconf_flags)
103873 ieee80211_hw_config(local, hw_reconf_flags);
103874 @@ -727,7 +727,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103875 err_del_interface:
103876 drv_remove_interface(local, sdata);
103877 err_stop:
103878 - if (!local->open_count)
103879 + if (!local_read(&local->open_count))
103880 drv_stop(local);
103881 err_del_bss:
103882 sdata->bss = NULL;
103883 @@ -893,7 +893,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103884 }
103885
103886 if (going_down)
103887 - local->open_count--;
103888 + local_dec(&local->open_count);
103889
103890 switch (sdata->vif.type) {
103891 case NL80211_IFTYPE_AP_VLAN:
103892 @@ -955,7 +955,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103893 }
103894 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
103895
103896 - if (local->open_count == 0)
103897 + if (local_read(&local->open_count) == 0)
103898 ieee80211_clear_tx_pending(local);
103899
103900 /*
103901 @@ -998,7 +998,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103902 if (cancel_scan)
103903 flush_delayed_work(&local->scan_work);
103904
103905 - if (local->open_count == 0) {
103906 + if (local_read(&local->open_count) == 0) {
103907 ieee80211_stop_device(local);
103908
103909 /* no reconfiguring after stop! */
103910 @@ -1009,7 +1009,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103911 ieee80211_configure_filter(local);
103912 ieee80211_hw_config(local, hw_reconf_flags);
103913
103914 - if (local->monitors == local->open_count)
103915 + if (local->monitors == local_read(&local->open_count))
103916 ieee80211_add_virtual_monitor(local);
103917 }
103918
103919 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
103920 index 0de7c93..884b2ca 100644
103921 --- a/net/mac80211/main.c
103922 +++ b/net/mac80211/main.c
103923 @@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
103924 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
103925 IEEE80211_CONF_CHANGE_POWER);
103926
103927 - if (changed && local->open_count) {
103928 + if (changed && local_read(&local->open_count)) {
103929 ret = drv_config(local, changed);
103930 /*
103931 * Goal:
103932 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
103933 index 4c5192e..04cc0d8 100644
103934 --- a/net/mac80211/pm.c
103935 +++ b/net/mac80211/pm.c
103936 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
103937 struct ieee80211_sub_if_data *sdata;
103938 struct sta_info *sta;
103939
103940 - if (!local->open_count)
103941 + if (!local_read(&local->open_count))
103942 goto suspend;
103943
103944 ieee80211_scan_cancel(local);
103945 @@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
103946 cancel_work_sync(&local->dynamic_ps_enable_work);
103947 del_timer_sync(&local->dynamic_ps_timer);
103948
103949 - local->wowlan = wowlan && local->open_count;
103950 + local->wowlan = wowlan && local_read(&local->open_count);
103951 if (local->wowlan) {
103952 int err = drv_suspend(local, wowlan);
103953 if (err < 0) {
103954 @@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
103955 WARN_ON(!list_empty(&local->chanctx_list));
103956
103957 /* stop hardware - this must stop RX */
103958 - if (local->open_count)
103959 + if (local_read(&local->open_count))
103960 ieee80211_stop_device(local);
103961
103962 suspend:
103963 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
103964 index 6081329..ab23834 100644
103965 --- a/net/mac80211/rate.c
103966 +++ b/net/mac80211/rate.c
103967 @@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
103968
103969 ASSERT_RTNL();
103970
103971 - if (local->open_count)
103972 + if (local_read(&local->open_count))
103973 return -EBUSY;
103974
103975 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
103976 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
103977 index 3c61060..7bed2e3 100644
103978 --- a/net/mac80211/util.c
103979 +++ b/net/mac80211/util.c
103980 @@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
103981 }
103982 #endif
103983 /* everything else happens only if HW was up & running */
103984 - if (!local->open_count)
103985 + if (!local_read(&local->open_count))
103986 goto wake_up;
103987
103988 /*
103989 @@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
103990 local->in_reconfig = false;
103991 barrier();
103992
103993 - if (local->monitors == local->open_count && local->monitors > 0)
103994 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
103995 ieee80211_add_virtual_monitor(local);
103996
103997 /*
103998 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
103999 index ae5096ab..e5aa70a 100644
104000 --- a/net/netfilter/Kconfig
104001 +++ b/net/netfilter/Kconfig
104002 @@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
104003
104004 To compile it as a module, choose M here. If unsure, say N.
104005
104006 +config NETFILTER_XT_MATCH_GRADM
104007 + tristate '"gradm" match support'
104008 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
104009 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
104010 + ---help---
104011 + The gradm match allows to match on grsecurity RBAC being enabled.
104012 + It is useful when iptables rules are applied early on bootup to
104013 + prevent connections to the machine (except from a trusted host)
104014 + while the RBAC system is disabled.
104015 +
104016 config NETFILTER_XT_MATCH_HASHLIMIT
104017 tristate '"hashlimit" match support'
104018 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
104019 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
104020 index a9571be..c59e173 100644
104021 --- a/net/netfilter/Makefile
104022 +++ b/net/netfilter/Makefile
104023 @@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
104024 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
104025 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
104026 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
104027 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
104028 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
104029 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
104030 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
104031 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
104032 index d259da3..6a32b2c 100644
104033 --- a/net/netfilter/ipset/ip_set_core.c
104034 +++ b/net/netfilter/ipset/ip_set_core.c
104035 @@ -1952,7 +1952,7 @@ done:
104036 return ret;
104037 }
104038
104039 -static struct nf_sockopt_ops so_set __read_mostly = {
104040 +static struct nf_sockopt_ops so_set = {
104041 .pf = PF_INET,
104042 .get_optmin = SO_IP_SET,
104043 .get_optmax = SO_IP_SET + 1,
104044 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
104045 index b0f7b62..0541842 100644
104046 --- a/net/netfilter/ipvs/ip_vs_conn.c
104047 +++ b/net/netfilter/ipvs/ip_vs_conn.c
104048 @@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
104049 /* Increase the refcnt counter of the dest */
104050 ip_vs_dest_hold(dest);
104051
104052 - conn_flags = atomic_read(&dest->conn_flags);
104053 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
104054 if (cp->protocol != IPPROTO_UDP)
104055 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
104056 flags = cp->flags;
104057 @@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
104058
104059 cp->control = NULL;
104060 atomic_set(&cp->n_control, 0);
104061 - atomic_set(&cp->in_pkts, 0);
104062 + atomic_set_unchecked(&cp->in_pkts, 0);
104063
104064 cp->packet_xmit = NULL;
104065 cp->app = NULL;
104066 @@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
104067
104068 /* Don't drop the entry if its number of incoming packets is not
104069 located in [0, 8] */
104070 - i = atomic_read(&cp->in_pkts);
104071 + i = atomic_read_unchecked(&cp->in_pkts);
104072 if (i > 8 || i < 0) return 0;
104073
104074 if (!todrop_rate[i]) return 0;
104075 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
104076 index 990decb..5075248 100644
104077 --- a/net/netfilter/ipvs/ip_vs_core.c
104078 +++ b/net/netfilter/ipvs/ip_vs_core.c
104079 @@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
104080 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
104081 /* do not touch skb anymore */
104082
104083 - atomic_inc(&cp->in_pkts);
104084 + atomic_inc_unchecked(&cp->in_pkts);
104085 ip_vs_conn_put(cp);
104086 return ret;
104087 }
104088 @@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
104089 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
104090 pkts = sysctl_sync_threshold(ipvs);
104091 else
104092 - pkts = atomic_add_return(1, &cp->in_pkts);
104093 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104094
104095 if (ipvs->sync_state & IP_VS_STATE_MASTER)
104096 ip_vs_sync_conn(net, cp, pkts);
104097 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
104098 index ac7ba68..9735acb9 100644
104099 --- a/net/netfilter/ipvs/ip_vs_ctl.c
104100 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
104101 @@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
104102 */
104103 ip_vs_rs_hash(ipvs, dest);
104104 }
104105 - atomic_set(&dest->conn_flags, conn_flags);
104106 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
104107
104108 /* bind the service */
104109 old_svc = rcu_dereference_protected(dest->svc, 1);
104110 @@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
104111 * align with netns init in ip_vs_control_net_init()
104112 */
104113
104114 -static struct ctl_table vs_vars[] = {
104115 +static ctl_table_no_const vs_vars[] __read_only = {
104116 {
104117 .procname = "amemthresh",
104118 .maxlen = sizeof(int),
104119 @@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104120 " %-7s %-6d %-10d %-10d\n",
104121 &dest->addr.in6,
104122 ntohs(dest->port),
104123 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104124 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104125 atomic_read(&dest->weight),
104126 atomic_read(&dest->activeconns),
104127 atomic_read(&dest->inactconns));
104128 @@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104129 "%-7s %-6d %-10d %-10d\n",
104130 ntohl(dest->addr.ip),
104131 ntohs(dest->port),
104132 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104133 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104134 atomic_read(&dest->weight),
104135 atomic_read(&dest->activeconns),
104136 atomic_read(&dest->inactconns));
104137 @@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
104138
104139 entry.addr = dest->addr.ip;
104140 entry.port = dest->port;
104141 - entry.conn_flags = atomic_read(&dest->conn_flags);
104142 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
104143 entry.weight = atomic_read(&dest->weight);
104144 entry.u_threshold = dest->u_threshold;
104145 entry.l_threshold = dest->l_threshold;
104146 @@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
104147 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
104148 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
104149 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
104150 - (atomic_read(&dest->conn_flags) &
104151 + (atomic_read_unchecked(&dest->conn_flags) &
104152 IP_VS_CONN_F_FWD_MASK)) ||
104153 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
104154 atomic_read(&dest->weight)) ||
104155 @@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
104156 {
104157 int idx;
104158 struct netns_ipvs *ipvs = net_ipvs(net);
104159 - struct ctl_table *tbl;
104160 + ctl_table_no_const *tbl;
104161
104162 atomic_set(&ipvs->dropentry, 0);
104163 spin_lock_init(&ipvs->dropentry_lock);
104164 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
104165 index 127f140..553d652 100644
104166 --- a/net/netfilter/ipvs/ip_vs_lblc.c
104167 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
104168 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
104169 * IPVS LBLC sysctl table
104170 */
104171 #ifdef CONFIG_SYSCTL
104172 -static struct ctl_table vs_vars_table[] = {
104173 +static ctl_table_no_const vs_vars_table[] __read_only = {
104174 {
104175 .procname = "lblc_expiration",
104176 .data = NULL,
104177 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
104178 index 2229d2d..b32b785 100644
104179 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
104180 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
104181 @@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
104182 * IPVS LBLCR sysctl table
104183 */
104184
104185 -static struct ctl_table vs_vars_table[] = {
104186 +static ctl_table_no_const vs_vars_table[] __read_only = {
104187 {
104188 .procname = "lblcr_expiration",
104189 .data = NULL,
104190 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
104191 index 7162c86..9eeb60e 100644
104192 --- a/net/netfilter/ipvs/ip_vs_sync.c
104193 +++ b/net/netfilter/ipvs/ip_vs_sync.c
104194 @@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
104195 cp = cp->control;
104196 if (cp) {
104197 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104198 - pkts = atomic_add_return(1, &cp->in_pkts);
104199 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104200 else
104201 pkts = sysctl_sync_threshold(ipvs);
104202 ip_vs_sync_conn(net, cp->control, pkts);
104203 @@ -771,7 +771,7 @@ control:
104204 if (!cp)
104205 return;
104206 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104207 - pkts = atomic_add_return(1, &cp->in_pkts);
104208 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104209 else
104210 pkts = sysctl_sync_threshold(ipvs);
104211 goto sloop;
104212 @@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
104213
104214 if (opt)
104215 memcpy(&cp->in_seq, opt, sizeof(*opt));
104216 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104217 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104218 cp->state = state;
104219 cp->old_state = cp->state;
104220 /*
104221 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
104222 index bd90bf8..816a020d 100644
104223 --- a/net/netfilter/ipvs/ip_vs_xmit.c
104224 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
104225 @@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
104226 else
104227 rc = NF_ACCEPT;
104228 /* do not touch skb anymore */
104229 - atomic_inc(&cp->in_pkts);
104230 + atomic_inc_unchecked(&cp->in_pkts);
104231 goto out;
104232 }
104233
104234 @@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
104235 else
104236 rc = NF_ACCEPT;
104237 /* do not touch skb anymore */
104238 - atomic_inc(&cp->in_pkts);
104239 + atomic_inc_unchecked(&cp->in_pkts);
104240 goto out;
104241 }
104242
104243 diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
104244 index a4b5e2a..13b1de3 100644
104245 --- a/net/netfilter/nf_conntrack_acct.c
104246 +++ b/net/netfilter/nf_conntrack_acct.c
104247 @@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
104248 #ifdef CONFIG_SYSCTL
104249 static int nf_conntrack_acct_init_sysctl(struct net *net)
104250 {
104251 - struct ctl_table *table;
104252 + ctl_table_no_const *table;
104253
104254 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
104255 GFP_KERNEL);
104256 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
104257 index 5016a69..594f8e9 100644
104258 --- a/net/netfilter/nf_conntrack_core.c
104259 +++ b/net/netfilter/nf_conntrack_core.c
104260 @@ -1739,6 +1739,10 @@ void nf_conntrack_init_end(void)
104261 #define DYING_NULLS_VAL ((1<<30)+1)
104262 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
104263
104264 +#ifdef CONFIG_GRKERNSEC_HIDESYM
104265 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
104266 +#endif
104267 +
104268 int nf_conntrack_init_net(struct net *net)
104269 {
104270 int ret = -ENOMEM;
104271 @@ -1764,7 +1768,11 @@ int nf_conntrack_init_net(struct net *net)
104272 if (!net->ct.stat)
104273 goto err_pcpu_lists;
104274
104275 +#ifdef CONFIG_GRKERNSEC_HIDESYM
104276 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
104277 +#else
104278 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
104279 +#endif
104280 if (!net->ct.slabname)
104281 goto err_slabname;
104282
104283 diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
104284 index 4e78c57..ec8fb74 100644
104285 --- a/net/netfilter/nf_conntrack_ecache.c
104286 +++ b/net/netfilter/nf_conntrack_ecache.c
104287 @@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
104288 #ifdef CONFIG_SYSCTL
104289 static int nf_conntrack_event_init_sysctl(struct net *net)
104290 {
104291 - struct ctl_table *table;
104292 + ctl_table_no_const *table;
104293
104294 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
104295 GFP_KERNEL);
104296 diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
104297 index 5b3eae7..dd4b8fe 100644
104298 --- a/net/netfilter/nf_conntrack_helper.c
104299 +++ b/net/netfilter/nf_conntrack_helper.c
104300 @@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
104301
104302 static int nf_conntrack_helper_init_sysctl(struct net *net)
104303 {
104304 - struct ctl_table *table;
104305 + ctl_table_no_const *table;
104306
104307 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
104308 GFP_KERNEL);
104309 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
104310 index b65d586..beec902 100644
104311 --- a/net/netfilter/nf_conntrack_proto.c
104312 +++ b/net/netfilter/nf_conntrack_proto.c
104313 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
104314
104315 static void
104316 nf_ct_unregister_sysctl(struct ctl_table_header **header,
104317 - struct ctl_table **table,
104318 + ctl_table_no_const **table,
104319 unsigned int users)
104320 {
104321 if (users > 0)
104322 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
104323 index cf65a1e..2f291e9 100644
104324 --- a/net/netfilter/nf_conntrack_standalone.c
104325 +++ b/net/netfilter/nf_conntrack_standalone.c
104326 @@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
104327
104328 static int nf_conntrack_standalone_init_sysctl(struct net *net)
104329 {
104330 - struct ctl_table *table;
104331 + ctl_table_no_const *table;
104332
104333 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
104334 GFP_KERNEL);
104335 diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
104336 index 7a394df..bd91a8a 100644
104337 --- a/net/netfilter/nf_conntrack_timestamp.c
104338 +++ b/net/netfilter/nf_conntrack_timestamp.c
104339 @@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
104340 #ifdef CONFIG_SYSCTL
104341 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
104342 {
104343 - struct ctl_table *table;
104344 + ctl_table_no_const *table;
104345
104346 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
104347 GFP_KERNEL);
104348 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
104349 index d719764..311bc60 100644
104350 --- a/net/netfilter/nf_log.c
104351 +++ b/net/netfilter/nf_log.c
104352 @@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
104353
104354 #ifdef CONFIG_SYSCTL
104355 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
104356 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
104357 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
104358
104359 static int nf_log_proc_dostring(struct ctl_table *table, int write,
104360 void __user *buffer, size_t *lenp, loff_t *ppos)
104361 @@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
104362 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
104363 mutex_unlock(&nf_log_mutex);
104364 } else {
104365 + ctl_table_no_const nf_log_table = *table;
104366 +
104367 mutex_lock(&nf_log_mutex);
104368 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
104369 lockdep_is_held(&nf_log_mutex));
104370 if (!logger)
104371 - table->data = "NONE";
104372 + nf_log_table.data = "NONE";
104373 else
104374 - table->data = logger->name;
104375 - r = proc_dostring(table, write, buffer, lenp, ppos);
104376 + nf_log_table.data = logger->name;
104377 + r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
104378 mutex_unlock(&nf_log_mutex);
104379 }
104380
104381 diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
104382 index c68c1e5..8b5d670 100644
104383 --- a/net/netfilter/nf_sockopt.c
104384 +++ b/net/netfilter/nf_sockopt.c
104385 @@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
104386 }
104387 }
104388
104389 - list_add(&reg->list, &nf_sockopts);
104390 + pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
104391 out:
104392 mutex_unlock(&nf_sockopt_mutex);
104393 return ret;
104394 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
104395 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
104396 {
104397 mutex_lock(&nf_sockopt_mutex);
104398 - list_del(&reg->list);
104399 + pax_list_del((struct list_head *)&reg->list);
104400 mutex_unlock(&nf_sockopt_mutex);
104401 }
104402 EXPORT_SYMBOL(nf_unregister_sockopt);
104403 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
104404 index 5f1be5b..2cba8cd 100644
104405 --- a/net/netfilter/nfnetlink_log.c
104406 +++ b/net/netfilter/nfnetlink_log.c
104407 @@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
104408 struct nfnl_log_net {
104409 spinlock_t instances_lock;
104410 struct hlist_head instance_table[INSTANCE_BUCKETS];
104411 - atomic_t global_seq;
104412 + atomic_unchecked_t global_seq;
104413 };
104414
104415 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
104416 @@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
104417 /* global sequence number */
104418 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
104419 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
104420 - htonl(atomic_inc_return(&log->global_seq))))
104421 + htonl(atomic_inc_return_unchecked(&log->global_seq))))
104422 goto nla_put_failure;
104423
104424 if (data_len) {
104425 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
104426 new file mode 100644
104427 index 0000000..c566332
104428 --- /dev/null
104429 +++ b/net/netfilter/xt_gradm.c
104430 @@ -0,0 +1,51 @@
104431 +/*
104432 + * gradm match for netfilter
104433 + * Copyright © Zbigniew Krzystolik, 2010
104434 + *
104435 + * This program is free software; you can redistribute it and/or modify
104436 + * it under the terms of the GNU General Public License; either version
104437 + * 2 or 3 as published by the Free Software Foundation.
104438 + */
104439 +#include <linux/module.h>
104440 +#include <linux/moduleparam.h>
104441 +#include <linux/skbuff.h>
104442 +#include <linux/netfilter/x_tables.h>
104443 +#include <linux/grsecurity.h>
104444 +#include <linux/netfilter/xt_gradm.h>
104445 +
104446 +static bool
104447 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
104448 +{
104449 + const struct xt_gradm_mtinfo *info = par->matchinfo;
104450 + bool retval = false;
104451 + if (gr_acl_is_enabled())
104452 + retval = true;
104453 + return retval ^ info->invflags;
104454 +}
104455 +
104456 +static struct xt_match gradm_mt_reg __read_mostly = {
104457 + .name = "gradm",
104458 + .revision = 0,
104459 + .family = NFPROTO_UNSPEC,
104460 + .match = gradm_mt,
104461 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
104462 + .me = THIS_MODULE,
104463 +};
104464 +
104465 +static int __init gradm_mt_init(void)
104466 +{
104467 + return xt_register_match(&gradm_mt_reg);
104468 +}
104469 +
104470 +static void __exit gradm_mt_exit(void)
104471 +{
104472 + xt_unregister_match(&gradm_mt_reg);
104473 +}
104474 +
104475 +module_init(gradm_mt_init);
104476 +module_exit(gradm_mt_exit);
104477 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
104478 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
104479 +MODULE_LICENSE("GPL");
104480 +MODULE_ALIAS("ipt_gradm");
104481 +MODULE_ALIAS("ip6t_gradm");
104482 diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
104483 index 05fbc2a..4424b5c 100644
104484 --- a/net/netfilter/xt_hashlimit.c
104485 +++ b/net/netfilter/xt_hashlimit.c
104486 @@ -871,11 +871,11 @@ static int __net_init hashlimit_proc_net_init(struct net *net)
104487 {
104488 struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
104489
104490 - hashlimit_net->ipt_hashlimit = proc_mkdir("ipt_hashlimit", net->proc_net);
104491 + hashlimit_net->ipt_hashlimit = proc_mkdir_restrict("ipt_hashlimit", net->proc_net);
104492 if (!hashlimit_net->ipt_hashlimit)
104493 return -ENOMEM;
104494 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
104495 - hashlimit_net->ip6t_hashlimit = proc_mkdir("ip6t_hashlimit", net->proc_net);
104496 + hashlimit_net->ip6t_hashlimit = proc_mkdir_restrict("ip6t_hashlimit", net->proc_net);
104497 if (!hashlimit_net->ip6t_hashlimit) {
104498 remove_proc_entry("ipt_hashlimit", net->proc_net);
104499 return -ENOMEM;
104500 diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
104501 index a9faae8..1ea30e0 100644
104502 --- a/net/netfilter/xt_recent.c
104503 +++ b/net/netfilter/xt_recent.c
104504 @@ -615,7 +615,7 @@ static int __net_init recent_proc_net_init(struct net *net)
104505 {
104506 struct recent_net *recent_net = recent_pernet(net);
104507
104508 - recent_net->xt_recent = proc_mkdir("xt_recent", net->proc_net);
104509 + recent_net->xt_recent = proc_mkdir_restrict("xt_recent", net->proc_net);
104510 if (!recent_net->xt_recent)
104511 return -ENOMEM;
104512 return 0;
104513 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
104514 index 11de55e..f25e448 100644
104515 --- a/net/netfilter/xt_statistic.c
104516 +++ b/net/netfilter/xt_statistic.c
104517 @@ -19,7 +19,7 @@
104518 #include <linux/module.h>
104519
104520 struct xt_statistic_priv {
104521 - atomic_t count;
104522 + atomic_unchecked_t count;
104523 } ____cacheline_aligned_in_smp;
104524
104525 MODULE_LICENSE("GPL");
104526 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
104527 break;
104528 case XT_STATISTIC_MODE_NTH:
104529 do {
104530 - oval = atomic_read(&info->master->count);
104531 + oval = atomic_read_unchecked(&info->master->count);
104532 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
104533 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
104534 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
104535 if (nval == 0)
104536 ret = !ret;
104537 break;
104538 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
104539 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
104540 if (info->master == NULL)
104541 return -ENOMEM;
104542 - atomic_set(&info->master->count, info->u.nth.count);
104543 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
104544
104545 return 0;
104546 }
104547 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
104548 index b6bf8e8..7884ddf 100644
104549 --- a/net/netlink/af_netlink.c
104550 +++ b/net/netlink/af_netlink.c
104551 @@ -273,7 +273,7 @@ static void netlink_overrun(struct sock *sk)
104552 sk->sk_error_report(sk);
104553 }
104554 }
104555 - atomic_inc(&sk->sk_drops);
104556 + atomic_inc_unchecked(&sk->sk_drops);
104557 }
104558
104559 static void netlink_rcv_wake(struct sock *sk)
104560 @@ -3010,7 +3010,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
104561 sk_wmem_alloc_get(s),
104562 nlk->cb_running,
104563 atomic_read(&s->sk_refcnt),
104564 - atomic_read(&s->sk_drops),
104565 + atomic_read_unchecked(&s->sk_drops),
104566 sock_i_ino(s)
104567 );
104568
104569 diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
104570 index 8451612..c8872bc 100644
104571 --- a/net/openvswitch/vport-internal_dev.c
104572 +++ b/net/openvswitch/vport-internal_dev.c
104573 @@ -122,7 +122,7 @@ static const struct net_device_ops internal_dev_netdev_ops = {
104574 .ndo_get_stats64 = internal_dev_get_stats,
104575 };
104576
104577 -static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
104578 +static struct rtnl_link_ops internal_dev_link_ops = {
104579 .kind = "openvswitch",
104580 };
104581
104582 diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
104583 index 6015802..e81e8bf 100644
104584 --- a/net/openvswitch/vport.c
104585 +++ b/net/openvswitch/vport.c
104586 @@ -269,10 +269,10 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
104587 * netdev-stats can be directly read over netlink-ioctl.
104588 */
104589
104590 - stats->rx_errors = atomic_long_read(&vport->err_stats.rx_errors);
104591 - stats->tx_errors = atomic_long_read(&vport->err_stats.tx_errors);
104592 - stats->tx_dropped = atomic_long_read(&vport->err_stats.tx_dropped);
104593 - stats->rx_dropped = atomic_long_read(&vport->err_stats.rx_dropped);
104594 + stats->rx_errors = atomic_long_read_unchecked(&vport->err_stats.rx_errors);
104595 + stats->tx_errors = atomic_long_read_unchecked(&vport->err_stats.tx_errors);
104596 + stats->tx_dropped = atomic_long_read_unchecked(&vport->err_stats.tx_dropped);
104597 + stats->rx_dropped = atomic_long_read_unchecked(&vport->err_stats.rx_dropped);
104598
104599 for_each_possible_cpu(i) {
104600 const struct pcpu_sw_netstats *percpu_stats;
104601 @@ -503,19 +503,19 @@ static void ovs_vport_record_error(struct vport *vport,
104602 {
104603 switch (err_type) {
104604 case VPORT_E_RX_DROPPED:
104605 - atomic_long_inc(&vport->err_stats.rx_dropped);
104606 + atomic_long_inc_unchecked(&vport->err_stats.rx_dropped);
104607 break;
104608
104609 case VPORT_E_RX_ERROR:
104610 - atomic_long_inc(&vport->err_stats.rx_errors);
104611 + atomic_long_inc_unchecked(&vport->err_stats.rx_errors);
104612 break;
104613
104614 case VPORT_E_TX_DROPPED:
104615 - atomic_long_inc(&vport->err_stats.tx_dropped);
104616 + atomic_long_inc_unchecked(&vport->err_stats.tx_dropped);
104617 break;
104618
104619 case VPORT_E_TX_ERROR:
104620 - atomic_long_inc(&vport->err_stats.tx_errors);
104621 + atomic_long_inc_unchecked(&vport->err_stats.tx_errors);
104622 break;
104623 }
104624
104625 diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
104626 index 8942125..03ed887 100644
104627 --- a/net/openvswitch/vport.h
104628 +++ b/net/openvswitch/vport.h
104629 @@ -61,10 +61,10 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
104630 /* The following definitions are for implementers of vport devices: */
104631
104632 struct vport_err_stats {
104633 - atomic_long_t rx_dropped;
104634 - atomic_long_t rx_errors;
104635 - atomic_long_t tx_dropped;
104636 - atomic_long_t tx_errors;
104637 + atomic_long_unchecked_t rx_dropped;
104638 + atomic_long_unchecked_t rx_errors;
104639 + atomic_long_unchecked_t tx_dropped;
104640 + atomic_long_unchecked_t tx_errors;
104641 };
104642 /**
104643 * struct vport_portids - array of netlink portids of a vport.
104644 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
104645 index 07c04a8..3ca11eb 100644
104646 --- a/net/packet/af_packet.c
104647 +++ b/net/packet/af_packet.c
104648 @@ -269,7 +269,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
104649
104650 return ret;
104651 drop:
104652 - atomic_long_inc(&dev->tx_dropped);
104653 + atomic_long_inc_unchecked(&dev->tx_dropped);
104654 kfree_skb(skb);
104655 return NET_XMIT_DROP;
104656 }
104657 @@ -1836,7 +1836,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
104658
104659 spin_lock(&sk->sk_receive_queue.lock);
104660 po->stats.stats1.tp_packets++;
104661 - skb->dropcount = atomic_read(&sk->sk_drops);
104662 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
104663 __skb_queue_tail(&sk->sk_receive_queue, skb);
104664 spin_unlock(&sk->sk_receive_queue.lock);
104665 sk->sk_data_ready(sk);
104666 @@ -1845,7 +1845,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
104667 drop_n_acct:
104668 spin_lock(&sk->sk_receive_queue.lock);
104669 po->stats.stats1.tp_drops++;
104670 - atomic_inc(&sk->sk_drops);
104671 + atomic_inc_unchecked(&sk->sk_drops);
104672 spin_unlock(&sk->sk_receive_queue.lock);
104673
104674 drop_n_restore:
104675 @@ -3460,7 +3460,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
104676 case PACKET_HDRLEN:
104677 if (len > sizeof(int))
104678 len = sizeof(int);
104679 - if (copy_from_user(&val, optval, len))
104680 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
104681 return -EFAULT;
104682 switch (val) {
104683 case TPACKET_V1:
104684 @@ -3506,7 +3506,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
104685 len = lv;
104686 if (put_user(len, optlen))
104687 return -EFAULT;
104688 - if (copy_to_user(optval, data, len))
104689 + if (len > sizeof(st) || copy_to_user(optval, data, len))
104690 return -EFAULT;
104691 return 0;
104692 }
104693 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
104694 index 70a547e..23477fe 100644
104695 --- a/net/phonet/pep.c
104696 +++ b/net/phonet/pep.c
104697 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
104698
104699 case PNS_PEP_CTRL_REQ:
104700 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
104701 - atomic_inc(&sk->sk_drops);
104702 + atomic_inc_unchecked(&sk->sk_drops);
104703 break;
104704 }
104705 __skb_pull(skb, 4);
104706 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
104707 }
104708
104709 if (pn->rx_credits == 0) {
104710 - atomic_inc(&sk->sk_drops);
104711 + atomic_inc_unchecked(&sk->sk_drops);
104712 err = -ENOBUFS;
104713 break;
104714 }
104715 @@ -579,7 +579,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
104716 }
104717
104718 if (pn->rx_credits == 0) {
104719 - atomic_inc(&sk->sk_drops);
104720 + atomic_inc_unchecked(&sk->sk_drops);
104721 err = NET_RX_DROP;
104722 break;
104723 }
104724 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
104725 index 008214a..bb68240 100644
104726 --- a/net/phonet/socket.c
104727 +++ b/net/phonet/socket.c
104728 @@ -611,7 +611,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
104729 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
104730 sock_i_ino(sk),
104731 atomic_read(&sk->sk_refcnt), sk,
104732 - atomic_read(&sk->sk_drops));
104733 + atomic_read_unchecked(&sk->sk_drops));
104734 }
104735 seq_pad(seq, '\n');
104736 return 0;
104737 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
104738 index c02a8c4..3c5b600 100644
104739 --- a/net/phonet/sysctl.c
104740 +++ b/net/phonet/sysctl.c
104741 @@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
104742 {
104743 int ret;
104744 int range[2] = {local_port_range[0], local_port_range[1]};
104745 - struct ctl_table tmp = {
104746 + ctl_table_no_const tmp = {
104747 .data = &range,
104748 .maxlen = sizeof(range),
104749 .mode = table->mode,
104750 diff --git a/net/rds/cong.c b/net/rds/cong.c
104751 index e5b65ac..f3b6fb7 100644
104752 --- a/net/rds/cong.c
104753 +++ b/net/rds/cong.c
104754 @@ -78,7 +78,7 @@
104755 * finds that the saved generation number is smaller than the global generation
104756 * number, it wakes up the process.
104757 */
104758 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
104759 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
104760
104761 /*
104762 * Congestion monitoring
104763 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
104764 rdsdebug("waking map %p for %pI4\n",
104765 map, &map->m_addr);
104766 rds_stats_inc(s_cong_update_received);
104767 - atomic_inc(&rds_cong_generation);
104768 + atomic_inc_unchecked(&rds_cong_generation);
104769 if (waitqueue_active(&map->m_waitq))
104770 wake_up(&map->m_waitq);
104771 if (waitqueue_active(&rds_poll_waitq))
104772 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
104773
104774 int rds_cong_updated_since(unsigned long *recent)
104775 {
104776 - unsigned long gen = atomic_read(&rds_cong_generation);
104777 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
104778
104779 if (likely(*recent == gen))
104780 return 0;
104781 diff --git a/net/rds/ib.h b/net/rds/ib.h
104782 index 7280ab8..e04f4ea 100644
104783 --- a/net/rds/ib.h
104784 +++ b/net/rds/ib.h
104785 @@ -128,7 +128,7 @@ struct rds_ib_connection {
104786 /* sending acks */
104787 unsigned long i_ack_flags;
104788 #ifdef KERNEL_HAS_ATOMIC64
104789 - atomic64_t i_ack_next; /* next ACK to send */
104790 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
104791 #else
104792 spinlock_t i_ack_lock; /* protect i_ack_next */
104793 u64 i_ack_next; /* next ACK to send */
104794 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
104795 index 31b74f5..dc1fbfa 100644
104796 --- a/net/rds/ib_cm.c
104797 +++ b/net/rds/ib_cm.c
104798 @@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
104799 /* Clear the ACK state */
104800 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
104801 #ifdef KERNEL_HAS_ATOMIC64
104802 - atomic64_set(&ic->i_ack_next, 0);
104803 + atomic64_set_unchecked(&ic->i_ack_next, 0);
104804 #else
104805 ic->i_ack_next = 0;
104806 #endif
104807 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
104808 index d67de45..73dbf51 100644
104809 --- a/net/rds/ib_recv.c
104810 +++ b/net/rds/ib_recv.c
104811 @@ -596,7 +596,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
104812 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
104813 int ack_required)
104814 {
104815 - atomic64_set(&ic->i_ack_next, seq);
104816 + atomic64_set_unchecked(&ic->i_ack_next, seq);
104817 if (ack_required) {
104818 smp_mb__before_atomic();
104819 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104820 @@ -608,7 +608,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
104821 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104822 smp_mb__after_atomic();
104823
104824 - return atomic64_read(&ic->i_ack_next);
104825 + return atomic64_read_unchecked(&ic->i_ack_next);
104826 }
104827 #endif
104828
104829 diff --git a/net/rds/iw.h b/net/rds/iw.h
104830 index 04ce3b1..48119a6 100644
104831 --- a/net/rds/iw.h
104832 +++ b/net/rds/iw.h
104833 @@ -134,7 +134,7 @@ struct rds_iw_connection {
104834 /* sending acks */
104835 unsigned long i_ack_flags;
104836 #ifdef KERNEL_HAS_ATOMIC64
104837 - atomic64_t i_ack_next; /* next ACK to send */
104838 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
104839 #else
104840 spinlock_t i_ack_lock; /* protect i_ack_next */
104841 u64 i_ack_next; /* next ACK to send */
104842 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
104843 index a91e1db..cf3053f 100644
104844 --- a/net/rds/iw_cm.c
104845 +++ b/net/rds/iw_cm.c
104846 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
104847 /* Clear the ACK state */
104848 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
104849 #ifdef KERNEL_HAS_ATOMIC64
104850 - atomic64_set(&ic->i_ack_next, 0);
104851 + atomic64_set_unchecked(&ic->i_ack_next, 0);
104852 #else
104853 ic->i_ack_next = 0;
104854 #endif
104855 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
104856 index aa8bf67..b70133c 100644
104857 --- a/net/rds/iw_recv.c
104858 +++ b/net/rds/iw_recv.c
104859 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
104860 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
104861 int ack_required)
104862 {
104863 - atomic64_set(&ic->i_ack_next, seq);
104864 + atomic64_set_unchecked(&ic->i_ack_next, seq);
104865 if (ack_required) {
104866 smp_mb__before_atomic();
104867 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104868 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
104869 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
104870 smp_mb__after_atomic();
104871
104872 - return atomic64_read(&ic->i_ack_next);
104873 + return atomic64_read_unchecked(&ic->i_ack_next);
104874 }
104875 #endif
104876
104877 diff --git a/net/rds/rds.h b/net/rds/rds.h
104878 index 48f8ffc..0ef3eec 100644
104879 --- a/net/rds/rds.h
104880 +++ b/net/rds/rds.h
104881 @@ -449,7 +449,7 @@ struct rds_transport {
104882 void (*sync_mr)(void *trans_private, int direction);
104883 void (*free_mr)(void *trans_private, int invalidate);
104884 void (*flush_mrs)(void);
104885 -};
104886 +} __do_const;
104887
104888 struct rds_sock {
104889 struct sock rs_sk;
104890 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
104891 index edac9ef..16bcb98 100644
104892 --- a/net/rds/tcp.c
104893 +++ b/net/rds/tcp.c
104894 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
104895 int val = 1;
104896
104897 set_fs(KERNEL_DS);
104898 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
104899 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
104900 sizeof(val));
104901 set_fs(oldfs);
104902 }
104903 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
104904 index 53b17ca..45463e7 100644
104905 --- a/net/rds/tcp_send.c
104906 +++ b/net/rds/tcp_send.c
104907 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
104908
104909 oldfs = get_fs();
104910 set_fs(KERNEL_DS);
104911 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
104912 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
104913 sizeof(val));
104914 set_fs(oldfs);
104915 }
104916 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
104917 index 7b16704..9628ec6 100644
104918 --- a/net/rxrpc/af_rxrpc.c
104919 +++ b/net/rxrpc/af_rxrpc.c
104920 @@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
104921 __be32 rxrpc_epoch;
104922
104923 /* current debugging ID */
104924 -atomic_t rxrpc_debug_id;
104925 +atomic_unchecked_t rxrpc_debug_id;
104926
104927 /* count of skbs currently in use */
104928 atomic_t rxrpc_n_skbs;
104929 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
104930 index c6be17a..2a6200a 100644
104931 --- a/net/rxrpc/ar-ack.c
104932 +++ b/net/rxrpc/ar-ack.c
104933 @@ -223,7 +223,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
104934
104935 _enter("{%d,%d,%d,%d},",
104936 call->acks_hard, call->acks_unacked,
104937 - atomic_read(&call->sequence),
104938 + atomic_read_unchecked(&call->sequence),
104939 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
104940
104941 stop = 0;
104942 @@ -247,7 +247,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
104943
104944 /* each Tx packet has a new serial number */
104945 sp->hdr.serial =
104946 - htonl(atomic_inc_return(&call->conn->serial));
104947 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
104948
104949 hdr = (struct rxrpc_header *) txb->head;
104950 hdr->serial = sp->hdr.serial;
104951 @@ -451,7 +451,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
104952 */
104953 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
104954 {
104955 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
104956 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
104957 }
104958
104959 /*
104960 @@ -677,7 +677,7 @@ process_further:
104961
104962 latest = ntohl(sp->hdr.serial);
104963 hard = ntohl(ack.firstPacket);
104964 - tx = atomic_read(&call->sequence);
104965 + tx = atomic_read_unchecked(&call->sequence);
104966
104967 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
104968 latest,
104969 @@ -1209,7 +1209,7 @@ void rxrpc_process_call(struct work_struct *work)
104970 goto maybe_reschedule;
104971
104972 send_ACK_with_skew:
104973 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
104974 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
104975 ntohl(ack.serial));
104976 send_ACK:
104977 mtu = call->conn->trans->peer->if_mtu;
104978 @@ -1221,7 +1221,7 @@ send_ACK:
104979 ackinfo.rxMTU = htonl(rxrpc_rx_mtu);
104980 ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
104981
104982 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
104983 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
104984 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
104985 ntohl(hdr.serial),
104986 ntohs(ack.maxSkew),
104987 @@ -1239,7 +1239,7 @@ send_ACK:
104988 send_message:
104989 _debug("send message");
104990
104991 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
104992 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
104993 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
104994 send_message_2:
104995
104996 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
104997 index a9e05db..194e793 100644
104998 --- a/net/rxrpc/ar-call.c
104999 +++ b/net/rxrpc/ar-call.c
105000 @@ -232,7 +232,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
105001 spin_lock_init(&call->lock);
105002 rwlock_init(&call->state_lock);
105003 atomic_set(&call->usage, 1);
105004 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
105005 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105006 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
105007
105008 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
105009 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
105010 index 6631f4f..bfdf056 100644
105011 --- a/net/rxrpc/ar-connection.c
105012 +++ b/net/rxrpc/ar-connection.c
105013 @@ -210,7 +210,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
105014 rwlock_init(&conn->lock);
105015 spin_lock_init(&conn->state_lock);
105016 atomic_set(&conn->usage, 1);
105017 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
105018 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105019 conn->avail_calls = RXRPC_MAXCALLS;
105020 conn->size_align = 4;
105021 conn->header_size = sizeof(struct rxrpc_header);
105022 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
105023 index e7ed43a..6afa140 100644
105024 --- a/net/rxrpc/ar-connevent.c
105025 +++ b/net/rxrpc/ar-connevent.c
105026 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
105027
105028 len = iov[0].iov_len + iov[1].iov_len;
105029
105030 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
105031 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105032 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
105033
105034 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
105035 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
105036 index 481f89f..ceeaf8d 100644
105037 --- a/net/rxrpc/ar-input.c
105038 +++ b/net/rxrpc/ar-input.c
105039 @@ -331,9 +331,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
105040 /* track the latest serial number on this connection for ACK packet
105041 * information */
105042 serial = ntohl(sp->hdr.serial);
105043 - hi_serial = atomic_read(&call->conn->hi_serial);
105044 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
105045 while (serial > hi_serial)
105046 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
105047 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
105048 serial);
105049
105050 /* request ACK generation for any ACK or DATA packet that requests
105051 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
105052 index ba9fd36..9bbfe01 100644
105053 --- a/net/rxrpc/ar-internal.h
105054 +++ b/net/rxrpc/ar-internal.h
105055 @@ -272,8 +272,8 @@ struct rxrpc_connection {
105056 int error; /* error code for local abort */
105057 int debug_id; /* debug ID for printks */
105058 unsigned int call_counter; /* call ID counter */
105059 - atomic_t serial; /* packet serial number counter */
105060 - atomic_t hi_serial; /* highest serial number received */
105061 + atomic_unchecked_t serial; /* packet serial number counter */
105062 + atomic_unchecked_t hi_serial; /* highest serial number received */
105063 u8 avail_calls; /* number of calls available */
105064 u8 size_align; /* data size alignment (for security) */
105065 u8 header_size; /* rxrpc + security header size */
105066 @@ -346,7 +346,7 @@ struct rxrpc_call {
105067 spinlock_t lock;
105068 rwlock_t state_lock; /* lock for state transition */
105069 atomic_t usage;
105070 - atomic_t sequence; /* Tx data packet sequence counter */
105071 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
105072 u32 abort_code; /* local/remote abort code */
105073 enum { /* current state of call */
105074 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
105075 @@ -431,7 +431,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
105076 */
105077 extern atomic_t rxrpc_n_skbs;
105078 extern __be32 rxrpc_epoch;
105079 -extern atomic_t rxrpc_debug_id;
105080 +extern atomic_unchecked_t rxrpc_debug_id;
105081 extern struct workqueue_struct *rxrpc_workqueue;
105082
105083 /*
105084 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
105085 index 87f7135..74d3703 100644
105086 --- a/net/rxrpc/ar-local.c
105087 +++ b/net/rxrpc/ar-local.c
105088 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
105089 spin_lock_init(&local->lock);
105090 rwlock_init(&local->services_lock);
105091 atomic_set(&local->usage, 1);
105092 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
105093 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105094 memcpy(&local->srx, srx, sizeof(*srx));
105095 }
105096
105097 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
105098 index 0b4b9a7..966ffbb 100644
105099 --- a/net/rxrpc/ar-output.c
105100 +++ b/net/rxrpc/ar-output.c
105101 @@ -682,14 +682,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
105102 memset(skb_put(skb, pad), 0, pad);
105103 }
105104
105105 - seq = atomic_inc_return(&call->sequence);
105106 + seq = atomic_inc_return_unchecked(&call->sequence);
105107
105108 sp->hdr.epoch = conn->epoch;
105109 sp->hdr.cid = call->cid;
105110 sp->hdr.callNumber = call->call_id;
105111 sp->hdr.seq = htonl(seq);
105112 sp->hdr.serial =
105113 - htonl(atomic_inc_return(&conn->serial));
105114 + htonl(atomic_inc_return_unchecked(&conn->serial));
105115 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
105116 sp->hdr.userStatus = 0;
105117 sp->hdr.securityIndex = conn->security_ix;
105118 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
105119 index bebaa43..2644591 100644
105120 --- a/net/rxrpc/ar-peer.c
105121 +++ b/net/rxrpc/ar-peer.c
105122 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
105123 INIT_LIST_HEAD(&peer->error_targets);
105124 spin_lock_init(&peer->lock);
105125 atomic_set(&peer->usage, 1);
105126 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
105127 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105128 memcpy(&peer->srx, srx, sizeof(*srx));
105129
105130 rxrpc_assess_MTU_size(peer);
105131 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
105132 index 38047f7..9f48511 100644
105133 --- a/net/rxrpc/ar-proc.c
105134 +++ b/net/rxrpc/ar-proc.c
105135 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
105136 atomic_read(&conn->usage),
105137 rxrpc_conn_states[conn->state],
105138 key_serial(conn->key),
105139 - atomic_read(&conn->serial),
105140 - atomic_read(&conn->hi_serial));
105141 + atomic_read_unchecked(&conn->serial),
105142 + atomic_read_unchecked(&conn->hi_serial));
105143
105144 return 0;
105145 }
105146 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
105147 index 1976dec..aa70be5 100644
105148 --- a/net/rxrpc/ar-transport.c
105149 +++ b/net/rxrpc/ar-transport.c
105150 @@ -51,7 +51,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
105151 spin_lock_init(&trans->client_lock);
105152 rwlock_init(&trans->conn_lock);
105153 atomic_set(&trans->usage, 1);
105154 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
105155 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105156
105157 if (peer->srx.transport.family == AF_INET) {
105158 switch (peer->srx.transport_type) {
105159 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
105160 index f226709..0e735a8 100644
105161 --- a/net/rxrpc/rxkad.c
105162 +++ b/net/rxrpc/rxkad.c
105163 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
105164
105165 len = iov[0].iov_len + iov[1].iov_len;
105166
105167 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
105168 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105169 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
105170
105171 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
105172 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
105173
105174 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
105175
105176 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
105177 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105178 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
105179
105180 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
105181 diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
105182 index 6efca30..1259f82 100644
105183 --- a/net/sched/sch_generic.c
105184 +++ b/net/sched/sch_generic.c
105185 @@ -349,7 +349,7 @@ void netif_carrier_on(struct net_device *dev)
105186 if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
105187 if (dev->reg_state == NETREG_UNINITIALIZED)
105188 return;
105189 - atomic_inc(&dev->carrier_changes);
105190 + atomic_inc_unchecked(&dev->carrier_changes);
105191 linkwatch_fire_event(dev);
105192 if (netif_running(dev))
105193 __netdev_watchdog_up(dev);
105194 @@ -368,7 +368,7 @@ void netif_carrier_off(struct net_device *dev)
105195 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
105196 if (dev->reg_state == NETREG_UNINITIALIZED)
105197 return;
105198 - atomic_inc(&dev->carrier_changes);
105199 + atomic_inc_unchecked(&dev->carrier_changes);
105200 linkwatch_fire_event(dev);
105201 }
105202 }
105203 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
105204 index 0e4198e..f94193e 100644
105205 --- a/net/sctp/ipv6.c
105206 +++ b/net/sctp/ipv6.c
105207 @@ -972,7 +972,7 @@ static const struct inet6_protocol sctpv6_protocol = {
105208 .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
105209 };
105210
105211 -static struct sctp_af sctp_af_inet6 = {
105212 +static struct sctp_af sctp_af_inet6 __read_only = {
105213 .sa_family = AF_INET6,
105214 .sctp_xmit = sctp_v6_xmit,
105215 .setsockopt = ipv6_setsockopt,
105216 @@ -1002,7 +1002,7 @@ static struct sctp_af sctp_af_inet6 = {
105217 #endif
105218 };
105219
105220 -static struct sctp_pf sctp_pf_inet6 = {
105221 +static struct sctp_pf sctp_pf_inet6 __read_only = {
105222 .event_msgname = sctp_inet6_event_msgname,
105223 .skb_msgname = sctp_inet6_skb_msgname,
105224 .af_supported = sctp_inet6_af_supported,
105225 @@ -1029,7 +1029,7 @@ void sctp_v6_pf_init(void)
105226
105227 void sctp_v6_pf_exit(void)
105228 {
105229 - list_del(&sctp_af_inet6.list);
105230 + pax_list_del(&sctp_af_inet6.list);
105231 }
105232
105233 /* Initialize IPv6 support and register with socket layer. */
105234 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
105235 index 8f34b27..b105385 100644
105236 --- a/net/sctp/protocol.c
105237 +++ b/net/sctp/protocol.c
105238 @@ -836,8 +836,10 @@ int sctp_register_af(struct sctp_af *af)
105239 return 0;
105240 }
105241
105242 + pax_open_kernel();
105243 INIT_LIST_HEAD(&af->list);
105244 - list_add_tail(&af->list, &sctp_address_families);
105245 + pax_close_kernel();
105246 + pax_list_add_tail(&af->list, &sctp_address_families);
105247 return 1;
105248 }
105249
105250 @@ -967,7 +969,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
105251
105252 static struct sctp_af sctp_af_inet;
105253
105254 -static struct sctp_pf sctp_pf_inet = {
105255 +static struct sctp_pf sctp_pf_inet __read_only = {
105256 .event_msgname = sctp_inet_event_msgname,
105257 .skb_msgname = sctp_inet_skb_msgname,
105258 .af_supported = sctp_inet_af_supported,
105259 @@ -1039,7 +1041,7 @@ static const struct net_protocol sctp_protocol = {
105260 };
105261
105262 /* IPv4 address related functions. */
105263 -static struct sctp_af sctp_af_inet = {
105264 +static struct sctp_af sctp_af_inet __read_only = {
105265 .sa_family = AF_INET,
105266 .sctp_xmit = sctp_v4_xmit,
105267 .setsockopt = ip_setsockopt,
105268 @@ -1123,7 +1125,7 @@ static void sctp_v4_pf_init(void)
105269
105270 static void sctp_v4_pf_exit(void)
105271 {
105272 - list_del(&sctp_af_inet.list);
105273 + pax_list_del(&sctp_af_inet.list);
105274 }
105275
105276 static int sctp_v4_protosw_init(void)
105277 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
105278 index fef2acd..c705c4f 100644
105279 --- a/net/sctp/sm_sideeffect.c
105280 +++ b/net/sctp/sm_sideeffect.c
105281 @@ -439,7 +439,7 @@ static void sctp_generate_sack_event(unsigned long data)
105282 sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
105283 }
105284
105285 -sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
105286 +sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
105287 NULL,
105288 sctp_generate_t1_cookie_event,
105289 sctp_generate_t1_init_event,
105290 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
105291 index 634a2ab..8e93929 100644
105292 --- a/net/sctp/socket.c
105293 +++ b/net/sctp/socket.c
105294 @@ -2199,11 +2199,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
105295 {
105296 struct sctp_association *asoc;
105297 struct sctp_ulpevent *event;
105298 + struct sctp_event_subscribe subscribe;
105299
105300 if (optlen > sizeof(struct sctp_event_subscribe))
105301 return -EINVAL;
105302 - if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
105303 + if (copy_from_user(&subscribe, optval, optlen))
105304 return -EFAULT;
105305 + sctp_sk(sk)->subscribe = subscribe;
105306
105307 if (sctp_sk(sk)->subscribe.sctp_data_io_event)
105308 pr_warn_ratelimited(DEPRECATED "%s (pid %d) "
105309 @@ -4372,13 +4374,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
105310 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
105311 int __user *optlen)
105312 {
105313 + struct sctp_event_subscribe subscribe;
105314 +
105315 if (len <= 0)
105316 return -EINVAL;
105317 if (len > sizeof(struct sctp_event_subscribe))
105318 len = sizeof(struct sctp_event_subscribe);
105319 if (put_user(len, optlen))
105320 return -EFAULT;
105321 - if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
105322 + subscribe = sctp_sk(sk)->subscribe;
105323 + if (copy_to_user(optval, &subscribe, len))
105324 return -EFAULT;
105325 return 0;
105326 }
105327 @@ -4396,6 +4401,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
105328 */
105329 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
105330 {
105331 + __u32 autoclose;
105332 +
105333 /* Applicable to UDP-style socket only */
105334 if (sctp_style(sk, TCP))
105335 return -EOPNOTSUPP;
105336 @@ -4404,7 +4411,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
105337 len = sizeof(int);
105338 if (put_user(len, optlen))
105339 return -EFAULT;
105340 - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
105341 + autoclose = sctp_sk(sk)->autoclose;
105342 + if (copy_to_user(optval, &autoclose, sizeof(int)))
105343 return -EFAULT;
105344 return 0;
105345 }
105346 @@ -4778,12 +4786,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
105347 */
105348 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
105349 {
105350 + struct sctp_initmsg initmsg;
105351 +
105352 if (len < sizeof(struct sctp_initmsg))
105353 return -EINVAL;
105354 len = sizeof(struct sctp_initmsg);
105355 if (put_user(len, optlen))
105356 return -EFAULT;
105357 - if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
105358 + initmsg = sctp_sk(sk)->initmsg;
105359 + if (copy_to_user(optval, &initmsg, len))
105360 return -EFAULT;
105361 return 0;
105362 }
105363 @@ -4824,6 +4835,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
105364 ->addr_to_user(sp, &temp);
105365 if (space_left < addrlen)
105366 return -ENOMEM;
105367 + if (addrlen > sizeof(temp) || addrlen < 0)
105368 + return -EFAULT;
105369 if (copy_to_user(to, &temp, addrlen))
105370 return -EFAULT;
105371 to += addrlen;
105372 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
105373 index 2e9ada1..40f425d 100644
105374 --- a/net/sctp/sysctl.c
105375 +++ b/net/sctp/sysctl.c
105376 @@ -321,7 +321,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
105377 loff_t *ppos)
105378 {
105379 struct net *net = current->nsproxy->net_ns;
105380 - struct ctl_table tbl;
105381 + ctl_table_no_const tbl;
105382 bool changed = false;
105383 char *none = "none";
105384 char tmp[8];
105385 @@ -369,7 +369,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
105386 struct net *net = current->nsproxy->net_ns;
105387 unsigned int min = *(unsigned int *) ctl->extra1;
105388 unsigned int max = *(unsigned int *) ctl->extra2;
105389 - struct ctl_table tbl;
105390 + ctl_table_no_const tbl;
105391 int ret, new_value;
105392
105393 memset(&tbl, 0, sizeof(struct ctl_table));
105394 @@ -398,7 +398,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
105395 struct net *net = current->nsproxy->net_ns;
105396 unsigned int min = *(unsigned int *) ctl->extra1;
105397 unsigned int max = *(unsigned int *) ctl->extra2;
105398 - struct ctl_table tbl;
105399 + ctl_table_no_const tbl;
105400 int ret, new_value;
105401
105402 memset(&tbl, 0, sizeof(struct ctl_table));
105403 @@ -436,7 +436,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
105404 loff_t *ppos)
105405 {
105406 struct net *net = current->nsproxy->net_ns;
105407 - struct ctl_table tbl;
105408 + ctl_table_no_const tbl;
105409 int new_value, ret;
105410
105411 memset(&tbl, 0, sizeof(struct ctl_table));
105412 @@ -463,7 +463,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
105413
105414 int sctp_sysctl_net_register(struct net *net)
105415 {
105416 - struct ctl_table *table;
105417 + ctl_table_no_const *table;
105418 int i;
105419
105420 table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
105421 diff --git a/net/socket.c b/net/socket.c
105422 index fe20c31..83a0ed6 100644
105423 --- a/net/socket.c
105424 +++ b/net/socket.c
105425 @@ -89,6 +89,7 @@
105426 #include <linux/magic.h>
105427 #include <linux/slab.h>
105428 #include <linux/xattr.h>
105429 +#include <linux/in.h>
105430
105431 #include <asm/uaccess.h>
105432 #include <asm/unistd.h>
105433 @@ -113,6 +114,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
105434 unsigned int sysctl_net_busy_poll __read_mostly;
105435 #endif
105436
105437 +#include <linux/grsock.h>
105438 +
105439 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
105440 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
105441 unsigned long nr_segs, loff_t pos);
105442 @@ -164,7 +167,7 @@ static const struct file_operations socket_file_ops = {
105443 */
105444
105445 static DEFINE_SPINLOCK(net_family_lock);
105446 -static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
105447 +const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
105448
105449 /*
105450 * Statistics counters of the socket lists
105451 @@ -330,7 +333,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
105452 &sockfs_dentry_operations, SOCKFS_MAGIC);
105453 }
105454
105455 -static struct vfsmount *sock_mnt __read_mostly;
105456 +struct vfsmount *sock_mnt __read_mostly;
105457
105458 static struct file_system_type sock_fs_type = {
105459 .name = "sockfs",
105460 @@ -1263,6 +1266,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
105461 return -EAFNOSUPPORT;
105462 if (type < 0 || type >= SOCK_MAX)
105463 return -EINVAL;
105464 + if (protocol < 0)
105465 + return -EINVAL;
105466
105467 /* Compatibility.
105468
105469 @@ -1283,6 +1288,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
105470 if (err)
105471 return err;
105472
105473 + if(!kern && !gr_search_socket(family, type, protocol)) {
105474 + if (rcu_access_pointer(net_families[family]) == NULL)
105475 + return -EAFNOSUPPORT;
105476 + else
105477 + return -EACCES;
105478 + }
105479 +
105480 + if (!kern && gr_handle_sock_all(family, type, protocol)) {
105481 + if (rcu_access_pointer(net_families[family]) == NULL)
105482 + return -EAFNOSUPPORT;
105483 + else
105484 + return -EACCES;
105485 + }
105486 +
105487 /*
105488 * Allocate the socket and allow the family to set things up. if
105489 * the protocol is 0, the family is instructed to select an appropriate
105490 @@ -1534,6 +1553,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
105491 if (sock) {
105492 err = move_addr_to_kernel(umyaddr, addrlen, &address);
105493 if (err >= 0) {
105494 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
105495 + err = -EACCES;
105496 + goto error;
105497 + }
105498 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
105499 + if (err)
105500 + goto error;
105501 +
105502 err = security_socket_bind(sock,
105503 (struct sockaddr *)&address,
105504 addrlen);
105505 @@ -1542,6 +1569,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
105506 (struct sockaddr *)
105507 &address, addrlen);
105508 }
105509 +error:
105510 fput_light(sock->file, fput_needed);
105511 }
105512 return err;
105513 @@ -1565,10 +1593,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
105514 if ((unsigned int)backlog > somaxconn)
105515 backlog = somaxconn;
105516
105517 + if (gr_handle_sock_server_other(sock->sk)) {
105518 + err = -EPERM;
105519 + goto error;
105520 + }
105521 +
105522 + err = gr_search_listen(sock);
105523 + if (err)
105524 + goto error;
105525 +
105526 err = security_socket_listen(sock, backlog);
105527 if (!err)
105528 err = sock->ops->listen(sock, backlog);
105529
105530 +error:
105531 fput_light(sock->file, fput_needed);
105532 }
105533 return err;
105534 @@ -1612,6 +1650,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
105535 newsock->type = sock->type;
105536 newsock->ops = sock->ops;
105537
105538 + if (gr_handle_sock_server_other(sock->sk)) {
105539 + err = -EPERM;
105540 + sock_release(newsock);
105541 + goto out_put;
105542 + }
105543 +
105544 + err = gr_search_accept(sock);
105545 + if (err) {
105546 + sock_release(newsock);
105547 + goto out_put;
105548 + }
105549 +
105550 /*
105551 * We don't need try_module_get here, as the listening socket (sock)
105552 * has the protocol module (sock->ops->owner) held.
105553 @@ -1657,6 +1707,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
105554 fd_install(newfd, newfile);
105555 err = newfd;
105556
105557 + gr_attach_curr_ip(newsock->sk);
105558 +
105559 out_put:
105560 fput_light(sock->file, fput_needed);
105561 out:
105562 @@ -1689,6 +1741,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
105563 int, addrlen)
105564 {
105565 struct socket *sock;
105566 + struct sockaddr *sck;
105567 struct sockaddr_storage address;
105568 int err, fput_needed;
105569
105570 @@ -1699,6 +1752,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
105571 if (err < 0)
105572 goto out_put;
105573
105574 + sck = (struct sockaddr *)&address;
105575 +
105576 + if (gr_handle_sock_client(sck)) {
105577 + err = -EACCES;
105578 + goto out_put;
105579 + }
105580 +
105581 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
105582 + if (err)
105583 + goto out_put;
105584 +
105585 err =
105586 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
105587 if (err)
105588 @@ -1780,6 +1844,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
105589 * the protocol.
105590 */
105591
105592 +asmlinkage long sys_sendto(int, void __user *, size_t, unsigned, struct sockaddr __user *, int);
105593 +
105594 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
105595 unsigned int, flags, struct sockaddr __user *, addr,
105596 int, addr_len)
105597 @@ -1846,7 +1912,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
105598 struct socket *sock;
105599 struct iovec iov;
105600 struct msghdr msg;
105601 - struct sockaddr_storage address;
105602 + struct sockaddr_storage address = { };
105603 int err, err2;
105604 int fput_needed;
105605
105606 @@ -2075,7 +2141,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
105607 * checking falls down on this.
105608 */
105609 if (copy_from_user(ctl_buf,
105610 - (void __user __force *)msg_sys->msg_control,
105611 + (void __force_user *)msg_sys->msg_control,
105612 ctl_len))
105613 goto out_freectl;
105614 msg_sys->msg_control = ctl_buf;
105615 @@ -2226,7 +2292,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
105616 int err, total_len, len;
105617
105618 /* kernel mode address */
105619 - struct sockaddr_storage addr;
105620 + struct sockaddr_storage addr = { };
105621
105622 /* user mode address pointers */
105623 struct sockaddr __user *uaddr;
105624 @@ -2255,7 +2321,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
105625 /* Save the user-mode address (verify_iovec will change the
105626 * kernel msghdr to use the kernel address space)
105627 */
105628 - uaddr = (__force void __user *)msg_sys->msg_name;
105629 + uaddr = (void __force_user *)msg_sys->msg_name;
105630 uaddr_len = COMPAT_NAMELEN(msg);
105631 if (MSG_CMSG_COMPAT & flags)
105632 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
105633 @@ -2896,7 +2962,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
105634 ifr = compat_alloc_user_space(buf_size);
105635 rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
105636
105637 - if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
105638 + if (copy_in_user(ifr->ifr_name, ifr32->ifr_name, IFNAMSIZ))
105639 return -EFAULT;
105640
105641 if (put_user(convert_in ? rxnfc : compat_ptr(data),
105642 @@ -3007,7 +3073,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
105643 old_fs = get_fs();
105644 set_fs(KERNEL_DS);
105645 err = dev_ioctl(net, cmd,
105646 - (struct ifreq __user __force *) &kifr);
105647 + (struct ifreq __force_user *) &kifr);
105648 set_fs(old_fs);
105649
105650 return err;
105651 @@ -3100,7 +3166,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
105652
105653 old_fs = get_fs();
105654 set_fs(KERNEL_DS);
105655 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
105656 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
105657 set_fs(old_fs);
105658
105659 if (cmd == SIOCGIFMAP && !err) {
105660 @@ -3184,7 +3250,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
105661 ret |= get_user(rtdev, &(ur4->rt_dev));
105662 if (rtdev) {
105663 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
105664 - r4.rt_dev = (char __user __force *)devname;
105665 + r4.rt_dev = (char __force_user *)devname;
105666 devname[15] = 0;
105667 } else
105668 r4.rt_dev = NULL;
105669 @@ -3411,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
105670 int __user *uoptlen;
105671 int err;
105672
105673 - uoptval = (char __user __force *) optval;
105674 - uoptlen = (int __user __force *) optlen;
105675 + uoptval = (char __force_user *) optval;
105676 + uoptlen = (int __force_user *) optlen;
105677
105678 set_fs(KERNEL_DS);
105679 if (level == SOL_SOCKET)
105680 @@ -3432,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
105681 char __user *uoptval;
105682 int err;
105683
105684 - uoptval = (char __user __force *) optval;
105685 + uoptval = (char __force_user *) optval;
105686
105687 set_fs(KERNEL_DS);
105688 if (level == SOL_SOCKET)
105689 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
105690 index c548ab2..4e1b68b 100644
105691 --- a/net/sunrpc/auth_gss/svcauth_gss.c
105692 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
105693 @@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
105694 uint64_t *handle)
105695 {
105696 struct rsc rsci, *rscp = NULL;
105697 - static atomic64_t ctxhctr;
105698 + static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
105699 long long ctxh;
105700 struct gss_api_mech *gm = NULL;
105701 time_t expiry;
105702 @@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
105703 status = -ENOMEM;
105704 /* the handle needs to be just a unique id,
105705 * use a static counter */
105706 - ctxh = atomic64_inc_return(&ctxhctr);
105707 + ctxh = atomic64_inc_return_unchecked(&ctxhctr);
105708
105709 /* make a copy for the caller */
105710 *handle = ctxh;
105711 diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
105712 index 0663621..c4928d4 100644
105713 --- a/net/sunrpc/cache.c
105714 +++ b/net/sunrpc/cache.c
105715 @@ -1609,7 +1609,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
105716 struct sunrpc_net *sn;
105717
105718 sn = net_generic(net, sunrpc_net_id);
105719 - cd->u.procfs.proc_ent = proc_mkdir(cd->name, sn->proc_net_rpc);
105720 + cd->u.procfs.proc_ent = proc_mkdir_restrict(cd->name, sn->proc_net_rpc);
105721 if (cd->u.procfs.proc_ent == NULL)
105722 goto out_nomem;
105723 cd->u.procfs.channel_ent = NULL;
105724 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
105725 index 9acd6ce..4353a72 100644
105726 --- a/net/sunrpc/clnt.c
105727 +++ b/net/sunrpc/clnt.c
105728 @@ -1428,7 +1428,9 @@ call_start(struct rpc_task *task)
105729 (RPC_IS_ASYNC(task) ? "async" : "sync"));
105730
105731 /* Increment call count */
105732 - task->tk_msg.rpc_proc->p_count++;
105733 + pax_open_kernel();
105734 + (*(unsigned int *)&task->tk_msg.rpc_proc->p_count)++;
105735 + pax_close_kernel();
105736 clnt->cl_stats->rpccnt++;
105737 task->tk_action = call_reserve;
105738 }
105739 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
105740 index fe3441a..922c29e 100644
105741 --- a/net/sunrpc/sched.c
105742 +++ b/net/sunrpc/sched.c
105743 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)
105744 #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
105745 static void rpc_task_set_debuginfo(struct rpc_task *task)
105746 {
105747 - static atomic_t rpc_pid;
105748 + static atomic_unchecked_t rpc_pid;
105749
105750 - task->tk_pid = atomic_inc_return(&rpc_pid);
105751 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
105752 }
105753 #else
105754 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
105755 diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
105756 index 5453049..465669a 100644
105757 --- a/net/sunrpc/stats.c
105758 +++ b/net/sunrpc/stats.c
105759 @@ -267,7 +267,7 @@ int rpc_proc_init(struct net *net)
105760
105761 dprintk("RPC: registering /proc/net/rpc\n");
105762 sn = net_generic(net, sunrpc_net_id);
105763 - sn->proc_net_rpc = proc_mkdir("rpc", net->proc_net);
105764 + sn->proc_net_rpc = proc_mkdir_restrict("rpc", net->proc_net);
105765 if (sn->proc_net_rpc == NULL)
105766 return -ENOMEM;
105767
105768 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
105769 index ca8a795..ddfc41b 100644
105770 --- a/net/sunrpc/svc.c
105771 +++ b/net/sunrpc/svc.c
105772 @@ -1165,7 +1165,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
105773 svc_putnl(resv, RPC_SUCCESS);
105774
105775 /* Bump per-procedure stats counter */
105776 - procp->pc_count++;
105777 + pax_open_kernel();
105778 + (*(unsigned int *)&procp->pc_count)++;
105779 + pax_close_kernel();
105780
105781 /* Initialize storage for argp and resp */
105782 memset(rqstp->rq_argp, 0, procp->pc_argsize);
105783 diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
105784 index 621ca7b..59421dd 100644
105785 --- a/net/sunrpc/svcauth_unix.c
105786 +++ b/net/sunrpc/svcauth_unix.c
105787 @@ -414,7 +414,7 @@ struct unix_gid {
105788 struct group_info *gi;
105789 };
105790
105791 -static int unix_gid_hash(kuid_t uid)
105792 +static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
105793 {
105794 return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
105795 }
105796 @@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
105797 (*bpp)[-1] = '\n';
105798 }
105799
105800 -static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
105801 +static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
105802
105803 static int unix_gid_parse(struct cache_detail *cd,
105804 char *mesg, int mlen)
105805 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
105806 index c1b6270..05089c1 100644
105807 --- a/net/sunrpc/xprtrdma/svc_rdma.c
105808 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
105809 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
105810 static unsigned int min_max_inline = 4096;
105811 static unsigned int max_max_inline = 65536;
105812
105813 -atomic_t rdma_stat_recv;
105814 -atomic_t rdma_stat_read;
105815 -atomic_t rdma_stat_write;
105816 -atomic_t rdma_stat_sq_starve;
105817 -atomic_t rdma_stat_rq_starve;
105818 -atomic_t rdma_stat_rq_poll;
105819 -atomic_t rdma_stat_rq_prod;
105820 -atomic_t rdma_stat_sq_poll;
105821 -atomic_t rdma_stat_sq_prod;
105822 +atomic_unchecked_t rdma_stat_recv;
105823 +atomic_unchecked_t rdma_stat_read;
105824 +atomic_unchecked_t rdma_stat_write;
105825 +atomic_unchecked_t rdma_stat_sq_starve;
105826 +atomic_unchecked_t rdma_stat_rq_starve;
105827 +atomic_unchecked_t rdma_stat_rq_poll;
105828 +atomic_unchecked_t rdma_stat_rq_prod;
105829 +atomic_unchecked_t rdma_stat_sq_poll;
105830 +atomic_unchecked_t rdma_stat_sq_prod;
105831
105832 /* Temporary NFS request map and context caches */
105833 struct kmem_cache *svc_rdma_map_cachep;
105834 @@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
105835 len -= *ppos;
105836 if (len > *lenp)
105837 len = *lenp;
105838 - if (len && copy_to_user(buffer, str_buf, len))
105839 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
105840 return -EFAULT;
105841 *lenp = len;
105842 *ppos += len;
105843 @@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
105844 {
105845 .procname = "rdma_stat_read",
105846 .data = &rdma_stat_read,
105847 - .maxlen = sizeof(atomic_t),
105848 + .maxlen = sizeof(atomic_unchecked_t),
105849 .mode = 0644,
105850 .proc_handler = read_reset_stat,
105851 },
105852 {
105853 .procname = "rdma_stat_recv",
105854 .data = &rdma_stat_recv,
105855 - .maxlen = sizeof(atomic_t),
105856 + .maxlen = sizeof(atomic_unchecked_t),
105857 .mode = 0644,
105858 .proc_handler = read_reset_stat,
105859 },
105860 {
105861 .procname = "rdma_stat_write",
105862 .data = &rdma_stat_write,
105863 - .maxlen = sizeof(atomic_t),
105864 + .maxlen = sizeof(atomic_unchecked_t),
105865 .mode = 0644,
105866 .proc_handler = read_reset_stat,
105867 },
105868 {
105869 .procname = "rdma_stat_sq_starve",
105870 .data = &rdma_stat_sq_starve,
105871 - .maxlen = sizeof(atomic_t),
105872 + .maxlen = sizeof(atomic_unchecked_t),
105873 .mode = 0644,
105874 .proc_handler = read_reset_stat,
105875 },
105876 {
105877 .procname = "rdma_stat_rq_starve",
105878 .data = &rdma_stat_rq_starve,
105879 - .maxlen = sizeof(atomic_t),
105880 + .maxlen = sizeof(atomic_unchecked_t),
105881 .mode = 0644,
105882 .proc_handler = read_reset_stat,
105883 },
105884 {
105885 .procname = "rdma_stat_rq_poll",
105886 .data = &rdma_stat_rq_poll,
105887 - .maxlen = sizeof(atomic_t),
105888 + .maxlen = sizeof(atomic_unchecked_t),
105889 .mode = 0644,
105890 .proc_handler = read_reset_stat,
105891 },
105892 {
105893 .procname = "rdma_stat_rq_prod",
105894 .data = &rdma_stat_rq_prod,
105895 - .maxlen = sizeof(atomic_t),
105896 + .maxlen = sizeof(atomic_unchecked_t),
105897 .mode = 0644,
105898 .proc_handler = read_reset_stat,
105899 },
105900 {
105901 .procname = "rdma_stat_sq_poll",
105902 .data = &rdma_stat_sq_poll,
105903 - .maxlen = sizeof(atomic_t),
105904 + .maxlen = sizeof(atomic_unchecked_t),
105905 .mode = 0644,
105906 .proc_handler = read_reset_stat,
105907 },
105908 {
105909 .procname = "rdma_stat_sq_prod",
105910 .data = &rdma_stat_sq_prod,
105911 - .maxlen = sizeof(atomic_t),
105912 + .maxlen = sizeof(atomic_unchecked_t),
105913 .mode = 0644,
105914 .proc_handler = read_reset_stat,
105915 },
105916 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
105917 index e011027..9d3c4e1 100644
105918 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
105919 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
105920 @@ -220,7 +220,7 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
105921 *page_no = pg_no;
105922 *page_offset = pg_off;
105923 ret = read;
105924 - atomic_inc(&rdma_stat_read);
105925 + atomic_inc_unchecked(&rdma_stat_read);
105926 return ret;
105927 err:
105928 svc_rdma_unmap_dma(ctxt);
105929 @@ -356,7 +356,7 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
105930 *page_no = pg_no;
105931 *page_offset = pg_off;
105932 ret = read;
105933 - atomic_inc(&rdma_stat_read);
105934 + atomic_inc_unchecked(&rdma_stat_read);
105935 return ret;
105936 err:
105937 svc_rdma_unmap_dma(ctxt);
105938 @@ -540,7 +540,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
105939 dto_q);
105940 list_del_init(&ctxt->dto_q);
105941 } else {
105942 - atomic_inc(&rdma_stat_rq_starve);
105943 + atomic_inc_unchecked(&rdma_stat_rq_starve);
105944 clear_bit(XPT_DATA, &xprt->xpt_flags);
105945 ctxt = NULL;
105946 }
105947 @@ -559,7 +559,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
105948 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
105949 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
105950 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
105951 - atomic_inc(&rdma_stat_recv);
105952 + atomic_inc_unchecked(&rdma_stat_recv);
105953
105954 /* Build up the XDR from the receive buffers. */
105955 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
105956 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
105957 index 9f1b506..2e0b321 100644
105958 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
105959 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
105960 @@ -208,7 +208,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
105961 write_wr.wr.rdma.remote_addr = to;
105962
105963 /* Post It */
105964 - atomic_inc(&rdma_stat_write);
105965 + atomic_inc_unchecked(&rdma_stat_write);
105966 if (svc_rdma_send(xprt, &write_wr))
105967 goto err;
105968 return write_len - bc;
105969 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
105970 index 4e61880..1f0d963 100644
105971 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
105972 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
105973 @@ -295,7 +295,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
105974 return;
105975
105976 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
105977 - atomic_inc(&rdma_stat_rq_poll);
105978 + atomic_inc_unchecked(&rdma_stat_rq_poll);
105979
105980 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
105981 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
105982 @@ -317,7 +317,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
105983 }
105984
105985 if (ctxt)
105986 - atomic_inc(&rdma_stat_rq_prod);
105987 + atomic_inc_unchecked(&rdma_stat_rq_prod);
105988
105989 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
105990 /*
105991 @@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
105992 return;
105993
105994 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
105995 - atomic_inc(&rdma_stat_sq_poll);
105996 + atomic_inc_unchecked(&rdma_stat_sq_poll);
105997 while ((ret = ib_poll_cq(cq, ARRAY_SIZE(wc_a), wc_a)) > 0) {
105998 int i;
105999
106000 @@ -420,7 +420,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
106001 }
106002
106003 if (ctxt)
106004 - atomic_inc(&rdma_stat_sq_prod);
106005 + atomic_inc_unchecked(&rdma_stat_sq_prod);
106006 }
106007
106008 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
106009 @@ -1264,7 +1264,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
106010 spin_lock_bh(&xprt->sc_lock);
106011 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
106012 spin_unlock_bh(&xprt->sc_lock);
106013 - atomic_inc(&rdma_stat_sq_starve);
106014 + atomic_inc_unchecked(&rdma_stat_sq_starve);
106015
106016 /* See if we can opportunistically reap SQ WR to make room */
106017 sq_cq_reap(xprt);
106018 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
106019 index e7000be..e3b0ba7 100644
106020 --- a/net/sysctl_net.c
106021 +++ b/net/sysctl_net.c
106022 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
106023 kgid_t root_gid = make_kgid(net->user_ns, 0);
106024
106025 /* Allow network administrator to have same access as root. */
106026 - if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
106027 + if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
106028 uid_eq(root_uid, current_euid())) {
106029 int mode = (table->mode >> 6) & 7;
106030 return (mode << 6) | (mode << 3) | mode;
106031 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
106032 index 31b5cb2..566ff01 100644
106033 --- a/net/tipc/subscr.c
106034 +++ b/net/tipc/subscr.c
106035 @@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
106036 struct tipc_subscriber *subscriber = sub->subscriber;
106037 struct kvec msg_sect;
106038
106039 - msg_sect.iov_base = (void *)&sub->evt;
106040 + msg_sect.iov_base = &sub->evt;
106041 msg_sect.iov_len = sizeof(struct tipc_event);
106042 sub->evt.event = htohl(event, sub->swap);
106043 sub->evt.found_lower = htohl(found_lower, sub->swap);
106044 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
106045 index e968843..bc95776 100644
106046 --- a/net/unix/af_unix.c
106047 +++ b/net/unix/af_unix.c
106048 @@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
106049 err = -ECONNREFUSED;
106050 if (!S_ISSOCK(inode->i_mode))
106051 goto put_fail;
106052 +
106053 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
106054 + err = -EACCES;
106055 + goto put_fail;
106056 + }
106057 +
106058 u = unix_find_socket_byinode(inode);
106059 if (!u)
106060 goto put_fail;
106061 @@ -811,6 +817,13 @@ static struct sock *unix_find_other(struct net *net,
106062 if (u) {
106063 struct dentry *dentry;
106064 dentry = unix_sk(u)->path.dentry;
106065 +
106066 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
106067 + err = -EPERM;
106068 + sock_put(u);
106069 + goto fail;
106070 + }
106071 +
106072 if (dentry)
106073 touch_atime(&unix_sk(u)->path);
106074 } else
106075 @@ -844,12 +857,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
106076 */
106077 err = security_path_mknod(&path, dentry, mode, 0);
106078 if (!err) {
106079 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
106080 + err = -EACCES;
106081 + goto out;
106082 + }
106083 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
106084 if (!err) {
106085 res->mnt = mntget(path.mnt);
106086 res->dentry = dget(dentry);
106087 + gr_handle_create(dentry, path.mnt);
106088 }
106089 }
106090 +out:
106091 done_path_create(&path, dentry);
106092 return err;
106093 }
106094 @@ -2350,9 +2369,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
106095 seq_puts(seq, "Num RefCount Protocol Flags Type St "
106096 "Inode Path\n");
106097 else {
106098 - struct sock *s = v;
106099 + struct sock *s = v, *peer;
106100 struct unix_sock *u = unix_sk(s);
106101 unix_state_lock(s);
106102 + peer = unix_peer(s);
106103 + unix_state_unlock(s);
106104 +
106105 + unix_state_double_lock(s, peer);
106106
106107 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
106108 s,
106109 @@ -2379,8 +2402,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
106110 }
106111 for ( ; i < len; i++)
106112 seq_putc(seq, u->addr->name->sun_path[i]);
106113 - }
106114 - unix_state_unlock(s);
106115 + } else if (peer)
106116 + seq_printf(seq, " P%lu", sock_i_ino(peer));
106117 +
106118 + unix_state_double_unlock(s, peer);
106119 seq_putc(seq, '\n');
106120 }
106121
106122 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
106123 index b3d5150..ff3a837 100644
106124 --- a/net/unix/sysctl_net_unix.c
106125 +++ b/net/unix/sysctl_net_unix.c
106126 @@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
106127
106128 int __net_init unix_sysctl_register(struct net *net)
106129 {
106130 - struct ctl_table *table;
106131 + ctl_table_no_const *table;
106132
106133 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
106134 if (table == NULL)
106135 diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
106136 index 9b7f207..2596621 100644
106137 --- a/net/vmw_vsock/vmci_transport_notify.c
106138 +++ b/net/vmw_vsock/vmci_transport_notify.c
106139 @@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
106140
106141 /* Socket control packet based operations. */
106142 struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
106143 - vmci_transport_notify_pkt_socket_init,
106144 - vmci_transport_notify_pkt_socket_destruct,
106145 - vmci_transport_notify_pkt_poll_in,
106146 - vmci_transport_notify_pkt_poll_out,
106147 - vmci_transport_notify_pkt_handle_pkt,
106148 - vmci_transport_notify_pkt_recv_init,
106149 - vmci_transport_notify_pkt_recv_pre_block,
106150 - vmci_transport_notify_pkt_recv_pre_dequeue,
106151 - vmci_transport_notify_pkt_recv_post_dequeue,
106152 - vmci_transport_notify_pkt_send_init,
106153 - vmci_transport_notify_pkt_send_pre_block,
106154 - vmci_transport_notify_pkt_send_pre_enqueue,
106155 - vmci_transport_notify_pkt_send_post_enqueue,
106156 - vmci_transport_notify_pkt_process_request,
106157 - vmci_transport_notify_pkt_process_negotiate,
106158 + .socket_init = vmci_transport_notify_pkt_socket_init,
106159 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
106160 + .poll_in = vmci_transport_notify_pkt_poll_in,
106161 + .poll_out = vmci_transport_notify_pkt_poll_out,
106162 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
106163 + .recv_init = vmci_transport_notify_pkt_recv_init,
106164 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
106165 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
106166 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
106167 + .send_init = vmci_transport_notify_pkt_send_init,
106168 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
106169 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
106170 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
106171 + .process_request = vmci_transport_notify_pkt_process_request,
106172 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
106173 };
106174 diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
106175 index dc9c792..3089de0 100644
106176 --- a/net/vmw_vsock/vmci_transport_notify_qstate.c
106177 +++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
106178 @@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue(
106179
106180 /* Socket always on control packet based operations. */
106181 struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
106182 - vmci_transport_notify_pkt_socket_init,
106183 - vmci_transport_notify_pkt_socket_destruct,
106184 - vmci_transport_notify_pkt_poll_in,
106185 - vmci_transport_notify_pkt_poll_out,
106186 - vmci_transport_notify_pkt_handle_pkt,
106187 - vmci_transport_notify_pkt_recv_init,
106188 - vmci_transport_notify_pkt_recv_pre_block,
106189 - vmci_transport_notify_pkt_recv_pre_dequeue,
106190 - vmci_transport_notify_pkt_recv_post_dequeue,
106191 - vmci_transport_notify_pkt_send_init,
106192 - vmci_transport_notify_pkt_send_pre_block,
106193 - vmci_transport_notify_pkt_send_pre_enqueue,
106194 - vmci_transport_notify_pkt_send_post_enqueue,
106195 - vmci_transport_notify_pkt_process_request,
106196 - vmci_transport_notify_pkt_process_negotiate,
106197 + .socket_init = vmci_transport_notify_pkt_socket_init,
106198 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
106199 + .poll_in = vmci_transport_notify_pkt_poll_in,
106200 + .poll_out = vmci_transport_notify_pkt_poll_out,
106201 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
106202 + .recv_init = vmci_transport_notify_pkt_recv_init,
106203 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
106204 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
106205 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
106206 + .send_init = vmci_transport_notify_pkt_send_init,
106207 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
106208 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
106209 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
106210 + .process_request = vmci_transport_notify_pkt_process_request,
106211 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
106212 };
106213 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
106214 index c8717c1..08539f5 100644
106215 --- a/net/wireless/wext-core.c
106216 +++ b/net/wireless/wext-core.c
106217 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
106218 */
106219
106220 /* Support for very large requests */
106221 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
106222 - (user_length > descr->max_tokens)) {
106223 + if (user_length > descr->max_tokens) {
106224 /* Allow userspace to GET more than max so
106225 * we can support any size GET requests.
106226 * There is still a limit : -ENOMEM.
106227 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
106228 }
106229 }
106230
106231 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
106232 - /*
106233 - * If this is a GET, but not NOMAX, it means that the extra
106234 - * data is not bounded by userspace, but by max_tokens. Thus
106235 - * set the length to max_tokens. This matches the extra data
106236 - * allocation.
106237 - * The driver should fill it with the number of tokens it
106238 - * provided, and it may check iwp->length rather than having
106239 - * knowledge of max_tokens. If the driver doesn't change the
106240 - * iwp->length, this ioctl just copies back max_token tokens
106241 - * filled with zeroes. Hopefully the driver isn't claiming
106242 - * them to be valid data.
106243 - */
106244 - iwp->length = descr->max_tokens;
106245 - }
106246 -
106247 err = handler(dev, info, (union iwreq_data *) iwp, extra);
106248
106249 iwp->length += essid_compat;
106250 diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
106251 index 4323952..a06dfe1 100644
106252 --- a/net/x25/sysctl_net_x25.c
106253 +++ b/net/x25/sysctl_net_x25.c
106254 @@ -70,7 +70,7 @@ static struct ctl_table x25_table[] = {
106255 .mode = 0644,
106256 .proc_handler = proc_dointvec,
106257 },
106258 - { 0, },
106259 + { },
106260 };
106261
106262 void __init x25_register_sysctl(void)
106263 diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
106264 index 0917f04..f4e3d8c 100644
106265 --- a/net/x25/x25_proc.c
106266 +++ b/net/x25/x25_proc.c
106267 @@ -209,7 +209,7 @@ static const struct file_operations x25_seq_forward_fops = {
106268
106269 int __init x25_proc_init(void)
106270 {
106271 - if (!proc_mkdir("x25", init_net.proc_net))
106272 + if (!proc_mkdir_restrict("x25", init_net.proc_net))
106273 return -ENOMEM;
106274
106275 if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
106276 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
106277 index 88bf289..7b0741b 100644
106278 --- a/net/xfrm/xfrm_policy.c
106279 +++ b/net/xfrm/xfrm_policy.c
106280 @@ -330,7 +330,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
106281 {
106282 policy->walk.dead = 1;
106283
106284 - atomic_inc(&policy->genid);
106285 + atomic_inc_unchecked(&policy->genid);
106286
106287 if (del_timer(&policy->polq.hold_timer))
106288 xfrm_pol_put(policy);
106289 @@ -781,7 +781,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
106290 hlist_add_head(&policy->bydst, chain);
106291 xfrm_pol_hold(policy);
106292 net->xfrm.policy_count[dir]++;
106293 - atomic_inc(&net->xfrm.flow_cache_genid);
106294 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
106295
106296 /* After previous checking, family can either be AF_INET or AF_INET6 */
106297 if (policy->family == AF_INET)
106298 @@ -1871,7 +1871,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
106299
106300 xdst->num_pols = num_pols;
106301 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
106302 - xdst->policy_genid = atomic_read(&pols[0]->genid);
106303 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
106304
106305 return xdst;
106306 }
106307 @@ -2685,10 +2685,11 @@ void xfrm_garbage_collect(struct net *net)
106308 }
106309 EXPORT_SYMBOL(xfrm_garbage_collect);
106310
106311 -static void xfrm_garbage_collect_deferred(struct net *net)
106312 +void xfrm_garbage_collect_deferred(struct net *net)
106313 {
106314 flow_cache_flush_deferred(net);
106315 }
106316 +EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
106317
106318 static void xfrm_init_pmtu(struct dst_entry *dst)
106319 {
106320 @@ -2738,7 +2739,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
106321 if (xdst->xfrm_genid != dst->xfrm->genid)
106322 return 0;
106323 if (xdst->num_pols > 0 &&
106324 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
106325 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
106326 return 0;
106327
106328 mtu = dst_mtu(dst->child);
106329 @@ -2826,8 +2827,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
106330 dst_ops->link_failure = xfrm_link_failure;
106331 if (likely(dst_ops->neigh_lookup == NULL))
106332 dst_ops->neigh_lookup = xfrm_neigh_lookup;
106333 - if (likely(afinfo->garbage_collect == NULL))
106334 - afinfo->garbage_collect = xfrm_garbage_collect_deferred;
106335 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
106336 }
106337 spin_unlock(&xfrm_policy_afinfo_lock);
106338 @@ -2881,7 +2880,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
106339 dst_ops->check = NULL;
106340 dst_ops->negative_advice = NULL;
106341 dst_ops->link_failure = NULL;
106342 - afinfo->garbage_collect = NULL;
106343 }
106344 return err;
106345 }
106346 @@ -3277,7 +3275,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
106347 sizeof(pol->xfrm_vec[i].saddr));
106348 pol->xfrm_vec[i].encap_family = mp->new_family;
106349 /* flush bundles */
106350 - atomic_inc(&pol->genid);
106351 + atomic_inc_unchecked(&pol->genid);
106352 }
106353 }
106354
106355 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
106356 index de971b6..b843409 100644
106357 --- a/net/xfrm/xfrm_state.c
106358 +++ b/net/xfrm/xfrm_state.c
106359 @@ -166,12 +166,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
106360
106361 if (unlikely(afinfo == NULL))
106362 return -EAFNOSUPPORT;
106363 - typemap = afinfo->type_map;
106364 + typemap = (const struct xfrm_type **)afinfo->type_map;
106365 spin_lock_bh(&xfrm_type_lock);
106366
106367 - if (likely(typemap[type->proto] == NULL))
106368 + if (likely(typemap[type->proto] == NULL)) {
106369 + pax_open_kernel();
106370 typemap[type->proto] = type;
106371 - else
106372 + pax_close_kernel();
106373 + } else
106374 err = -EEXIST;
106375 spin_unlock_bh(&xfrm_type_lock);
106376 xfrm_state_put_afinfo(afinfo);
106377 @@ -187,13 +189,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
106378
106379 if (unlikely(afinfo == NULL))
106380 return -EAFNOSUPPORT;
106381 - typemap = afinfo->type_map;
106382 + typemap = (const struct xfrm_type **)afinfo->type_map;
106383 spin_lock_bh(&xfrm_type_lock);
106384
106385 if (unlikely(typemap[type->proto] != type))
106386 err = -ENOENT;
106387 - else
106388 + else {
106389 + pax_open_kernel();
106390 typemap[type->proto] = NULL;
106391 + pax_close_kernel();
106392 + }
106393 spin_unlock_bh(&xfrm_type_lock);
106394 xfrm_state_put_afinfo(afinfo);
106395 return err;
106396 @@ -203,7 +208,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
106397 static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
106398 {
106399 struct xfrm_state_afinfo *afinfo;
106400 - const struct xfrm_type **typemap;
106401 const struct xfrm_type *type;
106402 int modload_attempted = 0;
106403
106404 @@ -211,9 +215,8 @@ retry:
106405 afinfo = xfrm_state_get_afinfo(family);
106406 if (unlikely(afinfo == NULL))
106407 return NULL;
106408 - typemap = afinfo->type_map;
106409
106410 - type = typemap[proto];
106411 + type = afinfo->type_map[proto];
106412 if (unlikely(type && !try_module_get(type->owner)))
106413 type = NULL;
106414 if (!type && !modload_attempted) {
106415 @@ -247,7 +250,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
106416 return -EAFNOSUPPORT;
106417
106418 err = -EEXIST;
106419 - modemap = afinfo->mode_map;
106420 + modemap = (struct xfrm_mode **)afinfo->mode_map;
106421 spin_lock_bh(&xfrm_mode_lock);
106422 if (modemap[mode->encap])
106423 goto out;
106424 @@ -256,8 +259,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
106425 if (!try_module_get(afinfo->owner))
106426 goto out;
106427
106428 - mode->afinfo = afinfo;
106429 + pax_open_kernel();
106430 + *(const void **)&mode->afinfo = afinfo;
106431 modemap[mode->encap] = mode;
106432 + pax_close_kernel();
106433 err = 0;
106434
106435 out:
106436 @@ -281,10 +286,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
106437 return -EAFNOSUPPORT;
106438
106439 err = -ENOENT;
106440 - modemap = afinfo->mode_map;
106441 + modemap = (struct xfrm_mode **)afinfo->mode_map;
106442 spin_lock_bh(&xfrm_mode_lock);
106443 if (likely(modemap[mode->encap] == mode)) {
106444 + pax_open_kernel();
106445 modemap[mode->encap] = NULL;
106446 + pax_close_kernel();
106447 module_put(mode->afinfo->owner);
106448 err = 0;
106449 }
106450 @@ -1505,10 +1512,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
106451 u32 xfrm_get_acqseq(void)
106452 {
106453 u32 res;
106454 - static atomic_t acqseq;
106455 + static atomic_unchecked_t acqseq;
106456
106457 do {
106458 - res = atomic_inc_return(&acqseq);
106459 + res = atomic_inc_return_unchecked(&acqseq);
106460 } while (!res);
106461
106462 return res;
106463 diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
106464 index 05a6e3d..6716ec9 100644
106465 --- a/net/xfrm/xfrm_sysctl.c
106466 +++ b/net/xfrm/xfrm_sysctl.c
106467 @@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
106468
106469 int __net_init xfrm_sysctl_init(struct net *net)
106470 {
106471 - struct ctl_table *table;
106472 + ctl_table_no_const *table;
106473
106474 __xfrm_sysctl_init(net);
106475
106476 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
106477 index 649ce68..f6bc05c 100644
106478 --- a/scripts/Makefile.build
106479 +++ b/scripts/Makefile.build
106480 @@ -60,7 +60,7 @@ endif
106481 endif
106482
106483 # Do not include host rules unless needed
106484 -ifneq ($(hostprogs-y)$(hostprogs-m),)
106485 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
106486 include scripts/Makefile.host
106487 endif
106488
106489 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
106490 index b1c668d..638055f 100644
106491 --- a/scripts/Makefile.clean
106492 +++ b/scripts/Makefile.clean
106493 @@ -41,7 +41,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
106494 __clean-files := $(extra-y) $(extra-m) $(extra-) \
106495 $(always) $(targets) $(clean-files) \
106496 $(host-progs) \
106497 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
106498 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
106499 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
106500
106501 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
106502
106503 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
106504 index 133edfa..c9aa07f 100644
106505 --- a/scripts/Makefile.host
106506 +++ b/scripts/Makefile.host
106507 @@ -20,7 +20,19 @@
106508 # Will compile qconf as a C++ program, and menu as a C program.
106509 # They are linked as C++ code to the executable qconf
106510
106511 +# hostprogs-y := conf
106512 +# conf-objs := conf.o libkconfig.so
106513 +# libkconfig-objs := expr.o type.o
106514 +# Will create a shared library named libkconfig.so that consists of
106515 +# expr.o and type.o (they are both compiled as C code and the object files
106516 +# are made as position independent code).
106517 +# conf.c is compiled as a C program, and conf.o is linked together with
106518 +# libkconfig.so as the executable conf.
106519 +# Note: Shared libraries consisting of C++ files are not supported
106520 +
106521 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
106522 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
106523 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
106524
106525 # C code
106526 # Executables compiled from a single .c file
106527 @@ -42,6 +54,19 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
106528 # C++ Object (.o) files compiled from .cc files
106529 host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
106530
106531 +# Shared libaries (only .c supported)
106532 +# Shared libraries (.so) - all .so files referenced in "xxx-objs"
106533 +host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
106534 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
106535 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
106536 +# Remove .so files from "xxx-objs"
106537 +host-cobjs := $(filter-out %.so,$(host-cobjs))
106538 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
106539 +
106540 +# Object (.o) files used by the shared libaries
106541 +host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
106542 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
106543 +
106544 # output directory for programs/.o files
106545 # hostprogs-y := tools/build may have been specified.
106546 # Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
106547 @@ -56,6 +81,10 @@ host-cmulti := $(addprefix $(obj)/,$(host-cmulti))
106548 host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
106549 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
106550 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
106551 +host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
106552 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
106553 +host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
106554 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
106555 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
106556
106557 obj-dirs += $(host-objdirs)
106558 @@ -124,5 +153,37 @@ quiet_cmd_host-cxxobjs = HOSTCXX $@
106559 $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
106560 $(call if_changed_dep,host-cxxobjs)
106561
106562 +# Compile .c file, create position independent .o file
106563 +# host-cshobjs -> .o
106564 +quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
106565 + cmd_host-cshobjs = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
106566 +$(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
106567 + $(call if_changed_dep,host-cshobjs)
106568 +
106569 +# Compile .c file, create position independent .o file
106570 +# host-cxxshobjs -> .o
106571 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
106572 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
106573 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
106574 + $(call if_changed_dep,host-cxxshobjs)
106575 +
106576 +# Link a shared library, based on position independent .o files
106577 +# *.o -> .so shared library (host-cshlib)
106578 +quiet_cmd_host-cshlib = HOSTLLD -shared $@
106579 + cmd_host-cshlib = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
106580 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
106581 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
106582 +$(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
106583 + $(call if_changed,host-cshlib)
106584 +
106585 +# Link a shared library, based on position independent .o files
106586 +# *.o -> .so shared library (host-cxxshlib)
106587 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
106588 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
106589 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
106590 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
106591 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
106592 + $(call if_changed,host-cxxshlib)
106593 +
106594 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
106595 - $(host-cxxmulti) $(host-cxxobjs)
106596 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
106597 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
106598 index b304068..462d24e 100644
106599 --- a/scripts/basic/fixdep.c
106600 +++ b/scripts/basic/fixdep.c
106601 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
106602 /*
106603 * Lookup a value in the configuration string.
106604 */
106605 -static int is_defined_config(const char *name, int len, unsigned int hash)
106606 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
106607 {
106608 struct item *aux;
106609
106610 @@ -211,10 +211,10 @@ static void clear_config(void)
106611 /*
106612 * Record the use of a CONFIG_* word.
106613 */
106614 -static void use_config(const char *m, int slen)
106615 +static void use_config(const char *m, unsigned int slen)
106616 {
106617 unsigned int hash = strhash(m, slen);
106618 - int c, i;
106619 + unsigned int c, i;
106620
106621 if (is_defined_config(m, slen, hash))
106622 return;
106623 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
106624
106625 static void parse_config_file(const char *map, size_t len)
106626 {
106627 - const int *end = (const int *) (map + len);
106628 + const unsigned int *end = (const unsigned int *) (map + len);
106629 /* start at +1, so that p can never be < map */
106630 - const int *m = (const int *) map + 1;
106631 + const unsigned int *m = (const unsigned int *) map + 1;
106632 const char *p, *q;
106633
106634 for (; m < end; m++) {
106635 @@ -435,7 +435,7 @@ static void print_deps(void)
106636 static void traps(void)
106637 {
106638 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
106639 - int *p = (int *)test;
106640 + unsigned int *p = (unsigned int *)test;
106641
106642 if (*p != INT_CONF) {
106643 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
106644 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
106645 new file mode 100644
106646 index 0000000..42018ed
106647 --- /dev/null
106648 +++ b/scripts/gcc-plugin.sh
106649 @@ -0,0 +1,51 @@
106650 +#!/bin/sh
106651 +srctree=$(dirname "$0")
106652 +gccplugins_dir=$($3 -print-file-name=plugin)
106653 +plugincc=$($1 -E - -o /dev/null -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
106654 +#include "gcc-common.h"
106655 +#if BUILDING_GCC_VERSION >= 4008 || defined(ENABLE_BUILD_WITH_CXX)
106656 +#warning $2 CXX
106657 +#else
106658 +#warning $1 CC
106659 +#endif
106660 +EOF
106661 +)
106662 +
106663 +if [ $? -ne 0 ]
106664 +then
106665 + exit 1
106666 +fi
106667 +
106668 +case "$plugincc" in
106669 + *"$1 CC"*)
106670 + echo "$1"
106671 + exit 0
106672 + ;;
106673 +
106674 + *"$2 CXX"*)
106675 + # the c++ compiler needs another test, see below
106676 + ;;
106677 +
106678 + *)
106679 + exit 1
106680 + ;;
106681 +esac
106682 +
106683 +# we need a c++ compiler that supports the designated initializer GNU extension
106684 +plugincc=$($2 -c -x c++ -std=gnu++98 - -fsyntax-only -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
106685 +#include "gcc-common.h"
106686 +class test {
106687 +public:
106688 + int test;
106689 +} test = {
106690 + .test = 1
106691 +};
106692 +EOF
106693 +)
106694 +
106695 +if [ $? -eq 0 ]
106696 +then
106697 + echo "$2"
106698 + exit 0
106699 +fi
106700 +exit 1
106701 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
106702 index fdebd66..a349e33 100755
106703 --- a/scripts/headers_install.sh
106704 +++ b/scripts/headers_install.sh
106705 @@ -32,6 +32,7 @@ do
106706 FILE="$(basename "$i")"
106707 sed -r \
106708 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
106709 + -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
106710 -e 's/__attribute_const__([ \t]|$)/\1/g' \
106711 -e 's@^#include <linux/compiler.h>@@' \
106712 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
106713 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
106714 index 86a4fe7..99e91f9 100755
106715 --- a/scripts/link-vmlinux.sh
106716 +++ b/scripts/link-vmlinux.sh
106717 @@ -166,7 +166,7 @@ else
106718 fi;
106719
106720 # final build of init/
106721 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
106722 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
106723
106724 kallsymso=""
106725 kallsyms_vmlinux=""
106726 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
106727 index e614ef6..d9d2b01 100644
106728 --- a/scripts/mod/file2alias.c
106729 +++ b/scripts/mod/file2alias.c
106730 @@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
106731 unsigned long size, unsigned long id_size,
106732 void *symval)
106733 {
106734 - int i;
106735 + unsigned int i;
106736
106737 if (size % id_size || size < id_size) {
106738 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
106739 @@ -171,7 +171,7 @@ static void device_id_check(const char *modname, const char *device_id,
106740 /* USB is special because the bcdDevice can be matched against a numeric range */
106741 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
106742 static void do_usb_entry(void *symval,
106743 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
106744 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
106745 unsigned char range_lo, unsigned char range_hi,
106746 unsigned char max, struct module *mod)
106747 {
106748 @@ -281,7 +281,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
106749 {
106750 unsigned int devlo, devhi;
106751 unsigned char chi, clo, max;
106752 - int ndigits;
106753 + unsigned int ndigits;
106754
106755 DEF_FIELD(symval, usb_device_id, match_flags);
106756 DEF_FIELD(symval, usb_device_id, idVendor);
106757 @@ -534,7 +534,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
106758 for (i = 0; i < count; i++) {
106759 DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
106760 char acpi_id[sizeof(*id)];
106761 - int j;
106762 + unsigned int j;
106763
106764 buf_printf(&mod->dev_table_buf,
106765 "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
106766 @@ -563,7 +563,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
106767
106768 for (j = 0; j < PNP_MAX_DEVICES; j++) {
106769 const char *id = (char *)(*devs)[j].id;
106770 - int i2, j2;
106771 + unsigned int i2, j2;
106772 int dup = 0;
106773
106774 if (!id[0])
106775 @@ -589,7 +589,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
106776 /* add an individual alias for every device entry */
106777 if (!dup) {
106778 char acpi_id[PNP_ID_LEN];
106779 - int k;
106780 + unsigned int k;
106781
106782 buf_printf(&mod->dev_table_buf,
106783 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
106784 @@ -939,7 +939,7 @@ static void dmi_ascii_filter(char *d, const char *s)
106785 static int do_dmi_entry(const char *filename, void *symval,
106786 char *alias)
106787 {
106788 - int i, j;
106789 + unsigned int i, j;
106790 DEF_FIELD_ADDR(symval, dmi_system_id, matches);
106791 sprintf(alias, "dmi*");
106792
106793 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
106794 index d439856..10c1eac 100644
106795 --- a/scripts/mod/modpost.c
106796 +++ b/scripts/mod/modpost.c
106797 @@ -921,6 +921,7 @@ enum mismatch {
106798 ANY_INIT_TO_ANY_EXIT,
106799 ANY_EXIT_TO_ANY_INIT,
106800 EXPORT_TO_INIT_EXIT,
106801 + DATA_TO_TEXT
106802 };
106803
106804 struct sectioncheck {
106805 @@ -1007,6 +1008,12 @@ static const struct sectioncheck sectioncheck[] = {
106806 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
106807 .mismatch = EXPORT_TO_INIT_EXIT,
106808 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
106809 +},
106810 +/* Do not reference code from writable data */
106811 +{
106812 + .fromsec = { DATA_SECTIONS, NULL },
106813 + .tosec = { TEXT_SECTIONS, NULL },
106814 + .mismatch = DATA_TO_TEXT
106815 }
106816 };
106817
106818 @@ -1127,10 +1134,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
106819 continue;
106820 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
106821 continue;
106822 - if (sym->st_value == addr)
106823 - return sym;
106824 /* Find a symbol nearby - addr are maybe negative */
106825 d = sym->st_value - addr;
106826 + if (d == 0)
106827 + return sym;
106828 if (d < 0)
106829 d = addr - sym->st_value;
106830 if (d < distance) {
106831 @@ -1408,6 +1415,14 @@ static void report_sec_mismatch(const char *modname,
106832 tosym, prl_to, prl_to, tosym);
106833 free(prl_to);
106834 break;
106835 + case DATA_TO_TEXT:
106836 +#if 0
106837 + fprintf(stderr,
106838 + "The %s %s:%s references\n"
106839 + "the %s %s:%s%s\n",
106840 + from, fromsec, fromsym, to, tosec, tosym, to_p);
106841 +#endif
106842 + break;
106843 }
106844 fprintf(stderr, "\n");
106845 }
106846 @@ -1659,7 +1674,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
106847 static void check_sec_ref(struct module *mod, const char *modname,
106848 struct elf_info *elf)
106849 {
106850 - int i;
106851 + unsigned int i;
106852 Elf_Shdr *sechdrs = elf->sechdrs;
106853
106854 /* Walk through all sections */
106855 @@ -1790,7 +1805,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
106856 va_end(ap);
106857 }
106858
106859 -void buf_write(struct buffer *buf, const char *s, int len)
106860 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
106861 {
106862 if (buf->size - buf->pos < len) {
106863 buf->size += len + SZ;
106864 @@ -2009,7 +2024,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
106865 if (fstat(fileno(file), &st) < 0)
106866 goto close_write;
106867
106868 - if (st.st_size != b->pos)
106869 + if (st.st_size != (off_t)b->pos)
106870 goto close_write;
106871
106872 tmp = NOFAIL(malloc(b->pos));
106873 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
106874 index 168b43d..77914bf 100644
106875 --- a/scripts/mod/modpost.h
106876 +++ b/scripts/mod/modpost.h
106877 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
106878
106879 struct buffer {
106880 char *p;
106881 - int pos;
106882 - int size;
106883 + unsigned int pos;
106884 + unsigned int size;
106885 };
106886
106887 void __attribute__((format(printf, 2, 3)))
106888 buf_printf(struct buffer *buf, const char *fmt, ...);
106889
106890 void
106891 -buf_write(struct buffer *buf, const char *s, int len);
106892 +buf_write(struct buffer *buf, const char *s, unsigned int len);
106893
106894 struct module {
106895 struct module *next;
106896 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
106897 index 944418d..15291e4 100644
106898 --- a/scripts/mod/sumversion.c
106899 +++ b/scripts/mod/sumversion.c
106900 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
106901 goto out;
106902 }
106903
106904 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
106905 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
106906 warn("writing sum in %s failed: %s\n",
106907 filename, strerror(errno));
106908 goto out;
106909 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
106910 index 0865b3e..7235dd4 100644
106911 --- a/scripts/module-common.lds
106912 +++ b/scripts/module-common.lds
106913 @@ -6,6 +6,10 @@
106914 SECTIONS {
106915 /DISCARD/ : { *(.discard) }
106916
106917 + .rodata : {
106918 + *(.rodata) *(.rodata.*)
106919 + *(.data..read_only)
106920 + }
106921 __ksymtab : { *(SORT(___ksymtab+*)) }
106922 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
106923 __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
106924 diff --git a/scripts/package/Makefile b/scripts/package/Makefile
106925 index 99ca6e7..3a1a1a1 100644
106926 --- a/scripts/package/Makefile
106927 +++ b/scripts/package/Makefile
106928 @@ -46,7 +46,7 @@ rpm-pkg rpm: FORCE
106929 ln -sf $(srctree) $(KERNELPATH)
106930 $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
106931 $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
106932 - tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
106933 + tar --owner=root --group=root -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
106934 rm $(KERNELPATH)
106935 rm -f $(objtree)/.scmversion
106936 $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
106937 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
106938 index 5972624..4028795 100755
106939 --- a/scripts/package/builddeb
106940 +++ b/scripts/package/builddeb
106941 @@ -293,6 +293,7 @@ fi
106942 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
106943 (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
106944 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
106945 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
106946 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
106947 mkdir -p "$destdir"
106948 (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
106949 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
106950 index 1395760..bca2734 100755
106951 --- a/scripts/package/mkspec
106952 +++ b/scripts/package/mkspec
106953 @@ -121,29 +121,40 @@ echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
106954 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
106955 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\""
106956 echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
106957 -echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
106958 -echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
106959 -echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
106960
106961 echo ""
106962 echo "%clean"
106963 echo 'rm -rf $RPM_BUILD_ROOT'
106964 echo ""
106965 +echo "%pre"
106966 +echo 'chmod -f 0500 /boot'
106967 +echo 'if [ -d /lib/modules ]; then'
106968 +echo 'chmod -f 0500 /lib/modules'
106969 +echo 'fi'
106970 +echo 'if [ -d /lib32/modules ]; then'
106971 +echo 'chmod -f 0500 /lib32/modules'
106972 +echo 'fi'
106973 +echo 'if [ -d /lib64/modules ]; then'
106974 +echo 'chmod -f 0500 /lib64/modules'
106975 +echo 'fi'
106976 +echo ""
106977 +echo "%post devel"
106978 +echo "ln -sf /usr/src/kernels/$KERNELRELEASE /lib/modules/$KERNELRELEASE/build"
106979 +echo "ln -sf /usr/src/kernels/$KERNELRELEASE /lib/modules/$KERNELRELEASE/source"
106980 +echo ""
106981 echo "%post"
106982 -echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
106983 -echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm"
106984 -echo "cp /boot/System.map-$KERNELRELEASE /boot/System.map-$KERNELRELEASE-rpm"
106985 -echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
106986 -echo "/sbin/installkernel $KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
106987 -echo "rm -f /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
106988 +echo "if [ -x /sbin/dracut ]; then"
106989 +echo '/sbin/new-kernel-pkg --dracut --mkinitrd --depmod --install --make-default '"$KERNELRELEASE"' || exit $?'
106990 +echo "else"
106991 +echo '/sbin/new-kernel-pkg --mkinitrd --depmod --install --make-default '"$KERNELRELEASE"' || exit $?'
106992 echo "fi"
106993 echo ""
106994 echo "%files"
106995 -echo '%defattr (-, root, root)'
106996 +echo '%defattr (400, root, root, 500)'
106997 echo "%dir /lib/modules"
106998 -echo "/lib/modules/$KERNELRELEASE"
106999 echo "%exclude /lib/modules/$KERNELRELEASE/build"
107000 echo "%exclude /lib/modules/$KERNELRELEASE/source"
107001 +echo "/lib/modules/$KERNELRELEASE"
107002 echo "/lib/firmware/$KERNELRELEASE"
107003 echo "/boot/*"
107004 echo ""
107005 @@ -152,8 +163,7 @@ echo '%defattr (-, root, root)'
107006 echo "/usr/include"
107007 echo ""
107008 echo "%files devel"
107009 -echo '%defattr (-, root, root)'
107010 +echo '%defattr (400, root, root, 500)'
107011 +echo "%dir /lib/modules/$KERNELRELEASE"
107012 echo "/usr/src/kernels/$KERNELRELEASE"
107013 -echo "/lib/modules/$KERNELRELEASE/build"
107014 -echo "/lib/modules/$KERNELRELEASE/source"
107015 echo ""
107016 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
107017 index 4718d78..9220d58 100644
107018 --- a/scripts/pnmtologo.c
107019 +++ b/scripts/pnmtologo.c
107020 @@ -244,14 +244,14 @@ static void write_header(void)
107021 fprintf(out, " * Linux logo %s\n", logoname);
107022 fputs(" */\n\n", out);
107023 fputs("#include <linux/linux_logo.h>\n\n", out);
107024 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
107025 + fprintf(out, "static unsigned char %s_data[] = {\n",
107026 logoname);
107027 }
107028
107029 static void write_footer(void)
107030 {
107031 fputs("\n};\n\n", out);
107032 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
107033 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
107034 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
107035 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
107036 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
107037 @@ -381,7 +381,7 @@ static void write_logo_clut224(void)
107038 fputs("\n};\n\n", out);
107039
107040 /* write logo clut */
107041 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
107042 + fprintf(out, "static unsigned char %s_clut[] = {\n",
107043 logoname);
107044 write_hex_cnt = 0;
107045 for (i = 0; i < logo_clutsize; i++) {
107046 diff --git a/scripts/sortextable.h b/scripts/sortextable.h
107047 index ba87004..3f4852c 100644
107048 --- a/scripts/sortextable.h
107049 +++ b/scripts/sortextable.h
107050 @@ -108,9 +108,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
107051 const char *secstrtab;
107052 const char *strtab;
107053 char *extab_image;
107054 - int extab_index = 0;
107055 - int i;
107056 - int idx;
107057 + unsigned int extab_index = 0;
107058 + unsigned int i;
107059 + unsigned int idx;
107060 unsigned int num_sections;
107061 unsigned int secindex_strings;
107062
107063 diff --git a/scripts/tags.sh b/scripts/tags.sh
107064 index cdb491d..8d32bfc 100755
107065 --- a/scripts/tags.sh
107066 +++ b/scripts/tags.sh
107067 @@ -26,7 +26,7 @@ else
107068 fi
107069
107070 # ignore userspace tools
107071 -ignore="$ignore ( -path ${tree}tools ) -prune -o"
107072 +ignore="$ignore ( -path \"${tree}tools/[^g]*\" ) -prune -o"
107073
107074 # Find all available archs
107075 find_all_archs()
107076 diff --git a/security/Kconfig b/security/Kconfig
107077 index beb86b5..1a953b1 100644
107078 --- a/security/Kconfig
107079 +++ b/security/Kconfig
107080 @@ -4,6 +4,974 @@
107081
107082 menu "Security options"
107083
107084 +menu "Grsecurity"
107085 +
107086 + config ARCH_TRACK_EXEC_LIMIT
107087 + bool
107088 +
107089 + config PAX_KERNEXEC_PLUGIN
107090 + bool
107091 +
107092 + config PAX_PER_CPU_PGD
107093 + bool
107094 +
107095 + config TASK_SIZE_MAX_SHIFT
107096 + int
107097 + depends on X86_64
107098 + default 47 if !PAX_PER_CPU_PGD
107099 + default 42 if PAX_PER_CPU_PGD
107100 +
107101 + config PAX_ENABLE_PAE
107102 + bool
107103 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
107104 +
107105 + config PAX_USERCOPY_SLABS
107106 + bool
107107 +
107108 +config GRKERNSEC
107109 + bool "Grsecurity"
107110 + select CRYPTO
107111 + select CRYPTO_SHA256
107112 + select PROC_FS
107113 + select STOP_MACHINE
107114 + select TTY
107115 + select DEBUG_KERNEL
107116 + select DEBUG_LIST
107117 + help
107118 + If you say Y here, you will be able to configure many features
107119 + that will enhance the security of your system. It is highly
107120 + recommended that you say Y here and read through the help
107121 + for each option so that you fully understand the features and
107122 + can evaluate their usefulness for your machine.
107123 +
107124 +choice
107125 + prompt "Configuration Method"
107126 + depends on GRKERNSEC
107127 + default GRKERNSEC_CONFIG_CUSTOM
107128 + help
107129 +
107130 +config GRKERNSEC_CONFIG_AUTO
107131 + bool "Automatic"
107132 + help
107133 + If you choose this configuration method, you'll be able to answer a small
107134 + number of simple questions about how you plan to use this kernel.
107135 + The settings of grsecurity and PaX will be automatically configured for
107136 + the highest commonly-used settings within the provided constraints.
107137 +
107138 + If you require additional configuration, custom changes can still be made
107139 + from the "custom configuration" menu.
107140 +
107141 +config GRKERNSEC_CONFIG_CUSTOM
107142 + bool "Custom"
107143 + help
107144 + If you choose this configuration method, you'll be able to configure all
107145 + grsecurity and PaX settings manually. Via this method, no options are
107146 + automatically enabled.
107147 +
107148 +endchoice
107149 +
107150 +choice
107151 + prompt "Usage Type"
107152 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107153 + default GRKERNSEC_CONFIG_SERVER
107154 + help
107155 +
107156 +config GRKERNSEC_CONFIG_SERVER
107157 + bool "Server"
107158 + help
107159 + Choose this option if you plan to use this kernel on a server.
107160 +
107161 +config GRKERNSEC_CONFIG_DESKTOP
107162 + bool "Desktop"
107163 + help
107164 + Choose this option if you plan to use this kernel on a desktop.
107165 +
107166 +endchoice
107167 +
107168 +choice
107169 + prompt "Virtualization Type"
107170 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
107171 + default GRKERNSEC_CONFIG_VIRT_NONE
107172 + help
107173 +
107174 +config GRKERNSEC_CONFIG_VIRT_NONE
107175 + bool "None"
107176 + help
107177 + Choose this option if this kernel will be run on bare metal.
107178 +
107179 +config GRKERNSEC_CONFIG_VIRT_GUEST
107180 + bool "Guest"
107181 + help
107182 + Choose this option if this kernel will be run as a VM guest.
107183 +
107184 +config GRKERNSEC_CONFIG_VIRT_HOST
107185 + bool "Host"
107186 + help
107187 + Choose this option if this kernel will be run as a VM host.
107188 +
107189 +endchoice
107190 +
107191 +choice
107192 + prompt "Virtualization Hardware"
107193 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
107194 + help
107195 +
107196 +config GRKERNSEC_CONFIG_VIRT_EPT
107197 + bool "EPT/RVI Processor Support"
107198 + depends on X86
107199 + help
107200 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
107201 + hardware virtualization. This allows for additional kernel hardening protections
107202 + to operate without additional performance impact.
107203 +
107204 + To see if your Intel processor supports EPT, see:
107205 + http://ark.intel.com/Products/VirtualizationTechnology
107206 + (Most Core i3/5/7 support EPT)
107207 +
107208 + To see if your AMD processor supports RVI, see:
107209 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
107210 +
107211 +config GRKERNSEC_CONFIG_VIRT_SOFT
107212 + bool "First-gen/No Hardware Virtualization"
107213 + help
107214 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
107215 + support hardware virtualization or doesn't support the EPT/RVI extensions.
107216 +
107217 +endchoice
107218 +
107219 +choice
107220 + prompt "Virtualization Software"
107221 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
107222 + help
107223 +
107224 +config GRKERNSEC_CONFIG_VIRT_XEN
107225 + bool "Xen"
107226 + help
107227 + Choose this option if this kernel is running as a Xen guest or host.
107228 +
107229 +config GRKERNSEC_CONFIG_VIRT_VMWARE
107230 + bool "VMWare"
107231 + help
107232 + Choose this option if this kernel is running as a VMWare guest or host.
107233 +
107234 +config GRKERNSEC_CONFIG_VIRT_KVM
107235 + bool "KVM"
107236 + help
107237 + Choose this option if this kernel is running as a KVM guest or host.
107238 +
107239 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
107240 + bool "VirtualBox"
107241 + help
107242 + Choose this option if this kernel is running as a VirtualBox guest or host.
107243 +
107244 +config GRKERNSEC_CONFIG_VIRT_HYPERV
107245 + bool "Hyper-V"
107246 + help
107247 + Choose this option if this kernel is running as a Hyper-V guest.
107248 +
107249 +endchoice
107250 +
107251 +choice
107252 + prompt "Required Priorities"
107253 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107254 + default GRKERNSEC_CONFIG_PRIORITY_PERF
107255 + help
107256 +
107257 +config GRKERNSEC_CONFIG_PRIORITY_PERF
107258 + bool "Performance"
107259 + help
107260 + Choose this option if performance is of highest priority for this deployment
107261 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
107262 + clearing of structures intended for userland, and freed memory sanitizing will
107263 + be disabled.
107264 +
107265 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
107266 + bool "Security"
107267 + help
107268 + Choose this option if security is of highest priority for this deployment of
107269 + grsecurity. UDEREF, kernel stack clearing, clearing of structures intended
107270 + for userland, and freed memory sanitizing will be enabled for this kernel.
107271 + In a worst-case scenario, these features can introduce a 20% performance hit
107272 + (UDEREF on x64 contributing half of this hit).
107273 +
107274 +endchoice
107275 +
107276 +menu "Default Special Groups"
107277 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107278 +
107279 +config GRKERNSEC_PROC_GID
107280 + int "GID exempted from /proc restrictions"
107281 + default 1001
107282 + help
107283 + Setting this GID determines which group will be exempted from
107284 + grsecurity's /proc restrictions, allowing users of the specified
107285 + group to view network statistics and the existence of other users'
107286 + processes on the system. This GID may also be chosen at boot time
107287 + via "grsec_proc_gid=" on the kernel commandline.
107288 +
107289 +config GRKERNSEC_TPE_UNTRUSTED_GID
107290 + int "GID for TPE-untrusted users"
107291 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
107292 + default 1005
107293 + help
107294 + Setting this GID determines which group untrusted users should
107295 + be added to. These users will be placed under grsecurity's Trusted Path
107296 + Execution mechanism, preventing them from executing their own binaries.
107297 + The users will only be able to execute binaries in directories owned and
107298 + writable only by the root user. If the sysctl option is enabled, a sysctl
107299 + option with name "tpe_gid" is created.
107300 +
107301 +config GRKERNSEC_TPE_TRUSTED_GID
107302 + int "GID for TPE-trusted users"
107303 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
107304 + default 1005
107305 + help
107306 + Setting this GID determines what group TPE restrictions will be
107307 + *disabled* for. If the sysctl option is enabled, a sysctl option
107308 + with name "tpe_gid" is created.
107309 +
107310 +config GRKERNSEC_SYMLINKOWN_GID
107311 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
107312 + depends on GRKERNSEC_CONFIG_SERVER
107313 + default 1006
107314 + help
107315 + Setting this GID determines what group kernel-enforced
107316 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
107317 + is enabled, a sysctl option with name "symlinkown_gid" is created.
107318 +
107319 +
107320 +endmenu
107321 +
107322 +menu "Customize Configuration"
107323 +depends on GRKERNSEC
107324 +
107325 +menu "PaX"
107326 +
107327 +config PAX
107328 + bool "Enable various PaX features"
107329 + default y if GRKERNSEC_CONFIG_AUTO
107330 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
107331 + help
107332 + This allows you to enable various PaX features. PaX adds
107333 + intrusion prevention mechanisms to the kernel that reduce
107334 + the risks posed by exploitable memory corruption bugs.
107335 +
107336 +menu "PaX Control"
107337 + depends on PAX
107338 +
107339 +config PAX_SOFTMODE
107340 + bool 'Support soft mode'
107341 + help
107342 + Enabling this option will allow you to run PaX in soft mode, that
107343 + is, PaX features will not be enforced by default, only on executables
107344 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
107345 + support as they are the only way to mark executables for soft mode use.
107346 +
107347 + Soft mode can be activated by using the "pax_softmode=1" kernel command
107348 + line option on boot. Furthermore you can control various PaX features
107349 + at runtime via the entries in /proc/sys/kernel/pax.
107350 +
107351 +config PAX_EI_PAX
107352 + bool 'Use legacy ELF header marking'
107353 + default y if GRKERNSEC_CONFIG_AUTO
107354 + help
107355 + Enabling this option will allow you to control PaX features on
107356 + a per executable basis via the 'chpax' utility available at
107357 + http://pax.grsecurity.net/. The control flags will be read from
107358 + an otherwise reserved part of the ELF header. This marking has
107359 + numerous drawbacks (no support for soft-mode, toolchain does not
107360 + know about the non-standard use of the ELF header) therefore it
107361 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
107362 + support.
107363 +
107364 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
107365 + support as well, they will override the legacy EI_PAX marks.
107366 +
107367 + If you enable none of the marking options then all applications
107368 + will run with PaX enabled on them by default.
107369 +
107370 +config PAX_PT_PAX_FLAGS
107371 + bool 'Use ELF program header marking'
107372 + default y if GRKERNSEC_CONFIG_AUTO
107373 + help
107374 + Enabling this option will allow you to control PaX features on
107375 + a per executable basis via the 'paxctl' utility available at
107376 + http://pax.grsecurity.net/. The control flags will be read from
107377 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
107378 + has the benefits of supporting both soft mode and being fully
107379 + integrated into the toolchain (the binutils patch is available
107380 + from http://pax.grsecurity.net).
107381 +
107382 + Note that if you enable the legacy EI_PAX marking support as well,
107383 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
107384 +
107385 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
107386 + must make sure that the marks are the same if a binary has both marks.
107387 +
107388 + If you enable none of the marking options then all applications
107389 + will run with PaX enabled on them by default.
107390 +
107391 +config PAX_XATTR_PAX_FLAGS
107392 + bool 'Use filesystem extended attributes marking'
107393 + default y if GRKERNSEC_CONFIG_AUTO
107394 + select CIFS_XATTR if CIFS
107395 + select F2FS_FS_XATTR if F2FS_FS
107396 + select EXT2_FS_XATTR if EXT2_FS
107397 + select EXT3_FS_XATTR if EXT3_FS
107398 + select JFFS2_FS_XATTR if JFFS2_FS
107399 + select REISERFS_FS_XATTR if REISERFS_FS
107400 + select SQUASHFS_XATTR if SQUASHFS
107401 + select TMPFS_XATTR if TMPFS
107402 + help
107403 + Enabling this option will allow you to control PaX features on
107404 + a per executable basis via the 'setfattr' utility. The control
107405 + flags will be read from the user.pax.flags extended attribute of
107406 + the file. This marking has the benefit of supporting binary-only
107407 + applications that self-check themselves (e.g., skype) and would
107408 + not tolerate chpax/paxctl changes. The main drawback is that
107409 + extended attributes are not supported by some filesystems (e.g.,
107410 + isofs, udf, vfat) so copying files through such filesystems will
107411 + lose the extended attributes and these PaX markings.
107412 +
107413 + Note that if you enable the legacy EI_PAX marking support as well,
107414 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
107415 +
107416 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
107417 + must make sure that the marks are the same if a binary has both marks.
107418 +
107419 + If you enable none of the marking options then all applications
107420 + will run with PaX enabled on them by default.
107421 +
107422 +choice
107423 + prompt 'MAC system integration'
107424 + default PAX_HAVE_ACL_FLAGS
107425 + help
107426 + Mandatory Access Control systems have the option of controlling
107427 + PaX flags on a per executable basis, choose the method supported
107428 + by your particular system.
107429 +
107430 + - "none": if your MAC system does not interact with PaX,
107431 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
107432 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
107433 +
107434 + NOTE: this option is for developers/integrators only.
107435 +
107436 + config PAX_NO_ACL_FLAGS
107437 + bool 'none'
107438 +
107439 + config PAX_HAVE_ACL_FLAGS
107440 + bool 'direct'
107441 +
107442 + config PAX_HOOK_ACL_FLAGS
107443 + bool 'hook'
107444 +endchoice
107445 +
107446 +endmenu
107447 +
107448 +menu "Non-executable pages"
107449 + depends on PAX
107450 +
107451 +config PAX_NOEXEC
107452 + bool "Enforce non-executable pages"
107453 + default y if GRKERNSEC_CONFIG_AUTO
107454 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
107455 + help
107456 + By design some architectures do not allow for protecting memory
107457 + pages against execution or even if they do, Linux does not make
107458 + use of this feature. In practice this means that if a page is
107459 + readable (such as the stack or heap) it is also executable.
107460 +
107461 + There is a well known exploit technique that makes use of this
107462 + fact and a common programming mistake where an attacker can
107463 + introduce code of his choice somewhere in the attacked program's
107464 + memory (typically the stack or the heap) and then execute it.
107465 +
107466 + If the attacked program was running with different (typically
107467 + higher) privileges than that of the attacker, then he can elevate
107468 + his own privilege level (e.g. get a root shell, write to files for
107469 + which he does not have write access to, etc).
107470 +
107471 + Enabling this option will let you choose from various features
107472 + that prevent the injection and execution of 'foreign' code in
107473 + a program.
107474 +
107475 + This will also break programs that rely on the old behaviour and
107476 + expect that dynamically allocated memory via the malloc() family
107477 + of functions is executable (which it is not). Notable examples
107478 + are the XFree86 4.x server, the java runtime and wine.
107479 +
107480 +config PAX_PAGEEXEC
107481 + bool "Paging based non-executable pages"
107482 + default y if GRKERNSEC_CONFIG_AUTO
107483 + 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)
107484 + select ARCH_TRACK_EXEC_LIMIT if X86_32
107485 + help
107486 + This implementation is based on the paging feature of the CPU.
107487 + On i386 without hardware non-executable bit support there is a
107488 + variable but usually low performance impact, however on Intel's
107489 + P4 core based CPUs it is very high so you should not enable this
107490 + for kernels meant to be used on such CPUs.
107491 +
107492 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
107493 + with hardware non-executable bit support there is no performance
107494 + impact, on ppc the impact is negligible.
107495 +
107496 + Note that several architectures require various emulations due to
107497 + badly designed userland ABIs, this will cause a performance impact
107498 + but will disappear as soon as userland is fixed. For example, ppc
107499 + userland MUST have been built with secure-plt by a recent toolchain.
107500 +
107501 +config PAX_SEGMEXEC
107502 + bool "Segmentation based non-executable pages"
107503 + default y if GRKERNSEC_CONFIG_AUTO
107504 + depends on PAX_NOEXEC && X86_32
107505 + help
107506 + This implementation is based on the segmentation feature of the
107507 + CPU and has a very small performance impact, however applications
107508 + will be limited to a 1.5 GB address space instead of the normal
107509 + 3 GB.
107510 +
107511 +config PAX_EMUTRAMP
107512 + bool "Emulate trampolines"
107513 + default y if PARISC || GRKERNSEC_CONFIG_AUTO
107514 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
107515 + help
107516 + There are some programs and libraries that for one reason or
107517 + another attempt to execute special small code snippets from
107518 + non-executable memory pages. Most notable examples are the
107519 + signal handler return code generated by the kernel itself and
107520 + the GCC trampolines.
107521 +
107522 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
107523 + such programs will no longer work under your kernel.
107524 +
107525 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
107526 + utilities to enable trampoline emulation for the affected programs
107527 + yet still have the protection provided by the non-executable pages.
107528 +
107529 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
107530 + your system will not even boot.
107531 +
107532 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
107533 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
107534 + for the affected files.
107535 +
107536 + NOTE: enabling this feature *may* open up a loophole in the
107537 + protection provided by non-executable pages that an attacker
107538 + could abuse. Therefore the best solution is to not have any
107539 + files on your system that would require this option. This can
107540 + be achieved by not using libc5 (which relies on the kernel
107541 + signal handler return code) and not using or rewriting programs
107542 + that make use of the nested function implementation of GCC.
107543 + Skilled users can just fix GCC itself so that it implements
107544 + nested function calls in a way that does not interfere with PaX.
107545 +
107546 +config PAX_EMUSIGRT
107547 + bool "Automatically emulate sigreturn trampolines"
107548 + depends on PAX_EMUTRAMP && PARISC
107549 + default y
107550 + help
107551 + Enabling this option will have the kernel automatically detect
107552 + and emulate signal return trampolines executing on the stack
107553 + that would otherwise lead to task termination.
107554 +
107555 + This solution is intended as a temporary one for users with
107556 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
107557 + Modula-3 runtime, etc) or executables linked to such, basically
107558 + everything that does not specify its own SA_RESTORER function in
107559 + normal executable memory like glibc 2.1+ does.
107560 +
107561 + On parisc you MUST enable this option, otherwise your system will
107562 + not even boot.
107563 +
107564 + NOTE: this feature cannot be disabled on a per executable basis
107565 + and since it *does* open up a loophole in the protection provided
107566 + by non-executable pages, the best solution is to not have any
107567 + files on your system that would require this option.
107568 +
107569 +config PAX_MPROTECT
107570 + bool "Restrict mprotect()"
107571 + default y if GRKERNSEC_CONFIG_AUTO
107572 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
107573 + help
107574 + Enabling this option will prevent programs from
107575 + - changing the executable status of memory pages that were
107576 + not originally created as executable,
107577 + - making read-only executable pages writable again,
107578 + - creating executable pages from anonymous memory,
107579 + - making read-only-after-relocations (RELRO) data pages writable again.
107580 +
107581 + You should say Y here to complete the protection provided by
107582 + the enforcement of non-executable pages.
107583 +
107584 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
107585 + this feature on a per file basis.
107586 +
107587 +config PAX_MPROTECT_COMPAT
107588 + bool "Use legacy/compat protection demoting (read help)"
107589 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
107590 + depends on PAX_MPROTECT
107591 + help
107592 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
107593 + by sending the proper error code to the application. For some broken
107594 + userland, this can cause problems with Python or other applications. The
107595 + current implementation however allows for applications like clamav to
107596 + detect if JIT compilation/execution is allowed and to fall back gracefully
107597 + to an interpreter-based mode if it does not. While we encourage everyone
107598 + to use the current implementation as-is and push upstream to fix broken
107599 + userland (note that the RWX logging option can assist with this), in some
107600 + environments this may not be possible. Having to disable MPROTECT
107601 + completely on certain binaries reduces the security benefit of PaX,
107602 + so this option is provided for those environments to revert to the old
107603 + behavior.
107604 +
107605 +config PAX_ELFRELOCS
107606 + bool "Allow ELF text relocations (read help)"
107607 + depends on PAX_MPROTECT
107608 + default n
107609 + help
107610 + Non-executable pages and mprotect() restrictions are effective
107611 + in preventing the introduction of new executable code into an
107612 + attacked task's address space. There remain only two venues
107613 + for this kind of attack: if the attacker can execute already
107614 + existing code in the attacked task then he can either have it
107615 + create and mmap() a file containing his code or have it mmap()
107616 + an already existing ELF library that does not have position
107617 + independent code in it and use mprotect() on it to make it
107618 + writable and copy his code there. While protecting against
107619 + the former approach is beyond PaX, the latter can be prevented
107620 + by having only PIC ELF libraries on one's system (which do not
107621 + need to relocate their code). If you are sure this is your case,
107622 + as is the case with all modern Linux distributions, then leave
107623 + this option disabled. You should say 'n' here.
107624 +
107625 +config PAX_ETEXECRELOCS
107626 + bool "Allow ELF ET_EXEC text relocations"
107627 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
107628 + select PAX_ELFRELOCS
107629 + default y
107630 + help
107631 + On some architectures there are incorrectly created applications
107632 + that require text relocations and would not work without enabling
107633 + this option. If you are an alpha, ia64 or parisc user, you should
107634 + enable this option and disable it once you have made sure that
107635 + none of your applications need it.
107636 +
107637 +config PAX_EMUPLT
107638 + bool "Automatically emulate ELF PLT"
107639 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
107640 + default y
107641 + help
107642 + Enabling this option will have the kernel automatically detect
107643 + and emulate the Procedure Linkage Table entries in ELF files.
107644 + On some architectures such entries are in writable memory, and
107645 + become non-executable leading to task termination. Therefore
107646 + it is mandatory that you enable this option on alpha, parisc,
107647 + sparc and sparc64, otherwise your system would not even boot.
107648 +
107649 + NOTE: this feature *does* open up a loophole in the protection
107650 + provided by the non-executable pages, therefore the proper
107651 + solution is to modify the toolchain to produce a PLT that does
107652 + not need to be writable.
107653 +
107654 +config PAX_DLRESOLVE
107655 + bool 'Emulate old glibc resolver stub'
107656 + depends on PAX_EMUPLT && SPARC
107657 + default n
107658 + help
107659 + This option is needed if userland has an old glibc (before 2.4)
107660 + that puts a 'save' instruction into the runtime generated resolver
107661 + stub that needs special emulation.
107662 +
107663 +config PAX_KERNEXEC
107664 + bool "Enforce non-executable kernel pages"
107665 + 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))
107666 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
107667 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
107668 + select PAX_KERNEXEC_PLUGIN if X86_64
107669 + help
107670 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
107671 + that is, enabling this option will make it harder to inject
107672 + and execute 'foreign' code in kernel memory itself.
107673 +
107674 + Note that on amd64, CONFIG_EFI enabled with "efi=old_map" on
107675 + the kernel command-line will result in an RWX physical map.
107676 +
107677 + Likewise, the EFI runtime services are necessarily mapped as
107678 + RWX. If CONFIG_EFI is enabled on an EFI-capable system, it
107679 + is recommended that you boot with "noefi" on the kernel
107680 + command-line if possible to eliminate the mapping.
107681 +
107682 +choice
107683 + prompt "Return Address Instrumentation Method"
107684 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
107685 + depends on PAX_KERNEXEC_PLUGIN
107686 + help
107687 + Select the method used to instrument function pointer dereferences.
107688 + Note that binary modules cannot be instrumented by this approach.
107689 +
107690 + Note that the implementation requires a gcc with plugin support,
107691 + i.e., gcc 4.5 or newer. You may need to install the supporting
107692 + headers explicitly in addition to the normal gcc package.
107693 +
107694 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
107695 + bool "bts"
107696 + help
107697 + This method is compatible with binary only modules but has
107698 + a higher runtime overhead.
107699 +
107700 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
107701 + bool "or"
107702 + depends on !PARAVIRT
107703 + help
107704 + This method is incompatible with binary only modules but has
107705 + a lower runtime overhead.
107706 +endchoice
107707 +
107708 +config PAX_KERNEXEC_PLUGIN_METHOD
107709 + string
107710 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
107711 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
107712 + default ""
107713 +
107714 +config PAX_KERNEXEC_MODULE_TEXT
107715 + int "Minimum amount of memory reserved for module code"
107716 + default "8" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
107717 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
107718 + depends on PAX_KERNEXEC && X86_32
107719 + help
107720 + Due to implementation details the kernel must reserve a fixed
107721 + amount of memory for runtime allocated code (such as modules)
107722 + at compile time that cannot be changed at runtime. Here you
107723 + can specify the minimum amount in MB that will be reserved.
107724 + Due to the same implementation details this size will always
107725 + be rounded up to the next 2/4 MB boundary (depends on PAE) so
107726 + the actually available memory for runtime allocated code will
107727 + usually be more than this minimum.
107728 +
107729 + The default 4 MB should be enough for most users but if you have
107730 + an excessive number of modules (e.g., most distribution configs
107731 + compile many drivers as modules) or use huge modules such as
107732 + nvidia's kernel driver, you will need to adjust this amount.
107733 + A good rule of thumb is to look at your currently loaded kernel
107734 + modules and add up their sizes.
107735 +
107736 +endmenu
107737 +
107738 +menu "Address Space Layout Randomization"
107739 + depends on PAX
107740 +
107741 +config PAX_ASLR
107742 + bool "Address Space Layout Randomization"
107743 + default y if GRKERNSEC_CONFIG_AUTO
107744 + help
107745 + Many if not most exploit techniques rely on the knowledge of
107746 + certain addresses in the attacked program. The following options
107747 + will allow the kernel to apply a certain amount of randomization
107748 + to specific parts of the program thereby forcing an attacker to
107749 + guess them in most cases. Any failed guess will most likely crash
107750 + the attacked program which allows the kernel to detect such attempts
107751 + and react on them. PaX itself provides no reaction mechanisms,
107752 + instead it is strongly encouraged that you make use of grsecurity's
107753 + (http://www.grsecurity.net/) built-in crash detection features or
107754 + develop one yourself.
107755 +
107756 + By saying Y here you can choose to randomize the following areas:
107757 + - top of the task's kernel stack
107758 + - top of the task's userland stack
107759 + - base address for mmap() requests that do not specify one
107760 + (this includes all libraries)
107761 + - base address of the main executable
107762 +
107763 + It is strongly recommended to say Y here as address space layout
107764 + randomization has negligible impact on performance yet it provides
107765 + a very effective protection.
107766 +
107767 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
107768 + this feature on a per file basis.
107769 +
107770 +config PAX_RANDKSTACK
107771 + bool "Randomize kernel stack base"
107772 + default y if GRKERNSEC_CONFIG_AUTO && !(GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_VIRTUALBOX)
107773 + depends on X86_TSC && X86
107774 + help
107775 + By saying Y here the kernel will randomize every task's kernel
107776 + stack on every system call. This will not only force an attacker
107777 + to guess it but also prevent him from making use of possible
107778 + leaked information about it.
107779 +
107780 + Since the kernel stack is a rather scarce resource, randomization
107781 + may cause unexpected stack overflows, therefore you should very
107782 + carefully test your system. Note that once enabled in the kernel
107783 + configuration, this feature cannot be disabled on a per file basis.
107784 +
107785 +config PAX_RANDUSTACK
107786 + bool
107787 +
107788 +config PAX_RANDMMAP
107789 + bool "Randomize user stack and mmap() bases"
107790 + default y if GRKERNSEC_CONFIG_AUTO
107791 + depends on PAX_ASLR
107792 + select PAX_RANDUSTACK
107793 + help
107794 + By saying Y here the kernel will randomize every task's userland
107795 + stack and use a randomized base address for mmap() requests that
107796 + do not specify one themselves.
107797 +
107798 + The stack randomization is done in two steps where the second
107799 + one may apply a big amount of shift to the top of the stack and
107800 + cause problems for programs that want to use lots of memory (more
107801 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
107802 +
107803 + As a result of mmap randomization all dynamically loaded libraries
107804 + will appear at random addresses and therefore be harder to exploit
107805 + by a technique where an attacker attempts to execute library code
107806 + for his purposes (e.g. spawn a shell from an exploited program that
107807 + is running at an elevated privilege level).
107808 +
107809 + Furthermore, if a program is relinked as a dynamic ELF file, its
107810 + base address will be randomized as well, completing the full
107811 + randomization of the address space layout. Attacking such programs
107812 + becomes a guess game. You can find an example of doing this at
107813 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
107814 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
107815 +
107816 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
107817 + feature on a per file basis.
107818 +
107819 +endmenu
107820 +
107821 +menu "Miscellaneous hardening features"
107822 +
107823 +config PAX_MEMORY_SANITIZE
107824 + bool "Sanitize all freed memory"
107825 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
107826 + help
107827 + By saying Y here the kernel will erase memory pages and slab objects
107828 + as soon as they are freed. This in turn reduces the lifetime of data
107829 + stored in them, making it less likely that sensitive information such
107830 + as passwords, cryptographic secrets, etc stay in memory for too long.
107831 +
107832 + This is especially useful for programs whose runtime is short, long
107833 + lived processes and the kernel itself benefit from this as long as
107834 + they ensure timely freeing of memory that may hold sensitive
107835 + information.
107836 +
107837 + A nice side effect of the sanitization of slab objects is the
107838 + reduction of possible info leaks caused by padding bytes within the
107839 + leaky structures. Use-after-free bugs for structures containing
107840 + pointers can also be detected as dereferencing the sanitized pointer
107841 + will generate an access violation.
107842 +
107843 + The tradeoff is performance impact, on a single CPU system kernel
107844 + compilation sees a 3% slowdown, other systems and workloads may vary
107845 + and you are advised to test this feature on your expected workload
107846 + before deploying it.
107847 +
107848 + The slab sanitization feature excludes a few slab caches per default
107849 + for performance reasons. To extend the feature to cover those as
107850 + well, pass "pax_sanitize_slab=full" as kernel command line parameter.
107851 +
107852 + To reduce the performance penalty by sanitizing pages only, albeit
107853 + limiting the effectiveness of this feature at the same time, slab
107854 + sanitization can be disabled with the kernel command line parameter
107855 + "pax_sanitize_slab=off".
107856 +
107857 + Note that this feature does not protect data stored in live pages,
107858 + e.g., process memory swapped to disk may stay there for a long time.
107859 +
107860 +config PAX_MEMORY_STACKLEAK
107861 + bool "Sanitize kernel stack"
107862 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
107863 + depends on X86
107864 + help
107865 + By saying Y here the kernel will erase the kernel stack before it
107866 + returns from a system call. This in turn reduces the information
107867 + that a kernel stack leak bug can reveal.
107868 +
107869 + Note that such a bug can still leak information that was put on
107870 + the stack by the current system call (the one eventually triggering
107871 + the bug) but traces of earlier system calls on the kernel stack
107872 + cannot leak anymore.
107873 +
107874 + The tradeoff is performance impact: on a single CPU system kernel
107875 + compilation sees a 1% slowdown, other systems and workloads may vary
107876 + and you are advised to test this feature on your expected workload
107877 + before deploying it.
107878 +
107879 + Note that the full feature requires a gcc with plugin support,
107880 + i.e., gcc 4.5 or newer. You may need to install the supporting
107881 + headers explicitly in addition to the normal gcc package. Using
107882 + older gcc versions means that functions with large enough stack
107883 + frames may leave uninitialized memory behind that may be exposed
107884 + to a later syscall leaking the stack.
107885 +
107886 +config PAX_MEMORY_STRUCTLEAK
107887 + bool "Forcibly initialize local variables copied to userland"
107888 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
107889 + help
107890 + By saying Y here the kernel will zero initialize some local
107891 + variables that are going to be copied to userland. This in
107892 + turn prevents unintended information leakage from the kernel
107893 + stack should later code forget to explicitly set all parts of
107894 + the copied variable.
107895 +
107896 + The tradeoff is less performance impact than PAX_MEMORY_STACKLEAK
107897 + at a much smaller coverage.
107898 +
107899 + Note that the implementation requires a gcc with plugin support,
107900 + i.e., gcc 4.5 or newer. You may need to install the supporting
107901 + headers explicitly in addition to the normal gcc package.
107902 +
107903 +config PAX_MEMORY_UDEREF
107904 + bool "Prevent invalid userland pointer dereference"
107905 + default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
107906 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
107907 + select PAX_PER_CPU_PGD if X86_64
107908 + help
107909 + By saying Y here the kernel will be prevented from dereferencing
107910 + userland pointers in contexts where the kernel expects only kernel
107911 + pointers. This is both a useful runtime debugging feature and a
107912 + security measure that prevents exploiting a class of kernel bugs.
107913 +
107914 + The tradeoff is that some virtualization solutions may experience
107915 + a huge slowdown and therefore you should not enable this feature
107916 + for kernels meant to run in such environments. Whether a given VM
107917 + solution is affected or not is best determined by simply trying it
107918 + out, the performance impact will be obvious right on boot as this
107919 + mechanism engages from very early on. A good rule of thumb is that
107920 + VMs running on CPUs without hardware virtualization support (i.e.,
107921 + the majority of IA-32 CPUs) will likely experience the slowdown.
107922 +
107923 + On X86_64 the kernel will make use of PCID support when available
107924 + (Intel's Westmere, Sandy Bridge, etc) for better security (default)
107925 + or performance impact. Pass pax_weakuderef on the kernel command
107926 + line to choose the latter.
107927 +
107928 +config PAX_REFCOUNT
107929 + bool "Prevent various kernel object reference counter overflows"
107930 + default y if GRKERNSEC_CONFIG_AUTO
107931 + depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || PPC || SPARC64 || X86)
107932 + help
107933 + By saying Y here the kernel will detect and prevent overflowing
107934 + various (but not all) kinds of object reference counters. Such
107935 + overflows can normally occur due to bugs only and are often, if
107936 + not always, exploitable.
107937 +
107938 + The tradeoff is that data structures protected by an overflowed
107939 + refcount will never be freed and therefore will leak memory. Note
107940 + that this leak also happens even without this protection but in
107941 + that case the overflow can eventually trigger the freeing of the
107942 + data structure while it is still being used elsewhere, resulting
107943 + in the exploitable situation that this feature prevents.
107944 +
107945 + Since this has a negligible performance impact, you should enable
107946 + this feature.
107947 +
107948 +config PAX_CONSTIFY_PLUGIN
107949 + bool "Automatically constify eligible structures"
107950 + default y
107951 + depends on !UML && PAX_KERNEXEC
107952 + help
107953 + By saying Y here the compiler will automatically constify a class
107954 + of types that contain only function pointers. This reduces the
107955 + kernel's attack surface and also produces a better memory layout.
107956 +
107957 + Note that the implementation requires a gcc with plugin support,
107958 + i.e., gcc 4.5 or newer. You may need to install the supporting
107959 + headers explicitly in addition to the normal gcc package.
107960 +
107961 + Note that if some code really has to modify constified variables
107962 + then the source code will have to be patched to allow it. Examples
107963 + can be found in PaX itself (the no_const attribute) and for some
107964 + out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
107965 +
107966 +config PAX_USERCOPY
107967 + bool "Harden heap object copies between kernel and userland"
107968 + default y if GRKERNSEC_CONFIG_AUTO
107969 + depends on ARM || IA64 || PPC || SPARC || X86
107970 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
107971 + select PAX_USERCOPY_SLABS
107972 + help
107973 + By saying Y here the kernel will enforce the size of heap objects
107974 + when they are copied in either direction between the kernel and
107975 + userland, even if only a part of the heap object is copied.
107976 +
107977 + Specifically, this checking prevents information leaking from the
107978 + kernel heap during kernel to userland copies (if the kernel heap
107979 + object is otherwise fully initialized) and prevents kernel heap
107980 + overflows during userland to kernel copies.
107981 +
107982 + Note that the current implementation provides the strictest bounds
107983 + checks for the SLUB allocator.
107984 +
107985 + Enabling this option also enables per-slab cache protection against
107986 + data in a given cache being copied into/out of via userland
107987 + accessors. Though the whitelist of regions will be reduced over
107988 + time, it notably protects important data structures like task structs.
107989 +
107990 + If frame pointers are enabled on x86, this option will also restrict
107991 + copies into and out of the kernel stack to local variables within a
107992 + single frame.
107993 +
107994 + Since this has a negligible performance impact, you should enable
107995 + this feature.
107996 +
107997 +config PAX_USERCOPY_DEBUG
107998 + bool
107999 + depends on X86 && PAX_USERCOPY
108000 + default n
108001 +
108002 +config PAX_SIZE_OVERFLOW
108003 + bool "Prevent various integer overflows in function size parameters"
108004 + default y if GRKERNSEC_CONFIG_AUTO
108005 + depends on X86
108006 + help
108007 + By saying Y here the kernel recomputes expressions of function
108008 + arguments marked by a size_overflow attribute with double integer
108009 + precision (DImode/TImode for 32/64 bit integer types).
108010 +
108011 + The recomputed argument is checked against TYPE_MAX and an event
108012 + is logged on overflow and the triggering process is killed.
108013 +
108014 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
108015 +
108016 + Note that the implementation requires a gcc with plugin support,
108017 + i.e., gcc 4.5 or newer. You may need to install the supporting
108018 + headers explicitly in addition to the normal gcc package.
108019 +
108020 +config PAX_LATENT_ENTROPY
108021 + bool "Generate some entropy during boot and runtime"
108022 + default y if GRKERNSEC_CONFIG_AUTO
108023 + help
108024 + By saying Y here the kernel will instrument some kernel code to
108025 + extract some entropy from both original and artificially created
108026 + program state. This will help especially embedded systems where
108027 + there is little 'natural' source of entropy normally. The cost
108028 + is some slowdown of the boot process and fork and irq processing.
108029 +
108030 + When pax_extra_latent_entropy is passed on the kernel command line,
108031 + entropy will be extracted from up to the first 4GB of RAM while the
108032 + runtime memory allocator is being initialized. This costs even more
108033 + slowdown of the boot process.
108034 +
108035 + Note that the implementation requires a gcc with plugin support,
108036 + i.e., gcc 4.5 or newer. You may need to install the supporting
108037 + headers explicitly in addition to the normal gcc package.
108038 +
108039 + Note that entropy extracted this way is not cryptographically
108040 + secure!
108041 +
108042 +endmenu
108043 +
108044 +endmenu
108045 +
108046 +source grsecurity/Kconfig
108047 +
108048 +endmenu
108049 +
108050 +endmenu
108051 +
108052 source security/keys/Kconfig
108053
108054 config SECURITY_DMESG_RESTRICT
108055 @@ -103,7 +1071,7 @@ config INTEL_TXT
108056 config LSM_MMAP_MIN_ADDR
108057 int "Low address space for LSM to protect from user allocation"
108058 depends on SECURITY && SECURITY_SELINUX
108059 - default 32768 if ARM || (ARM64 && COMPAT)
108060 + default 32768 if ALPHA || ARM || (ARM64 && COMPAT) || PARISC || SPARC32
108061 default 65536
108062 help
108063 This is the portion of low virtual memory which should be protected
108064 diff --git a/security/apparmor/file.c b/security/apparmor/file.c
108065 index fdaa50c..2761dcb 100644
108066 --- a/security/apparmor/file.c
108067 +++ b/security/apparmor/file.c
108068 @@ -348,8 +348,8 @@ static inline bool xindex_is_subset(u32 link, u32 target)
108069 int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
108070 struct path *new_dir, struct dentry *new_dentry)
108071 {
108072 - struct path link = { new_dir->mnt, new_dentry };
108073 - struct path target = { new_dir->mnt, old_dentry };
108074 + struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };
108075 + struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry };
108076 struct path_cond cond = {
108077 old_dentry->d_inode->i_uid,
108078 old_dentry->d_inode->i_mode
108079 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
108080 index 65ca451..ad6f22d 100644
108081 --- a/security/apparmor/lsm.c
108082 +++ b/security/apparmor/lsm.c
108083 @@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
108084 struct dentry *dentry, u32 mask,
108085 struct path_cond *cond)
108086 {
108087 - struct path path = { dir->mnt, dentry };
108088 + struct path path = { .mnt = dir->mnt, .dentry = dentry };
108089
108090 return common_perm(op, &path, mask, cond);
108091 }
108092 @@ -203,7 +203,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
108093 static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
108094 struct dentry *dentry, u32 mask)
108095 {
108096 - struct path path = { mnt, dentry };
108097 + struct path path = { .mnt = mnt, .dentry = dentry };
108098 struct path_cond cond = { dentry->d_inode->i_uid,
108099 dentry->d_inode->i_mode
108100 };
108101 @@ -325,8 +325,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
108102
108103 profile = aa_current_profile();
108104 if (!unconfined(profile)) {
108105 - struct path old_path = { old_dir->mnt, old_dentry };
108106 - struct path new_path = { new_dir->mnt, new_dentry };
108107 + struct path old_path = { .mnt = old_dir->mnt, .dentry = old_dentry };
108108 + struct path new_path = { .mnt = new_dir->mnt, .dentry = new_dentry };
108109 struct path_cond cond = { old_dentry->d_inode->i_uid,
108110 old_dentry->d_inode->i_mode
108111 };
108112 @@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
108113 return error;
108114 }
108115
108116 -static struct security_operations apparmor_ops = {
108117 +static struct security_operations apparmor_ops __read_only = {
108118 .name = "apparmor",
108119
108120 .ptrace_access_check = apparmor_ptrace_access_check,
108121 diff --git a/security/commoncap.c b/security/commoncap.c
108122 index bab0611..f9a0ff5 100644
108123 --- a/security/commoncap.c
108124 +++ b/security/commoncap.c
108125 @@ -427,6 +427,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
108126 return 0;
108127 }
108128
108129 +/* returns:
108130 + 1 for suid privilege
108131 + 2 for sgid privilege
108132 + 3 for fscap privilege
108133 +*/
108134 +int is_privileged_binary(const struct dentry *dentry)
108135 +{
108136 + struct cpu_vfs_cap_data capdata;
108137 + struct inode *inode = dentry->d_inode;
108138 +
108139 + if (!inode || S_ISDIR(inode->i_mode))
108140 + return 0;
108141 +
108142 + if (inode->i_mode & S_ISUID)
108143 + return 1;
108144 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
108145 + return 2;
108146 +
108147 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
108148 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
108149 + return 3;
108150 + }
108151 +
108152 + return 0;
108153 +}
108154 +
108155 /*
108156 * Attempt to get the on-exec apply capability sets for an executable file from
108157 * its xattrs and, if present, apply them to the proposed credentials being
108158 @@ -595,6 +621,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
108159 const struct cred *cred = current_cred();
108160 kuid_t root_uid = make_kuid(cred->user_ns, 0);
108161
108162 + if (gr_acl_enable_at_secure())
108163 + return 1;
108164 +
108165 if (!uid_eq(cred->uid, root_uid)) {
108166 if (bprm->cap_effective)
108167 return 1;
108168 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
108169 index 8ee997d..24c174b 100644
108170 --- a/security/integrity/ima/ima.h
108171 +++ b/security/integrity/ima/ima.h
108172 @@ -116,8 +116,8 @@ int ima_init_template(void);
108173 extern spinlock_t ima_queue_lock;
108174
108175 struct ima_h_table {
108176 - atomic_long_t len; /* number of stored measurements in the list */
108177 - atomic_long_t violations;
108178 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
108179 + atomic_long_unchecked_t violations;
108180 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
108181 };
108182 extern struct ima_h_table ima_htable;
108183 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
108184 index 8688597..9fa80d2 100644
108185 --- a/security/integrity/ima/ima_api.c
108186 +++ b/security/integrity/ima/ima_api.c
108187 @@ -137,7 +137,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
108188 int result;
108189
108190 /* can overflow, only indicator */
108191 - atomic_long_inc(&ima_htable.violations);
108192 + atomic_long_inc_unchecked(&ima_htable.violations);
108193
108194 result = ima_alloc_init_template(NULL, file, filename,
108195 NULL, 0, &entry);
108196 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
108197 index da92fcc..8a5d390 100644
108198 --- a/security/integrity/ima/ima_fs.c
108199 +++ b/security/integrity/ima/ima_fs.c
108200 @@ -28,12 +28,12 @@
108201 static int valid_policy = 1;
108202 #define TMPBUFLEN 12
108203 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
108204 - loff_t *ppos, atomic_long_t *val)
108205 + loff_t *ppos, atomic_long_unchecked_t *val)
108206 {
108207 char tmpbuf[TMPBUFLEN];
108208 ssize_t len;
108209
108210 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
108211 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
108212 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
108213 }
108214
108215 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
108216 index 552705d..9920f4fb 100644
108217 --- a/security/integrity/ima/ima_queue.c
108218 +++ b/security/integrity/ima/ima_queue.c
108219 @@ -83,7 +83,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
108220 INIT_LIST_HEAD(&qe->later);
108221 list_add_tail_rcu(&qe->later, &ima_measurements);
108222
108223 - atomic_long_inc(&ima_htable.len);
108224 + atomic_long_inc_unchecked(&ima_htable.len);
108225 key = ima_hash_key(entry->digest);
108226 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
108227 return 0;
108228 diff --git a/security/keys/compat.c b/security/keys/compat.c
108229 index 3478965..ec7bb9e 100644
108230 --- a/security/keys/compat.c
108231 +++ b/security/keys/compat.c
108232 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
108233 if (ret == 0)
108234 goto no_payload_free;
108235
108236 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
108237 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
108238 err:
108239 if (iov != iovstack)
108240 kfree(iov);
108241 diff --git a/security/keys/internal.h b/security/keys/internal.h
108242 index 200e378..cdc74b5 100644
108243 --- a/security/keys/internal.h
108244 +++ b/security/keys/internal.h
108245 @@ -244,7 +244,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
108246 extern long keyctl_invalidate_key(key_serial_t);
108247
108248 extern long keyctl_instantiate_key_common(key_serial_t,
108249 - const struct iovec *,
108250 + const struct iovec __user *,
108251 unsigned, size_t, key_serial_t);
108252 #ifdef CONFIG_PERSISTENT_KEYRINGS
108253 extern long keyctl_get_persistent(uid_t, key_serial_t);
108254 diff --git a/security/keys/key.c b/security/keys/key.c
108255 index e17ba6a..2cc04a6 100644
108256 --- a/security/keys/key.c
108257 +++ b/security/keys/key.c
108258 @@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
108259
108260 atomic_set(&key->usage, 1);
108261 init_rwsem(&key->sem);
108262 - lockdep_set_class(&key->sem, &type->lock_class);
108263 + lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
108264 key->index_key.type = type;
108265 key->user = user;
108266 key->quotalen = quotalen;
108267 @@ -1075,7 +1075,9 @@ int register_key_type(struct key_type *ktype)
108268 struct key_type *p;
108269 int ret;
108270
108271 - memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
108272 + pax_open_kernel();
108273 + memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
108274 + pax_close_kernel();
108275
108276 ret = -EEXIST;
108277 down_write(&key_types_sem);
108278 @@ -1087,7 +1089,7 @@ int register_key_type(struct key_type *ktype)
108279 }
108280
108281 /* store the type */
108282 - list_add(&ktype->link, &key_types_list);
108283 + pax_list_add((struct list_head *)&ktype->link, &key_types_list);
108284
108285 pr_notice("Key type %s registered\n", ktype->name);
108286 ret = 0;
108287 @@ -1109,7 +1111,7 @@ EXPORT_SYMBOL(register_key_type);
108288 void unregister_key_type(struct key_type *ktype)
108289 {
108290 down_write(&key_types_sem);
108291 - list_del_init(&ktype->link);
108292 + pax_list_del_init((struct list_head *)&ktype->link);
108293 downgrade_write(&key_types_sem);
108294 key_gc_keytype(ktype);
108295 pr_notice("Key type %s unregistered\n", ktype->name);
108296 @@ -1127,10 +1129,10 @@ void __init key_init(void)
108297 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
108298
108299 /* add the special key types */
108300 - list_add_tail(&key_type_keyring.link, &key_types_list);
108301 - list_add_tail(&key_type_dead.link, &key_types_list);
108302 - list_add_tail(&key_type_user.link, &key_types_list);
108303 - list_add_tail(&key_type_logon.link, &key_types_list);
108304 + pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
108305 + pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
108306 + pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
108307 + pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
108308
108309 /* record the root user tracking */
108310 rb_link_node(&root_key_user.node,
108311 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
108312 index 4743d71..170a185 100644
108313 --- a/security/keys/keyctl.c
108314 +++ b/security/keys/keyctl.c
108315 @@ -1000,7 +1000,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
108316 /*
108317 * Copy the iovec data from userspace
108318 */
108319 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
108320 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
108321 unsigned ioc)
108322 {
108323 for (; ioc > 0; ioc--) {
108324 @@ -1022,7 +1022,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
108325 * If successful, 0 will be returned.
108326 */
108327 long keyctl_instantiate_key_common(key_serial_t id,
108328 - const struct iovec *payload_iov,
108329 + const struct iovec __user *payload_iov,
108330 unsigned ioc,
108331 size_t plen,
108332 key_serial_t ringid)
108333 @@ -1117,7 +1117,7 @@ long keyctl_instantiate_key(key_serial_t id,
108334 [0].iov_len = plen
108335 };
108336
108337 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
108338 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
108339 }
108340
108341 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
108342 @@ -1150,7 +1150,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
108343 if (ret == 0)
108344 goto no_payload_free;
108345
108346 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
108347 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
108348 err:
108349 if (iov != iovstack)
108350 kfree(iov);
108351 diff --git a/security/min_addr.c b/security/min_addr.c
108352 index f728728..6457a0c 100644
108353 --- a/security/min_addr.c
108354 +++ b/security/min_addr.c
108355 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
108356 */
108357 static void update_mmap_min_addr(void)
108358 {
108359 +#ifndef SPARC
108360 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
108361 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
108362 mmap_min_addr = dac_mmap_min_addr;
108363 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
108364 #else
108365 mmap_min_addr = dac_mmap_min_addr;
108366 #endif
108367 +#endif
108368 }
108369
108370 /*
108371 diff --git a/security/security.c b/security/security.c
108372 index 18b35c6..c9fbc92 100644
108373 --- a/security/security.c
108374 +++ b/security/security.c
108375 @@ -33,8 +33,8 @@
108376 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
108377 CONFIG_DEFAULT_SECURITY;
108378
108379 -static struct security_operations *security_ops;
108380 -static struct security_operations default_security_ops = {
108381 +struct security_operations *security_ops __read_only;
108382 +struct security_operations default_security_ops __read_only = {
108383 .name = "default",
108384 };
108385
108386 @@ -73,11 +73,6 @@ int __init security_init(void)
108387 return 0;
108388 }
108389
108390 -void reset_security_ops(void)
108391 -{
108392 - security_ops = &default_security_ops;
108393 -}
108394 -
108395 /* Save user chosen LSM */
108396 static int __init choose_lsm(char *str)
108397 {
108398 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
108399 index a18f1fa..c9b9fc4 100644
108400 --- a/security/selinux/avc.c
108401 +++ b/security/selinux/avc.c
108402 @@ -59,7 +59,7 @@ struct avc_node {
108403 struct avc_cache {
108404 struct hlist_head slots[AVC_CACHE_SLOTS]; /* head for avc_node->list */
108405 spinlock_t slots_lock[AVC_CACHE_SLOTS]; /* lock for writes */
108406 - atomic_t lru_hint; /* LRU hint for reclaim scan */
108407 + atomic_unchecked_t lru_hint; /* LRU hint for reclaim scan */
108408 atomic_t active_nodes;
108409 u32 latest_notif; /* latest revocation notification */
108410 };
108411 @@ -167,7 +167,7 @@ void __init avc_init(void)
108412 spin_lock_init(&avc_cache.slots_lock[i]);
108413 }
108414 atomic_set(&avc_cache.active_nodes, 0);
108415 - atomic_set(&avc_cache.lru_hint, 0);
108416 + atomic_set_unchecked(&avc_cache.lru_hint, 0);
108417
108418 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
108419 0, SLAB_PANIC, NULL);
108420 @@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
108421 spinlock_t *lock;
108422
108423 for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
108424 - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
108425 + hvalue = atomic_inc_return_unchecked(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
108426 head = &avc_cache.slots[hvalue];
108427 lock = &avc_cache.slots_lock[hvalue];
108428
108429 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
108430 index c603b20..8716ec9 100644
108431 --- a/security/selinux/hooks.c
108432 +++ b/security/selinux/hooks.c
108433 @@ -95,8 +95,6 @@
108434 #include "audit.h"
108435 #include "avc_ss.h"
108436
108437 -extern struct security_operations *security_ops;
108438 -
108439 /* SECMARK reference count */
108440 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
108441
108442 @@ -5809,7 +5807,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
108443
108444 #endif
108445
108446 -static struct security_operations selinux_ops = {
108447 +static struct security_operations selinux_ops __read_only = {
108448 .name = "selinux",
108449
108450 .ptrace_access_check = selinux_ptrace_access_check,
108451 @@ -6150,6 +6148,9 @@ static void selinux_nf_ip_exit(void)
108452 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
108453 static int selinux_disabled;
108454
108455 +extern struct security_operations *security_ops;
108456 +extern struct security_operations default_security_ops;
108457 +
108458 int selinux_disable(void)
108459 {
108460 if (ss_initialized) {
108461 @@ -6167,7 +6168,9 @@ int selinux_disable(void)
108462 selinux_disabled = 1;
108463 selinux_enabled = 0;
108464
108465 - reset_security_ops();
108466 + pax_open_kernel();
108467 + security_ops = &default_security_ops;
108468 + pax_close_kernel();
108469
108470 /* Try to destroy the avc node cache */
108471 avc_disable();
108472 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
108473 index 1450f85..a91e0bc 100644
108474 --- a/security/selinux/include/xfrm.h
108475 +++ b/security/selinux/include/xfrm.h
108476 @@ -48,7 +48,7 @@ static inline void selinux_xfrm_notify_policyload(void)
108477
108478 rtnl_lock();
108479 for_each_net(net) {
108480 - atomic_inc(&net->xfrm.flow_cache_genid);
108481 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
108482 rt_genid_bump_all(net);
108483 }
108484 rtnl_unlock();
108485 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
108486 index d515ec2..8a4ca71 100644
108487 --- a/security/smack/smack_lsm.c
108488 +++ b/security/smack/smack_lsm.c
108489 @@ -4079,7 +4079,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
108490 return 0;
108491 }
108492
108493 -struct security_operations smack_ops = {
108494 +struct security_operations smack_ops __read_only = {
108495 .name = "smack",
108496
108497 .ptrace_access_check = smack_ptrace_access_check,
108498 diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
108499 index 4003907..13a2b55 100644
108500 --- a/security/tomoyo/file.c
108501 +++ b/security/tomoyo/file.c
108502 @@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
108503 {
108504 struct tomoyo_request_info r;
108505 struct tomoyo_obj_info obj = {
108506 - .path1 = *path,
108507 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108508 };
108509 int error = -ENOMEM;
108510 struct tomoyo_path_info buf;
108511 @@ -740,7 +740,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
108512 struct tomoyo_path_info buf;
108513 struct tomoyo_request_info r;
108514 struct tomoyo_obj_info obj = {
108515 - .path1 = *path,
108516 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108517 };
108518 int idx;
108519
108520 @@ -786,7 +786,7 @@ int tomoyo_path_perm(const u8 operation, struct path *path, const char *target)
108521 {
108522 struct tomoyo_request_info r;
108523 struct tomoyo_obj_info obj = {
108524 - .path1 = *path,
108525 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108526 };
108527 int error;
108528 struct tomoyo_path_info buf;
108529 @@ -843,7 +843,7 @@ int tomoyo_mkdev_perm(const u8 operation, struct path *path,
108530 {
108531 struct tomoyo_request_info r;
108532 struct tomoyo_obj_info obj = {
108533 - .path1 = *path,
108534 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108535 };
108536 int error = -ENOMEM;
108537 struct tomoyo_path_info buf;
108538 @@ -890,8 +890,8 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
108539 struct tomoyo_path_info buf2;
108540 struct tomoyo_request_info r;
108541 struct tomoyo_obj_info obj = {
108542 - .path1 = *path1,
108543 - .path2 = *path2,
108544 + .path1 = { .mnt = path1->mnt, .dentry = path1->dentry },
108545 + .path2 = { .mnt = path2->mnt, .dentry = path2->dentry }
108546 };
108547 int idx;
108548
108549 diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
108550 index 390c646..f2f8db3 100644
108551 --- a/security/tomoyo/mount.c
108552 +++ b/security/tomoyo/mount.c
108553 @@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
108554 type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
108555 need_dev = -1; /* dev_name is a directory */
108556 } else {
108557 + if (!capable(CAP_SYS_ADMIN)) {
108558 + error = -EPERM;
108559 + goto out;
108560 + }
108561 fstype = get_fs_type(type);
108562 if (!fstype) {
108563 error = -ENODEV;
108564 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
108565 index f0b756e..8aa497b 100644
108566 --- a/security/tomoyo/tomoyo.c
108567 +++ b/security/tomoyo/tomoyo.c
108568 @@ -146,7 +146,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm)
108569 */
108570 static int tomoyo_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
108571 {
108572 - struct path path = { mnt, dentry };
108573 + struct path path = { .mnt = mnt, .dentry = dentry };
108574 return tomoyo_path_perm(TOMOYO_TYPE_GETATTR, &path, NULL);
108575 }
108576
108577 @@ -172,7 +172,7 @@ static int tomoyo_path_truncate(struct path *path)
108578 */
108579 static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
108580 {
108581 - struct path path = { parent->mnt, dentry };
108582 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108583 return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
108584 }
108585
108586 @@ -188,7 +188,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
108587 static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
108588 umode_t mode)
108589 {
108590 - struct path path = { parent->mnt, dentry };
108591 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108592 return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
108593 mode & S_IALLUGO);
108594 }
108595 @@ -203,7 +203,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
108596 */
108597 static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
108598 {
108599 - struct path path = { parent->mnt, dentry };
108600 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108601 return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);
108602 }
108603
108604 @@ -219,7 +219,7 @@ static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
108605 static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
108606 const char *old_name)
108607 {
108608 - struct path path = { parent->mnt, dentry };
108609 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108610 return tomoyo_path_perm(TOMOYO_TYPE_SYMLINK, &path, old_name);
108611 }
108612
108613 @@ -236,7 +236,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
108614 static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
108615 umode_t mode, unsigned int dev)
108616 {
108617 - struct path path = { parent->mnt, dentry };
108618 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108619 int type = TOMOYO_TYPE_CREATE;
108620 const unsigned int perm = mode & S_IALLUGO;
108621
108622 @@ -275,8 +275,8 @@ static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
108623 static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
108624 struct dentry *new_dentry)
108625 {
108626 - struct path path1 = { new_dir->mnt, old_dentry };
108627 - struct path path2 = { new_dir->mnt, new_dentry };
108628 + struct path path1 = { .mnt = new_dir->mnt, .dentry = old_dentry };
108629 + struct path path2 = { .mnt = new_dir->mnt, .dentry = new_dentry };
108630 return tomoyo_path2_perm(TOMOYO_TYPE_LINK, &path1, &path2);
108631 }
108632
108633 @@ -295,8 +295,8 @@ static int tomoyo_path_rename(struct path *old_parent,
108634 struct path *new_parent,
108635 struct dentry *new_dentry)
108636 {
108637 - struct path path1 = { old_parent->mnt, old_dentry };
108638 - struct path path2 = { new_parent->mnt, new_dentry };
108639 + struct path path1 = { .mnt = old_parent->mnt, .dentry = old_dentry };
108640 + struct path path2 = { .mnt = new_parent->mnt, .dentry = new_dentry };
108641 return tomoyo_path2_perm(TOMOYO_TYPE_RENAME, &path1, &path2);
108642 }
108643
108644 @@ -424,7 +424,7 @@ static int tomoyo_sb_mount(const char *dev_name, struct path *path,
108645 */
108646 static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
108647 {
108648 - struct path path = { mnt, mnt->mnt_root };
108649 + struct path path = { .mnt = mnt, .dentry = mnt->mnt_root };
108650 return tomoyo_path_perm(TOMOYO_TYPE_UMOUNT, &path, NULL);
108651 }
108652
108653 @@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
108654 * tomoyo_security_ops is a "struct security_operations" which is used for
108655 * registering TOMOYO.
108656 */
108657 -static struct security_operations tomoyo_security_ops = {
108658 +static struct security_operations tomoyo_security_ops __read_only = {
108659 .name = "tomoyo",
108660 .cred_alloc_blank = tomoyo_cred_alloc_blank,
108661 .cred_prepare = tomoyo_cred_prepare,
108662 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
108663 index 20ef514..4182bed 100644
108664 --- a/security/yama/Kconfig
108665 +++ b/security/yama/Kconfig
108666 @@ -1,6 +1,6 @@
108667 config SECURITY_YAMA
108668 bool "Yama support"
108669 - depends on SECURITY
108670 + depends on SECURITY && !GRKERNSEC
108671 select SECURITYFS
108672 select SECURITY_PATH
108673 default n
108674 diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
108675 index 13c88fbc..f8c115e 100644
108676 --- a/security/yama/yama_lsm.c
108677 +++ b/security/yama/yama_lsm.c
108678 @@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
108679 }
108680
108681 #ifndef CONFIG_SECURITY_YAMA_STACKED
108682 -static struct security_operations yama_ops = {
108683 +static struct security_operations yama_ops __read_only = {
108684 .name = "yama",
108685
108686 .ptrace_access_check = yama_ptrace_access_check,
108687 @@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
108688 #endif
108689
108690 #ifdef CONFIG_SYSCTL
108691 +static int zero __read_only;
108692 +static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
108693 +
108694 static int yama_dointvec_minmax(struct ctl_table *table, int write,
108695 void __user *buffer, size_t *lenp, loff_t *ppos)
108696 {
108697 - int rc;
108698 + ctl_table_no_const yama_table;
108699
108700 if (write && !capable(CAP_SYS_PTRACE))
108701 return -EPERM;
108702
108703 - rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108704 - if (rc)
108705 - return rc;
108706 -
108707 + yama_table = *table;
108708 /* Lock the max value if it ever gets set. */
108709 - if (write && *(int *)table->data == *(int *)table->extra2)
108710 - table->extra1 = table->extra2;
108711 -
108712 - return rc;
108713 + if (ptrace_scope == max_scope)
108714 + yama_table.extra1 = &max_scope;
108715 + return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
108716 }
108717
108718 -static int zero;
108719 -static int max_scope = YAMA_SCOPE_NO_ATTACH;
108720 -
108721 struct ctl_path yama_sysctl_path[] = {
108722 { .procname = "kernel", },
108723 { .procname = "yama", },
108724 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
108725 index 401107b..b9c47c6 100644
108726 --- a/sound/aoa/codecs/onyx.c
108727 +++ b/sound/aoa/codecs/onyx.c
108728 @@ -54,7 +54,7 @@ struct onyx {
108729 spdif_locked:1,
108730 analog_locked:1,
108731 original_mute:2;
108732 - int open_count;
108733 + local_t open_count;
108734 struct codec_info *codec_info;
108735
108736 /* mutex serializes concurrent access to the device
108737 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
108738 struct onyx *onyx = cii->codec_data;
108739
108740 mutex_lock(&onyx->mutex);
108741 - onyx->open_count++;
108742 + local_inc(&onyx->open_count);
108743 mutex_unlock(&onyx->mutex);
108744
108745 return 0;
108746 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
108747 struct onyx *onyx = cii->codec_data;
108748
108749 mutex_lock(&onyx->mutex);
108750 - onyx->open_count--;
108751 - if (!onyx->open_count)
108752 + if (local_dec_and_test(&onyx->open_count))
108753 onyx->spdif_locked = onyx->analog_locked = 0;
108754 mutex_unlock(&onyx->mutex);
108755
108756 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
108757 index ffd2025..df062c9 100644
108758 --- a/sound/aoa/codecs/onyx.h
108759 +++ b/sound/aoa/codecs/onyx.h
108760 @@ -11,6 +11,7 @@
108761 #include <linux/i2c.h>
108762 #include <asm/pmac_low_i2c.h>
108763 #include <asm/prom.h>
108764 +#include <asm/local.h>
108765
108766 /* PCM3052 register definitions */
108767
108768 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
108769 index ada69d7..5f65386 100644
108770 --- a/sound/core/oss/pcm_oss.c
108771 +++ b/sound/core/oss/pcm_oss.c
108772 @@ -1190,10 +1190,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
108773 if (in_kernel) {
108774 mm_segment_t fs;
108775 fs = snd_enter_user();
108776 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
108777 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
108778 snd_leave_user(fs);
108779 } else {
108780 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
108781 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
108782 }
108783 if (ret != -EPIPE && ret != -ESTRPIPE)
108784 break;
108785 @@ -1233,10 +1233,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
108786 if (in_kernel) {
108787 mm_segment_t fs;
108788 fs = snd_enter_user();
108789 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
108790 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
108791 snd_leave_user(fs);
108792 } else {
108793 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
108794 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
108795 }
108796 if (ret == -EPIPE) {
108797 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
108798 @@ -1332,7 +1332,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
108799 struct snd_pcm_plugin_channel *channels;
108800 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
108801 if (!in_kernel) {
108802 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
108803 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
108804 return -EFAULT;
108805 buf = runtime->oss.buffer;
108806 }
108807 @@ -1402,7 +1402,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
108808 }
108809 } else {
108810 tmp = snd_pcm_oss_write2(substream,
108811 - (const char __force *)buf,
108812 + (const char __force_kernel *)buf,
108813 runtime->oss.period_bytes, 0);
108814 if (tmp <= 0)
108815 goto err;
108816 @@ -1428,7 +1428,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
108817 struct snd_pcm_runtime *runtime = substream->runtime;
108818 snd_pcm_sframes_t frames, frames1;
108819 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
108820 - char __user *final_dst = (char __force __user *)buf;
108821 + char __user *final_dst = (char __force_user *)buf;
108822 if (runtime->oss.plugin_first) {
108823 struct snd_pcm_plugin_channel *channels;
108824 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
108825 @@ -1490,7 +1490,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
108826 xfer += tmp;
108827 runtime->oss.buffer_used -= tmp;
108828 } else {
108829 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
108830 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
108831 runtime->oss.period_bytes, 0);
108832 if (tmp <= 0)
108833 goto err;
108834 @@ -1659,7 +1659,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
108835 size1);
108836 size1 /= runtime->channels; /* frames */
108837 fs = snd_enter_user();
108838 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
108839 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
108840 snd_leave_user(fs);
108841 }
108842 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
108843 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
108844 index 2d957ba..fda022c 100644
108845 --- a/sound/core/pcm_compat.c
108846 +++ b/sound/core/pcm_compat.c
108847 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
108848 int err;
108849
108850 fs = snd_enter_user();
108851 - err = snd_pcm_delay(substream, &delay);
108852 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
108853 snd_leave_user(fs);
108854 if (err < 0)
108855 return err;
108856 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
108857 index 166d59c..89e3889 100644
108858 --- a/sound/core/pcm_native.c
108859 +++ b/sound/core/pcm_native.c
108860 @@ -2931,11 +2931,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
108861 switch (substream->stream) {
108862 case SNDRV_PCM_STREAM_PLAYBACK:
108863 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
108864 - (void __user *)arg);
108865 + (void __force_user *)arg);
108866 break;
108867 case SNDRV_PCM_STREAM_CAPTURE:
108868 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
108869 - (void __user *)arg);
108870 + (void __force_user *)arg);
108871 break;
108872 default:
108873 result = -EINVAL;
108874 diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
108875 index 16d4267..fe8b49b 100644
108876 --- a/sound/core/seq/oss/seq_oss.c
108877 +++ b/sound/core/seq/oss/seq_oss.c
108878 @@ -69,8 +69,8 @@ static int __init alsa_seq_oss_init(void)
108879 {
108880 int rc;
108881 static struct snd_seq_dev_ops ops = {
108882 - snd_seq_oss_synth_register,
108883 - snd_seq_oss_synth_unregister,
108884 + .init_device = snd_seq_oss_synth_register,
108885 + .free_device = snd_seq_oss_synth_unregister,
108886 };
108887
108888 snd_seq_autoload_lock();
108889 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
108890 index 91a786a..4c07ed4 100644
108891 --- a/sound/core/seq/seq_device.c
108892 +++ b/sound/core/seq/seq_device.c
108893 @@ -64,7 +64,7 @@ struct ops_list {
108894 int argsize; /* argument size */
108895
108896 /* operators */
108897 - struct snd_seq_dev_ops ops;
108898 + struct snd_seq_dev_ops *ops;
108899
108900 /* registered devices */
108901 struct list_head dev_list; /* list of devices */
108902 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
108903
108904 mutex_lock(&ops->reg_mutex);
108905 /* copy driver operators */
108906 - ops->ops = *entry;
108907 + ops->ops = entry;
108908 ops->driver |= DRIVER_LOADED;
108909 ops->argsize = argsize;
108910
108911 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
108912 dev->name, ops->id, ops->argsize, dev->argsize);
108913 return -EINVAL;
108914 }
108915 - if (ops->ops.init_device(dev) >= 0) {
108916 + if (ops->ops->init_device(dev) >= 0) {
108917 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
108918 ops->num_init_devices++;
108919 } else {
108920 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
108921 dev->name, ops->id, ops->argsize, dev->argsize);
108922 return -EINVAL;
108923 }
108924 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
108925 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
108926 dev->status = SNDRV_SEQ_DEVICE_FREE;
108927 dev->driver_data = NULL;
108928 ops->num_init_devices--;
108929 diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
108930 index a1fd77a..69cd659 100644
108931 --- a/sound/core/seq/seq_midi.c
108932 +++ b/sound/core/seq/seq_midi.c
108933 @@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
108934 static int __init alsa_seq_midi_init(void)
108935 {
108936 static struct snd_seq_dev_ops ops = {
108937 - snd_seq_midisynth_register_port,
108938 - snd_seq_midisynth_unregister_port,
108939 + .init_device = snd_seq_midisynth_register_port,
108940 + .free_device = snd_seq_midisynth_unregister_port,
108941 };
108942 memset(&synths, 0, sizeof(synths));
108943 snd_seq_autoload_lock();
108944 diff --git a/sound/core/sound.c b/sound/core/sound.c
108945 index 38ad1a0..5010a40 100644
108946 --- a/sound/core/sound.c
108947 +++ b/sound/core/sound.c
108948 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
108949 case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
108950 default: return;
108951 }
108952 - request_module(str);
108953 + request_module("%s", str);
108954 }
108955
108956 #endif /* modular kernel */
108957 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
108958 index f5fd448..6ae276da 100644
108959 --- a/sound/drivers/mts64.c
108960 +++ b/sound/drivers/mts64.c
108961 @@ -29,6 +29,7 @@
108962 #include <sound/initval.h>
108963 #include <sound/rawmidi.h>
108964 #include <sound/control.h>
108965 +#include <asm/local.h>
108966
108967 #define CARD_NAME "Miditerminal 4140"
108968 #define DRIVER_NAME "MTS64"
108969 @@ -67,7 +68,7 @@ struct mts64 {
108970 struct pardevice *pardev;
108971 int pardev_claimed;
108972
108973 - int open_count;
108974 + local_t open_count;
108975 int current_midi_output_port;
108976 int current_midi_input_port;
108977 u8 mode[MTS64_NUM_INPUT_PORTS];
108978 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
108979 {
108980 struct mts64 *mts = substream->rmidi->private_data;
108981
108982 - if (mts->open_count == 0) {
108983 + if (local_read(&mts->open_count) == 0) {
108984 /* We don't need a spinlock here, because this is just called
108985 if the device has not been opened before.
108986 So there aren't any IRQs from the device */
108987 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
108988
108989 msleep(50);
108990 }
108991 - ++(mts->open_count);
108992 + local_inc(&mts->open_count);
108993
108994 return 0;
108995 }
108996 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
108997 struct mts64 *mts = substream->rmidi->private_data;
108998 unsigned long flags;
108999
109000 - --(mts->open_count);
109001 - if (mts->open_count == 0) {
109002 + if (local_dec_return(&mts->open_count) == 0) {
109003 /* We need the spinlock_irqsave here because we can still
109004 have IRQs at this point */
109005 spin_lock_irqsave(&mts->lock, flags);
109006 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
109007
109008 msleep(500);
109009
109010 - } else if (mts->open_count < 0)
109011 - mts->open_count = 0;
109012 + } else if (local_read(&mts->open_count) < 0)
109013 + local_set(&mts->open_count, 0);
109014
109015 return 0;
109016 }
109017 diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
109018 index 6839953..7a0f4b9 100644
109019 --- a/sound/drivers/opl3/opl3_seq.c
109020 +++ b/sound/drivers/opl3/opl3_seq.c
109021 @@ -281,8 +281,8 @@ static int __init alsa_opl3_seq_init(void)
109022 {
109023 static struct snd_seq_dev_ops ops =
109024 {
109025 - snd_opl3_seq_new_device,
109026 - snd_opl3_seq_delete_device
109027 + .init_device = snd_opl3_seq_new_device,
109028 + .free_device = snd_opl3_seq_delete_device
109029 };
109030
109031 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
109032 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
109033 index b953fb4..1999c01 100644
109034 --- a/sound/drivers/opl4/opl4_lib.c
109035 +++ b/sound/drivers/opl4/opl4_lib.c
109036 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
109037 MODULE_DESCRIPTION("OPL4 driver");
109038 MODULE_LICENSE("GPL");
109039
109040 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
109041 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
109042 {
109043 int timeout = 10;
109044 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
109045 diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
109046 index 9919769..d7de36c 100644
109047 --- a/sound/drivers/opl4/opl4_seq.c
109048 +++ b/sound/drivers/opl4/opl4_seq.c
109049 @@ -198,8 +198,8 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)
109050 static int __init alsa_opl4_synth_init(void)
109051 {
109052 static struct snd_seq_dev_ops ops = {
109053 - snd_opl4_seq_new_device,
109054 - snd_opl4_seq_delete_device
109055 + .init_device = snd_opl4_seq_new_device,
109056 + .free_device = snd_opl4_seq_delete_device
109057 };
109058
109059 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops,
109060 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
109061 index 78ccfa4..7a0857b 100644
109062 --- a/sound/drivers/portman2x4.c
109063 +++ b/sound/drivers/portman2x4.c
109064 @@ -48,6 +48,7 @@
109065 #include <sound/initval.h>
109066 #include <sound/rawmidi.h>
109067 #include <sound/control.h>
109068 +#include <asm/local.h>
109069
109070 #define CARD_NAME "Portman 2x4"
109071 #define DRIVER_NAME "portman"
109072 @@ -85,7 +86,7 @@ struct portman {
109073 struct pardevice *pardev;
109074 int pardev_claimed;
109075
109076 - int open_count;
109077 + local_t open_count;
109078 int mode[PORTMAN_NUM_INPUT_PORTS];
109079 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
109080 };
109081 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
109082 index 95fc2eaf..ea5d6a7 100644
109083 --- a/sound/firewire/amdtp.c
109084 +++ b/sound/firewire/amdtp.c
109085 @@ -521,7 +521,7 @@ static void update_pcm_pointers(struct amdtp_stream *s,
109086 ptr = s->pcm_buffer_pointer + frames;
109087 if (ptr >= pcm->runtime->buffer_size)
109088 ptr -= pcm->runtime->buffer_size;
109089 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
109090 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
109091
109092 s->pcm_period_pointer += frames;
109093 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
109094 @@ -961,7 +961,7 @@ EXPORT_SYMBOL(amdtp_stream_pcm_pointer);
109095 */
109096 void amdtp_stream_update(struct amdtp_stream *s)
109097 {
109098 - ACCESS_ONCE(s->source_node_id_field) =
109099 + ACCESS_ONCE_RW(s->source_node_id_field) =
109100 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
109101 }
109102 EXPORT_SYMBOL(amdtp_stream_update);
109103 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
109104 index 4823c08..47a5f7c 100644
109105 --- a/sound/firewire/amdtp.h
109106 +++ b/sound/firewire/amdtp.h
109107 @@ -212,7 +212,7 @@ static inline bool amdtp_stream_pcm_running(struct amdtp_stream *s)
109108 static inline void amdtp_stream_pcm_trigger(struct amdtp_stream *s,
109109 struct snd_pcm_substream *pcm)
109110 {
109111 - ACCESS_ONCE(s->pcm) = pcm;
109112 + ACCESS_ONCE_RW(s->pcm) = pcm;
109113 }
109114
109115 /**
109116 @@ -230,7 +230,7 @@ static inline void amdtp_stream_midi_trigger(struct amdtp_stream *s,
109117 struct snd_rawmidi_substream *midi)
109118 {
109119 if (port < s->midi_ports)
109120 - ACCESS_ONCE(s->midi[port]) = midi;
109121 + ACCESS_ONCE_RW(s->midi[port]) = midi;
109122 }
109123
109124 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
109125 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
109126 index 7ac9443..0ec6274 100644
109127 --- a/sound/firewire/isight.c
109128 +++ b/sound/firewire/isight.c
109129 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
109130 ptr += count;
109131 if (ptr >= runtime->buffer_size)
109132 ptr -= runtime->buffer_size;
109133 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
109134 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
109135
109136 isight->period_counter += count;
109137 if (isight->period_counter >= runtime->period_size) {
109138 @@ -299,7 +299,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
109139 if (err < 0)
109140 return err;
109141
109142 - ACCESS_ONCE(isight->pcm_active) = true;
109143 + ACCESS_ONCE_RW(isight->pcm_active) = true;
109144
109145 return 0;
109146 }
109147 @@ -337,7 +337,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
109148 {
109149 struct isight *isight = substream->private_data;
109150
109151 - ACCESS_ONCE(isight->pcm_active) = false;
109152 + ACCESS_ONCE_RW(isight->pcm_active) = false;
109153
109154 mutex_lock(&isight->mutex);
109155 isight_stop_streaming(isight);
109156 @@ -430,10 +430,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
109157
109158 switch (cmd) {
109159 case SNDRV_PCM_TRIGGER_START:
109160 - ACCESS_ONCE(isight->pcm_running) = true;
109161 + ACCESS_ONCE_RW(isight->pcm_running) = true;
109162 break;
109163 case SNDRV_PCM_TRIGGER_STOP:
109164 - ACCESS_ONCE(isight->pcm_running) = false;
109165 + ACCESS_ONCE_RW(isight->pcm_running) = false;
109166 break;
109167 default:
109168 return -EINVAL;
109169 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
109170 index 2dba848..c682aef 100644
109171 --- a/sound/firewire/scs1x.c
109172 +++ b/sound/firewire/scs1x.c
109173 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
109174 {
109175 struct scs *scs = stream->rmidi->private_data;
109176
109177 - ACCESS_ONCE(scs->output) = up ? stream : NULL;
109178 + ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
109179 if (up) {
109180 scs->output_idle = false;
109181 tasklet_schedule(&scs->tasklet);
109182 @@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
109183 {
109184 struct scs *scs = stream->rmidi->private_data;
109185
109186 - ACCESS_ONCE(scs->input) = up ? stream : NULL;
109187 + ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
109188 }
109189
109190 static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
109191 @@ -473,8 +473,8 @@ static void scs_remove(struct fw_unit *unit)
109192
109193 snd_card_disconnect(scs->card);
109194
109195 - ACCESS_ONCE(scs->output) = NULL;
109196 - ACCESS_ONCE(scs->input) = NULL;
109197 + ACCESS_ONCE_RW(scs->output) = NULL;
109198 + ACCESS_ONCE_RW(scs->input) = NULL;
109199
109200 wait_event(scs->idle_wait, scs->output_idle);
109201
109202 diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
109203 index 4e3fcfb..ab45a9d 100644
109204 --- a/sound/isa/sb/emu8000_synth.c
109205 +++ b/sound/isa/sb/emu8000_synth.c
109206 @@ -120,8 +120,8 @@ static int __init alsa_emu8000_init(void)
109207 {
109208
109209 static struct snd_seq_dev_ops ops = {
109210 - snd_emu8000_new_device,
109211 - snd_emu8000_delete_device,
109212 + .init_device = snd_emu8000_new_device,
109213 + .free_device = snd_emu8000_delete_device,
109214 };
109215 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
109216 sizeof(struct snd_emu8000*));
109217 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
109218 index 048439a..3be9f6f 100644
109219 --- a/sound/oss/sb_audio.c
109220 +++ b/sound/oss/sb_audio.c
109221 @@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
109222 buf16 = (signed short *)(localbuf + localoffs);
109223 while (c)
109224 {
109225 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
109226 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
109227 if (copy_from_user(lbuf8,
109228 userbuf+useroffs + p,
109229 locallen))
109230 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
109231 index a33e8ce..2262303 100644
109232 --- a/sound/oss/swarm_cs4297a.c
109233 +++ b/sound/oss/swarm_cs4297a.c
109234 @@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
109235 {
109236 struct cs4297a_state *s;
109237 u32 pwr, id;
109238 - mm_segment_t fs;
109239 int rval;
109240 u64 cfg;
109241 int mdio_val;
109242 @@ -2709,22 +2708,23 @@ static int __init cs4297a_init(void)
109243 if (!rval) {
109244 char *sb1250_duart_present;
109245
109246 +#if 0
109247 + mm_segment_t fs;
109248 fs = get_fs();
109249 set_fs(KERNEL_DS);
109250 -#if 0
109251 val = SOUND_MASK_LINE;
109252 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
109253 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
109254 val = initvol[i].vol;
109255 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
109256 }
109257 + set_fs(fs);
109258 // cs4297a_write_ac97(s, 0x18, 0x0808);
109259 #else
109260 // cs4297a_write_ac97(s, 0x5e, 0x180);
109261 cs4297a_write_ac97(s, 0x02, 0x0808);
109262 cs4297a_write_ac97(s, 0x18, 0x0808);
109263 #endif
109264 - set_fs(fs);
109265
109266 list_add(&s->list, &cs4297a_devs);
109267
109268 diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
109269 index 4c41c90..37f3631 100644
109270 --- a/sound/pci/emu10k1/emu10k1_synth.c
109271 +++ b/sound/pci/emu10k1/emu10k1_synth.c
109272 @@ -108,8 +108,8 @@ static int __init alsa_emu10k1_synth_init(void)
109273 {
109274
109275 static struct snd_seq_dev_ops ops = {
109276 - snd_emu10k1_synth_new_device,
109277 - snd_emu10k1_synth_delete_device,
109278 + .init_device = snd_emu10k1_synth_new_device,
109279 + .free_device = snd_emu10k1_synth_delete_device,
109280 };
109281 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
109282 sizeof(struct snd_emu10k1_synth_arg));
109283 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
109284 index 15e0089..ad6bc9b 100644
109285 --- a/sound/pci/hda/hda_codec.c
109286 +++ b/sound/pci/hda/hda_codec.c
109287 @@ -966,14 +966,10 @@ find_codec_preset(struct hda_codec *codec)
109288 mutex_unlock(&preset_mutex);
109289
109290 if (mod_requested < HDA_MODREQ_MAX_COUNT) {
109291 - char name[32];
109292 if (!mod_requested)
109293 - snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
109294 - codec->vendor_id);
109295 + request_module("snd-hda-codec-id:%08x", codec->vendor_id);
109296 else
109297 - snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
109298 - (codec->vendor_id >> 16) & 0xffff);
109299 - request_module(name);
109300 + request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
109301 mod_requested++;
109302 goto again;
109303 }
109304 @@ -2800,7 +2796,7 @@ static int get_kctl_0dB_offset(struct hda_codec *codec,
109305 /* FIXME: set_fs() hack for obtaining user-space TLV data */
109306 mm_segment_t fs = get_fs();
109307 set_fs(get_ds());
109308 - if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), _tlv))
109309 + if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), (unsigned int __force_user *)_tlv))
109310 tlv = _tlv;
109311 set_fs(fs);
109312 } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
109313 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
109314 index 4631a23..001ae57 100644
109315 --- a/sound/pci/ymfpci/ymfpci.h
109316 +++ b/sound/pci/ymfpci/ymfpci.h
109317 @@ -358,7 +358,7 @@ struct snd_ymfpci {
109318 spinlock_t reg_lock;
109319 spinlock_t voice_lock;
109320 wait_queue_head_t interrupt_sleep;
109321 - atomic_t interrupt_sleep_count;
109322 + atomic_unchecked_t interrupt_sleep_count;
109323 struct snd_info_entry *proc_entry;
109324 const struct firmware *dsp_microcode;
109325 const struct firmware *controller_microcode;
109326 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
109327 index 81c916a..516f0bf 100644
109328 --- a/sound/pci/ymfpci/ymfpci_main.c
109329 +++ b/sound/pci/ymfpci/ymfpci_main.c
109330 @@ -204,8 +204,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
109331 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
109332 break;
109333 }
109334 - if (atomic_read(&chip->interrupt_sleep_count)) {
109335 - atomic_set(&chip->interrupt_sleep_count, 0);
109336 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
109337 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109338 wake_up(&chip->interrupt_sleep);
109339 }
109340 __end:
109341 @@ -789,7 +789,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
109342 continue;
109343 init_waitqueue_entry(&wait, current);
109344 add_wait_queue(&chip->interrupt_sleep, &wait);
109345 - atomic_inc(&chip->interrupt_sleep_count);
109346 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
109347 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
109348 remove_wait_queue(&chip->interrupt_sleep, &wait);
109349 }
109350 @@ -827,8 +827,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
109351 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
109352 spin_unlock(&chip->reg_lock);
109353
109354 - if (atomic_read(&chip->interrupt_sleep_count)) {
109355 - atomic_set(&chip->interrupt_sleep_count, 0);
109356 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
109357 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109358 wake_up(&chip->interrupt_sleep);
109359 }
109360 }
109361 @@ -2423,7 +2423,7 @@ int snd_ymfpci_create(struct snd_card *card,
109362 spin_lock_init(&chip->reg_lock);
109363 spin_lock_init(&chip->voice_lock);
109364 init_waitqueue_head(&chip->interrupt_sleep);
109365 - atomic_set(&chip->interrupt_sleep_count, 0);
109366 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109367 chip->card = card;
109368 chip->pci = pci;
109369 chip->irq = -1;
109370 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
109371 index b60ff56..7307f0f 100644
109372 --- a/sound/soc/soc-core.c
109373 +++ b/sound/soc/soc-core.c
109374 @@ -2132,8 +2132,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
109375 if (ret)
109376 return ret;
109377
109378 - ops->warm_reset = snd_soc_ac97_warm_reset;
109379 - ops->reset = snd_soc_ac97_reset;
109380 + pax_open_kernel();
109381 + *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
109382 + *(void **)&ops->reset = snd_soc_ac97_reset;
109383 + pax_close_kernel();
109384
109385 snd_ac97_rst_cfg = cfg;
109386 return 0;
109387 diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
109388 index 7778b8e..3d619fc 100644
109389 --- a/sound/synth/emux/emux_seq.c
109390 +++ b/sound/synth/emux/emux_seq.c
109391 @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf
109392 * MIDI emulation operators
109393 */
109394 static struct snd_midi_op emux_ops = {
109395 - snd_emux_note_on,
109396 - snd_emux_note_off,
109397 - snd_emux_key_press,
109398 - snd_emux_terminate_note,
109399 - snd_emux_control,
109400 - snd_emux_nrpn,
109401 - snd_emux_sysex,
109402 + .note_on = snd_emux_note_on,
109403 + .note_off = snd_emux_note_off,
109404 + .key_press = snd_emux_key_press,
109405 + .note_terminate = snd_emux_terminate_note,
109406 + .control = snd_emux_control,
109407 + .nrpn = snd_emux_nrpn,
109408 + .sysex = snd_emux_sysex,
109409 };
109410
109411
109412 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
109413 new file mode 100644
109414 index 0000000..de92ed9
109415 --- /dev/null
109416 +++ b/tools/gcc/.gitignore
109417 @@ -0,0 +1 @@
109418 +randomize_layout_seed.h
109419 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
109420 new file mode 100644
109421 index 0000000..7b8921f
109422 --- /dev/null
109423 +++ b/tools/gcc/Makefile
109424 @@ -0,0 +1,52 @@
109425 +#CC := gcc
109426 +#PLUGIN_SOURCE_FILES := pax_plugin.c
109427 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
109428 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
109429 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
109430 +
109431 +ifeq ($(PLUGINCC),$(HOSTCC))
109432 +HOSTLIBS := hostlibs
109433 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu99 -ggdb
109434 +export HOST_EXTRACFLAGS
109435 +else
109436 +HOSTLIBS := hostcxxlibs
109437 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti -ggdb -Wno-unused-parameter -Wno-narrowing -Wno-unused-variable
109438 +export HOST_EXTRACXXFLAGS
109439 +endif
109440 +
109441 +export GCCPLUGINS_DIR HOSTLIBS
109442 +
109443 +$(HOSTLIBS)-$(CONFIG_PAX_CONSTIFY_PLUGIN) := constify_plugin.so
109444 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
109445 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
109446 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
109447 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
109448 +$(HOSTLIBS)-y += colorize_plugin.so
109449 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
109450 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STRUCTLEAK) += structleak_plugin.so
109451 +$(HOSTLIBS)-$(CONFIG_GRKERNSEC_RANDSTRUCT) += randomize_layout_plugin.so
109452 +
109453 +subdir-$(CONFIG_PAX_SIZE_OVERFLOW) := size_overflow_plugin
109454 +subdir- += size_overflow_plugin
109455 +
109456 +always := $($(HOSTLIBS)-y)
109457 +
109458 +constify_plugin-objs := constify_plugin.o
109459 +stackleak_plugin-objs := stackleak_plugin.o
109460 +kallocstat_plugin-objs := kallocstat_plugin.o
109461 +kernexec_plugin-objs := kernexec_plugin.o
109462 +checker_plugin-objs := checker_plugin.o
109463 +colorize_plugin-objs := colorize_plugin.o
109464 +latent_entropy_plugin-objs := latent_entropy_plugin.o
109465 +structleak_plugin-objs := structleak_plugin.o
109466 +randomize_layout_plugin-objs := randomize_layout_plugin.o
109467 +
109468 +$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
109469 +
109470 +quiet_cmd_create_randomize_layout_seed = GENSEED $@
109471 + cmd_create_randomize_layout_seed = \
109472 + $(CONFIG_SHELL) $(srctree)/$(src)/gen-random-seed.sh $@ $(objtree)/include/generated/randomize_layout_hash.h
109473 +$(objtree)/$(obj)/randomize_layout_seed.h: FORCE
109474 + $(call if_changed,create_randomize_layout_seed)
109475 +
109476 +targets += randomize_layout_seed.h randomize_layout_hash.h
109477 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
109478 new file mode 100644
109479 index 0000000..5452feea
109480 --- /dev/null
109481 +++ b/tools/gcc/checker_plugin.c
109482 @@ -0,0 +1,150 @@
109483 +/*
109484 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
109485 + * Licensed under the GPL v2
109486 + *
109487 + * Note: the choice of the license means that the compilation process is
109488 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109489 + * but for the kernel it doesn't matter since it doesn't link against
109490 + * any of the gcc libraries
109491 + *
109492 + * gcc plugin to implement various sparse (source code checker) features
109493 + *
109494 + * TODO:
109495 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
109496 + *
109497 + * BUGS:
109498 + * - none known
109499 + */
109500 +
109501 +#include "gcc-common.h"
109502 +
109503 +extern void c_register_addr_space (const char *str, addr_space_t as);
109504 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
109505 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
109506 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
109507 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
109508 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
109509 +
109510 +int plugin_is_GPL_compatible;
109511 +
109512 +static struct plugin_info checker_plugin_info = {
109513 + .version = "201304082245",
109514 + .help = NULL,
109515 +};
109516 +
109517 +#define ADDR_SPACE_KERNEL 0
109518 +#define ADDR_SPACE_FORCE_KERNEL 1
109519 +#define ADDR_SPACE_USER 2
109520 +#define ADDR_SPACE_FORCE_USER 3
109521 +#define ADDR_SPACE_IOMEM 0
109522 +#define ADDR_SPACE_FORCE_IOMEM 0
109523 +#define ADDR_SPACE_PERCPU 0
109524 +#define ADDR_SPACE_FORCE_PERCPU 0
109525 +#define ADDR_SPACE_RCU 0
109526 +#define ADDR_SPACE_FORCE_RCU 0
109527 +
109528 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
109529 +{
109530 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
109531 +}
109532 +
109533 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
109534 +{
109535 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
109536 +}
109537 +
109538 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
109539 +{
109540 + return default_addr_space_valid_pointer_mode(mode, as);
109541 +}
109542 +
109543 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
109544 +{
109545 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
109546 +}
109547 +
109548 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
109549 +{
109550 + return default_addr_space_legitimize_address(x, oldx, mode, as);
109551 +}
109552 +
109553 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
109554 +{
109555 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
109556 + return true;
109557 +
109558 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
109559 + return true;
109560 +
109561 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
109562 + return true;
109563 +
109564 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
109565 + return true;
109566 +
109567 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
109568 + return true;
109569 +
109570 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
109571 + return true;
109572 +
109573 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
109574 + return true;
109575 +
109576 + return subset == superset;
109577 +}
109578 +
109579 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
109580 +{
109581 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
109582 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
109583 +
109584 + return op;
109585 +}
109586 +
109587 +static void register_checker_address_spaces(void *event_data, void *data)
109588 +{
109589 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
109590 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
109591 + c_register_addr_space("__user", ADDR_SPACE_USER);
109592 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
109593 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
109594 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
109595 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
109596 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
109597 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
109598 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
109599 +
109600 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
109601 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
109602 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
109603 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
109604 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
109605 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
109606 + targetm.addr_space.convert = checker_addr_space_convert;
109607 +}
109608 +
109609 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109610 +{
109611 + const char * const plugin_name = plugin_info->base_name;
109612 + const int argc = plugin_info->argc;
109613 + const struct plugin_argument * const argv = plugin_info->argv;
109614 + int i;
109615 +
109616 + if (!plugin_default_version_check(version, &gcc_version)) {
109617 + error(G_("incompatible gcc/plugin versions"));
109618 + return 1;
109619 + }
109620 +
109621 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
109622 +
109623 + for (i = 0; i < argc; ++i)
109624 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109625 +
109626 + if (TARGET_64BIT == 0)
109627 + return 0;
109628 +
109629 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
109630 +
109631 + return 0;
109632 +}
109633 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
109634 new file mode 100644
109635 index 0000000..54461af
109636 --- /dev/null
109637 +++ b/tools/gcc/colorize_plugin.c
109638 @@ -0,0 +1,210 @@
109639 +/*
109640 + * Copyright 2012-2014 by PaX Team <pageexec@freemail.hu>
109641 + * Licensed under the GPL v2
109642 + *
109643 + * Note: the choice of the license means that the compilation process is
109644 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109645 + * but for the kernel it doesn't matter since it doesn't link against
109646 + * any of the gcc libraries
109647 + *
109648 + * gcc plugin to colorize diagnostic output
109649 + *
109650 + */
109651 +
109652 +#include "gcc-common.h"
109653 +
109654 +int plugin_is_GPL_compatible;
109655 +
109656 +static struct plugin_info colorize_plugin_info = {
109657 + .version = "201404202350",
109658 + .help = "color=[never|always|auto]\tdetermine when to colorize\n",
109659 +};
109660 +
109661 +#define GREEN "\033[32m\033[K"
109662 +#define LIGHTGREEN "\033[1;32m\033[K"
109663 +#define YELLOW "\033[33m\033[K"
109664 +#define LIGHTYELLOW "\033[1;33m\033[K"
109665 +#define RED "\033[31m\033[K"
109666 +#define LIGHTRED "\033[1;31m\033[K"
109667 +#define BLUE "\033[34m\033[K"
109668 +#define LIGHTBLUE "\033[1;34m\033[K"
109669 +#define BRIGHT "\033[1;m\033[K"
109670 +#define NORMAL "\033[m\033[K"
109671 +
109672 +static diagnostic_starter_fn old_starter;
109673 +static diagnostic_finalizer_fn old_finalizer;
109674 +
109675 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
109676 +{
109677 + const char *color;
109678 + char *newprefix;
109679 +
109680 + switch (diagnostic->kind) {
109681 + case DK_NOTE:
109682 + color = LIGHTBLUE;
109683 + break;
109684 +
109685 + case DK_PEDWARN:
109686 + case DK_WARNING:
109687 + color = LIGHTYELLOW;
109688 + break;
109689 +
109690 + case DK_ERROR:
109691 + case DK_FATAL:
109692 + case DK_ICE:
109693 + case DK_PERMERROR:
109694 + case DK_SORRY:
109695 + color = LIGHTRED;
109696 + break;
109697 +
109698 + default:
109699 + color = NORMAL;
109700 + }
109701 +
109702 + old_starter(context, diagnostic);
109703 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
109704 + return;
109705 + pp_destroy_prefix(context->printer);
109706 + pp_set_prefix(context->printer, newprefix);
109707 +}
109708 +
109709 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
109710 +{
109711 + old_finalizer(context, diagnostic);
109712 +}
109713 +
109714 +static void colorize_arm(void)
109715 +{
109716 + old_starter = diagnostic_starter(global_dc);
109717 + old_finalizer = diagnostic_finalizer(global_dc);
109718 +
109719 + diagnostic_starter(global_dc) = start_colorize;
109720 + diagnostic_finalizer(global_dc) = finalize_colorize;
109721 +}
109722 +
109723 +static unsigned int execute_colorize_rearm(void)
109724 +{
109725 + if (diagnostic_starter(global_dc) == start_colorize)
109726 + return 0;
109727 +
109728 + colorize_arm();
109729 + return 0;
109730 +}
109731 +
109732 +#if BUILDING_GCC_VERSION >= 4009
109733 +static const struct pass_data colorize_rearm_pass_data = {
109734 +#else
109735 +struct simple_ipa_opt_pass colorize_rearm_pass = {
109736 + .pass = {
109737 +#endif
109738 + .type = SIMPLE_IPA_PASS,
109739 + .name = "colorize_rearm",
109740 +#if BUILDING_GCC_VERSION >= 4008
109741 + .optinfo_flags = OPTGROUP_NONE,
109742 +#endif
109743 +#if BUILDING_GCC_VERSION >= 4009
109744 + .has_gate = false,
109745 + .has_execute = true,
109746 +#else
109747 + .gate = NULL,
109748 + .execute = execute_colorize_rearm,
109749 + .sub = NULL,
109750 + .next = NULL,
109751 + .static_pass_number = 0,
109752 +#endif
109753 + .tv_id = TV_NONE,
109754 + .properties_required = 0,
109755 + .properties_provided = 0,
109756 + .properties_destroyed = 0,
109757 + .todo_flags_start = 0,
109758 + .todo_flags_finish = 0
109759 +#if BUILDING_GCC_VERSION < 4009
109760 + }
109761 +#endif
109762 +};
109763 +
109764 +#if BUILDING_GCC_VERSION >= 4009
109765 +namespace {
109766 +class colorize_rearm_pass : public simple_ipa_opt_pass {
109767 +public:
109768 + colorize_rearm_pass() : simple_ipa_opt_pass(colorize_rearm_pass_data, g) {}
109769 + unsigned int execute() { return execute_colorize_rearm(); }
109770 +};
109771 +}
109772 +
109773 +static opt_pass *make_colorize_rearm_pass(void)
109774 +{
109775 + return new colorize_rearm_pass();
109776 +}
109777 +#else
109778 +static struct opt_pass *make_colorize_rearm_pass(void)
109779 +{
109780 + return &colorize_rearm_pass.pass;
109781 +}
109782 +#endif
109783 +
109784 +static void colorize_start_unit(void *gcc_data, void *user_data)
109785 +{
109786 + colorize_arm();
109787 +}
109788 +
109789 +static bool should_colorize(void)
109790 +{
109791 +#if BUILDING_GCC_VERSION >= 4009
109792 + return false;
109793 +#else
109794 + char const *t = getenv("TERM");
109795 +
109796 + return t && strcmp(t, "dumb") && isatty(STDERR_FILENO);
109797 +#endif
109798 +}
109799 +
109800 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109801 +{
109802 + const char * const plugin_name = plugin_info->base_name;
109803 + const int argc = plugin_info->argc;
109804 + const struct plugin_argument * const argv = plugin_info->argv;
109805 + int i;
109806 + struct register_pass_info colorize_rearm_pass_info;
109807 + bool colorize;
109808 +
109809 + colorize_rearm_pass_info.pass = make_colorize_rearm_pass();
109810 + colorize_rearm_pass_info.reference_pass_name = "*free_lang_data";
109811 + colorize_rearm_pass_info.ref_pass_instance_number = 1;
109812 + colorize_rearm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
109813 +
109814 + if (!plugin_default_version_check(version, &gcc_version)) {
109815 + error(G_("incompatible gcc/plugin versions"));
109816 + return 1;
109817 + }
109818 +
109819 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
109820 +
109821 + colorize = getenv("GCC_COLORS") ? should_colorize() : false;
109822 +
109823 + for (i = 0; i < argc; ++i) {
109824 + if (!strcmp(argv[i].key, "color")) {
109825 + if (!argv[i].value) {
109826 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109827 + continue;
109828 + }
109829 + if (!strcmp(argv[i].value, "always"))
109830 + colorize = true;
109831 + else if (!strcmp(argv[i].value, "never"))
109832 + colorize = false;
109833 + else if (!strcmp(argv[i].value, "auto"))
109834 + colorize = should_colorize();
109835 + else
109836 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
109837 + continue;
109838 + }
109839 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109840 + }
109841 +
109842 + if (colorize) {
109843 + // TODO: parse GCC_COLORS as used by gcc 4.9+
109844 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
109845 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
109846 + }
109847 + return 0;
109848 +}
109849 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
109850 new file mode 100644
109851 index 0000000..82bc5a8
109852 --- /dev/null
109853 +++ b/tools/gcc/constify_plugin.c
109854 @@ -0,0 +1,557 @@
109855 +/*
109856 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
109857 + * Copyright 2011-2014 by PaX Team <pageexec@freemail.hu>
109858 + * Licensed under the GPL v2, or (at your option) v3
109859 + *
109860 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
109861 + *
109862 + * Homepage:
109863 + * http://www.grsecurity.net/~ephox/const_plugin/
109864 + *
109865 + * Usage:
109866 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
109867 + * $ gcc -fplugin=constify_plugin.so test.c -O2
109868 + */
109869 +
109870 +#include "gcc-common.h"
109871 +
109872 +// unused C type flag in all versions 4.5-4.9
109873 +#define TYPE_CONSTIFY_VISITED(TYPE) TYPE_LANG_FLAG_4(TYPE)
109874 +
109875 +int plugin_is_GPL_compatible;
109876 +
109877 +static struct plugin_info const_plugin_info = {
109878 + .version = "201401270210",
109879 + .help = "no-constify\tturn off constification\n",
109880 +};
109881 +
109882 +typedef struct {
109883 + bool has_fptr_field;
109884 + bool has_writable_field;
109885 + bool has_do_const_field;
109886 + bool has_no_const_field;
109887 +} constify_info;
109888 +
109889 +static const_tree get_field_type(const_tree field)
109890 +{
109891 + return strip_array_types(TREE_TYPE(field));
109892 +}
109893 +
109894 +static bool is_fptr(const_tree field)
109895 +{
109896 + const_tree ptr = get_field_type(field);
109897 +
109898 + if (TREE_CODE(ptr) != POINTER_TYPE)
109899 + return false;
109900 +
109901 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
109902 +}
109903 +
109904 +/*
109905 + * determine whether the given structure type meets the requirements for automatic constification,
109906 + * including the constification attributes on nested structure types
109907 + */
109908 +static void constifiable(const_tree node, constify_info *cinfo)
109909 +{
109910 + const_tree field;
109911 +
109912 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
109913 +
109914 + // e.g., pointer to structure fields while still constructing the structure type
109915 + if (TYPE_FIELDS(node) == NULL_TREE)
109916 + return;
109917 +
109918 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
109919 + const_tree type = get_field_type(field);
109920 + enum tree_code code = TREE_CODE(type);
109921 +
109922 + if (node == type)
109923 + continue;
109924 +
109925 + if (is_fptr(field))
109926 + cinfo->has_fptr_field = true;
109927 + else if (!TREE_READONLY(field))
109928 + cinfo->has_writable_field = true;
109929 +
109930 + if (code == RECORD_TYPE || code == UNION_TYPE) {
109931 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
109932 + cinfo->has_do_const_field = true;
109933 + else if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
109934 + cinfo->has_no_const_field = true;
109935 + else
109936 + constifiable(type, cinfo);
109937 + }
109938 + }
109939 +}
109940 +
109941 +static bool constified(const_tree node)
109942 +{
109943 + constify_info cinfo = {
109944 + .has_fptr_field = false,
109945 + .has_writable_field = false,
109946 + .has_do_const_field = false,
109947 + .has_no_const_field = false
109948 + };
109949 +
109950 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
109951 +
109952 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
109953 +// gcc_assert(!TYPE_READONLY(node));
109954 + return false;
109955 + }
109956 +
109957 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node))) {
109958 + gcc_assert(TYPE_READONLY(node));
109959 + return true;
109960 + }
109961 +
109962 + constifiable(node, &cinfo);
109963 + if ((!cinfo.has_fptr_field || cinfo.has_writable_field) && !cinfo.has_do_const_field)
109964 + return false;
109965 +
109966 + return TYPE_READONLY(node);
109967 +}
109968 +
109969 +static void deconstify_tree(tree node);
109970 +
109971 +static void deconstify_type(tree type)
109972 +{
109973 + tree field;
109974 +
109975 + gcc_assert(TREE_CODE(type) == RECORD_TYPE || TREE_CODE(type) == UNION_TYPE);
109976 +
109977 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
109978 + const_tree fieldtype = get_field_type(field);
109979 +
109980 + // special case handling of simple ptr-to-same-array-type members
109981 + if (TREE_CODE(TREE_TYPE(field)) == POINTER_TYPE) {
109982 + tree ptrtype = TREE_TYPE(TREE_TYPE(field));
109983 +
109984 + if (TREE_TYPE(TREE_TYPE(field)) == type)
109985 + continue;
109986 + if (TREE_CODE(ptrtype) != RECORD_TYPE && TREE_CODE(ptrtype) != UNION_TYPE)
109987 + continue;
109988 + if (!constified(ptrtype))
109989 + continue;
109990 + if (TYPE_MAIN_VARIANT(ptrtype) == TYPE_MAIN_VARIANT(type)) {
109991 + TREE_TYPE(field) = copy_node(TREE_TYPE(field));
109992 + TREE_TYPE(TREE_TYPE(field)) = build_qualified_type(type, TYPE_QUALS(ptrtype) & ~TYPE_QUAL_CONST);
109993 + }
109994 + continue;
109995 + }
109996 + if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
109997 + continue;
109998 + if (!constified(fieldtype))
109999 + continue;
110000 +
110001 + deconstify_tree(field);
110002 + TREE_READONLY(field) = 0;
110003 + }
110004 + TYPE_READONLY(type) = 0;
110005 + C_TYPE_FIELDS_READONLY(type) = 0;
110006 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110007 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
110008 + TYPE_ATTRIBUTES(type) = remove_attribute("do_const", TYPE_ATTRIBUTES(type));
110009 + }
110010 +}
110011 +
110012 +static void deconstify_tree(tree node)
110013 +{
110014 + tree old_type, new_type, field;
110015 +
110016 + old_type = TREE_TYPE(node);
110017 + while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
110018 + node = TREE_TYPE(node) = copy_node(old_type);
110019 + old_type = TREE_TYPE(old_type);
110020 + }
110021 +
110022 + gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
110023 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
110024 +
110025 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
110026 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
110027 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
110028 + DECL_FIELD_CONTEXT(field) = new_type;
110029 +
110030 + deconstify_type(new_type);
110031 +
110032 + TREE_TYPE(node) = new_type;
110033 +}
110034 +
110035 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
110036 +{
110037 + tree type;
110038 + constify_info cinfo = {
110039 + .has_fptr_field = false,
110040 + .has_writable_field = false,
110041 + .has_do_const_field = false,
110042 + .has_no_const_field = false
110043 + };
110044 +
110045 + *no_add_attrs = true;
110046 + if (TREE_CODE(*node) == FUNCTION_DECL) {
110047 + error("%qE attribute does not apply to functions (%qF)", name, *node);
110048 + return NULL_TREE;
110049 + }
110050 +
110051 + if (TREE_CODE(*node) == PARM_DECL) {
110052 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
110053 + return NULL_TREE;
110054 + }
110055 +
110056 + if (TREE_CODE(*node) == VAR_DECL) {
110057 + error("%qE attribute does not apply to variables (%qD)", name, *node);
110058 + return NULL_TREE;
110059 + }
110060 +
110061 + if (TYPE_P(*node)) {
110062 + type = *node;
110063 + } else {
110064 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
110065 + type = TREE_TYPE(*node);
110066 + }
110067 +
110068 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
110069 + error("%qE attribute used on %qT applies to struct and union types only", name, type);
110070 + return NULL_TREE;
110071 + }
110072 +
110073 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
110074 + error("%qE attribute is already applied to the type %qT", name, type);
110075 + return NULL_TREE;
110076 + }
110077 +
110078 + if (TYPE_P(*node)) {
110079 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
110080 + error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
110081 + else
110082 + *no_add_attrs = false;
110083 + return NULL_TREE;
110084 + }
110085 +
110086 + constifiable(type, &cinfo);
110087 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110088 + deconstify_tree(*node);
110089 + TYPE_CONSTIFY_VISITED(TREE_TYPE(*node)) = 1;
110090 + return NULL_TREE;
110091 + }
110092 +
110093 + error("%qE attribute used on type %qT that is not constified", name, type);
110094 + return NULL_TREE;
110095 +}
110096 +
110097 +static void constify_type(tree type)
110098 +{
110099 + TYPE_READONLY(type) = 1;
110100 + C_TYPE_FIELDS_READONLY(type) = 1;
110101 + TYPE_CONSTIFY_VISITED(type) = 1;
110102 +// TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
110103 +// TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("do_const"), NULL_TREE, TYPE_ATTRIBUTES(type));
110104 +}
110105 +
110106 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
110107 +{
110108 + *no_add_attrs = true;
110109 + if (!TYPE_P(*node)) {
110110 + error("%qE attribute applies to types only (%qD)", name, *node);
110111 + return NULL_TREE;
110112 + }
110113 +
110114 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
110115 + error("%qE attribute used on %qT applies to struct and union types only", name, *node);
110116 + return NULL_TREE;
110117 + }
110118 +
110119 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
110120 + error("%qE attribute used on %qT is already applied to the type", name, *node);
110121 + return NULL_TREE;
110122 + }
110123 +
110124 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
110125 + error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
110126 + return NULL_TREE;
110127 + }
110128 +
110129 + *no_add_attrs = false;
110130 + return NULL_TREE;
110131 +}
110132 +
110133 +static struct attribute_spec no_const_attr = {
110134 + .name = "no_const",
110135 + .min_length = 0,
110136 + .max_length = 0,
110137 + .decl_required = false,
110138 + .type_required = false,
110139 + .function_type_required = false,
110140 + .handler = handle_no_const_attribute,
110141 +#if BUILDING_GCC_VERSION >= 4007
110142 + .affects_type_identity = true
110143 +#endif
110144 +};
110145 +
110146 +static struct attribute_spec do_const_attr = {
110147 + .name = "do_const",
110148 + .min_length = 0,
110149 + .max_length = 0,
110150 + .decl_required = false,
110151 + .type_required = false,
110152 + .function_type_required = false,
110153 + .handler = handle_do_const_attribute,
110154 +#if BUILDING_GCC_VERSION >= 4007
110155 + .affects_type_identity = true
110156 +#endif
110157 +};
110158 +
110159 +static void register_attributes(void *event_data, void *data)
110160 +{
110161 + register_attribute(&no_const_attr);
110162 + register_attribute(&do_const_attr);
110163 +}
110164 +
110165 +static void finish_type(void *event_data, void *data)
110166 +{
110167 + tree type = (tree)event_data;
110168 + constify_info cinfo = {
110169 + .has_fptr_field = false,
110170 + .has_writable_field = false,
110171 + .has_do_const_field = false,
110172 + .has_no_const_field = false
110173 + };
110174 +
110175 + if (type == NULL_TREE || type == error_mark_node)
110176 + return;
110177 +
110178 + if (TYPE_FIELDS(type) == NULL_TREE || TYPE_CONSTIFY_VISITED(type))
110179 + return;
110180 +
110181 + constifiable(type, &cinfo);
110182 +
110183 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
110184 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
110185 + deconstify_type(type);
110186 + TYPE_CONSTIFY_VISITED(type) = 1;
110187 + } else
110188 + error("'no_const' attribute used on type %qT that is not constified", type);
110189 + return;
110190 + }
110191 +
110192 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110193 + if (!cinfo.has_writable_field) {
110194 + error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
110195 + return;
110196 + }
110197 + constify_type(type);
110198 + return;
110199 + }
110200 +
110201 + if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
110202 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110203 + error("'do_const' attribute used on type %qT that is constified", type);
110204 + return;
110205 + }
110206 + constify_type(type);
110207 + return;
110208 + }
110209 +
110210 + deconstify_type(type);
110211 + TYPE_CONSTIFY_VISITED(type) = 1;
110212 +}
110213 +
110214 +static void check_global_variables(void *event_data, void *data)
110215 +{
110216 +#if BUILDING_GCC_VERSION >= 4009
110217 + varpool_node *node;
110218 +#else
110219 + struct varpool_node *node;
110220 +#endif
110221 +
110222 + FOR_EACH_VARIABLE(node) {
110223 + tree var = NODE_DECL(node);
110224 + tree type = TREE_TYPE(var);
110225 +
110226 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
110227 + continue;
110228 +
110229 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
110230 + continue;
110231 +
110232 + if (!TYPE_CONSTIFY_VISITED(type))
110233 + continue;
110234 +
110235 + if (DECL_EXTERNAL(var))
110236 + continue;
110237 +
110238 + if (DECL_INITIAL(var))
110239 + continue;
110240 +
110241 + // this works around a gcc bug/feature where uninitialized globals
110242 + // are moved into the .bss section regardless of any constification
110243 + DECL_INITIAL(var) = build_constructor(type, NULL);
110244 +// inform(DECL_SOURCE_LOCATION(var), "constified variable %qE moved into .rodata", var);
110245 + }
110246 +}
110247 +
110248 +static unsigned int check_local_variables(void)
110249 +{
110250 + unsigned int ret = 0;
110251 + tree var;
110252 +
110253 + unsigned int i;
110254 +
110255 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
110256 + tree type = TREE_TYPE(var);
110257 +
110258 + gcc_assert(DECL_P(var));
110259 + if (is_global_var(var))
110260 + continue;
110261 +
110262 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
110263 + continue;
110264 +
110265 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
110266 + continue;
110267 +
110268 + if (!TYPE_CONSTIFY_VISITED(type))
110269 + continue;
110270 +
110271 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
110272 + ret = 1;
110273 + }
110274 + return ret;
110275 +}
110276 +
110277 +#if BUILDING_GCC_VERSION >= 4009
110278 +static const struct pass_data check_local_variables_pass_data = {
110279 +#else
110280 +static struct gimple_opt_pass check_local_variables_pass = {
110281 + .pass = {
110282 +#endif
110283 + .type = GIMPLE_PASS,
110284 + .name = "check_local_variables",
110285 +#if BUILDING_GCC_VERSION >= 4008
110286 + .optinfo_flags = OPTGROUP_NONE,
110287 +#endif
110288 +#if BUILDING_GCC_VERSION >= 4009
110289 + .has_gate = false,
110290 + .has_execute = true,
110291 +#else
110292 + .gate = NULL,
110293 + .execute = check_local_variables,
110294 + .sub = NULL,
110295 + .next = NULL,
110296 + .static_pass_number = 0,
110297 +#endif
110298 + .tv_id = TV_NONE,
110299 + .properties_required = 0,
110300 + .properties_provided = 0,
110301 + .properties_destroyed = 0,
110302 + .todo_flags_start = 0,
110303 + .todo_flags_finish = 0
110304 +#if BUILDING_GCC_VERSION < 4009
110305 + }
110306 +#endif
110307 +};
110308 +
110309 +#if BUILDING_GCC_VERSION >= 4009
110310 +namespace {
110311 +class check_local_variables_pass : public gimple_opt_pass {
110312 +public:
110313 + check_local_variables_pass() : gimple_opt_pass(check_local_variables_pass_data, g) {}
110314 + unsigned int execute() { return check_local_variables(); }
110315 +};
110316 +}
110317 +
110318 +static opt_pass *make_check_local_variables_pass(void)
110319 +{
110320 + return new check_local_variables_pass();
110321 +}
110322 +#else
110323 +static struct opt_pass *make_check_local_variables_pass(void)
110324 +{
110325 + return &check_local_variables_pass.pass;
110326 +}
110327 +#endif
110328 +
110329 +static struct {
110330 + const char *name;
110331 + const char *asm_op;
110332 +} sections[] = {
110333 + {".init.rodata", "\t.section\t.init.rodata,\"a\""},
110334 + {".ref.rodata", "\t.section\t.ref.rodata,\"a\""},
110335 + {".devinit.rodata", "\t.section\t.devinit.rodata,\"a\""},
110336 + {".devexit.rodata", "\t.section\t.devexit.rodata,\"a\""},
110337 + {".cpuinit.rodata", "\t.section\t.cpuinit.rodata,\"a\""},
110338 + {".cpuexit.rodata", "\t.section\t.cpuexit.rodata,\"a\""},
110339 + {".meminit.rodata", "\t.section\t.meminit.rodata,\"a\""},
110340 + {".memexit.rodata", "\t.section\t.memexit.rodata,\"a\""},
110341 + {".data..read_only", "\t.section\t.data..read_only,\"a\""},
110342 +};
110343 +
110344 +static unsigned int (*old_section_type_flags)(tree decl, const char *name, int reloc);
110345 +
110346 +static unsigned int constify_section_type_flags(tree decl, const char *name, int reloc)
110347 +{
110348 + size_t i;
110349 +
110350 + for (i = 0; i < ARRAY_SIZE(sections); i++)
110351 + if (!strcmp(sections[i].name, name))
110352 + return 0;
110353 + return old_section_type_flags(decl, name, reloc);
110354 +}
110355 +
110356 +static void constify_start_unit(void *gcc_data, void *user_data)
110357 +{
110358 +// size_t i;
110359 +
110360 +// for (i = 0; i < ARRAY_SIZE(sections); i++)
110361 +// sections[i].section = get_unnamed_section(0, output_section_asm_op, sections[i].asm_op);
110362 +// sections[i].section = get_section(sections[i].name, 0, NULL);
110363 +
110364 + old_section_type_flags = targetm.section_type_flags;
110365 + targetm.section_type_flags = constify_section_type_flags;
110366 +}
110367 +
110368 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110369 +{
110370 + const char * const plugin_name = plugin_info->base_name;
110371 + const int argc = plugin_info->argc;
110372 + const struct plugin_argument * const argv = plugin_info->argv;
110373 + int i;
110374 + bool constify = true;
110375 +
110376 + struct register_pass_info check_local_variables_pass_info;
110377 +
110378 + check_local_variables_pass_info.pass = make_check_local_variables_pass();
110379 + check_local_variables_pass_info.reference_pass_name = "ssa";
110380 + check_local_variables_pass_info.ref_pass_instance_number = 1;
110381 + check_local_variables_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
110382 +
110383 + if (!plugin_default_version_check(version, &gcc_version)) {
110384 + error(G_("incompatible gcc/plugin versions"));
110385 + return 1;
110386 + }
110387 +
110388 + for (i = 0; i < argc; ++i) {
110389 + if (!(strcmp(argv[i].key, "no-constify"))) {
110390 + constify = false;
110391 + continue;
110392 + }
110393 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
110394 + }
110395 +
110396 + if (strcmp(lang_hooks.name, "GNU C")) {
110397 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
110398 + constify = false;
110399 + }
110400 +
110401 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
110402 + if (constify) {
110403 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
110404 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
110405 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &check_local_variables_pass_info);
110406 + register_callback(plugin_name, PLUGIN_START_UNIT, constify_start_unit, NULL);
110407 + }
110408 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
110409 +
110410 + return 0;
110411 +}
110412 diff --git a/tools/gcc/gcc-common.h b/tools/gcc/gcc-common.h
110413 new file mode 100644
110414 index 0000000..e90c205
110415 --- /dev/null
110416 +++ b/tools/gcc/gcc-common.h
110417 @@ -0,0 +1,295 @@
110418 +#ifndef GCC_COMMON_H_INCLUDED
110419 +#define GCC_COMMON_H_INCLUDED
110420 +
110421 +#include "plugin.h"
110422 +#include "bversion.h"
110423 +#include "plugin-version.h"
110424 +#include "config.h"
110425 +#include "system.h"
110426 +#include "coretypes.h"
110427 +#include "tm.h"
110428 +#include "line-map.h"
110429 +#include "input.h"
110430 +#include "tree.h"
110431 +
110432 +#include "tree-inline.h"
110433 +#include "version.h"
110434 +#include "rtl.h"
110435 +#include "tm_p.h"
110436 +#include "flags.h"
110437 +//#include "insn-attr.h"
110438 +//#include "insn-config.h"
110439 +//#include "insn-flags.h"
110440 +#include "hard-reg-set.h"
110441 +//#include "recog.h"
110442 +#include "output.h"
110443 +#include "except.h"
110444 +#include "function.h"
110445 +#include "toplev.h"
110446 +//#include "expr.h"
110447 +#include "basic-block.h"
110448 +#include "intl.h"
110449 +#include "ggc.h"
110450 +//#include "regs.h"
110451 +#include "timevar.h"
110452 +
110453 +#include "params.h"
110454 +#include "pointer-set.h"
110455 +#include "emit-rtl.h"
110456 +//#include "reload.h"
110457 +//#include "ira.h"
110458 +//#include "dwarf2asm.h"
110459 +#include "debug.h"
110460 +#include "target.h"
110461 +#include "langhooks.h"
110462 +#include "cfgloop.h"
110463 +//#include "hosthooks.h"
110464 +#include "cgraph.h"
110465 +#include "opts.h"
110466 +//#include "coverage.h"
110467 +//#include "value-prof.h"
110468 +
110469 +#if BUILDING_GCC_VERSION >= 4007
110470 +#include "tree-pretty-print.h"
110471 +#include "gimple-pretty-print.h"
110472 +#include "c-tree.h"
110473 +//#include "alloc-pool.h"
110474 +#endif
110475 +
110476 +#if BUILDING_GCC_VERSION <= 4008
110477 +#include "tree-flow.h"
110478 +#else
110479 +#include "tree-cfgcleanup.h"
110480 +#endif
110481 +
110482 +#include "diagnostic.h"
110483 +//#include "tree-diagnostic.h"
110484 +#include "tree-dump.h"
110485 +#include "tree-pass.h"
110486 +//#include "df.h"
110487 +#include "predict.h"
110488 +#include "ipa-utils.h"
110489 +
110490 +#if BUILDING_GCC_VERSION >= 4009
110491 +#include "varasm.h"
110492 +#include "stor-layout.h"
110493 +#include "internal-fn.h"
110494 +#include "gimple-expr.h"
110495 +//#include "diagnostic-color.h"
110496 +#include "context.h"
110497 +#include "tree-ssa-alias.h"
110498 +#include "stringpool.h"
110499 +#include "tree-ssanames.h"
110500 +#include "print-tree.h"
110501 +#include "tree-eh.h"
110502 +#include "stmt.h"
110503 +#endif
110504 +
110505 +#include "gimple.h"
110506 +
110507 +#if BUILDING_GCC_VERSION >= 4009
110508 +#include "tree-ssa-operands.h"
110509 +#include "tree-phinodes.h"
110510 +#include "tree-cfg.h"
110511 +#include "gimple-iterator.h"
110512 +#include "gimple-ssa.h"
110513 +#include "ssa-iterators.h"
110514 +#endif
110515 +
110516 +//#include "lto/lto.h"
110517 +//#include "data-streamer.h"
110518 +//#include "lto-compress.h"
110519 +
110520 +//#include "expr.h" where are you...
110521 +extern rtx emit_move_insn(rtx x, rtx y);
110522 +
110523 +// missing from basic_block.h...
110524 +extern void debug_dominance_info(enum cdi_direction dir);
110525 +extern void debug_dominance_tree(enum cdi_direction dir, basic_block root);
110526 +
110527 +#define __unused __attribute__((__unused__))
110528 +
110529 +#define DECL_NAME_POINTER(node) IDENTIFIER_POINTER(DECL_NAME(node))
110530 +#define DECL_NAME_LENGTH(node) IDENTIFIER_LENGTH(DECL_NAME(node))
110531 +#define TYPE_NAME_POINTER(node) IDENTIFIER_POINTER(TYPE_NAME(node))
110532 +#define TYPE_NAME_LENGTH(node) IDENTIFIER_LENGTH(TYPE_NAME(node))
110533 +
110534 +#if BUILDING_GCC_VERSION == 4005
110535 +#define FOR_EACH_LOCAL_DECL(FUN, I, D) for (tree vars = (FUN)->local_decls; vars && (D = TREE_VALUE(vars)); vars = TREE_CHAIN(vars), I)
110536 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
110537 +#define FOR_EACH_VEC_ELT(T, V, I, P) for (I = 0; VEC_iterate(T, (V), (I), (P)); ++(I))
110538 +#define TODO_rebuild_cgraph_edges 0
110539 +
110540 +static inline bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
110541 +{
110542 + tree fndecl;
110543 +
110544 + if (!is_gimple_call(stmt))
110545 + return false;
110546 + fndecl = gimple_call_fndecl(stmt);
110547 + if (!fndecl || DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
110548 + return false;
110549 +// print_node(stderr, "pax", fndecl, 4);
110550 + return DECL_FUNCTION_CODE(fndecl) == code;
110551 +}
110552 +
110553 +static inline bool is_simple_builtin(tree decl)
110554 +{
110555 + if (decl && DECL_BUILT_IN_CLASS(decl) != BUILT_IN_NORMAL)
110556 + return false;
110557 +
110558 + switch (DECL_FUNCTION_CODE(decl)) {
110559 + /* Builtins that expand to constants. */
110560 + case BUILT_IN_CONSTANT_P:
110561 + case BUILT_IN_EXPECT:
110562 + case BUILT_IN_OBJECT_SIZE:
110563 + case BUILT_IN_UNREACHABLE:
110564 + /* Simple register moves or loads from stack. */
110565 + case BUILT_IN_RETURN_ADDRESS:
110566 + case BUILT_IN_EXTRACT_RETURN_ADDR:
110567 + case BUILT_IN_FROB_RETURN_ADDR:
110568 + case BUILT_IN_RETURN:
110569 + case BUILT_IN_AGGREGATE_INCOMING_ADDRESS:
110570 + case BUILT_IN_FRAME_ADDRESS:
110571 + case BUILT_IN_VA_END:
110572 + case BUILT_IN_STACK_SAVE:
110573 + case BUILT_IN_STACK_RESTORE:
110574 + /* Exception state returns or moves registers around. */
110575 + case BUILT_IN_EH_FILTER:
110576 + case BUILT_IN_EH_POINTER:
110577 + case BUILT_IN_EH_COPY_VALUES:
110578 + return true;
110579 +
110580 + default:
110581 + return false;
110582 + }
110583 +}
110584 +#endif
110585 +
110586 +#if BUILDING_GCC_VERSION <= 4006
110587 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
110588 +#define C_DECL_REGISTER(EXP) DECL_LANG_FLAG_4(EXP)
110589 +
110590 +// should come from c-tree.h if only it were installed for gcc 4.5...
110591 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
110592 +
110593 +#define get_random_seed(noinit) ({ \
110594 + unsigned HOST_WIDE_INT seed; \
110595 + sscanf(get_random_seed(noinit), "%" HOST_WIDE_INT_PRINT "x", &seed); \
110596 + seed * seed; })
110597 +
110598 +static inline bool gimple_clobber_p(gimple s)
110599 +{
110600 + return false;
110601 +}
110602 +
110603 +static inline tree builtin_decl_implicit(enum built_in_function fncode)
110604 +{
110605 + return implicit_built_in_decls[fncode];
110606 +}
110607 +
110608 +static inline struct cgraph_node *cgraph_get_create_node(tree decl)
110609 +{
110610 + struct cgraph_node *node = cgraph_get_node(decl);
110611 +
110612 + return node ? node : cgraph_node(decl);
110613 +}
110614 +
110615 +static inline bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
110616 +{
110617 + return node->analyzed && !node->thunk.thunk_p && !node->alias;
110618 +}
110619 +
110620 +static inline struct cgraph_node *cgraph_first_function_with_gimple_body(void)
110621 +{
110622 + struct cgraph_node *node;
110623 +
110624 + for (node = cgraph_nodes; node; node = node->next)
110625 + if (cgraph_function_with_gimple_body_p(node))
110626 + return node;
110627 + return NULL;
110628 +}
110629 +
110630 +static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
110631 +{
110632 + for (node = node->next; node; node = node->next)
110633 + if (cgraph_function_with_gimple_body_p(node))
110634 + return node;
110635 + return NULL;
110636 +}
110637 +
110638 +#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
110639 + for ((node) = cgraph_first_function_with_gimple_body(); (node); \
110640 + (node) = cgraph_next_function_with_gimple_body(node))
110641 +#endif
110642 +
110643 +#if BUILDING_GCC_VERSION == 4006
110644 +extern void debug_gimple_stmt(gimple);
110645 +extern void debug_gimple_seq(gimple_seq);
110646 +extern void print_gimple_seq(FILE *, gimple_seq, int, int);
110647 +extern void print_gimple_stmt(FILE *, gimple, int, int);
110648 +extern void print_gimple_expr(FILE *, gimple, int, int);
110649 +extern void dump_gimple_stmt(pretty_printer *, gimple, int, int);
110650 +#endif
110651 +
110652 +#if BUILDING_GCC_VERSION <= 4007
110653 +#define FOR_EACH_VARIABLE(node) for (node = varpool_nodes; node; node = node->next)
110654 +#define PROP_loops 0
110655 +
110656 +static inline int bb_loop_depth(const_basic_block bb)
110657 +{
110658 + return bb->loop_father ? loop_depth(bb->loop_father) : 0;
110659 +}
110660 +
110661 +static inline bool gimple_store_p(gimple gs)
110662 +{
110663 + tree lhs = gimple_get_lhs(gs);
110664 + return lhs && !is_gimple_reg(lhs);
110665 +}
110666 +#endif
110667 +
110668 +#if BUILDING_GCC_VERSION >= 4007
110669 +#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
110670 + cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
110671 +#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
110672 + cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
110673 +#endif
110674 +
110675 +#if BUILDING_GCC_VERSION <= 4008
110676 +#define ENTRY_BLOCK_PTR_FOR_FN(FN) ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
110677 +#define EXIT_BLOCK_PTR_FOR_FN(FN) EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
110678 +#define basic_block_info_for_fn(FN) ((FN)->cfg->x_basic_block_info)
110679 +#define n_basic_blocks_for_fn(FN) ((FN)->cfg->x_n_basic_blocks)
110680 +#define n_edges_for_fn(FN) ((FN)->cfg->x_n_edges)
110681 +#define last_basic_block_for_fn(FN) ((FN)->cfg->x_last_basic_block)
110682 +#define label_to_block_map_for_fn(FN) ((FN)->cfg->x_label_to_block_map)
110683 +#define profile_status_for_fn(FN) ((FN)->cfg->x_profile_status)
110684 +
110685 +static inline const char *get_tree_code_name(enum tree_code code)
110686 +{
110687 + gcc_assert(code < MAX_TREE_CODES);
110688 + return tree_code_name[code];
110689 +}
110690 +
110691 +#define ipa_remove_stmt_references(cnode, stmt)
110692 +#endif
110693 +
110694 +#if BUILDING_GCC_VERSION == 4008
110695 +#define NODE_DECL(node) node->symbol.decl
110696 +#else
110697 +#define NODE_DECL(node) node->decl
110698 +#endif
110699 +
110700 +#if BUILDING_GCC_VERSION >= 4008
110701 +#define add_referenced_var(var)
110702 +#define mark_sym_for_renaming(var)
110703 +#define varpool_mark_needed_node(node)
110704 +#define TODO_dump_func 0
110705 +#define TODO_dump_cgraph 0
110706 +#endif
110707 +
110708 +#if BUILDING_GCC_VERSION >= 4009
110709 +#define TODO_ggc_collect 0
110710 +#endif
110711 +
110712 +#endif
110713 diff --git a/tools/gcc/gen-random-seed.sh b/tools/gcc/gen-random-seed.sh
110714 new file mode 100644
110715 index 0000000..7514850
110716 --- /dev/null
110717 +++ b/tools/gcc/gen-random-seed.sh
110718 @@ -0,0 +1,8 @@
110719 +#!/bin/sh
110720 +
110721 +if [ ! -f "$1" ]; then
110722 + SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
110723 + echo "const char *randstruct_seed = \"$SEED\";" > "$1"
110724 + HASH=`echo -n "$SEED" | sha256sum | cut -d" " -f1 | tr -d ' \n'`
110725 + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2"
110726 +fi
110727 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
110728 new file mode 100644
110729 index 0000000..d81c094
110730 --- /dev/null
110731 +++ b/tools/gcc/kallocstat_plugin.c
110732 @@ -0,0 +1,183 @@
110733 +/*
110734 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
110735 + * Licensed under the GPL v2
110736 + *
110737 + * Note: the choice of the license means that the compilation process is
110738 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
110739 + * but for the kernel it doesn't matter since it doesn't link against
110740 + * any of the gcc libraries
110741 + *
110742 + * gcc plugin to find the distribution of k*alloc sizes
110743 + *
110744 + * TODO:
110745 + *
110746 + * BUGS:
110747 + * - none known
110748 + */
110749 +
110750 +#include "gcc-common.h"
110751 +
110752 +int plugin_is_GPL_compatible;
110753 +
110754 +static struct plugin_info kallocstat_plugin_info = {
110755 + .version = "201401260140",
110756 + .help = NULL
110757 +};
110758 +
110759 +static const char * const kalloc_functions[] = {
110760 + "__kmalloc",
110761 + "kmalloc",
110762 + "kmalloc_large",
110763 + "kmalloc_node",
110764 + "kmalloc_order",
110765 + "kmalloc_order_trace",
110766 + "kmalloc_slab",
110767 + "kzalloc",
110768 + "kzalloc_node",
110769 +};
110770 +
110771 +static bool is_kalloc(const char *fnname)
110772 +{
110773 + size_t i;
110774 +
110775 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
110776 + if (!strcmp(fnname, kalloc_functions[i]))
110777 + return true;
110778 + return false;
110779 +}
110780 +
110781 +static unsigned int execute_kallocstat(void)
110782 +{
110783 + basic_block bb;
110784 +
110785 + // 1. loop through BBs and GIMPLE statements
110786 + FOR_EACH_BB_FN(bb, cfun) {
110787 + gimple_stmt_iterator gsi;
110788 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
110789 + // gimple match:
110790 + tree fndecl, size;
110791 + gimple stmt;
110792 + const char *fnname;
110793 +
110794 + // is it a call
110795 + stmt = gsi_stmt(gsi);
110796 + if (!is_gimple_call(stmt))
110797 + continue;
110798 + fndecl = gimple_call_fndecl(stmt);
110799 + if (fndecl == NULL_TREE)
110800 + continue;
110801 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
110802 + continue;
110803 +
110804 + // is it a call to k*alloc
110805 + fnname = DECL_NAME_POINTER(fndecl);
110806 + if (!is_kalloc(fnname))
110807 + continue;
110808 +
110809 + // is the size arg const or the result of a simple const assignment
110810 + size = gimple_call_arg(stmt, 0);
110811 + while (true) {
110812 + expanded_location xloc;
110813 + size_t size_val;
110814 +
110815 + if (TREE_CONSTANT(size)) {
110816 + xloc = expand_location(gimple_location(stmt));
110817 + if (!xloc.file)
110818 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
110819 + size_val = TREE_INT_CST_LOW(size);
110820 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
110821 + break;
110822 + }
110823 +
110824 + if (TREE_CODE(size) != SSA_NAME)
110825 + break;
110826 + stmt = SSA_NAME_DEF_STMT(size);
110827 +//debug_gimple_stmt(stmt);
110828 +//debug_tree(size);
110829 + if (!stmt || !is_gimple_assign(stmt))
110830 + break;
110831 + if (gimple_num_ops(stmt) != 2)
110832 + break;
110833 + size = gimple_assign_rhs1(stmt);
110834 + }
110835 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
110836 +//debug_tree(gimple_call_fn(call_stmt));
110837 +//print_node(stderr, "pax", fndecl, 4);
110838 + }
110839 + }
110840 +
110841 + return 0;
110842 +}
110843 +
110844 +#if BUILDING_GCC_VERSION >= 4009
110845 +static const struct pass_data kallocstat_pass_data = {
110846 +#else
110847 +static struct gimple_opt_pass kallocstat_pass = {
110848 + .pass = {
110849 +#endif
110850 + .type = GIMPLE_PASS,
110851 + .name = "kallocstat",
110852 +#if BUILDING_GCC_VERSION >= 4008
110853 + .optinfo_flags = OPTGROUP_NONE,
110854 +#endif
110855 +#if BUILDING_GCC_VERSION >= 4009
110856 + .has_gate = false,
110857 + .has_execute = true,
110858 +#else
110859 + .gate = NULL,
110860 + .execute = execute_kallocstat,
110861 + .sub = NULL,
110862 + .next = NULL,
110863 + .static_pass_number = 0,
110864 +#endif
110865 + .tv_id = TV_NONE,
110866 + .properties_required = 0,
110867 + .properties_provided = 0,
110868 + .properties_destroyed = 0,
110869 + .todo_flags_start = 0,
110870 + .todo_flags_finish = 0
110871 +#if BUILDING_GCC_VERSION < 4009
110872 + }
110873 +#endif
110874 +};
110875 +
110876 +#if BUILDING_GCC_VERSION >= 4009
110877 +namespace {
110878 +class kallocstat_pass : public gimple_opt_pass {
110879 +public:
110880 + kallocstat_pass() : gimple_opt_pass(kallocstat_pass_data, g) {}
110881 + unsigned int execute() { return execute_kallocstat(); }
110882 +};
110883 +}
110884 +
110885 +static opt_pass *make_kallocstat_pass(void)
110886 +{
110887 + return new kallocstat_pass();
110888 +}
110889 +#else
110890 +static struct opt_pass *make_kallocstat_pass(void)
110891 +{
110892 + return &kallocstat_pass.pass;
110893 +}
110894 +#endif
110895 +
110896 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110897 +{
110898 + const char * const plugin_name = plugin_info->base_name;
110899 + struct register_pass_info kallocstat_pass_info;
110900 +
110901 + kallocstat_pass_info.pass = make_kallocstat_pass();
110902 + kallocstat_pass_info.reference_pass_name = "ssa";
110903 + kallocstat_pass_info.ref_pass_instance_number = 1;
110904 + kallocstat_pass_info.pos_op = PASS_POS_INSERT_AFTER;
110905 +
110906 + if (!plugin_default_version_check(version, &gcc_version)) {
110907 + error(G_("incompatible gcc/plugin versions"));
110908 + return 1;
110909 + }
110910 +
110911 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
110912 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
110913 +
110914 + return 0;
110915 +}
110916 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
110917 new file mode 100644
110918 index 0000000..89f256d
110919 --- /dev/null
110920 +++ b/tools/gcc/kernexec_plugin.c
110921 @@ -0,0 +1,522 @@
110922 +/*
110923 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
110924 + * Licensed under the GPL v2
110925 + *
110926 + * Note: the choice of the license means that the compilation process is
110927 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
110928 + * but for the kernel it doesn't matter since it doesn't link against
110929 + * any of the gcc libraries
110930 + *
110931 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
110932 + *
110933 + * TODO:
110934 + *
110935 + * BUGS:
110936 + * - none known
110937 + */
110938 +
110939 +#include "gcc-common.h"
110940 +
110941 +int plugin_is_GPL_compatible;
110942 +
110943 +static struct plugin_info kernexec_plugin_info = {
110944 + .version = "201401260140",
110945 + .help = "method=[bts|or]\tinstrumentation method\n"
110946 +};
110947 +
110948 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
110949 +static void (*kernexec_instrument_retaddr)(rtx);
110950 +
110951 +/*
110952 + * add special KERNEXEC instrumentation: reload %r12 after it has been clobbered
110953 + */
110954 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
110955 +{
110956 + gimple asm_movabs_stmt;
110957 +
110958 + // build asm volatile("movabs $0x8000000000000000, %%r12\n\t" : : : );
110959 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r12\n\t", NULL, NULL, NULL, NULL);
110960 + gimple_asm_set_volatile(asm_movabs_stmt, true);
110961 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
110962 + update_stmt(asm_movabs_stmt);
110963 +}
110964 +
110965 +/*
110966 + * find all asm() stmts that clobber r12 and add a reload of r12
110967 + */
110968 +static unsigned int execute_kernexec_reload(void)
110969 +{
110970 + basic_block bb;
110971 +
110972 + // 1. loop through BBs and GIMPLE statements
110973 + FOR_EACH_BB_FN(bb, cfun) {
110974 + gimple_stmt_iterator gsi;
110975 +
110976 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
110977 + // gimple match: __asm__ ("" : : : "r12");
110978 + gimple asm_stmt;
110979 + size_t nclobbers;
110980 +
110981 + // is it an asm ...
110982 + asm_stmt = gsi_stmt(gsi);
110983 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
110984 + continue;
110985 +
110986 + // ... clobbering r12
110987 + nclobbers = gimple_asm_nclobbers(asm_stmt);
110988 + while (nclobbers--) {
110989 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
110990 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r12"))
110991 + continue;
110992 + kernexec_reload_fptr_mask(&gsi);
110993 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
110994 + break;
110995 + }
110996 + }
110997 + }
110998 +
110999 + return 0;
111000 +}
111001 +
111002 +/*
111003 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
111004 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
111005 + */
111006 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
111007 +{
111008 + gimple assign_intptr, assign_new_fptr, call_stmt;
111009 + tree intptr, orptr, old_fptr, new_fptr, kernexec_mask;
111010 +
111011 + call_stmt = gsi_stmt(*gsi);
111012 + old_fptr = gimple_call_fn(call_stmt);
111013 +
111014 + // create temporary unsigned long variable used for bitops and cast fptr to it
111015 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
111016 + add_referenced_var(intptr);
111017 + intptr = make_ssa_name(intptr, NULL);
111018 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
111019 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
111020 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
111021 + update_stmt(assign_intptr);
111022 +
111023 + // apply logical or to temporary unsigned long and bitmask
111024 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
111025 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
111026 + orptr = fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask);
111027 + intptr = make_ssa_name(SSA_NAME_VAR(intptr), NULL);
111028 + assign_intptr = gimple_build_assign(intptr, orptr);
111029 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
111030 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
111031 + update_stmt(assign_intptr);
111032 +
111033 + // cast temporary unsigned long back to a temporary fptr variable
111034 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
111035 + add_referenced_var(new_fptr);
111036 + new_fptr = make_ssa_name(new_fptr, NULL);
111037 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
111038 + SSA_NAME_DEF_STMT(new_fptr) = assign_new_fptr;
111039 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
111040 + update_stmt(assign_new_fptr);
111041 +
111042 + // replace call stmt fn with the new fptr
111043 + gimple_call_set_fn(call_stmt, new_fptr);
111044 + update_stmt(call_stmt);
111045 +}
111046 +
111047 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
111048 +{
111049 + gimple asm_or_stmt, call_stmt;
111050 + tree old_fptr, new_fptr, input, output;
111051 +#if BUILDING_GCC_VERSION <= 4007
111052 + VEC(tree, gc) *inputs = NULL;
111053 + VEC(tree, gc) *outputs = NULL;
111054 +#else
111055 + vec<tree, va_gc> *inputs = NULL;
111056 + vec<tree, va_gc> *outputs = NULL;
111057 +#endif
111058 +
111059 + call_stmt = gsi_stmt(*gsi);
111060 + old_fptr = gimple_call_fn(call_stmt);
111061 +
111062 + // create temporary fptr variable
111063 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
111064 + add_referenced_var(new_fptr);
111065 + new_fptr = make_ssa_name(new_fptr, NULL);
111066 +
111067 + // build asm volatile("orq %%r12, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
111068 + input = build_tree_list(NULL_TREE, build_string(1, "0"));
111069 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
111070 + output = build_tree_list(NULL_TREE, build_string(2, "=r"));
111071 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
111072 +#if BUILDING_GCC_VERSION <= 4007
111073 + VEC_safe_push(tree, gc, inputs, input);
111074 + VEC_safe_push(tree, gc, outputs, output);
111075 +#else
111076 + vec_safe_push(inputs, input);
111077 + vec_safe_push(outputs, output);
111078 +#endif
111079 + asm_or_stmt = gimple_build_asm_vec("orq %%r12, %0\n\t", inputs, outputs, NULL, NULL);
111080 + SSA_NAME_DEF_STMT(new_fptr) = asm_or_stmt;
111081 + gimple_asm_set_volatile(asm_or_stmt, true);
111082 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
111083 + update_stmt(asm_or_stmt);
111084 +
111085 + // replace call stmt fn with the new fptr
111086 + gimple_call_set_fn(call_stmt, new_fptr);
111087 + update_stmt(call_stmt);
111088 +}
111089 +
111090 +/*
111091 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
111092 + */
111093 +static unsigned int execute_kernexec_fptr(void)
111094 +{
111095 + basic_block bb;
111096 +
111097 + // 1. loop through BBs and GIMPLE statements
111098 + FOR_EACH_BB_FN(bb, cfun) {
111099 + gimple_stmt_iterator gsi;
111100 +
111101 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111102 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
111103 + tree fn;
111104 + gimple call_stmt;
111105 +
111106 + // is it a call ...
111107 + call_stmt = gsi_stmt(gsi);
111108 + if (!is_gimple_call(call_stmt))
111109 + continue;
111110 + fn = gimple_call_fn(call_stmt);
111111 + if (TREE_CODE(fn) == ADDR_EXPR)
111112 + continue;
111113 + if (TREE_CODE(fn) != SSA_NAME)
111114 + gcc_unreachable();
111115 +
111116 + // ... through a function pointer
111117 + if (SSA_NAME_VAR(fn) != NULL_TREE) {
111118 + fn = SSA_NAME_VAR(fn);
111119 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
111120 + debug_tree(fn);
111121 + gcc_unreachable();
111122 + }
111123 + }
111124 + fn = TREE_TYPE(fn);
111125 + if (TREE_CODE(fn) != POINTER_TYPE)
111126 + continue;
111127 + fn = TREE_TYPE(fn);
111128 + if (TREE_CODE(fn) != FUNCTION_TYPE)
111129 + continue;
111130 +
111131 + kernexec_instrument_fptr(&gsi);
111132 +
111133 +//debug_tree(gimple_call_fn(call_stmt));
111134 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
111135 + }
111136 + }
111137 +
111138 + return 0;
111139 +}
111140 +
111141 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
111142 +static void kernexec_instrument_retaddr_bts(rtx insn)
111143 +{
111144 + rtx btsq;
111145 + rtvec argvec, constraintvec, labelvec;
111146 + int line;
111147 +
111148 + // create asm volatile("btsq $63,(%%rsp)":::)
111149 + argvec = rtvec_alloc(0);
111150 + constraintvec = rtvec_alloc(0);
111151 + labelvec = rtvec_alloc(0);
111152 + line = expand_location(RTL_LOCATION(insn)).line;
111153 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
111154 + MEM_VOLATILE_P(btsq) = 1;
111155 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
111156 + emit_insn_before(btsq, insn);
111157 +}
111158 +
111159 +// add special KERNEXEC instrumentation: orq %r12,(%rsp) just before retn
111160 +static void kernexec_instrument_retaddr_or(rtx insn)
111161 +{
111162 + rtx orq;
111163 + rtvec argvec, constraintvec, labelvec;
111164 + int line;
111165 +
111166 + // create asm volatile("orq %%r12,(%%rsp)":::)
111167 + argvec = rtvec_alloc(0);
111168 + constraintvec = rtvec_alloc(0);
111169 + labelvec = rtvec_alloc(0);
111170 + line = expand_location(RTL_LOCATION(insn)).line;
111171 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r12,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
111172 + MEM_VOLATILE_P(orq) = 1;
111173 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
111174 + emit_insn_before(orq, insn);
111175 +}
111176 +
111177 +/*
111178 + * find all asm level function returns and forcibly set the highest bit of the return address
111179 + */
111180 +static unsigned int execute_kernexec_retaddr(void)
111181 +{
111182 + rtx insn;
111183 +
111184 +// if (stack_realign_drap)
111185 +// inform(DECL_SOURCE_LOCATION(current_function_decl), "drap detected in %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
111186 +
111187 + // 1. find function returns
111188 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
111189 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
111190 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
111191 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
111192 + rtx body;
111193 +
111194 + // is it a retn
111195 + if (!JUMP_P(insn))
111196 + continue;
111197 + body = PATTERN(insn);
111198 + if (GET_CODE(body) == PARALLEL)
111199 + body = XVECEXP(body, 0, 0);
111200 + if (!ANY_RETURN_P(body))
111201 + continue;
111202 + kernexec_instrument_retaddr(insn);
111203 + }
111204 +
111205 +// print_simple_rtl(stderr, get_insns());
111206 +// print_rtl(stderr, get_insns());
111207 +
111208 + return 0;
111209 +}
111210 +
111211 +static bool kernexec_cmodel_check(void)
111212 +{
111213 + tree section;
111214 +
111215 + if (ix86_cmodel != CM_KERNEL)
111216 + return false;
111217 +
111218 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
111219 + if (!section || !TREE_VALUE(section))
111220 + return true;
111221 +
111222 + section = TREE_VALUE(TREE_VALUE(section));
111223 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
111224 + return true;
111225 +
111226 + return false;
111227 +}
111228 +
111229 +#if BUILDING_GCC_VERSION >= 4009
111230 +static const struct pass_data kernexec_reload_pass_data = {
111231 +#else
111232 +static struct gimple_opt_pass kernexec_reload_pass = {
111233 + .pass = {
111234 +#endif
111235 + .type = GIMPLE_PASS,
111236 + .name = "kernexec_reload",
111237 +#if BUILDING_GCC_VERSION >= 4008
111238 + .optinfo_flags = OPTGROUP_NONE,
111239 +#endif
111240 +#if BUILDING_GCC_VERSION >= 4009
111241 + .has_gate = true,
111242 + .has_execute = true,
111243 +#else
111244 + .gate = kernexec_cmodel_check,
111245 + .execute = execute_kernexec_reload,
111246 + .sub = NULL,
111247 + .next = NULL,
111248 + .static_pass_number = 0,
111249 +#endif
111250 + .tv_id = TV_NONE,
111251 + .properties_required = 0,
111252 + .properties_provided = 0,
111253 + .properties_destroyed = 0,
111254 + .todo_flags_start = 0,
111255 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
111256 +#if BUILDING_GCC_VERSION < 4009
111257 + }
111258 +#endif
111259 +};
111260 +
111261 +#if BUILDING_GCC_VERSION >= 4009
111262 +static const struct pass_data kernexec_fptr_pass_data = {
111263 +#else
111264 +static struct gimple_opt_pass kernexec_fptr_pass = {
111265 + .pass = {
111266 +#endif
111267 + .type = GIMPLE_PASS,
111268 + .name = "kernexec_fptr",
111269 +#if BUILDING_GCC_VERSION >= 4008
111270 + .optinfo_flags = OPTGROUP_NONE,
111271 +#endif
111272 +#if BUILDING_GCC_VERSION >= 4009
111273 + .has_gate = true,
111274 + .has_execute = true,
111275 +#else
111276 + .gate = kernexec_cmodel_check,
111277 + .execute = execute_kernexec_fptr,
111278 + .sub = NULL,
111279 + .next = NULL,
111280 + .static_pass_number = 0,
111281 +#endif
111282 + .tv_id = TV_NONE,
111283 + .properties_required = 0,
111284 + .properties_provided = 0,
111285 + .properties_destroyed = 0,
111286 + .todo_flags_start = 0,
111287 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
111288 +#if BUILDING_GCC_VERSION < 4009
111289 + }
111290 +#endif
111291 +};
111292 +
111293 +#if BUILDING_GCC_VERSION >= 4009
111294 +static const struct pass_data kernexec_retaddr_pass_data = {
111295 +#else
111296 +static struct rtl_opt_pass kernexec_retaddr_pass = {
111297 + .pass = {
111298 +#endif
111299 + .type = RTL_PASS,
111300 + .name = "kernexec_retaddr",
111301 +#if BUILDING_GCC_VERSION >= 4008
111302 + .optinfo_flags = OPTGROUP_NONE,
111303 +#endif
111304 +#if BUILDING_GCC_VERSION >= 4009
111305 + .has_gate = true,
111306 + .has_execute = true,
111307 +#else
111308 + .gate = kernexec_cmodel_check,
111309 + .execute = execute_kernexec_retaddr,
111310 + .sub = NULL,
111311 + .next = NULL,
111312 + .static_pass_number = 0,
111313 +#endif
111314 + .tv_id = TV_NONE,
111315 + .properties_required = 0,
111316 + .properties_provided = 0,
111317 + .properties_destroyed = 0,
111318 + .todo_flags_start = 0,
111319 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
111320 +#if BUILDING_GCC_VERSION < 4009
111321 + }
111322 +#endif
111323 +};
111324 +
111325 +#if BUILDING_GCC_VERSION >= 4009
111326 +namespace {
111327 +class kernexec_reload_pass : public gimple_opt_pass {
111328 +public:
111329 + kernexec_reload_pass() : gimple_opt_pass(kernexec_reload_pass_data, g) {}
111330 + bool gate() { return kernexec_cmodel_check(); }
111331 + unsigned int execute() { return execute_kernexec_reload(); }
111332 +};
111333 +
111334 +class kernexec_fptr_pass : public gimple_opt_pass {
111335 +public:
111336 + kernexec_fptr_pass() : gimple_opt_pass(kernexec_fptr_pass_data, g) {}
111337 + bool gate() { return kernexec_cmodel_check(); }
111338 + unsigned int execute() { return execute_kernexec_fptr(); }
111339 +};
111340 +
111341 +class kernexec_retaddr_pass : public rtl_opt_pass {
111342 +public:
111343 + kernexec_retaddr_pass() : rtl_opt_pass(kernexec_retaddr_pass_data, g) {}
111344 + bool gate() { return kernexec_cmodel_check(); }
111345 + unsigned int execute() { return execute_kernexec_retaddr(); }
111346 +};
111347 +}
111348 +
111349 +static opt_pass *make_kernexec_reload_pass(void)
111350 +{
111351 + return new kernexec_reload_pass();
111352 +}
111353 +
111354 +static opt_pass *make_kernexec_fptr_pass(void)
111355 +{
111356 + return new kernexec_fptr_pass();
111357 +}
111358 +
111359 +static opt_pass *make_kernexec_retaddr_pass(void)
111360 +{
111361 + return new kernexec_retaddr_pass();
111362 +}
111363 +#else
111364 +static struct opt_pass *make_kernexec_reload_pass(void)
111365 +{
111366 + return &kernexec_reload_pass.pass;
111367 +}
111368 +
111369 +static struct opt_pass *make_kernexec_fptr_pass(void)
111370 +{
111371 + return &kernexec_fptr_pass.pass;
111372 +}
111373 +
111374 +static struct opt_pass *make_kernexec_retaddr_pass(void)
111375 +{
111376 + return &kernexec_retaddr_pass.pass;
111377 +}
111378 +#endif
111379 +
111380 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
111381 +{
111382 + const char * const plugin_name = plugin_info->base_name;
111383 + const int argc = plugin_info->argc;
111384 + const struct plugin_argument * const argv = plugin_info->argv;
111385 + int i;
111386 + struct register_pass_info kernexec_reload_pass_info;
111387 + struct register_pass_info kernexec_fptr_pass_info;
111388 + struct register_pass_info kernexec_retaddr_pass_info;
111389 +
111390 + kernexec_reload_pass_info.pass = make_kernexec_reload_pass();
111391 + kernexec_reload_pass_info.reference_pass_name = "ssa";
111392 + kernexec_reload_pass_info.ref_pass_instance_number = 1;
111393 + kernexec_reload_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111394 +
111395 + kernexec_fptr_pass_info.pass = make_kernexec_fptr_pass();
111396 + kernexec_fptr_pass_info.reference_pass_name = "ssa";
111397 + kernexec_fptr_pass_info.ref_pass_instance_number = 1;
111398 + kernexec_fptr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111399 +
111400 + kernexec_retaddr_pass_info.pass = make_kernexec_retaddr_pass();
111401 + kernexec_retaddr_pass_info.reference_pass_name = "pro_and_epilogue";
111402 + kernexec_retaddr_pass_info.ref_pass_instance_number = 1;
111403 + kernexec_retaddr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111404 +
111405 + if (!plugin_default_version_check(version, &gcc_version)) {
111406 + error(G_("incompatible gcc/plugin versions"));
111407 + return 1;
111408 + }
111409 +
111410 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
111411 +
111412 + if (TARGET_64BIT == 0)
111413 + return 0;
111414 +
111415 + for (i = 0; i < argc; ++i) {
111416 + if (!strcmp(argv[i].key, "method")) {
111417 + if (!argv[i].value) {
111418 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
111419 + continue;
111420 + }
111421 + if (!strcmp(argv[i].value, "bts")) {
111422 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
111423 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
111424 + } else if (!strcmp(argv[i].value, "or")) {
111425 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
111426 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
111427 + fix_register("r12", 1, 1);
111428 + } else
111429 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
111430 + continue;
111431 + }
111432 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
111433 + }
111434 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
111435 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
111436 +
111437 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
111438 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
111439 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
111440 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
111441 +
111442 + return 0;
111443 +}
111444 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
111445 new file mode 100644
111446 index 0000000..e48b323
111447 --- /dev/null
111448 +++ b/tools/gcc/latent_entropy_plugin.c
111449 @@ -0,0 +1,466 @@
111450 +/*
111451 + * Copyright 2012-2014 by the PaX Team <pageexec@freemail.hu>
111452 + * Licensed under the GPL v2
111453 + *
111454 + * Note: the choice of the license means that the compilation process is
111455 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
111456 + * but for the kernel it doesn't matter since it doesn't link against
111457 + * any of the gcc libraries
111458 + *
111459 + * gcc plugin to help generate a little bit of entropy from program state,
111460 + * used throughout the uptime of the kernel
111461 + *
111462 + * TODO:
111463 + * - add ipa pass to identify not explicitly marked candidate functions
111464 + * - mix in more program state (function arguments/return values, loop variables, etc)
111465 + * - more instrumentation control via attribute parameters
111466 + *
111467 + * BUGS:
111468 + * - LTO needs -flto-partition=none for now
111469 + */
111470 +
111471 +#include "gcc-common.h"
111472 +
111473 +int plugin_is_GPL_compatible;
111474 +
111475 +static tree latent_entropy_decl;
111476 +
111477 +static struct plugin_info latent_entropy_plugin_info = {
111478 + .version = "201409101820",
111479 + .help = NULL
111480 +};
111481 +
111482 +static unsigned HOST_WIDE_INT seed;
111483 +static unsigned HOST_WIDE_INT get_random_const(void)
111484 +{
111485 + unsigned int i;
111486 + unsigned HOST_WIDE_INT ret = 0;
111487 +
111488 + for (i = 0; i < 8 * sizeof ret; i++) {
111489 + ret = (ret << 1) | (seed & 1);
111490 + seed >>= 1;
111491 + if (ret & 1)
111492 + seed ^= 0xD800000000000000ULL;
111493 + }
111494 +
111495 + return ret;
111496 +}
111497 +
111498 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
111499 +{
111500 + tree type;
111501 + unsigned long long mask;
111502 +#if BUILDING_GCC_VERSION <= 4007
111503 + VEC(constructor_elt, gc) *vals;
111504 +#else
111505 + vec<constructor_elt, va_gc> *vals;
111506 +#endif
111507 +
111508 + switch (TREE_CODE(*node)) {
111509 + default:
111510 + *no_add_attrs = true;
111511 + error("%qE attribute only applies to functions and variables", name);
111512 + break;
111513 +
111514 + case VAR_DECL:
111515 + if (DECL_INITIAL(*node)) {
111516 + *no_add_attrs = true;
111517 + error("variable %qD with %qE attribute must not be initialized", *node, name);
111518 + break;
111519 + }
111520 +
111521 + if (!TREE_STATIC(*node)) {
111522 + *no_add_attrs = true;
111523 + error("variable %qD with %qE attribute must not be local", *node, name);
111524 + break;
111525 + }
111526 +
111527 + type = TREE_TYPE(*node);
111528 + switch (TREE_CODE(type)) {
111529 + default:
111530 + *no_add_attrs = true;
111531 + 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);
111532 + break;
111533 +
111534 + case RECORD_TYPE: {
111535 + tree field;
111536 + unsigned int nelt = 0;
111537 +
111538 + for (field = TYPE_FIELDS(type); field; nelt++, field = TREE_CHAIN(field)) {
111539 + tree fieldtype;
111540 +
111541 + fieldtype = TREE_TYPE(field);
111542 + if (TREE_CODE(fieldtype) != INTEGER_TYPE) {
111543 + *no_add_attrs = true;
111544 + error("structure variable %qD with %qE attribute has a non-integer field %qE", *node, name, field);
111545 + break;
111546 + }
111547 + }
111548 +
111549 + if (field)
111550 + break;
111551 +
111552 +#if BUILDING_GCC_VERSION <= 4007
111553 + vals = VEC_alloc(constructor_elt, gc, nelt);
111554 +#else
111555 + vec_alloc(vals, nelt);
111556 +#endif
111557 +
111558 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
111559 + tree fieldtype;
111560 +
111561 + fieldtype = TREE_TYPE(field);
111562 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(fieldtype)) - 1);
111563 + mask = 2 * (mask - 1) + 1;
111564 +
111565 + if (TYPE_UNSIGNED(fieldtype))
111566 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cstu(fieldtype, mask & get_random_const()));
111567 + else
111568 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cst(fieldtype, mask & get_random_const()));
111569 + }
111570 +
111571 + DECL_INITIAL(*node) = build_constructor(type, vals);
111572 +//debug_tree(DECL_INITIAL(*node));
111573 + break;
111574 + }
111575 +
111576 + case INTEGER_TYPE:
111577 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(type)) - 1);
111578 + mask = 2 * (mask - 1) + 1;
111579 +
111580 + if (TYPE_UNSIGNED(type))
111581 + DECL_INITIAL(*node) = build_int_cstu(type, mask & get_random_const());
111582 + else
111583 + DECL_INITIAL(*node) = build_int_cst(type, mask & get_random_const());
111584 + break;
111585 +
111586 + case ARRAY_TYPE: {
111587 + tree elt_type, array_size, elt_size;
111588 + unsigned int i, nelt;
111589 +
111590 + elt_type = TREE_TYPE(type);
111591 + elt_size = TYPE_SIZE_UNIT(TREE_TYPE(type));
111592 + array_size = TYPE_SIZE_UNIT(type);
111593 +
111594 + if (TREE_CODE(elt_type) != INTEGER_TYPE || !array_size || TREE_CODE(array_size) != INTEGER_CST) {
111595 + *no_add_attrs = true;
111596 + error("array variable %qD with %qE attribute must be a fixed length integer array type", *node, name);
111597 + break;
111598 + }
111599 +
111600 + nelt = TREE_INT_CST_LOW(array_size) / TREE_INT_CST_LOW(elt_size);
111601 +#if BUILDING_GCC_VERSION <= 4007
111602 + vals = VEC_alloc(constructor_elt, gc, nelt);
111603 +#else
111604 + vec_alloc(vals, nelt);
111605 +#endif
111606 +
111607 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(elt_type)) - 1);
111608 + mask = 2 * (mask - 1) + 1;
111609 +
111610 + for (i = 0; i < nelt; i++)
111611 + if (TYPE_UNSIGNED(elt_type))
111612 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cstu(elt_type, mask & get_random_const()));
111613 + else
111614 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cst(elt_type, mask & get_random_const()));
111615 +
111616 + DECL_INITIAL(*node) = build_constructor(type, vals);
111617 +//debug_tree(DECL_INITIAL(*node));
111618 + break;
111619 + }
111620 + }
111621 + break;
111622 +
111623 + case FUNCTION_DECL:
111624 + break;
111625 + }
111626 +
111627 + return NULL_TREE;
111628 +}
111629 +
111630 +static struct attribute_spec latent_entropy_attr = {
111631 + .name = "latent_entropy",
111632 + .min_length = 0,
111633 + .max_length = 0,
111634 + .decl_required = true,
111635 + .type_required = false,
111636 + .function_type_required = false,
111637 + .handler = handle_latent_entropy_attribute,
111638 +#if BUILDING_GCC_VERSION >= 4007
111639 + .affects_type_identity = false
111640 +#endif
111641 +};
111642 +
111643 +static void register_attributes(void *event_data, void *data)
111644 +{
111645 + register_attribute(&latent_entropy_attr);
111646 +}
111647 +
111648 +static bool gate_latent_entropy(void)
111649 +{
111650 + // don't bother with noreturn functions for now
111651 + if (TREE_THIS_VOLATILE(current_function_decl))
111652 + return false;
111653 +
111654 + // gcc-4.5 doesn't discover some trivial noreturn functions
111655 + if (EDGE_COUNT(EXIT_BLOCK_PTR_FOR_FN(cfun)->preds) == 0)
111656 + return false;
111657 +
111658 + return lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl)) != NULL_TREE;
111659 +}
111660 +
111661 +static enum tree_code get_op(tree *rhs)
111662 +{
111663 + static enum tree_code op;
111664 + unsigned HOST_WIDE_INT random_const;
111665 +
111666 + random_const = get_random_const();
111667 +
111668 + switch (op) {
111669 + case BIT_XOR_EXPR:
111670 + op = PLUS_EXPR;
111671 + break;
111672 +
111673 + case PLUS_EXPR:
111674 + if (rhs) {
111675 + op = LROTATE_EXPR;
111676 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
111677 + break;
111678 + }
111679 +
111680 + case LROTATE_EXPR:
111681 + default:
111682 + op = BIT_XOR_EXPR;
111683 + break;
111684 + }
111685 + if (rhs)
111686 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
111687 + return op;
111688 +}
111689 +
111690 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
111691 +{
111692 + gimple_stmt_iterator gsi;
111693 + gimple assign;
111694 + tree addxorrol, rhs;
111695 + enum tree_code op;
111696 +
111697 + op = get_op(&rhs);
111698 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
111699 + assign = gimple_build_assign(local_entropy, addxorrol);
111700 + gsi = gsi_after_labels(bb);
111701 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
111702 + update_stmt(assign);
111703 +//debug_bb(bb);
111704 +}
111705 +
111706 +static void perturb_latent_entropy(basic_block bb, tree rhs)
111707 +{
111708 + gimple_stmt_iterator gsi;
111709 + gimple assign;
111710 + tree addxorrol, temp;
111711 +
111712 + // 1. create temporary copy of latent_entropy
111713 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
111714 + add_referenced_var(temp);
111715 +
111716 + // 2. read...
111717 + temp = make_ssa_name(temp, NULL);
111718 + assign = gimple_build_assign(temp, latent_entropy_decl);
111719 + SSA_NAME_DEF_STMT(temp) = assign;
111720 + add_referenced_var(latent_entropy_decl);
111721 + gsi = gsi_after_labels(bb);
111722 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111723 + update_stmt(assign);
111724 +
111725 + // 3. ...modify...
111726 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
111727 + temp = make_ssa_name(SSA_NAME_VAR(temp), NULL);
111728 + assign = gimple_build_assign(temp, addxorrol);
111729 + SSA_NAME_DEF_STMT(temp) = assign;
111730 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111731 + update_stmt(assign);
111732 +
111733 + // 4. ...write latent_entropy
111734 + assign = gimple_build_assign(latent_entropy_decl, temp);
111735 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111736 + update_stmt(assign);
111737 +}
111738 +
111739 +static unsigned int execute_latent_entropy(void)
111740 +{
111741 + basic_block bb;
111742 + gimple assign;
111743 + gimple_stmt_iterator gsi;
111744 + tree local_entropy;
111745 +
111746 + if (!latent_entropy_decl) {
111747 +#if BUILDING_GCC_VERSION >= 4009
111748 + varpool_node *node;
111749 +#else
111750 + struct varpool_node *node;
111751 +#endif
111752 +
111753 + FOR_EACH_VARIABLE(node) {
111754 + tree var = NODE_DECL(node);
111755 +
111756 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
111757 + continue;
111758 + latent_entropy_decl = var;
111759 +// debug_tree(var);
111760 + break;
111761 + }
111762 + if (!latent_entropy_decl) {
111763 +// debug_tree(current_function_decl);
111764 + return 0;
111765 + }
111766 + }
111767 +
111768 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
111769 +
111770 + // 1. create local entropy variable
111771 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
111772 + add_referenced_var(local_entropy);
111773 + mark_sym_for_renaming(local_entropy);
111774 +
111775 + // 2. initialize local entropy variable
111776 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
111777 + if (dom_info_available_p(CDI_DOMINATORS))
111778 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
111779 + gsi = gsi_start_bb(bb);
111780 +
111781 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
111782 +// gimple_set_location(assign, loc);
111783 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
111784 + update_stmt(assign);
111785 +//debug_bb(bb);
111786 + gcc_assert(single_succ_p(bb));
111787 + bb = single_succ(bb);
111788 +
111789 + // 3. instrument each BB with an operation on the local entropy variable
111790 + while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {
111791 + perturb_local_entropy(bb, local_entropy);
111792 +//debug_bb(bb);
111793 + bb = bb->next_bb;
111794 + };
111795 +
111796 + // 4. mix local entropy into the global entropy variable
111797 + gcc_assert(single_pred_p(EXIT_BLOCK_PTR_FOR_FN(cfun)));
111798 + perturb_latent_entropy(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)), local_entropy);
111799 +//debug_bb(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)));
111800 + return 0;
111801 +}
111802 +
111803 +static void latent_entropy_start_unit(void *gcc_data, void *user_data)
111804 +{
111805 + tree latent_entropy_type;
111806 +
111807 + seed = get_random_seed(false);
111808 +
111809 + if (in_lto_p)
111810 + return;
111811 +
111812 + // extern volatile u64 latent_entropy
111813 + gcc_assert(TYPE_PRECISION(long_long_unsigned_type_node) == 64);
111814 + latent_entropy_type = build_qualified_type(long_long_unsigned_type_node, TYPE_QUALS(long_long_unsigned_type_node) | TYPE_QUAL_VOLATILE);
111815 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), latent_entropy_type);
111816 +
111817 + TREE_STATIC(latent_entropy_decl) = 1;
111818 + TREE_PUBLIC(latent_entropy_decl) = 1;
111819 + TREE_USED(latent_entropy_decl) = 1;
111820 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
111821 + DECL_EXTERNAL(latent_entropy_decl) = 1;
111822 + DECL_ARTIFICIAL(latent_entropy_decl) = 1;
111823 + lang_hooks.decls.pushdecl(latent_entropy_decl);
111824 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
111825 +// varpool_finalize_decl(latent_entropy_decl);
111826 +// varpool_mark_needed_node(latent_entropy_decl);
111827 +}
111828 +
111829 +#if BUILDING_GCC_VERSION >= 4009
111830 +static const struct pass_data latent_entropy_pass_data = {
111831 +#else
111832 +static struct gimple_opt_pass latent_entropy_pass = {
111833 + .pass = {
111834 +#endif
111835 + .type = GIMPLE_PASS,
111836 + .name = "latent_entropy",
111837 +#if BUILDING_GCC_VERSION >= 4008
111838 + .optinfo_flags = OPTGROUP_NONE,
111839 +#endif
111840 +#if BUILDING_GCC_VERSION >= 4009
111841 + .has_gate = true,
111842 + .has_execute = true,
111843 +#else
111844 + .gate = gate_latent_entropy,
111845 + .execute = execute_latent_entropy,
111846 + .sub = NULL,
111847 + .next = NULL,
111848 + .static_pass_number = 0,
111849 +#endif
111850 + .tv_id = TV_NONE,
111851 + .properties_required = PROP_gimple_leh | PROP_cfg,
111852 + .properties_provided = 0,
111853 + .properties_destroyed = 0,
111854 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
111855 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
111856 +#if BUILDING_GCC_VERSION < 4009
111857 + }
111858 +#endif
111859 +};
111860 +
111861 +#if BUILDING_GCC_VERSION >= 4009
111862 +namespace {
111863 +class latent_entropy_pass : public gimple_opt_pass {
111864 +public:
111865 + latent_entropy_pass() : gimple_opt_pass(latent_entropy_pass_data, g) {}
111866 + bool gate() { return gate_latent_entropy(); }
111867 + unsigned int execute() { return execute_latent_entropy(); }
111868 +};
111869 +}
111870 +
111871 +static opt_pass *make_latent_entropy_pass(void)
111872 +{
111873 + return new latent_entropy_pass();
111874 +}
111875 +#else
111876 +static struct opt_pass *make_latent_entropy_pass(void)
111877 +{
111878 + return &latent_entropy_pass.pass;
111879 +}
111880 +#endif
111881 +
111882 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
111883 +{
111884 + const char * const plugin_name = plugin_info->base_name;
111885 + struct register_pass_info latent_entropy_pass_info;
111886 +
111887 + latent_entropy_pass_info.pass = make_latent_entropy_pass();
111888 + latent_entropy_pass_info.reference_pass_name = "optimized";
111889 + latent_entropy_pass_info.ref_pass_instance_number = 1;
111890 + latent_entropy_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
111891 + static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = {
111892 + {
111893 + .base = &latent_entropy_decl,
111894 + .nelt = 1,
111895 + .stride = sizeof(latent_entropy_decl),
111896 + .cb = &gt_ggc_mx_tree_node,
111897 + .pchw = &gt_pch_nx_tree_node
111898 + },
111899 + LAST_GGC_ROOT_TAB
111900 + };
111901 +
111902 + if (!plugin_default_version_check(version, &gcc_version)) {
111903 + error(G_("incompatible gcc/plugin versions"));
111904 + return 1;
111905 + }
111906 +
111907 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
111908 + register_callback(plugin_name, PLUGIN_START_UNIT, &latent_entropy_start_unit, NULL);
111909 + if (!in_lto_p)
111910 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_latent_entropy);
111911 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
111912 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
111913 +
111914 + return 0;
111915 +}
111916 diff --git a/tools/gcc/randomize_layout_plugin.c b/tools/gcc/randomize_layout_plugin.c
111917 new file mode 100644
111918 index 0000000..a5cb46b
111919 --- /dev/null
111920 +++ b/tools/gcc/randomize_layout_plugin.c
111921 @@ -0,0 +1,915 @@
111922 +/*
111923 + * Copyright 2014 by Open Source Security, Inc., Brad Spengler <spender@grsecurity.net>
111924 + * and PaX Team <pageexec@freemail.hu>
111925 + * Licensed under the GPL v2
111926 + *
111927 + * Usage:
111928 + * $ # for 4.5/4.6/C based 4.7
111929 + * $ 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
111930 + * $ # for C++ based 4.7/4.8+
111931 + * $ 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
111932 + * $ gcc -fplugin=./randomize_layout_plugin.so test.c -O2
111933 + */
111934 +
111935 +#include "gcc-common.h"
111936 +#include "randomize_layout_seed.h"
111937 +
111938 +#if BUILDING_GCC_MAJOR < 4 || BUILDING_GCC_MINOR < 6 || (BUILDING_GCC_MINOR == 6 && BUILDING_GCC_PATCHLEVEL < 4)
111939 +#error "The RANDSTRUCT plugin requires GCC 4.6.4 or newer."
111940 +#endif
111941 +
111942 +#define ORIG_TYPE_NAME(node) \
111943 + (TYPE_NAME(TYPE_MAIN_VARIANT(node)) != NULL_TREE ? ((const unsigned char *)IDENTIFIER_POINTER(TYPE_NAME(TYPE_MAIN_VARIANT(node)))) : (const unsigned char *)"anonymous")
111944 +
111945 +int plugin_is_GPL_compatible;
111946 +
111947 +static int performance_mode;
111948 +
111949 +static struct plugin_info randomize_layout_plugin_info = {
111950 + .version = "201402201816",
111951 + .help = "disable\t\t\tdo not activate plugin\n"
111952 + "performance-mode\tenable cacheline-aware layout randomization\n"
111953 +};
111954 +
111955 +/* from old Linux dcache.h */
111956 +static inline unsigned long
111957 +partial_name_hash(unsigned long c, unsigned long prevhash)
111958 +{
111959 + return (prevhash + (c << 4) + (c >> 4)) * 11;
111960 +}
111961 +static inline unsigned int
111962 +name_hash(const unsigned char *name)
111963 +{
111964 + unsigned long hash = 0;
111965 + unsigned int len = strlen((const char *)name);
111966 + while (len--)
111967 + hash = partial_name_hash(*name++, hash);
111968 + return (unsigned int)hash;
111969 +}
111970 +
111971 +static tree handle_randomize_layout_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
111972 +{
111973 + tree type;
111974 +
111975 + *no_add_attrs = true;
111976 + if (TREE_CODE(*node) == FUNCTION_DECL) {
111977 + error("%qE attribute does not apply to functions (%qF)", name, *node);
111978 + return NULL_TREE;
111979 + }
111980 +
111981 + if (TREE_CODE(*node) == PARM_DECL) {
111982 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
111983 + return NULL_TREE;
111984 + }
111985 +
111986 + if (TREE_CODE(*node) == VAR_DECL) {
111987 + error("%qE attribute does not apply to variables (%qD)", name, *node);
111988 + return NULL_TREE;
111989 + }
111990 +
111991 + if (TYPE_P(*node)) {
111992 + type = *node;
111993 + } else {
111994 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
111995 + type = TREE_TYPE(*node);
111996 + }
111997 +
111998 + if (TREE_CODE(type) != RECORD_TYPE) {
111999 + error("%qE attribute used on %qT applies to struct types only", name, type);
112000 + return NULL_TREE;
112001 + }
112002 +
112003 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
112004 + error("%qE attribute is already applied to the type %qT", name, type);
112005 + return NULL_TREE;
112006 + }
112007 +
112008 + *no_add_attrs = false;
112009 +
112010 + return NULL_TREE;
112011 +}
112012 +
112013 +/* set on complete types that we don't need to inspect further at all */
112014 +static tree handle_randomize_considered_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112015 +{
112016 + *no_add_attrs = false;
112017 + return NULL_TREE;
112018 +}
112019 +
112020 +/*
112021 + * set on types that we've performed a shuffle on, to prevent re-shuffling
112022 + * this does not preclude us from inspecting its fields for potential shuffles
112023 + */
112024 +static tree handle_randomize_performed_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112025 +{
112026 + *no_add_attrs = false;
112027 + return NULL_TREE;
112028 +}
112029 +
112030 +/*
112031 + * 64bit variant of Bob Jenkins' public domain PRNG
112032 + * 256 bits of internal state
112033 + */
112034 +
112035 +typedef unsigned long long u64;
112036 +
112037 +typedef struct ranctx { u64 a; u64 b; u64 c; u64 d; } ranctx;
112038 +
112039 +#define rot(x,k) (((x)<<(k))|((x)>>(64-(k))))
112040 +static u64 ranval(ranctx *x) {
112041 + u64 e = x->a - rot(x->b, 7);
112042 + x->a = x->b ^ rot(x->c, 13);
112043 + x->b = x->c + rot(x->d, 37);
112044 + x->c = x->d + e;
112045 + x->d = e + x->a;
112046 + return x->d;
112047 +}
112048 +
112049 +static void raninit(ranctx *x, u64 *seed) {
112050 + int i;
112051 +
112052 + x->a = seed[0];
112053 + x->b = seed[1];
112054 + x->c = seed[2];
112055 + x->d = seed[3];
112056 +
112057 + for (i=0; i < 30; ++i)
112058 + (void)ranval(x);
112059 +}
112060 +
112061 +static u64 shuffle_seed[4];
112062 +
112063 +struct partition_group {
112064 + tree tree_start;
112065 + unsigned long start;
112066 + unsigned long length;
112067 +};
112068 +
112069 +static void partition_struct(tree *fields, unsigned long length, struct partition_group *size_groups, unsigned long *num_groups)
112070 +{
112071 + unsigned long i;
112072 + unsigned long accum_size = 0;
112073 + unsigned long accum_length = 0;
112074 + unsigned long group_idx = 0;
112075 +
112076 + gcc_assert(length < INT_MAX);
112077 +
112078 + memset(size_groups, 0, sizeof(struct partition_group) * length);
112079 +
112080 + for (i = 0; i < length; i++) {
112081 + if (size_groups[group_idx].tree_start == NULL_TREE) {
112082 + size_groups[group_idx].tree_start = fields[i];
112083 + size_groups[group_idx].start = i;
112084 + accum_length = 0;
112085 + accum_size = 0;
112086 + }
112087 + accum_size += (unsigned long)int_size_in_bytes(TREE_TYPE(fields[i]));
112088 + accum_length++;
112089 + if (accum_size >= 64) {
112090 + size_groups[group_idx].length = accum_length;
112091 + accum_length = 0;
112092 + group_idx++;
112093 + }
112094 + }
112095 +
112096 + if (size_groups[group_idx].tree_start != NULL_TREE &&
112097 + !size_groups[group_idx].length) {
112098 + size_groups[group_idx].length = accum_length;
112099 + group_idx++;
112100 + }
112101 +
112102 + *num_groups = group_idx;
112103 +}
112104 +
112105 +static void performance_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
112106 +{
112107 + unsigned long i, x;
112108 + struct partition_group size_group[length];
112109 + unsigned long num_groups = 0;
112110 + unsigned long randnum;
112111 +
112112 + partition_struct(newtree, length, (struct partition_group *)&size_group, &num_groups);
112113 + for (i = num_groups - 1; i > 0; i--) {
112114 + struct partition_group tmp;
112115 + randnum = ranval(prng_state) % (i + 1);
112116 + tmp = size_group[i];
112117 + size_group[i] = size_group[randnum];
112118 + size_group[randnum] = tmp;
112119 + }
112120 +
112121 + for (x = 0; x < num_groups; x++) {
112122 + for (i = size_group[x].start + size_group[x].length - 1; i > size_group[x].start; i--) {
112123 + tree tmp;
112124 + if (DECL_BIT_FIELD_TYPE(newtree[i]))
112125 + continue;
112126 + randnum = ranval(prng_state) % (i + 1);
112127 + // we could handle this case differently if desired
112128 + if (DECL_BIT_FIELD_TYPE(newtree[randnum]))
112129 + continue;
112130 + tmp = newtree[i];
112131 + newtree[i] = newtree[randnum];
112132 + newtree[randnum] = tmp;
112133 + }
112134 + }
112135 +}
112136 +
112137 +static void full_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
112138 +{
112139 + unsigned long i, randnum;
112140 +
112141 + for (i = length - 1; i > 0; i--) {
112142 + tree tmp;
112143 + randnum = ranval(prng_state) % (i + 1);
112144 + tmp = newtree[i];
112145 + newtree[i] = newtree[randnum];
112146 + newtree[randnum] = tmp;
112147 + }
112148 +}
112149 +
112150 +/* modern in-place Fisher-Yates shuffle */
112151 +static void shuffle(const_tree type, tree *newtree, unsigned long length)
112152 +{
112153 + unsigned long i;
112154 + u64 seed[4];
112155 + ranctx prng_state;
112156 + const unsigned char *structname;
112157 +
112158 + if (length == 0)
112159 + return;
112160 +
112161 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112162 +
112163 + structname = ORIG_TYPE_NAME(type);
112164 +
112165 +#ifdef __DEBUG_PLUGIN
112166 + fprintf(stderr, "Shuffling struct %s %p\n", (const char *)structname, type);
112167 +#ifdef __DEBUG_VERBOSE
112168 + debug_tree((tree)type);
112169 +#endif
112170 +#endif
112171 +
112172 + for (i = 0; i < 4; i++) {
112173 + seed[i] = shuffle_seed[i];
112174 + seed[i] ^= name_hash(structname);
112175 + }
112176 +
112177 + raninit(&prng_state, (u64 *)&seed);
112178 +
112179 + if (performance_mode)
112180 + performance_shuffle(newtree, length, &prng_state);
112181 + else
112182 + full_shuffle(newtree, length, &prng_state);
112183 +}
112184 +
112185 +static bool is_flexible_array(const_tree field)
112186 +{
112187 + const_tree fieldtype;
112188 + const_tree typesize;
112189 + const_tree elemtype;
112190 + const_tree elemsize;
112191 +
112192 + fieldtype = TREE_TYPE(field);
112193 + typesize = TYPE_SIZE(fieldtype);
112194 +
112195 + if (TREE_CODE(fieldtype) != ARRAY_TYPE)
112196 + return false;
112197 +
112198 + elemtype = TREE_TYPE(fieldtype);
112199 + elemsize = TYPE_SIZE(elemtype);
112200 +
112201 + /* size of type is represented in bits */
112202 +
112203 + if (typesize == NULL_TREE && TYPE_DOMAIN(fieldtype) != NULL_TREE &&
112204 + TYPE_MAX_VALUE(TYPE_DOMAIN(fieldtype)) == NULL_TREE)
112205 + return true;
112206 +
112207 + if (typesize != NULL_TREE &&
112208 + (TREE_CONSTANT(typesize) && (!TREE_INT_CST_LOW(typesize) ||
112209 + TREE_INT_CST_LOW(typesize) == TREE_INT_CST_LOW(elemsize))))
112210 + return true;
112211 +
112212 + return false;
112213 +}
112214 +
112215 +static int relayout_struct(tree type)
112216 +{
112217 + unsigned long num_fields = (unsigned long)list_length(TYPE_FIELDS(type));
112218 + unsigned long shuffle_length = num_fields;
112219 + tree field;
112220 + tree newtree[num_fields];
112221 + unsigned long i;
112222 + tree list;
112223 + tree variant;
112224 + expanded_location xloc;
112225 +
112226 + if (TYPE_FIELDS(type) == NULL_TREE)
112227 + return 0;
112228 +
112229 + if (num_fields < 2)
112230 + return 0;
112231 +
112232 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112233 +
112234 + gcc_assert(num_fields < INT_MAX);
112235 +
112236 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)) ||
112237 + lookup_attribute("no_randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))))
112238 + return 0;
112239 +
112240 + /* Workaround for 3rd-party VirtualBox source that we can't modify ourselves */
112241 + if (!strcmp((const char *)ORIG_TYPE_NAME(type), "INTNETTRUNKFACTORY") ||
112242 + !strcmp((const char *)ORIG_TYPE_NAME(type), "RAWPCIFACTORY"))
112243 + return 0;
112244 +
112245 + /* throw out any structs in uapi */
112246 + xloc = expand_location(DECL_SOURCE_LOCATION(TYPE_FIELDS(type)));
112247 +
112248 + if (strstr(xloc.file, "/uapi/"))
112249 + error(G_("attempted to randomize userland API struct %s"), ORIG_TYPE_NAME(type));
112250 +
112251 + for (field = TYPE_FIELDS(type), i = 0; field; field = TREE_CHAIN(field), i++) {
112252 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
112253 + newtree[i] = field;
112254 + }
112255 +
112256 + /*
112257 + * enforce that we don't randomize the layout of the last
112258 + * element of a struct if it's a 0 or 1-length array
112259 + * or a proper flexible array
112260 + */
112261 + if (is_flexible_array(newtree[num_fields - 1]))
112262 + shuffle_length--;
112263 +
112264 + shuffle(type, (tree *)newtree, shuffle_length);
112265 +
112266 + /*
112267 + * set up a bogus anonymous struct field designed to error out on unnamed struct initializers
112268 + * as gcc provides no other way to detect such code
112269 + */
112270 + list = make_node(FIELD_DECL);
112271 + TREE_CHAIN(list) = newtree[0];
112272 + TREE_TYPE(list) = void_type_node;
112273 + DECL_SIZE(list) = bitsize_zero_node;
112274 + DECL_NONADDRESSABLE_P(list) = 1;
112275 + DECL_FIELD_BIT_OFFSET(list) = bitsize_zero_node;
112276 + DECL_SIZE_UNIT(list) = size_zero_node;
112277 + DECL_FIELD_OFFSET(list) = size_zero_node;
112278 + // to satisfy the constify plugin
112279 + TREE_READONLY(list) = 1;
112280 +
112281 + for (i = 0; i < num_fields - 1; i++)
112282 + TREE_CHAIN(newtree[i]) = newtree[i+1];
112283 + TREE_CHAIN(newtree[num_fields - 1]) = NULL_TREE;
112284 +
112285 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
112286 + TYPE_FIELDS(variant) = list;
112287 + TYPE_ATTRIBUTES(variant) = copy_list(TYPE_ATTRIBUTES(variant));
112288 + TYPE_ATTRIBUTES(variant) = tree_cons(get_identifier("randomize_performed"), NULL_TREE, TYPE_ATTRIBUTES(variant));
112289 + // force a re-layout
112290 + TYPE_SIZE(variant) = NULL_TREE;
112291 + layout_type(variant);
112292 + }
112293 +
112294 + return 1;
112295 +}
112296 +
112297 +/* from constify plugin */
112298 +static const_tree get_field_type(const_tree field)
112299 +{
112300 + return strip_array_types(TREE_TYPE(field));
112301 +}
112302 +
112303 +/* from constify plugin */
112304 +static bool is_fptr(const_tree fieldtype)
112305 +{
112306 + if (TREE_CODE(fieldtype) != POINTER_TYPE)
112307 + return false;
112308 +
112309 + return TREE_CODE(TREE_TYPE(fieldtype)) == FUNCTION_TYPE;
112310 +}
112311 +
112312 +/* derived from constify plugin */
112313 +static int is_pure_ops_struct(const_tree node)
112314 +{
112315 + const_tree field;
112316 +
112317 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
112318 +
112319 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
112320 + const_tree fieldtype = get_field_type(field);
112321 + enum tree_code code = TREE_CODE(fieldtype);
112322 +
112323 + if (node == fieldtype)
112324 + continue;
112325 +
112326 + if (!is_fptr(fieldtype))
112327 + return 0;
112328 +
112329 + if (code != RECORD_TYPE && code != UNION_TYPE)
112330 + continue;
112331 +
112332 + if (!is_pure_ops_struct(fieldtype))
112333 + return 0;
112334 + }
112335 +
112336 + return 1;
112337 +}
112338 +
112339 +static void randomize_type(tree type)
112340 +{
112341 + tree variant;
112342 +
112343 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112344 +
112345 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
112346 + return;
112347 +
112348 + if (lookup_attribute("randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))) || is_pure_ops_struct(type))
112349 + relayout_struct(type);
112350 +
112351 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
112352 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
112353 + TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("randomize_considered"), NULL_TREE, TYPE_ATTRIBUTES(type));
112354 + }
112355 +#ifdef __DEBUG_PLUGIN
112356 + fprintf(stderr, "Marking randomize_considered on struct %s\n", ORIG_TYPE_NAME(type));
112357 +#ifdef __DEBUG_VERBOSE
112358 + debug_tree(type);
112359 +#endif
112360 +#endif
112361 +}
112362 +
112363 +static void randomize_layout_finish_decl(void *event_data, void *data)
112364 +{
112365 + tree decl = (tree)event_data;
112366 + tree type;
112367 +
112368 + if (decl == NULL_TREE || decl == error_mark_node)
112369 + return;
112370 +
112371 + type = TREE_TYPE(decl);
112372 +
112373 + if (TREE_CODE(decl) != VAR_DECL)
112374 + return;
112375 +
112376 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
112377 + return;
112378 +
112379 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)))
112380 + return;
112381 +
112382 + relayout_decl(decl);
112383 +}
112384 +
112385 +static void finish_type(void *event_data, void *data)
112386 +{
112387 + tree type = (tree)event_data;
112388 +
112389 + if (type == NULL_TREE || type == error_mark_node)
112390 + return;
112391 +
112392 + if (TREE_CODE(type) != RECORD_TYPE)
112393 + return;
112394 +
112395 + if (TYPE_FIELDS(type) == NULL_TREE)
112396 + return;
112397 +
112398 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
112399 + return;
112400 +
112401 +#ifdef __DEBUG_PLUGIN
112402 + fprintf(stderr, "Calling randomize_type on %s\n", ORIG_TYPE_NAME(type));
112403 +#endif
112404 +#ifdef __DEBUG_VERBOSE
112405 + debug_tree(type);
112406 +#endif
112407 + randomize_type(type);
112408 +
112409 + return;
112410 +}
112411 +
112412 +static struct attribute_spec randomize_layout_attr = {
112413 + .name = "randomize_layout",
112414 + // related to args
112415 + .min_length = 0,
112416 + .max_length = 0,
112417 + .decl_required = false,
112418 + // need type declaration
112419 + .type_required = true,
112420 + .function_type_required = false,
112421 + .handler = handle_randomize_layout_attr,
112422 +#if BUILDING_GCC_VERSION >= 4007
112423 + .affects_type_identity = true
112424 +#endif
112425 +};
112426 +
112427 +static struct attribute_spec no_randomize_layout_attr = {
112428 + .name = "no_randomize_layout",
112429 + // related to args
112430 + .min_length = 0,
112431 + .max_length = 0,
112432 + .decl_required = false,
112433 + // need type declaration
112434 + .type_required = true,
112435 + .function_type_required = false,
112436 + .handler = handle_randomize_layout_attr,
112437 +#if BUILDING_GCC_VERSION >= 4007
112438 + .affects_type_identity = true
112439 +#endif
112440 +};
112441 +
112442 +static struct attribute_spec randomize_considered_attr = {
112443 + .name = "randomize_considered",
112444 + // related to args
112445 + .min_length = 0,
112446 + .max_length = 0,
112447 + .decl_required = false,
112448 + // need type declaration
112449 + .type_required = true,
112450 + .function_type_required = false,
112451 + .handler = handle_randomize_considered_attr,
112452 +#if BUILDING_GCC_VERSION >= 4007
112453 + .affects_type_identity = false
112454 +#endif
112455 +};
112456 +
112457 +static struct attribute_spec randomize_performed_attr = {
112458 + .name = "randomize_performed",
112459 + // related to args
112460 + .min_length = 0,
112461 + .max_length = 0,
112462 + .decl_required = false,
112463 + // need type declaration
112464 + .type_required = true,
112465 + .function_type_required = false,
112466 + .handler = handle_randomize_performed_attr,
112467 +#if BUILDING_GCC_VERSION >= 4007
112468 + .affects_type_identity = false
112469 +#endif
112470 +};
112471 +
112472 +static void register_attributes(void *event_data, void *data)
112473 +{
112474 + register_attribute(&randomize_layout_attr);
112475 + register_attribute(&no_randomize_layout_attr);
112476 + register_attribute(&randomize_considered_attr);
112477 + register_attribute(&randomize_performed_attr);
112478 +}
112479 +
112480 +static void check_bad_casts_in_constructor(tree var, tree init)
112481 +{
112482 + unsigned HOST_WIDE_INT idx;
112483 + tree field, val;
112484 + tree field_type, val_type;
112485 +
112486 + FOR_EACH_CONSTRUCTOR_ELT(CONSTRUCTOR_ELTS(init), idx, field, val) {
112487 + if (TREE_CODE(val) == CONSTRUCTOR) {
112488 + check_bad_casts_in_constructor(var, val);
112489 + continue;
112490 + }
112491 +
112492 + /* pipacs' plugin creates franken-arrays that differ from those produced by
112493 + normal code which all have valid 'field' trees. work around this */
112494 + if (field == NULL_TREE)
112495 + continue;
112496 + field_type = TREE_TYPE(field);
112497 + val_type = TREE_TYPE(val);
112498 +
112499 + if (TREE_CODE(field_type) != POINTER_TYPE || TREE_CODE(val_type) != POINTER_TYPE)
112500 + continue;
112501 +
112502 + if (field_type == val_type)
112503 + continue;
112504 +
112505 + field_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(field_type))));
112506 + val_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(val_type))));
112507 +
112508 + if (field_type == void_type_node)
112509 + continue;
112510 + if (field_type == val_type)
112511 + continue;
112512 + if (TREE_CODE(val_type) != RECORD_TYPE)
112513 + continue;
112514 +
112515 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(val_type)))
112516 + continue;
112517 + inform(DECL_SOURCE_LOCATION(var), "found mismatched struct pointer types: %qT and %qT\n", TYPE_MAIN_VARIANT(field_type), TYPE_MAIN_VARIANT(val_type));
112518 + }
112519 +}
112520 +
112521 +/* derived from the constify plugin */
112522 +static void check_global_variables(void *event_data, void *data)
112523 +{
112524 + struct varpool_node *node;
112525 + tree init;
112526 +
112527 + FOR_EACH_VARIABLE(node) {
112528 + tree var = NODE_DECL(node);
112529 + init = DECL_INITIAL(var);
112530 + if (init == NULL_TREE)
112531 + continue;
112532 +
112533 + if (TREE_CODE(init) != CONSTRUCTOR)
112534 + continue;
112535 +
112536 + check_bad_casts_in_constructor(var, init);
112537 + }
112538 +}
112539 +
112540 +static bool dominated_by_is_err(const_tree rhs, basic_block bb)
112541 +{
112542 + basic_block dom;
112543 + gimple dom_stmt;
112544 + gimple call_stmt;
112545 + const_tree dom_lhs;
112546 + const_tree poss_is_err_cond;
112547 + const_tree poss_is_err_func;
112548 + const_tree is_err_arg;
112549 +
112550 + dom = get_immediate_dominator(CDI_DOMINATORS, bb);
112551 + if (!dom)
112552 + return false;
112553 +
112554 + dom_stmt = last_stmt(dom);
112555 + if (!dom_stmt)
112556 + return false;
112557 +
112558 + if (gimple_code(dom_stmt) != GIMPLE_COND)
112559 + return false;
112560 +
112561 + if (gimple_cond_code(dom_stmt) != NE_EXPR)
112562 + return false;
112563 +
112564 + if (!integer_zerop(gimple_cond_rhs(dom_stmt)))
112565 + return false;
112566 +
112567 + poss_is_err_cond = gimple_cond_lhs(dom_stmt);
112568 +
112569 + if (TREE_CODE(poss_is_err_cond) != SSA_NAME)
112570 + return false;
112571 +
112572 + call_stmt = SSA_NAME_DEF_STMT(poss_is_err_cond);
112573 +
112574 + if (gimple_code(call_stmt) != GIMPLE_CALL)
112575 + return false;
112576 +
112577 + dom_lhs = gimple_get_lhs(call_stmt);
112578 + poss_is_err_func = gimple_call_fndecl(call_stmt);
112579 + if (!poss_is_err_func)
112580 + return false;
112581 + if (dom_lhs != poss_is_err_cond)
112582 + return false;
112583 + if (strcmp(DECL_NAME_POINTER(poss_is_err_func), "IS_ERR"))
112584 + return false;
112585 +
112586 + is_err_arg = gimple_call_arg(call_stmt, 0);
112587 + if (!is_err_arg)
112588 + return false;
112589 +
112590 + if (is_err_arg != rhs)
112591 + return false;
112592 +
112593 + return true;
112594 +}
112595 +
112596 +static void handle_local_var_initializers(void)
112597 +{
112598 + tree var;
112599 + unsigned int i;
112600 +
112601 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
112602 + tree init = DECL_INITIAL(var);
112603 + if (!init)
112604 + continue;
112605 + if (TREE_CODE(init) != CONSTRUCTOR)
112606 + continue;
112607 + check_bad_casts_in_constructor(var, init);
112608 + }
112609 +}
112610 +
112611 +/*
112612 + * iterate over all statements to find "bad" casts:
112613 + * those where the address of the start of a structure is cast
112614 + * to a pointer of a structure of a different type, or a
112615 + * structure pointer type is cast to a different structure pointer type
112616 + */
112617 +static unsigned int find_bad_casts(void)
112618 +{
112619 + basic_block bb;
112620 +
112621 + handle_local_var_initializers();
112622 +
112623 + FOR_ALL_BB_FN(bb, cfun) {
112624 + gimple_stmt_iterator gsi;
112625 +
112626 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
112627 + gimple stmt;
112628 + const_tree lhs;
112629 + const_tree lhs_type;
112630 + const_tree rhs1;
112631 + const_tree rhs_type;
112632 + const_tree ptr_lhs_type;
112633 + const_tree ptr_rhs_type;
112634 + const_tree op0;
112635 + const_tree op0_type;
112636 + enum tree_code rhs_code;
112637 +
112638 + stmt = gsi_stmt(gsi);
112639 +
112640 +#ifdef __DEBUG_PLUGIN
112641 +#ifdef __DEBUG_VERBOSE
112642 + debug_gimple_stmt(stmt);
112643 + debug_tree(gimple_get_lhs(stmt));
112644 +#endif
112645 +#endif
112646 +
112647 + if (gimple_code(stmt) != GIMPLE_ASSIGN)
112648 + continue;
112649 +
112650 +#ifdef __DEBUG_PLUGIN
112651 +#ifdef __DEBUG_VERBOSE
112652 + debug_tree(gimple_assign_rhs1(stmt));
112653 +#endif
112654 +#endif
112655 +
112656 + rhs_code = gimple_assign_rhs_code(stmt);
112657 +
112658 + if (rhs_code != ADDR_EXPR && rhs_code != SSA_NAME)
112659 + continue;
112660 +
112661 + lhs = gimple_get_lhs(stmt);
112662 + lhs_type = TREE_TYPE(lhs);
112663 + rhs1 = gimple_assign_rhs1(stmt);
112664 + rhs_type = TREE_TYPE(rhs1);
112665 +
112666 + if (TREE_CODE(rhs_type) != POINTER_TYPE ||
112667 + TREE_CODE(lhs_type) != POINTER_TYPE)
112668 + continue;
112669 +
112670 + ptr_lhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(lhs_type))));
112671 + ptr_rhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(rhs_type))));
112672 +
112673 + if (ptr_rhs_type == void_type_node)
112674 + continue;
112675 +
112676 + if (ptr_lhs_type == void_type_node)
112677 + continue;
112678 +
112679 + if (dominated_by_is_err(rhs1, bb))
112680 + continue;
112681 +
112682 + if (TREE_CODE(ptr_rhs_type) != RECORD_TYPE) {
112683 +#ifndef __DEBUG_PLUGIN
112684 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_lhs_type)))
112685 +#endif
112686 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
112687 + continue;
112688 + }
112689 +
112690 + if (rhs_code == SSA_NAME && ptr_lhs_type == ptr_rhs_type)
112691 + continue;
112692 +
112693 + if (rhs_code == ADDR_EXPR) {
112694 + op0 = TREE_OPERAND(rhs1, 0);
112695 +
112696 + if (op0 == NULL_TREE)
112697 + continue;
112698 +
112699 + if (TREE_CODE(op0) != VAR_DECL)
112700 + continue;
112701 +
112702 + op0_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(op0))));
112703 + if (op0_type == ptr_lhs_type)
112704 + continue;
112705 +
112706 +#ifndef __DEBUG_PLUGIN
112707 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(op0_type)))
112708 +#endif
112709 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, op0_type);
112710 + } else {
112711 + const_tree ssa_name_var = SSA_NAME_VAR(rhs1);
112712 + /* skip bogus type casts introduced by container_of */
112713 + if (ssa_name_var != NULL_TREE && DECL_NAME(ssa_name_var) &&
112714 + !strcmp((const char *)DECL_NAME_POINTER(ssa_name_var), "__mptr"))
112715 + continue;
112716 +#ifndef __DEBUG_PLUGIN
112717 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_rhs_type)))
112718 +#endif
112719 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
112720 + }
112721 +
112722 + }
112723 + }
112724 + return 0;
112725 +}
112726 +
112727 +#if BUILDING_GCC_VERSION >= 4009
112728 +static const struct pass_data randomize_layout_bad_cast_data = {
112729 +#else
112730 +static struct gimple_opt_pass randomize_layout_bad_cast = {
112731 + .pass = {
112732 +#endif
112733 + .type = GIMPLE_PASS,
112734 + .name = "randomize_layout_bad_cast",
112735 +#if BUILDING_GCC_VERSION >= 4008
112736 + .optinfo_flags = OPTGROUP_NONE,
112737 +#endif
112738 +#if BUILDING_GCC_VERSION >= 4009
112739 + .has_gate = false,
112740 + .has_execute = true,
112741 +#else
112742 + .gate = NULL,
112743 + .execute = find_bad_casts,
112744 + .sub = NULL,
112745 + .next = NULL,
112746 + .static_pass_number = 0,
112747 +#endif
112748 + .tv_id = TV_NONE,
112749 + .properties_required = PROP_cfg,
112750 + .properties_provided = 0,
112751 + .properties_destroyed = 0,
112752 + .todo_flags_start = 0,
112753 + .todo_flags_finish = TODO_dump_func
112754 +#if BUILDING_GCC_VERSION < 4009
112755 + }
112756 +#endif
112757 +};
112758 +
112759 +#if BUILDING_GCC_VERSION >= 4009
112760 +namespace {
112761 +class randomize_layout_bad_cast : public gimple_opt_pass {
112762 +public:
112763 + randomize_layout_bad_cast() : gimple_opt_pass(randomize_layout_bad_cast_data, g) {}
112764 + unsigned int execute() { return find_bad_casts(); }
112765 +};
112766 +}
112767 +#endif
112768 +
112769 +static struct opt_pass *make_randomize_layout_bad_cast(void)
112770 +{
112771 +#if BUILDING_GCC_VERSION >= 4009
112772 + return new randomize_layout_bad_cast();
112773 +#else
112774 + return &randomize_layout_bad_cast.pass;
112775 +#endif
112776 +}
112777 +
112778 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
112779 +{
112780 + int i;
112781 + const char * const plugin_name = plugin_info->base_name;
112782 + const int argc = plugin_info->argc;
112783 + const struct plugin_argument * const argv = plugin_info->argv;
112784 + bool enable = true;
112785 + int obtained_seed = 0;
112786 + struct register_pass_info randomize_layout_bad_cast_info;
112787 +
112788 + randomize_layout_bad_cast_info.pass = make_randomize_layout_bad_cast();
112789 + randomize_layout_bad_cast_info.reference_pass_name = "ssa";
112790 + randomize_layout_bad_cast_info.ref_pass_instance_number = 1;
112791 + randomize_layout_bad_cast_info.pos_op = PASS_POS_INSERT_AFTER;
112792 +
112793 + if (!plugin_default_version_check(version, &gcc_version)) {
112794 + error(G_("incompatible gcc/plugin versions"));
112795 + return 1;
112796 + }
112797 +
112798 + if (strcmp(lang_hooks.name, "GNU C")) {
112799 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
112800 + enable = false;
112801 + }
112802 +
112803 + for (i = 0; i < argc; ++i) {
112804 + if (!strcmp(argv[i].key, "disable")) {
112805 + enable = false;
112806 + continue;
112807 + }
112808 + if (!strcmp(argv[i].key, "performance-mode")) {
112809 + performance_mode = 1;
112810 + continue;
112811 + }
112812 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
112813 + }
112814 +
112815 + if (strlen(randstruct_seed) != 64) {
112816 + error(G_("invalid seed value supplied for %s plugin"), plugin_name);
112817 + return 1;
112818 + }
112819 + obtained_seed = sscanf(randstruct_seed, "%016llx%016llx%016llx%016llx",
112820 + &shuffle_seed[0], &shuffle_seed[1], &shuffle_seed[2], &shuffle_seed[3]);
112821 + if (obtained_seed != 4) {
112822 + error(G_("Invalid seed supplied for %s plugin"), plugin_name);
112823 + return 1;
112824 + }
112825 +
112826 + register_callback(plugin_name, PLUGIN_INFO, NULL, &randomize_layout_plugin_info);
112827 + if (enable) {
112828 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
112829 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &randomize_layout_bad_cast_info);
112830 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
112831 + register_callback(plugin_name, PLUGIN_FINISH_DECL, randomize_layout_finish_decl, NULL);
112832 + }
112833 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
112834 +
112835 + return 0;
112836 +}
112837 diff --git a/tools/gcc/size_overflow_plugin/.gitignore b/tools/gcc/size_overflow_plugin/.gitignore
112838 new file mode 100644
112839 index 0000000..1f0214f
112840 --- /dev/null
112841 +++ b/tools/gcc/size_overflow_plugin/.gitignore
112842 @@ -0,0 +1,3 @@
112843 +randomize_layout_seed.h
112844 +size_overflow_hash.h
112845 +size_overflow_hash_aux.h
112846 diff --git a/tools/gcc/size_overflow_plugin/Makefile b/tools/gcc/size_overflow_plugin/Makefile
112847 new file mode 100644
112848 index 0000000..1ae2ed5
112849 --- /dev/null
112850 +++ b/tools/gcc/size_overflow_plugin/Makefile
112851 @@ -0,0 +1,20 @@
112852 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
112853 +always := $($(HOSTLIBS)-y)
112854 +
112855 +size_overflow_plugin-objs := $(patsubst $(srctree)/$(src)/%.c,%.o,$(wildcard $(srctree)/$(src)/*.c))
112856 +
112857 +$(patsubst $(srctree)/$(src)/%.c,$(obj)/%.o,$(wildcard $(srctree)/$(src)/*.c)): $(objtree)/$(obj)/size_overflow_hash.h $(objtree)/$(obj)/size_overflow_hash_aux.h
112858 +
112859 +quiet_cmd_build_size_overflow_hash = GENHASH $@
112860 + cmd_build_size_overflow_hash = \
112861 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash -d $< -o $@
112862 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
112863 + $(call if_changed,build_size_overflow_hash)
112864 +
112865 +quiet_cmd_build_size_overflow_hash_aux = GENHASH $@
112866 + cmd_build_size_overflow_hash_aux = \
112867 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash_aux -d $< -o $@
112868 +$(objtree)/$(obj)/size_overflow_hash_aux.h: $(src)/size_overflow_hash_aux.data FORCE
112869 + $(call if_changed,build_size_overflow_hash_aux)
112870 +
112871 +targets += size_overflow_hash.h size_overflow_hash_aux.h
112872 diff --git a/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
112873 new file mode 100644
112874 index 0000000..12b1e3b
112875 --- /dev/null
112876 +++ b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
112877 @@ -0,0 +1,102 @@
112878 +#!/bin/bash
112879 +
112880 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
112881 +
112882 +header1="size_overflow_hash.h"
112883 +database="size_overflow_hash.data"
112884 +n=65536
112885 +hashtable_name="size_overflow_hash"
112886 +
112887 +usage() {
112888 +cat <<EOF
112889 +usage: $0 options
112890 +OPTIONS:
112891 + -h|--help help
112892 + -o header file
112893 + -d database file
112894 + -n hash array size
112895 + -s name of the hash table
112896 +EOF
112897 + return 0
112898 +}
112899 +
112900 +while true
112901 +do
112902 + case "$1" in
112903 + -h|--help) usage && exit 0;;
112904 + -n) n=$2; shift 2;;
112905 + -o) header1="$2"; shift 2;;
112906 + -d) database="$2"; shift 2;;
112907 + -s) hashtable_name="$2"; shift 2;;
112908 + --) shift 1; break ;;
112909 + *) break ;;
112910 + esac
112911 +done
112912 +
112913 +create_defines() {
112914 + for i in `seq 0 31`
112915 + do
112916 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
112917 + done
112918 + echo >> "$header1"
112919 +}
112920 +
112921 +create_structs() {
112922 + rm -f "$header1"
112923 +
112924 + create_defines
112925 +
112926 + cat "$database" | while read data
112927 + do
112928 + data_array=($data)
112929 + struct_hash_name="${data_array[0]}"
112930 + funcn="${data_array[1]}"
112931 + params="${data_array[2]}"
112932 + next="${data_array[4]}"
112933 +
112934 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
112935 +
112936 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
112937 + echo -en "\t.param\t= " >> "$header1"
112938 + line=
112939 + for param_num in ${params//-/ };
112940 + do
112941 + line="${line}PARAM"$param_num"|"
112942 + done
112943 +
112944 + echo -e "${line%?},\n};\n" >> "$header1"
112945 + done
112946 +}
112947 +
112948 +create_headers() {
112949 + echo "const struct size_overflow_hash * const $hashtable_name[$n] = {" >> "$header1"
112950 +}
112951 +
112952 +create_array_elements() {
112953 + index=0
112954 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
112955 + do
112956 + data_array=($data)
112957 + i="${data_array[3]}"
112958 + hash="${data_array[0]}"
112959 + while [[ $index -lt $i ]]
112960 + do
112961 + echo -e "\t["$index"]\t= NULL," >> "$header1"
112962 + index=$(($index + 1))
112963 + done
112964 + index=$(($index + 1))
112965 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
112966 + done
112967 + echo '};' >> $header1
112968 +}
112969 +
112970 +size_overflow_plugin_dir=`dirname $header1`
112971 +if [ "$size_overflow_plugin_dir" != '.' ]; then
112972 + mkdir -p "$size_overflow_plugin_dir" 2> /dev/null
112973 +fi
112974 +
112975 +create_structs
112976 +create_headers
112977 +create_array_elements
112978 +
112979 +exit 0
112980 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
112981 new file mode 100644
112982 index 0000000..c43901f
112983 --- /dev/null
112984 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
112985 @@ -0,0 +1,748 @@
112986 +/*
112987 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
112988 + * Licensed under the GPL v2, or (at your option) v3
112989 + *
112990 + * Homepage:
112991 + * http://www.grsecurity.net/~ephox/overflow_plugin/
112992 + *
112993 + * Documentation:
112994 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
112995 + *
112996 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
112997 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
112998 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
112999 + *
113000 + * Usage:
113001 + * $ make
113002 + * $ make run
113003 + */
113004 +
113005 +#include "gcc-common.h"
113006 +#include "size_overflow.h"
113007 +
113008 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
113009 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
113010 +
113011 +// data for the size_overflow asm stmt
113012 +struct asm_data {
113013 + gimple def_stmt;
113014 + tree input;
113015 + tree output;
113016 +};
113017 +
113018 +#if BUILDING_GCC_VERSION <= 4007
113019 +static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
113020 +#else
113021 +static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
113022 +#endif
113023 +{
113024 + tree list;
113025 +#if BUILDING_GCC_VERSION <= 4007
113026 + VEC(tree, gc) *vec_list = NULL;
113027 +#else
113028 + vec<tree, va_gc> *vec_list = NULL;
113029 +#endif
113030 +
113031 + list = build_tree_list(NULL_TREE, string);
113032 + list = chainon(NULL_TREE, build_tree_list(list, io));
113033 +#if BUILDING_GCC_VERSION <= 4007
113034 + VEC_safe_push(tree, gc, vec_list, list);
113035 +#else
113036 + vec_safe_push(vec_list, list);
113037 +#endif
113038 + return vec_list;
113039 +}
113040 +
113041 +static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
113042 +{
113043 + gimple asm_stmt;
113044 + gimple_stmt_iterator gsi;
113045 +#if BUILDING_GCC_VERSION <= 4007
113046 + VEC(tree, gc) *input, *output = NULL;
113047 +#else
113048 + vec<tree, va_gc> *input, *output = NULL;
113049 +#endif
113050 +
113051 + input = create_asm_io_list(str_input, asm_data->input);
113052 +
113053 + if (asm_data->output)
113054 + output = create_asm_io_list(str_output, asm_data->output);
113055 +
113056 + asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
113057 + gsi = gsi_for_stmt(asm_data->def_stmt);
113058 + gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
113059 +
113060 + if (asm_data->output)
113061 + SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
113062 +}
113063 +
113064 +static void replace_call_lhs(const struct asm_data *asm_data)
113065 +{
113066 + gimple_set_lhs(asm_data->def_stmt, asm_data->input);
113067 + update_stmt(asm_data->def_stmt);
113068 + SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
113069 +}
113070 +
113071 +static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
113072 +{
113073 + enum mark cur_fndecl_attr;
113074 + gimple phi = get_def_stmt(result);
113075 + unsigned int i, n = gimple_phi_num_args(phi);
113076 +
113077 + pointer_set_insert(visited, phi);
113078 + for (i = 0; i < n; i++) {
113079 + tree arg = gimple_phi_arg_def(phi, i);
113080 +
113081 + cur_fndecl_attr = search_intentional(visited, arg);
113082 + if (cur_fndecl_attr != MARK_NO)
113083 + return cur_fndecl_attr;
113084 + }
113085 + return MARK_NO;
113086 +}
113087 +
113088 +static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
113089 +{
113090 + enum mark cur_fndecl_attr;
113091 + const_tree rhs1, rhs2;
113092 + gimple def_stmt = get_def_stmt(lhs);
113093 +
113094 + rhs1 = gimple_assign_rhs1(def_stmt);
113095 + rhs2 = gimple_assign_rhs2(def_stmt);
113096 +
113097 + cur_fndecl_attr = search_intentional(visited, rhs1);
113098 + if (cur_fndecl_attr != MARK_NO)
113099 + return cur_fndecl_attr;
113100 + return search_intentional(visited, rhs2);
113101 +}
113102 +
113103 +// Look up the intentional_overflow attribute on the caller and the callee functions.
113104 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
113105 +{
113106 + const_gimple def_stmt;
113107 +
113108 + if (TREE_CODE(lhs) != SSA_NAME)
113109 + return get_intentional_attr_type(lhs);
113110 +
113111 + def_stmt = get_def_stmt(lhs);
113112 + if (!def_stmt)
113113 + return MARK_NO;
113114 +
113115 + if (pointer_set_contains(visited, def_stmt))
113116 + return MARK_NO;
113117 +
113118 + switch (gimple_code(def_stmt)) {
113119 + case GIMPLE_NOP:
113120 + return search_intentional(visited, SSA_NAME_VAR(lhs));
113121 + case GIMPLE_ASM:
113122 + if (is_size_overflow_intentional_asm_turn_off(def_stmt))
113123 + return MARK_TURN_OFF;
113124 + return MARK_NO;
113125 + case GIMPLE_CALL:
113126 + return MARK_NO;
113127 + case GIMPLE_PHI:
113128 + return search_intentional_phi(visited, lhs);
113129 + case GIMPLE_ASSIGN:
113130 + switch (gimple_num_ops(def_stmt)) {
113131 + case 2:
113132 + return search_intentional(visited, gimple_assign_rhs1(def_stmt));
113133 + case 3:
113134 + return search_intentional_binary(visited, lhs);
113135 + }
113136 + case GIMPLE_RETURN:
113137 + return MARK_NO;
113138 + default:
113139 + debug_gimple_stmt((gimple)def_stmt);
113140 + error("%s: unknown gimple code", __func__);
113141 + gcc_unreachable();
113142 + }
113143 +}
113144 +
113145 +// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
113146 +static enum mark check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
113147 +{
113148 + const_tree fndecl;
113149 + struct pointer_set_t *visited;
113150 + enum mark cur_fndecl_attr, decl_attr = MARK_NO;
113151 +
113152 + fndecl = get_interesting_orig_fndecl(stmt, argnum);
113153 + if (is_end_intentional_intentional_attr(fndecl, argnum))
113154 + decl_attr = MARK_NOT_INTENTIONAL;
113155 + else if (is_yes_intentional_attr(fndecl, argnum))
113156 + decl_attr = MARK_YES;
113157 + else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
113158 + return MARK_TURN_OFF;
113159 + }
113160 +
113161 + visited = pointer_set_create();
113162 + cur_fndecl_attr = search_intentional(visited, arg);
113163 + pointer_set_destroy(visited);
113164 +
113165 + switch (cur_fndecl_attr) {
113166 + case MARK_NO:
113167 + case MARK_TURN_OFF:
113168 + return cur_fndecl_attr;
113169 + default:
113170 + print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
113171 + return MARK_YES;
113172 + }
113173 +}
113174 +
113175 +static void check_missing_size_overflow_attribute(tree var)
113176 +{
113177 + tree orig_fndecl;
113178 + unsigned int num;
113179 +
113180 + if (is_a_return_check(var))
113181 + orig_fndecl = DECL_ORIGIN(var);
113182 + else
113183 + orig_fndecl = DECL_ORIGIN(current_function_decl);
113184 +
113185 + num = get_function_num(var, orig_fndecl);
113186 + if (num == CANNOT_FIND_ARG)
113187 + return;
113188 +
113189 + is_missing_function(orig_fndecl, num);
113190 +}
113191 +
113192 +static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
113193 +{
113194 + gimple phi = get_def_stmt(result);
113195 + unsigned int i, n = gimple_phi_num_args(phi);
113196 +
113197 + pointer_set_insert(visited, phi);
113198 + for (i = 0; i < n; i++) {
113199 + tree arg = gimple_phi_arg_def(phi, i);
113200 +
113201 + search_size_overflow_attribute(visited, arg);
113202 + }
113203 +}
113204 +
113205 +static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
113206 +{
113207 + const_gimple def_stmt = get_def_stmt(lhs);
113208 + tree rhs1, rhs2;
113209 +
113210 + rhs1 = gimple_assign_rhs1(def_stmt);
113211 + rhs2 = gimple_assign_rhs2(def_stmt);
113212 +
113213 + search_size_overflow_attribute(visited, rhs1);
113214 + search_size_overflow_attribute(visited, rhs2);
113215 +}
113216 +
113217 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
113218 +{
113219 + const_gimple def_stmt;
113220 +
113221 + if (TREE_CODE(lhs) == PARM_DECL) {
113222 + check_missing_size_overflow_attribute(lhs);
113223 + return;
113224 + }
113225 +
113226 + def_stmt = get_def_stmt(lhs);
113227 + if (!def_stmt)
113228 + return;
113229 +
113230 + if (pointer_set_insert(visited, def_stmt))
113231 + return;
113232 +
113233 + switch (gimple_code(def_stmt)) {
113234 + case GIMPLE_NOP:
113235 + return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
113236 + case GIMPLE_ASM:
113237 + return;
113238 + case GIMPLE_CALL: {
113239 + tree fndecl = gimple_call_fndecl(def_stmt);
113240 +
113241 + if (fndecl == NULL_TREE)
113242 + return;
113243 + check_missing_size_overflow_attribute(fndecl);
113244 + return;
113245 + }
113246 + case GIMPLE_PHI:
113247 + return search_size_overflow_attribute_phi(visited, lhs);
113248 + case GIMPLE_ASSIGN:
113249 + switch (gimple_num_ops(def_stmt)) {
113250 + case 2:
113251 + return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
113252 + case 3:
113253 + return search_size_overflow_attribute_binary(visited, lhs);
113254 + }
113255 + default:
113256 + debug_gimple_stmt((gimple)def_stmt);
113257 + error("%s: unknown gimple code", __func__);
113258 + gcc_unreachable();
113259 + }
113260 +}
113261 +
113262 +// Search missing entries in the hash table (invoked from the gimple pass)
113263 +static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
113264 +{
113265 + tree fndecl = NULL_TREE;
113266 + tree lhs;
113267 + struct pointer_set_t *visited;
113268 +
113269 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
113270 + return;
113271 +
113272 + if (num == 0) {
113273 + gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
113274 + lhs = gimple_return_retval(stmt);
113275 + } else {
113276 + gcc_assert(is_gimple_call(stmt));
113277 + lhs = gimple_call_arg(stmt, num - 1);
113278 + fndecl = gimple_call_fndecl(stmt);
113279 + }
113280 +
113281 + if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
113282 + return;
113283 +
113284 + visited = pointer_set_create();
113285 + search_size_overflow_attribute(visited, lhs);
113286 + pointer_set_destroy(visited);
113287 +}
113288 +
113289 +static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
113290 +{
113291 + gimple_stmt_iterator gsi;
113292 + gimple assign;
113293 +
113294 + assign = gimple_build_assign(asm_data->input, asm_data->output);
113295 + gsi = gsi_for_stmt(stmt);
113296 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
113297 + asm_data->def_stmt = assign;
113298 +
113299 + asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
113300 + asm_data->output = make_ssa_name(asm_data->output, stmt);
113301 + if (gimple_code(stmt) == GIMPLE_RETURN)
113302 + gimple_return_set_retval(stmt, asm_data->output);
113303 + else
113304 + gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
113305 + update_stmt(stmt);
113306 +}
113307 +
113308 +static char *create_asm_comment(unsigned int argnum, const_gimple stmt , const char *mark_str)
113309 +{
113310 + const char *fn_name;
113311 + char *asm_comment;
113312 + unsigned int len;
113313 +
113314 + if (argnum == 0)
113315 + fn_name = DECL_NAME_POINTER(current_function_decl);
113316 + else
113317 + fn_name = DECL_NAME_POINTER(gimple_call_fndecl(stmt));
113318 +
113319 + len = asprintf(&asm_comment, "%s %s %u", mark_str, fn_name, argnum);
113320 + gcc_assert(len > 0);
113321 +
113322 + return asm_comment;
113323 +}
113324 +
113325 +static const char *convert_mark_to_str(enum mark mark)
113326 +{
113327 + switch (mark) {
113328 + case MARK_NO:
113329 + return OK_ASM_STR;
113330 + case MARK_YES:
113331 + case MARK_NOT_INTENTIONAL:
113332 + return YES_ASM_STR;
113333 + case MARK_TURN_OFF:
113334 + return TURN_OFF_ASM_STR;
113335 + }
113336 +
113337 + gcc_unreachable();
113338 +}
113339 +
113340 +/* Create the input of the size_overflow asm stmt.
113341 + * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
113342 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
113343 + * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
113344 + * otherwise create the input (for a phi stmt the output too) of the asm stmt.
113345 + */
113346 +static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
113347 +{
113348 + if (!asm_data->def_stmt) {
113349 + asm_data->input = NULL_TREE;
113350 + return;
113351 + }
113352 +
113353 + asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
113354 + asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
113355 +
113356 + switch (gimple_code(asm_data->def_stmt)) {
113357 + case GIMPLE_ASSIGN:
113358 + case GIMPLE_CALL:
113359 + replace_call_lhs(asm_data);
113360 + break;
113361 + case GIMPLE_PHI:
113362 + create_output_from_phi(stmt, argnum, asm_data);
113363 + break;
113364 + case GIMPLE_NOP: {
113365 + enum mark mark;
113366 + const char *mark_str;
113367 + char *asm_comment;
113368 +
113369 + mark = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
113370 +
113371 + asm_data->input = asm_data->output;
113372 + asm_data->output = NULL;
113373 + asm_data->def_stmt = stmt;
113374 +
113375 + mark_str = convert_mark_to_str(mark);
113376 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
113377 +
113378 + create_asm_stmt(asm_comment, build_string(3, "rm"), NULL, asm_data);
113379 + free(asm_comment);
113380 + asm_data->input = NULL_TREE;
113381 + break;
113382 + }
113383 + case GIMPLE_ASM:
113384 + if (is_size_overflow_asm(asm_data->def_stmt)) {
113385 + asm_data->input = NULL_TREE;
113386 + break;
113387 + }
113388 + default:
113389 + debug_gimple_stmt(asm_data->def_stmt);
113390 + gcc_unreachable();
113391 + }
113392 +}
113393 +
113394 +/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
113395 + * is of the right kind create the appropriate size_overflow asm stmts:
113396 + * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
113397 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
113398 + */
113399 +static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
113400 +{
113401 + struct asm_data asm_data;
113402 + const char *mark_str;
113403 + char *asm_comment;
113404 + enum mark mark;
113405 +
113406 + if (is_gimple_constant(output_node))
113407 + return;
113408 +
113409 + asm_data.output = output_node;
113410 + mark = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
113411 + if (mark != MARK_TURN_OFF)
113412 + search_missing_size_overflow_attribute_gimple(stmt, argnum);
113413 +
113414 + asm_data.def_stmt = get_def_stmt(asm_data.output);
113415 + if (is_size_overflow_intentional_asm_turn_off(asm_data.def_stmt))
113416 + return;
113417 +
113418 + create_asm_input(stmt, argnum, &asm_data);
113419 + if (asm_data.input == NULL_TREE)
113420 + return;
113421 +
113422 + mark_str = convert_mark_to_str(mark);
113423 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
113424 + create_asm_stmt(asm_comment, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
113425 + free(asm_comment);
113426 +}
113427 +
113428 +// Insert an asm stmt with "MARK_TURN_OFF", "MARK_YES" or "MARK_NOT_INTENTIONAL".
113429 +static bool create_mark_asm(gimple stmt, enum mark mark)
113430 +{
113431 + struct asm_data asm_data;
113432 + const char *asm_str;
113433 +
113434 + switch (mark) {
113435 + case MARK_TURN_OFF:
113436 + asm_str = TURN_OFF_ASM_STR;
113437 + break;
113438 + case MARK_NOT_INTENTIONAL:
113439 + case MARK_YES:
113440 + asm_str = YES_ASM_STR;
113441 + break;
113442 + default:
113443 + gcc_unreachable();
113444 + }
113445 +
113446 + asm_data.def_stmt = stmt;
113447 + asm_data.output = gimple_call_lhs(stmt);
113448 +
113449 + if (asm_data.output == NULL_TREE) {
113450 + asm_data.input = gimple_call_arg(stmt, 0);
113451 + if (is_gimple_constant(asm_data.input))
113452 + return false;
113453 + asm_data.output = NULL;
113454 + create_asm_stmt(asm_str, build_string(3, "rm"), NULL, &asm_data);
113455 + return true;
113456 + }
113457 +
113458 + create_asm_input(stmt, 0, &asm_data);
113459 + gcc_assert(asm_data.input != NULL_TREE);
113460 +
113461 + create_asm_stmt(asm_str, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
113462 + return true;
113463 +}
113464 +
113465 +static void walk_use_def_ptr(struct pointer_set_t *visited, const_tree lhs)
113466 +{
113467 + gimple def_stmt;
113468 +
113469 + def_stmt = get_def_stmt(lhs);
113470 + if (!def_stmt)
113471 + return;
113472 +
113473 + if (pointer_set_insert(visited, def_stmt))
113474 + return;
113475 +
113476 + switch (gimple_code(def_stmt)) {
113477 + case GIMPLE_NOP:
113478 + case GIMPLE_ASM:
113479 + case GIMPLE_CALL:
113480 + break;
113481 + case GIMPLE_PHI: {
113482 + unsigned int i, n = gimple_phi_num_args(def_stmt);
113483 +
113484 + pointer_set_insert(visited, def_stmt);
113485 +
113486 + for (i = 0; i < n; i++) {
113487 + tree arg = gimple_phi_arg_def(def_stmt, i);
113488 +
113489 + walk_use_def_ptr(visited, arg);
113490 + }
113491 + }
113492 + case GIMPLE_ASSIGN:
113493 + switch (gimple_num_ops(def_stmt)) {
113494 + case 2:
113495 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
113496 + return;
113497 + case 3:
113498 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
113499 + walk_use_def_ptr(visited, gimple_assign_rhs2(def_stmt));
113500 + return;
113501 + default:
113502 + return;
113503 + }
113504 + default:
113505 + debug_gimple_stmt((gimple)def_stmt);
113506 + error("%s: unknown gimple code", __func__);
113507 + gcc_unreachable();
113508 + }
113509 +}
113510 +
113511 +// Look for a ptr - ptr expression (e.g., cpuset_common_file_read() s - page)
113512 +static void insert_mark_not_intentional_asm_at_ptr(const_tree arg)
113513 +{
113514 + struct pointer_set_t *visited;
113515 +
113516 + visited = pointer_set_create();
113517 + walk_use_def_ptr(visited, arg);
113518 + pointer_set_destroy(visited);
113519 +}
113520 +
113521 +// Determine the return value and insert the asm stmt to mark the return stmt.
113522 +static void insert_asm_ret(gimple stmt)
113523 +{
113524 + tree ret;
113525 +
113526 + ret = gimple_return_retval(stmt);
113527 + create_size_overflow_asm(stmt, ret, 0);
113528 +}
113529 +
113530 +// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
113531 +static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
113532 +{
113533 + tree arg;
113534 + unsigned int argnum;
113535 +
113536 + argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
113537 + gcc_assert(argnum != 0);
113538 + if (argnum == CANNOT_FIND_ARG)
113539 + return;
113540 +
113541 + arg = gimple_call_arg(stmt, argnum - 1);
113542 + gcc_assert(arg != NULL_TREE);
113543 +
113544 + // skip all ptr - ptr expressions
113545 + insert_mark_not_intentional_asm_at_ptr(arg);
113546 +
113547 + create_size_overflow_asm(stmt, arg, argnum);
113548 +}
113549 +
113550 +// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
113551 +static void set_argnum_attribute(const_tree attr, bool *argnums)
113552 +{
113553 + unsigned int argnum;
113554 + tree attr_value;
113555 +
113556 + for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
113557 + argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
113558 + argnums[argnum] = true;
113559 + }
113560 +}
113561 +
113562 +// If a function arg or the return value is in the hash table then set its index in the array.
113563 +static void set_argnum_hash(tree fndecl, bool *argnums)
113564 +{
113565 + unsigned int num;
113566 + const struct size_overflow_hash *hash;
113567 +
113568 + hash = get_function_hash(DECL_ORIGIN(fndecl));
113569 + if (!hash)
113570 + return;
113571 +
113572 + for (num = 0; num <= MAX_PARAM; num++) {
113573 + if (!(hash->param & (1U << num)))
113574 + continue;
113575 +
113576 + argnums[num] = true;
113577 + }
113578 +}
113579 +
113580 +static bool is_all_the_argnums_empty(bool *argnums)
113581 +{
113582 + unsigned int i;
113583 +
113584 + for (i = 0; i <= MAX_PARAM; i++)
113585 + if (argnums[i])
113586 + return false;
113587 + return true;
113588 +}
113589 +
113590 +// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
113591 +static void search_interesting_args(tree fndecl, bool *argnums)
113592 +{
113593 + const_tree attr;
113594 +
113595 + set_argnum_hash(fndecl, argnums);
113596 + if (!is_all_the_argnums_empty(argnums))
113597 + return;
113598 +
113599 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
113600 + if (attr && TREE_VALUE(attr))
113601 + set_argnum_attribute(attr, argnums);
113602 +}
113603 +
113604 +/*
113605 + * Look up the intentional_overflow attribute that turns off ipa based duplication
113606 + * on the callee function.
113607 + */
113608 +static bool is_mark_turn_off_attribute(gimple stmt)
113609 +{
113610 + enum mark mark;
113611 + const_tree fndecl = gimple_call_fndecl(stmt);
113612 +
113613 + mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
113614 + if (mark == MARK_TURN_OFF)
113615 + return true;
113616 + return false;
113617 +}
113618 +
113619 +// 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
113620 +static void handle_interesting_function(gimple stmt)
113621 +{
113622 + unsigned int argnum;
113623 + tree fndecl;
113624 + bool orig_argnums[MAX_PARAM + 1] = {false};
113625 +
113626 + if (gimple_call_num_args(stmt) == 0)
113627 + return;
113628 + fndecl = gimple_call_fndecl(stmt);
113629 + if (fndecl == NULL_TREE)
113630 + return;
113631 + fndecl = DECL_ORIGIN(fndecl);
113632 +
113633 + if (is_mark_turn_off_attribute(stmt)) {
113634 + create_mark_asm(stmt, MARK_TURN_OFF);
113635 + return;
113636 + }
113637 +
113638 + search_interesting_args(fndecl, orig_argnums);
113639 +
113640 + for (argnum = 1; argnum < MAX_PARAM; argnum++)
113641 + if (orig_argnums[argnum])
113642 + insert_asm_arg(stmt, argnum);
113643 +}
113644 +
113645 +// 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
113646 +static void handle_interesting_ret(gimple stmt)
113647 +{
113648 + bool orig_argnums[MAX_PARAM + 1] = {false};
113649 +
113650 + search_interesting_args(current_function_decl, orig_argnums);
113651 +
113652 + if (orig_argnums[0])
113653 + insert_asm_ret(stmt);
113654 +}
113655 +
113656 +// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
113657 +static unsigned int search_interesting_functions(void)
113658 +{
113659 + basic_block bb;
113660 +
113661 + FOR_ALL_BB_FN(bb, cfun) {
113662 + gimple_stmt_iterator gsi;
113663 +
113664 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
113665 + gimple stmt = gsi_stmt(gsi);
113666 +
113667 + if (is_size_overflow_asm(stmt))
113668 + continue;
113669 +
113670 + if (is_gimple_call(stmt))
113671 + handle_interesting_function(stmt);
113672 + else if (gimple_code(stmt) == GIMPLE_RETURN)
113673 + handle_interesting_ret(stmt);
113674 + }
113675 + }
113676 + return 0;
113677 +}
113678 +
113679 +/*
113680 + * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
113681 + * this pass inserts asm stmts to mark the interesting args
113682 + * that the ipa pass will detect and insert the size overflow checks for.
113683 + */
113684 +#if BUILDING_GCC_VERSION >= 4009
113685 +static const struct pass_data insert_size_overflow_asm_pass_data = {
113686 +#else
113687 +static struct gimple_opt_pass insert_size_overflow_asm_pass = {
113688 + .pass = {
113689 +#endif
113690 + .type = GIMPLE_PASS,
113691 + .name = "insert_size_overflow_asm",
113692 +#if BUILDING_GCC_VERSION >= 4008
113693 + .optinfo_flags = OPTGROUP_NONE,
113694 +#endif
113695 +#if BUILDING_GCC_VERSION >= 4009
113696 + .has_gate = false,
113697 + .has_execute = true,
113698 +#else
113699 + .gate = NULL,
113700 + .execute = search_interesting_functions,
113701 + .sub = NULL,
113702 + .next = NULL,
113703 + .static_pass_number = 0,
113704 +#endif
113705 + .tv_id = TV_NONE,
113706 + .properties_required = PROP_cfg,
113707 + .properties_provided = 0,
113708 + .properties_destroyed = 0,
113709 + .todo_flags_start = 0,
113710 + .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
113711 +#if BUILDING_GCC_VERSION < 4009
113712 + }
113713 +#endif
113714 +};
113715 +
113716 +#if BUILDING_GCC_VERSION >= 4009
113717 +namespace {
113718 +class insert_size_overflow_asm_pass : public gimple_opt_pass {
113719 +public:
113720 + insert_size_overflow_asm_pass() : gimple_opt_pass(insert_size_overflow_asm_pass_data, g) {}
113721 + unsigned int execute() { return search_interesting_functions(); }
113722 +};
113723 +}
113724 +#endif
113725 +
113726 +struct opt_pass *make_insert_size_overflow_asm_pass(void)
113727 +{
113728 +#if BUILDING_GCC_VERSION >= 4009
113729 + return new insert_size_overflow_asm_pass();
113730 +#else
113731 + return &insert_size_overflow_asm_pass.pass;
113732 +#endif
113733 +}
113734 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
113735 new file mode 100644
113736 index 0000000..73f0a12
113737 --- /dev/null
113738 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c
113739 @@ -0,0 +1,943 @@
113740 +/*
113741 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
113742 + * Licensed under the GPL v2, or (at your option) v3
113743 + *
113744 + * Homepage:
113745 + * http://www.grsecurity.net/~ephox/overflow_plugin/
113746 + *
113747 + * Documentation:
113748 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
113749 + *
113750 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
113751 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
113752 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
113753 + *
113754 + * Usage:
113755 + * $ make
113756 + * $ make run
113757 + */
113758 +
113759 +#include "gcc-common.h"
113760 +#include "size_overflow.h"
113761 +
113762 +#define MIN_CHECK true
113763 +#define MAX_CHECK false
113764 +
113765 +static tree get_size_overflow_type(struct visited *visited, const_gimple stmt, const_tree node)
113766 +{
113767 + const_tree type;
113768 + tree new_type;
113769 +
113770 + gcc_assert(node != NULL_TREE);
113771 +
113772 + type = TREE_TYPE(node);
113773 +
113774 + if (pointer_set_contains(visited->my_stmts, stmt))
113775 + return TREE_TYPE(node);
113776 +
113777 + switch (TYPE_MODE(type)) {
113778 + case QImode:
113779 + new_type = size_overflow_type_HI;
113780 + break;
113781 + case HImode:
113782 + new_type = size_overflow_type_SI;
113783 + break;
113784 + case SImode:
113785 + new_type = size_overflow_type_DI;
113786 + break;
113787 + case DImode:
113788 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
113789 + new_type = TYPE_UNSIGNED(type) ? unsigned_intDI_type_node : intDI_type_node;
113790 + else
113791 + new_type = size_overflow_type_TI;
113792 + break;
113793 + case TImode:
113794 + gcc_assert(!TYPE_UNSIGNED(type));
113795 + new_type = size_overflow_type_TI;
113796 + break;
113797 + default:
113798 + debug_tree((tree)node);
113799 + error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
113800 + gcc_unreachable();
113801 + }
113802 +
113803 + if (TYPE_QUALS(type) != 0)
113804 + return build_qualified_type(new_type, TYPE_QUALS(type));
113805 + return new_type;
113806 +}
113807 +
113808 +static tree get_lhs(const_gimple stmt)
113809 +{
113810 + switch (gimple_code(stmt)) {
113811 + case GIMPLE_ASSIGN:
113812 + case GIMPLE_CALL:
113813 + return gimple_get_lhs(stmt);
113814 + case GIMPLE_PHI:
113815 + return gimple_phi_result(stmt);
113816 + default:
113817 + return NULL_TREE;
113818 + }
113819 +}
113820 +
113821 +static tree cast_to_new_size_overflow_type(struct visited *visited, gimple stmt, tree rhs, tree size_overflow_type, bool before)
113822 +{
113823 + gimple_stmt_iterator gsi;
113824 + tree lhs;
113825 + gimple new_stmt;
113826 +
113827 + if (rhs == NULL_TREE)
113828 + return NULL_TREE;
113829 +
113830 + gsi = gsi_for_stmt(stmt);
113831 + new_stmt = build_cast_stmt(visited, size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
113832 + pointer_set_insert(visited->my_stmts, new_stmt);
113833 +
113834 + lhs = get_lhs(new_stmt);
113835 + gcc_assert(lhs != NULL_TREE);
113836 + return lhs;
113837 +}
113838 +
113839 +tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before)
113840 +{
113841 + tree lhs, dst_type;
113842 + gimple_stmt_iterator gsi;
113843 +
113844 + if (rhs1 == NULL_TREE) {
113845 + debug_gimple_stmt(oldstmt);
113846 + error("%s: rhs1 is NULL_TREE", __func__);
113847 + gcc_unreachable();
113848 + }
113849 +
113850 + switch (gimple_code(oldstmt)) {
113851 + case GIMPLE_ASM:
113852 + lhs = rhs1;
113853 + break;
113854 + case GIMPLE_CALL:
113855 + case GIMPLE_ASSIGN:
113856 + lhs = gimple_get_lhs(oldstmt);
113857 + break;
113858 + default:
113859 + debug_gimple_stmt(oldstmt);
113860 + gcc_unreachable();
113861 + }
113862 +
113863 + gsi = gsi_for_stmt(oldstmt);
113864 + pointer_set_insert(visited->stmts, oldstmt);
113865 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
113866 + basic_block next_bb, cur_bb;
113867 + const_edge e;
113868 +
113869 + gcc_assert(before == false);
113870 + gcc_assert(stmt_can_throw_internal(oldstmt));
113871 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
113872 + gcc_assert(!gsi_end_p(gsi));
113873 +
113874 + cur_bb = gimple_bb(oldstmt);
113875 + next_bb = cur_bb->next_bb;
113876 + e = find_edge(cur_bb, next_bb);
113877 + gcc_assert(e != NULL);
113878 + gcc_assert(e->flags & EDGE_FALLTHRU);
113879 +
113880 + gsi = gsi_after_labels(next_bb);
113881 + gcc_assert(!gsi_end_p(gsi));
113882 +
113883 + before = true;
113884 + oldstmt = gsi_stmt(gsi);
113885 + }
113886 +
113887 + dst_type = get_size_overflow_type(visited, oldstmt, lhs);
113888 +
113889 + if (is_gimple_constant(rhs1))
113890 + return cast_a_tree(dst_type, rhs1);
113891 + return cast_to_new_size_overflow_type(visited, oldstmt, rhs1, dst_type, before);
113892 +}
113893 +
113894 +tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
113895 +{
113896 + gimple stmt;
113897 + gimple_stmt_iterator gsi;
113898 + tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
113899 +
113900 + if (pointer_set_contains(visited->my_stmts, oldstmt))
113901 + return lhs;
113902 +
113903 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
113904 + rhs1 = gimple_assign_rhs1(oldstmt);
113905 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
113906 + }
113907 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
113908 + rhs2 = gimple_assign_rhs2(oldstmt);
113909 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
113910 + }
113911 +
113912 + stmt = gimple_copy(oldstmt);
113913 + gimple_set_location(stmt, gimple_location(oldstmt));
113914 + pointer_set_insert(visited->my_stmts, stmt);
113915 +
113916 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
113917 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
113918 +
113919 + size_overflow_type = get_size_overflow_type(visited, oldstmt, node);
113920 +
113921 + new_var = create_new_var(size_overflow_type);
113922 + new_var = make_ssa_name(new_var, stmt);
113923 + gimple_assign_set_lhs(stmt, new_var);
113924 +
113925 + if (rhs1 != NULL_TREE)
113926 + gimple_assign_set_rhs1(stmt, rhs1);
113927 +
113928 + if (rhs2 != NULL_TREE)
113929 + gimple_assign_set_rhs2(stmt, rhs2);
113930 +#if BUILDING_GCC_VERSION >= 4006
113931 + if (rhs3 != NULL_TREE)
113932 + gimple_assign_set_rhs3(stmt, rhs3);
113933 +#endif
113934 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
113935 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
113936 +
113937 + gsi = gsi_for_stmt(oldstmt);
113938 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
113939 + update_stmt(stmt);
113940 + pointer_set_insert(visited->stmts, oldstmt);
113941 + return gimple_assign_lhs(stmt);
113942 +}
113943 +
113944 +static tree cast_parm_decl(struct visited *visited, tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
113945 +{
113946 + gimple assign;
113947 + gimple_stmt_iterator gsi;
113948 + basic_block first_bb;
113949 +
113950 + gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
113951 +
113952 + if (bb->index == 0) {
113953 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
113954 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
113955 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
113956 + bb = first_bb;
113957 + }
113958 +
113959 + gsi = gsi_after_labels(bb);
113960 + assign = build_cast_stmt(visited, size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
113961 + pointer_set_insert(visited->my_stmts, assign);
113962 +
113963 + return gimple_assign_lhs(assign);
113964 +}
113965 +
113966 +static tree use_phi_ssa_name(struct visited *visited, tree ssa_name_var, tree new_arg)
113967 +{
113968 + gimple_stmt_iterator gsi;
113969 + gimple assign, def_stmt = get_def_stmt(new_arg);
113970 +
113971 + if (gimple_code(def_stmt) == GIMPLE_PHI) {
113972 + gsi = gsi_after_labels(gimple_bb(def_stmt));
113973 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
113974 + } else {
113975 + gsi = gsi_for_stmt(def_stmt);
113976 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
113977 + }
113978 +
113979 + pointer_set_insert(visited->my_stmts, assign);
113980 + return gimple_assign_lhs(assign);
113981 +}
113982 +
113983 +static tree cast_visited_phi_arg(struct visited *visited, tree ssa_name_var, tree arg, tree size_overflow_type)
113984 +{
113985 + basic_block bb;
113986 + gimple_stmt_iterator gsi;
113987 + const_gimple def_stmt;
113988 + gimple assign;
113989 +
113990 + def_stmt = get_def_stmt(arg);
113991 + bb = gimple_bb(def_stmt);
113992 + gcc_assert(bb->index != 0);
113993 + gsi = gsi_after_labels(bb);
113994 +
113995 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
113996 + pointer_set_insert(visited->my_stmts, assign);
113997 + return gimple_assign_lhs(assign);
113998 +}
113999 +
114000 +static tree create_new_phi_arg(struct visited *visited, tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
114001 +{
114002 + tree size_overflow_type;
114003 + tree arg;
114004 + const_gimple def_stmt;
114005 +
114006 + if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
114007 + return new_arg;
114008 +
114009 + arg = gimple_phi_arg_def(oldstmt, i);
114010 + def_stmt = get_def_stmt(arg);
114011 + gcc_assert(def_stmt != NULL);
114012 + size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
114013 +
114014 + switch (gimple_code(def_stmt)) {
114015 + case GIMPLE_PHI:
114016 + return cast_visited_phi_arg(visited, ssa_name_var, arg, size_overflow_type);
114017 + case GIMPLE_NOP: {
114018 + basic_block bb;
114019 +
114020 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
114021 + return cast_parm_decl(visited, ssa_name_var, arg, size_overflow_type, bb);
114022 + }
114023 + case GIMPLE_ASM: {
114024 + gimple_stmt_iterator gsi;
114025 + gimple assign, stmt = get_def_stmt(arg);
114026 +
114027 + gsi = gsi_for_stmt(stmt);
114028 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
114029 + pointer_set_insert(visited->my_stmts, assign);
114030 + return gimple_assign_lhs(assign);
114031 + }
114032 + default:
114033 + gcc_assert(new_arg != NULL_TREE);
114034 + gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
114035 + return use_phi_ssa_name(visited, ssa_name_var, new_arg);
114036 + }
114037 +}
114038 +
114039 +static gimple overflow_create_phi_node(struct visited *visited, gimple oldstmt, tree result)
114040 +{
114041 + basic_block bb;
114042 + gimple phi;
114043 + gimple_seq seq;
114044 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
114045 +
114046 + bb = gsi_bb(gsi);
114047 +
114048 + if (result == NULL_TREE) {
114049 + tree old_result = gimple_phi_result(oldstmt);
114050 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, old_result);
114051 +
114052 + result = create_new_var(size_overflow_type);
114053 + }
114054 +
114055 + phi = create_phi_node(result, bb);
114056 + gimple_phi_set_result(phi, make_ssa_name(result, phi));
114057 + seq = phi_nodes(bb);
114058 + gsi = gsi_last(seq);
114059 + gsi_remove(&gsi, false);
114060 +
114061 + gsi = gsi_for_stmt(oldstmt);
114062 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
114063 + gimple_set_bb(phi, bb);
114064 + return phi;
114065 +}
114066 +
114067 +#if BUILDING_GCC_VERSION <= 4007
114068 +static tree create_new_phi_node(struct visited *visited, VEC(tree, heap) **args, tree ssa_name_var, gimple oldstmt)
114069 +#else
114070 +static tree create_new_phi_node(struct visited *visited, vec<tree, va_heap, vl_embed> *&args, tree ssa_name_var, gimple oldstmt)
114071 +#endif
114072 +{
114073 + gimple new_phi;
114074 + unsigned int i;
114075 + tree arg, result;
114076 + location_t loc = gimple_location(oldstmt);
114077 +
114078 +#if BUILDING_GCC_VERSION <= 4007
114079 + gcc_assert(!VEC_empty(tree, *args));
114080 +#else
114081 + gcc_assert(!args->is_empty());
114082 +#endif
114083 +
114084 + new_phi = overflow_create_phi_node(visited, oldstmt, ssa_name_var);
114085 + result = gimple_phi_result(new_phi);
114086 + ssa_name_var = SSA_NAME_VAR(result);
114087 +
114088 +#if BUILDING_GCC_VERSION <= 4007
114089 + FOR_EACH_VEC_ELT(tree, *args, i, arg) {
114090 +#else
114091 + FOR_EACH_VEC_SAFE_ELT(args, i, arg) {
114092 +#endif
114093 + arg = create_new_phi_arg(visited, ssa_name_var, arg, oldstmt, i);
114094 + add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
114095 + }
114096 +
114097 +#if BUILDING_GCC_VERSION <= 4007
114098 + VEC_free(tree, heap, *args);
114099 +#else
114100 + vec_free(args);
114101 +#endif
114102 + update_stmt(new_phi);
114103 + pointer_set_insert(visited->my_stmts, new_phi);
114104 + return result;
114105 +}
114106 +
114107 +static tree handle_phi(struct visited *visited, struct cgraph_node *caller_node, tree orig_result)
114108 +{
114109 + tree ssa_name_var = NULL_TREE;
114110 +#if BUILDING_GCC_VERSION <= 4007
114111 + VEC(tree, heap) *args = NULL;
114112 +#else
114113 + vec<tree, va_heap, vl_embed> *args = NULL;
114114 +#endif
114115 + gimple oldstmt = get_def_stmt(orig_result);
114116 + unsigned int i, len = gimple_phi_num_args(oldstmt);
114117 +
114118 + pointer_set_insert(visited->stmts, oldstmt);
114119 + for (i = 0; i < len; i++) {
114120 + tree arg, new_arg;
114121 +
114122 + arg = gimple_phi_arg_def(oldstmt, i);
114123 + new_arg = expand(visited, caller_node, arg);
114124 +
114125 + if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
114126 + ssa_name_var = SSA_NAME_VAR(new_arg);
114127 +
114128 + if (is_gimple_constant(arg)) {
114129 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
114130 +
114131 + new_arg = cast_a_tree(size_overflow_type, arg);
114132 + }
114133 +
114134 +#if BUILDING_GCC_VERSION <= 4007
114135 + VEC_safe_push(tree, heap, args, new_arg);
114136 +#else
114137 + vec_safe_push(args, new_arg);
114138 +#endif
114139 + }
114140 +
114141 +#if BUILDING_GCC_VERSION <= 4007
114142 + return create_new_phi_node(visited, &args, ssa_name_var, oldstmt);
114143 +#else
114144 + return create_new_phi_node(visited, args, ssa_name_var, oldstmt);
114145 +#endif
114146 +}
114147 +
114148 +static tree create_cast_assign(struct visited *visited, gimple stmt)
114149 +{
114150 + tree rhs1 = gimple_assign_rhs1(stmt);
114151 + tree lhs = gimple_assign_lhs(stmt);
114152 + const_tree rhs1_type = TREE_TYPE(rhs1);
114153 + const_tree lhs_type = TREE_TYPE(lhs);
114154 +
114155 + if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
114156 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114157 +
114158 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
114159 +}
114160 +
114161 +static bool skip_lhs_cast_check(const_gimple stmt)
114162 +{
114163 + const_tree rhs = gimple_assign_rhs1(stmt);
114164 + const_gimple def_stmt = get_def_stmt(rhs);
114165 +
114166 + // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max
114167 + if (gimple_code(def_stmt) == GIMPLE_ASM)
114168 + return true;
114169 +
114170 + if (is_const_plus_unsigned_signed_truncation(rhs))
114171 + return true;
114172 +
114173 + return false;
114174 +}
114175 +
114176 +static tree create_string_param(tree string)
114177 +{
114178 + tree i_type, a_type;
114179 + const int length = TREE_STRING_LENGTH(string);
114180 +
114181 + gcc_assert(length > 0);
114182 +
114183 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
114184 + a_type = build_array_type(char_type_node, i_type);
114185 +
114186 + TREE_TYPE(string) = a_type;
114187 + TREE_CONSTANT(string) = 1;
114188 + TREE_READONLY(string) = 1;
114189 +
114190 + return build1(ADDR_EXPR, ptr_type_node, string);
114191 +}
114192 +
114193 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
114194 +{
114195 + gimple cond_stmt;
114196 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
114197 +
114198 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
114199 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
114200 + update_stmt(cond_stmt);
114201 +}
114202 +
114203 +static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
114204 +{
114205 + gimple func_stmt;
114206 + const_gimple def_stmt;
114207 + const_tree loc_line;
114208 + tree loc_file, ssa_name, current_func;
114209 + expanded_location xloc;
114210 + char *ssa_name_buf;
114211 + int len;
114212 + struct cgraph_edge *edge;
114213 + struct cgraph_node *callee_node;
114214 + int frequency;
114215 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
114216 +
114217 + def_stmt = get_def_stmt(arg);
114218 + xloc = expand_location(gimple_location(def_stmt));
114219 +
114220 + if (!gimple_has_location(def_stmt)) {
114221 + xloc = expand_location(gimple_location(stmt));
114222 + if (!gimple_has_location(stmt))
114223 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
114224 + }
114225 +
114226 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
114227 +
114228 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
114229 + loc_file = create_string_param(loc_file);
114230 +
114231 + current_func = build_string(DECL_NAME_LENGTH(current_function_decl) + 1, DECL_NAME_POINTER(current_function_decl));
114232 + current_func = create_string_param(current_func);
114233 +
114234 + gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
114235 + call_count++;
114236 + 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);
114237 + gcc_assert(len > 0);
114238 + ssa_name = build_string(len + 1, ssa_name_buf);
114239 + free(ssa_name_buf);
114240 + ssa_name = create_string_param(ssa_name);
114241 +
114242 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
114243 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
114244 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
114245 +
114246 + callee_node = cgraph_get_create_node(report_size_overflow_decl);
114247 + frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
114248 +
114249 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
114250 + gcc_assert(edge != NULL);
114251 +}
114252 +
114253 +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)
114254 +{
114255 + basic_block cond_bb, join_bb, bb_true;
114256 + edge e;
114257 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
114258 +
114259 + cond_bb = gimple_bb(stmt);
114260 + if (before)
114261 + gsi_prev(&gsi);
114262 + if (gsi_end_p(gsi))
114263 + e = split_block_after_labels(cond_bb);
114264 + else
114265 + e = split_block(cond_bb, gsi_stmt(gsi));
114266 + cond_bb = e->src;
114267 + join_bb = e->dest;
114268 + e->flags = EDGE_FALSE_VALUE;
114269 + e->probability = REG_BR_PROB_BASE;
114270 +
114271 + bb_true = create_empty_bb(cond_bb);
114272 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
114273 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
114274 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
114275 +
114276 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
114277 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
114278 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
114279 +
114280 + if (current_loops != NULL) {
114281 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
114282 + add_bb_to_loop(bb_true, cond_bb->loop_father);
114283 + }
114284 +
114285 + insert_cond(cond_bb, arg, cond_code, type_value);
114286 + insert_cond_result(caller_node, bb_true, stmt, arg, min);
114287 +
114288 +// print_the_code_insertions(stmt);
114289 +}
114290 +
114291 +void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
114292 +{
114293 + const_tree rhs_type = TREE_TYPE(rhs);
114294 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
114295 +
114296 + gcc_assert(rhs_type != NULL_TREE);
114297 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
114298 + return;
114299 +
114300 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
114301 +
114302 + if (is_const_plus_unsigned_signed_truncation(rhs))
114303 + return;
114304 +
114305 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
114306 + // typemax (-1) < typemin (0)
114307 + if (TREE_OVERFLOW(type_max))
114308 + return;
114309 +
114310 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
114311 +
114312 + cast_rhs_type = TREE_TYPE(cast_rhs);
114313 + type_max_type = TREE_TYPE(type_max);
114314 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
114315 +
114316 + insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
114317 +
114318 + // special case: get_size_overflow_type(), 32, u64->s
114319 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && TYPE_UNSIGNED(size_overflow_type) && !TYPE_UNSIGNED(rhs_type))
114320 + return;
114321 +
114322 + type_min_type = TREE_TYPE(type_min);
114323 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
114324 + insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
114325 +}
114326 +
114327 +static tree create_cast_overflow_check(struct visited *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
114328 +{
114329 + bool cast_lhs, cast_rhs;
114330 + tree lhs = gimple_assign_lhs(stmt);
114331 + tree rhs = gimple_assign_rhs1(stmt);
114332 + const_tree lhs_type = TREE_TYPE(lhs);
114333 + const_tree rhs_type = TREE_TYPE(rhs);
114334 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
114335 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
114336 + unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode);
114337 + unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode);
114338 +
114339 + static bool check_lhs[3][4] = {
114340 + // ss su us uu
114341 + { false, true, true, false }, // lhs > rhs
114342 + { false, false, false, false }, // lhs = rhs
114343 + { true, true, true, true }, // lhs < rhs
114344 + };
114345 +
114346 + static bool check_rhs[3][4] = {
114347 + // ss su us uu
114348 + { true, false, true, true }, // lhs > rhs
114349 + { true, false, true, true }, // lhs = rhs
114350 + { true, false, true, true }, // lhs < rhs
114351 + };
114352 +
114353 + // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!!
114354 + if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
114355 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114356 +
114357 + if (lhs_size > rhs_size) {
114358 + cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114359 + cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114360 + } else if (lhs_size == rhs_size) {
114361 + cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114362 + cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114363 + } else {
114364 + cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114365 + cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114366 + }
114367 +
114368 + if (!cast_lhs && !cast_rhs)
114369 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114370 +
114371 + if (cast_lhs && !skip_lhs_cast_check(stmt))
114372 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
114373 +
114374 + if (cast_rhs)
114375 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
114376 +
114377 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114378 +}
114379 +
114380 +static tree handle_unary_rhs(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
114381 +{
114382 + enum tree_code rhs_code;
114383 + tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
114384 +
114385 + if (pointer_set_contains(visited->my_stmts, stmt))
114386 + return lhs;
114387 +
114388 + rhs1 = gimple_assign_rhs1(stmt);
114389 + if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
114390 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114391 +
114392 + new_rhs1 = expand(visited, caller_node, rhs1);
114393 +
114394 + if (new_rhs1 == NULL_TREE)
114395 + return create_cast_assign(visited, stmt);
114396 +
114397 + if (pointer_set_contains(visited->no_cast_check, stmt))
114398 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114399 +
114400 + rhs_code = gimple_assign_rhs_code(stmt);
114401 + if (rhs_code == BIT_NOT_EXPR || rhs_code == NEGATE_EXPR) {
114402 + tree size_overflow_type = get_size_overflow_type(visited, stmt, rhs1);
114403 +
114404 + new_rhs1 = cast_to_new_size_overflow_type(visited, stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
114405 + check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
114406 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114407 + }
114408 +
114409 + if (!gimple_assign_cast_p(stmt))
114410 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114411 +
114412 + return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
114413 +}
114414 +
114415 +static tree handle_unary_ops(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
114416 +{
114417 + tree rhs1, lhs = gimple_assign_lhs(stmt);
114418 + gimple def_stmt = get_def_stmt(lhs);
114419 +
114420 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
114421 + rhs1 = gimple_assign_rhs1(def_stmt);
114422 +
114423 + if (is_gimple_constant(rhs1))
114424 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114425 +
114426 + switch (TREE_CODE(rhs1)) {
114427 + case SSA_NAME: {
114428 + tree ret = handle_unary_rhs(visited, caller_node, def_stmt);
114429 +
114430 + if (gimple_assign_cast_p(stmt))
114431 + unsigned_signed_cast_intentional_overflow(visited, stmt);
114432 + return ret;
114433 + }
114434 + case ARRAY_REF:
114435 + case BIT_FIELD_REF:
114436 + case ADDR_EXPR:
114437 + case COMPONENT_REF:
114438 + case INDIRECT_REF:
114439 +#if BUILDING_GCC_VERSION >= 4006
114440 + case MEM_REF:
114441 +#endif
114442 + case TARGET_MEM_REF:
114443 + case VIEW_CONVERT_EXPR:
114444 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114445 + case PARM_DECL:
114446 + case VAR_DECL:
114447 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114448 +
114449 + default:
114450 + debug_gimple_stmt(def_stmt);
114451 + debug_tree(rhs1);
114452 + gcc_unreachable();
114453 + }
114454 +}
114455 +
114456 +static void __unused print_the_code_insertions(const_gimple stmt)
114457 +{
114458 + location_t loc = gimple_location(stmt);
114459 +
114460 + inform(loc, "Integer size_overflow check applied here.");
114461 +}
114462 +
114463 +static bool is_from_cast(const_tree node)
114464 +{
114465 + gimple def_stmt = get_def_stmt(node);
114466 +
114467 + if (!def_stmt)
114468 + return false;
114469 +
114470 + if (gimple_assign_cast_p(def_stmt))
114471 + return true;
114472 +
114473 + return false;
114474 +}
114475 +
114476 +// Skip duplication when there is a minus expr and the type of rhs1 or rhs2 is a pointer_type.
114477 +static bool is_a_ptr_minus(gimple stmt)
114478 +{
114479 + const_tree rhs1, rhs2, ptr1_rhs, ptr2_rhs;
114480 +
114481 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
114482 + return false;
114483 +
114484 + rhs1 = gimple_assign_rhs1(stmt);
114485 + if (!is_from_cast(rhs1))
114486 + return false;
114487 +
114488 + rhs2 = gimple_assign_rhs2(stmt);
114489 + if (!is_from_cast(rhs2))
114490 + return false;
114491 +
114492 + ptr1_rhs = gimple_assign_rhs1(get_def_stmt(rhs1));
114493 + ptr2_rhs = gimple_assign_rhs1(get_def_stmt(rhs2));
114494 +
114495 + if (TREE_CODE(TREE_TYPE(ptr1_rhs)) != POINTER_TYPE && TREE_CODE(TREE_TYPE(ptr2_rhs)) != POINTER_TYPE)
114496 + return false;
114497 +
114498 + return true;
114499 +}
114500 +
114501 +static tree handle_binary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114502 +{
114503 + enum intentional_overflow_type res;
114504 + tree rhs1, rhs2, new_lhs;
114505 + gimple def_stmt = get_def_stmt(lhs);
114506 + tree new_rhs1 = NULL_TREE;
114507 + tree new_rhs2 = NULL_TREE;
114508 +
114509 + if (is_a_ptr_minus(def_stmt))
114510 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114511 +
114512 + rhs1 = gimple_assign_rhs1(def_stmt);
114513 + rhs2 = gimple_assign_rhs2(def_stmt);
114514 +
114515 + /* no DImode/TImode division in the 32/64 bit kernel */
114516 + switch (gimple_assign_rhs_code(def_stmt)) {
114517 + case RDIV_EXPR:
114518 + case TRUNC_DIV_EXPR:
114519 + case CEIL_DIV_EXPR:
114520 + case FLOOR_DIV_EXPR:
114521 + case ROUND_DIV_EXPR:
114522 + case TRUNC_MOD_EXPR:
114523 + case CEIL_MOD_EXPR:
114524 + case FLOOR_MOD_EXPR:
114525 + case ROUND_MOD_EXPR:
114526 + case EXACT_DIV_EXPR:
114527 + case POINTER_PLUS_EXPR:
114528 + case BIT_AND_EXPR:
114529 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114530 + default:
114531 + break;
114532 + }
114533 +
114534 + new_lhs = handle_integer_truncation(visited, caller_node, lhs);
114535 + if (new_lhs != NULL_TREE)
114536 + return new_lhs;
114537 +
114538 + if (TREE_CODE(rhs1) == SSA_NAME)
114539 + new_rhs1 = expand(visited, caller_node, rhs1);
114540 + if (TREE_CODE(rhs2) == SSA_NAME)
114541 + new_rhs2 = expand(visited, caller_node, rhs2);
114542 +
114543 + res = add_mul_intentional_overflow(def_stmt);
114544 + if (res != NO_INTENTIONAL_OVERFLOW) {
114545 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114546 + insert_cast_expr(visited, get_def_stmt(new_lhs), res);
114547 + return new_lhs;
114548 + }
114549 +
114550 + if (skip_expr_on_double_type(def_stmt)) {
114551 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114552 + insert_cast_expr(visited, get_def_stmt(new_lhs), NO_INTENTIONAL_OVERFLOW);
114553 + return new_lhs;
114554 + }
114555 +
114556 + if (is_a_neg_overflow(def_stmt, rhs2))
114557 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
114558 + if (is_a_neg_overflow(def_stmt, rhs1))
114559 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
114560 +
114561 +
114562 + if (is_a_constant_overflow(def_stmt, rhs2))
114563 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
114564 + if (is_a_constant_overflow(def_stmt, rhs1))
114565 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
114566 +
114567 + // the const is between 0 and (signed) MAX
114568 + if (is_gimple_constant(rhs1))
114569 + new_rhs1 = create_assign(visited, def_stmt, rhs1, BEFORE_STMT);
114570 + if (is_gimple_constant(rhs2))
114571 + new_rhs2 = create_assign(visited, def_stmt, rhs2, BEFORE_STMT);
114572 +
114573 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114574 +}
114575 +
114576 +#if BUILDING_GCC_VERSION >= 4006
114577 +static tree get_new_rhs(struct visited *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
114578 +{
114579 + if (is_gimple_constant(rhs))
114580 + return cast_a_tree(size_overflow_type, rhs);
114581 + if (TREE_CODE(rhs) != SSA_NAME)
114582 + return NULL_TREE;
114583 + return expand(visited, caller_node, rhs);
114584 +}
114585 +
114586 +static tree handle_ternary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114587 +{
114588 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
114589 + gimple def_stmt = get_def_stmt(lhs);
114590 +
114591 + size_overflow_type = get_size_overflow_type(visited, def_stmt, lhs);
114592 +
114593 + rhs1 = gimple_assign_rhs1(def_stmt);
114594 + rhs2 = gimple_assign_rhs2(def_stmt);
114595 + rhs3 = gimple_assign_rhs3(def_stmt);
114596 + new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
114597 + new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
114598 + new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
114599 +
114600 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
114601 +}
114602 +#endif
114603 +
114604 +static tree get_my_stmt_lhs(struct visited *visited, gimple stmt)
114605 +{
114606 + gimple_stmt_iterator gsi;
114607 + gimple next_stmt = NULL;
114608 +
114609 + gsi = gsi_for_stmt(stmt);
114610 +
114611 + do {
114612 + gsi_next(&gsi);
114613 + next_stmt = gsi_stmt(gsi);
114614 +
114615 + if (gimple_code(stmt) == GIMPLE_PHI && !pointer_set_contains(visited->my_stmts, next_stmt))
114616 + return NULL_TREE;
114617 +
114618 + if (pointer_set_contains(visited->my_stmts, next_stmt) && !pointer_set_contains(visited->skip_expr_casts, next_stmt))
114619 + break;
114620 +
114621 + gcc_assert(pointer_set_contains(visited->my_stmts, next_stmt));
114622 + } while (!gsi_end_p(gsi));
114623 +
114624 + gcc_assert(next_stmt);
114625 + return get_lhs(next_stmt);
114626 +}
114627 +
114628 +static tree expand_visited(struct visited *visited, gimple def_stmt)
114629 +{
114630 + gimple_stmt_iterator gsi;
114631 + enum gimple_code code = gimple_code(def_stmt);
114632 +
114633 + if (code == GIMPLE_ASM)
114634 + return NULL_TREE;
114635 +
114636 + gsi = gsi_for_stmt(def_stmt);
114637 + gsi_next(&gsi);
114638 +
114639 + if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi))
114640 + return NULL_TREE;
114641 + return get_my_stmt_lhs(visited, def_stmt);
114642 +}
114643 +
114644 +tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114645 +{
114646 + gimple def_stmt;
114647 +
114648 + def_stmt = get_def_stmt(lhs);
114649 +
114650 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
114651 + return NULL_TREE;
114652 +
114653 + if (pointer_set_contains(visited->my_stmts, def_stmt))
114654 + return lhs;
114655 +
114656 + if (pointer_set_contains(visited->stmts, def_stmt))
114657 + return expand_visited(visited, def_stmt);
114658 +
114659 + switch (gimple_code(def_stmt)) {
114660 + case GIMPLE_PHI:
114661 + return handle_phi(visited, caller_node, lhs);
114662 + case GIMPLE_CALL:
114663 + case GIMPLE_ASM:
114664 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114665 + case GIMPLE_ASSIGN:
114666 + switch (gimple_num_ops(def_stmt)) {
114667 + case 2:
114668 + return handle_unary_ops(visited, caller_node, def_stmt);
114669 + case 3:
114670 + return handle_binary_ops(visited, caller_node, lhs);
114671 +#if BUILDING_GCC_VERSION >= 4006
114672 + case 4:
114673 + return handle_ternary_ops(visited, caller_node, lhs);
114674 +#endif
114675 + }
114676 + default:
114677 + debug_gimple_stmt(def_stmt);
114678 + error("%s: unknown gimple code", __func__);
114679 + gcc_unreachable();
114680 + }
114681 +}
114682 +
114683 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
114684 new file mode 100644
114685 index 0000000..df50164
114686 --- /dev/null
114687 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c
114688 @@ -0,0 +1,1141 @@
114689 +/*
114690 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114691 + * Licensed under the GPL v2, or (at your option) v3
114692 + *
114693 + * Homepage:
114694 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114695 + *
114696 + * Documentation:
114697 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114698 + *
114699 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114700 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114701 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114702 + *
114703 + * Usage:
114704 + * $ make
114705 + * $ make run
114706 + */
114707 +
114708 +#include "gcc-common.h"
114709 +#include "size_overflow.h"
114710 +
114711 +#define VEC_LEN 128
114712 +#define RET_CHECK NULL_TREE
114713 +#define WRONG_NODE 32
114714 +#define NOT_INTENTIONAL_ASM NULL
114715 +
114716 +unsigned int call_count;
114717 +
114718 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
114719 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
114720 +
114721 +struct visited_fns {
114722 + struct visited_fns *next;
114723 + const_tree fndecl;
114724 + unsigned int num;
114725 + const_gimple first_stmt;
114726 +};
114727 +
114728 +struct next_cgraph_node {
114729 + struct next_cgraph_node *next;
114730 + struct cgraph_node *current_function;
114731 + tree callee_fndecl;
114732 + unsigned int num;
114733 +};
114734 +
114735 +// Don't want to duplicate entries in next_cgraph_node
114736 +static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
114737 +{
114738 + const_tree new_callee_fndecl;
114739 + struct next_cgraph_node *cur_node;
114740 +
114741 + if (fndecl == RET_CHECK)
114742 + new_callee_fndecl = NODE_DECL(node);
114743 + else
114744 + new_callee_fndecl = fndecl;
114745 +
114746 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
114747 + if (!operand_equal_p(NODE_DECL(cur_node->current_function), NODE_DECL(node), 0))
114748 + continue;
114749 + if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
114750 + continue;
114751 + if (num == cur_node->num)
114752 + return true;
114753 + }
114754 + return false;
114755 +}
114756 +
114757 +/* Add a next_cgraph_node into the list for handle_function().
114758 + * handle_function() iterates over all the next cgraph nodes and
114759 + * starts the overflow check insertion process.
114760 + */
114761 +static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
114762 +{
114763 + struct next_cgraph_node *new_node;
114764 +
114765 + if (is_in_next_cgraph_node(head, node, fndecl, num))
114766 + return head;
114767 +
114768 + new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
114769 + new_node->current_function = node;
114770 + new_node->next = NULL;
114771 + new_node->num = num;
114772 + if (fndecl == RET_CHECK)
114773 + new_node->callee_fndecl = NODE_DECL(node);
114774 + else
114775 + new_node->callee_fndecl = fndecl;
114776 +
114777 + if (!head)
114778 + return new_node;
114779 +
114780 + new_node->next = head;
114781 + return new_node;
114782 +}
114783 +
114784 +static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
114785 +{
114786 + struct cgraph_edge *e;
114787 +
114788 + if (num == 0)
114789 + return create_new_next_cgraph_node(head, node, RET_CHECK, num);
114790 +
114791 + for (e = node->callers; e; e = e->next_caller) {
114792 + tree fndecl = gimple_call_fndecl(e->call_stmt);
114793 +
114794 + gcc_assert(fndecl != NULL_TREE);
114795 + head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
114796 + }
114797 +
114798 + return head;
114799 +}
114800 +
114801 +struct missing_functions {
114802 + struct missing_functions *next;
114803 + const_tree node;
114804 + tree fndecl;
114805 +};
114806 +
114807 +static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
114808 +{
114809 + struct missing_functions *new_function;
114810 +
114811 + new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
114812 + new_function->node = node;
114813 + new_function->next = NULL;
114814 +
114815 + if (TREE_CODE(node) == FUNCTION_DECL)
114816 + new_function->fndecl = node;
114817 + else
114818 + new_function->fndecl = current_function_decl;
114819 + gcc_assert(new_function->fndecl);
114820 +
114821 + if (!missing_fn_head)
114822 + return new_function;
114823 +
114824 + new_function->next = missing_fn_head;
114825 + return new_function;
114826 +}
114827 +
114828 +/* If the function is missing from the hash table and it is a static function
114829 + * then create a next_cgraph_node from it for handle_function()
114830 + */
114831 +static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
114832 +{
114833 + unsigned int num;
114834 + const_tree orig_fndecl;
114835 + struct cgraph_node *next_node = NULL;
114836 +
114837 + orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
114838 +
114839 + num = get_function_num(missing_fn_head->node, orig_fndecl);
114840 + if (num == CANNOT_FIND_ARG)
114841 + return cnodes;
114842 +
114843 + if (!is_missing_function(orig_fndecl, num))
114844 + return cnodes;
114845 +
114846 + next_node = cgraph_get_node(missing_fn_head->fndecl);
114847 + if (next_node && next_node->local.local)
114848 + cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
114849 + return cnodes;
114850 +}
114851 +
114852 +/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
114853 + * into the next_cgraph_node list. They will be the next interesting returns or callees.
114854 + */
114855 +static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
114856 +{
114857 + unsigned int i;
114858 + tree node;
114859 + struct missing_functions *cur, *missing_fn_head = NULL;
114860 +
114861 +#if BUILDING_GCC_VERSION <= 4007
114862 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
114863 +#else
114864 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
114865 +#endif
114866 + switch (TREE_CODE(node)) {
114867 + case PARM_DECL:
114868 + if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
114869 + break;
114870 + case FUNCTION_DECL:
114871 + missing_fn_head = create_new_missing_function(missing_fn_head, node);
114872 + break;
114873 + default:
114874 + break;
114875 + }
114876 + }
114877 +
114878 + while (missing_fn_head) {
114879 + cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
114880 +
114881 + cur = missing_fn_head->next;
114882 + free(missing_fn_head);
114883 + missing_fn_head = cur;
114884 + }
114885 +
114886 + return cnodes;
114887 +}
114888 +
114889 +static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
114890 +{
114891 + gimple phi = get_def_stmt(result);
114892 + unsigned int i, n = gimple_phi_num_args(phi);
114893 +
114894 + pointer_set_insert(visited, phi);
114895 + for (i = 0; i < n; i++) {
114896 + const_tree arg = gimple_phi_arg_def(phi, i);
114897 +
114898 + set_conditions(visited, interesting_conditions, arg);
114899 + }
114900 +}
114901 +
114902 +enum conditions {
114903 + FROM_CONST, NOT_UNARY, CAST, RET, PHI
114904 +};
114905 +
114906 +// Search for constants, cast assignments and binary/ternary assignments
114907 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
114908 +{
114909 + gimple def_stmt = get_def_stmt(lhs);
114910 +
114911 + if (is_gimple_constant(lhs)) {
114912 + interesting_conditions[FROM_CONST] = true;
114913 + return;
114914 + }
114915 +
114916 + if (!def_stmt)
114917 + return;
114918 +
114919 + if (pointer_set_contains(visited, def_stmt))
114920 + return;
114921 +
114922 + switch (gimple_code(def_stmt)) {
114923 + case GIMPLE_CALL:
114924 + if (lhs == gimple_call_lhs(def_stmt))
114925 + interesting_conditions[RET] = true;
114926 + return;
114927 + case GIMPLE_NOP:
114928 + case GIMPLE_ASM:
114929 + return;
114930 + case GIMPLE_PHI:
114931 + interesting_conditions[PHI] = true;
114932 + return walk_phi_set_conditions(visited, interesting_conditions, lhs);
114933 + case GIMPLE_ASSIGN:
114934 + if (gimple_num_ops(def_stmt) == 2) {
114935 + const_tree rhs = gimple_assign_rhs1(def_stmt);
114936 +
114937 + if (gimple_assign_cast_p(def_stmt))
114938 + interesting_conditions[CAST] = true;
114939 +
114940 + return set_conditions(visited, interesting_conditions, rhs);
114941 + } else {
114942 + interesting_conditions[NOT_UNARY] = true;
114943 + return;
114944 + }
114945 + default:
114946 + debug_gimple_stmt(def_stmt);
114947 + gcc_unreachable();
114948 + }
114949 +}
114950 +
114951 +// determine whether duplication will be necessary or not.
114952 +static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
114953 +{
114954 + struct pointer_set_t *visited;
114955 +
114956 + if (gimple_assign_cast_p(cur_node->first_stmt))
114957 + interesting_conditions[CAST] = true;
114958 + else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
114959 + interesting_conditions[NOT_UNARY] = true;
114960 +
114961 + visited = pointer_set_create();
114962 + set_conditions(visited, interesting_conditions, cur_node->node);
114963 + pointer_set_destroy(visited);
114964 +}
114965 +
114966 +// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
114967 +static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
114968 +{
114969 + gimple assign;
114970 + gimple_stmt_iterator gsi;
114971 +
114972 + // already removed
114973 + if (gimple_bb(asm_stmt) == NULL)
114974 + return;
114975 + gsi = gsi_for_stmt(asm_stmt);
114976 +
114977 + assign = gimple_build_assign(lhs, rhs);
114978 + gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
114979 + SSA_NAME_DEF_STMT(lhs) = assign;
114980 +
114981 + gsi_remove(&gsi, true);
114982 +}
114983 +
114984 +/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
114985 + * stmt is a return otherwise it is the callee function.
114986 + */
114987 +const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
114988 +{
114989 + const_tree fndecl;
114990 +
114991 + if (argnum == 0)
114992 + fndecl = current_function_decl;
114993 + else
114994 + fndecl = gimple_call_fndecl(stmt);
114995 +
114996 + if (fndecl == NULL_TREE)
114997 + return NULL_TREE;
114998 +
114999 + return DECL_ORIGIN(fndecl);
115000 +}
115001 +
115002 +// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
115003 +static bool skip_asm(const_tree arg)
115004 +{
115005 + gimple def_stmt = get_def_stmt(arg);
115006 +
115007 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
115008 + return false;
115009 +
115010 + def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
115011 + return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
115012 +}
115013 +
115014 +static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
115015 +{
115016 + gimple phi = get_def_stmt(result);
115017 + unsigned int i, n = gimple_phi_num_args(phi);
115018 +
115019 + pointer_set_insert(visited, phi);
115020 + for (i = 0; i < n; i++) {
115021 + tree arg = gimple_phi_arg_def(phi, i);
115022 +
115023 + walk_use_def(visited, cur_node, arg);
115024 + }
115025 +}
115026 +
115027 +static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
115028 +{
115029 + gimple def_stmt = get_def_stmt(lhs);
115030 + tree rhs1, rhs2;
115031 +
115032 + rhs1 = gimple_assign_rhs1(def_stmt);
115033 + rhs2 = gimple_assign_rhs2(def_stmt);
115034 +
115035 + walk_use_def(visited, cur_node, rhs1);
115036 + walk_use_def(visited, cur_node, rhs2);
115037 +}
115038 +
115039 +static void insert_last_node(struct interesting_node *cur_node, tree node)
115040 +{
115041 + unsigned int i;
115042 + tree element;
115043 + enum tree_code code;
115044 +
115045 + gcc_assert(node != NULL_TREE);
115046 +
115047 + if (is_gimple_constant(node))
115048 + return;
115049 +
115050 + code = TREE_CODE(node);
115051 + if (code == VAR_DECL) {
115052 + node = DECL_ORIGIN(node);
115053 + code = TREE_CODE(node);
115054 + }
115055 +
115056 + if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
115057 + return;
115058 +
115059 +#if BUILDING_GCC_VERSION <= 4007
115060 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
115061 +#else
115062 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
115063 +#endif
115064 + if (operand_equal_p(node, element, 0))
115065 + return;
115066 + }
115067 +
115068 +#if BUILDING_GCC_VERSION <= 4007
115069 + gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
115070 + VEC_safe_push(tree, gc, cur_node->last_nodes, node);
115071 +#else
115072 + gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
115073 + vec_safe_push(cur_node->last_nodes, node);
115074 +#endif
115075 +}
115076 +
115077 +// a size_overflow asm stmt in the control flow doesn't stop the recursion
115078 +static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
115079 +{
115080 + if (!is_size_overflow_asm(stmt))
115081 + walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
115082 +}
115083 +
115084 +/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
115085 + * and component refs (for checking the intentional_overflow attribute).
115086 + */
115087 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
115088 +{
115089 + const_gimple def_stmt;
115090 +
115091 + if (TREE_CODE(lhs) != SSA_NAME) {
115092 + insert_last_node(cur_node, lhs);
115093 + return;
115094 + }
115095 +
115096 + def_stmt = get_def_stmt(lhs);
115097 + if (!def_stmt)
115098 + return;
115099 +
115100 + if (pointer_set_insert(visited, def_stmt))
115101 + return;
115102 +
115103 + switch (gimple_code(def_stmt)) {
115104 + case GIMPLE_NOP:
115105 + return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
115106 + case GIMPLE_ASM:
115107 + return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
115108 + case GIMPLE_CALL: {
115109 + tree fndecl = gimple_call_fndecl(def_stmt);
115110 +
115111 + if (fndecl == NULL_TREE)
115112 + return;
115113 + insert_last_node(cur_node, fndecl);
115114 + return;
115115 + }
115116 + case GIMPLE_PHI:
115117 + return walk_use_def_phi(visited, cur_node, lhs);
115118 + case GIMPLE_ASSIGN:
115119 + switch (gimple_num_ops(def_stmt)) {
115120 + case 2:
115121 + return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
115122 + case 3:
115123 + return walk_use_def_binary(visited, cur_node, lhs);
115124 + }
115125 + default:
115126 + debug_gimple_stmt((gimple)def_stmt);
115127 + error("%s: unknown gimple code", __func__);
115128 + gcc_unreachable();
115129 + }
115130 +}
115131 +
115132 +// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
115133 +static void set_last_nodes(struct interesting_node *cur_node)
115134 +{
115135 + struct pointer_set_t *visited;
115136 +
115137 + visited = pointer_set_create();
115138 + walk_use_def(visited, cur_node, cur_node->node);
115139 + pointer_set_destroy(visited);
115140 +}
115141 +
115142 +enum precond {
115143 + NO_ATTRIBUTE_SEARCH, NO_CHECK_INSERT, NONE
115144 +};
115145 +
115146 +/* 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.
115147 + * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
115148 + * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
115149 + * It skips the possible error codes too.
115150 + */
115151 +static enum precond check_preconditions(struct interesting_node *cur_node)
115152 +{
115153 + bool interesting_conditions[5] = {false, false, false, false, false};
115154 +
115155 + set_last_nodes(cur_node);
115156 +
115157 + check_intentional_attribute_ipa(cur_node);
115158 + if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
115159 + return NO_ATTRIBUTE_SEARCH;
115160 +
115161 + search_interesting_conditions(cur_node, interesting_conditions);
115162 +
115163 + // error code: a phi, unary assign (not cast) and returns only
115164 + if (!interesting_conditions[NOT_UNARY] && interesting_conditions[PHI] && interesting_conditions[RET] && !interesting_conditions[CAST])
115165 + return NO_ATTRIBUTE_SEARCH;
115166 +
115167 + // error code: def_stmts trace back to a constant and there are no binary/ternary assigments
115168 + if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
115169 + return NO_ATTRIBUTE_SEARCH;
115170 +
115171 + // unnecessary overflow check
115172 + if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
115173 + return NO_CHECK_INSERT;
115174 +
115175 + if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
115176 + return NO_CHECK_INSERT;
115177 +
115178 + return NONE;
115179 +}
115180 +
115181 +static tree cast_to_orig_type(struct visited *visited, gimple stmt, const_tree orig_node, tree new_node)
115182 +{
115183 + const_gimple assign;
115184 + tree orig_type = TREE_TYPE(orig_node);
115185 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
115186 +
115187 + assign = build_cast_stmt(visited, orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
115188 + return gimple_assign_lhs(assign);
115189 +}
115190 +
115191 +static void change_orig_node(struct visited *visited, struct interesting_node *cur_node, tree new_node)
115192 +{
115193 + void (*set_rhs)(gimple, tree);
115194 + gimple stmt = cur_node->first_stmt;
115195 + const_tree orig_node = cur_node->node;
115196 +
115197 + switch (gimple_code(stmt)) {
115198 + case GIMPLE_RETURN:
115199 + gimple_return_set_retval(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
115200 + break;
115201 + case GIMPLE_CALL:
115202 + gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(visited, stmt, orig_node, new_node));
115203 + break;
115204 + case GIMPLE_ASSIGN:
115205 + switch (cur_node->num) {
115206 + case 1:
115207 + set_rhs = &gimple_assign_set_rhs1;
115208 + break;
115209 + case 2:
115210 + set_rhs = &gimple_assign_set_rhs2;
115211 + break;
115212 +#if BUILDING_GCC_VERSION >= 4006
115213 + case 3:
115214 + set_rhs = &gimple_assign_set_rhs3;
115215 + break;
115216 +#endif
115217 + default:
115218 + gcc_unreachable();
115219 + }
115220 +
115221 + set_rhs(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
115222 + break;
115223 + default:
115224 + debug_gimple_stmt(stmt);
115225 + gcc_unreachable();
115226 + }
115227 +
115228 + update_stmt(stmt);
115229 +}
115230 +
115231 +static struct visited *create_visited(void)
115232 +{
115233 + struct visited *new_node;
115234 +
115235 + new_node = (struct visited *)xmalloc(sizeof(*new_node));
115236 + new_node->stmts = pointer_set_create();
115237 + new_node->my_stmts = pointer_set_create();
115238 + new_node->skip_expr_casts = pointer_set_create();
115239 + new_node->no_cast_check = pointer_set_create();
115240 + return new_node;
115241 +}
115242 +
115243 +static void free_visited(struct visited *visited)
115244 +{
115245 + pointer_set_destroy(visited->stmts);
115246 + pointer_set_destroy(visited->my_stmts);
115247 + pointer_set_destroy(visited->skip_expr_casts);
115248 + pointer_set_destroy(visited->no_cast_check);
115249 +
115250 + free(visited);
115251 +}
115252 +
115253 +/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
115254 + * 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
115255 + * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
115256 + */
115257 +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)
115258 +{
115259 + enum precond ret;
115260 + tree new_node, orig_node = cur_node->node;
115261 +
115262 + ret = check_preconditions(cur_node);
115263 + if (ret == NO_ATTRIBUTE_SEARCH)
115264 + return cnodes;
115265 +
115266 + cnodes = search_overflow_attribute(cnodes, cur_node);
115267 +
115268 + if (ret == NO_CHECK_INSERT)
115269 + return cnodes;
115270 +
115271 + new_node = expand(visited, caller_node, orig_node);
115272 + if (new_node == NULL_TREE)
115273 + return cnodes;
115274 +
115275 + change_orig_node(visited, cur_node, new_node);
115276 + check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
115277 +
115278 + return cnodes;
115279 +}
115280 +
115281 +// Check visited_fns interesting nodes.
115282 +static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
115283 +{
115284 + struct interesting_node *cur;
115285 +
115286 + for (cur = head; cur; cur = cur->next) {
115287 + if (!operand_equal_p(node, cur->node, 0))
115288 + continue;
115289 + if (num != cur->num)
115290 + continue;
115291 + if (first_stmt == cur->first_stmt)
115292 + return true;
115293 + }
115294 + return false;
115295 +}
115296 +
115297 +/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
115298 + 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
115299 + 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
115300 + the intentional_overflow attribute check. They are collected by set_last_nodes().
115301 + num: arg count of a call stmt or 0 when it is a ret
115302 + node: the recursion starts from here, it is a call arg or a return value
115303 + 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.
115304 + intentional_attr_decl: intentional_overflow attribute of the callee function
115305 + intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
115306 + intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
115307 + */
115308 +static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
115309 +{
115310 + struct interesting_node *new_node;
115311 + tree fndecl;
115312 + enum gimple_code code;
115313 +
115314 + gcc_assert(node != NULL_TREE);
115315 + code = gimple_code(first_stmt);
115316 + gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
115317 +
115318 + if (num == CANNOT_FIND_ARG)
115319 + return head;
115320 +
115321 + if (skip_types(node))
115322 + return head;
115323 +
115324 + if (skip_asm(node))
115325 + return head;
115326 +
115327 + if (is_gimple_call(first_stmt))
115328 + fndecl = gimple_call_fndecl(first_stmt);
115329 + else
115330 + fndecl = current_function_decl;
115331 +
115332 + if (fndecl == NULL_TREE)
115333 + return head;
115334 +
115335 + if (is_in_interesting_node(head, first_stmt, node, num))
115336 + return head;
115337 +
115338 + new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
115339 +
115340 + new_node->next = NULL;
115341 + new_node->first_stmt = first_stmt;
115342 +#if BUILDING_GCC_VERSION <= 4007
115343 + new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
115344 +#else
115345 + vec_alloc(new_node->last_nodes, VEC_LEN);
115346 +#endif
115347 + new_node->num = num;
115348 + new_node->node = node;
115349 + new_node->fndecl = fndecl;
115350 + new_node->intentional_attr_decl = MARK_NO;
115351 + new_node->intentional_attr_cur_fndecl = MARK_NO;
115352 + new_node->intentional_mark_from_gimple = asm_stmt;
115353 +
115354 + if (!head)
115355 + return new_node;
115356 +
115357 + new_node->next = head;
115358 + return new_node;
115359 +}
115360 +
115361 +/* 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).
115362 + * If the ret stmt is in the next cgraph node list then it's an interesting ret.
115363 + */
115364 +static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
115365 +{
115366 + struct next_cgraph_node *cur_node;
115367 + tree ret = gimple_return_retval(stmt);
115368 +
115369 + if (ret == NULL_TREE)
115370 + return head;
115371 +
115372 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
115373 + if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
115374 + continue;
115375 + if (cur_node->num == 0)
115376 + head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
115377 + }
115378 +
115379 + return head;
115380 +}
115381 +
115382 +/* 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).
115383 + * If the call stmt is in the next cgraph node list then it's an interesting call.
115384 + */
115385 +static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
115386 +{
115387 + unsigned int argnum;
115388 + tree arg;
115389 + const_tree fndecl;
115390 + struct next_cgraph_node *cur_node;
115391 +
115392 + fndecl = gimple_call_fndecl(stmt);
115393 + if (fndecl == NULL_TREE)
115394 + return head;
115395 +
115396 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
115397 + if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
115398 + continue;
115399 + argnum = get_correct_arg_count(cur_node->num, fndecl);
115400 + gcc_assert(argnum != CANNOT_FIND_ARG);
115401 + if (argnum == 0)
115402 + continue;
115403 +
115404 + arg = gimple_call_arg(stmt, argnum - 1);
115405 + head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
115406 + }
115407 +
115408 + return head;
115409 +}
115410 +
115411 +static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
115412 +{
115413 + if (!operand_equal_p(orig_node, node, 0))
115414 + return WRONG_NODE;
115415 + if (skip_types(node))
115416 + return WRONG_NODE;
115417 + return ret_count;
115418 +}
115419 +
115420 +// Get the index of the rhs node in an assignment
115421 +static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
115422 +{
115423 + const_tree rhs1, rhs2;
115424 + unsigned int ret;
115425 +
115426 + gcc_assert(stmt);
115427 + gcc_assert(is_gimple_assign(stmt));
115428 +
115429 + rhs1 = gimple_assign_rhs1(stmt);
115430 + gcc_assert(rhs1 != NULL_TREE);
115431 +
115432 + switch (gimple_num_ops(stmt)) {
115433 + case 2:
115434 + return check_ops(node, rhs1, 1);
115435 + case 3:
115436 + ret = check_ops(node, rhs1, 1);
115437 + if (ret != WRONG_NODE)
115438 + return ret;
115439 +
115440 + rhs2 = gimple_assign_rhs2(stmt);
115441 + gcc_assert(rhs2 != NULL_TREE);
115442 + return check_ops(node, rhs2, 2);
115443 + default:
115444 + gcc_unreachable();
115445 + }
115446 +}
115447 +
115448 +// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
115449 +static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
115450 +{
115451 + unsigned int i;
115452 +
115453 + if (gimple_call_fndecl(stmt) == NULL_TREE)
115454 + return CANNOT_FIND_ARG;
115455 +
115456 + for (i = 0; i < gimple_call_num_args(stmt); i++) {
115457 + tree node;
115458 +
115459 + node = gimple_call_arg(stmt, i);
115460 + if (!operand_equal_p(arg, node, 0))
115461 + continue;
115462 + if (!skip_types(node))
115463 + return i + 1;
115464 + }
115465 +
115466 + return CANNOT_FIND_ARG;
115467 +}
115468 +
115469 +/* starting from the size_overflow asm stmt collect interesting stmts. They can be
115470 + * any of return, call or assignment stmts (because of inlining).
115471 + */
115472 +static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
115473 +{
115474 + use_operand_p use_p;
115475 + imm_use_iterator imm_iter;
115476 + unsigned int argnum;
115477 +
115478 + gcc_assert(TREE_CODE(node) == SSA_NAME);
115479 +
115480 + if (pointer_set_insert(visited, node))
115481 + return head;
115482 +
115483 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
115484 + gimple stmt = USE_STMT(use_p);
115485 +
115486 + if (stmt == NULL)
115487 + return head;
115488 + if (is_gimple_debug(stmt))
115489 + continue;
115490 +
115491 + switch (gimple_code(stmt)) {
115492 + case GIMPLE_CALL:
115493 + argnum = find_arg_number_gimple(node, stmt);
115494 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
115495 + break;
115496 + case GIMPLE_RETURN:
115497 + head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
115498 + break;
115499 + case GIMPLE_ASSIGN:
115500 + argnum = get_assign_ops_count(stmt, node);
115501 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
115502 + break;
115503 + case GIMPLE_PHI: {
115504 + tree result = gimple_phi_result(stmt);
115505 + head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
115506 + break;
115507 + }
115508 + case GIMPLE_ASM:
115509 + if (gimple_asm_noutputs(stmt) != 0)
115510 + break;
115511 + if (!is_size_overflow_asm(stmt))
115512 + break;
115513 + head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
115514 + break;
115515 + case GIMPLE_COND:
115516 + case GIMPLE_SWITCH:
115517 + break;
115518 + default:
115519 + debug_gimple_stmt(stmt);
115520 + gcc_unreachable();
115521 + break;
115522 + }
115523 + }
115524 + return head;
115525 +}
115526 +
115527 +static void remove_size_overflow_asm(gimple stmt)
115528 +{
115529 + gimple_stmt_iterator gsi;
115530 + tree input, output;
115531 +
115532 + if (!is_size_overflow_asm(stmt))
115533 + return;
115534 +
115535 + if (gimple_asm_noutputs(stmt) == 0) {
115536 + gsi = gsi_for_stmt(stmt);
115537 + ipa_remove_stmt_references(cgraph_get_create_node(current_function_decl), stmt);
115538 + gsi_remove(&gsi, true);
115539 + return;
115540 + }
115541 +
115542 + input = gimple_asm_input_op(stmt, 0);
115543 + output = gimple_asm_output_op(stmt, 0);
115544 + replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
115545 +}
115546 +
115547 +/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
115548 + * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
115549 + * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
115550 + */
115551 +static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
115552 +{
115553 + const_tree output;
115554 + struct pointer_set_t *visited;
115555 + gimple intentional_asm = NOT_INTENTIONAL_ASM;
115556 +
115557 + if (!is_size_overflow_asm(stmt))
115558 + return head;
115559 +
115560 + if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
115561 + intentional_asm = stmt;
115562 +
115563 + gcc_assert(gimple_asm_ninputs(stmt) == 1);
115564 +
115565 + if (gimple_asm_noutputs(stmt) == 0 && is_size_overflow_intentional_asm_turn_off(stmt))
115566 + return head;
115567 +
115568 + if (gimple_asm_noutputs(stmt) == 0) {
115569 + const_tree input;
115570 +
115571 + if (!is_size_overflow_intentional_asm_turn_off(stmt))
115572 + return head;
115573 +
115574 + input = gimple_asm_input_op(stmt, 0);
115575 + remove_size_overflow_asm(stmt);
115576 + if (is_gimple_constant(TREE_VALUE(input)))
115577 + return head;
115578 + visited = pointer_set_create();
115579 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
115580 + pointer_set_destroy(visited);
115581 + return head;
115582 + }
115583 +
115584 + if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
115585 + remove_size_overflow_asm(stmt);
115586 +
115587 + visited = pointer_set_create();
115588 + output = gimple_asm_output_op(stmt, 0);
115589 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
115590 + pointer_set_destroy(visited);
115591 + return head;
115592 +}
115593 +
115594 +/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
115595 + * or a call stmt or a return stmt and store them in the interesting_node list
115596 + */
115597 +static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
115598 +{
115599 + basic_block bb;
115600 + struct interesting_node *head = NULL;
115601 +
115602 + FOR_ALL_BB_FN(bb, cfun) {
115603 + gimple_stmt_iterator gsi;
115604 +
115605 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
115606 + enum gimple_code code;
115607 + gimple stmt = gsi_stmt(gsi);
115608 +
115609 + code = gimple_code(stmt);
115610 +
115611 + if (code == GIMPLE_ASM)
115612 + head = handle_stmt_by_size_overflow_asm(stmt, head);
115613 +
115614 + if (!next_node)
115615 + continue;
115616 + if (code == GIMPLE_CALL)
115617 + head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
115618 + if (code == GIMPLE_RETURN)
115619 + head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
115620 + }
115621 + }
115622 + return head;
115623 +}
115624 +
115625 +static void free_interesting_node(struct interesting_node *head)
115626 +{
115627 + struct interesting_node *cur;
115628 +
115629 + while (head) {
115630 + cur = head->next;
115631 +#if BUILDING_GCC_VERSION <= 4007
115632 + VEC_free(tree, gc, head->last_nodes);
115633 +#else
115634 + vec_free(head->last_nodes);
115635 +#endif
115636 + free(head);
115637 + head = cur;
115638 + }
115639 +}
115640 +
115641 +static struct visited_fns *insert_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
115642 +{
115643 + struct visited_fns *new_visited_fns;
115644 +
115645 + new_visited_fns = (struct visited_fns *)xmalloc(sizeof(*new_visited_fns));
115646 + new_visited_fns->fndecl = cur_node->fndecl;
115647 + new_visited_fns->num = cur_node->num;
115648 + new_visited_fns->first_stmt = cur_node->first_stmt;
115649 + new_visited_fns->next = NULL;
115650 +
115651 + if (!head)
115652 + return new_visited_fns;
115653 +
115654 + new_visited_fns->next = head;
115655 + return new_visited_fns;
115656 +}
115657 +
115658 +/* 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
115659 + * it is a visited_fns function.
115660 + */
115661 +static bool is_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
115662 +{
115663 + struct visited_fns *cur;
115664 +
115665 + if (!head)
115666 + return false;
115667 +
115668 + for (cur = head; cur; cur = cur->next) {
115669 + if (cur_node->first_stmt != cur->first_stmt)
115670 + continue;
115671 + if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
115672 + continue;
115673 + if (cur_node->num == cur->num)
115674 + return true;
115675 + }
115676 + return false;
115677 +}
115678 +
115679 +static void free_next_cgraph_node(struct next_cgraph_node *head)
115680 +{
115681 + struct next_cgraph_node *cur;
115682 +
115683 + while (head) {
115684 + cur = head->next;
115685 + free(head);
115686 + head = cur;
115687 + }
115688 +}
115689 +
115690 +static void remove_all_size_overflow_asm(void)
115691 +{
115692 + basic_block bb;
115693 +
115694 + FOR_ALL_BB_FN(bb, cfun) {
115695 + gimple_stmt_iterator si;
115696 +
115697 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
115698 + remove_size_overflow_asm(gsi_stmt(si));
115699 + }
115700 +}
115701 +
115702 +/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
115703 + * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
115704 + * the newly collected interesting functions (they are interesting if there is control flow between
115705 + * the interesting stmts and them).
115706 + */
115707 +static struct visited_fns *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited_fns *visited_fns)
115708 +{
115709 + struct visited *visited;
115710 + struct interesting_node *head, *cur_node;
115711 + struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
115712 +
115713 + set_current_function_decl(NODE_DECL(node));
115714 + call_count = 0;
115715 +
115716 + head = collect_interesting_stmts(next_node);
115717 +
115718 + visited = create_visited();
115719 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
115720 + if (is_visited_fns_function(visited_fns, cur_node))
115721 + continue;
115722 + cnodes_head = handle_interesting_stmt(visited, cnodes_head, cur_node, node);
115723 + visited_fns = insert_visited_fns_function(visited_fns, cur_node);
115724 + }
115725 +
115726 + free_visited(visited);
115727 + free_interesting_node(head);
115728 + remove_all_size_overflow_asm();
115729 + unset_current_function_decl();
115730 +
115731 + for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
115732 + visited_fns = handle_function(cur_cnodes->current_function, cur_cnodes, visited_fns);
115733 +
115734 + free_next_cgraph_node(cnodes_head);
115735 + return visited_fns;
115736 +}
115737 +
115738 +static void free_visited_fns(struct visited_fns *head)
115739 +{
115740 + struct visited_fns *cur;
115741 +
115742 + while (head) {
115743 + cur = head->next;
115744 + free(head);
115745 + head = cur;
115746 + }
115747 +}
115748 +
115749 +// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
115750 +unsigned int search_function(void)
115751 +{
115752 + struct cgraph_node *node;
115753 + struct visited_fns *visited_fns = NULL;
115754 +
115755 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
115756 + gcc_assert(cgraph_function_flags_ready);
115757 +#if BUILDING_GCC_VERSION <= 4007
115758 + gcc_assert(node->reachable);
115759 +#endif
115760 +
115761 + visited_fns = handle_function(node, NULL, visited_fns);
115762 + }
115763 +
115764 + free_visited_fns(visited_fns);
115765 + return 0;
115766 +}
115767 +
115768 +#if BUILDING_GCC_VERSION >= 4009
115769 +static const struct pass_data insert_size_overflow_check_data = {
115770 +#else
115771 +static struct ipa_opt_pass_d insert_size_overflow_check = {
115772 + .pass = {
115773 +#endif
115774 + .type = SIMPLE_IPA_PASS,
115775 + .name = "size_overflow",
115776 +#if BUILDING_GCC_VERSION >= 4008
115777 + .optinfo_flags = OPTGROUP_NONE,
115778 +#endif
115779 +#if BUILDING_GCC_VERSION >= 4009
115780 + .has_gate = false,
115781 + .has_execute = true,
115782 +#else
115783 + .gate = NULL,
115784 + .execute = search_function,
115785 + .sub = NULL,
115786 + .next = NULL,
115787 + .static_pass_number = 0,
115788 +#endif
115789 + .tv_id = TV_NONE,
115790 + .properties_required = 0,
115791 + .properties_provided = 0,
115792 + .properties_destroyed = 0,
115793 + .todo_flags_start = 0,
115794 + .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,
115795 +#if BUILDING_GCC_VERSION < 4009
115796 + },
115797 + .generate_summary = NULL,
115798 + .write_summary = NULL,
115799 + .read_summary = NULL,
115800 +#if BUILDING_GCC_VERSION >= 4006
115801 + .write_optimization_summary = NULL,
115802 + .read_optimization_summary = NULL,
115803 +#endif
115804 + .stmt_fixup = NULL,
115805 + .function_transform_todo_flags_start = 0,
115806 + .function_transform = NULL,
115807 + .variable_transform = NULL,
115808 +#endif
115809 +};
115810 +
115811 +#if BUILDING_GCC_VERSION >= 4009
115812 +namespace {
115813 +class insert_size_overflow_check : public ipa_opt_pass_d {
115814 +public:
115815 + insert_size_overflow_check() : ipa_opt_pass_d(insert_size_overflow_check_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
115816 + unsigned int execute() { return search_function(); }
115817 +};
115818 +}
115819 +#endif
115820 +
115821 +struct opt_pass *make_insert_size_overflow_check(void)
115822 +{
115823 +#if BUILDING_GCC_VERSION >= 4009
115824 + return new insert_size_overflow_check();
115825 +#else
115826 + return &insert_size_overflow_check.pass;
115827 +#endif
115828 +}
115829 +
115830 diff --git a/tools/gcc/size_overflow_plugin/intentional_overflow.c b/tools/gcc/size_overflow_plugin/intentional_overflow.c
115831 new file mode 100644
115832 index 0000000..d71d72a
115833 --- /dev/null
115834 +++ b/tools/gcc/size_overflow_plugin/intentional_overflow.c
115835 @@ -0,0 +1,736 @@
115836 +/*
115837 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
115838 + * Licensed under the GPL v2, or (at your option) v3
115839 + *
115840 + * Homepage:
115841 + * http://www.grsecurity.net/~ephox/overflow_plugin/
115842 + *
115843 + * Documentation:
115844 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
115845 + *
115846 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
115847 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
115848 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
115849 + *
115850 + * Usage:
115851 + * $ make
115852 + * $ make run
115853 + */
115854 +
115855 +#include "gcc-common.h"
115856 +#include "size_overflow.h"
115857 +
115858 +/* Get the param of the intentional_overflow attribute.
115859 + * * 0: MARK_NOT_INTENTIONAL
115860 + * * 1..MAX_PARAM: MARK_YES
115861 + * * -1: MARK_TURN_OFF
115862 + */
115863 +static tree get_attribute_param(const_tree decl)
115864 +{
115865 + const_tree attr;
115866 +
115867 + if (decl == NULL_TREE)
115868 + return NULL_TREE;
115869 +
115870 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
115871 + if (!attr || !TREE_VALUE(attr))
115872 + return NULL_TREE;
115873 +
115874 + return TREE_VALUE(attr);
115875 +}
115876 +
115877 +// MARK_TURN_OFF
115878 +bool is_turn_off_intentional_attr(const_tree decl)
115879 +{
115880 + const_tree param_head;
115881 +
115882 + param_head = get_attribute_param(decl);
115883 + if (param_head == NULL_TREE)
115884 + return false;
115885 +
115886 + if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
115887 + return true;
115888 + return false;
115889 +}
115890 +
115891 +// MARK_NOT_INTENTIONAL
115892 +bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
115893 +{
115894 + const_tree param_head;
115895 +
115896 + if (argnum == 0)
115897 + return false;
115898 +
115899 + param_head = get_attribute_param(decl);
115900 + if (param_head == NULL_TREE)
115901 + return false;
115902 +
115903 + if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
115904 + return true;
115905 + return false;
115906 +}
115907 +
115908 +// MARK_YES
115909 +bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
115910 +{
115911 + tree param, param_head;
115912 +
115913 + if (argnum == 0)
115914 + return false;
115915 +
115916 + param_head = get_attribute_param(decl);
115917 + for (param = param_head; param; param = TREE_CHAIN(param))
115918 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
115919 + return true;
115920 + return false;
115921 +}
115922 +
115923 +void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
115924 +{
115925 + location_t loc;
115926 +
115927 + if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
115928 + return;
115929 +
115930 + if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
115931 + return;
115932 +
115933 + loc = DECL_SOURCE_LOCATION(decl);
115934 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", DECL_NAME_POINTER(decl), argnum);
115935 +}
115936 +
115937 +// Get the field decl of a component ref for intentional_overflow checking
115938 +static const_tree search_field_decl(const_tree comp_ref)
115939 +{
115940 + const_tree field = NULL_TREE;
115941 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
115942 +
115943 + for (i = 0; i < len; i++) {
115944 + field = TREE_OPERAND(comp_ref, i);
115945 + if (TREE_CODE(field) == FIELD_DECL)
115946 + break;
115947 + }
115948 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
115949 + return field;
115950 +}
115951 +
115952 +/* Get the type of the intentional_overflow attribute of a node
115953 + * * MARK_TURN_OFF
115954 + * * MARK_YES
115955 + * * MARK_NO
115956 + * * MARK_NOT_INTENTIONAL
115957 + */
115958 +enum mark get_intentional_attr_type(const_tree node)
115959 +{
115960 + const_tree cur_decl;
115961 +
115962 + if (node == NULL_TREE)
115963 + return MARK_NO;
115964 +
115965 + switch (TREE_CODE(node)) {
115966 + case COMPONENT_REF:
115967 + cur_decl = search_field_decl(node);
115968 + if (is_turn_off_intentional_attr(cur_decl))
115969 + return MARK_TURN_OFF;
115970 + if (is_end_intentional_intentional_attr(cur_decl, 1))
115971 + return MARK_YES;
115972 + break;
115973 + case PARM_DECL: {
115974 + unsigned int argnum;
115975 +
115976 + cur_decl = DECL_ORIGIN(current_function_decl);
115977 + argnum = find_arg_number_tree(node, cur_decl);
115978 + if (argnum == CANNOT_FIND_ARG)
115979 + return MARK_NO;
115980 + if (is_yes_intentional_attr(cur_decl, argnum))
115981 + return MARK_YES;
115982 + if (is_end_intentional_intentional_attr(cur_decl, argnum))
115983 + return MARK_NOT_INTENTIONAL;
115984 + break;
115985 + }
115986 + case FUNCTION_DECL:
115987 + if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
115988 + return MARK_TURN_OFF;
115989 + break;
115990 + default:
115991 + break;
115992 + }
115993 + return MARK_NO;
115994 +}
115995 +
115996 +// Search for the intentional_overflow attribute on the last nodes
115997 +static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
115998 +{
115999 + unsigned int i;
116000 + tree last_node;
116001 + enum mark mark = MARK_NO;
116002 +
116003 +#if BUILDING_GCC_VERSION <= 4007
116004 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
116005 +#else
116006 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
116007 +#endif
116008 + mark = get_intentional_attr_type(last_node);
116009 + if (mark != MARK_NO)
116010 + break;
116011 + }
116012 + return mark;
116013 +}
116014 +
116015 +/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
116016 + * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
116017 + */
116018 +static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
116019 +{
116020 + if (!cur_node->intentional_mark_from_gimple)
116021 + return false;
116022 +
116023 + if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
116024 + cur_node->intentional_attr_cur_fndecl = MARK_YES;
116025 + else
116026 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
116027 +
116028 + // skip param decls
116029 + if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
116030 + return true;
116031 + return true;
116032 +}
116033 +
116034 +/* Search intentional_overflow attribute on caller and on callee too.
116035 + * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
116036 + * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
116037 + * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
116038 +*/
116039 +void check_intentional_attribute_ipa(struct interesting_node *cur_node)
116040 +{
116041 + const_tree fndecl;
116042 +
116043 + if (is_intentional_attribute_from_gimple(cur_node))
116044 + return;
116045 +
116046 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
116047 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
116048 + return;
116049 + }
116050 +
116051 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
116052 + cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
116053 + return;
116054 + }
116055 +
116056 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
116057 + return;
116058 +
116059 + fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
116060 + if (is_turn_off_intentional_attr(fndecl)) {
116061 + cur_node->intentional_attr_decl = MARK_TURN_OFF;
116062 + return;
116063 + }
116064 +
116065 + if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
116066 + cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
116067 + else if (is_yes_intentional_attr(fndecl, cur_node->num))
116068 + cur_node->intentional_attr_decl = MARK_YES;
116069 +
116070 + cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
116071 + print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
116072 +}
116073 +
116074 +bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
116075 +{
116076 + const_tree rhs1, lhs, rhs1_type, lhs_type;
116077 + enum machine_mode lhs_mode, rhs_mode;
116078 + gimple def_stmt = get_def_stmt(no_const_rhs);
116079 +
116080 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116081 + return false;
116082 +
116083 + rhs1 = gimple_assign_rhs1(def_stmt);
116084 + lhs = gimple_assign_lhs(def_stmt);
116085 + rhs1_type = TREE_TYPE(rhs1);
116086 + lhs_type = TREE_TYPE(lhs);
116087 + rhs_mode = TYPE_MODE(rhs1_type);
116088 + lhs_mode = TYPE_MODE(lhs_type);
116089 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
116090 + return false;
116091 +
116092 + return true;
116093 +}
116094 +
116095 +static unsigned int uses_num(tree node)
116096 +{
116097 + imm_use_iterator imm_iter;
116098 + use_operand_p use_p;
116099 + unsigned int num = 0;
116100 +
116101 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
116102 + gimple use_stmt = USE_STMT(use_p);
116103 +
116104 + if (use_stmt == NULL)
116105 + return num;
116106 + if (is_gimple_debug(use_stmt))
116107 + continue;
116108 + if (gimple_assign_cast_p(use_stmt) && is_size_overflow_type(gimple_assign_lhs(use_stmt)))
116109 + continue;
116110 + num++;
116111 + }
116112 + return num;
116113 +}
116114 +
116115 +static bool no_uses(tree node)
116116 +{
116117 + return !uses_num(node);
116118 +}
116119 +
116120 +// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max
116121 +bool is_const_plus_unsigned_signed_truncation(const_tree lhs)
116122 +{
116123 + tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs;
116124 + gimple def_stmt = get_def_stmt(lhs);
116125 +
116126 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116127 + return false;
116128 +
116129 + rhs1 = gimple_assign_rhs1(def_stmt);
116130 + rhs_type = TREE_TYPE(rhs1);
116131 + lhs_type = TREE_TYPE(lhs);
116132 + if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type))
116133 + return false;
116134 + if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type))
116135 + return false;
116136 +
116137 + def_stmt = get_def_stmt(rhs1);
116138 + if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
116139 + return false;
116140 +
116141 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
116142 + return false;
116143 +
116144 + rhs1 = gimple_assign_rhs1(def_stmt);
116145 + rhs2 = gimple_assign_rhs2(def_stmt);
116146 + if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116147 + return false;
116148 +
116149 + if (is_gimple_constant(rhs2))
116150 + not_const_rhs = rhs1;
116151 + else
116152 + not_const_rhs = rhs2;
116153 +
116154 + return no_uses(not_const_rhs);
116155 +}
116156 +
116157 +static bool is_lt_signed_type_max(const_tree rhs)
116158 +{
116159 + const_tree new_type, type_max, type = TREE_TYPE(rhs);
116160 +
116161 + if (!TYPE_UNSIGNED(type))
116162 + return true;
116163 +
116164 + switch (TYPE_MODE(type)) {
116165 + case QImode:
116166 + new_type = intQI_type_node;
116167 + break;
116168 + case HImode:
116169 + new_type = intHI_type_node;
116170 + break;
116171 + case SImode:
116172 + new_type = intSI_type_node;
116173 + break;
116174 + case DImode:
116175 + new_type = intDI_type_node;
116176 + break;
116177 + default:
116178 + debug_tree((tree)type);
116179 + gcc_unreachable();
116180 + }
116181 +
116182 + type_max = TYPE_MAX_VALUE(new_type);
116183 + if (!tree_int_cst_lt(type_max, rhs))
116184 + return true;
116185 +
116186 + return false;
116187 +}
116188 +
116189 +static bool is_gt_zero(const_tree rhs)
116190 +{
116191 + const_tree type = TREE_TYPE(rhs);
116192 +
116193 + if (TYPE_UNSIGNED(type))
116194 + return true;
116195 +
116196 + if (!tree_int_cst_lt(rhs, integer_zero_node))
116197 + return true;
116198 +
116199 + return false;
116200 +}
116201 +
116202 +bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
116203 +{
116204 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
116205 + return false;
116206 + if (!is_gimple_constant(rhs))
116207 + return false;
116208 +
116209 + // If the const is between 0 and the max value of the signed type of the same bitsize then there is no intentional overflow
116210 + if (is_lt_signed_type_max(rhs) && is_gt_zero(rhs))
116211 + return false;
116212 +
116213 + return true;
116214 +}
116215 +
116216 +static tree change_assign_rhs(struct visited *visited, gimple stmt, const_tree orig_rhs, tree new_rhs)
116217 +{
116218 + gimple assign;
116219 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116220 + tree origtype = TREE_TYPE(orig_rhs);
116221 +
116222 + gcc_assert(is_gimple_assign(stmt));
116223 +
116224 + assign = build_cast_stmt(visited, origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116225 + pointer_set_insert(visited->my_stmts, assign);
116226 + return gimple_assign_lhs(assign);
116227 +}
116228 +
116229 +tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
116230 +{
116231 + tree new_rhs, orig_rhs;
116232 + void (*gimple_assign_set_rhs)(gimple, tree);
116233 + tree rhs1 = gimple_assign_rhs1(stmt);
116234 + tree rhs2 = gimple_assign_rhs2(stmt);
116235 + tree lhs = gimple_assign_lhs(stmt);
116236 +
116237 + if (!check_overflow)
116238 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116239 +
116240 + if (change_rhs == NULL_TREE)
116241 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116242 +
116243 + if (new_rhs2 == NULL_TREE) {
116244 + orig_rhs = rhs1;
116245 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
116246 + } else {
116247 + orig_rhs = rhs2;
116248 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
116249 + }
116250 +
116251 + check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
116252 +
116253 + new_rhs = change_assign_rhs(visited, stmt, orig_rhs, change_rhs);
116254 + gimple_assign_set_rhs(stmt, new_rhs);
116255 + update_stmt(stmt);
116256 +
116257 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116258 +}
116259 +
116260 +static bool is_subtraction_special(struct visited *visited, const_gimple stmt)
116261 +{
116262 + gimple rhs1_def_stmt, rhs2_def_stmt;
116263 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
116264 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
116265 + const_tree rhs1 = gimple_assign_rhs1(stmt);
116266 + const_tree rhs2 = gimple_assign_rhs2(stmt);
116267 +
116268 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
116269 + return false;
116270 +
116271 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
116272 +
116273 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
116274 + return false;
116275 +
116276 + rhs1_def_stmt = get_def_stmt(rhs1);
116277 + rhs2_def_stmt = get_def_stmt(rhs2);
116278 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
116279 + return false;
116280 +
116281 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116282 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
116283 + rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
116284 + rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
116285 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
116286 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
116287 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
116288 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
116289 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
116290 + return false;
116291 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
116292 + return false;
116293 +
116294 + pointer_set_insert(visited->no_cast_check, rhs1_def_stmt);
116295 + pointer_set_insert(visited->no_cast_check, rhs2_def_stmt);
116296 + return true;
116297 +}
116298 +
116299 +static gimple create_binary_assign(struct visited *visited, enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
116300 +{
116301 + gimple assign;
116302 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116303 + tree type = TREE_TYPE(rhs1);
116304 + tree lhs = create_new_var(type);
116305 +
116306 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
116307 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
116308 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
116309 +
116310 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
116311 + update_stmt(assign);
116312 + pointer_set_insert(visited->my_stmts, assign);
116313 + return assign;
116314 +}
116315 +
116316 +static tree cast_to_TI_type(struct visited *visited, gimple stmt, tree node)
116317 +{
116318 + gimple_stmt_iterator gsi;
116319 + gimple cast_stmt;
116320 + tree type = TREE_TYPE(node);
116321 +
116322 + if (types_compatible_p(type, intTI_type_node))
116323 + return node;
116324 +
116325 + gsi = gsi_for_stmt(stmt);
116326 + cast_stmt = build_cast_stmt(visited, intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116327 + pointer_set_insert(visited->my_stmts, cast_stmt);
116328 + return gimple_assign_lhs(cast_stmt);
116329 +}
116330 +
116331 +static tree get_def_stmt_rhs(struct visited *visited, const_tree var)
116332 +{
116333 + tree rhs1, def_stmt_rhs1;
116334 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
116335 +
116336 + def_stmt = get_def_stmt(var);
116337 + if (!gimple_assign_cast_p(def_stmt))
116338 + return NULL_TREE;
116339 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && pointer_set_contains(visited->my_stmts, def_stmt) && gimple_assign_cast_p(def_stmt));
116340 +
116341 + rhs1 = gimple_assign_rhs1(def_stmt);
116342 + rhs1_def_stmt = get_def_stmt(rhs1);
116343 + if (!gimple_assign_cast_p(rhs1_def_stmt))
116344 + return rhs1;
116345 +
116346 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116347 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
116348 +
116349 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
116350 + case GIMPLE_CALL:
116351 + case GIMPLE_NOP:
116352 + case GIMPLE_ASM:
116353 + case GIMPLE_PHI:
116354 + return def_stmt_rhs1;
116355 + case GIMPLE_ASSIGN:
116356 + return rhs1;
116357 + default:
116358 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
116359 + gcc_unreachable();
116360 + }
116361 +}
116362 +
116363 +tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs)
116364 +{
116365 + tree new_rhs1, new_rhs2;
116366 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
116367 + gimple assign, stmt = get_def_stmt(lhs);
116368 + tree rhs1 = gimple_assign_rhs1(stmt);
116369 + tree rhs2 = gimple_assign_rhs2(stmt);
116370 +
116371 + if (!is_subtraction_special(visited, stmt))
116372 + return NULL_TREE;
116373 +
116374 + new_rhs1 = expand(visited, caller_node, rhs1);
116375 + new_rhs2 = expand(visited, caller_node, rhs2);
116376 +
116377 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs1);
116378 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs2);
116379 +
116380 + if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
116381 + return NULL_TREE;
116382 +
116383 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
116384 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs1_def_stmt_rhs1);
116385 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs2_def_stmt_rhs1);
116386 + }
116387 +
116388 + assign = create_binary_assign(visited, MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
116389 + new_lhs = gimple_assign_lhs(assign);
116390 + check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
116391 +
116392 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
116393 +}
116394 +
116395 +bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
116396 +{
116397 + const_gimple def_stmt;
116398 +
116399 + if (TREE_CODE(rhs) != SSA_NAME)
116400 + return false;
116401 +
116402 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
116403 + return false;
116404 +
116405 + def_stmt = get_def_stmt(rhs);
116406 + if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
116407 + return false;
116408 +
116409 + return true;
116410 +}
116411 +
116412 +/* e.g., drivers/acpi/acpica/utids.c acpi_ut_execute_CID()
116413 + * ((count - 1) * sizeof(struct acpi_pnp_dee_id_list) -> (count + fffffff) * 16
116414 + * fffffff * 16 > signed max -> truncate
116415 + */
116416 +static bool look_for_mult_and_add(const_gimple stmt)
116417 +{
116418 + const_tree res;
116419 + tree rhs1, rhs2, def_rhs1, def_rhs2, const_rhs, def_const_rhs;
116420 + const_gimple def_stmt;
116421 +
116422 + if (!stmt || gimple_code(stmt) == GIMPLE_NOP)
116423 + return false;
116424 + if (!is_gimple_assign(stmt))
116425 + return false;
116426 + if (gimple_assign_rhs_code(stmt) != MULT_EXPR)
116427 + return false;
116428 +
116429 + rhs1 = gimple_assign_rhs1(stmt);
116430 + rhs2 = gimple_assign_rhs2(stmt);
116431 + if (is_gimple_constant(rhs1)) {
116432 + const_rhs = rhs1;
116433 + def_stmt = get_def_stmt(rhs2);
116434 + } else if (is_gimple_constant(rhs2)) {
116435 + const_rhs = rhs2;
116436 + def_stmt = get_def_stmt(rhs1);
116437 + } else
116438 + return false;
116439 +
116440 + if (!is_gimple_assign(def_stmt))
116441 + return false;
116442 +
116443 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR && gimple_assign_rhs_code(def_stmt) != MINUS_EXPR)
116444 + return false;
116445 +
116446 + def_rhs1 = gimple_assign_rhs1(def_stmt);
116447 + def_rhs2 = gimple_assign_rhs2(def_stmt);
116448 + if (is_gimple_constant(def_rhs1))
116449 + def_const_rhs = def_rhs1;
116450 + else if (is_gimple_constant(def_rhs2))
116451 + def_const_rhs = def_rhs2;
116452 + else
116453 + return false;
116454 +
116455 + res = fold_binary_loc(gimple_location(def_stmt), MULT_EXPR, TREE_TYPE(const_rhs), const_rhs, def_const_rhs);
116456 + if (is_lt_signed_type_max(res) && is_gt_zero(res))
116457 + return false;
116458 + return true;
116459 +}
116460 +
116461 +enum intentional_overflow_type add_mul_intentional_overflow(const_gimple stmt)
116462 +{
116463 + const_gimple def_stmt_1, def_stmt_2;
116464 + const_tree rhs1, rhs2;
116465 + bool add_mul_rhs1, add_mul_rhs2;
116466 +
116467 + rhs1 = gimple_assign_rhs1(stmt);
116468 + def_stmt_1 = get_def_stmt(rhs1);
116469 + add_mul_rhs1 = look_for_mult_and_add(def_stmt_1);
116470 +
116471 + rhs2 = gimple_assign_rhs2(stmt);
116472 + def_stmt_2 = get_def_stmt(rhs2);
116473 + add_mul_rhs2 = look_for_mult_and_add(def_stmt_2);
116474 +
116475 + if (add_mul_rhs1)
116476 + return RHS1_INTENTIONAL_OVERFLOW;
116477 + if (add_mul_rhs2)
116478 + return RHS2_INTENTIONAL_OVERFLOW;
116479 + return NO_INTENTIONAL_OVERFLOW;
116480 +}
116481 +
116482 +static gimple get_dup_stmt(struct visited *visited, gimple stmt)
116483 +{
116484 + gimple my_stmt;
116485 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116486 +
116487 + gsi_next(&gsi);
116488 + my_stmt = gsi_stmt(gsi);
116489 +
116490 + gcc_assert(pointer_set_contains(visited->my_stmts, my_stmt));
116491 + gcc_assert(gimple_assign_rhs_code(stmt) == gimple_assign_rhs_code(my_stmt));
116492 +
116493 + return my_stmt;
116494 +}
116495 +
116496 +/* unsigned type -> unary or binary assign (rhs1 or rhs2 is constant)
116497 + * unsigned type cast to signed type, unsigned type: no more uses
116498 + * e.g., lib/vsprintf.c:simple_strtol()
116499 + * _10 = (unsigned long int) _9
116500 + * _11 = -_10;
116501 + * _12 = (long int) _11; (_11_ no more uses)
116502 + */
116503 +static bool is_call_or_cast(gimple stmt)
116504 +{
116505 + return gimple_assign_cast_p(stmt) || is_gimple_call(stmt);
116506 +}
116507 +
116508 +static bool is_unsigned_cast_or_call_def_stmt(const_tree node)
116509 +{
116510 + const_tree rhs;
116511 + gimple def_stmt;
116512 +
116513 + if (node == NULL_TREE)
116514 + return true;
116515 + if (is_gimple_constant(node))
116516 + return true;
116517 +
116518 + def_stmt = get_def_stmt(node);
116519 + if (!def_stmt)
116520 + return false;
116521 +
116522 + if (is_call_or_cast(def_stmt))
116523 + return true;
116524 +
116525 + if (!is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 2)
116526 + return false;
116527 + rhs = gimple_assign_rhs1(def_stmt);
116528 + def_stmt = get_def_stmt(rhs);
116529 + if (!def_stmt)
116530 + return false;
116531 + return is_call_or_cast(def_stmt);
116532 +}
116533 +
116534 +void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt)
116535 +{
116536 + unsigned int use_num;
116537 + gimple so_stmt;
116538 + const_gimple def_stmt;
116539 + const_tree rhs1, rhs2;
116540 + tree rhs = gimple_assign_rhs1(stmt);
116541 + tree lhs_type = TREE_TYPE(gimple_assign_lhs(stmt));
116542 + const_tree rhs_type = TREE_TYPE(rhs);
116543 +
116544 + if (!(TYPE_UNSIGNED(rhs_type) && !TYPE_UNSIGNED(lhs_type)))
116545 + return;
116546 + if (GET_MODE_BITSIZE(TYPE_MODE(rhs_type)) != GET_MODE_BITSIZE(TYPE_MODE(lhs_type)))
116547 + return;
116548 + use_num = uses_num(rhs);
116549 + if (use_num != 1)
116550 + return;
116551 +
116552 + def_stmt = get_def_stmt(rhs);
116553 + if (!def_stmt)
116554 + return;
116555 + if (!is_gimple_assign(def_stmt))
116556 + return;
116557 +
116558 + rhs1 = gimple_assign_rhs1(def_stmt);
116559 + if (!is_unsigned_cast_or_call_def_stmt(rhs1))
116560 + return;
116561 +
116562 + rhs2 = gimple_assign_rhs2(def_stmt);
116563 + if (!is_unsigned_cast_or_call_def_stmt(rhs2))
116564 + return;
116565 + if (gimple_num_ops(def_stmt) == 3 && !is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116566 + return;
116567 +
116568 + so_stmt = get_dup_stmt(visited, stmt);
116569 + create_up_and_down_cast(visited, so_stmt, lhs_type, gimple_assign_rhs1(so_stmt));
116570 +}
116571 +
116572 diff --git a/tools/gcc/size_overflow_plugin/misc.c b/tools/gcc/size_overflow_plugin/misc.c
116573 new file mode 100644
116574 index 0000000..4bddad2
116575 --- /dev/null
116576 +++ b/tools/gcc/size_overflow_plugin/misc.c
116577 @@ -0,0 +1,203 @@
116578 +/*
116579 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
116580 + * Licensed under the GPL v2, or (at your option) v3
116581 + *
116582 + * Homepage:
116583 + * http://www.grsecurity.net/~ephox/overflow_plugin/
116584 + *
116585 + * Documentation:
116586 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
116587 + *
116588 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
116589 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
116590 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
116591 + *
116592 + * Usage:
116593 + * $ make
116594 + * $ make run
116595 + */
116596 +
116597 +#include "gcc-common.h"
116598 +#include "size_overflow.h"
116599 +
116600 +void set_current_function_decl(tree fndecl)
116601 +{
116602 + gcc_assert(fndecl != NULL_TREE);
116603 +
116604 + push_cfun(DECL_STRUCT_FUNCTION(fndecl));
116605 + calculate_dominance_info(CDI_DOMINATORS);
116606 + current_function_decl = fndecl;
116607 +}
116608 +
116609 +void unset_current_function_decl(void)
116610 +{
116611 + free_dominance_info(CDI_DOMINATORS);
116612 + pop_cfun();
116613 + current_function_decl = NULL_TREE;
116614 +}
116615 +
116616 +static bool is_bool(const_tree node)
116617 +{
116618 + const_tree type;
116619 +
116620 + if (node == NULL_TREE)
116621 + return false;
116622 +
116623 + type = TREE_TYPE(node);
116624 + if (!INTEGRAL_TYPE_P(type))
116625 + return false;
116626 + if (TREE_CODE(type) == BOOLEAN_TYPE)
116627 + return true;
116628 + if (TYPE_PRECISION(type) == 1)
116629 + return true;
116630 + return false;
116631 +}
116632 +
116633 +bool skip_types(const_tree var)
116634 +{
116635 + tree type;
116636 + enum tree_code code;
116637 +
116638 + if (is_gimple_constant(var))
116639 + return true;
116640 +
116641 + switch (TREE_CODE(var)) {
116642 + case ADDR_EXPR:
116643 +#if BUILDING_GCC_VERSION >= 4006
116644 + case MEM_REF:
116645 +#endif
116646 + case ARRAY_REF:
116647 + case BIT_FIELD_REF:
116648 + case INDIRECT_REF:
116649 + case TARGET_MEM_REF:
116650 + case COMPONENT_REF:
116651 + case VAR_DECL:
116652 + case VIEW_CONVERT_EXPR:
116653 + return true;
116654 + default:
116655 + break;
116656 + }
116657 +
116658 + code = TREE_CODE(var);
116659 + gcc_assert(code == SSA_NAME || code == PARM_DECL);
116660 +
116661 + type = TREE_TYPE(var);
116662 + switch (TREE_CODE(type)) {
116663 + case INTEGER_TYPE:
116664 + case ENUMERAL_TYPE:
116665 + return false;
116666 + case BOOLEAN_TYPE:
116667 + return is_bool(var);
116668 + default:
116669 + return true;
116670 + }
116671 +}
116672 +
116673 +gimple get_def_stmt(const_tree node)
116674 +{
116675 + gcc_assert(node != NULL_TREE);
116676 +
116677 + if (skip_types(node))
116678 + return NULL;
116679 +
116680 + if (TREE_CODE(node) != SSA_NAME)
116681 + return NULL;
116682 + return SSA_NAME_DEF_STMT(node);
116683 +}
116684 +
116685 +tree create_new_var(tree type)
116686 +{
116687 + tree new_var = create_tmp_var(type, "cicus");
116688 +
116689 + add_referenced_var(new_var);
116690 + return new_var;
116691 +}
116692 +
116693 +static bool skip_cast(tree dst_type, const_tree rhs, bool force)
116694 +{
116695 + const_gimple def_stmt = get_def_stmt(rhs);
116696 +
116697 + if (force)
116698 + return false;
116699 +
116700 + if (is_gimple_constant(rhs))
116701 + return false;
116702 +
116703 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
116704 + return false;
116705 +
116706 + if (!types_compatible_p(dst_type, TREE_TYPE(rhs)))
116707 + return false;
116708 +
116709 + // DI type can be on 32 bit (from create_assign) but overflow type stays DI
116710 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
116711 + return false;
116712 +
116713 + return true;
116714 +}
116715 +
116716 +tree cast_a_tree(tree type, tree var)
116717 +{
116718 + gcc_assert(type != NULL_TREE);
116719 + gcc_assert(var != NULL_TREE);
116720 + gcc_assert(fold_convertible_p(type, var));
116721 +
116722 + return fold_convert(type, var);
116723 +}
116724 +
116725 +gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force)
116726 +{
116727 + gimple assign, def_stmt;
116728 +
116729 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
116730 + gcc_assert(!is_gimple_constant(rhs));
116731 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
116732 + gcc_unreachable();
116733 +
116734 + def_stmt = get_def_stmt(rhs);
116735 + if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && pointer_set_contains(visited->my_stmts, def_stmt))
116736 + return def_stmt;
116737 +
116738 + if (lhs == CREATE_NEW_VAR)
116739 + lhs = create_new_var(dst_type);
116740 +
116741 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
116742 +
116743 + if (!gsi_end_p(*gsi)) {
116744 + location_t loc = gimple_location(gsi_stmt(*gsi));
116745 + gimple_set_location(assign, loc);
116746 + }
116747 +
116748 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
116749 +
116750 + if (before)
116751 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
116752 + else
116753 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
116754 + update_stmt(assign);
116755 + return assign;
116756 +}
116757 +
116758 +bool is_size_overflow_type(const_tree var)
116759 +{
116760 + const char *name;
116761 + const_tree type_name, type;
116762 +
116763 + if (var == NULL_TREE)
116764 + return false;
116765 +
116766 + type = TREE_TYPE(var);
116767 + type_name = TYPE_NAME(type);
116768 + if (type_name == NULL_TREE)
116769 + return false;
116770 +
116771 + if (DECL_P(type_name))
116772 + name = DECL_NAME_POINTER(type_name);
116773 + else
116774 + name = IDENTIFIER_POINTER(type_name);
116775 +
116776 + if (!strncmp(name, "size_overflow_type", 18))
116777 + return true;
116778 + return false;
116779 +}
116780 +
116781 diff --git a/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
116782 new file mode 100644
116783 index 0000000..7c9e6d1
116784 --- /dev/null
116785 +++ b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
116786 @@ -0,0 +1,138 @@
116787 +/*
116788 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
116789 + * Licensed under the GPL v2, or (at your option) v3
116790 + *
116791 + * Homepage:
116792 + * http://www.grsecurity.net/~ephox/overflow_plugin/
116793 + *
116794 + * Documentation:
116795 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
116796 + *
116797 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
116798 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
116799 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
116800 + *
116801 + * Usage:
116802 + * $ make
116803 + * $ make run
116804 + */
116805 +
116806 +#include "gcc-common.h"
116807 +#include "size_overflow.h"
116808 +
116809 +bool skip_expr_on_double_type(const_gimple stmt)
116810 +{
116811 + enum tree_code code = gimple_assign_rhs_code(stmt);
116812 +
116813 + switch (code) {
116814 + case RSHIFT_EXPR:
116815 + case TRUNC_DIV_EXPR:
116816 + case CEIL_DIV_EXPR:
116817 + case FLOOR_DIV_EXPR:
116818 + case ROUND_DIV_EXPR:
116819 + case EXACT_DIV_EXPR:
116820 + case RDIV_EXPR:
116821 + case TRUNC_MOD_EXPR:
116822 + case CEIL_MOD_EXPR:
116823 + case FLOOR_MOD_EXPR:
116824 + case ROUND_MOD_EXPR:
116825 + return true;
116826 + default:
116827 + return false;
116828 + }
116829 +}
116830 +
116831 +void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs)
116832 +{
116833 + const_tree orig_rhs1;
116834 + tree down_lhs, new_lhs, dup_type = TREE_TYPE(rhs);
116835 + gimple down_cast, up_cast;
116836 + gimple_stmt_iterator gsi = gsi_for_stmt(use_stmt);
116837 +
116838 + down_cast = build_cast_stmt(visited, orig_type, rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116839 + down_lhs = gimple_assign_lhs(down_cast);
116840 +
116841 + gsi = gsi_for_stmt(use_stmt);
116842 + up_cast = build_cast_stmt(visited, dup_type, down_lhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116843 + new_lhs = gimple_assign_lhs(up_cast);
116844 +
116845 + orig_rhs1 = gimple_assign_rhs1(use_stmt);
116846 + if (operand_equal_p(orig_rhs1, rhs, 0))
116847 + gimple_assign_set_rhs1(use_stmt, new_lhs);
116848 + else
116849 + gimple_assign_set_rhs2(use_stmt, new_lhs);
116850 + update_stmt(use_stmt);
116851 +
116852 + pointer_set_insert(visited->my_stmts, up_cast);
116853 + pointer_set_insert(visited->my_stmts, down_cast);
116854 + pointer_set_insert(visited->skip_expr_casts, up_cast);
116855 + pointer_set_insert(visited->skip_expr_casts, down_cast);
116856 +}
116857 +
116858 +static tree get_proper_unsigned_half_type(const_tree node)
116859 +{
116860 + tree new_type, type;
116861 +
116862 + gcc_assert(is_size_overflow_type(node));
116863 +
116864 + type = TREE_TYPE(node);
116865 + switch (TYPE_MODE(type)) {
116866 + case HImode:
116867 + new_type = unsigned_intQI_type_node;
116868 + break;
116869 + case SImode:
116870 + new_type = unsigned_intHI_type_node;
116871 + break;
116872 + case DImode:
116873 + new_type = unsigned_intSI_type_node;
116874 + break;
116875 + case TImode:
116876 + new_type = unsigned_intDI_type_node;
116877 + break;
116878 + default:
116879 + gcc_unreachable();
116880 + }
116881 +
116882 + if (TYPE_QUALS(type) != 0)
116883 + return build_qualified_type(new_type, TYPE_QUALS(type));
116884 + return new_type;
116885 +}
116886 +
116887 +static void insert_cast_rhs(struct visited *visited, gimple stmt, tree rhs)
116888 +{
116889 + tree type;
116890 +
116891 + if (rhs == NULL_TREE)
116892 + return;
116893 + if (!is_size_overflow_type(rhs))
116894 + return;
116895 +
116896 + type = get_proper_unsigned_half_type(rhs);
116897 + if (is_gimple_constant(rhs))
116898 + return;
116899 + create_up_and_down_cast(visited, stmt, type, rhs);
116900 +}
116901 +
116902 +static void insert_cast(struct visited *visited, gimple stmt, tree rhs)
116903 +{
116904 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && !is_size_overflow_type(rhs))
116905 + return;
116906 + gcc_assert(is_size_overflow_type(rhs));
116907 + insert_cast_rhs(visited, stmt, rhs);
116908 +}
116909 +
116910 +void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type)
116911 +{
116912 + tree rhs1, rhs2;
116913 +
116914 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS1_INTENTIONAL_OVERFLOW) {
116915 + rhs1 = gimple_assign_rhs1(stmt);
116916 + insert_cast(visited, stmt, rhs1);
116917 + }
116918 +
116919 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS2_INTENTIONAL_OVERFLOW) {
116920 + rhs2 = gimple_assign_rhs2(stmt);
116921 + insert_cast(visited, stmt, rhs2);
116922 + }
116923 +}
116924 +
116925 diff --git a/tools/gcc/size_overflow_plugin/size_overflow.h b/tools/gcc/size_overflow_plugin/size_overflow.h
116926 new file mode 100644
116927 index 0000000..e5b4e50
116928 --- /dev/null
116929 +++ b/tools/gcc/size_overflow_plugin/size_overflow.h
116930 @@ -0,0 +1,127 @@
116931 +#ifndef SIZE_OVERFLOW_H
116932 +#define SIZE_OVERFLOW_H
116933 +
116934 +#define CREATE_NEW_VAR NULL_TREE
116935 +#define CANNOT_FIND_ARG 32
116936 +#define MAX_PARAM 31
116937 +#define BEFORE_STMT true
116938 +#define AFTER_STMT false
116939 +
116940 +#define TURN_OFF_ASM_STR "# size_overflow MARK_TURN_OFF "
116941 +#define YES_ASM_STR "# size_overflow MARK_YES "
116942 +#define OK_ASM_STR "# size_overflow "
116943 +
116944 +enum mark {
116945 + MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
116946 +};
116947 +
116948 +enum intentional_overflow_type {
116949 + NO_INTENTIONAL_OVERFLOW, RHS1_INTENTIONAL_OVERFLOW, RHS2_INTENTIONAL_OVERFLOW
116950 +};
116951 +
116952 +struct visited {
116953 + struct pointer_set_t *stmts;
116954 + struct pointer_set_t *my_stmts;
116955 + struct pointer_set_t *skip_expr_casts;
116956 + struct pointer_set_t *no_cast_check;
116957 +};
116958 +
116959 +// size_overflow_plugin.c
116960 +extern tree report_size_overflow_decl;
116961 +extern tree size_overflow_type_HI;
116962 +extern tree size_overflow_type_SI;
116963 +extern tree size_overflow_type_DI;
116964 +extern tree size_overflow_type_TI;
116965 +
116966 +
116967 +// size_overflow_plugin_hash.c
116968 +struct size_overflow_hash {
116969 + const struct size_overflow_hash * const next;
116970 + const char * const name;
116971 + const unsigned int param;
116972 +};
116973 +
116974 +struct interesting_node {
116975 + struct interesting_node *next;
116976 + gimple first_stmt;
116977 + const_tree fndecl;
116978 + tree node;
116979 +#if BUILDING_GCC_VERSION <= 4007
116980 + VEC(tree, gc) *last_nodes;
116981 +#else
116982 + vec<tree, va_gc> *last_nodes;
116983 +#endif
116984 + unsigned int num;
116985 + enum mark intentional_attr_decl;
116986 + enum mark intentional_attr_cur_fndecl;
116987 + gimple intentional_mark_from_gimple;
116988 +};
116989 +
116990 +extern bool is_size_overflow_asm(const_gimple stmt);
116991 +extern unsigned int get_function_num(const_tree node, const_tree orig_fndecl);
116992 +extern unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl);
116993 +extern bool is_missing_function(const_tree orig_fndecl, unsigned int num);
116994 +extern bool is_a_return_check(const_tree node);
116995 +extern const struct size_overflow_hash *get_function_hash(const_tree fndecl);
116996 +extern unsigned int find_arg_number_tree(const_tree arg, const_tree func);
116997 +
116998 +
116999 +// size_overflow_debug.c
117000 +extern struct opt_pass *make_dump_pass(void);
117001 +
117002 +
117003 +// intentional_overflow.c
117004 +extern enum mark get_intentional_attr_type(const_tree node);
117005 +extern bool is_size_overflow_intentional_asm_yes(const_gimple stmt);
117006 +extern bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt);
117007 +extern bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum);
117008 +extern bool is_yes_intentional_attr(const_tree decl, unsigned int argnum);
117009 +extern bool is_turn_off_intentional_attr(const_tree decl);
117010 +extern void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum);
117011 +extern void check_intentional_attribute_ipa(struct interesting_node *cur_node);
117012 +extern bool is_a_cast_and_const_overflow(const_tree no_const_rhs);
117013 +extern bool is_const_plus_unsigned_signed_truncation(const_tree lhs);
117014 +extern bool is_a_constant_overflow(const_gimple stmt, const_tree rhs);
117015 +extern tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2);
117016 +extern tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs);
117017 +extern bool is_a_neg_overflow(const_gimple stmt, const_tree rhs);
117018 +extern enum intentional_overflow_type add_mul_intentional_overflow(const_gimple def_stmt);
117019 +extern void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt);
117020 +
117021 +
117022 +// insert_size_overflow_check_ipa.c
117023 +extern unsigned int search_function(void);
117024 +extern unsigned int call_count;
117025 +extern struct opt_pass *make_insert_size_overflow_check(void);
117026 +extern const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum);
117027 +
117028 +
117029 +// insert_size_overflow_asm.c
117030 +extern struct opt_pass *make_insert_size_overflow_asm_pass(void);
117031 +
117032 +
117033 +// misc.c
117034 +extern void set_current_function_decl(tree fndecl);
117035 +extern void unset_current_function_decl(void);
117036 +extern gimple get_def_stmt(const_tree node);
117037 +extern tree create_new_var(tree type);
117038 +extern gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force);
117039 +extern bool skip_types(const_tree var);
117040 +extern tree cast_a_tree(tree type, tree var);
117041 +extern bool is_size_overflow_type(const_tree var);
117042 +
117043 +
117044 +// insert_size_overflow_check_core.c
117045 +extern tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs);
117046 +extern void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
117047 +extern tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
117048 +extern tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before);
117049 +
117050 +
117051 +// remove_unnecessary_dup.c
117052 +extern struct opt_pass *make_remove_unnecessary_dup_pass(void);
117053 +extern void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type);
117054 +extern bool skip_expr_on_double_type(const_gimple stmt);
117055 +extern void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs);
117056 +
117057 +#endif
117058 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_debug.c b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
117059 new file mode 100644
117060 index 0000000..4378111
117061 --- /dev/null
117062 +++ b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
117063 @@ -0,0 +1,116 @@
117064 +/*
117065 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
117066 + * Licensed under the GPL v2, or (at your option) v3
117067 + *
117068 + * Homepage:
117069 + * http://www.grsecurity.net/~ephox/overflow_plugin/
117070 + *
117071 + * Documentation:
117072 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
117073 + *
117074 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
117075 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
117076 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
117077 + *
117078 + * Usage:
117079 + * $ make
117080 + * $ make run
117081 + */
117082 +
117083 +#include "gcc-common.h"
117084 +
117085 +static unsigned int dump_functions(void)
117086 +{
117087 + struct cgraph_node *node;
117088 +
117089 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
117090 + basic_block bb;
117091 +
117092 + push_cfun(DECL_STRUCT_FUNCTION(NODE_DECL(node)));
117093 + current_function_decl = NODE_DECL(node);
117094 +
117095 + fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", DECL_NAME_POINTER(current_function_decl));
117096 +
117097 + FOR_ALL_BB_FN(bb, cfun) {
117098 + gimple_stmt_iterator si;
117099 +
117100 + fprintf(stderr, "<bb %u>:\n", bb->index);
117101 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
117102 + debug_gimple_stmt(gsi_stmt(si));
117103 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
117104 + debug_gimple_stmt(gsi_stmt(si));
117105 + fprintf(stderr, "\n");
117106 + }
117107 +
117108 + fprintf(stderr, "-------------------------------------------------------------------------\n");
117109 +
117110 + pop_cfun();
117111 + current_function_decl = NULL_TREE;
117112 + }
117113 +
117114 + fprintf(stderr, "###############################################################################\n");
117115 +
117116 + return 0;
117117 +}
117118 +
117119 +#if BUILDING_GCC_VERSION >= 4009
117120 +static const struct pass_data dump_pass_data = {
117121 +#else
117122 +static struct ipa_opt_pass_d dump_pass = {
117123 + .pass = {
117124 +#endif
117125 + .type = SIMPLE_IPA_PASS,
117126 + .name = "dump",
117127 +#if BUILDING_GCC_VERSION >= 4008
117128 + .optinfo_flags = OPTGROUP_NONE,
117129 +#endif
117130 +#if BUILDING_GCC_VERSION >= 4009
117131 + .has_gate = false,
117132 + .has_execute = true,
117133 +#else
117134 + .gate = NULL,
117135 + .execute = dump_functions,
117136 + .sub = NULL,
117137 + .next = NULL,
117138 + .static_pass_number = 0,
117139 +#endif
117140 + .tv_id = TV_NONE,
117141 + .properties_required = 0,
117142 + .properties_provided = 0,
117143 + .properties_destroyed = 0,
117144 + .todo_flags_start = 0,
117145 + .todo_flags_finish = 0,
117146 +#if BUILDING_GCC_VERSION < 4009
117147 + },
117148 + .generate_summary = NULL,
117149 + .write_summary = NULL,
117150 + .read_summary = NULL,
117151 +#if BUILDING_GCC_VERSION >= 4006
117152 + .write_optimization_summary = NULL,
117153 + .read_optimization_summary = NULL,
117154 +#endif
117155 + .stmt_fixup = NULL,
117156 + .function_transform_todo_flags_start = 0,
117157 + .function_transform = NULL,
117158 + .variable_transform = NULL,
117159 +#endif
117160 +};
117161 +
117162 +#if BUILDING_GCC_VERSION >= 4009
117163 +namespace {
117164 +class dump_pass : public ipa_opt_pass_d {
117165 +public:
117166 + dump_pass() : ipa_opt_pass_d(dump_pass_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
117167 + unsigned int execute() { return dump_functions(); }
117168 +};
117169 +}
117170 +#endif
117171 +
117172 +struct opt_pass *make_dump_pass(void)
117173 +{
117174 +#if BUILDING_GCC_VERSION >= 4009
117175 + return new dump_pass();
117176 +#else
117177 + return &dump_pass.pass;
117178 +#endif
117179 +}
117180 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
117181 new file mode 100644
117182 index 0000000..f38f762
117183 --- /dev/null
117184 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
117185 @@ -0,0 +1,6029 @@
117186 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
117187 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
117188 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
117189 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
117190 +sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
117191 +padzero_55 padzero 1 55 &sel_read_policyvers_55
117192 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
117193 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
117194 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
117195 +load_msg_95 load_msg 2 95 NULL
117196 +ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
117197 +init_q_132 init_q 4 132 NULL
117198 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
117199 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
117200 +ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
117201 +ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
117202 +tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
117203 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
117204 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
117205 +obd_proc_jobid_var_seq_write_199 obd_proc_jobid_var_seq_write 3 199 NULL
117206 +ll_xattr_cache_seq_write_250 ll_xattr_cache_seq_write 3 250 NULL
117207 +vpdma_create_desc_list_255 vpdma_create_desc_list 2 255 NULL
117208 +br_port_info_size_268 br_port_info_size 0 268 NULL
117209 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
117210 +SYSC_connect_304 SYSC_connect 3 304 NULL
117211 +syslog_print_307 syslog_print 2 307 NULL
117212 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
117213 +mlx5_core_access_reg_361 mlx5_core_access_reg 3-5 361 NULL
117214 +aio_read_events_ring_410 aio_read_events_ring 3-0 410 NULL
117215 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
117216 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
117217 +cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
117218 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
117219 +iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
117220 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
117221 +smp_send_cmd_512 smp_send_cmd 3 512 NULL
117222 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
117223 +zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
117224 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
117225 +sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
117226 +lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
117227 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
117228 +start_isoc_chain_565 start_isoc_chain 2 565 NULL nohasharray
117229 +dev_hard_header_565 dev_hard_header 0 565 &start_isoc_chain_565
117230 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
117231 +btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
117232 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
117233 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
117234 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
117235 +viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
117236 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
117237 +cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL
117238 +unlink_queued_645 unlink_queued 4 645 NULL
117239 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
117240 +nvif_notify_new_671 nvif_notify_new 6 671 NULL
117241 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
117242 +persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
117243 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
117244 +dvb_video_write_754 dvb_video_write 3 754 NULL
117245 +cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
117246 +ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
117247 +if_writecmd_815 if_writecmd 2 815 NULL
117248 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
117249 +error_state_read_859 error_state_read 6 859 NULL
117250 +lustre_init_msg_v2_864 lustre_init_msg_v2 2 864 NULL
117251 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
117252 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
117253 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
117254 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
117255 +__nodes_weight_956 __nodes_weight 2-0 956 NULL
117256 +bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
117257 +usnic_ib_qp_grp_dump_hdr_989 usnic_ib_qp_grp_dump_hdr 2 989 NULL
117258 +readreg_1017 readreg 0-1 1017 NULL
117259 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
117260 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
117261 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
117262 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
117263 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
117264 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
117265 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
117266 +__arch_hweight8_1105 __arch_hweight8 0 1105 NULL
117267 +utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
117268 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
117269 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
117270 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
117271 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
117272 +pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
117273 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
117274 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
117275 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
117276 +lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
117277 +kernfs_file_direct_read_1238 kernfs_file_direct_read 3 1238 NULL
117278 +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
117279 +drm_primary_helper_create_plane_1262 drm_primary_helper_create_plane 3 1262 NULL
117280 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
117281 +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
117282 +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
117283 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
117284 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
117285 +posix_acl_xattr_set_1301 posix_acl_xattr_set 4 1301 NULL
117286 +ffs_1322 ffs 0 1322 NULL
117287 +qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
117288 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
117289 +bond_verify_device_path_1352 bond_verify_device_path 3 1352 NULL
117290 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
117291 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
117292 +fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
117293 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
117294 +xpcs_reg_addr_read_1381 xpcs_reg_addr_read 3 1381 NULL
117295 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
117296 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
117297 +SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
117298 +cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
117299 +init_rs_internal_1436 init_rs_internal 1 1436 NULL
117300 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
117301 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
117302 +xprt_alloc_1475 xprt_alloc 2 1475 NULL
117303 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
117304 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
117305 +fpregs_set_1497 fpregs_set 4 1497 NULL
117306 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
117307 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
117308 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
117309 +ffs_mutex_lock_1564 ffs_mutex_lock 0 1564 NULL
117310 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
117311 +ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
117312 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
117313 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
117314 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
117315 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
117316 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
117317 +rmap_add_1677 rmap_add 3 1677 NULL
117318 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
117319 +iwl_dbgfs_d0i3_refs_read_1705 iwl_dbgfs_d0i3_refs_read 3 1705 NULL
117320 +pdu_write_u_1710 pdu_write_u 3 1710 NULL
117321 +coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
117322 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
117323 +internal_create_group_1733 internal_create_group 0 1733 NULL
117324 +dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
117325 +usb_ep_align_maybe_1743 usb_ep_align_maybe 0-3 1743 NULL
117326 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
117327 +cosa_write_1774 cosa_write 3 1774 NULL
117328 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
117329 +__nodelist_scnprintf_1815 __nodelist_scnprintf 2-0 1815 NULL
117330 +sb_issue_zeroout_1884 sb_issue_zeroout 3 1884 NULL
117331 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
117332 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
117333 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
117334 +uhid_char_read_1920 uhid_char_read 3 1920 NULL
117335 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
117336 +azx_get_position_1927 azx_get_position 0 1927 NULL
117337 +bdev_erase_1933 bdev_erase 3 1933 NULL
117338 +ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
117339 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL nohasharray
117340 +nvif_object_sclass_1940 nvif_object_sclass 3 1940 &cyttsp_probe_1940
117341 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
117342 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
117343 +qla2xxx_get_vpd_field_1965 qla2xxx_get_vpd_field 4 1965 NULL
117344 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
117345 +gpio_power_write_1991 gpio_power_write 3 1991 NULL
117346 +__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
117347 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
117348 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
117349 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
117350 +BcmCopySection_2035 BcmCopySection 5 2035 NULL
117351 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
117352 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
117353 +__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
117354 +diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL
117355 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
117356 +xgmac_reg_value_read_2095 xgmac_reg_value_read 3 2095 NULL
117357 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
117358 +audit_expand_2098 audit_expand 0 2098 NULL
117359 +__set_print_fmt_2106 __set_print_fmt 0 2106 NULL
117360 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
117361 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
117362 +btrfs_file_extent_inline_len_2116 btrfs_file_extent_inline_len 0 2116 NULL
117363 +enable_read_2117 enable_read 3 2117 NULL
117364 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
117365 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
117366 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
117367 +__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
117368 +_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
117369 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
117370 +picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
117371 +u32_array_read_2219 u32_array_read 3 2219 NULL nohasharray
117372 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 &u32_array_read_2219
117373 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
117374 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
117375 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
117376 +do_update_counters_2259 do_update_counters 4 2259 NULL
117377 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
117378 +vpdma_alloc_desc_buf_2278 vpdma_alloc_desc_buf 2 2278 NULL
117379 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
117380 +sr_read_cmd_2299 sr_read_cmd 5 2299 NULL
117381 +kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
117382 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
117383 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 NULL nohasharray
117384 +picolcd_fb_write_2318 picolcd_fb_write 3 2318 &hfsplus_find_init_2318
117385 +dice_hwdep_read_2326 dice_hwdep_read 3 2326 NULL
117386 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
117387 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
117388 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
117389 +xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
117390 +rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
117391 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
117392 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
117393 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
117394 +raid1_size_2419 raid1_size 0-2 2419 NULL
117395 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
117396 +wiphy_new_2482 wiphy_new 2 2482 NULL
117397 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
117398 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
117399 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
117400 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
117401 +batadv_tvlv_container_list_size_2524 batadv_tvlv_container_list_size 0 2524 NULL
117402 +smk_write_syslog_2529 smk_write_syslog 3 2529 NULL
117403 +__ceph_setxattr_2532 __ceph_setxattr 4 2532 NULL
117404 +sfw_create_rpc_2562 sfw_create_rpc 4 2562 NULL
117405 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
117406 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
117407 +mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
117408 +slot_bytes_2609 slot_bytes 0 2609 NULL
117409 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
117410 +switch_status_2629 switch_status 5 2629 NULL
117411 +_proc_do_string_2632 _proc_do_string 2 2632 NULL
117412 +tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
117413 +osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
117414 +ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
117415 +oti6858_write_2692 oti6858_write 4 2692 NULL
117416 +copy_to_iter_iovec_2697 copy_to_iter_iovec 2 2697 NULL
117417 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
117418 +memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
117419 +lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 NULL
117420 +xfs_readdir_2767 xfs_readdir 3 2767 NULL
117421 +fsl_edma_alloc_desc_2769 fsl_edma_alloc_desc 2 2769 NULL
117422 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
117423 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
117424 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
117425 +iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
117426 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
117427 +vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL
117428 +sock_create_2838 sock_create 0 2838 NULL
117429 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
117430 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
117431 +irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
117432 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
117433 +nla_padlen_2883 nla_padlen 1 2883 NULL
117434 +cmm_write_2896 cmm_write 3 2896 NULL
117435 +osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
117436 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
117437 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
117438 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
117439 +i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
117440 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
117441 +free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
117442 +bio_setup_sector_2970 bio_setup_sector 3 2970 NULL
117443 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
117444 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
117445 +lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
117446 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
117447 +depth_write_3021 depth_write 3 3021 NULL
117448 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
117449 +nvme_split_and_submit_3027 nvme_split_and_submit 3 3027 NULL
117450 +kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
117451 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
117452 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
117453 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
117454 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
117455 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
117456 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
117457 +__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
117458 +hfsplus_asc2uni_3071 hfsplus_asc2uni 0 3071 NULL nohasharray
117459 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 &hfsplus_asc2uni_3071
117460 +read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
117461 +bio_integrity_intervals_3094 bio_integrity_intervals 0-2 3094 NULL
117462 +ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
117463 +rb_alloc_3102 rb_alloc 1 3102 NULL
117464 +ufshcd_get_rsp_upiu_result_3114 ufshcd_get_rsp_upiu_result 0 3114 NULL
117465 +simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
117466 +print_time_3132 print_time 0 3132 NULL
117467 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
117468 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
117469 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
117470 +pkcs7_sig_note_signature_3178 pkcs7_sig_note_signature 5 3178 NULL
117471 +uinput_ioctl_handler_3181 uinput_ioctl_handler 2 3181 NULL nohasharray
117472 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 &uinput_ioctl_handler_3181
117473 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
117474 +mempool_create_node_3191 mempool_create_node 1 3191 NULL
117475 +alloc_context_3194 alloc_context 1 3194 NULL
117476 +dma_init_coherent_memory_3197 dma_init_coherent_memory 3 3197 NULL
117477 +shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
117478 +codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
117479 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
117480 +btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
117481 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
117482 +write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
117483 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
117484 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
117485 +key_key_read_3241 key_key_read 3 3241 NULL
117486 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
117487 +ieee80211_if_write_beacon_loss_3296 ieee80211_if_write_beacon_loss 3 3296 NULL
117488 +cgroup_name_3300 cgroup_name 3 3300 NULL
117489 +__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
117490 +_iwl_dbgfs_d3_sram_write_3315 _iwl_dbgfs_d3_sram_write 3 3315 NULL
117491 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
117492 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
117493 +sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
117494 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
117495 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
117496 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
117497 +scnprintf_3360 scnprintf 0-2 3360 NULL
117498 +sr_read_3366 sr_read 3 3366 NULL
117499 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
117500 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
117501 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
117502 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
117503 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
117504 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
117505 +softsynth_write_3455 softsynth_write 3 3455 NULL
117506 +snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 NULL
117507 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
117508 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
117509 +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
117510 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
117511 +SyS_readv_3539 SyS_readv 3 3539 NULL
117512 +nouveau_fuse_create__3546 nouveau_fuse_create_ 4 3546 NULL
117513 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
117514 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
117515 +evtchn_read_3569 evtchn_read 3 3569 NULL
117516 +ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
117517 +vc_resize_3585 vc_resize 3-2 3585 NULL
117518 +kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
117519 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
117520 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
117521 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
117522 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
117523 +fm10k_alloc_q_vector_3638 fm10k_alloc_q_vector 4-6 3638 NULL
117524 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
117525 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
117526 +_iwl_dbgfs_tx_flush_write_3675 _iwl_dbgfs_tx_flush_write 3 3675 NULL
117527 +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL
117528 +ci_ll_write_3740 ci_ll_write 4 3740 NULL
117529 +msm_otg_mode_write_3788 msm_otg_mode_write 3 3788 NULL
117530 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
117531 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
117532 +llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
117533 +ceph_do_getattr_3838 ceph_do_getattr 0 3838 NULL
117534 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
117535 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
117536 +get_fd_set_3866 get_fd_set 1 3866 NULL
117537 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
117538 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
117539 +nvram_write_3894 nvram_write 3 3894 NULL
117540 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
117541 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
117542 +vcs_write_3910 vcs_write 3 3910 NULL
117543 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
117544 +hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
117545 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
117546 +mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
117547 +copy_from_user_atomic_iovec_3990 copy_from_user_atomic_iovec 0-4 3990 NULL
117548 +do_add_counters_3992 do_add_counters 3 3992 NULL
117549 +userspace_status_4004 userspace_status 4 4004 NULL
117550 +xfs_check_block_4005 xfs_check_block 4 4005 NULL nohasharray
117551 +mei_write_4005 mei_write 3 4005 &xfs_check_block_4005
117552 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
117553 +blk_end_request_4024 blk_end_request 3 4024 NULL
117554 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
117555 +mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
117556 +read_file_queues_4078 read_file_queues 3 4078 NULL
117557 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
117558 +C_SYSC_rt_sigpending_4114 C_SYSC_rt_sigpending 2 4114 NULL
117559 +tm6000_read_4151 tm6000_read 3 4151 NULL
117560 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
117561 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
117562 +get_alua_req_4166 get_alua_req 3 4166 NULL
117563 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
117564 +read_file_bool_4180 read_file_bool 3 4180 NULL
117565 +lstcon_test_add_4190 lstcon_test_add 10 4190 NULL
117566 +vring_new_virtqueue_4199 vring_new_virtqueue 2 4199 NULL
117567 +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
117568 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
117569 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
117570 +ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
117571 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
117572 +get_connectors_for_crtc_4291 get_connectors_for_crtc 0 4291 NULL
117573 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
117574 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
117575 +count_strings_4315 count_strings 0 4315 NULL nohasharray
117576 +cfg80211_inform_bss_4315 cfg80211_inform_bss 9 4315 &count_strings_4315
117577 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
117578 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
117579 +ima_eventdigest_init_common_4338 ima_eventdigest_init_common 2 4338 NULL
117580 +__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
117581 +lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
117582 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
117583 +access_process_vm_4412 access_process_vm 0 4412 NULL nohasharray
117584 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
117585 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
117586 +rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
117587 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
117588 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
117589 +snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
117590 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
117591 +set_link_security_4502 set_link_security 4 4502 NULL
117592 +ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
117593 +tty_register_device_4544 tty_register_device 2 4544 NULL
117594 +fsl_edma_prep_slave_sg_4555 fsl_edma_prep_slave_sg 3 4555 NULL
117595 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
117596 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
117597 +bch_alloc_4593 bch_alloc 1 4593 NULL
117598 +ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
117599 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
117600 +nve0_gpio_intr_mask_4665 nve0_gpio_intr_mask 4-3 4665 NULL
117601 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
117602 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
117603 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
117604 +kone_receive_4690 kone_receive 4 4690 NULL
117605 +hash_netportnet6_expire_4702 hash_netportnet6_expire 4 4702 NULL
117606 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
117607 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
117608 +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
117609 +ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
117610 +bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
117611 +lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
117612 +pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
117613 +create_subvol_4791 create_subvol 4 4791 NULL
117614 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
117615 +C_SYSC_setsockopt_4806 C_SYSC_setsockopt 5 4806 NULL
117616 +repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
117617 +scsi_end_request_4839 scsi_end_request 3-4 4839 NULL
117618 +comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
117619 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
117620 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
117621 +ocfs2_defrag_extent_4873 ocfs2_defrag_extent 2 4873 NULL
117622 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
117623 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
117624 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
117625 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
117626 +ath10k_read_chip_id_4969 ath10k_read_chip_id 3 4969 NULL
117627 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
117628 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
117629 +compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
117630 +do_mincore_5018 do_mincore 0-2-1 5018 NULL
117631 +cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
117632 +ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
117633 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
117634 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
117635 +get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
117636 +kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 &get_random_bytes_5091 nohasharray
117637 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
117638 +sound_write_5102 sound_write 3 5102 NULL
117639 +i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
117640 +qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
117641 +bucket_table_alloc_5149 bucket_table_alloc 1 5149 NULL
117642 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
117643 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
117644 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
117645 +trf7970a_read_cont_5179 trf7970a_read_cont 4 5179 NULL
117646 +ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
117647 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
117648 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
117649 +ipv4_tun_to_nlattr_5261 ipv4_tun_to_nlattr 4 5261 NULL
117650 +dvb_ringbuffer_write_user_5270 dvb_ringbuffer_write_user 3 5270 NULL
117651 +xgmac_reg_addr_read_5278 xgmac_reg_addr_read 3 5278 NULL
117652 +usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
117653 +r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
117654 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
117655 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
117656 +uinput_ioctl_5342 uinput_ioctl 2 5342 NULL
117657 +cq_free_res_5355 cq_free_res 5 5355 NULL
117658 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
117659 +cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
117660 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
117661 +ll_xattr_cache_refill_5468 ll_xattr_cache_refill 0 5468 NULL
117662 +kernfs_fop_write_5471 kernfs_fop_write 3 5471 NULL
117663 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
117664 +pci_enable_msix_exact_5482 pci_enable_msix_exact 3 5482 NULL
117665 +cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
117666 +tty_write_5494 tty_write 3 5494 NULL
117667 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
117668 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
117669 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
117670 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
117671 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
117672 +le_readq_5557 le_readq 0 5557 NULL
117673 +inw_5558 inw 0 5558 NULL
117674 +bioset_create_5580 bioset_create 1 5580 NULL
117675 +oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
117676 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
117677 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
117678 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
117679 +get_arg_5694 get_arg 3 5694 NULL
117680 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
117681 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
117682 +sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
117683 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
117684 +nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
117685 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL nohasharray
117686 +ath10k_core_create_5806 ath10k_core_create 1 5806 &skb_copy_datagram_iovec_5806
117687 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
117688 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
117689 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
117690 +setup_req_5848 setup_req 3 5848 NULL
117691 +ria_page_count_5849 ria_page_count 0 5849 NULL
117692 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
117693 +uinput_compat_ioctl_5861 uinput_compat_ioctl 2 5861 NULL
117694 +config_buf_5862 config_buf 0 5862 NULL nohasharray
117695 +ufshcd_check_query_response_5862 ufshcd_check_query_response 0 5862 &config_buf_5862
117696 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
117697 +port_show_regs_5904 port_show_regs 3 5904 NULL
117698 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
117699 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
117700 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
117701 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
117702 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
117703 +ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
117704 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
117705 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
117706 +SyS_semop_5980 SyS_semop 3 5980 NULL
117707 +btrfs_item_offset_6019 btrfs_item_offset 0 6019 NULL
117708 +alloc_msg_6072 alloc_msg 1 6072 NULL
117709 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
117710 +_random_read_6098 _random_read 3 6098 NULL
117711 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL nohasharray
117712 +force_static_address_read_6110 force_static_address_read 3 6110 &ipmi_addr_length_6110
117713 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
117714 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
117715 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
117716 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
117717 +maybe_insert_hole_6167 maybe_insert_hole 3 6167 NULL
117718 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
117719 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
117720 +snd_efw_command_get_phys_meters_6190 snd_efw_command_get_phys_meters 3 6190 NULL
117721 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
117722 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
117723 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
117724 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
117725 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
117726 +of_gpio_count_6270 of_gpio_count 0 6270 NULL
117727 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
117728 +snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
117729 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
117730 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
117731 +serial_port_in_6291 serial_port_in 0 6291 NULL
117732 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
117733 +hfsplus_direct_IO_6313 hfsplus_direct_IO 4 6313 NULL
117734 +SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
117735 +hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
117736 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
117737 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
117738 +regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
117739 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
117740 +arch_gnttab_valloc_6372 arch_gnttab_valloc 2 6372 NULL
117741 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL nohasharray
117742 +sync_fence_alloc_6378 sync_fence_alloc 1 6378 &osd_req_read_sg_kern_6378
117743 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
117744 +add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
117745 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
117746 +__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
117747 +C_SYSC_vmsplice_6470 C_SYSC_vmsplice 3 6470 NULL
117748 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
117749 +qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
117750 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
117751 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
117752 +mei_read_6507 mei_read 3 6507 NULL
117753 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
117754 +wdm_read_6549 wdm_read 3 6549 NULL
117755 +dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
117756 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
117757 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
117758 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
117759 +xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
117760 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
117761 +btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3 6696 NULL
117762 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
117763 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
117764 +mpeg_read_6708 mpeg_read 3 6708 NULL
117765 +ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
117766 +check_clk_sync_6717 check_clk_sync 2 6717 NULL
117767 +video_proc_write_6724 video_proc_write 3 6724 NULL
117768 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
117769 +inet_recv_error_6744 inet_recv_error 3 6744 NULL
117770 +kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
117771 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
117772 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
117773 +zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
117774 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
117775 +ll_xattr_cache_find_6798 ll_xattr_cache_find 0 6798 NULL
117776 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
117777 +rounded_hashtable_size_6802 rounded_hashtable_size 0 6802 NULL
117778 +lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
117779 +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
117780 +blk_alloc_flush_queue_6839 blk_alloc_flush_queue 3 6839 NULL
117781 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
117782 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
117783 +perf_output_sample_ustack_6868 perf_output_sample_ustack 2 6868 NULL
117784 +dio_complete_6879 dio_complete 0-3-2 6879 NULL
117785 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL nohasharray
117786 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 &raw_seticmpfilter_6888
117787 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
117788 +proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray
117789 +spi_show_regs_6911 spi_show_regs 3 6911 &proc_sessionid_read_6911 nohasharray
117790 +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &spi_show_regs_6911
117791 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
117792 +do_msgrcv_6921 do_msgrcv 3 6921 NULL
117793 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
117794 +ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
117795 +qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
117796 +tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
117797 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
117798 +i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
117799 +rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
117800 +lustre_pack_reply_6982 lustre_pack_reply 2 6982 NULL
117801 +request_key_async_6990 request_key_async 4 6990 NULL
117802 +tpl_write_6998 tpl_write 3 6998 NULL
117803 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
117804 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
117805 +ld_usb_write_7022 ld_usb_write 3 7022 NULL
117806 +wimax_msg_7030 wimax_msg 4 7030 NULL
117807 +ceph_kvmalloc_7033 ceph_kvmalloc 1 7033 NULL
117808 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
117809 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
117810 +nouveau_device_create__7063 nouveau_device_create_ 7 7063 NULL
117811 +hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
117812 +event_enable_read_7074 event_enable_read 3 7074 NULL
117813 +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL nohasharray
117814 +tipc_send_packet_7091 tipc_send_packet 4 7091 &beacon_interval_read_7091
117815 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
117816 +osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
117817 +qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
117818 +kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
117819 +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
117820 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
117821 +hdlc_loop_7255 hdlc_loop 0 7255 NULL
117822 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL nohasharray
117823 +kimage_alloc_init_7282 kimage_alloc_init 3 7282 &rx_rate_rx_frames_per_rates_read_7282
117824 +get_string_7302 get_string 0 7302 NULL
117825 +pci_vpd_info_field_size_7324 pci_vpd_info_field_size 0 7324 NULL
117826 +mgmt_control_7349 mgmt_control 3 7349 NULL
117827 +at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
117828 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
117829 +ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
117830 +hweight_long_7388 hweight_long 0-1 7388 NULL
117831 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
117832 +_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
117833 +audmux_read_file_7400 audmux_read_file 3 7400 NULL
117834 +readb_7401 readb 0 7401 NULL
117835 +tipc_recvmsg_7402 tipc_recvmsg 4 7402 NULL
117836 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
117837 +__copy_to_user_nocheck_7443 __copy_to_user_nocheck 0-3 7443 NULL
117838 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
117839 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
117840 +rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
117841 +l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
117842 +garp_request_join_7471 garp_request_join 4 7471 NULL nohasharray
117843 +ReadHSCX_7471 ReadHSCX 0 7471 &garp_request_join_7471
117844 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
117845 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 NULL nohasharray
117846 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 &ahash_instance_headroom_7509
117847 +array_zalloc_7519 array_zalloc 1-2 7519 NULL
117848 +ath10k_read_htt_stats_mask_7557 ath10k_read_htt_stats_mask 3 7557 NULL
117849 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
117850 +netvsc_get_slots_7565 netvsc_get_slots 0 7565 NULL
117851 +cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
117852 +groups_alloc_7614 groups_alloc 1 7614 NULL nohasharray
117853 +create_dir_7614 create_dir 0 7614 &groups_alloc_7614
117854 +_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
117855 +fault_inject_write_7662 fault_inject_write 3 7662 NULL
117856 +acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 NULL
117857 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
117858 +dev_write_7708 dev_write 3 7708 NULL
117859 +pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
117860 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
117861 +iwl_dbgfs_bt_cmd_read_7770 iwl_dbgfs_bt_cmd_read 3 7770 NULL
117862 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
117863 +__videobuf_read_start_7782 __videobuf_read_start 0 7782 NULL
117864 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
117865 +bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
117866 +diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
117867 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
117868 +seq_buf_alloc_7828 seq_buf_alloc 1 7828 NULL
117869 +cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
117870 +tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
117871 +config_desc_7878 config_desc 0 7878 NULL
117872 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
117873 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
117874 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
117875 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
117876 +integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
117877 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
117878 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
117879 +vcs_read_8017 vcs_read 3 8017 NULL
117880 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
117881 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
117882 +spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
117883 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 NULL
117884 +venus_lookup_8121 venus_lookup 4 8121 NULL
117885 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
117886 +xfs_file_fallocate_8150 xfs_file_fallocate 3-4 8150 NULL
117887 +ufshcd_wait_for_dev_cmd_8168 ufshcd_wait_for_dev_cmd 0 8168 NULL
117888 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
117889 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
117890 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
117891 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
117892 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
117893 +play_iframe_8219 play_iframe 3 8219 NULL
117894 +kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL
117895 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
117896 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
117897 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
117898 +init_cdev_8274 init_cdev 1 8274 NULL
117899 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
117900 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
117901 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
117902 +rtw_cfg80211_rx_action_8329 rtw_cfg80211_rx_action 3 8329 NULL
117903 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
117904 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
117905 +generic_write_sync_8358 generic_write_sync 0 8358 NULL
117906 +ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
117907 +ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
117908 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
117909 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
117910 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
117911 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
117912 +roccat_common2_sysfs_read_8431 roccat_common2_sysfs_read 6 8431 NULL
117913 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
117914 +fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
117915 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
117916 +dev_config_8506 dev_config 3 8506 NULL
117917 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
117918 +nouveau_platform_device_create__8514 nouveau_platform_device_create_ 2 8514 NULL
117919 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
117920 +user_on_off_8552 user_on_off 2 8552 NULL
117921 +profile_remove_8556 profile_remove 3 8556 NULL
117922 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
117923 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
117924 +tower_write_8580 tower_write 3 8580 NULL
117925 +cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
117926 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
117927 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
117928 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
117929 +fuse_send_write_pages_8636 fuse_send_write_pages 5-0 8636 NULL
117930 +mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
117931 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
117932 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
117933 +bpf_prog_size_8685 bpf_prog_size 0 8685 NULL
117934 +rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
117935 +skb_frag_size_8695 skb_frag_size 0 8695 NULL
117936 +arcfb_write_8702 arcfb_write 3 8702 NULL
117937 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
117938 +init_header_8703 init_header 0 8703 &i_size_read_8703
117939 +ufshcd_get_tr_ocs_8706 ufshcd_get_tr_ocs 0 8706 NULL
117940 +HDLC_irq_8709 HDLC_irq 2 8709 NULL
117941 +ctrl_out_8712 ctrl_out 3-5 8712 NULL
117942 +tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
117943 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
117944 +iov_iter_zero_8748 iov_iter_zero 1 8748 NULL
117945 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
117946 +compound_order_8750 compound_order 0 8750 NULL
117947 +cfg80211_inform_bss_width_8754 cfg80211_inform_bss_width 10 8754 NULL
117948 +yurex_write_8761 yurex_write 3 8761 NULL
117949 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
117950 +kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
117951 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
117952 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 4-3 8785 NULL
117953 +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
117954 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
117955 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
117956 +ll_xattr_cache_get_8829 ll_xattr_cache_get 0 8829 NULL
117957 +get_queue_depth_8833 get_queue_depth 0 8833 NULL
117958 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
117959 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
117960 +iwl_rx_packet_len_8854 iwl_rx_packet_len 0 8854 NULL
117961 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
117962 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
117963 +xgmac_reg_value_write_8860 xgmac_reg_value_write 3 8860 NULL
117964 +radeon_drm_ioctl_8875 radeon_drm_ioctl 2 8875 NULL
117965 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
117966 +ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
117967 +tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
117968 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
117969 +sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
117970 +write_file_ani_8918 write_file_ani 3 8918 NULL
117971 +layout_commit_8926 layout_commit 3 8926 NULL
117972 +cp2112_hid_get_8933 cp2112_hid_get 4 8933 NULL
117973 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
117974 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
117975 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
117976 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
117977 +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
117978 +venus_mkdir_8967 venus_mkdir 4 8967 NULL
117979 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
117980 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
117981 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
117982 +sony_register_touchpad_8981 sony_register_touchpad 2 8981 NULL
117983 +jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
117984 +il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
117985 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
117986 +fd_ioctl_9028 fd_ioctl 3 9028 NULL
117987 +nla_put_9042 nla_put 3 9042 NULL
117988 +sta_tx_latency_stat_header_9050 sta_tx_latency_stat_header 0-3-4 9050 NULL
117989 +snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
117990 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
117991 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
117992 +create_queues_9088 create_queues 2-3 9088 NULL
117993 +nvkm_output_create__9091 nvkm_output_create_ 6 9091 NULL
117994 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
117995 +adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
117996 +gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 NULL nohasharray
117997 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 &gfn_to_rmap_9110
117998 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
117999 +vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
118000 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
118001 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
118002 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
118003 +altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
118004 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
118005 +iwl_dbgfs_frame_stats_read_9211 iwl_dbgfs_frame_stats_read 3 9211 NULL
118006 +card_send_command_9215 card_send_command 3 9215 NULL
118007 +virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
118008 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
118009 +l2cap_create_connless_pdu_9222 l2cap_create_connless_pdu 3 9222 NULL
118010 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
118011 +hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
118012 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
118013 +flakey_status_9274 flakey_status 5 9274 NULL
118014 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
118015 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
118016 +__blockdev_direct_IO_9321 __blockdev_direct_IO 0-6 9321 NULL
118017 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
118018 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
118019 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
118020 +ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
118021 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
118022 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
118023 +read_9397 read 3 9397 NULL
118024 +hash_ipportip4_expire_9415 hash_ipportip4_expire 4 9415 NULL
118025 +btrfs_drop_extents_9423 btrfs_drop_extents 4 9423 NULL
118026 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
118027 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
118028 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
118029 +get_registers_9470 get_registers 4 9470 NULL nohasharray
118030 +agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 &get_registers_9470
118031 +crypt_status_9492 crypt_status 5 9492 NULL
118032 +lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
118033 +lp_write_9511 lp_write 3 9511 NULL
118034 +mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
118035 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
118036 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
118037 +read_file_dma_9530 read_file_dma 3 9530 NULL
118038 +iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
118039 +il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
118040 +compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
118041 +fw_node_create_9559 fw_node_create 2 9559 NULL
118042 +kobj_map_9566 kobj_map 2-3 9566 NULL
118043 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
118044 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
118045 +lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
118046 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
118047 +ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
118048 +acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
118049 +ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
118050 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
118051 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
118052 +tipc_port_mcast_xmit_9663 tipc_port_mcast_xmit 4 9663 NULL
118053 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
118054 +dns_query_9676 dns_query 3 9676 NULL
118055 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
118056 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
118057 +lowpan_control_write_9699 lowpan_control_write 3 9699 NULL
118058 +vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
118059 +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
118060 +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
118061 +cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
118062 +parse_uac2_sample_rate_range_9718 parse_uac2_sample_rate_range 0 9718 NULL
118063 +btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
118064 +SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
118065 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
118066 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
118067 +ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
118068 +regmap_multi_reg_write_bypassed_9751 regmap_multi_reg_write_bypassed 3 9751 NULL nohasharray
118069 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 &regmap_multi_reg_write_bypassed_9751
118070 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
118071 +copy_page_from_iter_bvec_9767 copy_page_from_iter_bvec 0-3 9767 NULL
118072 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
118073 +kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
118074 +bio_alloc_map_data_9798 bio_alloc_map_data 1 9798 NULL
118075 +ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL nohasharray
118076 +udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 &ieee80211_if_read_state_9813
118077 +compat_SyS_vmsplice_9828 compat_SyS_vmsplice 3 9828 NULL
118078 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
118079 +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
118080 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
118081 +bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
118082 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
118083 +snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL
118084 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
118085 +iwl_dbgfs_prph_reg_read_9928 iwl_dbgfs_prph_reg_read 3 9928 NULL
118086 +root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
118087 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
118088 +read_file_misc_9948 read_file_misc 3 9948 NULL
118089 +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
118090 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
118091 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
118092 +btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
118093 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
118094 +ceph_oloc_oid_to_pg_10003 ceph_oloc_oid_to_pg 0 10003 NULL
118095 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
118096 +asymmetric_key_generate_id_10064 asymmetric_key_generate_id 2-4 10064 NULL
118097 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
118098 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
118099 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
118100 +gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
118101 +SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL
118102 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
118103 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL nohasharray
118104 +tracing_nsecs_write_10157 tracing_nsecs_write 3 10157 &rx_out_of_mem_read_10157
118105 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
118106 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
118107 +kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
118108 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
118109 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
118110 +hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
118111 +lmv_hsm_req_count_10245 lmv_hsm_req_count 0 10245 NULL
118112 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
118113 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
118114 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
118115 +nvif_object_new_10300 nvif_object_new 5 10300 NULL
118116 +read_emulate_10310 read_emulate 2-4 10310 NULL
118117 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
118118 +compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
118119 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
118120 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
118121 +whci_add_cap_10350 whci_add_cap 0 10350 NULL
118122 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
118123 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
118124 +sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
118125 +ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
118126 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
118127 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
118128 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
118129 +hash_ipportip6_expire_10478 hash_ipportip6_expire 4 10478 NULL
118130 +nouveau_pwr_create__10483 nouveau_pwr_create_ 4 10483 NULL
118131 +ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
118132 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
118133 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
118134 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
118135 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
118136 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL
118137 +kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 NULL nohasharray
118138 +snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 &kstrtouint_from_user_10536
118139 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
118140 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
118141 +otp_read_10594 otp_read 2-4-5 10594 NULL
118142 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
118143 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
118144 +fq_alloc_node_10633 fq_alloc_node 1 10633 NULL
118145 +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL
118146 +efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
118147 +parport_write_10669 parport_write 0 10669 NULL
118148 +edge_write_10692 edge_write 4 10692 NULL
118149 +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
118150 +inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
118151 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
118152 +shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
118153 +spi_sync_10731 spi_sync 0 10731 NULL
118154 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
118155 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
118156 +SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
118157 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
118158 +rd_build_prot_space_10761 rd_build_prot_space 2-3 10761 NULL
118159 +kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
118160 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
118161 +diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
118162 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
118163 +ext4_direct_IO_10843 ext4_direct_IO 4 10843 NULL
118164 +ida_get_new_above_10853 ida_get_new_above 0 10853 NULL
118165 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
118166 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
118167 +wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
118168 +get_scq_10897 get_scq 2 10897 NULL
118169 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
118170 +lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
118171 +__copy_from_user_10918 __copy_from_user 0-3 10918 NULL
118172 +kobject_add_10919 kobject_add 0 10919 NULL
118173 +ar9003_dump_modal_eeprom_10959 ar9003_dump_modal_eeprom 3-2-0 10959 NULL
118174 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
118175 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
118176 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
118177 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
118178 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
118179 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
118180 +nouveau_gpio_create__11048 nouveau_gpio_create_ 4 11048 NULL
118181 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
118182 +insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 NULL nohasharray
118183 +qlcnic_83xx_calculate_msix_vector_11063 qlcnic_83xx_calculate_msix_vector 0 11063 &insert_inline_extent_backref_11063
118184 +xfs_collapse_file_space_11075 xfs_collapse_file_space 2-3 11075 NULL
118185 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
118186 +count_argc_11083 count_argc 0 11083 NULL
118187 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
118188 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
118189 +tc90522_master_xfer_11119 tc90522_master_xfer 3 11119 NULL
118190 +page_offset_11120 page_offset 0 11120 NULL
118191 +tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL
118192 +alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
118193 +snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 NULL
118194 +copy_from_iter_iovec_11196 copy_from_iter_iovec 2 11196 NULL
118195 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
118196 +comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
118197 +of_irq_count_11253 of_irq_count 0 11253 NULL
118198 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
118199 +ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
118200 +SYSC_getrandom_11294 SYSC_getrandom 2 11294 NULL
118201 +tipc_msg_build_11304 tipc_msg_build 3-4-5 11304 NULL
118202 +__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
118203 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
118204 +bcache_dev_sectors_dirty_add_11315 bcache_dev_sectors_dirty_add 3-4 11315 NULL
118205 +sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
118206 +tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
118207 +construct_key_11329 construct_key 3 11329 NULL nohasharray
118208 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
118209 +next_segment_11330 next_segment 0-2-1 11330 NULL
118210 +persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
118211 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
118212 +sel_write_create_11353 sel_write_create 3 11353 NULL nohasharray
118213 +nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 &sel_write_create_11353
118214 +of_get_available_child_count_11361 of_get_available_child_count 0 11361 NULL
118215 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
118216 +tcf_register_action_11381 tcf_register_action 2 11381 NULL nohasharray
118217 +nft_value_dump_11381 nft_value_dump 3 11381 &tcf_register_action_11381
118218 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
118219 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
118220 +lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
118221 +___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
118222 +str_to_user_11411 str_to_user 2 11411 NULL
118223 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
118224 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
118225 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
118226 +trace_options_read_11419 trace_options_read 3 11419 NULL
118227 +i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
118228 +bttv_read_11432 bttv_read 3 11432 NULL
118229 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
118230 +ufshcd_change_queue_depth_11477 ufshcd_change_queue_depth 2 11477 NULL
118231 +sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL nohasharray
118232 +pci_set_power_state_11479 pci_set_power_state 0 11479 &sca3000_read_first_n_hw_rb_11479
118233 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
118234 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
118235 +ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
118236 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
118237 +skb_cow_data_11565 skb_cow_data 0 11565 NULL
118238 +lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
118239 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
118240 +batadv_iv_ogm_orig_add_if_11586 batadv_iv_ogm_orig_add_if 2 11586 NULL
118241 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
118242 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
118243 +batadv_iv_ogm_orig_del_if_11604 batadv_iv_ogm_orig_del_if 2 11604 NULL
118244 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
118245 +C_SYSC_migrate_pages_11618 C_SYSC_migrate_pages 2 11618 NULL
118246 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
118247 +nla_total_size_11658 nla_total_size 0-1 11658 NULL
118248 +srpc_create_client_rpc_11664 srpc_create_client_rpc 3 11664 NULL nohasharray
118249 +slab_ksize_11664 slab_ksize 0 11664 &srpc_create_client_rpc_11664
118250 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
118251 +compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
118252 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
118253 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
118254 +split_11691 split 2 11691 NULL
118255 +compat_SyS_keyctl_11695 compat_SyS_keyctl 4 11695 NULL nohasharray
118256 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 &compat_SyS_keyctl_11695
118257 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
118258 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
118259 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
118260 +ieee80211_get_num_supported_channels_11768 ieee80211_get_num_supported_channels 0 11768 NULL
118261 +tipc_sendmsg_11769 tipc_sendmsg 4 11769 NULL
118262 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
118263 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
118264 +pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
118265 +umc_device_register_11824 umc_device_register 0 11824 NULL
118266 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
118267 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
118268 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
118269 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
118270 +pci_enable_msix_range_11852 pci_enable_msix_range 0-4 11852 NULL
118271 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
118272 +l2cap_chan_send_11878 l2cap_chan_send 3 11878 NULL
118273 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
118274 +mdc_rename_11899 mdc_rename 4-6 11899 NULL
118275 +xstateregs_get_11906 xstateregs_get 4 11906 NULL
118276 +ti_write_11916 ti_write 4 11916 NULL
118277 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
118278 +bitmap_remap_11929 bitmap_remap 5 11929 NULL
118279 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
118280 +r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
118281 +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
118282 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
118283 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
118284 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
118285 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
118286 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
118287 +batadv_tt_global_size_mod_12085 batadv_tt_global_size_mod 3 12085 NULL
118288 +rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
118289 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
118290 +set_powered_12129 set_powered 4 12129 NULL
118291 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
118292 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
118293 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
118294 +rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
118295 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
118296 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
118297 +fnic_reset_stats_write_12177 fnic_reset_stats_write 3 12177 NULL
118298 +LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
118299 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
118300 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
118301 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
118302 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
118303 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
118304 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
118305 +__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
118306 +usnic_ib_qp_grp_dump_rows_12239 usnic_ib_qp_grp_dump_rows 3 12239 NULL
118307 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
118308 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
118309 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
118310 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
118311 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray
118312 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288
118313 +bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
118314 +usnic_transport_sock_to_str_12322 usnic_transport_sock_to_str 2-0 12322 NULL
118315 +ufshcd_copy_query_response_12324 ufshcd_copy_query_response 0 12324 NULL
118316 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
118317 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
118318 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
118319 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
118320 +write_file_dump_12391 write_file_dump 3 12391 NULL nohasharray
118321 +btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 &write_file_dump_12391 nohasharray
118322 +populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
118323 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
118324 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
118325 +cfs_array_alloc_12441 cfs_array_alloc 1-2 12441 NULL
118326 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
118327 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
118328 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
118329 +__ceph_osdc_start_request_12502 __ceph_osdc_start_request 0 12502 NULL
118330 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
118331 +nvkm_event_init_12565 nvkm_event_init 3-2 12565 NULL
118332 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
118333 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
118334 +_iwl_dbgfs_prph_reg_write_12597 _iwl_dbgfs_prph_reg_write 3 12597 NULL
118335 +tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
118336 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
118337 +sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
118338 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
118339 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
118340 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
118341 +nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
118342 +rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
118343 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
118344 +lustre_pack_request_v2_12665 lustre_pack_request_v2 2 12665 NULL
118345 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
118346 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
118347 +ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
118348 +iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
118349 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
118350 +ivtv_write_12721 ivtv_write 3 12721 NULL
118351 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
118352 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
118353 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
118354 +listxattr_12769 listxattr 3 12769 NULL
118355 +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
118356 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
118357 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
118358 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
118359 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
118360 +spidev_sync_12842 spidev_sync 0 12842 NULL
118361 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
118362 +ath9k_dump_4k_modal_eeprom_12883 ath9k_dump_4k_modal_eeprom 3-2 12883 NULL
118363 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
118364 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
118365 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
118366 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
118367 +bm_status_write_12964 bm_status_write 3 12964 NULL
118368 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
118369 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
118370 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
118371 +bset_prev_bytes_13020 bset_prev_bytes 0 13020 NULL
118372 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
118373 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
118374 +__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL nohasharray
118375 +ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 &__dn_setsockopt_13060
118376 +ufshcd_compose_upiu_13076 ufshcd_compose_upiu 0 13076 NULL
118377 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
118378 +ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
118379 +SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
118380 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
118381 +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
118382 +blk_update_request_13146 blk_update_request 3 13146 NULL
118383 +caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
118384 +pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
118385 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
118386 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
118387 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
118388 +comedi_read_13199 comedi_read 3 13199 NULL
118389 +hash_ipport4_expire_13201 hash_ipport4_expire 4 13201 NULL
118390 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
118391 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
118392 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
118393 +_iwl_dbgfs_disable_power_off_write_13243 _iwl_dbgfs_disable_power_off_write 3 13243 NULL
118394 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
118395 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
118396 +bio_integrity_trim_13259 bio_integrity_trim 3-2 13259 NULL
118397 +simple_attr_write_13260 simple_attr_write 3 13260 NULL
118398 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
118399 +nvkm_ltc_create__13275 nvkm_ltc_create_ 4 13275 NULL
118400 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
118401 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
118402 +nvkm_i2c_pad_create__13292 nvkm_i2c_pad_create_ 5 13292 NULL
118403 +sd_major_13294 sd_major 0-1 13294 NULL
118404 +read_file_phy_err_13318 read_file_phy_err 3 13318 NULL
118405 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
118406 +round_event_name_len_13348 round_event_name_len 0 13348 NULL
118407 +hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
118408 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
118409 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
118410 +ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
118411 +lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
118412 +dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
118413 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
118414 +sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
118415 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
118416 +sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
118417 +data_read_13494 data_read 3 13494 NULL nohasharray
118418 +ext_prop_data_store_13494 ext_prop_data_store 3 13494 &data_read_13494
118419 +ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 0-2 13512 NULL
118420 +core_status_13515 core_status 4 13515 NULL
118421 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
118422 +bm_init_13529 bm_init 2 13529 NULL
118423 +llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
118424 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
118425 +hash_net4_expire_13559 hash_net4_expire 4 13559 NULL
118426 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
118427 +cache_write_13589 cache_write 3 13589 NULL
118428 +Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
118429 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
118430 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
118431 +packet_snd_13634 packet_snd 3 13634 NULL
118432 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
118433 +cache_downcall_13666 cache_downcall 3 13666 NULL
118434 +usb_get_string_13693 usb_get_string 0 13693 NULL
118435 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
118436 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
118437 +udf_direct_IO_13765 udf_direct_IO 4 13765 NULL
118438 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
118439 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
118440 +alloc_indirect_13783 alloc_indirect 1 13783 NULL
118441 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
118442 +random_read_13815 random_read 3 13815 NULL
118443 +mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
118444 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
118445 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
118446 +qce_ahash_hmac_setkey_13837 qce_ahash_hmac_setkey 3 13837 NULL
118447 +enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
118448 +evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
118449 +compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
118450 +qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL
118451 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
118452 +cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
118453 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
118454 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
118455 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
118456 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
118457 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
118458 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
118459 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
118460 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
118461 +qcam_read_13977 qcam_read 3 13977 NULL
118462 +dsp_read_13980 dsp_read 2 13980 NULL
118463 +dvb_demux_read_13981 dvb_demux_read 3 13981 NULL
118464 +sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
118465 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
118466 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
118467 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
118468 +pci_add_ext_cap_save_buffer_14032 pci_add_ext_cap_save_buffer 3 14032 NULL
118469 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
118470 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
118471 +ovs_nla_alloc_flow_actions_14056 ovs_nla_alloc_flow_actions 1 14056 NULL
118472 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
118473 +lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
118474 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
118475 +ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
118476 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
118477 +em_canid_change_14150 em_canid_change 3 14150 NULL
118478 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
118479 +midi_alloc_ep_req_14159 midi_alloc_ep_req 2 14159 NULL
118480 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
118481 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
118482 +datafab_read_data_14186 datafab_read_data 4 14186 NULL
118483 +hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
118484 +alloc_async_14208 alloc_async 1 14208 NULL
118485 +ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
118486 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
118487 +dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
118488 +btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL
118489 +ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
118490 +rr_status_14293 rr_status 5 14293 NULL
118491 +read_default_ldt_14302 read_default_ldt 2 14302 NULL nohasharray
118492 +lustre_pack_reply_flags_14302 lustre_pack_reply_flags 2 14302 &read_default_ldt_14302
118493 +oo_objects_14319 oo_objects 0 14319 NULL
118494 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
118495 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
118496 +hash_ipportnet4_expire_14354 hash_ipportnet4_expire 4 14354 NULL
118497 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
118498 +lowpan_read_14369 lowpan_read 3 14369 NULL
118499 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
118500 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
118501 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
118502 +get_kcore_size_14425 get_kcore_size 0 14425 NULL
118503 +_iwl_dbgfs_sram_write_14439 _iwl_dbgfs_sram_write 3 14439 NULL
118504 +block_size_14443 block_size 0 14443 NULL
118505 +lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
118506 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
118507 +ath10k_write_htt_stats_mask_14458 ath10k_write_htt_stats_mask 3 14458 NULL
118508 +lustre_msg_size_v2_14470 lustre_msg_size_v2 0-1 14470 NULL
118509 +dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
118510 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
118511 +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
118512 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
118513 +dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 NULL nohasharray
118514 +ep0_write_14536 ep0_write 3 14536 &dataflash_read_user_otp_14536
118515 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
118516 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
118517 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
118518 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
118519 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
118520 +ufshcd_compose_dev_cmd_14626 ufshcd_compose_dev_cmd 0 14626 NULL
118521 +dbJoin_14644 dbJoin 0 14644 NULL
118522 +profile_replace_14652 profile_replace 3 14652 NULL
118523 +usnic_vnic_dump_14662 usnic_vnic_dump 3 14662 NULL
118524 +min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
118525 +nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
118526 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
118527 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
118528 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
118529 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
118530 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
118531 +rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
118532 +vfd_write_14717 vfd_write 3 14717 NULL
118533 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
118534 +raid1_resize_14740 raid1_resize 2 14740 NULL
118535 +i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
118536 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
118537 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
118538 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
118539 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
118540 +keys_proc_write_14792 keys_proc_write 3 14792 NULL
118541 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
118542 +__kfifo_in_14797 __kfifo_in 3-0 14797 NULL nohasharray
118543 +ttm_page_pool_free_14797 ttm_page_pool_free 2-0 14797 &__kfifo_in_14797
118544 +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
118545 +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
118546 +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
118547 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
118548 +lcd_write_14857 lcd_write 3 14857 NULL
118549 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
118550 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
118551 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
118552 +netlbl_catmap_walk_14902 netlbl_catmap_walk 0-2 14902 NULL
118553 +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
118554 +qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923 nohasharray
118555 +ptlrpc_prep_req_pool_14923 ptlrpc_prep_req_pool 4 14923 &qp_memcpy_to_queue_iov_14923
118556 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
118557 +queue_cnt_14951 queue_cnt 0 14951 NULL
118558 +unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
118559 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
118560 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
118561 +setkey_14987 setkey 3 14987 NULL nohasharray
118562 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
118563 +sctp_setsockopt_default_sndinfo_15011 sctp_setsockopt_default_sndinfo 3 15011 NULL
118564 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
118565 +read_file_node_aggr_15040 read_file_node_aggr 3 15040 NULL
118566 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
118567 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
118568 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
118569 +ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
118570 +pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
118571 +smscore_load_firmware_family2_15086 smscore_load_firmware_family2 3 15086 NULL
118572 +compat_SyS_pwritev_15118 compat_SyS_pwritev 3 15118 NULL
118573 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
118574 +start_port_15124 start_port 0 15124 NULL
118575 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
118576 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
118577 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
118578 +mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
118579 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
118580 +iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
118581 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
118582 +wacom_led_putimage_15264 wacom_led_putimage 4 15264 NULL
118583 +simple_strtol_15273 simple_strtol 0 15273 NULL
118584 +fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
118585 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
118586 +ioread16_15342 ioread16 0 15342 NULL
118587 +ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
118588 +blkdev_readpages_15357 blkdev_readpages 4 15357 NULL
118589 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
118590 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
118591 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
118592 +alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
118593 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
118594 +get_modalias_15406 get_modalias 2 15406 NULL
118595 +__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
118596 +tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
118597 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
118598 +memweight_15450 memweight 2 15450 NULL
118599 +__clone_and_map_data_bio_15498 __clone_and_map_data_bio 3 15498 NULL
118600 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
118601 +ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
118602 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
118603 +xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
118604 +persistent_status_15574 persistent_status 4 15574 NULL
118605 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
118606 +vme_user_write_15587 vme_user_write 3 15587 NULL
118607 +compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
118608 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
118609 +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
118610 +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642 nohasharray
118611 +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &pipeline_hs_tx_stat_fifo_int_read_15642
118612 +joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
118613 +fs_path_add_15648 fs_path_add 3 15648 NULL
118614 +xsd_read_15653 xsd_read 3 15653 NULL
118615 +unix_bind_15668 unix_bind 3 15668 NULL
118616 +dm_read_15674 dm_read 3 15674 NULL nohasharray
118617 +SyS_connect_15674 SyS_connect 3 15674 &dm_read_15674
118618 +uinput_str_to_user_15695 uinput_str_to_user 3 15695 NULL
118619 +__sk_migrate_realloc_15709 __sk_migrate_realloc 3 15709 NULL
118620 +tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
118621 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
118622 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
118623 +gnttab_expand_15817 gnttab_expand 1 15817 NULL nohasharray
118624 +nameseq_list_15817 nameseq_list 3-0 15817 &gnttab_expand_15817
118625 +afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
118626 +table_size_15851 table_size 0-1-2 15851 NULL
118627 +write_file_tx99_15856 write_file_tx99 3 15856 NULL
118628 +media_entity_init_15870 media_entity_init 2-4 15870 NULL
118629 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
118630 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
118631 +power_read_15939 power_read 3 15939 NULL
118632 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
118633 +snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
118634 +memblock_virt_alloc_try_nid_15954 memblock_virt_alloc_try_nid 1 15954 NULL
118635 +smk_read_ptrace_15974 smk_read_ptrace 3 15974 NULL
118636 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
118637 +dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
118638 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
118639 +SYSC_kexec_file_load_16058 SYSC_kexec_file_load 3 16058 NULL
118640 +si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
118641 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
118642 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 NULL nohasharray
118643 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 &isr_hw_pm_mode_changes_read_16110
118644 +udelay_test_write_16111 udelay_test_write 3 16111 NULL
118645 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
118646 +fsm_init_16134 fsm_init 2 16134 NULL
118647 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
118648 +optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
118649 +mapping_level_16188 mapping_level 2-0 16188 NULL
118650 +i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
118651 +ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
118652 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
118653 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
118654 +create_table_16213 create_table 2 16213 NULL
118655 +ath9k_hw_ar9287_dump_eeprom_16224 ath9k_hw_ar9287_dump_eeprom 5-4 16224 NULL
118656 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
118657 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
118658 +lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
118659 +i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL
118660 +il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
118661 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
118662 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
118663 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
118664 +nand_bch_init_16280 nand_bch_init 3-2 16280 NULL nohasharray
118665 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 &nand_bch_init_16280
118666 +account_16283 account 0-4-2 16283 NULL nohasharray
118667 +mirror_status_16283 mirror_status 5 16283 &account_16283
118668 +jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
118669 +mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
118670 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
118671 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
118672 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
118673 +kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
118674 +sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
118675 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
118676 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
118677 +nv50_pioc_create_16389 nv50_pioc_create 5 16389 NULL
118678 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
118679 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
118680 +__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
118681 +cmdline_store_16442 cmdline_store 4 16442 NULL
118682 +copy_from_user_bvec_16447 copy_from_user_bvec 0-4 16447 NULL
118683 +btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 4 16452 NULL
118684 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
118685 +req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
118686 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
118687 +KEY_OFFSET_16504 KEY_OFFSET 0 16504 NULL
118688 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
118689 +raid10_resize_16537 raid10_resize 2 16537 NULL
118690 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
118691 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
118692 +lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0-1 16589 NULL
118693 +compat_SyS_migrate_pages_16618 compat_SyS_migrate_pages 2 16618 NULL
118694 +rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
118695 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
118696 +__wa_populate_dto_urb_16699 __wa_populate_dto_urb 3-4 16699 NULL
118697 +_iwl_dbgfs_bt_force_ant_write_16701 _iwl_dbgfs_bt_force_ant_write 3 16701 NULL
118698 +__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
118699 +__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
118700 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
118701 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
118702 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
118703 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
118704 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
118705 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
118706 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
118707 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
118708 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
118709 +st_write_16874 st_write 3 16874 NULL
118710 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
118711 +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
118712 +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
118713 +_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
118714 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
118715 +svcxdr_dupstr_16963 svcxdr_dupstr 3 16963 NULL
118716 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
118717 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
118718 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
118719 +C_SYSC_keyctl_17041 C_SYSC_keyctl 4 17041 NULL
118720 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
118721 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
118722 +sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
118723 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
118724 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
118725 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
118726 +entry_length_17093 entry_length 0 17093 NULL
118727 +write_mem_17114 write_mem 3 17114 NULL
118728 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
118729 +do_blockdev_direct_IO_17143 do_blockdev_direct_IO 0-6 17143 NULL
118730 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
118731 +jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
118732 +mxt_upload_cfg_mem_17157 mxt_upload_cfg_mem 4 17157 NULL
118733 +sep_read_17161 sep_read 3 17161 NULL
118734 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
118735 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
118736 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
118737 +access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
118738 +iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
118739 +driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
118740 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
118741 +sync_request_17208 sync_request 2 17208 NULL
118742 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
118743 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
118744 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
118745 +alloc_ep_17269 alloc_ep 1 17269 NULL
118746 +pg_read_17276 pg_read 3 17276 NULL
118747 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
118748 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
118749 +neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
118750 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
118751 +__ptlrpc_request_bufs_pack_17298 __ptlrpc_request_bufs_pack 4 17298 NULL
118752 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
118753 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
118754 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
118755 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
118756 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
118757 +mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
118758 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
118759 +copy_from_iter_17433 copy_from_iter 2 17433 NULL
118760 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
118761 +libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
118762 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
118763 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
118764 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
118765 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
118766 +copy_page_from_iter_17512 copy_page_from_iter 3-0 17512 NULL
118767 +reiserfs_direct_IO_17513 reiserfs_direct_IO 4 17513 NULL
118768 +lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
118769 +qp_free_res_17541 qp_free_res 5 17541 NULL
118770 +__copy_to_user_17551 __copy_to_user 0-3 17551 NULL
118771 +copy_from_user_17559 copy_from_user 3-0 17559 NULL
118772 +hash_netport4_expire_17573 hash_netport4_expire 4 17573 NULL
118773 +wil_write_file_rxon_17581 wil_write_file_rxon 3 17581 NULL
118774 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
118775 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
118776 +osst_execute_17607 osst_execute 7-6 17607 NULL
118777 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
118778 +dma_map_page_17628 dma_map_page 0 17628 NULL
118779 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
118780 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
118781 +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL
118782 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
118783 +venus_rename_17707 venus_rename 4-5 17707 NULL
118784 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
118785 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
118786 +nv92_gpio_intr_mask_17773 nv92_gpio_intr_mask 4-3 17773 NULL
118787 +shrink_slab_node_17794 shrink_slab_node 3 17794 NULL
118788 +lpuart_copy_rx_to_tty_17801 lpuart_copy_rx_to_tty 3 17801 NULL
118789 +_iwl_dbgfs_set_nic_temperature_write_17804 _iwl_dbgfs_set_nic_temperature_write 3 17804 NULL
118790 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
118791 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
118792 +em28xx_audio_ep_packet_size_17844 em28xx_audio_ep_packet_size 0 17844 NULL
118793 +dm_stats_message_17863 dm_stats_message 5 17863 NULL
118794 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
118795 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
118796 +virtio_cread32_17873 virtio_cread32 0 17873 NULL
118797 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
118798 +orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL nohasharray
118799 +i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
118800 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
118801 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
118802 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
118803 +dev_pm_opp_get_opp_count_17911 dev_pm_opp_get_opp_count 0 17911 NULL
118804 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
118805 +tipc_port_iovec_rcv_17921 tipc_port_iovec_rcv 3 17921 NULL
118806 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
118807 +__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
118808 +beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
118809 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
118810 +ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
118811 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
118812 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
118813 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
118814 +o2hb_highest_node_18034 o2hb_highest_node 0 18034 NULL
118815 +cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
118816 +__btrfs_drop_extents_18049 __btrfs_drop_extents 5 18049 NULL
118817 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
118818 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
118819 +fpregs_get_18066 fpregs_get 4 18066 NULL
118820 +kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
118821 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
118822 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
118823 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
118824 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
118825 +svc_getnl_18120 svc_getnl 0 18120 NULL
118826 +paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
118827 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
118828 +enable_ints_write_18170 enable_ints_write 3 18170 NULL
118829 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
118830 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
118831 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
118832 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
118833 +fill_ext_prop_18233 fill_ext_prop 0 18233 NULL
118834 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
118835 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
118836 +rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
118837 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
118838 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
118839 +alloc_ring_18278 alloc_ring 2-4 18278 NULL
118840 +bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray
118841 +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281
118842 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
118843 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
118844 +um_idi_write_18293 um_idi_write 3 18293 NULL
118845 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
118846 +lustre_msg_hdr_size_18308 lustre_msg_hdr_size 2 18308 NULL
118847 +class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
118848 +csio_mem_read_18319 csio_mem_read 3 18319 NULL
118849 +alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
118850 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
118851 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
118852 +copy_page_to_iter_18345 copy_page_to_iter 0-3 18345 NULL
118853 +lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
118854 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
118855 +SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
118856 +ep_io_18367 ep_io 0 18367 NULL
118857 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
118858 +__ceph_getxattr_18386 __ceph_getxattr 0 18386 NULL
118859 +ci_role_write_18388 ci_role_write 3 18388 NULL
118860 +hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
118861 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 NULL
118862 +nvif_device_init_18418 nvif_device_init 6 18418 NULL
118863 +memblock_virt_alloc_node_nopanic_18431 memblock_virt_alloc_node_nopanic 1 18431 NULL
118864 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 NULL
118865 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
118866 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
118867 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
118868 +pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
118869 +mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
118870 +udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
118871 +btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL
118872 +__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
118873 +snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
118874 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
118875 +nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
118876 +tipc_send2port_18531 tipc_send2port 4 18531 NULL
118877 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
118878 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
118879 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
118880 +debug_output_18575 debug_output 3 18575 NULL
118881 +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
118882 +slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
118883 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
118884 +from_buffer_18625 from_buffer 3 18625 NULL
118885 +kmalloc_kernel_18641 kmalloc_kernel 1 18641 NULL
118886 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
118887 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
118888 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
118889 +fnic_stats_debugfs_read_18688 fnic_stats_debugfs_read 3 18688 NULL
118890 +echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
118891 +iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
118892 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
118893 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
118894 +nfs4_init_callback_netid_18717 nfs4_init_callback_netid 3 18717 NULL
118895 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
118896 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
118897 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
118898 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
118899 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
118900 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
118901 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
118902 +fence_context_alloc_18792 fence_context_alloc 1 18792 NULL
118903 +dm_stats_print_18815 dm_stats_print 7 18815 NULL
118904 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
118905 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
118906 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
118907 +ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
118908 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
118909 +devm_mdiobus_alloc_size_18902 devm_mdiobus_alloc_size 2 18902 NULL
118910 +tracing_thresh_write_18909 tracing_thresh_write 3 18909 NULL
118911 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
118912 +xfs_buf_read_uncached_18922 xfs_buf_read_uncached 3 18922 NULL
118913 +ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
118914 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
118915 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
118916 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
118917 +huge_page_size_19008 huge_page_size 0 19008 NULL
118918 +hash_netport6_expire_19013 hash_netport6_expire 4 19013 NULL
118919 +sysfs_create_dir_ns_19033 sysfs_create_dir_ns 0 19033 NULL
118920 +revalidate_19043 revalidate 2 19043 NULL
118921 +afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
118922 +osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
118923 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
118924 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
118925 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
118926 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
118927 +skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
118928 +cma_bitmap_maxno_19135 cma_bitmap_maxno 0 19135 NULL
118929 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
118930 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
118931 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
118932 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
118933 +read_extent_buffer_to_user_19189 read_extent_buffer_to_user 4-3 19189 NULL
118934 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
118935 +__copy_to_user_inatomic_19214 __copy_to_user_inatomic 0-3 19214 NULL
118936 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
118937 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
118938 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
118939 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
118940 +ucma_query_19260 ucma_query 4 19260 NULL
118941 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
118942 +batadv_tt_save_orig_buffer_19288 batadv_tt_save_orig_buffer 4 19288 NULL nohasharray
118943 +cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 &batadv_tt_save_orig_buffer_19288
118944 +qc_capture_19298 qc_capture 3 19298 NULL
118945 +ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
118946 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
118947 +debug_read_19322 debug_read 3 19322 NULL
118948 +lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 NULL nohasharray
118949 +cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 &lbs_host_sleep_write_19332
118950 +closure_sub_19359 closure_sub 2 19359 NULL
118951 +firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
118952 +read_zero_19366 read_zero 3 19366 NULL
118953 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
118954 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
118955 +pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
118956 +hid_hw_raw_request_19408 hid_hw_raw_request 0 19408 NULL
118957 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
118958 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
118959 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
118960 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
118961 +gp2ap020a00f_get_thresh_reg_19468 gp2ap020a00f_get_thresh_reg 0 19468 NULL
118962 +sky2_read16_19475 sky2_read16 0 19475 NULL
118963 +__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
118964 +kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
118965 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
118966 +batadv_tvlv_container_register_19520 batadv_tvlv_container_register 5 19520 NULL
118967 +ttm_dma_page_pool_free_19527 ttm_dma_page_pool_free 2-0 19527 NULL
118968 +cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL
118969 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
118970 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
118971 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
118972 +nfsd_read_19568 nfsd_read 5 19568 NULL
118973 +ieee80211_key_alloc_19575 ieee80211_key_alloc 3 19575 NULL
118974 +bm_status_read_19583 bm_status_read 3 19583 NULL
118975 +load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
118976 +drbg_sec_strength_19604 drbg_sec_strength 0 19604 NULL
118977 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
118978 +parser_init_19651 parser_init 2 19651 NULL
118979 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
118980 +memblock_virt_alloc_low_nopanic_19714 memblock_virt_alloc_low_nopanic 1 19714 NULL
118981 +read_reg_19723 read_reg 0 19723 NULL
118982 +wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
118983 +memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
118984 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
118985 +p9_client_read_19750 p9_client_read 5-0 19750 NULL
118986 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
118987 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
118988 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
118989 +readhscx_19769 readhscx 0 19769 NULL
118990 +ath10k_write_htt_max_amsdu_ampdu_19820 ath10k_write_htt_max_amsdu_ampdu 3 19820 NULL
118991 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
118992 +vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
118993 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
118994 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
118995 +__nla_put_19857 __nla_put 3 19857 NULL
118996 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
118997 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
118998 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
118999 +mangle_name_19923 mangle_name 0 19923 NULL
119000 +tipc_sk_show_19928 tipc_sk_show 3-0 19928 NULL
119001 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
119002 +guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
119003 +azx_get_pos_lpib_19933 azx_get_pos_lpib 0 19933 NULL
119004 +v4l2_ctrl_new_19942 v4l2_ctrl_new 8-12 19942 NULL
119005 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
119006 +cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
119007 +ll_xattr_cache_list_19954 ll_xattr_cache_list 0 19954 NULL
119008 +get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
119009 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
119010 +rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL nohasharray
119011 +i40e_reserve_msix_vectors_19989 i40e_reserve_msix_vectors 2 19989 &rtw_set_wps_probe_resp_19989
119012 +lustre_pack_request_19992 lustre_pack_request 3 19992 NULL
119013 +find_overflow_devnum_19995 find_overflow_devnum 0 19995 NULL
119014 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
119015 +lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL nohasharray
119016 +event_trigger_write_20009 event_trigger_write 3 20009 &lov_stripe_md_size_20009
119017 +tree_mod_log_eb_move_20011 tree_mod_log_eb_move 5 20011 NULL
119018 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
119019 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
119020 +iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 0-4 20067 NULL
119021 +target_message_20072 target_message 2 20072 NULL
119022 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
119023 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
119024 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
119025 +team_options_register_20091 team_options_register 3 20091 NULL
119026 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
119027 +root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
119028 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
119029 +ext4_ext_direct_IO_20165 ext4_ext_direct_IO 4 20165 NULL
119030 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
119031 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
119032 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
119033 +crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
119034 +pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
119035 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
119036 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
119037 +btrfs_header_nritems_20296 btrfs_header_nritems 0 20296 NULL
119038 +r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
119039 +dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
119040 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
119041 +vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
119042 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
119043 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
119044 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
119045 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
119046 +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
119047 +SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 NULL nohasharray
119048 +__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399
119049 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
119050 +read_buf_20469 read_buf 2 20469 NULL
119051 +bio_trim_20472 bio_trim 2 20472 NULL
119052 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
119053 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
119054 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
119055 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
119056 +scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
119057 +venus_create_20555 venus_create 4 20555 NULL
119058 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
119059 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
119060 +kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
119061 +set_secure_conn_20596 set_secure_conn 4 20596 NULL
119062 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
119063 +lirc_write_20604 lirc_write 3 20604 NULL
119064 +qib_qsfp_write_20614 qib_qsfp_write 0-4-2 20614 NULL
119065 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
119066 +get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
119067 +kfifo_copy_to_user_20646 kfifo_copy_to_user 3-4 20646 NULL
119068 +cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
119069 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
119070 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
119071 +snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
119072 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
119073 +cpumask_size_20683 cpumask_size 0 20683 NULL
119074 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
119075 +xpcs_reg_addr_write_20694 xpcs_reg_addr_write 3 20694 NULL
119076 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
119077 +__maestro_read_20700 __maestro_read 0 20700 NULL
119078 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
119079 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
119080 +hfs_direct_IO_20714 hfs_direct_IO 4 20714 NULL
119081 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
119082 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
119083 +fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
119084 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
119085 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
119086 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
119087 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
119088 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
119089 +edid_write_20797 edid_write 3 20797 NULL
119090 +lowpan_write_20800 lowpan_write 3 20800 NULL
119091 +strndup_user_20819 strndup_user 2 20819 NULL
119092 +tipc_msg_build_20825 tipc_msg_build 3 20825 NULL
119093 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
119094 +uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
119095 +p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
119096 +nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
119097 +get_name_20855 get_name 4 20855 NULL
119098 +iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
119099 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
119100 +srq_free_res_20868 srq_free_res 5 20868 NULL
119101 +cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
119102 +req_capsule_filled_sizes_20888 req_capsule_filled_sizes 0 20888 NULL
119103 +rb_simple_write_20890 rb_simple_write 3 20890 NULL
119104 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
119105 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
119106 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
119107 +lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
119108 +htable_bits_20933 htable_bits 0 20933 NULL
119109 +cfg80211_rx_assoc_resp_20934 cfg80211_rx_assoc_resp 4 20934 NULL
119110 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
119111 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
119112 +rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
119113 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
119114 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
119115 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
119116 +qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
119117 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
119118 +arch_gnttab_init_21030 arch_gnttab_init 1 21030 NULL
119119 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
119120 +srp_change_queue_depth_21038 srp_change_queue_depth 2 21038 NULL
119121 +fsl_edma_prep_dma_cyclic_21042 fsl_edma_prep_dma_cyclic 4-3 21042 NULL
119122 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
119123 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
119124 +qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
119125 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
119126 +bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
119127 +multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
119128 +rate_control_pid_events_read_21099 rate_control_pid_events_read 3 21099 NULL
119129 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
119130 +_efx_mcdi_rpc_async_21119 _efx_mcdi_rpc_async 4-5 21119 NULL
119131 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
119132 +mei_dbgfs_read_active_21172 mei_dbgfs_read_active 3 21172 NULL
119133 +bioset_create_nobvec_21180 bioset_create_nobvec 1 21180 NULL
119134 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
119135 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
119136 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
119137 +get_numpages_21227 get_numpages 0-1-2 21227 NULL
119138 +input_ff_create_21240 input_ff_create 2 21240 NULL
119139 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
119140 +fru_length_21257 fru_length 0 21257 NULL
119141 +rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
119142 +ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
119143 +drm_universal_plane_init_21296 drm_universal_plane_init 6 21296 NULL
119144 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
119145 +add_res_range_21310 add_res_range 4 21310 NULL
119146 +get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
119147 +ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
119148 +read_file_bool_bmps_21344 read_file_bool_bmps 3 21344 NULL
119149 +azx_get_delay_from_lpib_21348 azx_get_delay_from_lpib 3 21348 NULL
119150 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
119151 +allocate_cmdlines_buffer_21355 allocate_cmdlines_buffer 1 21355 NULL
119152 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
119153 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
119154 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
119155 +insert_ptr_21386 insert_ptr 6 21386 NULL
119156 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
119157 +snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
119158 +usnic_ib_dump_vf_hdr_21423 usnic_ib_dump_vf_hdr 3 21423 NULL
119159 +snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
119160 +tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
119161 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
119162 +nouveau_clock_create__21449 nouveau_clock_create_ 8 21449 NULL
119163 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
119164 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
119165 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
119166 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
119167 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
119168 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
119169 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
119170 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
119171 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
119172 +snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
119173 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
119174 +filemap_get_page_21606 filemap_get_page 2 21606 NULL
119175 +ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
119176 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
119177 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
119178 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
119179 +regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
119180 +rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL nohasharray
119181 +proc_maps_open_21687 proc_maps_open 4 21687 &rtllib_alloc_txb_21687
119182 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
119183 +unix_skb_len_21722 unix_skb_len 0 21722 NULL
119184 +lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
119185 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
119186 +usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
119187 +gen_pool_add_21776 gen_pool_add 3 21776 NULL
119188 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
119189 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
119190 +_iwl_dbgfs_sta_drain_write_21837 _iwl_dbgfs_sta_drain_write 3 21837 NULL
119191 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
119192 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
119193 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
119194 +msix_capability_init_21870 msix_capability_init 0 21870 NULL
119195 +sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
119196 +ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
119197 +__btrfs_direct_write_21894 __btrfs_direct_write 3 21894 NULL
119198 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL nohasharray
119199 +nvme_submit_sync_cmd_21911 nvme_submit_sync_cmd 0 21911 &dbAllocCtl_21911
119200 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
119201 +twl_i2c_write_u16_21953 twl_i2c_write_u16 3 21953 NULL
119202 +__build_xattrs_21979 __build_xattrs 0 21979 NULL
119203 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
119204 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 NULL nohasharray
119205 +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
119206 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
119207 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
119208 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
119209 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
119210 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
119211 +btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
119212 +mem_rw_22085 mem_rw 3 22085 NULL
119213 +kstrtos32_from_user_22087 kstrtos32_from_user 2 22087 NULL
119214 +rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
119215 +snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
119216 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
119217 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
119218 +nve0_aux_mask_22158 nve0_aux_mask 2 22158 NULL
119219 +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
119220 +rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
119221 +mem_write_22232 mem_write 3 22232 NULL
119222 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
119223 +prepare_to_wait_event_22247 prepare_to_wait_event 0 22247 NULL
119224 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
119225 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
119226 +add_res_tree_22263 add_res_tree 7 22263 NULL
119227 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
119228 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL nohasharray
119229 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 &__tun_chr_ioctl_22300
119230 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
119231 +lov_setstripe_22307 lov_setstripe 2 22307 NULL
119232 +udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
119233 +C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL
119234 +atomic_read_22342 atomic_read 0 22342 NULL
119235 +ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
119236 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
119237 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
119238 +alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
119239 +zoran_write_22404 zoran_write 3 22404 NULL
119240 +queue_reply_22416 queue_reply 3 22416 NULL
119241 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
119242 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
119243 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
119244 +ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
119245 +qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL nohasharray
119246 +video_write_22490 video_write 3 22490 &qib_user_sdma_alloc_header_22490
119247 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
119248 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
119249 +trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
119250 +ntb_setup_bwd_msix_22549 ntb_setup_bwd_msix 2 22549 NULL
119251 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
119252 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
119253 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
119254 +cfs_expr_list_values_22600 cfs_expr_list_values 0 22600 NULL
119255 +snapshot_read_22601 snapshot_read 3 22601 NULL
119256 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
119257 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
119258 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
119259 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
119260 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
119261 +compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
119262 +l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 NULL
119263 +bch_dump_read_22685 bch_dump_read 3 22685 NULL
119264 +reg_umr_22686 reg_umr 5 22686 NULL
119265 +SYSC_vmsplice_22697 SYSC_vmsplice 3 22697 NULL
119266 +nr_cpusets_22705 nr_cpusets 0 22705 NULL
119267 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
119268 +cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
119269 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
119270 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
119271 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
119272 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
119273 +print_frame_22769 print_frame 0 22769 NULL
119274 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
119275 +vnic_dev_get_res_count_22791 vnic_dev_get_res_count 0 22791 NULL
119276 +__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
119277 +create_attr_set_22861 create_attr_set 1 22861 NULL
119278 +hash_ip6_expire_22867 hash_ip6_expire 4 22867 NULL
119279 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
119280 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
119281 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
119282 +ion_handle_test_kernel_22900 ion_handle_test_kernel 4-3 22900 NULL nohasharray
119283 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 &ion_handle_test_kernel_22900
119284 +nfs4_acl_bytes_22915 nfs4_acl_bytes 0-1 22915 NULL
119285 +__set_xattr_22923 __set_xattr 0 22923 NULL
119286 +xstateregs_set_22932 xstateregs_set 4 22932 NULL
119287 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
119288 +alloc_sglist_22960 alloc_sglist 2-3 22960 NULL
119289 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
119290 +vme_get_size_22964 vme_get_size 0 22964 NULL
119291 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
119292 +cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
119293 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
119294 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
119295 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
119296 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
119297 +ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 6-7 23029 NULL
119298 +st_status_23032 st_status 5 23032 NULL
119299 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
119300 +comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
119301 +reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
119302 +unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
119303 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
119304 +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
119305 +raw_sendmsg_23078 raw_sendmsg 4 23078 NULL
119306 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
119307 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
119308 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
119309 +ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
119310 +dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
119311 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
119312 +bset_tree_bytes_23111 bset_tree_bytes 0 23111 NULL nohasharray
119313 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 &bset_tree_bytes_23111
119314 +__clear_user_23118 __clear_user 0-2 23118 NULL
119315 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
119316 +ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
119317 +read_file_ani_23161 read_file_ani 3 23161 NULL
119318 +usblp_write_23178 usblp_write 3 23178 NULL
119319 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
119320 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
119321 +tipc_sendmcast_23214 tipc_sendmcast 4 23214 NULL
119322 +mcryptd_alloc_instance_23221 mcryptd_alloc_instance 2-3 23221 NULL
119323 +nft_hash_tbl_alloc_23224 nft_hash_tbl_alloc 1 23224 NULL
119324 +tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
119325 +xlog_get_bp_23229 xlog_get_bp 2 23229 NULL nohasharray
119326 +__read_status_pci_23229 __read_status_pci 0 23229 &xlog_get_bp_23229
119327 +ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
119328 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
119329 +__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL
119330 +nv50_ram_create__23241 nv50_ram_create_ 4 23241 NULL
119331 +sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
119332 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
119333 +ec_i2c_count_message_23285 ec_i2c_count_message 0-2 23285 NULL
119334 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
119335 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
119336 +__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
119337 +page_readlink_23346 page_readlink 3 23346 NULL
119338 +kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
119339 +get_dst_timing_23358 get_dst_timing 0 23358 NULL
119340 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
119341 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
119342 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
119343 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
119344 +__ata_change_queue_depth_23484 __ata_change_queue_depth 3 23484 NULL
119345 +linear_conf_23485 linear_conf 2 23485 NULL
119346 +event_filter_read_23494 event_filter_read 3 23494 NULL
119347 +lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
119348 +devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
119349 +__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
119350 +hash_ipmark6_expire_23518 hash_ipmark6_expire 4 23518 NULL
119351 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
119352 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
119353 +btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
119354 +venus_symlink_23570 venus_symlink 6-4 23570 NULL
119355 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
119356 +xfpregs_get_23586 xfpregs_get 4 23586 NULL
119357 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
119358 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
119359 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
119360 +sInW_23663 sInW 0 23663 NULL
119361 +SyS_connect_23669 SyS_connect 3 23669 NULL
119362 +cx18_read_23699 cx18_read 3 23699 NULL
119363 +at_get_23708 at_get 0 23708 NULL
119364 +get_conn_info_23723 get_conn_info 4 23723 NULL
119365 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
119366 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
119367 +__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
119368 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
119369 +cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
119370 +mpt_free_res_23793 mpt_free_res 5 23793 NULL
119371 +map_write_23795 map_write 3 23795 NULL
119372 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
119373 +__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
119374 +lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
119375 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
119376 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
119377 +p54_init_common_23850 p54_init_common 1 23850 NULL
119378 +bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
119379 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
119380 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
119381 +tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
119382 +iov_iter_get_pages_alloc_23903 iov_iter_get_pages_alloc 3-0 23903 NULL
119383 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
119384 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
119385 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
119386 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
119387 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
119388 +kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
119389 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
119390 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
119391 +size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
119392 +sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
119393 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
119394 +xfs_zero_file_space_24000 xfs_zero_file_space 2-3 24000 NULL
119395 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
119396 +give_pages_24021 give_pages 3 24021 NULL
119397 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
119398 +hmac_setkey_24043 hmac_setkey 3 24043 NULL
119399 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
119400 +iwl_dbgfs_low_latency_read_24062 iwl_dbgfs_low_latency_read 3 24062 NULL
119401 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
119402 +C_SYSC_process_vm_writev_24102 C_SYSC_process_vm_writev 3-5 24102 NULL
119403 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
119404 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
119405 +lov_brw_24122 lov_brw 4 24122 NULL
119406 +mpu401_read_24126 mpu401_read 3 24126 NULL
119407 +_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
119408 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
119409 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
119410 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
119411 +adu_read_24177 adu_read 3 24177 NULL
119412 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
119413 +nv94_aux_24197 nv94_aux 3-6 24197 NULL
119414 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
119415 +efx_vf_size_24213 efx_vf_size 0 24213 NULL
119416 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
119417 +pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
119418 +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
119419 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
119420 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
119421 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
119422 +calculate_sizes_24273 calculate_sizes 2 24273 NULL
119423 +thin_status_24278 thin_status 5 24278 NULL
119424 +msg_size_24288 msg_size 0 24288 NULL
119425 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
119426 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
119427 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
119428 +C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL
119429 +kzalloc_node_24352 kzalloc_node 1 24352 NULL
119430 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
119431 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
119432 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
119433 +igetword_24373 igetword 0 24373 NULL
119434 +mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
119435 +osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
119436 +getxattr_24398 getxattr 4 24398 NULL nohasharray
119437 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 &getxattr_24398
119438 +populate_msi_sysfs_24399 populate_msi_sysfs 0 24399 NULL
119439 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
119440 +nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
119441 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
119442 +xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
119443 +ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
119444 +copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
119445 +ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
119446 +smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
119447 +rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
119448 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
119449 +lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
119450 +skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL
119451 +dut_mode_read_24489 dut_mode_read 3 24489 NULL
119452 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
119453 +pd_video_read_24510 pd_video_read 3 24510 NULL
119454 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
119455 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
119456 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
119457 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
119458 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
119459 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
119460 +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
119461 +lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605 nohasharray
119462 +i915_error_state_buf_init_24605 i915_error_state_buf_init 3 24605 &lov_alloc_memmd_24605
119463 +SyS_poll_24620 SyS_poll 2 24620 NULL
119464 +context_alloc_24645 context_alloc 3 24645 NULL
119465 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
119466 +datafab_write_data_24696 datafab_write_data 4 24696 NULL
119467 +intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
119468 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
119469 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
119470 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
119471 +ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL
119472 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
119473 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
119474 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
119475 +cache_read_24790 cache_read 3 24790 NULL
119476 +user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
119477 +kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
119478 +ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
119479 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
119480 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
119481 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
119482 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
119483 +queues_read_24877 queues_read 3 24877 NULL
119484 +iov_iter_npages_bvec_24905 iov_iter_npages_bvec 0-2 24905 NULL
119485 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
119486 +xpcs_reg_value_write_24922 xpcs_reg_value_write 3 24922 NULL
119487 +v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL
119488 +ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
119489 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
119490 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
119491 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL nohasharray
119492 +ath10k_fw_crash_dump_read_24987 ath10k_fw_crash_dump_read 3 24987 &llc_ui_sendmsg_24987
119493 +info_debugfs_read_helper_24988 info_debugfs_read_helper 0 24988 NULL
119494 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
119495 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
119496 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
119497 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
119498 +load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
119499 +btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
119500 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
119501 +ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
119502 +do_add_page_to_bio_25071 do_add_page_to_bio 2 25071 NULL
119503 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
119504 +ima_appraise_measurement_25093 ima_appraise_measurement 6 25093 NULL
119505 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
119506 +ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
119507 +kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
119508 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
119509 +security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
119510 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
119511 +stripe_status_25259 stripe_status 5 25259 NULL
119512 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
119513 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
119514 +vfs_writev_25278 vfs_writev 3 25278 NULL
119515 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
119516 +cx25821_write_frame_25315 cx25821_write_frame 3 25315 NULL
119517 +ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
119518 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
119519 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
119520 +unix_mkname_25368 unix_mkname 0-2 25368 NULL
119521 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
119522 +vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
119523 +mcp795_rtcc_read_25415 mcp795_rtcc_read 4 25415 NULL
119524 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
119525 +ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
119526 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
119527 +ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
119528 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
119529 +mxt_obj_size_25510 mxt_obj_size 0 25510 NULL
119530 +sb_permission_25523 sb_permission 0 25523 NULL
119531 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
119532 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
119533 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
119534 +ht_print_chan_25556 ht_print_chan 0-3-4 25556 NULL
119535 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
119536 +ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
119537 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
119538 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
119539 +befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
119540 +__get_user_pages_25628 __get_user_pages 0 25628 &befs_utf2nls_25628
119541 +__direct_map_25647 __direct_map 6-5 25647 NULL
119542 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
119543 +lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
119544 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
119545 +prom_early_alloc_25692 prom_early_alloc 1 25692 NULL
119546 +rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
119547 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
119548 +__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 NULL nohasharray
119549 +sel_write_context_25726 sel_write_context 3 25726 &__alloc_bootmem_low_node_25726
119550 +xgbe_common_read_25743 xgbe_common_read 2 25743 NULL
119551 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
119552 +event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
119553 +sg_read_25799 sg_read 3 25799 NULL
119554 +system_enable_read_25815 system_enable_read 3 25815 NULL
119555 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
119556 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
119557 +parport_read_25855 parport_read 0 25855 NULL
119558 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
119559 +key_attr_size_25865 key_attr_size 0 25865 NULL
119560 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
119561 +run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
119562 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
119563 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
119564 +nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
119565 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
119566 +rcname_read_25919 rcname_read 3 25919 NULL
119567 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
119568 +key_flags_read_25931 key_flags_read 3 25931 NULL
119569 +copy_play_buf_25932 copy_play_buf 3 25932 NULL
119570 +flush_25957 flush 2 25957 NULL
119571 +_regmap_multi_reg_write_25967 _regmap_multi_reg_write 3 25967 NULL
119572 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
119573 +lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
119574 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
119575 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
119576 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
119577 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
119578 +pri_wm_latency_write_26063 pri_wm_latency_write 3 26063 NULL
119579 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
119580 +i8042_pnp_id_to_string_26108 i8042_pnp_id_to_string 3 26108 NULL
119581 +read_sb_page_26119 read_sb_page 5 26119 NULL
119582 +ath9k_hw_name_26146 ath9k_hw_name 3 26146 NULL
119583 +copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
119584 +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
119585 +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
119586 +disk_devt_26180 disk_devt 0 26180 NULL
119587 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
119588 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
119589 +mce_write_26201 mce_write 3 26201 NULL
119590 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
119591 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
119592 +rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
119593 +nlm_end_grace_read_26234 nlm_end_grace_read 3 26234 NULL
119594 +genwqe_ffdc_buff_size_26263 genwqe_ffdc_buff_size 0 26263 NULL
119595 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
119596 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
119597 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL
119598 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
119599 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
119600 +snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
119601 +ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 6-3 26357 NULL
119602 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
119603 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
119604 +ntty_write_26404 ntty_write 3 26404 NULL
119605 +firmware_store_26408 firmware_store 4 26408 NULL
119606 +pagemap_read_26441 pagemap_read 3 26441 NULL
119607 +tower_read_26461 tower_read 3 26461 NULL nohasharray
119608 +enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461
119609 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
119610 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
119611 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL nohasharray
119612 +msi_verify_entries_26490 msi_verify_entries 0 26490 &dvb_ca_en50221_io_ioctl_26490
119613 +read_vmcore_26501 read_vmcore 3 26501 NULL
119614 +uhid_char_write_26502 uhid_char_write 3 26502 NULL
119615 +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
119616 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
119617 +alloc_ep_req_26521 alloc_ep_req 3-2 26521 NULL
119618 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
119619 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
119620 +dio_new_bio_26562 dio_new_bio 0 26562 NULL
119621 +rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
119622 +kernfs_name_locked_26617 kernfs_name_locked 3 26617 NULL
119623 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
119624 +amdtp_stream_get_max_payload_26645 amdtp_stream_get_max_payload 0 26645 NULL
119625 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL
119626 +nouveau_volt_create__26654 nouveau_volt_create_ 4 26654 NULL
119627 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
119628 +flowinfo_read_26683 flowinfo_read 3 26683 NULL
119629 +sysfs_add_file_26716 sysfs_add_file 0 26716 NULL
119630 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
119631 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
119632 +bos_desc_26752 bos_desc 0 26752 NULL
119633 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
119634 +dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
119635 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
119636 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
119637 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
119638 +smk_write_load_26829 smk_write_load 3 26829 NULL
119639 +snd_pcm_action_mutex_26832 snd_pcm_action_mutex 0 26832 NULL
119640 +scnprint_id_26842 scnprint_id 3-0 26842 NULL
119641 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
119642 +ss_alloc_ep_req_26848 ss_alloc_ep_req 2 26848 NULL
119643 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
119644 +ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
119645 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
119646 +skb_zerocopy_headlen_26910 skb_zerocopy_headlen 0 26910 NULL
119647 +hhf_zalloc_26912 hhf_zalloc 1 26912 NULL
119648 +cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
119649 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
119650 +brcmf_usb_dl_cmd_26931 brcmf_usb_dl_cmd 4 26931 NULL
119651 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
119652 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 NULL nohasharray
119653 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 &sctp_setsockopt_adaptation_layer_26935
119654 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
119655 +do_trimming_26952 do_trimming 3 26952 NULL nohasharray
119656 +extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952
119657 +do_direct_IO_26979 do_direct_IO 0 26979 NULL
119658 +lustre_msg_size_26995 lustre_msg_size 2 26995 NULL
119659 +sc16is7xx_port_read_27051 sc16is7xx_port_read 0 27051 NULL
119660 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
119661 +ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3 27064 NULL
119662 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
119663 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
119664 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
119665 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL nohasharray
119666 +ath9k_hw_4k_dump_eeprom_27089 ath9k_hw_4k_dump_eeprom 5-4 27089 &btmrvl_hscmd_write_27089
119667 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
119668 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
119669 +pms_capture_27142 pms_capture 4 27142 NULL
119670 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
119671 +wil_write_file_wmi_27150 wil_write_file_wmi 3 27150 NULL
119672 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
119673 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
119674 +write_kmem_27225 write_kmem 3 27225 NULL nohasharray
119675 +svcxdr_tmpalloc_27225 svcxdr_tmpalloc 2 27225 &write_kmem_27225
119676 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
119677 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
119678 +ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
119679 +comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
119680 +get_rx_fifo_content_27283 get_rx_fifo_content 0 27283 NULL
119681 +copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
119682 +virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
119683 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
119684 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
119685 +iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
119686 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
119687 +seq_read_27411 seq_read 3 27411 NULL
119688 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
119689 +ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
119690 +ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 3-4 27422 NULL
119691 +cypress_write_27423 cypress_write 4 27423 NULL
119692 +sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
119693 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
119694 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
119695 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
119696 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
119697 +garmin_read_process_27509 garmin_read_process 3 27509 NULL nohasharray
119698 +mcryptd_hash_setkey_27509 mcryptd_hash_setkey 3 27509 &garmin_read_process_27509
119699 +oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
119700 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
119701 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
119702 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
119703 +sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
119704 +libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
119705 +C_SYSC_mbind_27636 C_SYSC_mbind 5 27636 NULL
119706 +ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 NULL nohasharray
119707 +read_flush_procfs_27642 read_flush_procfs 3 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
119708 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642
119709 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
119710 +btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
119711 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
119712 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
119713 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
119714 +fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
119715 +evm_write_key_27715 evm_write_key 3 27715 NULL
119716 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
119717 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
119718 +load_scode_27738 load_scode 2 27738 NULL
119719 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
119720 +transport_init_session_tags_27776 transport_init_session_tags 1-2 27776 NULL
119721 +__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
119722 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
119723 +SyS_readv_27804 SyS_readv 3 27804 NULL
119724 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
119725 +hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
119726 +init_header_complete_27833 init_header_complete 0 27833 NULL
119727 +read_profile_27859 read_profile 3 27859 NULL
119728 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
119729 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
119730 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
119731 +i915_error_object_create_sized_27919 i915_error_object_create_sized 4 27919 NULL
119732 +check_mapped_name_27943 check_mapped_name 3 27943 NULL
119733 +bio_next_split_27961 bio_next_split 2 27961 NULL nohasharray
119734 +tracing_clock_write_27961 tracing_clock_write 3 27961 &bio_next_split_27961
119735 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
119736 +mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL nohasharray
119737 +device_register_27972 device_register 0 27972 &mic_rx_pkts_read_27972
119738 +compat_SyS_set_mempolicy_27975 compat_SyS_set_mempolicy 3 27975 NULL
119739 +pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
119740 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
119741 +seq_get_buf_28006 seq_get_buf 0 28006 NULL
119742 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
119743 +powercap_register_zone_28028 powercap_register_zone 6 28028 NULL
119744 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
119745 +cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
119746 +pool_status_28055 pool_status 5 28055 NULL
119747 +init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
119748 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
119749 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
119750 +acpi_gsb_i2c_write_bytes_28082 acpi_gsb_i2c_write_bytes 4 28082 NULL
119751 +mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
119752 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
119753 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
119754 +m25p80_read_reg_28132 m25p80_read_reg 4 28132 NULL
119755 +video_read_28148 video_read 3 28148 NULL
119756 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
119757 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
119758 +vread_28173 vread 0-3 28173 NULL
119759 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
119760 +counter_free_res_28187 counter_free_res 5 28187 NULL
119761 +read_disk_sb_28188 read_disk_sb 2 28188 NULL
119762 +nvkm_output_dp_create__28192 nvkm_output_dp_create_ 6 28192 NULL
119763 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
119764 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
119765 +line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
119766 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
119767 +usemap_size_28281 usemap_size 0 28281 NULL
119768 +inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
119769 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
119770 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
119771 +kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
119772 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
119773 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
119774 +xpcs_mmd_read_28331 xpcs_mmd_read 3 28331 NULL
119775 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
119776 +tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
119777 +snapshot_write_28351 snapshot_write 3 28351 NULL
119778 +xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
119779 +batadv_handle_tt_response_28370 batadv_handle_tt_response 4 28370 NULL
119780 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
119781 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
119782 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
119783 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
119784 +__videobuf_mmap_setup_28421 __videobuf_mmap_setup 0 28421 NULL
119785 +ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
119786 +hid_hw_output_report_28429 hid_hw_output_report 0 28429 NULL
119787 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
119788 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
119789 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
119790 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
119791 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
119792 +sh_irda_init_iobuf_28527 sh_irda_init_iobuf 2 28527 NULL nohasharray
119793 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 &sh_irda_init_iobuf_28527
119794 +early_init_dt_alloc_memory_arch_28528 early_init_dt_alloc_memory_arch 1 28528 NULL
119795 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
119796 +run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
119797 +aio_read_events_28545 aio_read_events 3 28545 &run_delalloc_range_28545 nohasharray
119798 +mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &aio_read_events_28545
119799 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
119800 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
119801 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
119802 +task_cgroup_path_28599 task_cgroup_path 3 28599 NULL
119803 +extract_entropy_28604 extract_entropy 5-3 28604 NULL
119804 +xgbe_common_write_28609 xgbe_common_write 2 28609 NULL
119805 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
119806 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
119807 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
119808 +qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
119809 +p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
119810 +iwl_dbgfs_nic_temp_read_28662 iwl_dbgfs_nic_temp_read 3 28662 NULL
119811 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
119812 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
119813 +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
119814 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
119815 +spi_execute_28736 spi_execute 5 28736 NULL
119816 +snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
119817 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
119818 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
119819 +nv50_dmac_create_28762 nv50_dmac_create 5 28762 NULL
119820 +rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
119821 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
119822 +sel_write_member_28800 sel_write_member 3 28800 NULL
119823 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
119824 +kernel_tree_alloc_28833 kernel_tree_alloc 1 28833 NULL
119825 +parser_init_byteStream_28841 parser_init_byteStream 2 28841 NULL
119826 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
119827 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
119828 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
119829 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
119830 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
119831 +iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
119832 +push_rx_28939 push_rx 3 28939 NULL
119833 +mxuport_prepare_write_buffer_28943 mxuport_prepare_write_buffer 3 28943 NULL
119834 +btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
119835 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
119836 +hash_net6_expire_28979 hash_net6_expire 4 28979 NULL
119837 +hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
119838 +bin_uuid_28999 bin_uuid 3 28999 NULL
119839 +fd_execute_rw_29004 fd_execute_rw 3 29004 NULL
119840 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
119841 +rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
119842 +btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
119843 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
119844 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
119845 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
119846 +iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
119847 +ccp_init_dm_workarea_29097 ccp_init_dm_workarea 3 29097 NULL
119848 +__compat_sys_preadv64_29103 __compat_sys_preadv64 3 29103 NULL
119849 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
119850 +snprintf_29125 snprintf 0 29125 NULL
119851 +iov_shorten_29130 iov_shorten 0 29130 NULL
119852 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
119853 +kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
119854 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
119855 +wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
119856 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
119857 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
119858 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
119859 +evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
119860 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
119861 +rbd_osd_req_create_29260 rbd_osd_req_create 3 29260 NULL
119862 +mwifiex_hscfg_write_29262 mwifiex_hscfg_write 3 29262 NULL
119863 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
119864 +ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
119865 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
119866 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
119867 +lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
119868 +kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
119869 +obd_proc_jobid_name_seq_write_29332 obd_proc_jobid_name_seq_write 3 29332 NULL
119870 +tun_put_user_29337 tun_put_user 5 29337 NULL
119871 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
119872 +l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
119873 +read_file_tx99_power_29405 read_file_tx99_power 3 29405 NULL
119874 +mempool_create_29437 mempool_create 1 29437 NULL
119875 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
119876 +p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
119877 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
119878 +memcg_update_cache_params_29465 memcg_update_cache_params 2 29465 NULL
119879 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
119880 +do_register_entry_29478 do_register_entry 4 29478 NULL
119881 +simple_strtoul_29480 simple_strtoul 0 29480 NULL
119882 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
119883 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
119884 +usnic_vnic_spec_dump_29508 usnic_vnic_spec_dump 2 29508 NULL
119885 +write_file_regidx_29517 write_file_regidx 3 29517 NULL
119886 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
119887 +pci_enable_msix_29524 pci_enable_msix 0 29524 NULL
119888 +mic_vringh_copy_29531 mic_vringh_copy 4 29531 NULL
119889 +ftrace_write_29551 ftrace_write 3 29551 NULL
119890 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
119891 +leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
119892 +kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
119893 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
119894 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
119895 +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
119896 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
119897 +slots_per_page_29601 slots_per_page 0 29601 NULL
119898 +osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
119899 +lstcon_rpc_init_29623 lstcon_rpc_init 4 29623 NULL
119900 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
119901 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
119902 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL nohasharray
119903 +spmi_controller_alloc_29654 spmi_controller_alloc 2 29654 &sctp_make_abort_user_29654
119904 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
119905 +lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
119906 +posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
119907 +probes_write_29711 probes_write 3 29711 NULL
119908 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
119909 +xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
119910 +std_nic_write_29752 std_nic_write 3 29752 NULL
119911 +static_key_count_29771 static_key_count 0 29771 NULL
119912 +tg3_irq_count_29786 tg3_irq_count 0 29786 NULL
119913 +dbAlloc_29794 dbAlloc 0 29794 NULL
119914 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
119915 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
119916 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
119917 +count_partial_29850 count_partial 0 29850 NULL
119918 +write_file_bool_bmps_29870 write_file_bool_bmps 3 29870 NULL
119919 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
119920 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
119921 +rtw_cfg80211_indicate_sta_assoc_29897 rtw_cfg80211_indicate_sta_assoc 3 29897 NULL
119922 +nv94_gpio_intr_mask_29907 nv94_gpio_intr_mask 4-3 29907 NULL
119923 +lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
119924 +write_file_queue_29922 write_file_queue 3 29922 NULL
119925 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
119926 +ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
119927 +zero_iovec_29955 zero_iovec 1 29955 NULL
119928 +dev_mem_write_30028 dev_mem_write 3 30028 NULL
119929 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
119930 +sysfs_add_file_mode_ns_30038 sysfs_add_file_mode_ns 0 30038 NULL
119931 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 0-4 30040 NULL
119932 +drp_wmove_30043 drp_wmove 4 30043 NULL
119933 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
119934 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
119935 +rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
119936 +defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
119937 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
119938 +u_memcpya_30139 u_memcpya 3-2 30139 NULL
119939 +dbg_port_buf_30145 dbg_port_buf 2 30145 NULL
119940 +elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
119941 +alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
119942 +expand_inode_data_30169 expand_inode_data 3-2 30169 NULL
119943 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
119944 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
119945 +__genwqe_readq_30197 __genwqe_readq 0 30197 NULL
119946 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
119947 +SyS_semop_30227 SyS_semop 3 30227 NULL
119948 +bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
119949 +rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
119950 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
119951 +compat_readv_30273 compat_readv 3 30273 NULL
119952 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
119953 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
119954 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
119955 +osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
119956 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
119957 +i8254_read_30330 i8254_read 0 30330 NULL
119958 +resource_from_user_30341 resource_from_user 3 30341 NULL
119959 +o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
119960 +kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
119961 +pvscsi_change_queue_depth_30365 pvscsi_change_queue_depth 2 30365 NULL
119962 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
119963 +blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3 30392 NULL
119964 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
119965 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
119966 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
119967 +lstcon_session_info_30425 lstcon_session_info 6 30425 NULL
119968 +enable_write_30456 enable_write 3 30456 NULL
119969 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
119970 +urandom_read_30462 urandom_read 3 30462 NULL
119971 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
119972 +adu_write_30487 adu_write 3 30487 NULL
119973 +dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
119974 +batadv_send_tt_request_30493 batadv_send_tt_request 5 30493 NULL
119975 +memblock_virt_alloc_node_30515 memblock_virt_alloc_node 1 30515 NULL
119976 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
119977 +debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
119978 +set_config_30526 set_config 0 30526 &debug_debug2_read_30526
119979 +xfs_sb_version_hasftype_30559 xfs_sb_version_hasftype 0 30559 NULL nohasharray
119980 +ixgbevf_acquire_msix_vectors_30559 ixgbevf_acquire_msix_vectors 2 30559 &xfs_sb_version_hasftype_30559
119981 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
119982 +set_le_30581 set_le 4 30581 NULL
119983 +blk_init_tags_30592 blk_init_tags 1 30592 NULL
119984 +sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
119985 +SyS_msgrcv_30611 SyS_msgrcv 3 30611 NULL
119986 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
119987 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
119988 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
119989 +mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
119990 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
119991 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
119992 +ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
119993 +sst_hsw_get_dsp_position_30691 sst_hsw_get_dsp_position 0 30691 NULL
119994 +get_pages_alloc_iovec_30699 get_pages_alloc_iovec 3-0 30699 NULL
119995 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
119996 +lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
119997 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
119998 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
119999 +snapshot_status_30744 snapshot_status 5 30744 NULL
120000 +fuse_direct_IO_30753 fuse_direct_IO 4 30753 NULL
120001 +fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
120002 +__bio_alloc_30787 __bio_alloc 3 30787 NULL
120003 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
120004 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
120005 +ath10k_write_fw_dbglog_30835 ath10k_write_fw_dbglog 3 30835 NULL
120006 +of_gpio_named_count_30841 of_gpio_named_count 0 30841 NULL
120007 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
120008 +cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
120009 +wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
120010 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
120011 +pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
120012 +copy_to_iter_30901 copy_to_iter 2 30901 NULL
120013 +usnic_debugfs_buildinfo_read_30928 usnic_debugfs_buildinfo_read 3 30928 NULL
120014 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
120015 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
120016 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
120017 +read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
120018 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
120019 +ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
120020 +template_fmt_size_31033 template_fmt_size 0 31033 NULL
120021 +stride_pg_count_31053 stride_pg_count 0-3-2-1-4-5 31053 NULL
120022 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
120023 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
120024 +proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
120025 +depth_read_31112 depth_read 3 31112 NULL
120026 +hash_ipportnet6_expire_31118 hash_ipportnet6_expire 4 31118 NULL
120027 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
120028 +size_inside_page_31141 size_inside_page 0 31141 NULL
120029 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
120030 +nvme_set_features_31169 nvme_set_features 0 31169 NULL
120031 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
120032 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
120033 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
120034 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
120035 +__read_reg_31216 __read_reg 0 31216 NULL
120036 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
120037 +tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
120038 +cyy_readb_31240 cyy_readb 0 31240 NULL
120039 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
120040 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
120041 +hash_netportnet4_expire_31290 hash_netportnet4_expire 4 31290 NULL
120042 +iwl_dbgfs_set_nic_temperature_read_31300 iwl_dbgfs_set_nic_temperature_read 3 31300 NULL
120043 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
120044 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
120045 +command_file_write_31318 command_file_write 3 31318 NULL
120046 +hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
120047 +_regmap_raw_multi_reg_write_31336 _regmap_raw_multi_reg_write 3 31336 NULL
120048 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
120049 +outlen_write_31358 outlen_write 3 31358 NULL
120050 +ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
120051 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
120052 +vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
120053 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
120054 +inb_31388 inb 0 31388 NULL
120055 +mp_ioapic_pin_count_31393 mp_ioapic_pin_count 0 31393 NULL
120056 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
120057 +_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
120058 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
120059 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
120060 +transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
120061 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
120062 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
120063 +alg_setkey_31485 alg_setkey 3 31485 NULL
120064 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
120065 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
120066 +__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
120067 +hidraw_write_31536 hidraw_write 3 31536 NULL
120068 +usbvision_read_31555 usbvision_read 3 31555 NULL
120069 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
120070 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
120071 +osst_write_31581 osst_write 3 31581 NULL
120072 +snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
120073 +iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
120074 +memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 NULL nohasharray
120075 +arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 &memblock_virt_alloc_nopanic_31617
120076 +usnic_ib_dump_vf_31623 usnic_ib_dump_vf 3 31623 NULL
120077 +videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
120078 +pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
120079 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
120080 +__lgread_31668 __lgread 4 31668 NULL
120081 +copy_from_user_nmi_31672 copy_from_user_nmi 3-0 31672 NULL
120082 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
120083 +fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
120084 +rs_pretty_print_rate_31727 rs_pretty_print_rate 0 31727 NULL
120085 +lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 NULL nohasharray
120086 +utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 &lu_buf_check_and_grow_31735
120087 +shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
120088 +input_abs_get_max_31742 input_abs_get_max 0 31742 NULL nohasharray
120089 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 &input_abs_get_max_31742
120090 +bcm_char_read_31750 bcm_char_read 3 31750 NULL
120091 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
120092 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
120093 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
120094 +get_count_order_31800 get_count_order 0 31800 NULL
120095 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
120096 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
120097 +data_write_31805 data_write 3 31805 NULL
120098 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
120099 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
120100 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
120101 +clone_bio_31854 clone_bio 4-3 31854 NULL
120102 +SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
120103 +iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
120104 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
120105 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
120106 +xattr_permission_31907 xattr_permission 0 31907 NULL
120107 +lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
120108 +new_dir_31919 new_dir 3 31919 NULL
120109 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
120110 +era_status_31934 era_status 5 31934 NULL
120111 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
120112 +read_mem_31942 read_mem 3 31942 NULL
120113 +ext4_zero_range_31944 ext4_zero_range 3-2 31944 NULL
120114 +vb2_write_31948 vb2_write 3 31948 NULL
120115 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
120116 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
120117 +iwl_rx_packet_payload_len_31965 iwl_rx_packet_payload_len 0 31965 NULL
120118 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
120119 +iblock_execute_rw_31982 iblock_execute_rw 3 31982 NULL nohasharray
120120 +vx_read_status_31982 vx_read_status 0 31982 &iblock_execute_rw_31982
120121 +find_next_zero_bit_31990 find_next_zero_bit 0 31990 NULL
120122 +lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
120123 +sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
120124 +calc_hmac_32010 calc_hmac 3 32010 NULL
120125 +aead_len_32021 aead_len 0 32021 NULL
120126 +sci_dma_rx_push_32029 sci_dma_rx_push 2 32029 NULL
120127 +stk_read_32038 stk_read 3 32038 NULL
120128 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
120129 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
120130 +cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
120131 +kiblnd_alloc_pages_32092 kiblnd_alloc_pages 3 32092 NULL
120132 +bio_alloc_32095 bio_alloc 2 32095 NULL
120133 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
120134 +wil_read_file_recovery_32104 wil_read_file_recovery 3 32104 NULL
120135 +disk_status_32120 disk_status 4 32120 NULL
120136 +kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
120137 +venus_link_32165 venus_link 5 32165 NULL
120138 +ocfs2_direct_IO_32168 ocfs2_direct_IO 4 32168 NULL
120139 +do_writepages_32173 do_writepages 0 32173 NULL
120140 +del_ptr_32197 del_ptr 4 32197 NULL
120141 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
120142 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
120143 +caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
120144 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
120145 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
120146 +kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
120147 +cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
120148 +SyS_select_32319 SyS_select 1 32319 NULL
120149 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
120150 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
120151 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
120152 +dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
120153 +rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
120154 +sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
120155 +ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
120156 +ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
120157 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
120158 +vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
120159 +cache_status_32462 cache_status 5 32462 NULL
120160 +fill_readbuf_32464 fill_readbuf 3 32464 NULL
120161 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
120162 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
120163 +mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
120164 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
120165 +disconnect_32521 disconnect 4 32521 NULL
120166 +qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
120167 +ilo_read_32531 ilo_read 3 32531 NULL
120168 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
120169 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
120170 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
120171 +osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
120172 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
120173 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
120174 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
120175 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
120176 +irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
120177 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
120178 +xpcs_reg_value_read_32644 xpcs_reg_value_read 3 32644 NULL
120179 +kvmalloc_32646 kvmalloc 1 32646 NULL
120180 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
120181 +generic_readlink_32654 generic_readlink 3 32654 NULL
120182 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
120183 +compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL
120184 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
120185 +rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
120186 +_xfs_buf_get_pages_32715 _xfs_buf_get_pages 2 32715 NULL
120187 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
120188 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
120189 +vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
120190 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
120191 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
120192 +sta_tx_latency_stat_read_32862 sta_tx_latency_stat_read 3 32862 NULL
120193 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
120194 +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 NULL nohasharray
120195 +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 &cifs_writedata_alloc_32880
120196 +vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
120197 +visorchannel_dump_section_32893 visorchannel_dump_section 4 32893 NULL
120198 +tipc_link_iovec_xmit_fast_32913 tipc_link_iovec_xmit_fast 3 32913 NULL nohasharray
120199 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 &tipc_link_iovec_xmit_fast_32913
120200 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
120201 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
120202 +ptlrpc_prep_bulk_imp_32997 ptlrpc_prep_bulk_imp 2 32997 NULL
120203 +compat_filldir_32999 compat_filldir 3 32999 NULL
120204 +SyS_syslog_33007 SyS_syslog 3 33007 NULL
120205 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
120206 +write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
120207 +mic_virtio_copy_to_user_33048 mic_virtio_copy_to_user 3 33048 NULL
120208 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
120209 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
120210 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
120211 +bitmap_resize_33054 bitmap_resize 2 33054 NULL
120212 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
120213 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
120214 +alloc_tio_33077 alloc_tio 3 33077 NULL
120215 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
120216 +f2fs_llseek_33098 f2fs_llseek 2 33098 NULL
120217 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
120218 +SyS_poll_33152 SyS_poll 2 33152 NULL
120219 +_pci_add_cap_save_buffer_33153 _pci_add_cap_save_buffer 4 33153 NULL
120220 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
120221 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
120222 +pp_read_33210 pp_read 3 33210 NULL
120223 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
120224 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
120225 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
120226 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
120227 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
120228 +vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
120229 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
120230 +lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
120231 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
120232 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
120233 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
120234 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
120235 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
120236 +nvc0_ram_create__33391 nvc0_ram_create_ 5 33391 NULL
120237 +ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
120238 +cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
120239 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
120240 +hash_netiface6_expire_33421 hash_netiface6_expire 4 33421 NULL
120241 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
120242 +message_stats_list_33440 message_stats_list 5 33440 NULL
120243 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
120244 +create_entry_33479 create_entry 2 33479 NULL
120245 +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL
120246 +res_counter_read_33499 res_counter_read 4 33499 NULL
120247 +hash_netnet4_expire_33500 hash_netnet4_expire 4 33500 NULL
120248 +fb_read_33506 fb_read 3 33506 NULL
120249 +musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
120250 +ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
120251 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
120252 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
120253 +tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL nohasharray
120254 +osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 &tomoyo_read_self_33539
120255 +count_subheaders_33591 count_subheaders 0 33591 NULL
120256 +scsi_execute_33596 scsi_execute 5 33596 NULL
120257 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
120258 +xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
120259 +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 NULL nohasharray
120260 +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 &il_dbgfs_qos_read_33615
120261 +stride_page_count_33641 stride_page_count 2 33641 NULL
120262 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
120263 +inw_p_33668 inw_p 0 33668 NULL
120264 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
120265 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
120266 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
120267 +netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
120268 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
120269 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
120270 +write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL
120271 +read_file_node_recv_33729 read_file_node_recv 3 33729 NULL
120272 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
120273 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
120274 +hashtab_create_33769 hashtab_create 3 33769 NULL
120275 +__btrfs_free_reserved_extent_33782 __btrfs_free_reserved_extent 2 33782 NULL
120276 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
120277 +filter_write_33819 filter_write 3 33819 NULL
120278 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
120279 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
120280 +ext4_journal_extend_33835 ext4_journal_extend 2 33835 NULL
120281 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
120282 +azx_get_pos_posbuf_33867 azx_get_pos_posbuf 0 33867 NULL
120283 +get_user_pages_33908 get_user_pages 0 33908 NULL
120284 +sg_nents_33909 sg_nents 0 33909 NULL
120285 +ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
120286 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
120287 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
120288 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
120289 +read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
120290 +rs_sta_dbgfs_drv_tx_stats_read_33946 rs_sta_dbgfs_drv_tx_stats_read 3 33946 NULL
120291 +__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
120292 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
120293 +lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
120294 +ppp_write_34034 ppp_write 3 34034 NULL
120295 +tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
120296 +bm_page_io_async_34050 bm_page_io_async 2 34050 NULL
120297 +calc_linear_pos_34067 calc_linear_pos 0-4 34067 NULL
120298 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
120299 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
120300 +__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
120301 +proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
120302 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
120303 +ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
120304 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
120305 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
120306 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
120307 +rsi_debug_zone_write_34206 rsi_debug_zone_write 3 34206 NULL nohasharray
120308 +rbd_osd_req_create_34206 rbd_osd_req_create 3 34206 &rsi_debug_zone_write_34206
120309 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
120310 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
120311 +device_private_init_34279 device_private_init 0 34279 NULL
120312 +xgmac_reg_addr_write_34284 xgmac_reg_addr_write 3 34284 NULL
120313 +ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
120314 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 NULL nohasharray
120315 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 &pcpu_need_to_extend_34326
120316 +proc_thread_self_readlink_34357 proc_thread_self_readlink 3 34357 NULL
120317 +crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL nohasharray
120318 +sync_page_io_34363 sync_page_io 3 34363 &crypto_ablkcipher_ivsize_34363
120319 +rngapi_reset_34366 rngapi_reset 3 34366 NULL
120320 +ea_read_34378 ea_read 0 34378 NULL nohasharray
120321 +_iwl_dbgfs_low_latency_write_34378 _iwl_dbgfs_low_latency_write 3 34378 &ea_read_34378
120322 +fuse_send_read_34379 fuse_send_read 0-4 34379 NULL
120323 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
120324 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
120325 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
120326 +ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL nohasharray
120327 +iwl_calib_set_34400 iwl_calib_set 3 34400 &ivtv_read_pos_34400
120328 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
120329 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
120330 +security_socket_create_34439 security_socket_create 0 34439 NULL
120331 +usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
120332 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
120333 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
120334 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
120335 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
120336 +SyS_pwritev_34494 SyS_pwritev 3 34494 NULL
120337 +qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
120338 +lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
120339 +ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
120340 +tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
120341 +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4-0 34547 NULL
120342 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
120343 +alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
120344 +ext4_ind_direct_IO_34574 ext4_ind_direct_IO 4 34574 NULL
120345 +lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
120346 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
120347 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
120348 +ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
120349 +cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
120350 +bio_integrity_bytes_34602 bio_integrity_bytes 2 34602 NULL
120351 +__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
120352 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
120353 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
120354 +kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
120355 +sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
120356 +f2fs_direct_IO_34685 f2fs_direct_IO 4 34685 NULL
120357 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
120358 +batadv_tvlv_realloc_packet_buff_34688 batadv_tvlv_realloc_packet_buff 3-4 34688 NULL
120359 +port_print_34704 port_print 3 34704 NULL
120360 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
120361 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
120362 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
120363 +lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
120364 +bootmode_store_34762 bootmode_store 4 34762 NULL
120365 +device_add_34766 device_add 0 34766 NULL
120366 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
120367 +ext3_direct_IO_34798 ext3_direct_IO 4 34798 NULL
120368 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
120369 +can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
120370 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
120371 +ll_setxattr_34806 ll_setxattr 4 34806 NULL
120372 +file_page_index_34820 file_page_index 0-2 34820 NULL
120373 +bio_segments_34832 bio_segments 0 34832 NULL
120374 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
120375 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
120376 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
120377 +usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
120378 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
120379 +msg_print_text_34889 msg_print_text 0 34889 NULL
120380 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
120381 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
120382 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 NULL nohasharray
120383 +__inode_permission_34925 __inode_permission 0 34925 &btrfs_super_chunk_root_34925
120384 +sec_flags2str_34933 sec_flags2str 3 34933 NULL
120385 +snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
120386 +compat_SyS_kexec_load_34947 compat_SyS_kexec_load 2 34947 NULL
120387 +do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
120388 +sdebug_change_qdepth_34994 sdebug_change_qdepth 2 34994 NULL
120389 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
120390 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
120391 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
120392 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
120393 +hwdep_read_locked_35037 hwdep_read_locked 3 35037 NULL
120394 +proc_setgroups_write_35039 proc_setgroups_write 3 35039 NULL
120395 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
120396 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
120397 +capi_write_35104 capi_write 3 35104 NULL nohasharray
120398 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
120399 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
120400 +ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
120401 +addrs_per_inode_35151 addrs_per_inode 0 35151 NULL
120402 +message_stats_print_35158 message_stats_print 6 35158 NULL
120403 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
120404 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
120405 +compat_SyS_pselect6_35203 compat_SyS_pselect6 1 35203 NULL
120406 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
120407 +striped_read_35218 striped_read 0-2 35218 NULL nohasharray
120408 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
120409 +rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
120410 +kimage_file_prepare_segments_35232 kimage_file_prepare_segments 5 35232 NULL
120411 +set_fd_set_35249 set_fd_set 1 35249 NULL
120412 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
120413 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
120414 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
120415 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
120416 +i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
120417 +isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL nohasharray
120418 +nvkm_notify_init_35283 nvkm_notify_init 7 35283 &isr_rx_rdys_read_35283
120419 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 NULL nohasharray
120420 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 &__btrfs_buffered_write_35311
120421 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
120422 +sta_tx_latency_stat_write_35323 sta_tx_latency_stat_write 3 35323 NULL
120423 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
120424 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
120425 +ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
120426 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
120427 +read_kmem_35372 read_kmem 3 35372 NULL
120428 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
120429 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
120430 +iwl_dbgfs_drv_rx_stats_read_35430 iwl_dbgfs_drv_rx_stats_read 3 35430 NULL
120431 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
120432 +efx_mcdi_rpc_async_quiet_35460 efx_mcdi_rpc_async_quiet 4-5 35460 NULL
120433 +macvtap_do_read_35475 macvtap_do_read 3 35475 NULL
120434 +fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
120435 +btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4 35500 NULL
120436 +async_setkey_35521 async_setkey 3 35521 NULL
120437 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
120438 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
120439 +pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
120440 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
120441 +ocfs2_write_zero_page_35539 ocfs2_write_zero_page 3 35539 NULL
120442 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
120443 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
120444 +C_SYSC_kexec_load_35565 C_SYSC_kexec_load 2 35565 NULL
120445 +ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
120446 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
120447 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
120448 +kernel_readv_35617 kernel_readv 3 35617 NULL
120449 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
120450 +ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
120451 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
120452 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
120453 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
120454 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
120455 +md_super_write_35703 md_super_write 4 35703 NULL
120456 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
120457 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
120458 +alloc_netdev_mqs_35806 alloc_netdev_mqs 1 35806 NULL
120459 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
120460 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
120461 +vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
120462 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
120463 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
120464 +ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
120465 +uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
120466 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
120467 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
120468 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
120469 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
120470 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
120471 +generic_ocp_read_35974 generic_ocp_read 3 35974 NULL nohasharray
120472 +ceph_buffer_new_35974 ceph_buffer_new 1 35974 &generic_ocp_read_35974
120473 +acl_alloc_35979 acl_alloc 1 35979 NULL
120474 +device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
120475 +write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
120476 +kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
120477 +lov_mds_md_max_stripe_count_36008 lov_mds_md_max_stripe_count 0-1 36008 NULL
120478 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
120479 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
120480 +account_shadowed_36048 account_shadowed 2 36048 NULL
120481 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
120482 +write_emulate_36065 write_emulate 2-4 36065 NULL
120483 +stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
120484 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
120485 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
120486 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
120487 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
120488 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
120489 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
120490 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
120491 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
120492 +twl_set_36154 twl_set 2 36154 NULL
120493 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
120494 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
120495 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
120496 +ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
120497 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
120498 +SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL
120499 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
120500 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
120501 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
120502 +vmsplice_to_user_36245 vmsplice_to_user 3 36245 NULL nohasharray
120503 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 &vmsplice_to_user_36245
120504 +cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 NULL
120505 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
120506 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
120507 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
120508 +cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
120509 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
120510 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL nohasharray
120511 +__compat_sys_pwritev64_36328 __compat_sys_pwritev64 3 36328 &fat_compat_ioctl_filldir_36328
120512 +lc_create_36332 lc_create 4 36332 NULL
120513 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
120514 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
120515 +ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
120516 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL
120517 +to_sector_36361 to_sector 0-1 36361 NULL
120518 +tunables_read_36385 tunables_read 3 36385 NULL
120519 +afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
120520 +sierra_write_36402 sierra_write 4 36402 NULL
120521 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
120522 +soc_pcm_codec_params_fixup_36434 soc_pcm_codec_params_fixup 2 36434 NULL
120523 +ReadW6692B_36445 ReadW6692B 0 36445 NULL
120524 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
120525 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
120526 +SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
120527 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
120528 +ds1343_nvram_write_36489 ds1343_nvram_write 5-6 36489 NULL
120529 +tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL nohasharray
120530 +ip6_append_data_36490 ip6_append_data 4 36490 &tx_tx_checksum_result_read_36490
120531 +cmd_loop_36491 cmd_loop 0 36491 NULL
120532 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
120533 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
120534 +_iwl_dbgfs_fw_nmi_write_36515 _iwl_dbgfs_fw_nmi_write 3 36515 NULL
120535 +get_param_l_36518 get_param_l 0 36518 NULL
120536 +ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
120537 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
120538 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
120539 +__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL
120540 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
120541 +__erst_read_36579 __erst_read 0 36579 NULL
120542 +put_cmsg_36589 put_cmsg 4 36589 NULL
120543 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
120544 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
120545 +convert_extent_item_v0_36645 convert_extent_item_v0 4 36645 NULL
120546 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
120547 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
120548 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
120549 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
120550 +xillybus_read_36678 xillybus_read 3 36678 NULL
120551 +gsmtty_write_36702 gsmtty_write 3 36702 NULL
120552 +path_getxattr_36717 path_getxattr 4 36717 NULL
120553 +snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
120554 +cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
120555 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
120556 +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
120557 +i40e_init_lan_hmc_36796 i40e_init_lan_hmc 5-4-3-2 36796 NULL
120558 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
120559 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
120560 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
120561 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
120562 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
120563 +cm_write_36858 cm_write 3 36858 NULL
120564 +tipc_link_iovec_long_xmit_36871 tipc_link_iovec_long_xmit 3 36871 NULL nohasharray
120565 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 &tipc_link_iovec_long_xmit_36871
120566 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
120567 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
120568 +__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
120569 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
120570 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
120571 +il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
120572 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
120573 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
120574 +setxattr_37006 setxattr 4 37006 NULL
120575 +ec_i2c_xfer_37029 ec_i2c_xfer 3 37029 NULL
120576 +ieee80211_chsw_switch_vifs_37030 ieee80211_chsw_switch_vifs 2 37030 NULL
120577 +command_file_read_37038 command_file_read 3 37038 NULL
120578 +figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
120579 +qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
120580 +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
120581 +_iwl_dbgfs_bcast_filters_macs_write_37069 _iwl_dbgfs_bcast_filters_macs_write 3 37069 NULL
120582 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
120583 +parse_command_37079 parse_command 2 37079 NULL
120584 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
120585 +tun_get_user_37094 tun_get_user 5 37094 NULL
120586 +has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
120587 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
120588 +mtt_free_res_37144 mtt_free_res 5 37144 NULL
120589 +msg_word_37164 msg_word 0 37164 NULL
120590 +vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
120591 +forced_ps_write_37209 forced_ps_write 3 37209 NULL
120592 +crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL
120593 +bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
120594 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
120595 +__do_replace_37227 __do_replace 5 37227 NULL
120596 +iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
120597 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL nohasharray
120598 +__btrfs_inc_extent_ref_37238 __btrfs_inc_extent_ref 7 37238 &rx_filter_dup_filter_read_37238
120599 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
120600 +_iwl_dbgfs_fw_restart_write_37270 _iwl_dbgfs_fw_restart_write 3 37270 NULL
120601 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
120602 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
120603 +tipc_send_37315 tipc_send 3 37315 NULL
120604 +l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
120605 +bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
120606 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
120607 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
120608 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
120609 +seek_firmware_37372 seek_firmware 2 37372 NULL
120610 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
120611 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
120612 +tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
120613 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
120614 +fru_alloc_37442 fru_alloc 1 37442 NULL
120615 +tcp_established_options_37450 tcp_established_options 0 37450 NULL
120616 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
120617 +get_est_timing_37484 get_est_timing 0 37484 NULL
120618 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
120619 +bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
120620 +osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
120621 +bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL
120622 +xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
120623 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
120624 +hdr_size_37536 hdr_size 0 37536 NULL
120625 +extent_map_end_37550 extent_map_end 0 37550 NULL
120626 +sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
120627 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
120628 +qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
120629 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
120630 +SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
120631 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
120632 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
120633 +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 NULL nohasharray
120634 +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 &vmw_framebuffer_dmabuf_dirty_37661
120635 +SYSC_get_mempolicy_37664 SYSC_get_mempolicy 3 37664 NULL
120636 +__wa_seg_calculate_isoc_frame_count_37672 __wa_seg_calculate_isoc_frame_count 0 37672 NULL
120637 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
120638 +tracing_saved_cmdlines_size_write_37684 tracing_saved_cmdlines_size_write 3 37684 NULL
120639 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
120640 +nametbl_header_37698 nametbl_header 2-0 37698 NULL
120641 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
120642 +dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
120643 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
120644 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
120645 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
120646 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
120647 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
120648 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
120649 +nvkm_notify_init_37806 nvkm_notify_init 6 37806 NULL
120650 +ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
120651 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
120652 +android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
120653 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
120654 +xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
120655 +btrfs_leaf_data_37869 btrfs_leaf_data 0 37869 NULL
120656 +btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
120657 +_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
120658 +pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
120659 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
120660 +write_file_bool_37957 write_file_bool 3 37957 NULL
120661 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
120662 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
120663 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
120664 +vfs_readv_38011 vfs_readv 3 38011 NULL
120665 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
120666 +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
120667 +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
120668 +parser_init_guts_38046 parser_init_guts 2 38046 NULL
120669 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
120670 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
120671 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
120672 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
120673 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
120674 +cifs_send_async_read_38077 cifs_send_async_read 2 38077 NULL
120675 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
120676 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
120677 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
120678 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
120679 +ep0_read_38095 ep0_read 3 38095 NULL
120680 +osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 NULL nohasharray
120681 +sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 &osc_checksum_seq_write_38096
120682 +o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
120683 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
120684 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
120685 +__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4-0 38153 NULL
120686 +btrfs_extent_same_38163 btrfs_extent_same 3-2-5 38163 NULL
120687 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
120688 +cdev_add_38176 cdev_add 2-3 38176 NULL
120689 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
120690 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
120691 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
120692 +ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
120693 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
120694 +nvkm_dmaobj_create__38250 nvkm_dmaobj_create_ 6 38250 NULL
120695 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 NULL nohasharray
120696 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &mthca_alloc_icm_table_38268 nohasharray
120697 +SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 &ieee80211_if_read_auto_open_plinks_38268
120698 +xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
120699 +xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
120700 +ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
120701 +C_SYSC_pselect6_38296 C_SYSC_pselect6 1 38296 NULL
120702 +ucma_query_path_38305 ucma_query_path 3 38305 NULL
120703 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
120704 +ida_simple_get_38326 ida_simple_get 0 38326 NULL
120705 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
120706 +usb_ext_prop_put_name_38352 usb_ext_prop_put_name 0-3 38352 NULL
120707 +btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
120708 +xfs_free_file_space_38383 xfs_free_file_space 2-3 38383 NULL
120709 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
120710 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
120711 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
120712 +iov_iter_npages_iovec_38448 iov_iter_npages_iovec 0-2 38448 NULL
120713 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
120714 +videobuf_waiton_38459 videobuf_waiton 0 38459 NULL
120715 +_iwl_dbgfs_scan_ant_rxchain_write_38479 _iwl_dbgfs_scan_ant_rxchain_write 3 38479 NULL
120716 +blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
120717 +dev_names_read_38509 dev_names_read 3 38509 NULL
120718 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
120719 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
120720 +set_queue_count_38519 set_queue_count 0 38519 NULL
120721 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
120722 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
120723 +kuc_len_38557 kuc_len 0-1 38557 NULL
120724 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
120725 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
120726 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
120727 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
120728 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
120729 +rd_allocate_sgl_table_38607 rd_allocate_sgl_table 3 38607 NULL
120730 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
120731 +write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
120732 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
120733 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
120734 +qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
120735 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
120736 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
120737 +ufshcd_read_sdev_qdepth_38676 ufshcd_read_sdev_qdepth 0 38676 NULL
120738 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
120739 +tracing_nsecs_read_38689 tracing_nsecs_read 3 38689 NULL
120740 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
120741 +w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
120742 +udf_readpages_38761 udf_readpages 4 38761 NULL
120743 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
120744 +bcache_device_init_38781 bcache_device_init 3 38781 NULL
120745 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
120746 +do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
120747 +err_decode_38804 err_decode 2 38804 NULL
120748 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
120749 +direct_entry_38836 direct_entry 3 38836 NULL
120750 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
120751 +interfaces_38859 interfaces 2 38859 NULL
120752 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
120753 +il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
120754 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
120755 +usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray
120756 +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977
120757 +OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
120758 +bio_clone_range_38997 bio_clone_range 2 38997 NULL
120759 +lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
120760 +get_nodes_39012 get_nodes 3 39012 NULL
120761 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
120762 +force_sc_support_read_39014 force_sc_support_read 3 39014 NULL
120763 +__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
120764 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
120765 +do_write_kmem_39051 do_write_kmem 0-1-3 39051 NULL
120766 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
120767 +__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
120768 +ea_foreach_39133 ea_foreach 0 39133 NULL
120769 +generic_permission_39150 generic_permission 0 39150 NULL
120770 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
120771 +ath9k_hw_ar9003_dump_eeprom_39156 ath9k_hw_ar9003_dump_eeprom 5-4 39156 NULL
120772 +echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
120773 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
120774 +mlx4_en_create_tx_ring_39179 mlx4_en_create_tx_ring 4 39179 NULL
120775 +ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
120776 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
120777 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
120778 +SyS_getrandom_39235 SyS_getrandom 2 39235 NULL
120779 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
120780 +snd_pcm_capture_forward_39248 snd_pcm_capture_forward 2 39248 NULL
120781 +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
120782 +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
120783 +i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
120784 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
120785 +_iwl_dbgfs_pm_params_write_39325 _iwl_dbgfs_pm_params_write 3 39325 NULL
120786 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
120787 +insert_reserved_file_extent_39327 insert_reserved_file_extent 3 39327 NULL
120788 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
120789 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
120790 +do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
120791 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
120792 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
120793 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
120794 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
120795 +__send_to_port_39386 __send_to_port 3 39386 NULL
120796 +user_power_read_39414 user_power_read 3 39414 NULL
120797 +hash_ipmark4_expire_39419 hash_ipmark4_expire 4 39419 NULL
120798 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
120799 +mic_desc_size_39464 mic_desc_size 0 39464 NULL
120800 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
120801 +usif_ioctl_39481 usif_ioctl 3 39481 NULL
120802 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
120803 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
120804 +int_proc_write_39542 int_proc_write 3 39542 NULL
120805 +pp_write_39554 pp_write 3 39554 NULL
120806 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
120807 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
120808 +memblock_virt_alloc_internal_39600 memblock_virt_alloc_internal 1 39600 NULL
120809 +ext_depth_39607 ext_depth 0 39607 NULL
120810 +batadv_tt_tvlv_generate_39615 batadv_tt_tvlv_generate 4 39615 NULL
120811 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
120812 +sdio_readb_39618 sdio_readb 0 39618 NULL
120813 +set_dev_class_39645 set_dev_class 4 39645 NULL
120814 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
120815 +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
120816 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
120817 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
120818 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
120819 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
120820 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
120821 +adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
120822 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
120823 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
120824 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
120825 +netlbl_catmap_walkrng_39885 netlbl_catmap_walkrng 0-2 39885 NULL
120826 +pkt_add_39897 pkt_add 3 39897 NULL
120827 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
120828 +gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
120829 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
120830 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
120831 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 NULL nohasharray
120832 +exofs_read_kern_39921 exofs_read_kern 6 39921 &oom_score_adj_read_39921
120833 +__spi_async_39932 __spi_async 0 39932 NULL
120834 +__get_order_39935 __get_order 0 39935 NULL
120835 +error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
120836 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
120837 +lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
120838 +bio_chain_clone_range_39967 bio_chain_clone_range 3 39967 NULL
120839 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
120840 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
120841 +lustre_pack_reply_v2_39978 lustre_pack_reply_v2 2 39978 NULL
120842 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
120843 +fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
120844 +server_name2svname_39998 server_name2svname 4 39998 NULL
120845 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
120846 +ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
120847 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
120848 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
120849 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
120850 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 NULL nohasharray
120851 +add_tty_40055 add_tty 1 40055 &l2cap_create_iframe_pdu_40055
120852 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
120853 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
120854 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
120855 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
120856 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL nohasharray
120857 +kvm_mmu_notifier_clear_flush_young_40143 kvm_mmu_notifier_clear_flush_young 3-4 40143 &ath10k_write_simulate_fw_crash_40143
120858 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
120859 +pt_write_40159 pt_write 3 40159 NULL
120860 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
120861 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL
120862 +allocate_probes_40204 allocate_probes 1 40204 NULL
120863 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
120864 +compress_file_range_40225 compress_file_range 3-4 40225 NULL
120865 +ocrdma_dbgfs_ops_read_40232 ocrdma_dbgfs_ops_read 3 40232 NULL
120866 +osst_read_40237 osst_read 3 40237 NULL
120867 +lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL
120868 +ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
120869 +of_get_child_count_40254 of_get_child_count 0 40254 NULL nohasharray
120870 +fsl_edma_prep_dma_cyclic_40254 fsl_edma_prep_dma_cyclic 3-4 40254 &of_get_child_count_40254
120871 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
120872 +ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
120873 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
120874 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
120875 +tracing_thresh_read_40295 tracing_thresh_read 3 40295 NULL
120876 +SyS_bind_40303 SyS_bind 3 40303 NULL
120877 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
120878 +mmio_read_40348 mmio_read 4 40348 NULL
120879 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
120880 +ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
120881 +get_chars_40373 get_chars 3 40373 NULL
120882 +fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
120883 +proc_write_driver_40432 proc_write_driver 3 40432 NULL
120884 +repair_io_failure_40452 repair_io_failure 4-3 40452 NULL
120885 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
120886 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
120887 +gp2ap020a00f_write_event_threshold_40461 gp2ap020a00f_write_event_threshold 2 40461 NULL
120888 +SyS_writev_40467 SyS_writev 3 40467 NULL
120889 +SyS_select_40473 SyS_select 1 40473 NULL
120890 +afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
120891 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
120892 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
120893 +__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
120894 +TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
120895 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
120896 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
120897 +esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
120898 +bl_alloc_init_bio_40569 bl_alloc_init_bio 1 40569 NULL
120899 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
120900 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
120901 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
120902 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
120903 +fops_read_40672 fops_read 3 40672 NULL
120904 +idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
120905 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
120906 +videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 4-3 40678 NULL
120907 +pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
120908 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
120909 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
120910 +lnet_new_text_buf_40717 lnet_new_text_buf 1 40717 NULL
120911 +ip_skb_dst_mtu_40718 ip_skb_dst_mtu 0 40718 NULL
120912 +of_pdt_build_one_prop_40735 of_pdt_build_one_prop 5 40735 NULL
120913 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
120914 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
120915 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
120916 +card_send_command_40757 card_send_command 3 40757 NULL
120917 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
120918 +pg_write_40766 pg_write 3 40766 NULL
120919 +kernfs_fop_read_40770 kernfs_fop_read 3 40770 NULL
120920 +show_list_40775 show_list 3-0 40775 NULL
120921 +kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
120922 +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
120923 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
120924 +rtw_add_beacon_40801 rtw_add_beacon 3-5 40801 NULL
120925 +add_action_40811 add_action 4 40811 NULL
120926 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
120927 +nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
120928 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
120929 +read_file_queue_40895 read_file_queue 3 40895 NULL
120930 +waiters_read_40902 waiters_read 3 40902 NULL
120931 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
120932 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
120933 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
120934 +snd_vx_create_40948 snd_vx_create 4 40948 NULL
120935 +path_listxattr_40949 path_listxattr 3 40949 NULL
120936 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
120937 +ima_appraise_measurement_40978 ima_appraise_measurement 6 40978 NULL
120938 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
120939 +iwl_dbgfs_scan_ant_rxchain_read_40999 iwl_dbgfs_scan_ant_rxchain_read 3 40999 NULL
120940 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
120941 +get_pages_alloc_bvec_41012 get_pages_alloc_bvec 0-3 41012 NULL
120942 +__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
120943 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
120944 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
120945 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
120946 +lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
120947 +vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
120948 +beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
120949 +sc_only_mode_read_41076 sc_only_mode_read 3 41076 NULL
120950 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
120951 +nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 NULL nohasharray
120952 +roccat_read_41093 roccat_read 3 41093 &nvme_map_user_pages_41093
120953 +dma_attach_41094 dma_attach 5-6 41094 NULL
120954 +nl80211_send_mlme_event_41099 nl80211_send_mlme_event 4 41099 NULL
120955 +provide_user_output_41105 provide_user_output 3 41105 NULL
120956 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
120957 +ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
120958 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
120959 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
120960 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
120961 +netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL
120962 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
120963 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
120964 +cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
120965 +hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
120966 +erst_read_41260 erst_read 0 41260 NULL
120967 +alloc_context_41283 alloc_context 1 41283 NULL
120968 +of_count_phandle_with_args_41291 of_count_phandle_with_args 0 41291 NULL
120969 +virtscsi_change_queue_depth_41327 virtscsi_change_queue_depth 2 41327 NULL
120970 +o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
120971 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
120972 +rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
120973 +ceph_do_getattr_41349 ceph_do_getattr 0 41349 NULL
120974 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
120975 +kmp_init_41373 kmp_init 2 41373 NULL
120976 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
120977 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
120978 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
120979 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
120980 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
120981 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
120982 +ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
120983 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
120984 +se_io_cb_41461 se_io_cb 3 41461 NULL
120985 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
120986 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
120987 +bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
120988 +kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
120989 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
120990 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
120991 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
120992 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
120993 +dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
120994 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
120995 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
120996 +nr_status_frames_41559 nr_status_frames 0-1 41559 NULL nohasharray
120997 +si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 &nr_status_frames_41559
120998 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
120999 +nfsd_readv_41585 nfsd_readv 4 41585 NULL
121000 +batadv_tvlv_container_ogm_append_41588 batadv_tvlv_container_ogm_append 4 41588 NULL
121001 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
121002 +lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
121003 +usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
121004 +a2mp_send_41615 a2mp_send 4 41615 NULL
121005 +lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
121006 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
121007 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
121008 +get_std_timing_41654 get_std_timing 0 41654 NULL
121009 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
121010 +fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
121011 +lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
121012 +connector_write_41709 connector_write 3 41709 NULL
121013 +fillonedir_41746 fillonedir 3 41746 NULL
121014 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
121015 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
121016 +ptlrpc_new_bulk_41804 ptlrpc_new_bulk 1 41804 NULL
121017 +rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
121018 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
121019 +kimage_file_alloc_init_41827 kimage_file_alloc_init 5 41827 NULL
121020 +copy_page_to_iter_bvec_41830 copy_page_to_iter_bvec 0-3 41830 NULL
121021 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
121022 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
121023 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
121024 +pci_map_single_41869 pci_map_single 0 41869 NULL
121025 +usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
121026 +v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
121027 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
121028 +ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 4-3 41935 NULL
121029 +sci_rxfill_41945 sci_rxfill 0 41945 NULL
121030 +read_gssp_41947 read_gssp 3 41947 NULL
121031 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
121032 +portnames_read_41958 portnames_read 3 41958 NULL
121033 +dst_mtu_41969 dst_mtu 0 41969 NULL
121034 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
121035 +pool_allocate_42012 pool_allocate 3 42012 NULL
121036 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
121037 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
121038 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
121039 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
121040 +alloc_trace_kprobe_42041 alloc_trace_kprobe 6 42041 NULL
121041 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
121042 +jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
121043 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
121044 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
121045 +ufshcd_dev_cmd_completion_42080 ufshcd_dev_cmd_completion 0 42080 NULL
121046 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
121047 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
121048 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
121049 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 NULL
121050 +blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
121051 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
121052 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
121053 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
121054 +write_file_beacon_42185 write_file_beacon 3 42185 NULL
121055 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
121056 +blockdev_direct_IO_42235 blockdev_direct_IO 5 42235 NULL nohasharray
121057 +pla_ocp_read_42235 pla_ocp_read 3 42235 &blockdev_direct_IO_42235
121058 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
121059 +find_last_bit_42260 find_last_bit 0 42260 NULL
121060 +__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
121061 +__tty_buffer_request_room_42276 __tty_buffer_request_room 2-0 42276 NULL
121062 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
121063 +__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
121064 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
121065 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
121066 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
121067 +xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
121068 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
121069 +tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
121070 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
121071 +drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
121072 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
121073 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
121074 +krng_get_random_42420 krng_get_random 3 42420 NULL
121075 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
121076 +spr_wm_latency_write_42441 spr_wm_latency_write 3 42441 NULL
121077 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
121078 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
121079 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
121080 +kuc_free_42455 kuc_free 2 42455 NULL
121081 +cp2112_gpio_get_42467 cp2112_gpio_get 2 42467 NULL
121082 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
121083 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
121084 +bypass_write_42498 bypass_write 3 42498 NULL
121085 +SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
121086 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
121087 +dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
121088 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
121089 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
121090 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
121091 +udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
121092 +iwl_print_event_log_42566 iwl_print_event_log 0-7-5 42566 NULL
121093 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
121094 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
121095 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
121096 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
121097 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
121098 +parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL nohasharray
121099 +num_controllers_42644 num_controllers 0 42644 &parport_pc_compat_write_block_pio_42644
121100 +_regmap_raw_write_42652 _regmap_raw_write 4-2 42652 NULL
121101 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
121102 +vb2_read_42703 vb2_read 3 42703 NULL
121103 +read_status_42722 read_status 0 42722 NULL
121104 +iwl_mvm_coex_dump_mbox_old_42727 iwl_mvm_coex_dump_mbox_old 4-3-0 42727 NULL
121105 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
121106 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
121107 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
121108 +dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
121109 +x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
121110 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
121111 +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
121112 +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
121113 +elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
121114 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
121115 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0 42796 NULL
121116 +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
121117 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
121118 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
121119 +set_arg_42824 set_arg 3 42824 NULL
121120 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
121121 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
121122 +nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
121123 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
121124 +hd_end_request_42904 hd_end_request 2 42904 NULL
121125 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
121126 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
121127 +vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
121128 +ntb_setup_snb_msix_42971 ntb_setup_snb_msix 2 42971 NULL
121129 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
121130 +nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL nohasharray
121131 +rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
121132 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
121133 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
121134 +__bioset_create_43059 __bioset_create 1 43059 NULL
121135 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
121136 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
121137 +_xfer_secondary_pool_43089 _xfer_secondary_pool 2 43089 NULL
121138 +sysfs_create_file_ns_43103 sysfs_create_file_ns 0 43103 NULL
121139 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
121140 +calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
121141 +read_file_dfs_43145 read_file_dfs 3 43145 NULL
121142 +cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
121143 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
121144 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
121145 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
121146 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
121147 +uio_write_43202 uio_write 3 43202 NULL
121148 +iso_callback_43208 iso_callback 3 43208 NULL
121149 +ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
121150 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
121151 +atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL
121152 +gfs2_direct_IO_43220 gfs2_direct_IO 4 43220 NULL
121153 +batadv_tt_tvlv_unicast_handler_v1_43239 batadv_tt_tvlv_unicast_handler_v1 5 43239 NULL
121154 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
121155 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
121156 +evtchn_write_43278 evtchn_write 3 43278 NULL nohasharray
121157 +parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 &evtchn_write_43278
121158 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
121159 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
121160 +mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
121161 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
121162 +xenfb_write_43412 xenfb_write 3 43412 NULL
121163 +ext4_xattr_check_names_43422 ext4_xattr_check_names 0 43422 NULL
121164 +__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
121165 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
121166 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
121167 +usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
121168 +usb_string_43443 usb_string 0 43443 &usemap_size_43443
121169 +get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
121170 +fs_path_prepare_for_add_43453 fs_path_prepare_for_add 2 43453 NULL
121171 +nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
121172 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
121173 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
121174 +ll_direct_IO_26_43530 ll_direct_IO_26 4 43530 NULL
121175 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
121176 +read_events_43534 read_events 3 43534 NULL
121177 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
121178 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL
121179 +request_resource_43548 request_resource 0 43548 NULL
121180 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
121181 +handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
121182 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
121183 +proc_read_43614 proc_read 3 43614 NULL
121184 +disable_dma_on_even_43618 disable_dma_on_even 0 43618 NULL
121185 +alloc_thread_groups_43625 alloc_thread_groups 2 43625 NULL
121186 +random_write_43656 random_write 3 43656 NULL
121187 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
121188 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
121189 +write_file_tx99_power_43670 write_file_tx99_power 3 43670 NULL
121190 +dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
121191 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
121192 +nvkm_connector_create__43711 nvkm_connector_create_ 6 43711 NULL
121193 +fuse_send_read_43725 fuse_send_read 4-0 43725 NULL
121194 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
121195 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
121196 +__alloc_alien_cache_43734 __alloc_alien_cache 2 43734 NULL
121197 +fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
121198 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
121199 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
121200 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
121201 +byte_pos_43787 byte_pos 0 43787 &ocfs2_xattr_get_value_outside_43787
121202 +btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
121203 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
121204 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
121205 +read_flush_43851 read_flush 3 43851 NULL
121206 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
121207 +ec_dbgfs_cmd_write_43895 ec_dbgfs_cmd_write 3 43895 NULL
121208 +SendString_43928 SendString 3 43928 NULL
121209 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
121210 +__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
121211 +nla_reserve_43984 nla_reserve 3 43984 NULL
121212 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
121213 +kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 NULL nohasharray
121214 +scsi_command_size_43992 scsi_command_size 0 43992 &kvm_read_guest_virt_43992 nohasharray
121215 +bcm_recvmsg_43992 bcm_recvmsg 4 43992 &scsi_command_size_43992
121216 +emit_flags_44006 emit_flags 4-3 44006 NULL
121217 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
121218 +fru_strlen_44046 fru_strlen 0 44046 NULL
121219 +ath9k_def_dump_modal_eeprom_44078 ath9k_def_dump_modal_eeprom 3-2-0 44078 NULL
121220 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
121221 +pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL
121222 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
121223 +skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
121224 +nouveau_clock_create__44116 nouveau_clock_create_ 6 44116 NULL
121225 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
121226 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
121227 +tracing_resize_saved_cmdlines_44140 tracing_resize_saved_cmdlines 1 44140 NULL
121228 +ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
121229 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
121230 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
121231 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
121232 +readreg_ipac_44186 readreg_ipac 0 44186 NULL
121233 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
121234 +btrfs_item_offset_nr_44220 btrfs_item_offset_nr 0 44220 NULL
121235 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
121236 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
121237 +sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
121238 +device_create_file_44285 device_create_file 0 44285 NULL
121239 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
121240 +bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
121241 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
121242 +ccp_init_data_44324 ccp_init_data 5 44324 NULL
121243 +rs_init_44327 rs_init 1 44327 NULL
121244 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
121245 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
121246 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
121247 +mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
121248 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
121249 +strlcpy_44400 strlcpy 3 44400 NULL
121250 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
121251 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
121252 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
121253 +mic_virtio_copy_to_user_44472 mic_virtio_copy_to_user 3-4 44472 NULL
121254 +write_file_debug_44476 write_file_debug 3 44476 NULL
121255 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
121256 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
121257 +bio_advance_44496 bio_advance 2 44496 NULL
121258 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
121259 +ac_register_board_44504 ac_register_board 3 44504 NULL
121260 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
121261 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
121262 +spidev_write_44510 spidev_write 3 44510 NULL
121263 +SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
121264 +ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
121265 +comm_write_44537 comm_write 3 44537 NULL
121266 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
121267 +l2cap_sock_memcpy_fromiovec_cb_44573 l2cap_sock_memcpy_fromiovec_cb 4 44573 NULL
121268 +nouveau_perfmon_create__44602 nouveau_perfmon_create_ 4 44602 NULL
121269 +xpcs_mmd_write_44633 xpcs_mmd_write 3 44633 NULL
121270 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
121271 +mpi_resize_44674 mpi_resize 2 44674 NULL
121272 +sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
121273 +ts_read_44687 ts_read 3 44687 NULL
121274 +write_file_spectral_bins_44696 write_file_spectral_bins 3 44696 NULL
121275 +lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
121276 +C_SYSC_select_44701 C_SYSC_select 1 44701 NULL
121277 +__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 NULL nohasharray
121278 +xfer_to_user_44713 xfer_to_user 3 44713 &__generic_block_fiemap_44713
121279 +nft_hash_tbl_size_44724 nft_hash_tbl_size 0 44724 NULL
121280 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
121281 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
121282 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
121283 +efx_wanted_parallelism_44732 efx_wanted_parallelism 0 44732 NULL
121284 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
121285 +bch_bio_max_sectors_44755 bch_bio_max_sectors 0 44755 NULL
121286 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
121287 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
121288 +__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
121289 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
121290 +irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
121291 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
121292 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
121293 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
121294 +force_static_address_write_44819 force_static_address_write 3 44819 NULL
121295 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
121296 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
121297 +sisusb_write_44834 sisusb_write 3 44834 NULL
121298 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
121299 +qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
121300 +copydesc_user_44855 copydesc_user 3 44855 NULL
121301 +set_advertising_44870 set_advertising 4 44870 NULL
121302 +init_rs_44873 init_rs 1 44873 NULL
121303 +skb_availroom_44883 skb_availroom 0 44883 NULL
121304 +do_tty_write_44896 do_tty_write 5 44896 NULL
121305 +regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
121306 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
121307 +bytepos_delta_45017 bytepos_delta 0 45017 NULL
121308 +ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
121309 +dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
121310 +sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
121311 +sel_write_user_45060 sel_write_user 3 45060 NULL
121312 +snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
121313 +lnet_expand1tb_45102 lnet_expand1tb 6 45102 NULL
121314 +snd_card_new_45104 snd_card_new 5 45104 NULL
121315 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
121316 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
121317 +usbdev_read_45114 usbdev_read 3 45114 NULL
121318 +send_to_tty_45141 send_to_tty 3 45141 NULL
121319 +cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
121320 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
121321 +device_write_45156 device_write 3 45156 NULL nohasharray
121322 +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 &device_write_45156
121323 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
121324 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
121325 +snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL nohasharray
121326 +sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 &snd_sb_csp_load_user_45190
121327 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
121328 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
121329 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
121330 +event_enable_write_45238 event_enable_write 3 45238 NULL
121331 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
121332 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
121333 +gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
121334 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
121335 +e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
121336 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
121337 +brcmf_sdio_died_dump_45359 brcmf_sdio_died_dump 3 45359 NULL
121338 +null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
121339 +count_skb_frag_slots_45395 count_skb_frag_slots 0 45395 NULL
121340 +sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
121341 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL
121342 +ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
121343 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
121344 +blkdev_direct_IO_45440 blkdev_direct_IO 4 45440 NULL
121345 +__node_remap_45458 __node_remap 4 45458 NULL
121346 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
121347 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
121348 +__calc_request_pg_45470 __calc_request_pg 0 45470 NULL
121349 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
121350 +copy_macs_45534 copy_macs 4 45534 NULL
121351 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
121352 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
121353 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
121354 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
121355 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
121356 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
121357 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
121358 +ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
121359 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
121360 +ip_dst_mtu_maybe_forward_45627 ip_dst_mtu_maybe_forward 0 45627 NULL
121361 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
121362 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
121363 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
121364 +bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray
121365 +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699
121366 +sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
121367 +wlcore_smart_config_decode_event_45714 wlcore_smart_config_decode_event 2-4 45714 NULL
121368 +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
121369 +rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
121370 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
121371 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
121372 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
121373 +osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
121374 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
121375 +rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
121376 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
121377 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
121378 +ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
121379 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
121380 +ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
121381 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
121382 +efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
121383 +isdn_write_45863 isdn_write 3 45863 NULL
121384 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
121385 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
121386 +cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
121387 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
121388 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
121389 +btree_keys_cachelines_45928 btree_keys_cachelines 0 45928 NULL
121390 +alloc_mr_45935 alloc_mr 1 45935 NULL
121391 +copy_to_45969 copy_to 3 45969 NULL
121392 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
121393 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
121394 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
121395 +fnic_reset_stats_read_46030 fnic_reset_stats_read 3 46030 NULL nohasharray
121396 +get_free_entries_46030 get_free_entries 1 46030 &fnic_reset_stats_read_46030
121397 +__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
121398 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
121399 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 NULL nohasharray
121400 +__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 &dma_tx_errors_read_46060
121401 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
121402 +memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
121403 +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
121404 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
121405 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
121406 +rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
121407 +vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 3-2 46146 NULL
121408 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
121409 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
121410 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
121411 +fq_resize_46195 fq_resize 2 46195 NULL
121412 +add_conn_list_46197 add_conn_list 3-0 46197 NULL
121413 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
121414 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
121415 +dsp_write_46218 dsp_write 2 46218 NULL
121416 +hash_netiface4_expire_46226 hash_netiface4_expire 4 46226 NULL
121417 +xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
121418 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
121419 +sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
121420 +C_SYSC_ppoll_46319 C_SYSC_ppoll 2 46319 NULL
121421 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
121422 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
121423 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
121424 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
121425 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
121426 +ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
121427 +cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
121428 +wdata_alloc_and_fillpages_46437 wdata_alloc_and_fillpages 1 46437 NULL
121429 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
121430 +parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
121431 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
121432 +filldir64_46469 filldir64 3 46469 NULL
121433 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
121434 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
121435 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
121436 +kmsg_read_46514 kmsg_read 3 46514 NULL nohasharray
121437 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 &kmsg_read_46514
121438 +nlm_end_grace_write_46517 nlm_end_grace_write 3 46517 NULL
121439 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
121440 +__btrfs_free_extent_46573 __btrfs_free_extent 7 46573 NULL
121441 +dn_current_mss_46574 dn_current_mss 0 46574 NULL
121442 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
121443 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
121444 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
121445 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
121446 +__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
121447 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
121448 +pci_enable_device_46642 pci_enable_device 0 46642 NULL
121449 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
121450 +e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
121451 +l2cap_create_le_flowctl_pdu_46682 l2cap_create_le_flowctl_pdu 3 46682 NULL
121452 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
121453 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
121454 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
121455 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
121456 +irq_domain_add_simple_46734 irq_domain_add_simple 2 46734 NULL
121457 +read_file_tx99_46741 read_file_tx99 3 46741 NULL
121458 +ext4_count_free_46754 ext4_count_free 2 46754 NULL
121459 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
121460 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
121461 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
121462 +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
121463 +readreg_46845 readreg 0 46845 NULL
121464 +spi_async_46857 spi_async 0 46857 NULL
121465 +vsnprintf_46863 vsnprintf 0 46863 NULL
121466 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
121467 +qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
121468 +lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
121469 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
121470 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
121471 +alloc_cmdid_46904 alloc_cmdid 0 46904 NULL
121472 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
121473 +wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
121474 +fb_write_46924 fb_write 3 46924 NULL
121475 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
121476 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
121477 +SYSC_poll_46965 SYSC_poll 2 46965 NULL
121478 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
121479 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
121480 +strlcat_46985 strlcat 3 46985 NULL
121481 +bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
121482 +sel_write_bool_46996 sel_write_bool 3 46996 NULL
121483 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
121484 +cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
121485 +fs_path_len_47060 fs_path_len 0 47060 NULL
121486 +event_trigger_regex_write_47067 event_trigger_regex_write 3 47067 NULL
121487 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
121488 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
121489 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
121490 +ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
121491 +mousedev_read_47123 mousedev_read 3 47123 NULL
121492 +upcall_msg_size_47141 upcall_msg_size 2 47141 NULL
121493 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 NULL nohasharray
121494 +ses_recv_diag_47143 ses_recv_diag 4 47143 &acpi_ut_initialize_buffer_47143
121495 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
121496 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
121497 +options_write_47243 options_write 3 47243 NULL
121498 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
121499 +ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
121500 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
121501 +vsnprintf_47291 vsnprintf 0 47291 NULL
121502 +SYSC_semop_47292 SYSC_semop 3 47292 NULL
121503 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
121504 +virtqueue_add_47306 virtqueue_add 3 47306 NULL
121505 +nouveau_fb_create__47316 nouveau_fb_create_ 4 47316 NULL
121506 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
121507 +nvme_submit_admin_cmd_47357 nvme_submit_admin_cmd 0 47357 NULL
121508 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
121509 +kvm_arch_create_memslot_47364 kvm_arch_create_memslot 3 47364 NULL nohasharray
121510 +__output_copy_user_47364 __output_copy_user 3 47364 &kvm_arch_create_memslot_47364
121511 +__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
121512 +nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
121513 +trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
121514 +nametbl_list_47391 nametbl_list 2 47391 NULL
121515 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
121516 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
121517 +lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
121518 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
121519 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
121520 +lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
121521 +C_SYSC_set_mempolicy_47466 C_SYSC_set_mempolicy 3 47466 NULL
121522 +lprocfs_fid_write_common_47471 lprocfs_fid_write_common 2 47471 NULL
121523 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
121524 +newpart_47485 newpart 6-4 47485 NULL
121525 +mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
121526 +core_sys_select_47494 core_sys_select 1 47494 NULL
121527 +as3722_block_write_47503 as3722_block_write 2-3 47503 NULL
121528 +alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
121529 +unlink_simple_47506 unlink_simple 3 47506 NULL
121530 +pstore_decompress_47510 pstore_decompress 0 47510 NULL
121531 +ec_i2c_count_response_47518 ec_i2c_count_response 0 47518 NULL
121532 +__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
121533 +process_vm_rw_47533 process_vm_rw 3-5 47533 NULL nohasharray
121534 +vscnprintf_47533 vscnprintf 0-2 47533 &process_vm_rw_47533
121535 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
121536 +drbg_statelen_47551 drbg_statelen 0 47551 NULL
121537 +read_ldt_47570 read_ldt 2 47570 NULL
121538 +isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
121539 +btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
121540 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
121541 +sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
121542 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
121543 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
121544 +ccp_sha_setkey_47633 ccp_sha_setkey 3 47633 NULL
121545 +get_size_47644 get_size 1-2 47644 NULL
121546 +osc_brw_prep_request_47680 osc_brw_prep_request 5 47680 NULL
121547 +packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
121548 +ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
121549 +save_microcode_47717 save_microcode 3 47717 NULL
121550 +bits_to_user_47733 bits_to_user 2-3 47733 NULL
121551 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
121552 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
121553 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
121554 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
121555 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
121556 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
121557 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
121558 +ptlrpc_prep_req_47792 ptlrpc_prep_req 4 47792 NULL
121559 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
121560 +W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
121561 +lov_packmd_47810 lov_packmd 0 47810 NULL
121562 +tree_mod_log_insert_move_47823 tree_mod_log_insert_move 5 47823 NULL
121563 +read_file_spectral_bins_47829 read_file_spectral_bins 3 47829 NULL
121564 +pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
121565 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
121566 +vhci_read_47878 vhci_read 3 47878 NULL
121567 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
121568 +cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
121569 +comedi_write_47926 comedi_write 3 47926 NULL
121570 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
121571 +arch_setup_msi_irq_47959 arch_setup_msi_irq 0 47959 NULL
121572 +gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
121573 +mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
121574 +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
121575 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
121576 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
121577 +lustre_cfg_len_48002 lustre_cfg_len 0-1 48002 NULL
121578 +gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
121579 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
121580 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
121581 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
121582 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
121583 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
121584 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
121585 +disc_write_48070 disc_write 3 48070 NULL
121586 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
121587 +skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
121588 +wm_latency_write_48125 wm_latency_write 3 48125 NULL
121589 +load_firmware_48128 load_firmware 2 48128 NULL
121590 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
121591 +set_discoverable_48141 set_discoverable 4 48141 NULL
121592 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
121593 +SyS_vmsplice_48150 SyS_vmsplice 3 48150 NULL
121594 +_add_to_r4w_48152 _add_to_r4w 4 48152 NULL
121595 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
121596 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
121597 +rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 NULL
121598 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
121599 +cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
121600 +ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
121601 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
121602 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
121603 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
121604 +read_file_recv_48232 read_file_recv 3 48232 NULL
121605 +unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL
121606 +nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
121607 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
121608 +batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
121609 +__videobuf_free_48260 __videobuf_free 0 48260 NULL
121610 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
121611 +trace_options_write_48275 trace_options_write 3 48275 NULL
121612 +send_set_info_48288 send_set_info 7 48288 NULL
121613 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
121614 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
121615 +hash_setkey_48310 hash_setkey 3 48310 NULL
121616 +kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
121617 +skb_add_data_48363 skb_add_data 3 48363 NULL
121618 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
121619 +ath10k_read_htt_max_amsdu_ampdu_48401 ath10k_read_htt_max_amsdu_ampdu 3 48401 NULL
121620 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
121621 +uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
121622 +div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
121623 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
121624 +print_filtered_48442 print_filtered 2-0 48442 NULL
121625 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
121626 +copy_page_from_iter_iovec_48466 copy_page_from_iter_iovec 3-0 48466 NULL
121627 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
121628 +_iwl_dbgfs_bt_tx_prio_write_48473 _iwl_dbgfs_bt_tx_prio_write 3 48473 NULL
121629 +ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
121630 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
121631 +ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
121632 +send_control_msg_48498 send_control_msg 6 48498 NULL
121633 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
121634 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
121635 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
121636 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
121637 +drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
121638 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
121639 +nvif_notify_init_48578 nvif_notify_init 7 48578 NULL
121640 +llog_data_len_48607 llog_data_len 1 48607 NULL
121641 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
121642 +kernel_sock_ioctl_48644 kernel_sock_ioctl 0 48644 NULL
121643 +ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
121644 +mtd_read_48655 mtd_read 0 48655 NULL
121645 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
121646 +sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL
121647 +hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
121648 +altera_drscan_48698 altera_drscan 2 48698 NULL
121649 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
121650 +lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
121651 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
121652 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
121653 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
121654 +l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
121655 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
121656 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
121657 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
121658 +azx_get_position_48841 azx_get_position 0 48841 NULL
121659 +vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
121660 +comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
121661 +suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
121662 +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL nohasharray
121663 +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 &viafb_dvp1_proc_write_48864
121664 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
121665 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
121666 +joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
121667 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
121668 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
121669 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
121670 +si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
121671 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
121672 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
121673 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
121674 +nilfs_direct_IO_48981 nilfs_direct_IO 4 48981 NULL
121675 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
121676 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
121677 +null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
121678 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
121679 +transient_status_49027 transient_status 4 49027 NULL
121680 +ll_xattr_cache_add_49032 ll_xattr_cache_add 4-0 49032 NULL
121681 +scsi_register_49094 scsi_register 2 49094 NULL
121682 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
121683 +xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
121684 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
121685 +pt_read_49136 pt_read 3 49136 NULL nohasharray
121686 +netxen_setup_msi_interrupts_49136 netxen_setup_msi_interrupts 2 49136 &pt_read_49136
121687 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
121688 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
121689 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
121690 +__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
121691 +ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
121692 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
121693 +print_queue_49191 print_queue 0-4 49191 NULL
121694 +root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
121695 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
121696 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
121697 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
121698 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
121699 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
121700 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
121701 +ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
121702 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
121703 +viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
121704 +uio_read_49300 uio_read 3 49300 NULL
121705 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
121706 +SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
121707 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
121708 +srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
121709 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
121710 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
121711 +ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
121712 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
121713 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
121714 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
121715 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
121716 +__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
121717 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
121718 +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
121719 +tipc_bclink_get_mtu_49483 tipc_bclink_get_mtu 0 49483 NULL
121720 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
121721 +iwl_dbgfs_disable_power_off_read_49517 iwl_dbgfs_disable_power_off_read 3 49517 NULL
121722 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
121723 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
121724 +smk_write_access_49561 smk_write_access 3 49561 NULL
121725 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
121726 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
121727 +readfifo_49583 readfifo 1 49583 NULL
121728 +tap_write_49595 tap_write 3 49595 NULL
121729 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
121730 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
121731 +heap_init_49617 heap_init 2 49617 NULL
121732 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
121733 +port_fops_read_49626 port_fops_read 3 49626 NULL
121734 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
121735 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
121736 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
121737 +__copy_from_user_nocheck_49699 __copy_from_user_nocheck 0-3 49699 NULL
121738 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
121739 +write_pool_49718 write_pool 3 49718 NULL
121740 +kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL nohasharray
121741 +sfw_create_test_rpc_49723 sfw_create_test_rpc 4 49723 &kvm_mmu_notifier_invalidate_page_49723
121742 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
121743 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
121744 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
121745 +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
121746 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
121747 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
121748 +w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
121749 +ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
121750 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
121751 +__of_parse_phandle_with_args_49807 __of_parse_phandle_with_args 0 49807 NULL
121752 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
121753 +add_uuid_49831 add_uuid 4 49831 NULL
121754 +iraw_loop_49842 iraw_loop 0-1 49842 NULL
121755 +twl4030_write_49846 twl4030_write 2 49846 NULL
121756 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
121757 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
121758 +fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
121759 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
121760 +osc_brw_49896 osc_brw 4 49896 NULL
121761 +fuse_send_write_49915 fuse_send_write 4-0 49915 NULL
121762 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
121763 +drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
121764 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
121765 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
121766 +security_context_to_sid_50019 security_context_to_sid 2 50019 NULL
121767 +isdn_read_50021 isdn_read 3 50021 NULL
121768 +mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
121769 +xlog_recovery_process_trans_50028 xlog_recovery_process_trans 4 50028 NULL
121770 +brcmf_debugfs_chipinfo_read_50033 brcmf_debugfs_chipinfo_read 3 50033 NULL
121771 +ioread8_50049 ioread8 0 50049 NULL
121772 +fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
121773 +__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
121774 +dev_set_alias_50084 dev_set_alias 3 50084 NULL
121775 +libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
121776 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
121777 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
121778 +android_set_cntry_50100 android_set_cntry 0 50100 NULL
121779 +read_file_slot_50111 read_file_slot 3 50111 NULL
121780 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
121781 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
121782 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
121783 +kmalloc_node_50163 kmalloc_node 1 50163 NULL
121784 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
121785 +ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
121786 +odev_update_50169 odev_update 2 50169 NULL
121787 +ubi_resize_volume_50172 ubi_resize_volume 2 50172 NULL nohasharray
121788 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 &ubi_resize_volume_50172
121789 +cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
121790 +cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
121791 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
121792 +l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
121793 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
121794 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
121795 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
121796 +soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
121797 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
121798 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
121799 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
121800 +do_launder_page_50329 do_launder_page 0 50329 NULL
121801 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
121802 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
121803 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 NULL
121804 +tpm_read_50344 tpm_read 3 50344 NULL
121805 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
121806 +iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 NULL
121807 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
121808 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
121809 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
121810 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
121811 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
121812 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
121813 +btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
121814 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
121815 +device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
121816 +cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
121817 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
121818 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
121819 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
121820 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
121821 +trigger_request_store_50548 trigger_request_store 4 50548 NULL
121822 +usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
121823 +fat_readpages_50582 fat_readpages 4 50582 NULL
121824 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
121825 +xillybus_write_50605 xillybus_write 3 50605 NULL
121826 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
121827 +sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
121828 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
121829 +ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
121830 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
121831 +prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
121832 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
121833 +dev_mem_read_50706 dev_mem_read 3 50706 NULL
121834 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
121835 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
121836 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
121837 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
121838 +tpm_write_50798 tpm_write 3 50798 NULL
121839 +tun_do_read_50800 tun_do_read 4 50800 NULL
121840 +write_flush_50803 write_flush 3 50803 NULL
121841 +dvb_play_50814 dvb_play 3 50814 NULL
121842 +btrfs_stack_file_extent_disk_num_bytes_50825 btrfs_stack_file_extent_disk_num_bytes 0 50825 NULL
121843 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
121844 +SetArea_50835 SetArea 4 50835 NULL
121845 +nft_trans_alloc_50836 nft_trans_alloc 3 50836 NULL
121846 +videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
121847 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
121848 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
121849 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
121850 +__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
121851 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
121852 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
121853 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
121854 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
121855 +show_device_status_50947 show_device_status 0 50947 NULL
121856 +irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
121857 +virtio_cread16_50951 virtio_cread16 0 50951 NULL
121858 +sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
121859 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
121860 +of_modalias_node_50975 of_modalias_node 3 50975 NULL
121861 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
121862 +timeout_write_50991 timeout_write 3 50991 NULL
121863 +proc_write_51003 proc_write 3 51003 NULL
121864 +jbd2_journal_extend_51012 jbd2_journal_extend 2 51012 NULL
121865 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
121866 +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL
121867 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
121868 +dump_midi_51040 dump_midi 3 51040 NULL
121869 +usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
121870 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
121871 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
121872 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
121873 +rsc_mgr_init_51067 rsc_mgr_init 3 51067 NULL
121874 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
121875 +__ipv4_tun_to_nlattr_51095 __ipv4_tun_to_nlattr 4 51095 NULL
121876 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
121877 +ti_recv_51110 ti_recv 3 51110 NULL
121878 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
121879 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
121880 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
121881 +i40evf_acquire_msix_vectors_51190 i40evf_acquire_msix_vectors 2 51190 NULL
121882 +iwl_dbgfs_bcast_filters_macs_read_51231 iwl_dbgfs_bcast_filters_macs_read 3 51231 NULL
121883 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
121884 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
121885 +drm_property_create_51239 drm_property_create 4 51239 NULL
121886 +st_read_51251 st_read 3 51251 NULL
121887 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
121888 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
121889 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
121890 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
121891 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
121892 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
121893 +init_map_ipmac_51317 init_map_ipmac 5 51317 NULL
121894 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
121895 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
121896 +smk_write_ptrace_51333 smk_write_ptrace 3 51333 NULL
121897 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
121898 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
121899 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
121900 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
121901 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
121902 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
121903 +hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
121904 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
121905 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
121906 +vmxnet3_acquire_msix_vectors_51462 vmxnet3_acquire_msix_vectors 2 51462 NULL
121907 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
121908 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
121909 +osc_brw_internal_51489 osc_brw_internal 5 51489 NULL
121910 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
121911 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
121912 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
121913 +batadv_tt_prepare_tvlv_local_data_51568 batadv_tt_prepare_tvlv_local_data 0 51568 NULL
121914 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
121915 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
121916 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
121917 +extent_fiemap_51621 extent_fiemap 3 51621 NULL
121918 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
121919 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
121920 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
121921 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
121922 +rtw_os_xmit_resource_alloc23a_51693 rtw_os_xmit_resource_alloc23a 3 51693 NULL
121923 +host_mapping_level_51696 host_mapping_level 0 51696 NULL
121924 +sel_write_access_51704 sel_write_access 3 51704 NULL
121925 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
121926 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
121927 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
121928 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
121929 +str_read_51731 str_read 4 51731 NULL
121930 +cm4040_read_51732 cm4040_read 3 51732 NULL
121931 +get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
121932 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
121933 +if_write_51756 if_write 3 51756 NULL
121934 +ssd1307fb_alloc_array_51788 ssd1307fb_alloc_array 1 51788 NULL
121935 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
121936 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
121937 +ioread32_51847 ioread32 0 51847 NULL nohasharray
121938 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
121939 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
121940 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
121941 +bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
121942 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
121943 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
121944 +user_read_51881 user_read 3 51881 NULL
121945 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
121946 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL
121947 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
121948 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
121949 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
121950 +xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
121951 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
121952 +get_clock_info_51952 get_clock_info 4 51952 NULL
121953 +snd_mask_min_51969 snd_mask_min 0 51969 NULL
121954 +get_zone_51981 get_zone 0-1 51981 NULL
121955 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
121956 +_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
121957 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
121958 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
121959 +rdmalt_52022 rdmalt 0 52022 NULL
121960 +override_release_52032 override_release 2 52032 NULL
121961 +end_port_52042 end_port 0 52042 NULL
121962 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
121963 +msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
121964 +dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
121965 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
121966 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
121967 +mxuport_process_read_urb_data_52072 mxuport_process_read_urb_data 3 52072 NULL
121968 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
121969 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
121970 +smsdvb_stats_read_52114 smsdvb_stats_read 3 52114 NULL
121971 +split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
121972 +retry_count_read_52129 retry_count_read 3 52129 NULL
121973 +gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
121974 +sub_alloc_52140 sub_alloc 0 52140 NULL
121975 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
121976 +htable_size_52148 htable_size 0-1 52148 NULL
121977 +smk_write_load2_52155 smk_write_load2 3 52155 NULL
121978 +tipc_node_get_mtu_52157 tipc_node_get_mtu 0 52157 NULL
121979 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
121980 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
121981 +print_prefix_52176 print_prefix 0 52176 NULL
121982 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
121983 +reiserfs_posix_acl_from_disk_52191 reiserfs_posix_acl_from_disk 2 52191 NULL
121984 +f2fs_seek_block_52194 f2fs_seek_block 2 52194 NULL
121985 +vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
121986 +fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL
121987 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
121988 +shrink_slab_52261 shrink_slab 2 52261 NULL
121989 +ext2_direct_IO_52270 ext2_direct_IO 4 52270 NULL
121990 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
121991 +handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
121992 +kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
121993 +read_file_reset_52310 read_file_reset 3 52310 NULL
121994 +ssd1307fb_write_52315 ssd1307fb_write 3 52315 NULL
121995 +request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
121996 +hwflags_read_52318 hwflags_read 3 52318 NULL
121997 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
121998 +hur_len_52339 hur_len 0 52339 NULL
121999 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
122000 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
122001 +iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
122002 +hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
122003 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
122004 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
122005 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
122006 +aer_inject_write_52399 aer_inject_write 3 52399 NULL
122007 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
122008 +hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
122009 +delay_status_52431 delay_status 5 52431 NULL
122010 +ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
122011 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
122012 +alauda_read_data_52452 alauda_read_data 3 52452 NULL
122013 +bt_alloc_52457 bt_alloc 2 52457 NULL
122014 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
122015 +usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
122016 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
122017 +fd_do_rw_52495 fd_do_rw 3 52495 NULL
122018 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
122019 +lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
122020 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
122021 +bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
122022 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
122023 +raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
122024 +SyS_vmsplice_52540 SyS_vmsplice 3 52540 NULL
122025 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
122026 +debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
122027 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
122028 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
122029 +ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
122030 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
122031 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
122032 +nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
122033 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
122034 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
122035 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
122036 +__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
122037 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
122038 +blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
122039 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
122040 +hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
122041 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
122042 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
122043 +nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
122044 +xenvif_write_io_ring_52802 xenvif_write_io_ring 3 52802 NULL
122045 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
122046 +lb_alloc_ep_req_52837 lb_alloc_ep_req 2 52837 NULL
122047 +mon_bin_get_event_52863 mon_bin_get_event 4-6 52863 NULL
122048 +twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
122049 +qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
122050 +twlreg_write_52880 twlreg_write 3 52880 NULL
122051 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
122052 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
122053 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
122054 +copy_from_iter_bvec_52912 copy_from_iter_bvec 0-2 52912 NULL
122055 +dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
122056 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
122057 +iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
122058 +__nodes_remap_52951 __nodes_remap 5 52951 NULL
122059 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
122060 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
122061 +num_node_state_52989 num_node_state 0 52989 NULL
122062 +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
122063 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
122064 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
122065 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
122066 +nv50_chan_create_53039 nv50_chan_create 5 53039 NULL
122067 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
122068 +fimc_get_alpha_mask_53057 fimc_get_alpha_mask 0 53057 NULL
122069 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
122070 +iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
122071 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
122072 +mic_virtio_copy_from_user_53107 mic_virtio_copy_from_user 3 53107 NULL
122073 +ath10k_mac_create_53118 ath10k_mac_create 1 53118 NULL
122074 +verity_status_53120 verity_status 5 53120 NULL
122075 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
122076 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
122077 +copy_user_segment_list_53150 copy_user_segment_list 2 53150 NULL
122078 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
122079 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
122080 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
122081 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
122082 +ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
122083 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
122084 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
122085 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
122086 +f2fs_fiemap_53310 f2fs_fiemap 4 53310 NULL
122087 +ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
122088 +find_nr_power_limit_53330 find_nr_power_limit 0 53330 NULL
122089 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
122090 +btree_keys_bytes_53348 btree_keys_bytes 0 53348 NULL
122091 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
122092 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
122093 +test_fw_misc_read_53384 test_fw_misc_read 3 53384 NULL
122094 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
122095 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
122096 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
122097 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
122098 +ima_write_template_field_data_53475 ima_write_template_field_data 2 53475 NULL nohasharray
122099 +create_trace_kprobe_53475 create_trace_kprobe 1 53475 &ima_write_template_field_data_53475
122100 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
122101 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
122102 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
122103 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
122104 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
122105 +check_acl_53512 check_acl 0 53512 NULL nohasharray
122106 +force_sc_support_write_53512 force_sc_support_write 3 53512 &check_acl_53512
122107 +nft_data_dump_53549 nft_data_dump 5 53549 NULL
122108 +SYSC_bind_53582 SYSC_bind 3 53582 NULL
122109 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
122110 +proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
122111 +pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
122112 +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL nohasharray
122113 +wil_write_file_txmgmt_53626 wil_write_file_txmgmt 3 53626 &___alloc_bootmem_nopanic_53626
122114 +ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
122115 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
122116 +fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
122117 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
122118 +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
122119 +igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690
122120 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
122121 +__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
122122 +wdm_write_53735 wdm_write 3 53735 NULL
122123 +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL
122124 +wa_populate_buf_in_urb_53758 wa_populate_buf_in_urb 3-4 53758 NULL
122125 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
122126 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
122127 +qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
122128 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
122129 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
122130 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
122131 +setup_data_read_53822 setup_data_read 3 53822 NULL
122132 +btrfs_free_reserved_extent_53873 btrfs_free_reserved_extent 2 53873 NULL nohasharray
122133 +pms_read_53873 pms_read 3 53873 &btrfs_free_reserved_extent_53873
122134 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
122135 +SyS_setgroups_53900 SyS_setgroups 1 53900 NULL
122136 +batadv_tt_tvlv_ogm_handler_v1_53909 batadv_tt_tvlv_ogm_handler_v1 5 53909 NULL
122137 +azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
122138 +usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
122139 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
122140 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
122141 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
122142 +hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
122143 +snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
122144 +mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
122145 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
122146 +batadv_tt_update_orig_54049 batadv_tt_update_orig 6-4 54049 NULL
122147 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
122148 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
122149 +rproc_state_read_54057 rproc_state_read 3 54057 NULL
122150 +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
122151 +altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
122152 +lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
122153 +__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
122154 +strn_len_54122 strn_len 0 54122 NULL
122155 +isku_receive_54130 isku_receive 4 54130 NULL
122156 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
122157 +irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
122158 +memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
122159 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
122160 +p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
122161 +do_sys_poll_54221 do_sys_poll 2 54221 NULL
122162 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
122163 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
122164 +mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
122165 +reada_add_block_54247 reada_add_block 2 54247 NULL
122166 +write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
122167 +xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
122168 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
122169 +audio_write_54261 audio_write 4 54261 NULL nohasharray
122170 +wusb_prf_54261 wusb_prf 7 54261 &audio_write_54261
122171 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
122172 +kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
122173 +sizeof_long_54276 sizeof_long 0 54276 NULL
122174 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
122175 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
122176 +reclaim_pages_54301 reclaim_pages 3 54301 NULL
122177 +sprintf_54306 sprintf 0 54306 NULL
122178 +path_setxattr_54308 path_setxattr 4 54308 NULL
122179 +bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
122180 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
122181 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
122182 +__get_free_pages_54352 __get_free_pages 0 54352 NULL
122183 +readlink_copy_54366 readlink_copy 2 54366 NULL
122184 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
122185 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 NULL nohasharray
122186 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 &intel_sdvo_write_cmd_54377
122187 +ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
122188 +snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL
122189 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL nohasharray
122190 +hash_mac4_expire_54392 hash_mac4_expire 4 54392 &iwl_dbgfs_power_save_status_read_54392
122191 +ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
122192 +copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
122193 +sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
122194 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
122195 +l2cap_create_basic_pdu_54508 l2cap_create_basic_pdu 3 54508 NULL
122196 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
122197 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
122198 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
122199 +viacam_read_54526 viacam_read 3 54526 NULL
122200 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
122201 +setsockopt_54539 setsockopt 5 54539 NULL
122202 +lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
122203 +SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL
122204 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
122205 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
122206 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
122207 +irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
122208 +port_fops_write_54627 port_fops_write 3 54627 NULL
122209 +tipc_send_stream_54648 tipc_send_stream 4 54648 NULL
122210 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
122211 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
122212 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
122213 +simple_alloc_urb_54661 simple_alloc_urb 3 54661 NULL
122214 +tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
122215 +bus_add_device_54665 bus_add_device 0 54665 NULL
122216 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
122217 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
122218 +evm_read_key_54674 evm_read_key 3 54674 NULL
122219 +jfs_direct_IO_54687 jfs_direct_IO 4 54687 NULL
122220 +rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
122221 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
122222 +kzalloc_54740 kzalloc 1 54740 NULL
122223 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
122224 +lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
122225 +crystalhd_user_data_54754 crystalhd_user_data 3 54754 NULL
122226 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
122227 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
122228 +ldsem_atomic_update_54774 ldsem_atomic_update 1 54774 NULL
122229 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
122230 +nfsd_write_54809 nfsd_write 6 54809 NULL
122231 +ar9287_dump_modal_eeprom_54814 ar9287_dump_modal_eeprom 3-2 54814 NULL
122232 +kvzalloc_54815 kvzalloc 1 54815 NULL nohasharray
122233 +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815 nohasharray
122234 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &crypto_tfm_ctx_alignment_54815
122235 +generic_perform_write_54832 generic_perform_write 3 54832 NULL
122236 +write_rio_54837 write_rio 3 54837 NULL
122237 +ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
122238 +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
122239 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
122240 +printer_read_54851 printer_read 3 54851 NULL
122241 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
122242 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
122243 +iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL nohasharray
122244 +kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
122245 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
122246 +bio_add_page_54933 bio_add_page 0-3 54933 NULL
122247 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
122248 +add_port_54941 add_port 2 54941 NULL
122249 +tipc_send2name_54946 tipc_send2name 5 54946 NULL
122250 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0-3 54949 NULL
122251 +alauda_write_data_54967 alauda_write_data 3 54967 NULL
122252 +c4_add_card_54968 c4_add_card 3 54968 NULL
122253 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
122254 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
122255 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
122256 +efw_transaction_55052 efw_transaction 5-7 55052 NULL
122257 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
122258 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
122259 +read_dma_55086 read_dma 3 55086 NULL
122260 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
122261 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
122262 +filldir_55137 filldir 3 55137 NULL
122263 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
122264 +npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
122265 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
122266 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
122267 +compat_SyS_ppoll_55196 compat_SyS_ppoll 2 55196 NULL
122268 +sched_feat_write_55202 sched_feat_write 3 55202 NULL
122269 +ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
122270 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
122271 +mlx4_load_one_55213 mlx4_load_one 3 55213 NULL
122272 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
122273 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
122274 +nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
122275 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
122276 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
122277 +lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
122278 +persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
122279 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
122280 +lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
122281 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
122282 +wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
122283 +qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL nohasharray
122284 +compat_SyS_process_vm_readv_55305 compat_SyS_process_vm_readv 3-5 55305 &qp_alloc_guest_work_55305
122285 +compat_SyS_mbind_55329 compat_SyS_mbind 5 55329 NULL
122286 +vme_user_read_55338 vme_user_read 3 55338 NULL
122287 +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
122288 +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
122289 +cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
122290 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
122291 +nouveau_cli_create_55425 nouveau_cli_create 3 55425 NULL
122292 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
122293 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
122294 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
122295 +ufshcd_exec_dev_cmd_55479 ufshcd_exec_dev_cmd 0 55479 NULL
122296 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
122297 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
122298 +batadv_tt_entries_55487 batadv_tt_entries 0-1 55487 NULL
122299 +ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 NULL
122300 +tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
122301 +ea_get_55522 ea_get 3-0 55522 NULL
122302 +buffer_size_55534 buffer_size 0 55534 NULL
122303 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
122304 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
122305 +hash_ipport6_expire_55549 hash_ipport6_expire 4 55549 NULL
122306 +dm_stats_list_55551 dm_stats_list 4 55551 NULL
122307 +compat_SyS_setsockopt_55581 compat_SyS_setsockopt 5 55581 NULL
122308 +add_partition_55588 add_partition 2 55588 NULL
122309 +kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
122310 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
122311 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
122312 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
122313 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
122314 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
122315 +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
122316 +osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
122317 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
122318 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
122319 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
122320 +get_info_55681 get_info 3 55681 NULL
122321 +iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
122322 +ext4_alloc_file_blocks_55689 ext4_alloc_file_blocks 3 55689 NULL
122323 +genl_allocate_reserve_groups_55705 genl_allocate_reserve_groups 1 55705 NULL
122324 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
122325 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
122326 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
122327 +set_local_name_55757 set_local_name 4 55757 NULL
122328 +ethtool_copy_validate_indir_55769 ethtool_copy_validate_indir 4 55769 NULL
122329 +strlen_55778 strlen 0 55778 NULL
122330 +set_spte_55783 set_spte 4-5 55783 NULL
122331 +conf_read_55786 conf_read 3 55786 NULL nohasharray
122332 +req_bio_endio_55786 req_bio_endio 3 55786 &conf_read_55786
122333 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
122334 +sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
122335 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
122336 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
122337 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
122338 +hsc_write_55875 hsc_write 3 55875 NULL
122339 +ramdisk_store_55885 ramdisk_store 4 55885 NULL
122340 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
122341 +hash_ip4_expire_55911 hash_ip4_expire 4 55911 NULL
122342 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
122343 +kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
122344 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
122345 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
122346 +simple_read_from_buffer_55957 simple_read_from_buffer 5-2-0 55957 NULL
122347 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
122348 +btrfs_clone_55977 btrfs_clone 5-3-6 55977 NULL
122349 +wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 3-2 55992 NULL
122350 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
122351 +iwl_trans_read_prph_56052 iwl_trans_read_prph 0 56052 NULL
122352 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
122353 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
122354 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
122355 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
122356 +write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
122357 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
122358 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0-3 56194 NULL
122359 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
122360 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
122361 +ufshcd_query_descriptor_56236 ufshcd_query_descriptor 0 56236 NULL
122362 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
122363 +fd_copyin_56247 fd_copyin 3 56247 NULL
122364 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
122365 +acpi_ex_get_serial_access_length_56275 acpi_ex_get_serial_access_length 0-2 56275 NULL
122366 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
122367 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
122368 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
122369 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
122370 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
122371 +speakup_file_write_56310 speakup_file_write 3 56310 NULL
122372 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
122373 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
122374 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
122375 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
122376 +mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
122377 +iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
122378 +dev_read_56369 dev_read 3 56369 NULL
122379 +ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
122380 +lnet_ping_56378 lnet_ping 4 56378 NULL
122381 +write_gssp_56404 write_gssp 3 56404 NULL
122382 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
122383 +store_msg_56417 store_msg 3 56417 NULL
122384 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
122385 +l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL nohasharray
122386 +nvme_submit_cmd_56426 nvme_submit_cmd 0 56426 &l2cap_segment_le_sdu_56426
122387 +lprocfs_fid_space_seq_write_56431 lprocfs_fid_space_seq_write 3 56431 NULL nohasharray
122388 +ec_dbgfs_cmd_read_56431 ec_dbgfs_cmd_read 3 56431 &lprocfs_fid_space_seq_write_56431
122389 +fl_create_56435 fl_create 5 56435 NULL
122390 +gnttab_map_56439 gnttab_map 2 56439 NULL
122391 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
122392 +set_connectable_56458 set_connectable 4 56458 NULL
122393 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
122394 +putused_user_56467 putused_user 3 56467 NULL
122395 +ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 3-2 56468 NULL
122396 +lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
122397 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
122398 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
122399 +memblock_virt_alloc_56501 memblock_virt_alloc 1 56501 NULL
122400 +init_map_ip_56508 init_map_ip 5 56508 NULL
122401 +lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
122402 +cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
122403 +ip_options_get_56538 ip_options_get 4 56538 NULL
122404 +ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
122405 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
122406 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
122407 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
122408 +gro_pull_from_frag0_56593 gro_pull_from_frag0 2 56593 NULL
122409 +event_filter_write_56609 event_filter_write 3 56609 NULL
122410 +nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
122411 +gather_array_56641 gather_array 3 56641 NULL
122412 +lookup_extent_backref_56644 lookup_extent_backref 9 56644 NULL
122413 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
122414 +nv50_gpio_intr_mask_56665 nv50_gpio_intr_mask 4-3 56665 NULL
122415 +tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
122416 +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
122417 +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
122418 +sfw_alloc_pages_56709 sfw_alloc_pages 3 56709 NULL
122419 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
122420 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
122421 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
122422 +__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
122423 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
122424 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
122425 +ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 NULL
122426 +ion_ioctl_56806 ion_ioctl 2 56806 NULL
122427 +do_syslog_56807 do_syslog 3 56807 NULL
122428 +mtdchar_write_56831 mtdchar_write 3 56831 NULL
122429 +snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
122430 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
122431 +gk20a_ram_get_56863 gk20a_ram_get 2 56863 NULL
122432 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
122433 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
122434 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
122435 +le_auto_conn_write_56895 le_auto_conn_write 3 56895 NULL nohasharray
122436 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 &le_auto_conn_write_56895
122437 +hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
122438 +strcspn_56913 strcspn 0 56913 NULL
122439 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
122440 +journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
122441 +nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
122442 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
122443 +sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
122444 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
122445 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
122446 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
122447 +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray
122448 +skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043
122449 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
122450 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
122451 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
122452 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
122453 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
122454 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
122455 +altera_get_note_57099 altera_get_note 6 57099 NULL
122456 +hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
122457 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
122458 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
122459 +ima_show_htable_value_57136 ima_show_htable_value 2 57136 NULL nohasharray
122460 +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136 nohasharray
122461 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136
122462 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
122463 +_iwl_dbgfs_bf_params_write_57141 _iwl_dbgfs_bf_params_write 3 57141 NULL
122464 +acpi_gsb_i2c_read_bytes_57145 acpi_gsb_i2c_read_bytes 4 57145 NULL
122465 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
122466 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
122467 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
122468 +hash_netnet6_expire_57191 hash_netnet6_expire 4 57191 NULL
122469 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
122470 +dma_fifo_alloc_57236 dma_fifo_alloc 2-3-5 57236 NULL
122471 +drbg_blocklen_57239 drbg_blocklen 0 57239 NULL
122472 +rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
122473 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
122474 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
122475 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
122476 +lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
122477 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
122478 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
122479 +string_length_no_trail_57290 string_length_no_trail 0-2 57290 NULL
122480 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
122481 +write_file_regval_57313 write_file_regval 3 57313 NULL
122482 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
122483 +usblp_read_57342 usblp_read 3 57342 NULL
122484 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
122485 +dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
122486 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
122487 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
122488 +bzImage64_load_57388 bzImage64_load 7 57388 NULL
122489 +read_file_blob_57406 read_file_blob 3 57406 NULL
122490 +enclosure_register_57412 enclosure_register 3 57412 NULL
122491 +read_file_eeprom_57428 read_file_eeprom 3 57428 NULL
122492 +compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
122493 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
122494 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
122495 +sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
122496 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
122497 +read_file_skb_rx_57490 read_file_skb_rx 3 57490 NULL
122498 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
122499 +skb_headlen_57501 skb_headlen 0 57501 NULL
122500 +copy_in_user_57502 copy_in_user 3 57502 NULL
122501 +ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
122502 +init_tag_map_57515 init_tag_map 3 57515 NULL
122503 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
122504 +il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517
122505 +cmm_read_57520 cmm_read 3 57520 NULL
122506 +inode_permission_57531 inode_permission 0 57531 NULL
122507 +acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
122508 +ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
122509 +compat_SyS_process_vm_writev_57542 compat_SyS_process_vm_writev 3-5 57542 NULL
122510 +ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL
122511 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
122512 +get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
122513 +ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
122514 +il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
122515 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
122516 +copy_to_iter_bvec_57604 copy_to_iter_bvec 0-2 57604 NULL
122517 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
122518 +sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
122519 +mem_read_57631 mem_read 3 57631 NULL
122520 +r3964_write_57662 r3964_write 4 57662 NULL
122521 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
122522 +__lgwrite_57669 __lgwrite 4 57669 NULL
122523 +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
122524 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
122525 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
122526 +pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL
122527 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
122528 +SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
122529 +ld2_57794 ld2 0 57794 NULL
122530 +ivtv_read_57796 ivtv_read 3 57796 NULL
122531 +ion_test_ioctl_57799 ion_test_ioctl 2 57799 NULL
122532 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
122533 +copy_to_user_57835 copy_to_user 3-0 57835 NULL
122534 +flash_read_57843 flash_read 3 57843 NULL
122535 +kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
122536 +radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3 57879 NULL
122537 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
122538 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
122539 +ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
122540 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
122541 +mwifiex_hscfg_read_57920 mwifiex_hscfg_read 3 57920 NULL
122542 +twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
122543 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
122544 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
122545 +xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
122546 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
122547 +arch_gnttab_init_57948 arch_gnttab_init 2-1 57948 NULL
122548 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
122549 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
122550 +iov_iter_npages_57979 iov_iter_npages 0-2 57979 NULL
122551 +do_rx_dma_57996 do_rx_dma 5 57996 NULL
122552 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
122553 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
122554 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
122555 +mce_async_out_58056 mce_async_out 3 58056 NULL
122556 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
122557 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
122558 +cm4040_write_58079 cm4040_write 3 58079 NULL
122559 +savemem_58129 savemem 3 58129 NULL
122560 +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
122561 +slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
122562 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
122563 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
122564 +i40evf_allocate_virt_mem_d_58210 i40evf_allocate_virt_mem_d 3 58210 NULL
122565 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
122566 +read_file_debug_58256 read_file_debug 3 58256 NULL
122567 +osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
122568 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
122569 +profile_load_58267 profile_load 3 58267 NULL
122570 +kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
122571 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
122572 +r100_mm_rreg_58276 r100_mm_rreg 0 58276 NULL
122573 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
122574 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
122575 +mic_virtio_copy_from_user_58323 mic_virtio_copy_from_user 3 58323 NULL
122576 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
122577 +lstcon_rpc_prep_58325 lstcon_rpc_prep 4 58325 NULL
122578 +ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
122579 +__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
122580 +ec_i2c_parse_response_58347 ec_i2c_parse_response 0 58347 NULL
122581 +brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
122582 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
122583 +_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
122584 +kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL nohasharray
122585 +idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
122586 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
122587 +capabilities_read_58457 capabilities_read 3 58457 NULL
122588 +usnic_vnic_get_resources_58462 usnic_vnic_get_resources 3 58462 NULL
122589 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 NULL nohasharray
122590 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 &compat_do_ipt_set_ctl_58466
122591 +nv_rd08_58472 nv_rd08 0 58472 NULL
122592 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
122593 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
122594 +dw_spi_show_regs_58486 dw_spi_show_regs 3 58486 NULL
122595 +btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
122596 +tcf_hash_create_58507 tcf_hash_create 4 58507 NULL
122597 +cifs_write_from_iter_58526 cifs_write_from_iter 2 58526 NULL
122598 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
122599 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
122600 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
122601 +cur_wm_latency_write_58581 cur_wm_latency_write 3 58581 NULL
122602 +get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
122603 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
122604 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
122605 +xip_file_read_58592 xip_file_read 3 58592 NULL
122606 +ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
122607 +radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
122608 +btrfs_direct_IO_58608 btrfs_direct_IO 4 58608 NULL
122609 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
122610 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
122611 +iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
122612 +find_zero_58685 find_zero 0-1 58685 NULL
122613 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
122614 +tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
122615 +visor_charqueue_create_58703 visor_charqueue_create 1 58703 NULL
122616 +vx_send_msg_58711 vx_send_msg 0 58711 NULL
122617 +csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
122618 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
122619 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
122620 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
122621 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
122622 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
122623 +isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
122624 +ep_read_58813 ep_read 3 58813 NULL
122625 +command_write_58841 command_write 3 58841 NULL
122626 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
122627 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
122628 +esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
122629 +lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
122630 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
122631 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
122632 +wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
122633 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
122634 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
122635 +init_list_set_59005 init_list_set 3 59005 NULL
122636 +ep_write_59008 ep_write 3 59008 NULL
122637 +lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
122638 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
122639 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
122640 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
122641 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
122642 +regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
122643 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
122644 +sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 NULL nohasharray
122645 +scsi_io_completion_59122 scsi_io_completion 2 59122 &sta_tx_latency_stat_table_59122
122646 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
122647 +framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray
122648 +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145
122649 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
122650 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
122651 +ksize_59176 ksize 0 59176 NULL
122652 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
122653 +ocfs2_move_extent_59187 ocfs2_move_extent 2-5 59187 NULL
122654 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
122655 +check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
122656 +dt3155_read_59226 dt3155_read 3 59226 NULL
122657 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
122658 +nla_len_59258 nla_len 0 59258 NULL
122659 +drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
122660 +btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
122661 +fd_copyout_59323 fd_copyout 3 59323 NULL
122662 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
122663 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
122664 +__map_request_59350 __map_request 0 59350 NULL
122665 +SyS_getrandom_59366 SyS_getrandom 2 59366 NULL
122666 +f2fs_fallocate_59377 f2fs_fallocate 4-3 59377 NULL
122667 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
122668 +journal_init_dev_59384 journal_init_dev 5 59384 NULL
122669 +__net_get_random_once_59389 __net_get_random_once 2 59389 NULL
122670 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
122671 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
122672 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
122673 +fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
122674 +tipc_recv_stream_59456 tipc_recv_stream 4 59456 NULL
122675 +_iwl_dbgfs_bcast_filters_write_59491 _iwl_dbgfs_bcast_filters_write 3 59491 NULL
122676 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
122677 +C_SYSC_get_mempolicy_59516 C_SYSC_get_mempolicy 3 59516 NULL
122678 +mic_vringh_copy_59523 mic_vringh_copy 4 59523 NULL
122679 +msix_setup_entries_59545 msix_setup_entries 0 59545 NULL
122680 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
122681 +tunables_write_59563 tunables_write 3 59563 NULL
122682 +bio_split_59564 bio_split 2 59564 NULL
122683 +__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
122684 +write_pbl_59583 write_pbl 4 59583 NULL
122685 +memdup_user_59590 memdup_user 2 59590 NULL
122686 +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
122687 +xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
122688 +ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
122689 +mtrr_write_59622 mtrr_write 3 59622 NULL
122690 +find_first_zero_bit_59636 find_first_zero_bit 0 59636 NULL
122691 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
122692 +hidraw_read_59650 hidraw_read 3 59650 NULL
122693 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
122694 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
122695 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
122696 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
122697 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
122698 +ioperm_get_59701 ioperm_get 4-3 59701 NULL
122699 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
122700 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL nohasharray
122701 +nv94_aux_mask_59740 nv94_aux_mask 2 59740 &ieee80211_if_read_fwded_unicast_59740
122702 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
122703 +strnlen_59746 strnlen 0 59746 NULL
122704 +ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
122705 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
122706 +venus_remove_59781 venus_remove 4 59781 NULL
122707 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
122708 +C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL
122709 +ipw_write_59807 ipw_write 3 59807 NULL
122710 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
122711 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
122712 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
122713 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
122714 +biovec_create_pool_59878 biovec_create_pool 1 59878 NULL
122715 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
122716 +l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
122717 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
122718 +kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
122719 +ath10k_read_dfs_stats_59949 ath10k_read_dfs_stats 3 59949 NULL
122720 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 NULL nohasharray
122721 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 &dapm_widget_power_read_file_59950
122722 +il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
122723 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
122724 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
122725 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
122726 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
122727 +copy_items_60009 copy_items 7 60009 NULL
122728 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
122729 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
122730 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
122731 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
122732 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
122733 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
122734 +vcs_size_60050 vcs_size 0 60050 NULL
122735 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
122736 +compat_writev_60063 compat_writev 3 60063 NULL
122737 +ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
122738 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
122739 +usb_os_desc_prepare_interf_dir_60075 usb_os_desc_prepare_interf_dir 2 60075 NULL
122740 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
122741 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
122742 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
122743 +nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
122744 +pcpu_need_to_extend_60133 pcpu_need_to_extend 0 60133 NULL
122745 +__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
122746 +ld_usb_read_60156 ld_usb_read 3 60156 NULL
122747 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
122748 +init_state_60165 init_state 2 60165 NULL
122749 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 NULL nohasharray
122750 +sg_build_sgat_60179 sg_build_sgat 3 60179 &jffs2_alloc_full_dirent_60179
122751 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
122752 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL nohasharray
122753 +arch_setup_msi_irqs_60193 arch_setup_msi_irqs 0 60193 &rx_rx_tkip_replays_read_60193
122754 +qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
122755 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
122756 +irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 2-3 60264 NULL
122757 +display_crc_ctl_write_60273 display_crc_ctl_write 3 60273 NULL
122758 +printer_write_60276 printer_write 3 60276 NULL
122759 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
122760 +getDataLength_60301 getDataLength 0 60301 NULL
122761 +bch_subtract_dirty_60306 bch_subtract_dirty 3-4 60306 NULL
122762 +usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
122763 +__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
122764 +max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
122765 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
122766 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
122767 +ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
122768 +driver_names_read_60399 driver_names_read 3 60399 NULL
122769 +simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
122770 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
122771 +kmalloc_60432 kmalloc 1 60432 NULL nohasharray
122772 +tstats_write_60432 tstats_write 3 60432 &kmalloc_60432
122773 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
122774 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
122775 +lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
122776 +compat_SyS_get_mempolicy_60527 compat_SyS_get_mempolicy 3 60527 NULL
122777 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
122778 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
122779 +osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
122780 +xfs_vm_direct_IO_60557 xfs_vm_direct_IO 4 60557 NULL
122781 +tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
122782 +memblock_virt_alloc_try_nid_nopanic_60604 memblock_virt_alloc_try_nid_nopanic 1 60604 NULL
122783 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
122784 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
122785 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
122786 +__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
122787 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
122788 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
122789 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
122790 +raid_status_60755 raid_status 5 60755 NULL
122791 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
122792 +opticon_write_60775 opticon_write 4 60775 NULL
122793 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
122794 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
122795 +nvif_object_init_60848 nvif_object_init 6 60848 NULL
122796 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
122797 +alloc_buf_60864 alloc_buf 3-2 60864 NULL
122798 +generic_writepages_60871 generic_writepages 0 60871 NULL
122799 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
122800 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
122801 +libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
122802 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
122803 +submit_extent_page_60928 submit_extent_page 5 60928 NULL
122804 +pti_char_write_60960 pti_char_write 3 60960 NULL
122805 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
122806 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
122807 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
122808 +generic_file_direct_write_60995 generic_file_direct_write 0 60995 NULL
122809 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
122810 +graph_depth_write_61024 graph_depth_write 3 61024 NULL
122811 +sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
122812 +read_file_ackto_61037 read_file_ackto 3 61037 NULL
122813 +lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
122814 +symtab_init_61050 symtab_init 2 61050 NULL
122815 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
122816 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-2 61062 NULL
122817 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
122818 +get_derived_key_61100 get_derived_key 4 61100 NULL
122819 +i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-4-3-2-1 61104 NULL
122820 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
122821 +__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
122822 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
122823 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
122824 +pair_device_61175 pair_device 4 61175 NULL nohasharray
122825 +event_oom_late_read_61175 event_oom_late_read 3 61175 &pair_device_61175
122826 +dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
122827 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
122828 +srp_create_fr_pool_61207 srp_create_fr_pool 3 61207 NULL
122829 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
122830 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
122831 +v9fs_mmap_file_read_61262 v9fs_mmap_file_read 3 61262 NULL
122832 +kvm_age_hva_61267 kvm_age_hva 2-3 61267 NULL
122833 +find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
122834 +btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &find_get_pages_tag_61270 nohasharray
122835 +ifalias_store_61270 ifalias_store 4 61270 &btrfs_bio_alloc_61270
122836 +hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
122837 +vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
122838 +nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
122839 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
122840 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
122841 +C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
122842 +write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
122843 +st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
122844 +rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
122845 +__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-3-2 61342 NULL
122846 +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
122847 +wil_write_file_recovery_61354 wil_write_file_recovery 3 61354 NULL
122848 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
122849 +system_enable_write_61396 system_enable_write 3 61396 NULL
122850 +xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
122851 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
122852 +snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
122853 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
122854 +erst_errno_61526 erst_errno 0 61526 NULL
122855 +proc_write_device_61541 proc_write_device 3 61541 NULL
122856 +compat_SyS_select_61542 compat_SyS_select 1 61542 NULL
122857 +trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
122858 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
122859 +parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
122860 +fan_proc_write_61569 fan_proc_write 3 61569 NULL
122861 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
122862 +ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
122863 +seq_open_private_61589 seq_open_private 3 61589 NULL
122864 +ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-1-2 61591 NULL
122865 +netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
122866 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
122867 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
122868 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
122869 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
122870 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL nohasharray
122871 +tcf_hashinfo_init_61643 tcf_hashinfo_init 2 61643 &snd_pcm_oss_read3_61643
122872 +resize_stripes_61650 resize_stripes 2 61650 NULL
122873 +ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
122874 +insert_one_name_61668 insert_one_name 7 61668 NULL
122875 +qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
122876 +lock_loop_61681 lock_loop 1 61681 NULL
122877 +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
122878 +filter_read_61692 filter_read 3 61692 NULL
122879 +SyS_kexec_file_load_61715 SyS_kexec_file_load 3 61715 NULL
122880 +iov_length_61716 iov_length 0 61716 NULL
122881 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
122882 +null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
122883 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
122884 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
122885 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
122886 +mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
122887 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
122888 +regcache_sync_block_61846 regcache_sync_block 5-4 61846 NULL
122889 +ath9k_hw_def_dump_eeprom_61853 ath9k_hw_def_dump_eeprom 5-4 61853 NULL
122890 +__skb_flow_dissect_61855 __skb_flow_dissect 5 61855 NULL
122891 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
122892 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
122893 +get_fw_name_61874 get_fw_name 3 61874 NULL
122894 +btrfs_ioctl_clone_61886 btrfs_ioctl_clone 3-4-5 61886 NULL
122895 +lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
122896 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
122897 +kernfs_name_61910 kernfs_name 3 61910 NULL
122898 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
122899 +au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
122900 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
122901 +efi_get_runtime_map_size_61927 efi_get_runtime_map_size 0 61927 NULL
122902 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
122903 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
122904 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
122905 +fix_read_error_61965 fix_read_error 4 61965 NULL
122906 +ocfs2_quota_write_61972 ocfs2_quota_write 4-5 61972 NULL
122907 +fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
122908 +cow_file_range_61979 cow_file_range 3 61979 NULL
122909 +dequeue_event_62000 dequeue_event 3 62000 NULL
122910 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
122911 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
122912 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
122913 +SYSC_select_62024 SYSC_select 1 62024 NULL
122914 +comedi_write_array_to_buffer_62032 comedi_write_array_to_buffer 3 62032 NULL
122915 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
122916 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
122917 +do_pselect_62061 do_pselect 1 62061 NULL
122918 +pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
122919 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
122920 +ip_recv_error_62117 ip_recv_error 3 62117 NULL
122921 +generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
122922 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
122923 +qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
122924 +kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
122925 +ql_status_62135 ql_status 5 62135 NULL nohasharray
122926 +device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
122927 +video_usercopy_62151 video_usercopy 2 62151 NULL
122928 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
122929 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
122930 +write_file_dfs_62180 write_file_dfs 3 62180 NULL
122931 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
122932 +rounded_hashtable_size_62198 rounded_hashtable_size 0 62198 NULL
122933 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
122934 +smk_read_syslog_62227 smk_read_syslog 3 62227 NULL
122935 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
122936 +ion_handle_test_dma_62262 ion_handle_test_dma 4-5 62262 NULL
122937 +get_random_int_62279 get_random_int 0 62279 NULL
122938 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
122939 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
122940 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
122941 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
122942 +subseq_list_62332 subseq_list 3-0 62332 NULL
122943 +ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
122944 +flash_write_62354 flash_write 3 62354 NULL
122945 +xfpregs_set_62363 xfpregs_set 4 62363 NULL
122946 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
122947 +altera_irscan_62396 altera_irscan 2 62396 NULL
122948 +set_ssp_62411 set_ssp 4 62411 NULL
122949 +tracing_saved_cmdlines_size_read_62491 tracing_saved_cmdlines_size_read 3 62491 NULL
122950 +srpc_alloc_bulk_62522 srpc_alloc_bulk 2 62522 NULL
122951 +pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
122952 +test_iso_queue_62534 test_iso_queue 5 62534 NULL
122953 +debugfs_read_62535 debugfs_read 3 62535 NULL
122954 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
122955 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
122956 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
122957 +compat_SyS_rt_sigpending_62580 compat_SyS_rt_sigpending 2 62580 NULL
122958 +get_subdir_62581 get_subdir 3 62581 NULL
122959 +dut_mode_write_62630 dut_mode_write 3 62630 NULL
122960 +vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
122961 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
122962 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
122963 +ieee80211_set_probe_resp_62700 ieee80211_set_probe_resp 3 62700 NULL
122964 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
122965 +gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
122966 +rdm_62719 rdm 0 62719 NULL
122967 +obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
122968 +key_replays_read_62746 key_replays_read 3 62746 NULL
122969 +lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
122970 +mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
122971 +mxt_obj_instances_62764 mxt_obj_instances 0 62764 NULL
122972 +copy_page_to_iter_iovec_62770 copy_page_to_iter_iovec 0-3 62770 NULL nohasharray
122973 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 &copy_page_to_iter_iovec_62770
122974 +C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
122975 +ptlrpc_req_set_repsize_62784 ptlrpc_req_set_repsize 2 62784 NULL
122976 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
122977 +dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
122978 +__add_action_62798 __add_action 4 62798 NULL
122979 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
122980 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
122981 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
122982 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
122983 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
122984 +l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
122985 +aoechr_write_62883 aoechr_write 3 62883 NULL
122986 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
122987 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
122988 +getdqbuf_62908 getdqbuf 1 62908 NULL
122989 +ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
122990 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
122991 +nvif_object_mthd_62960 nvif_object_mthd 4 62960 NULL
122992 +hwdep_read_62992 hwdep_read 3 62992 NULL
122993 +kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
122994 +__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
122995 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
122996 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
122997 +unlink1_63059 unlink1 3 63059 NULL
122998 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
122999 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
123000 +sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5 63087 NULL
123001 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
123002 +ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
123003 +iwl_mvm_coex_dump_mbox_63153 iwl_mvm_coex_dump_mbox 4-3-0 63153 NULL
123004 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
123005 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
123006 +vme_master_read_63221 vme_master_read 0 63221 NULL
123007 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
123008 +ptp_read_63251 ptp_read 4 63251 NULL
123009 +xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
123010 +iwl_dbgfs_fw_error_dump_read_63263 iwl_dbgfs_fw_error_dump_read 3 63263 NULL
123011 +raid5_resize_63306 raid5_resize 2 63306 NULL
123012 +nfsd_vfs_read_63307 nfsd_vfs_read 5 63307 NULL
123013 +ath10k_read_fw_dbglog_63323 ath10k_read_fw_dbglog 3 63323 NULL
123014 +proc_info_read_63344 proc_info_read 3 63344 NULL
123015 +nvif_device_new_63358 nvif_device_new 5 63358 NULL
123016 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
123017 +idmouse_read_63374 idmouse_read 3 63374 NULL
123018 +edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL nohasharray
123019 +usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 &edac_pci_alloc_ctl_info_63388
123020 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
123021 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
123022 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
123023 +si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
123024 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
123025 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
123026 +read_kcore_63488 read_kcore 3 63488 NULL
123027 +iwl_dbgfs_bcast_filters_read_63489 iwl_dbgfs_bcast_filters_read 3 63489 NULL
123028 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
123029 +efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 4-5 63529 NULL
123030 +ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL
123031 +write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
123032 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
123033 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
123034 +kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 NULL
123035 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
123036 +write_debug_level_63613 write_debug_level 3 63613 NULL
123037 +__spi_validate_63618 __spi_validate 0 63618 NULL
123038 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
123039 +hid_report_len_63637 hid_report_len 0 63637 NULL
123040 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
123041 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
123042 +ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
123043 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
123044 +vbi_read_63673 vbi_read 3 63673 NULL
123045 +write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
123046 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
123047 +btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
123048 +ntb_debugfs_read_63728 ntb_debugfs_read 3 63728 NULL
123049 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
123050 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
123051 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
123052 +spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
123053 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
123054 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
123055 +C_SYSC_process_vm_readv_63811 C_SYSC_process_vm_readv 3-5 63811 NULL
123056 +regmap_multi_reg_write_63826 regmap_multi_reg_write 3 63826 NULL nohasharray
123057 +prepare_copy_63826 prepare_copy 2 63826 &regmap_multi_reg_write_63826
123058 +sel_write_load_63830 sel_write_load 3 63830 NULL
123059 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
123060 +nv10_gpio_intr_mask_63862 nv10_gpio_intr_mask 4-3 63862 NULL
123061 +xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
123062 +uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
123063 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
123064 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
123065 +__team_options_register_63941 __team_options_register 3 63941 NULL
123066 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
123067 +set_bredr_63975 set_bredr 4 63975 NULL
123068 +construct_key_and_link_63985 construct_key_and_link 3 63985 NULL
123069 +rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
123070 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
123071 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
123072 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
123073 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
123074 +nl80211_send_rx_assoc_64040 nl80211_send_rx_assoc 4 64040 NULL
123075 +__sock_create_64069 __sock_create 0 64069 NULL
123076 +get_u8_64076 get_u8 0 64076 NULL
123077 +xilly_malloc_64077 xilly_malloc 2 64077 NULL
123078 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
123079 +vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
123080 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
123081 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
123082 +to_bytes_64103 to_bytes 0-1 64103 NULL
123083 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
123084 +rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
123085 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
123086 +bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
123087 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
123088 +init_bch_64130 init_bch 1-2 64130 NULL
123089 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
123090 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
123091 +number_of_tds_64156 number_of_tds 0 64156 NULL
123092 +bnx2x_vf_mcast_64166 bnx2x_vf_mcast 4 64166 NULL
123093 +cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
123094 +kernfs_iop_setxattr_64220 kernfs_iop_setxattr 4 64220 NULL
123095 +read_pulse_64227 read_pulse 0-3 64227 NULL
123096 +ea_len_64229 ea_len 0 64229 NULL
123097 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
123098 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL nohasharray
123099 +bpf_check_classic_64278 bpf_check_classic 2 64278 &btrfs_file_extent_offset_64278
123100 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
123101 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 NULL nohasharray
123102 +event_id_read_64288 event_id_read 3 64288 &xfs_dir_cilookup_result_64288
123103 +info_debugfs_read_64291 info_debugfs_read 3 64291 NULL
123104 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
123105 +snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
123106 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
123107 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
123108 +ts_write_64336 ts_write 3 64336 NULL
123109 +usbtmc_write_64340 usbtmc_write 3 64340 NULL
123110 +qlcnic_82xx_calculate_msix_vector_64354 qlcnic_82xx_calculate_msix_vector 0 64354 NULL
123111 +user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
123112 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
123113 +reg_create_64372 reg_create 5 64372 NULL nohasharray
123114 +bnx2_enable_msix_64372 bnx2_enable_msix 2 64372 &reg_create_64372
123115 +ilo_write_64378 ilo_write 3 64378 NULL
123116 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
123117 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
123118 +nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
123119 +ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
123120 +pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
123121 +rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
123122 +keyctl_get_security_64418 keyctl_get_security 3 64418 NULL
123123 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
123124 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 NULL
123125 +ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
123126 +single_open_size_64483 single_open_size 4 64483 NULL
123127 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
123128 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
123129 +remove_uuid_64505 remove_uuid 4 64505 NULL
123130 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
123131 +iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
123132 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
123133 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
123134 +SyS_bind_64544 SyS_bind 3 64544 NULL
123135 +rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL
123136 +__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3 64557 NULL
123137 +ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 NULL nohasharray
123138 +__spi_sync_64561 __spi_sync 0 64561 &ll_max_rw_chunk_seq_write_64561
123139 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
123140 +kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
123141 +do_erase_64574 do_erase 4 64574 NULL
123142 +fanotify_write_64623 fanotify_write 3 64623 NULL
123143 +_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3 64642 NULL
123144 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
123145 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
123146 +tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661
123147 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
123148 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
123149 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
123150 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
123151 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
123152 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
123153 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
123154 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
123155 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
123156 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
123157 +hwdep_write_64776 hwdep_write 3 64776 NULL
123158 +message_for_md_64777 message_for_md 5 64777 NULL
123159 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
123160 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
123161 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
123162 +rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL nohasharray
123163 +nv_mask_64808 nv_mask 0 64808 &rfkill_fop_write_64808
123164 +proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
123165 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
123166 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
123167 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
123168 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
123169 +pci_vc_do_save_buffer_64876 pci_vc_do_save_buffer 0 64876 NULL
123170 +lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
123171 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
123172 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL nohasharray
123173 +tipc_port_iovec_reject_64958 tipc_port_iovec_reject 4 64958 &ip_options_get_from_user_64958
123174 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
123175 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
123176 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
123177 +insert_dent_65034 insert_dent 7 65034 NULL
123178 +snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
123179 +ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
123180 +pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
123181 +__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
123182 +batadv_socket_write_65083 batadv_socket_write 3 65083 NULL
123183 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
123184 +ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0-3 65090 NULL
123185 +usbtest_alloc_urb_65115 usbtest_alloc_urb 3-5 65115 NULL
123186 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
123187 +nouveau_event_create_65229 nouveau_event_create 2-1 65229 NULL
123188 +print_endpoint_stat_65232 print_endpoint_stat 0-4-3 65232 NULL
123189 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
123190 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
123191 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
123192 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
123193 +fat_direct_IO_65295 fat_direct_IO 4 65295 NULL
123194 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
123195 +get_var_len_65304 get_var_len 0 65304 NULL
123196 +unpack_array_65318 unpack_array 0 65318 NULL
123197 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
123198 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
123199 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
123200 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
123201 +SyS_writev_65372 SyS_writev 3 65372 NULL
123202 +__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
123203 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
123204 +__read_vmcore_65402 __read_vmcore 2 65402 NULL
123205 +ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
123206 +device_add_groups_65423 device_add_groups 0 65423 NULL
123207 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
123208 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
123209 +il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
123210 +clear_user_65470 clear_user 2 65470 NULL
123211 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
123212 +lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9 65493 NULL
123213 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
123214 +tree_mod_log_eb_copy_65535 tree_mod_log_eb_copy 6 65535 NULL
123215 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
123216 new file mode 100644
123217 index 0000000..560cd7b
123218 --- /dev/null
123219 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
123220 @@ -0,0 +1,92 @@
123221 +spa_set_aux_vdevs_746 spa_set_aux_vdevs 3 746 NULL
123222 +zfs_lookup_2144 zfs_lookup 0 2144 NULL
123223 +mappedread_2627 mappedread 2 2627 NULL
123224 +vdev_disk_dio_alloc_2957 vdev_disk_dio_alloc 1 2957 NULL
123225 +nv_alloc_pushpage_spl_4286 nv_alloc_pushpage_spl 2 4286 NULL
123226 +zpl_xattr_get_4574 zpl_xattr_get 0 4574 NULL
123227 +sa_replace_all_by_template_5699 sa_replace_all_by_template 3 5699 NULL
123228 +dmu_write_6048 dmu_write 4-3 6048 NULL
123229 +dmu_buf_hold_array_6095 dmu_buf_hold_array 4-3 6095 NULL
123230 +update_pages_6225 update_pages 2-3 6225 NULL
123231 +bio_nr_pages_7117 bio_nr_pages 0-2 7117 NULL
123232 +dmu_buf_hold_array_by_bonus_8562 dmu_buf_hold_array_by_bonus 3-2 8562 NULL
123233 +zpios_dmu_write_8858 zpios_dmu_write 4-5 8858 NULL
123234 +ddi_copyout_9401 ddi_copyout 3 9401 NULL
123235 +avl_numnodes_12384 avl_numnodes 0 12384 NULL
123236 +dmu_write_uio_dnode_12473 dmu_write_uio_dnode 3 12473 NULL
123237 +dmu_xuio_init_12866 dmu_xuio_init 2 12866 NULL
123238 +zpl_read_common_14389 zpl_read_common 0 14389 NULL
123239 +dmu_snapshot_realname_14632 dmu_snapshot_realname 4 14632 NULL
123240 +kmem_alloc_debug_14852 kmem_alloc_debug 1 14852 NULL
123241 +kmalloc_node_nofail_15151 kmalloc_node_nofail 1 15151 NULL
123242 +dmu_write_uio_16351 dmu_write_uio 4 16351 NULL
123243 +zfs_log_write_16524 zfs_log_write 6-5 16524 NULL
123244 +sa_build_layouts_16910 sa_build_layouts 3 16910 NULL
123245 +dsl_dir_namelen_17053 dsl_dir_namelen 0 17053 NULL
123246 +kcopy_copy_to_user_17336 kcopy_copy_to_user 5 17336 NULL
123247 +sa_add_layout_entry_17507 sa_add_layout_entry 3 17507 NULL
123248 +sa_attr_table_setup_18029 sa_attr_table_setup 3 18029 NULL
123249 +uiocopy_18680 uiocopy 2 18680 NULL
123250 +dmu_buf_hold_array_by_dnode_19125 dmu_buf_hold_array_by_dnode 2-3 19125 NULL
123251 +zpl_acl_from_xattr_21141 zpl_acl_from_xattr 2 21141 NULL
123252 +dsl_pool_tx_assign_init_22518 dsl_pool_tx_assign_init 2 22518 NULL
123253 +nvlist_lookup_byte_array_22527 nvlist_lookup_byte_array 0 22527 NULL
123254 +sa_replace_all_by_template_locked_22533 sa_replace_all_by_template_locked 3 22533 NULL
123255 +tsd_hash_table_init_22559 tsd_hash_table_init 1 22559 NULL
123256 +spa_vdev_remove_aux_23966 spa_vdev_remove_aux 4 23966 NULL
123257 +zpl_xattr_acl_set_access_24129 zpl_xattr_acl_set_access 4 24129 NULL
123258 +dmu_assign_arcbuf_24622 dmu_assign_arcbuf 2 24622 NULL
123259 +zap_lookup_norm_25166 zap_lookup_norm 9 25166 NULL
123260 +dmu_prealloc_25456 dmu_prealloc 4-3 25456 NULL
123261 +kmalloc_nofail_26347 kmalloc_nofail 1 26347 NULL
123262 +zfsctl_snapshot_zpath_27578 zfsctl_snapshot_zpath 2 27578 NULL
123263 +zpios_dmu_read_30015 zpios_dmu_read 4-5 30015 NULL
123264 +splat_write_30943 splat_write 3 30943 NULL
123265 +zpl_xattr_get_sa_31183 zpl_xattr_get_sa 0 31183 NULL
123266 +dmu_read_uio_31467 dmu_read_uio 4 31467 NULL
123267 +zfs_replay_fuids_31479 zfs_replay_fuids 4 31479 NULL
123268 +spa_history_log_to_phys_31632 spa_history_log_to_phys 0-1 31632 NULL
123269 +__zpl_xattr_get_32601 __zpl_xattr_get 0 32601 NULL
123270 +proc_copyout_string_34049 proc_copyout_string 2 34049 NULL
123271 +nv_alloc_sleep_spl_34544 nv_alloc_sleep_spl 2 34544 NULL
123272 +nv_alloc_nosleep_spl_34761 nv_alloc_nosleep_spl 2 34761 NULL
123273 +zap_leaf_array_match_36922 zap_leaf_array_match 4 36922 NULL
123274 +copyinstr_36980 copyinstr 3 36980 NULL
123275 +zpl_xattr_acl_set_default_37864 zpl_xattr_acl_set_default 4 37864 NULL
123276 +splat_read_38116 splat_read 3 38116 NULL
123277 +sa_setup_38756 sa_setup 4 38756 NULL
123278 +vdev_disk_physio_39898 vdev_disk_physio 3 39898 NULL
123279 +arc_buf_size_39982 arc_buf_size 0 39982 NULL
123280 +kzalloc_nofail_40719 kzalloc_nofail 1 40719 NULL
123281 +fuidstr_to_sid_40777 fuidstr_to_sid 4 40777 NULL
123282 +vdev_raidz_matrix_reconstruct_40852 vdev_raidz_matrix_reconstruct 2-3 40852 NULL
123283 +sa_find_layout_40892 sa_find_layout 4 40892 NULL
123284 +zpl_xattr_get_dir_41918 zpl_xattr_get_dir 0 41918 NULL
123285 +zfs_sa_get_xattr_42600 zfs_sa_get_xattr 0 42600 NULL
123286 +zpl_xattr_acl_set_42808 zpl_xattr_acl_set 4 42808 NULL
123287 +xdr_dec_array_43091 xdr_dec_array 5 43091 NULL
123288 +dsl_dataset_namelen_43136 dsl_dataset_namelen 0 43136 NULL
123289 +kcopy_write_43683 kcopy_write 3 43683 NULL
123290 +uiomove_44355 uiomove 2 44355 NULL
123291 +dmu_read_44418 dmu_read 4-3 44418 NULL
123292 +ddi_copyin_44846 ddi_copyin 3 44846 NULL
123293 +kcopy_do_get_45061 kcopy_do_get 5 45061 NULL
123294 +copyin_45945 copyin 3 45945 NULL
123295 +zil_itx_create_46555 zil_itx_create 2 46555 NULL
123296 +dmu_write_uio_dbuf_48064 dmu_write_uio_dbuf 3 48064 NULL
123297 +blk_rq_pos_48233 blk_rq_pos 0 48233 NULL
123298 +spa_history_write_49650 spa_history_write 3 49650 NULL
123299 +kcopy_copy_pages_to_user_49823 kcopy_copy_pages_to_user 3-4 49823 NULL
123300 +zfs_log_write_50162 zfs_log_write 6-5 50162 NULL
123301 +i_fm_alloc_51038 i_fm_alloc 2 51038 NULL
123302 +copyout_51409 copyout 3 51409 NULL
123303 +zvol_log_write_54898 zvol_log_write 4-3 54898 NULL
123304 +zfs_acl_node_alloc_55641 zfs_acl_node_alloc 1 55641 NULL
123305 +get_nvlist_56685 get_nvlist 2 56685 NULL
123306 +zprop_get_numprops_56820 zprop_get_numprops 0 56820 NULL
123307 +splat_taskq_test4_common_59829 splat_taskq_test4_common 5 59829 NULL
123308 +zfs_replay_domain_cnt_61399 zfs_replay_domain_cnt 0 61399 NULL
123309 +zpios_write_61823 zpios_write 3 61823 NULL
123310 +proc_copyin_string_62019 proc_copyin_string 4 62019 NULL
123311 +random_get_pseudo_bytes_64611 random_get_pseudo_bytes 2 64611 NULL
123312 +zpios_read_64734 zpios_read 3 64734 NULL
123313 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
123314 new file mode 100644
123315 index 0000000..95f7abd
123316 --- /dev/null
123317 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
123318 @@ -0,0 +1,259 @@
123319 +/*
123320 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
123321 + * Licensed under the GPL v2, or (at your option) v3
123322 + *
123323 + * Homepage:
123324 + * http://www.grsecurity.net/~ephox/overflow_plugin/
123325 + *
123326 + * Documentation:
123327 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
123328 + *
123329 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
123330 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
123331 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
123332 + *
123333 + * Usage:
123334 + * $ make
123335 + * $ make run
123336 + */
123337 +
123338 +#include "gcc-common.h"
123339 +#include "size_overflow.h"
123340 +
123341 +int plugin_is_GPL_compatible;
123342 +
123343 +tree report_size_overflow_decl;
123344 +
123345 +tree size_overflow_type_HI;
123346 +tree size_overflow_type_SI;
123347 +tree size_overflow_type_DI;
123348 +tree size_overflow_type_TI;
123349 +
123350 +static struct plugin_info size_overflow_plugin_info = {
123351 + .version = "20140725",
123352 + .help = "no-size-overflow\tturn off size overflow checking\n",
123353 +};
123354 +
123355 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
123356 +{
123357 + unsigned int arg_count;
123358 + enum tree_code code = TREE_CODE(*node);
123359 +
123360 + switch (code) {
123361 + case FUNCTION_DECL:
123362 + arg_count = type_num_arguments(TREE_TYPE(*node));
123363 + break;
123364 + case FUNCTION_TYPE:
123365 + case METHOD_TYPE:
123366 + arg_count = type_num_arguments(*node);
123367 + break;
123368 + default:
123369 + *no_add_attrs = true;
123370 + error("%s: %qE attribute only applies to functions", __func__, name);
123371 + return NULL_TREE;
123372 + }
123373 +
123374 + for (; args; args = TREE_CHAIN(args)) {
123375 + tree position = TREE_VALUE(args);
123376 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
123377 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
123378 + *no_add_attrs = true;
123379 + }
123380 + }
123381 + return NULL_TREE;
123382 +}
123383 +
123384 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
123385 +{
123386 + unsigned int arg_count;
123387 + enum tree_code code = TREE_CODE(*node);
123388 +
123389 + switch (code) {
123390 + case FUNCTION_DECL:
123391 + arg_count = type_num_arguments(TREE_TYPE(*node));
123392 + break;
123393 + case FUNCTION_TYPE:
123394 + case METHOD_TYPE:
123395 + arg_count = type_num_arguments(*node);
123396 + break;
123397 + case FIELD_DECL:
123398 + return NULL_TREE;
123399 + default:
123400 + *no_add_attrs = true;
123401 + error("%qE attribute only applies to functions", name);
123402 + return NULL_TREE;
123403 + }
123404 +
123405 + if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0)
123406 + return NULL_TREE;
123407 +
123408 + for (; args; args = TREE_CHAIN(args)) {
123409 + tree position = TREE_VALUE(args);
123410 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
123411 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
123412 + *no_add_attrs = true;
123413 + }
123414 + }
123415 + return NULL_TREE;
123416 +}
123417 +
123418 +static struct attribute_spec size_overflow_attr = {
123419 + .name = "size_overflow",
123420 + .min_length = 1,
123421 + .max_length = -1,
123422 + .decl_required = true,
123423 + .type_required = false,
123424 + .function_type_required = false,
123425 + .handler = handle_size_overflow_attribute,
123426 +#if BUILDING_GCC_VERSION >= 4007
123427 + .affects_type_identity = false
123428 +#endif
123429 +};
123430 +
123431 +static struct attribute_spec intentional_overflow_attr = {
123432 + .name = "intentional_overflow",
123433 + .min_length = 1,
123434 + .max_length = -1,
123435 + .decl_required = true,
123436 + .type_required = false,
123437 + .function_type_required = false,
123438 + .handler = handle_intentional_overflow_attribute,
123439 +#if BUILDING_GCC_VERSION >= 4007
123440 + .affects_type_identity = false
123441 +#endif
123442 +};
123443 +
123444 +static void register_attributes(void __unused *event_data, void __unused *data)
123445 +{
123446 + register_attribute(&size_overflow_attr);
123447 + register_attribute(&intentional_overflow_attr);
123448 +}
123449 +
123450 +static tree create_typedef(tree type, const char* ident)
123451 +{
123452 + tree new_type, decl;
123453 +
123454 + new_type = build_variant_type_copy(type);
123455 + decl = build_decl(BUILTINS_LOCATION, TYPE_DECL, get_identifier(ident), new_type);
123456 + DECL_ORIGINAL_TYPE(decl) = type;
123457 + TYPE_NAME(new_type) = decl;
123458 + return new_type;
123459 +}
123460 +
123461 +// Create the noreturn report_size_overflow() function decl.
123462 +static void size_overflow_start_unit(void __unused *gcc_data, void __unused *user_data)
123463 +{
123464 + tree const_char_ptr_type_node;
123465 + tree fntype;
123466 +
123467 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
123468 +
123469 + size_overflow_type_HI = create_typedef(intHI_type_node, "size_overflow_type_HI");
123470 + size_overflow_type_SI = create_typedef(intSI_type_node, "size_overflow_type_SI");
123471 + size_overflow_type_DI = create_typedef(intDI_type_node, "size_overflow_type_DI");
123472 + size_overflow_type_TI = create_typedef(intTI_type_node, "size_overflow_type_TI");
123473 +
123474 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
123475 + fntype = build_function_type_list(void_type_node,
123476 + const_char_ptr_type_node,
123477 + unsigned_type_node,
123478 + const_char_ptr_type_node,
123479 + const_char_ptr_type_node,
123480 + NULL_TREE);
123481 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
123482 +
123483 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
123484 + TREE_PUBLIC(report_size_overflow_decl) = 1;
123485 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
123486 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
123487 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
123488 +}
123489 +
123490 +
123491 +extern struct gimple_opt_pass pass_dce;
123492 +
123493 +static struct opt_pass *make_dce_pass(void)
123494 +{
123495 +#if BUILDING_GCC_VERSION >= 4009
123496 + return make_pass_dce(g);
123497 +#else
123498 + return &pass_dce.pass;
123499 +#endif
123500 +}
123501 +
123502 +
123503 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
123504 +{
123505 + int i;
123506 + const char * const plugin_name = plugin_info->base_name;
123507 + const int argc = plugin_info->argc;
123508 + const struct plugin_argument * const argv = plugin_info->argv;
123509 + bool enable = true;
123510 + struct register_pass_info insert_size_overflow_asm_pass_info;
123511 + struct register_pass_info __unused dump_before_pass_info;
123512 + struct register_pass_info __unused dump_after_pass_info;
123513 + struct register_pass_info insert_size_overflow_check_info;
123514 + struct register_pass_info dce_pass_info;
123515 + static const struct ggc_root_tab gt_ggc_r_gt_size_overflow[] = {
123516 + {
123517 + .base = &report_size_overflow_decl,
123518 + .nelt = 1,
123519 + .stride = sizeof(report_size_overflow_decl),
123520 + .cb = &gt_ggc_mx_tree_node,
123521 + .pchw = &gt_pch_nx_tree_node
123522 + },
123523 + LAST_GGC_ROOT_TAB
123524 + };
123525 +
123526 + insert_size_overflow_asm_pass_info.pass = make_insert_size_overflow_asm_pass();
123527 + insert_size_overflow_asm_pass_info.reference_pass_name = "ssa";
123528 + insert_size_overflow_asm_pass_info.ref_pass_instance_number = 1;
123529 + insert_size_overflow_asm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
123530 +
123531 + dump_before_pass_info.pass = make_dump_pass();
123532 + dump_before_pass_info.reference_pass_name = "increase_alignment";
123533 + dump_before_pass_info.ref_pass_instance_number = 1;
123534 + dump_before_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
123535 +
123536 + insert_size_overflow_check_info.pass = make_insert_size_overflow_check();
123537 + insert_size_overflow_check_info.reference_pass_name = "increase_alignment";
123538 + insert_size_overflow_check_info.ref_pass_instance_number = 1;
123539 + insert_size_overflow_check_info.pos_op = PASS_POS_INSERT_BEFORE;
123540 +
123541 + dump_after_pass_info.pass = make_dump_pass();
123542 + dump_after_pass_info.reference_pass_name = "increase_alignment";
123543 + dump_after_pass_info.ref_pass_instance_number = 1;
123544 + dump_after_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
123545 +
123546 + dce_pass_info.pass = make_dce_pass();
123547 + dce_pass_info.reference_pass_name = "vrp";
123548 + dce_pass_info.ref_pass_instance_number = 1;
123549 + dce_pass_info.pos_op = PASS_POS_INSERT_AFTER;
123550 +
123551 + if (!plugin_default_version_check(version, &gcc_version)) {
123552 + error(G_("incompatible gcc/plugin versions"));
123553 + return 1;
123554 + }
123555 +
123556 + for (i = 0; i < argc; ++i) {
123557 + if (!strcmp(argv[i].key, "no-size-overflow")) {
123558 + enable = false;
123559 + continue;
123560 + }
123561 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
123562 + }
123563 +
123564 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
123565 + if (enable) {
123566 + register_callback(plugin_name, PLUGIN_START_UNIT, &size_overflow_start_unit, NULL);
123567 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_size_overflow);
123568 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
123569 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
123570 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_check_info);
123571 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
123572 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dce_pass_info);
123573 + }
123574 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
123575 +
123576 + return 0;
123577 +}
123578 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
123579 new file mode 100644
123580 index 0000000..0888f6c
123581 --- /dev/null
123582 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
123583 @@ -0,0 +1,364 @@
123584 +/*
123585 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
123586 + * Licensed under the GPL v2, or (at your option) v3
123587 + *
123588 + * Homepage:
123589 + * http://www.grsecurity.net/~ephox/overflow_plugin/
123590 + *
123591 + * Documentation:
123592 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
123593 + *
123594 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
123595 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
123596 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
123597 + *
123598 + * Usage:
123599 + * $ make
123600 + * $ make run
123601 + */
123602 +
123603 +#include "gcc-common.h"
123604 +#include "size_overflow.h"
123605 +
123606 +#include "size_overflow_hash.h"
123607 +#include "size_overflow_hash_aux.h"
123608 +
123609 +#define CODES_LIMIT 32
123610 +
123611 +static unsigned char get_tree_code(const_tree type)
123612 +{
123613 + switch (TREE_CODE(type)) {
123614 + case ARRAY_TYPE:
123615 + return 0;
123616 + case BOOLEAN_TYPE:
123617 + return 1;
123618 + case ENUMERAL_TYPE:
123619 + return 2;
123620 + case FUNCTION_TYPE:
123621 + return 3;
123622 + case INTEGER_TYPE:
123623 + return 4;
123624 + case POINTER_TYPE:
123625 + return 5;
123626 + case RECORD_TYPE:
123627 + return 6;
123628 + case UNION_TYPE:
123629 + return 7;
123630 + case VOID_TYPE:
123631 + return 8;
123632 + case REAL_TYPE:
123633 + return 9;
123634 + case VECTOR_TYPE:
123635 + return 10;
123636 + case REFERENCE_TYPE:
123637 + return 11;
123638 + case OFFSET_TYPE:
123639 + return 12;
123640 + case COMPLEX_TYPE:
123641 + return 13;
123642 + default:
123643 + debug_tree((tree)type);
123644 + gcc_unreachable();
123645 + }
123646 +}
123647 +
123648 +struct function_hash {
123649 + size_t tree_codes_len;
123650 + unsigned char tree_codes[CODES_LIMIT];
123651 + const_tree fndecl;
123652 + unsigned int hash;
123653 +};
123654 +
123655 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
123656 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
123657 +{
123658 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
123659 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
123660 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
123661 +
123662 + unsigned int m = 0x57559429;
123663 + unsigned int n = 0x5052acdb;
123664 + const unsigned int *key4 = (const unsigned int *)key;
123665 + unsigned int h = len;
123666 + unsigned int k = len + seed + n;
123667 + unsigned long long p;
123668 +
123669 + while (len >= 8) {
123670 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
123671 + len -= 8;
123672 + }
123673 + if (len >= 4) {
123674 + cwmixb(key4[0]) key4 += 1;
123675 + len -= 4;
123676 + }
123677 + if (len)
123678 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
123679 + cwmixb(h ^ (k + n));
123680 + return k ^ h;
123681 +
123682 +#undef cwfold
123683 +#undef cwmixa
123684 +#undef cwmixb
123685 +}
123686 +
123687 +static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
123688 +{
123689 + unsigned int fn, codes, seed = 0;
123690 +
123691 + fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
123692 + codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
123693 +
123694 + fn_hash_data->hash = fn ^ codes;
123695 +}
123696 +
123697 +static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
123698 +{
123699 + gcc_assert(type != NULL_TREE);
123700 + gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
123701 +
123702 + while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
123703 + fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
123704 + fn_hash_data->tree_codes_len++;
123705 + type = TREE_TYPE(type);
123706 + }
123707 +}
123708 +
123709 +static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
123710 +{
123711 + const_tree result;
123712 +
123713 + gcc_assert(node != NULL_TREE);
123714 +
123715 + if (DECL_P(node)) {
123716 + result = DECL_RESULT(node);
123717 + if (result != NULL_TREE)
123718 + return set_node_codes(TREE_TYPE(result), fn_hash_data);
123719 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
123720 + }
123721 +
123722 + gcc_assert(TYPE_P(node));
123723 +
123724 + if (TREE_CODE(node) == FUNCTION_TYPE)
123725 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
123726 +
123727 + return set_node_codes(node, fn_hash_data);
123728 +}
123729 +
123730 +static void set_function_codes(struct function_hash *fn_hash_data)
123731 +{
123732 + const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
123733 + enum tree_code code = TREE_CODE(type);
123734 +
123735 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
123736 +
123737 + set_result_codes(fn_hash_data->fndecl, fn_hash_data);
123738 +
123739 + for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
123740 + set_node_codes(TREE_VALUE(arg), fn_hash_data);
123741 +}
123742 +
123743 +static const struct size_overflow_hash *get_proper_hash_chain(const struct size_overflow_hash *entry, const char *func_name)
123744 +{
123745 + while (entry) {
123746 + if (!strcmp(entry->name, func_name))
123747 + return entry;
123748 + entry = entry->next;
123749 + }
123750 + return NULL;
123751 +}
123752 +
123753 +const struct size_overflow_hash *get_function_hash(const_tree fndecl)
123754 +{
123755 + const struct size_overflow_hash *entry;
123756 + struct function_hash fn_hash_data;
123757 + const char *func_name;
123758 +
123759 + // skip builtins __builtin_constant_p
123760 + if (DECL_BUILT_IN(fndecl))
123761 + return NULL;
123762 +
123763 + fn_hash_data.fndecl = fndecl;
123764 + fn_hash_data.tree_codes_len = 0;
123765 +
123766 + set_function_codes(&fn_hash_data);
123767 + gcc_assert(fn_hash_data.tree_codes_len != 0);
123768 +
123769 + func_name = DECL_NAME_POINTER(fn_hash_data.fndecl);
123770 + set_hash(func_name, &fn_hash_data);
123771 +
123772 + entry = size_overflow_hash[fn_hash_data.hash];
123773 + entry = get_proper_hash_chain(entry, func_name);
123774 + if (entry)
123775 + return entry;
123776 + entry = size_overflow_hash_aux[fn_hash_data.hash];
123777 + return get_proper_hash_chain(entry, func_name);
123778 +}
123779 +
123780 +static void print_missing_msg(const_tree func, unsigned int argnum)
123781 +{
123782 + location_t loc;
123783 + const char *curfunc;
123784 + struct function_hash fn_hash_data;
123785 +
123786 + fn_hash_data.fndecl = DECL_ORIGIN(func);
123787 + fn_hash_data.tree_codes_len = 0;
123788 +
123789 + loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
123790 + curfunc = DECL_NAME_POINTER(fn_hash_data.fndecl);
123791 +
123792 + set_function_codes(&fn_hash_data);
123793 + set_hash(curfunc, &fn_hash_data);
123794 +
123795 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
123796 +}
123797 +
123798 +unsigned int find_arg_number_tree(const_tree arg, const_tree func)
123799 +{
123800 + tree var;
123801 + unsigned int argnum = 1;
123802 +
123803 + if (TREE_CODE(arg) == SSA_NAME)
123804 + arg = SSA_NAME_VAR(arg);
123805 +
123806 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) {
123807 + if (!operand_equal_p(arg, var, 0) && strcmp(DECL_NAME_POINTER(var), DECL_NAME_POINTER(arg)))
123808 + continue;
123809 + if (!skip_types(var))
123810 + return argnum;
123811 + }
123812 +
123813 + return CANNOT_FIND_ARG;
123814 +}
123815 +
123816 +static const char *get_asm_string(const_gimple stmt)
123817 +{
123818 + if (!stmt)
123819 + return NULL;
123820 + if (gimple_code(stmt) != GIMPLE_ASM)
123821 + return NULL;
123822 +
123823 + return gimple_asm_string(stmt);
123824 +}
123825 +
123826 +bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
123827 +{
123828 + const char *str;
123829 +
123830 + str = get_asm_string(stmt);
123831 + if (!str)
123832 + return false;
123833 + return !strncmp(str, TURN_OFF_ASM_STR, sizeof(TURN_OFF_ASM_STR) - 1);
123834 +}
123835 +
123836 +bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
123837 +{
123838 + const char *str;
123839 +
123840 + str = get_asm_string(stmt);
123841 + if (!str)
123842 + return false;
123843 + return !strncmp(str, YES_ASM_STR, sizeof(YES_ASM_STR) - 1);
123844 +}
123845 +
123846 +bool is_size_overflow_asm(const_gimple stmt)
123847 +{
123848 + const char *str;
123849 +
123850 + str = get_asm_string(stmt);
123851 + if (!str)
123852 + return false;
123853 + return !strncmp(str, OK_ASM_STR, sizeof(OK_ASM_STR) - 1);
123854 +}
123855 +
123856 +bool is_a_return_check(const_tree node)
123857 +{
123858 + if (TREE_CODE(node) == FUNCTION_DECL)
123859 + return true;
123860 +
123861 + gcc_assert(TREE_CODE(node) == PARM_DECL);
123862 + return false;
123863 +}
123864 +
123865 +// Get the argnum of a function decl, if node is a return then the argnum is 0
123866 +unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
123867 +{
123868 + if (is_a_return_check(node))
123869 + return 0;
123870 + else
123871 + return find_arg_number_tree(node, orig_fndecl);
123872 +}
123873 +
123874 +unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl)
123875 +{
123876 + const struct size_overflow_hash *hash;
123877 + unsigned int new_argnum;
123878 + tree arg;
123879 + const_tree origarg;
123880 +
123881 + if (argnum == 0)
123882 + return argnum;
123883 +
123884 + hash = get_function_hash(fndecl);
123885 + if (hash && hash->param & (1U << argnum))
123886 + return argnum;
123887 +
123888 + if (DECL_EXTERNAL(fndecl))
123889 + return argnum;
123890 +
123891 + origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
123892 + argnum--;
123893 + while (origarg && argnum) {
123894 + origarg = TREE_CHAIN(origarg);
123895 + argnum--;
123896 + }
123897 + gcc_assert(argnum == 0);
123898 + gcc_assert(origarg != NULL_TREE);
123899 +
123900 + for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
123901 + if (operand_equal_p(origarg, arg, 0) || !strcmp(DECL_NAME_POINTER(origarg), DECL_NAME_POINTER(arg)))
123902 + return new_argnum;
123903 +
123904 + return CANNOT_FIND_ARG;
123905 +}
123906 +
123907 +static bool is_in_hash_table(const_tree fndecl, unsigned int num)
123908 +{
123909 + const struct size_overflow_hash *hash;
123910 +
123911 + hash = get_function_hash(fndecl);
123912 + if (hash && (hash->param & (1U << num)))
123913 + return true;
123914 + return false;
123915 +}
123916 +
123917 +/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
123918 + * If the function is missing everywhere then print the missing message into stderr.
123919 + */
123920 +bool is_missing_function(const_tree orig_fndecl, unsigned int num)
123921 +{
123922 + switch (DECL_FUNCTION_CODE(orig_fndecl)) {
123923 +#if BUILDING_GCC_VERSION >= 4008
123924 + case BUILT_IN_BSWAP16:
123925 +#endif
123926 + case BUILT_IN_BSWAP32:
123927 + case BUILT_IN_BSWAP64:
123928 + case BUILT_IN_EXPECT:
123929 + case BUILT_IN_MEMCMP:
123930 + return false;
123931 + default:
123932 + break;
123933 + }
123934 +
123935 + // skip test.c
123936 + if (strcmp(DECL_NAME_POINTER(current_function_decl), "coolmalloc")) {
123937 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
123938 + warning(0, "unnecessary size_overflow attribute on: %s\n", DECL_NAME_POINTER(orig_fndecl));
123939 + }
123940 +
123941 + if (is_in_hash_table(orig_fndecl, num))
123942 + return false;
123943 +
123944 + print_missing_msg(orig_fndecl, num);
123945 + return true;
123946 +}
123947 +
123948 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
123949 new file mode 100644
123950 index 0000000..924652b
123951 --- /dev/null
123952 +++ b/tools/gcc/stackleak_plugin.c
123953 @@ -0,0 +1,395 @@
123954 +/*
123955 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
123956 + * Licensed under the GPL v2
123957 + *
123958 + * Note: the choice of the license means that the compilation process is
123959 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
123960 + * but for the kernel it doesn't matter since it doesn't link against
123961 + * any of the gcc libraries
123962 + *
123963 + * gcc plugin to help implement various PaX features
123964 + *
123965 + * - track lowest stack pointer
123966 + *
123967 + * TODO:
123968 + * - initialize all local variables
123969 + *
123970 + * BUGS:
123971 + * - none known
123972 + */
123973 +
123974 +#include "gcc-common.h"
123975 +
123976 +int plugin_is_GPL_compatible;
123977 +
123978 +static int track_frame_size = -1;
123979 +static const char track_function[] = "pax_track_stack";
123980 +static const char check_function[] = "pax_check_alloca";
123981 +static tree track_function_decl, check_function_decl;
123982 +static bool init_locals;
123983 +
123984 +static struct plugin_info stackleak_plugin_info = {
123985 + .version = "201408011900",
123986 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
123987 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
123988 +};
123989 +
123990 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
123991 +{
123992 + gimple check_alloca;
123993 + tree alloca_size;
123994 +
123995 + // insert call to void pax_check_alloca(unsigned long size)
123996 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
123997 + check_alloca = gimple_build_call(check_function_decl, 1, alloca_size);
123998 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
123999 +}
124000 +
124001 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
124002 +{
124003 + gimple track_stack;
124004 +
124005 + // insert call to void pax_track_stack(void)
124006 + track_stack = gimple_build_call(track_function_decl, 0);
124007 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
124008 +}
124009 +
124010 +static bool is_alloca(gimple stmt)
124011 +{
124012 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
124013 + return true;
124014 +
124015 +#if BUILDING_GCC_VERSION >= 4007
124016 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
124017 + return true;
124018 +#endif
124019 +
124020 + return false;
124021 +}
124022 +
124023 +static unsigned int execute_stackleak_tree_instrument(void)
124024 +{
124025 + basic_block bb, entry_bb;
124026 + bool prologue_instrumented = false, is_leaf = true;
124027 +
124028 + entry_bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb;
124029 +
124030 + // 1. loop through BBs and GIMPLE statements
124031 + FOR_EACH_BB_FN(bb, cfun) {
124032 + gimple_stmt_iterator gsi;
124033 +
124034 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
124035 + gimple stmt;
124036 +
124037 + stmt = gsi_stmt(gsi);
124038 +
124039 + if (is_gimple_call(stmt))
124040 + is_leaf = false;
124041 +
124042 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
124043 + if (!is_alloca(stmt))
124044 + continue;
124045 +
124046 + // 2. insert stack overflow check before each __builtin_alloca call
124047 + stackleak_check_alloca(&gsi);
124048 +
124049 + // 3. insert track call after each __builtin_alloca call
124050 + stackleak_add_instrumentation(&gsi);
124051 + if (bb == entry_bb)
124052 + prologue_instrumented = true;
124053 + }
124054 + }
124055 +
124056 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
124057 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
124058 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
124059 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
124060 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
124061 + return 0;
124062 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
124063 + return 0;
124064 +
124065 + // 4. insert track call at the beginning
124066 + if (!prologue_instrumented) {
124067 + gimple_stmt_iterator gsi;
124068 +
124069 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
124070 + if (dom_info_available_p(CDI_DOMINATORS))
124071 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
124072 + gsi = gsi_start_bb(bb);
124073 + stackleak_add_instrumentation(&gsi);
124074 + }
124075 +
124076 + return 0;
124077 +}
124078 +
124079 +static unsigned int execute_stackleak_final(void)
124080 +{
124081 + rtx insn, next;
124082 +
124083 + if (cfun->calls_alloca)
124084 + return 0;
124085 +
124086 + // keep calls only if function frame is big enough
124087 + if (get_frame_size() >= track_frame_size)
124088 + return 0;
124089 +
124090 + // 1. find pax_track_stack calls
124091 + for (insn = get_insns(); insn; insn = next) {
124092 + // 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))
124093 + rtx body;
124094 +
124095 + next = NEXT_INSN(insn);
124096 + if (!CALL_P(insn))
124097 + continue;
124098 + body = PATTERN(insn);
124099 + if (GET_CODE(body) != CALL)
124100 + continue;
124101 + body = XEXP(body, 0);
124102 + if (GET_CODE(body) != MEM)
124103 + continue;
124104 + body = XEXP(body, 0);
124105 + if (GET_CODE(body) != SYMBOL_REF)
124106 + continue;
124107 +// if (strcmp(XSTR(body, 0), track_function))
124108 + if (SYMBOL_REF_DECL(body) != track_function_decl)
124109 + continue;
124110 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
124111 + // 2. delete call
124112 + delete_insn_and_edges(insn);
124113 +#if BUILDING_GCC_VERSION >= 4007
124114 + if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
124115 + insn = next;
124116 + next = NEXT_INSN(insn);
124117 + delete_insn_and_edges(insn);
124118 + }
124119 +#endif
124120 + }
124121 +
124122 +// print_simple_rtl(stderr, get_insns());
124123 +// print_rtl(stderr, get_insns());
124124 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
124125 +
124126 + return 0;
124127 +}
124128 +
124129 +static bool gate_stackleak_track_stack(void)
124130 +{
124131 + tree section;
124132 +
124133 + if (ix86_cmodel != CM_KERNEL)
124134 + return false;
124135 +
124136 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
124137 + if (section && TREE_VALUE(section)) {
124138 + section = TREE_VALUE(TREE_VALUE(section));
124139 +
124140 + if (!strncmp(TREE_STRING_POINTER(section), ".init.text", 10))
124141 + return false;
124142 + if (!strncmp(TREE_STRING_POINTER(section), ".devinit.text", 13))
124143 + return false;
124144 + if (!strncmp(TREE_STRING_POINTER(section), ".cpuinit.text", 13))
124145 + return false;
124146 + if (!strncmp(TREE_STRING_POINTER(section), ".meminit.text", 13))
124147 + return false;
124148 + }
124149 +
124150 + return track_frame_size >= 0;
124151 +}
124152 +
124153 +static void stackleak_start_unit(void *gcc_data, void *user_data)
124154 +{
124155 + tree fntype;
124156 +
124157 + // void pax_track_stack(void)
124158 + fntype = build_function_type_list(void_type_node, NULL_TREE);
124159 + track_function_decl = build_fn_decl(track_function, fntype);
124160 + DECL_ASSEMBLER_NAME(track_function_decl); // for LTO
124161 + TREE_PUBLIC(track_function_decl) = 1;
124162 + DECL_EXTERNAL(track_function_decl) = 1;
124163 + DECL_ARTIFICIAL(track_function_decl) = 1;
124164 +
124165 + // void pax_check_alloca(unsigned long)
124166 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
124167 + check_function_decl = build_fn_decl(check_function, fntype);
124168 + DECL_ASSEMBLER_NAME(check_function_decl); // for LTO
124169 + TREE_PUBLIC(check_function_decl) = 1;
124170 + DECL_EXTERNAL(check_function_decl) = 1;
124171 + DECL_ARTIFICIAL(check_function_decl) = 1;
124172 +}
124173 +
124174 +#if BUILDING_GCC_VERSION >= 4009
124175 +static const struct pass_data stackleak_tree_instrument_pass_data = {
124176 +#else
124177 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
124178 + .pass = {
124179 +#endif
124180 + .type = GIMPLE_PASS,
124181 + .name = "stackleak_tree_instrument",
124182 +#if BUILDING_GCC_VERSION >= 4008
124183 + .optinfo_flags = OPTGROUP_NONE,
124184 +#endif
124185 +#if BUILDING_GCC_VERSION >= 4009
124186 + .has_gate = true,
124187 + .has_execute = true,
124188 +#else
124189 + .gate = gate_stackleak_track_stack,
124190 + .execute = execute_stackleak_tree_instrument,
124191 + .sub = NULL,
124192 + .next = NULL,
124193 + .static_pass_number = 0,
124194 +#endif
124195 + .tv_id = TV_NONE,
124196 + .properties_required = PROP_gimple_leh | PROP_cfg,
124197 + .properties_provided = 0,
124198 + .properties_destroyed = 0,
124199 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
124200 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa | TODO_rebuild_cgraph_edges
124201 +#if BUILDING_GCC_VERSION < 4009
124202 + }
124203 +#endif
124204 +};
124205 +
124206 +#if BUILDING_GCC_VERSION >= 4009
124207 +static const struct pass_data stackleak_final_rtl_opt_pass_data = {
124208 +#else
124209 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
124210 + .pass = {
124211 +#endif
124212 + .type = RTL_PASS,
124213 + .name = "stackleak_final",
124214 +#if BUILDING_GCC_VERSION >= 4008
124215 + .optinfo_flags = OPTGROUP_NONE,
124216 +#endif
124217 +#if BUILDING_GCC_VERSION >= 4009
124218 + .has_gate = true,
124219 + .has_execute = true,
124220 +#else
124221 + .gate = gate_stackleak_track_stack,
124222 + .execute = execute_stackleak_final,
124223 + .sub = NULL,
124224 + .next = NULL,
124225 + .static_pass_number = 0,
124226 +#endif
124227 + .tv_id = TV_NONE,
124228 + .properties_required = 0,
124229 + .properties_provided = 0,
124230 + .properties_destroyed = 0,
124231 + .todo_flags_start = 0,
124232 + .todo_flags_finish = TODO_dump_func
124233 +#if BUILDING_GCC_VERSION < 4009
124234 + }
124235 +#endif
124236 +};
124237 +
124238 +#if BUILDING_GCC_VERSION >= 4009
124239 +namespace {
124240 +class stackleak_tree_instrument_pass : public gimple_opt_pass {
124241 +public:
124242 + stackleak_tree_instrument_pass() : gimple_opt_pass(stackleak_tree_instrument_pass_data, g) {}
124243 + bool gate() { return gate_stackleak_track_stack(); }
124244 + unsigned int execute() { return execute_stackleak_tree_instrument(); }
124245 +};
124246 +
124247 +class stackleak_final_rtl_opt_pass : public rtl_opt_pass {
124248 +public:
124249 + stackleak_final_rtl_opt_pass() : rtl_opt_pass(stackleak_final_rtl_opt_pass_data, g) {}
124250 + bool gate() { return gate_stackleak_track_stack(); }
124251 + unsigned int execute() { return execute_stackleak_final(); }
124252 +};
124253 +}
124254 +
124255 +static opt_pass *make_stackleak_tree_instrument_pass(void)
124256 +{
124257 + return new stackleak_tree_instrument_pass();
124258 +}
124259 +
124260 +static opt_pass *make_stackleak_final_rtl_opt_pass(void)
124261 +{
124262 + return new stackleak_final_rtl_opt_pass();
124263 +}
124264 +#else
124265 +static struct opt_pass *make_stackleak_tree_instrument_pass(void)
124266 +{
124267 + return &stackleak_tree_instrument_pass.pass;
124268 +}
124269 +
124270 +static struct opt_pass *make_stackleak_final_rtl_opt_pass(void)
124271 +{
124272 + return &stackleak_final_rtl_opt_pass.pass;
124273 +}
124274 +#endif
124275 +
124276 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
124277 +{
124278 + const char * const plugin_name = plugin_info->base_name;
124279 + const int argc = plugin_info->argc;
124280 + const struct plugin_argument * const argv = plugin_info->argv;
124281 + int i;
124282 + struct register_pass_info stackleak_tree_instrument_pass_info;
124283 + struct register_pass_info stackleak_final_pass_info;
124284 + static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
124285 + {
124286 + .base = &track_function_decl,
124287 + .nelt = 1,
124288 + .stride = sizeof(track_function_decl),
124289 + .cb = &gt_ggc_mx_tree_node,
124290 + .pchw = &gt_pch_nx_tree_node
124291 + },
124292 + {
124293 + .base = &check_function_decl,
124294 + .nelt = 1,
124295 + .stride = sizeof(check_function_decl),
124296 + .cb = &gt_ggc_mx_tree_node,
124297 + .pchw = &gt_pch_nx_tree_node
124298 + },
124299 + LAST_GGC_ROOT_TAB
124300 + };
124301 +
124302 + stackleak_tree_instrument_pass_info.pass = make_stackleak_tree_instrument_pass();
124303 +// stackleak_tree_instrument_pass_info.reference_pass_name = "tree_profile";
124304 + stackleak_tree_instrument_pass_info.reference_pass_name = "optimized";
124305 + stackleak_tree_instrument_pass_info.ref_pass_instance_number = 1;
124306 + stackleak_tree_instrument_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
124307 +
124308 + stackleak_final_pass_info.pass = make_stackleak_final_rtl_opt_pass();
124309 + stackleak_final_pass_info.reference_pass_name = "final";
124310 + stackleak_final_pass_info.ref_pass_instance_number = 1;
124311 + stackleak_final_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
124312 +
124313 + if (!plugin_default_version_check(version, &gcc_version)) {
124314 + error(G_("incompatible gcc/plugin versions"));
124315 + return 1;
124316 + }
124317 +
124318 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
124319 +
124320 + for (i = 0; i < argc; ++i) {
124321 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
124322 + if (!argv[i].value) {
124323 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124324 + continue;
124325 + }
124326 + track_frame_size = atoi(argv[i].value);
124327 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
124328 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
124329 + continue;
124330 + }
124331 + if (!strcmp(argv[i].key, "initialize-locals")) {
124332 + if (argv[i].value) {
124333 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
124334 + continue;
124335 + }
124336 + init_locals = true;
124337 + continue;
124338 + }
124339 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124340 + }
124341 +
124342 + register_callback(plugin_name, PLUGIN_START_UNIT, &stackleak_start_unit, NULL);
124343 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_stackleak);
124344 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
124345 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
124346 +
124347 + return 0;
124348 +}
124349 diff --git a/tools/gcc/structleak_plugin.c b/tools/gcc/structleak_plugin.c
124350 new file mode 100644
124351 index 0000000..4ee2231
124352 --- /dev/null
124353 +++ b/tools/gcc/structleak_plugin.c
124354 @@ -0,0 +1,274 @@
124355 +/*
124356 + * Copyright 2013-2014 by PaX Team <pageexec@freemail.hu>
124357 + * Licensed under the GPL v2
124358 + *
124359 + * Note: the choice of the license means that the compilation process is
124360 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
124361 + * but for the kernel it doesn't matter since it doesn't link against
124362 + * any of the gcc libraries
124363 + *
124364 + * gcc plugin to forcibly initialize certain local variables that could
124365 + * otherwise leak kernel stack to userland if they aren't properly initialized
124366 + * by later code
124367 + *
124368 + * Homepage: http://pax.grsecurity.net/
124369 + *
124370 + * Usage:
124371 + * $ # for 4.5/4.6/C based 4.7
124372 + * $ 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
124373 + * $ # for C++ based 4.7/4.8+
124374 + * $ 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
124375 + * $ gcc -fplugin=./structleak_plugin.so test.c -O2
124376 + *
124377 + * TODO: eliminate redundant initializers
124378 + * increase type coverage
124379 + */
124380 +
124381 +#include "gcc-common.h"
124382 +
124383 +// unused C type flag in all versions 4.5-4.9
124384 +#define TYPE_USERSPACE(TYPE) TYPE_LANG_FLAG_3(TYPE)
124385 +
124386 +int plugin_is_GPL_compatible;
124387 +
124388 +static struct plugin_info structleak_plugin_info = {
124389 + .version = "201401260140",
124390 + .help = "disable\tdo not activate plugin\n",
124391 +};
124392 +
124393 +static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
124394 +{
124395 + *no_add_attrs = true;
124396 +
124397 + // check for types? for now accept everything linux has to offer
124398 + if (TREE_CODE(*node) != FIELD_DECL)
124399 + return NULL_TREE;
124400 +
124401 + *no_add_attrs = false;
124402 + return NULL_TREE;
124403 +}
124404 +
124405 +static struct attribute_spec user_attr = {
124406 + .name = "user",
124407 + .min_length = 0,
124408 + .max_length = 0,
124409 + .decl_required = false,
124410 + .type_required = false,
124411 + .function_type_required = false,
124412 + .handler = handle_user_attribute,
124413 +#if BUILDING_GCC_VERSION >= 4007
124414 + .affects_type_identity = true
124415 +#endif
124416 +};
124417 +
124418 +static void register_attributes(void *event_data, void *data)
124419 +{
124420 + register_attribute(&user_attr);
124421 +// register_attribute(&force_attr);
124422 +}
124423 +
124424 +static tree get_field_type(tree field)
124425 +{
124426 + return strip_array_types(TREE_TYPE(field));
124427 +}
124428 +
124429 +static bool is_userspace_type(tree type)
124430 +{
124431 + tree field;
124432 +
124433 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
124434 + tree fieldtype = get_field_type(field);
124435 + enum tree_code code = TREE_CODE(fieldtype);
124436 +
124437 + if (code == RECORD_TYPE || code == UNION_TYPE)
124438 + if (is_userspace_type(fieldtype))
124439 + return true;
124440 +
124441 + if (lookup_attribute("user", DECL_ATTRIBUTES(field)))
124442 + return true;
124443 + }
124444 + return false;
124445 +}
124446 +
124447 +static void finish_type(void *event_data, void *data)
124448 +{
124449 + tree type = (tree)event_data;
124450 +
124451 + if (TYPE_USERSPACE(type))
124452 + return;
124453 +
124454 + if (is_userspace_type(type))
124455 + TYPE_USERSPACE(type) = 1;
124456 +}
124457 +
124458 +static void initialize(tree var)
124459 +{
124460 + basic_block bb;
124461 + gimple_stmt_iterator gsi;
124462 + tree initializer;
124463 + gimple init_stmt;
124464 +
124465 + // this is the original entry bb before the forced split
124466 + // TODO: check further BBs in case more splits occured before us
124467 + bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb->next_bb;
124468 +
124469 + // first check if the variable is already initialized, warn otherwise
124470 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
124471 + gimple stmt = gsi_stmt(gsi);
124472 + tree rhs1;
124473 +
124474 + // we're looking for an assignment of a single rhs...
124475 + if (!gimple_assign_single_p(stmt))
124476 + continue;
124477 + rhs1 = gimple_assign_rhs1(stmt);
124478 +#if BUILDING_GCC_VERSION >= 4007
124479 + // ... of a non-clobbering expression...
124480 + if (TREE_CLOBBER_P(rhs1))
124481 + continue;
124482 +#endif
124483 + // ... to our variable...
124484 + if (gimple_get_lhs(stmt) != var)
124485 + continue;
124486 + // if it's an initializer then we're good
124487 + if (TREE_CODE(rhs1) == CONSTRUCTOR)
124488 + return;
124489 + }
124490 +
124491 + // these aren't the 0days you're looking for
124492 +// inform(DECL_SOURCE_LOCATION(var), "userspace variable will be forcibly initialized");
124493 +
124494 + // build the initializer expression
124495 + initializer = build_constructor(TREE_TYPE(var), NULL);
124496 +
124497 + // build the initializer stmt
124498 + init_stmt = gimple_build_assign(var, initializer);
124499 + gsi = gsi_start_bb(ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb);
124500 + gsi_insert_before(&gsi, init_stmt, GSI_NEW_STMT);
124501 + update_stmt(init_stmt);
124502 +}
124503 +
124504 +static unsigned int handle_function(void)
124505 +{
124506 + basic_block bb;
124507 + unsigned int ret = 0;
124508 + tree var;
124509 + unsigned int i;
124510 +
124511 + // split the first bb where we can put the forced initializers
124512 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
124513 + if (dom_info_available_p(CDI_DOMINATORS))
124514 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
124515 +
124516 + // enumarate all local variables and forcibly initialize our targets
124517 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
124518 + tree type = TREE_TYPE(var);
124519 +
124520 + gcc_assert(DECL_P(var));
124521 + if (!auto_var_in_fn_p(var, current_function_decl))
124522 + continue;
124523 +
124524 + // only care about structure types
124525 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
124526 + continue;
124527 +
124528 + // if the type is of interest, examine the variable
124529 + if (TYPE_USERSPACE(type))
124530 + initialize(var);
124531 + }
124532 +
124533 + return ret;
124534 +}
124535 +
124536 +#if BUILDING_GCC_VERSION >= 4009
124537 +static const struct pass_data structleak_pass_data = {
124538 +#else
124539 +static struct gimple_opt_pass structleak_pass = {
124540 + .pass = {
124541 +#endif
124542 + .type = GIMPLE_PASS,
124543 + .name = "structleak",
124544 +#if BUILDING_GCC_VERSION >= 4008
124545 + .optinfo_flags = OPTGROUP_NONE,
124546 +#endif
124547 +#if BUILDING_GCC_VERSION >= 4009
124548 + .has_gate = false,
124549 + .has_execute = true,
124550 +#else
124551 + .gate = NULL,
124552 + .execute = handle_function,
124553 + .sub = NULL,
124554 + .next = NULL,
124555 + .static_pass_number = 0,
124556 +#endif
124557 + .tv_id = TV_NONE,
124558 + .properties_required = PROP_cfg,
124559 + .properties_provided = 0,
124560 + .properties_destroyed = 0,
124561 + .todo_flags_start = 0,
124562 + .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
124563 +#if BUILDING_GCC_VERSION < 4009
124564 + }
124565 +#endif
124566 +};
124567 +
124568 +#if BUILDING_GCC_VERSION >= 4009
124569 +namespace {
124570 +class structleak_pass : public gimple_opt_pass {
124571 +public:
124572 + structleak_pass() : gimple_opt_pass(structleak_pass_data, g) {}
124573 + unsigned int execute() { return handle_function(); }
124574 +};
124575 +}
124576 +
124577 +static opt_pass *make_structleak_pass(void)
124578 +{
124579 + return new structleak_pass();
124580 +}
124581 +#else
124582 +static struct opt_pass *make_structleak_pass(void)
124583 +{
124584 + return &structleak_pass.pass;
124585 +}
124586 +#endif
124587 +
124588 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
124589 +{
124590 + int i;
124591 + const char * const plugin_name = plugin_info->base_name;
124592 + const int argc = plugin_info->argc;
124593 + const struct plugin_argument * const argv = plugin_info->argv;
124594 + bool enable = true;
124595 + struct register_pass_info structleak_pass_info;
124596 +
124597 + structleak_pass_info.pass = make_structleak_pass();
124598 + structleak_pass_info.reference_pass_name = "ssa";
124599 + structleak_pass_info.ref_pass_instance_number = 1;
124600 + structleak_pass_info.pos_op = PASS_POS_INSERT_AFTER;
124601 +
124602 + if (!plugin_default_version_check(version, &gcc_version)) {
124603 + error(G_("incompatible gcc/plugin versions"));
124604 + return 1;
124605 + }
124606 +
124607 + if (strcmp(lang_hooks.name, "GNU C")) {
124608 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
124609 + enable = false;
124610 + }
124611 +
124612 + for (i = 0; i < argc; ++i) {
124613 + if (!strcmp(argv[i].key, "disable")) {
124614 + enable = false;
124615 + continue;
124616 + }
124617 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124618 + }
124619 +
124620 + register_callback(plugin_name, PLUGIN_INFO, NULL, &structleak_plugin_info);
124621 + if (enable) {
124622 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &structleak_pass_info);
124623 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
124624 + }
124625 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
124626 +
124627 + return 0;
124628 +}
124629 diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
124630 index 88461f0..6fb70a0 100644
124631 --- a/tools/include/linux/compiler.h
124632 +++ b/tools/include/linux/compiler.h
124633 @@ -35,6 +35,14 @@
124634 # define unlikely(x) __builtin_expect(!!(x), 0)
124635 #endif
124636
124637 +#ifndef __size_overflow
124638 +# define __size_overflow(...)
124639 +#endif
124640 +
124641 +#ifndef __intentional_overflow
124642 +# define __intentional_overflow(...)
124643 +#endif
124644 +
124645 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
124646
124647 #endif /* _TOOLS_LINUX_COMPILER_H */
124648 diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
124649 index 36c08b1..87c72d1 100644
124650 --- a/tools/lib/api/Makefile
124651 +++ b/tools/lib/api/Makefile
124652 @@ -21,7 +21,7 @@ LIB_OBJS += $(OUTPUT)fd/array.o
124653
124654 LIBFILE = libapikfs.a
124655
124656 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
124657 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
124658 EXTLIBS = -lelf -lpthread -lrt -lm
124659 ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
124660 ALL_LDFLAGS = $(LDFLAGS)
124661 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
124662 index 6789d788..4afd019e 100644
124663 --- a/tools/perf/util/include/asm/alternative-asm.h
124664 +++ b/tools/perf/util/include/asm/alternative-asm.h
124665 @@ -5,4 +5,7 @@
124666
124667 #define altinstruction_entry #
124668
124669 + .macro pax_force_retaddr rip=0, reload=0
124670 + .endm
124671 +
124672 #endif
124673 diff --git a/tools/virtio/linux/uaccess.h b/tools/virtio/linux/uaccess.h
124674 index 0a578fe..b81f62d 100644
124675 --- a/tools/virtio/linux/uaccess.h
124676 +++ b/tools/virtio/linux/uaccess.h
124677 @@ -13,7 +13,7 @@ static inline void __chk_user_ptr(const volatile void *p, size_t size)
124678 ({ \
124679 typeof(ptr) __pu_ptr = (ptr); \
124680 __chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr)); \
124681 - ACCESS_ONCE(*(__pu_ptr)) = x; \
124682 + ACCESS_ONCE_RW(*(__pu_ptr)) = x; \
124683 0; \
124684 })
124685
124686 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
124687 index 3cee7b1..29cb7d8 100644
124688 --- a/virt/kvm/kvm_main.c
124689 +++ b/virt/kvm/kvm_main.c
124690 @@ -78,12 +78,17 @@ LIST_HEAD(vm_list);
124691
124692 static cpumask_var_t cpus_hardware_enabled;
124693 static int kvm_usage_count = 0;
124694 -static atomic_t hardware_enable_failed;
124695 +static atomic_unchecked_t hardware_enable_failed;
124696
124697 struct kmem_cache *kvm_vcpu_cache;
124698 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
124699
124700 -static __read_mostly struct preempt_ops kvm_preempt_ops;
124701 +static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
124702 +static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
124703 +static struct preempt_ops kvm_preempt_ops = {
124704 + .sched_in = kvm_sched_in,
124705 + .sched_out = kvm_sched_out,
124706 +};
124707
124708 struct dentry *kvm_debugfs_dir;
124709
124710 @@ -786,7 +791,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
124711 /* We can read the guest memory with __xxx_user() later on. */
124712 if ((mem->slot < KVM_USER_MEM_SLOTS) &&
124713 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
124714 - !access_ok(VERIFY_WRITE,
124715 + !access_ok_noprefault(VERIFY_WRITE,
124716 (void __user *)(unsigned long)mem->userspace_addr,
124717 mem->memory_size)))
124718 goto out;
124719 @@ -1690,9 +1695,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
124720
124721 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
124722 {
124723 - const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
124724 + int r;
124725 + unsigned long addr;
124726
124727 - return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
124728 + addr = gfn_to_hva(kvm, gfn);
124729 + if (kvm_is_error_hva(addr))
124730 + return -EFAULT;
124731 + r = __clear_user((void __user *)addr + offset, len);
124732 + if (r)
124733 + return -EFAULT;
124734 + mark_page_dirty(kvm, gfn);
124735 + return 0;
124736 }
124737 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
124738
124739 @@ -1941,7 +1954,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
124740 return 0;
124741 }
124742
124743 -static struct file_operations kvm_vcpu_fops = {
124744 +static file_operations_no_const kvm_vcpu_fops __read_only = {
124745 .release = kvm_vcpu_release,
124746 .unlocked_ioctl = kvm_vcpu_ioctl,
124747 #ifdef CONFIG_COMPAT
124748 @@ -2650,7 +2663,7 @@ out:
124749 }
124750 #endif
124751
124752 -static struct file_operations kvm_vm_fops = {
124753 +static file_operations_no_const kvm_vm_fops __read_only = {
124754 .release = kvm_vm_release,
124755 .unlocked_ioctl = kvm_vm_ioctl,
124756 #ifdef CONFIG_COMPAT
124757 @@ -2721,7 +2734,7 @@ out:
124758 return r;
124759 }
124760
124761 -static struct file_operations kvm_chardev_ops = {
124762 +static file_operations_no_const kvm_chardev_ops __read_only = {
124763 .unlocked_ioctl = kvm_dev_ioctl,
124764 .compat_ioctl = kvm_dev_ioctl,
124765 .llseek = noop_llseek,
124766 @@ -2747,7 +2760,7 @@ static void hardware_enable_nolock(void *junk)
124767
124768 if (r) {
124769 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
124770 - atomic_inc(&hardware_enable_failed);
124771 + atomic_inc_unchecked(&hardware_enable_failed);
124772 printk(KERN_INFO "kvm: enabling virtualization on "
124773 "CPU%d failed\n", cpu);
124774 }
124775 @@ -2803,10 +2816,10 @@ static int hardware_enable_all(void)
124776
124777 kvm_usage_count++;
124778 if (kvm_usage_count == 1) {
124779 - atomic_set(&hardware_enable_failed, 0);
124780 + atomic_set_unchecked(&hardware_enable_failed, 0);
124781 on_each_cpu(hardware_enable_nolock, NULL, 1);
124782
124783 - if (atomic_read(&hardware_enable_failed)) {
124784 + if (atomic_read_unchecked(&hardware_enable_failed)) {
124785 hardware_disable_all_nolock();
124786 r = -EBUSY;
124787 }
124788 @@ -3213,7 +3226,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
124789 kvm_arch_vcpu_put(vcpu);
124790 }
124791
124792 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124793 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124794 struct module *module)
124795 {
124796 int r;
124797 @@ -3260,7 +3273,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124798 if (!vcpu_align)
124799 vcpu_align = __alignof__(struct kvm_vcpu);
124800 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
124801 - 0, NULL);
124802 + SLAB_USERCOPY, NULL);
124803 if (!kvm_vcpu_cache) {
124804 r = -ENOMEM;
124805 goto out_free_3;
124806 @@ -3270,9 +3283,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124807 if (r)
124808 goto out_free;
124809
124810 + pax_open_kernel();
124811 kvm_chardev_ops.owner = module;
124812 kvm_vm_fops.owner = module;
124813 kvm_vcpu_fops.owner = module;
124814 + pax_close_kernel();
124815
124816 r = misc_register(&kvm_dev);
124817 if (r) {
124818 @@ -3282,9 +3297,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
124819
124820 register_syscore_ops(&kvm_syscore_ops);
124821
124822 - kvm_preempt_ops.sched_in = kvm_sched_in;
124823 - kvm_preempt_ops.sched_out = kvm_sched_out;
124824 -
124825 r = kvm_init_debug();
124826 if (r) {
124827 printk(KERN_ERR "kvm: create debugfs files failed\n");
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)