]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-2.9.1-3.5.3-201208271906.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-2.9.1-3.5.3-201208271906.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index b4a898f..cd023f2 100644
3 --- a/Documentation/dontdiff
4 +++ b/Documentation/dontdiff
5 @@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9 +*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13 +*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17 @@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21 +*.gmo
22 *.grep
23 *.grp
24 *.gz
25 @@ -48,14 +51,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29 +*.vim
30 *.xml
31 *.xz
32 *_MODULES
33 +*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38 -.*
39 +.[^g]*
40 +.gen*
41 .*.d
42 .mm
43 53c700_d.h
44 @@ -69,6 +75,7 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48 +PERF*
49 SCCS
50 System.map*
51 TAGS
52 @@ -80,6 +87,7 @@ aic7*seq.h*
53 aicasm
54 aicdb.h*
55 altivec*.c
56 +ashldi3.S
57 asm-offsets.h
58 asm_offsets.h
59 autoconf.h*
60 @@ -92,19 +100,24 @@ bounds.h
61 bsetup
62 btfixupprep
63 build
64 +builtin-policy.h
65 bvmlinux
66 bzImage*
67 capability_names.h
68 capflags.c
69 classlist.h*
70 +clut_vga16.c
71 +common-cmds.h
72 comp*.log
73 compile.h*
74 conf
75 config
76 config-*
77 config_data.h*
78 +config.c
79 config.mak
80 config.mak.autogen
81 +config.tmp
82 conmakehash
83 consolemap_deftbl.c*
84 cpustr.h
85 @@ -115,9 +128,11 @@ devlist.h*
86 dnotify_test
87 docproc
88 dslm
89 +dtc-lexer.lex.c
90 elf2ecoff
91 elfconfig.h*
92 evergreen_reg_safe.h
93 +exception_policy.conf
94 fixdep
95 flask.h
96 fore200e_mkfirm
97 @@ -125,12 +140,15 @@ fore200e_pca_fw.c*
98 gconf
99 gconf.glade.h
100 gen-devlist
101 +gen-kdb_cmds.c
102 gen_crc32table
103 gen_init_cpio
104 generated
105 genheaders
106 genksyms
107 *_gray256.c
108 +hash
109 +hid-example
110 hpet_example
111 hugepage-mmap
112 hugepage-shm
113 @@ -145,7 +163,7 @@ int32.c
114 int4.c
115 int8.c
116 kallsyms
117 -kconfig
118 +kern_constants.h
119 keywords.c
120 ksym.c*
121 ksym.h*
122 @@ -153,7 +171,7 @@ kxgettext
123 lkc_defs.h
124 lex.c
125 lex.*.c
126 -linux
127 +lib1funcs.S
128 logo_*.c
129 logo_*_clut224.c
130 logo_*_mono.c
131 @@ -164,14 +182,15 @@ machtypes.h
132 map
133 map_hugetlb
134 maui_boot.h
135 -media
136 mconf
137 +mdp
138 miboot*
139 mk_elfconfig
140 mkboot
141 mkbugboot
142 mkcpustr
143 mkdep
144 +mkpiggy
145 mkprep
146 mkregtable
147 mktables
148 @@ -188,6 +207,8 @@ oui.c*
149 page-types
150 parse.c
151 parse.h
152 +parse-events*
153 +pasyms.h
154 patches*
155 pca200e.bin
156 pca200e_ecd.bin2
157 @@ -197,6 +218,7 @@ perf-archive
158 piggyback
159 piggy.gzip
160 piggy.S
161 +pmu-*
162 pnmtologo
163 ppc_defs.h*
164 pss_boot.h
165 @@ -206,7 +228,10 @@ r200_reg_safe.h
166 r300_reg_safe.h
167 r420_reg_safe.h
168 r600_reg_safe.h
169 +realmode.lds
170 +realmode.relocs
171 recordmcount
172 +regdb.c
173 relocs
174 rlim_names.h
175 rn50_reg_safe.h
176 @@ -216,8 +241,11 @@ series
177 setup
178 setup.bin
179 setup.elf
180 +size_overflow_hash.h
181 sImage
182 +slabinfo
183 sm_tbl*
184 +sortextable
185 split-include
186 syscalltab.h
187 tables.c
188 @@ -227,6 +255,7 @@ tftpboot.img
189 timeconst.h
190 times.h*
191 trix_boot.h
192 +user_constants.h
193 utsrelease.h*
194 vdso-syms.lds
195 vdso.lds
196 @@ -238,13 +267,17 @@ vdso32.lds
197 vdso32.so.dbg
198 vdso64.lds
199 vdso64.so.dbg
200 +vdsox32.lds
201 +vdsox32-syms.lds
202 version.h*
203 vmImage
204 vmlinux
205 vmlinux-*
206 vmlinux.aout
207 vmlinux.bin.all
208 +vmlinux.bin.bz2
209 vmlinux.lds
210 +vmlinux.relocs
211 vmlinuz
212 voffset.h
213 vsyscall.lds
214 @@ -252,9 +285,11 @@ vsyscall_32.lds
215 wanxlfw.inc
216 uImage
217 unifdef
218 +utsrelease.h
219 wakeup.bin
220 wakeup.elf
221 wakeup.lds
222 zImage*
223 zconf.hash.c
224 +zconf.lex.c
225 zoffset.h
226 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
227 index a92c5eb..7530459 100644
228 --- a/Documentation/kernel-parameters.txt
229 +++ b/Documentation/kernel-parameters.txt
230 @@ -2051,6 +2051,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
231 the specified number of seconds. This is to be used if
232 your oopses keep scrolling off the screen.
233
234 + pax_nouderef [X86] disables UDEREF. Most likely needed under certain
235 + virtualization environments that don't cope well with the
236 + expand down segment used by UDEREF on X86-32 or the frequent
237 + page table updates on X86-64.
238 +
239 + pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
240 +
241 pcbit= [HW,ISDN]
242
243 pcd. [PARIDE]
244 diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
245 index 13d6166..8c235b6 100644
246 --- a/Documentation/sysctl/fs.txt
247 +++ b/Documentation/sysctl/fs.txt
248 @@ -163,16 +163,22 @@ This value can be used to query and set the core dump mode for setuid
249 or otherwise protected/tainted binaries. The modes are
250
251 0 - (default) - traditional behaviour. Any process which has changed
252 - privilege levels or is execute only will not be dumped
253 + privilege levels or is execute only will not be dumped.
254 1 - (debug) - all processes dump core when possible. The core dump is
255 owned by the current user and no security is applied. This is
256 intended for system debugging situations only. Ptrace is unchecked.
257 + This is insecure as it allows regular users to examine the memory
258 + contents of privileged processes.
259 2 - (suidsafe) - any binary which normally would not be dumped is dumped
260 - readable by root only. This allows the end user to remove
261 - such a dump but not access it directly. For security reasons
262 - core dumps in this mode will not overwrite one another or
263 - other files. This mode is appropriate when administrators are
264 - attempting to debug problems in a normal environment.
265 + anyway, but only if the "core_pattern" kernel sysctl is set to
266 + either a pipe handler or a fully qualified path. (For more details
267 + on this limitation, see CVE-2006-2451.) This mode is appropriate
268 + when administrators are attempting to debug problems in a normal
269 + environment, and either have a core dump pipe handler that knows
270 + to treat privileged core dumps with care, or specific directory
271 + defined for catching core dumps. If a core dump happens without
272 + a pipe handler or fully qualifid path, a message will be emitted
273 + to syslog warning about the lack of a correct setting.
274
275 ==============================================================
276
277 diff --git a/Makefile b/Makefile
278 index c901aae..0f96503 100644
279 --- a/Makefile
280 +++ b/Makefile
281 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
282
283 HOSTCC = gcc
284 HOSTCXX = g++
285 -HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
286 -HOSTCXXFLAGS = -O2
287 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
288 +HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
289 +HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
290
291 # Decide whether to build built-in, modular, or both.
292 # Normally, just do built-in.
293 @@ -404,8 +405,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
294 # Rules shared between *config targets and build targets
295
296 # Basic helpers built in scripts/
297 -PHONY += scripts_basic
298 -scripts_basic:
299 +PHONY += scripts_basic gcc-plugins
300 +scripts_basic: gcc-plugins
301 $(Q)$(MAKE) $(build)=scripts/basic
302 $(Q)rm -f .tmp_quiet_recordmcount
303
304 @@ -561,6 +562,60 @@ else
305 KBUILD_CFLAGS += -O2
306 endif
307
308 +ifndef DISABLE_PAX_PLUGINS
309 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
310 +ifneq ($(PLUGINCC),)
311 +ifndef DISABLE_PAX_CONSTIFY_PLUGIN
312 +ifndef CONFIG_UML
313 +CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
314 +endif
315 +endif
316 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
317 +STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
318 +STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
319 +endif
320 +ifdef CONFIG_KALLOCSTAT_PLUGIN
321 +KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
322 +endif
323 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
324 +KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
325 +KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
326 +KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
327 +endif
328 +ifdef CONFIG_CHECKER_PLUGIN
329 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
330 +CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
331 +endif
332 +endif
333 +COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
334 +ifdef CONFIG_PAX_SIZE_OVERFLOW
335 +SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
336 +endif
337 +ifdef CONFIG_PAX_LATENT_ENTROPY
338 +LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
339 +endif
340 +GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
341 +GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
342 +GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS)
343 +GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
344 +export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN
345 +ifeq ($(KBUILD_EXTMOD),)
346 +gcc-plugins:
347 + $(Q)$(MAKE) $(build)=tools/gcc
348 +else
349 +gcc-plugins: ;
350 +endif
351 +else
352 +gcc-plugins:
353 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
354 + $(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.))
355 +else
356 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
357 +endif
358 + $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
359 +endif
360 +endif
361 +
362 include $(srctree)/arch/$(SRCARCH)/Makefile
363
364 ifdef CONFIG_READABLE_ASM
365 @@ -715,7 +770,7 @@ export mod_strip_cmd
366
367
368 ifeq ($(KBUILD_EXTMOD),)
369 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
370 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
371
372 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
373 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
374 @@ -762,6 +817,8 @@ endif
375
376 # The actual objects are generated when descending,
377 # make sure no implicit rule kicks in
378 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
379 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
380 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
381
382 # Handle descending into subdirectories listed in $(vmlinux-dirs)
383 @@ -771,7 +828,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
384 # Error messages still appears in the original language
385
386 PHONY += $(vmlinux-dirs)
387 -$(vmlinux-dirs): prepare scripts
388 +$(vmlinux-dirs): gcc-plugins prepare scripts
389 $(Q)$(MAKE) $(build)=$@
390
391 # Store (new) KERNELRELASE string in include/config/kernel.release
392 @@ -815,6 +872,7 @@ prepare0: archprepare FORCE
393 $(Q)$(MAKE) $(build)=.
394
395 # All the preparing..
396 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
397 prepare: prepare0
398
399 # Generate some files
400 @@ -922,6 +980,8 @@ all: modules
401 # using awk while concatenating to the final file.
402
403 PHONY += modules
404 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
405 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
406 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
407 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
408 @$(kecho) ' Building modules, stage 2.';
409 @@ -937,7 +997,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
410
411 # Target to prepare building external modules
412 PHONY += modules_prepare
413 -modules_prepare: prepare scripts
414 +modules_prepare: gcc-plugins prepare scripts
415
416 # Target to install modules
417 PHONY += modules_install
418 @@ -994,7 +1054,7 @@ CLEAN_DIRS += $(MODVERDIR)
419 MRPROPER_DIRS += include/config usr/include include/generated \
420 arch/*/include/generated
421 MRPROPER_FILES += .config .config.old .version .old_version \
422 - include/linux/version.h \
423 + include/linux/version.h tools/gcc/size_overflow_hash.h\
424 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
425
426 # clean - Delete most, but leave enough to build external modules
427 @@ -1032,6 +1092,7 @@ distclean: mrproper
428 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
429 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
430 -o -name '.*.rej' \
431 + -o -name '.*.rej' -o -name '*.so' \
432 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
433 -type f -print | xargs rm -f
434
435 @@ -1192,6 +1253,8 @@ PHONY += $(module-dirs) modules
436 $(module-dirs): crmodverdir $(objtree)/Module.symvers
437 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
438
439 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
440 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
441 modules: $(module-dirs)
442 @$(kecho) ' Building modules, stage 2.';
443 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
444 @@ -1326,17 +1389,21 @@ else
445 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
446 endif
447
448 -%.s: %.c prepare scripts FORCE
449 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
450 +%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
451 +%.s: %.c gcc-plugins prepare scripts FORCE
452 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
453 %.i: %.c prepare scripts FORCE
454 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
455 -%.o: %.c prepare scripts FORCE
456 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
457 +%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
458 +%.o: %.c gcc-plugins prepare scripts FORCE
459 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
460 %.lst: %.c prepare scripts FORCE
461 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
462 -%.s: %.S prepare scripts FORCE
463 +%.s: %.S gcc-plugins prepare scripts FORCE
464 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
465 -%.o: %.S prepare scripts FORCE
466 +%.o: %.S gcc-plugins prepare scripts FORCE
467 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
468 %.symtypes: %.c prepare scripts FORCE
469 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
470 @@ -1346,11 +1413,15 @@ endif
471 $(cmd_crmodverdir)
472 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
473 $(build)=$(build-dir)
474 -%/: prepare scripts FORCE
475 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
476 +%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
477 +%/: gcc-plugins prepare scripts FORCE
478 $(cmd_crmodverdir)
479 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
480 $(build)=$(build-dir)
481 -%.ko: prepare scripts FORCE
482 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
483 +%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
484 +%.ko: gcc-plugins prepare scripts FORCE
485 $(cmd_crmodverdir)
486 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
487 $(build)=$(build-dir) $(@:.ko=.o)
488 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
489 index 3bb7ffe..347a54c 100644
490 --- a/arch/alpha/include/asm/atomic.h
491 +++ b/arch/alpha/include/asm/atomic.h
492 @@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
493 #define atomic_dec(v) atomic_sub(1,(v))
494 #define atomic64_dec(v) atomic64_sub(1,(v))
495
496 +#define atomic64_read_unchecked(v) atomic64_read(v)
497 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
498 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
499 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
500 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
501 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
502 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
503 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
504 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
505 +
506 #define smp_mb__before_atomic_dec() smp_mb()
507 #define smp_mb__after_atomic_dec() smp_mb()
508 #define smp_mb__before_atomic_inc() smp_mb()
509 diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
510 index ad368a9..fbe0f25 100644
511 --- a/arch/alpha/include/asm/cache.h
512 +++ b/arch/alpha/include/asm/cache.h
513 @@ -4,19 +4,19 @@
514 #ifndef __ARCH_ALPHA_CACHE_H
515 #define __ARCH_ALPHA_CACHE_H
516
517 +#include <linux/const.h>
518
519 /* Bytes per L1 (data) cache line. */
520 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
521 -# define L1_CACHE_BYTES 64
522 # define L1_CACHE_SHIFT 6
523 #else
524 /* Both EV4 and EV5 are write-through, read-allocate,
525 direct-mapped, physical.
526 */
527 -# define L1_CACHE_BYTES 32
528 # define L1_CACHE_SHIFT 5
529 #endif
530
531 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
532 #define SMP_CACHE_BYTES L1_CACHE_BYTES
533
534 #endif
535 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
536 index 968d999..d36b2df 100644
537 --- a/arch/alpha/include/asm/elf.h
538 +++ b/arch/alpha/include/asm/elf.h
539 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
540
541 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
542
543 +#ifdef CONFIG_PAX_ASLR
544 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
545 +
546 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
547 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
548 +#endif
549 +
550 /* $0 is set by ld.so to a pointer to a function which might be
551 registered using atexit. This provides a mean for the dynamic
552 linker to call DT_FINI functions for shared libraries that have
553 diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
554 index bc2a0da..8ad11ee 100644
555 --- a/arch/alpha/include/asm/pgalloc.h
556 +++ b/arch/alpha/include/asm/pgalloc.h
557 @@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
558 pgd_set(pgd, pmd);
559 }
560
561 +static inline void
562 +pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
563 +{
564 + pgd_populate(mm, pgd, pmd);
565 +}
566 +
567 extern pgd_t *pgd_alloc(struct mm_struct *mm);
568
569 static inline void
570 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
571 index 81a4342..348b927 100644
572 --- a/arch/alpha/include/asm/pgtable.h
573 +++ b/arch/alpha/include/asm/pgtable.h
574 @@ -102,6 +102,17 @@ struct vm_area_struct;
575 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
576 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
577 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
578 +
579 +#ifdef CONFIG_PAX_PAGEEXEC
580 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
581 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
582 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
583 +#else
584 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
585 +# define PAGE_COPY_NOEXEC PAGE_COPY
586 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
587 +#endif
588 +
589 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
590
591 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
592 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
593 index 2fd00b7..cfd5069 100644
594 --- a/arch/alpha/kernel/module.c
595 +++ b/arch/alpha/kernel/module.c
596 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
597
598 /* The small sections were sorted to the end of the segment.
599 The following should definitely cover them. */
600 - gp = (u64)me->module_core + me->core_size - 0x8000;
601 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
602 got = sechdrs[me->arch.gotsecindex].sh_addr;
603
604 for (i = 0; i < n; i++) {
605 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
606 index 98a1036..fb54ccf 100644
607 --- a/arch/alpha/kernel/osf_sys.c
608 +++ b/arch/alpha/kernel/osf_sys.c
609 @@ -1312,7 +1312,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
610 /* At this point: (!vma || addr < vma->vm_end). */
611 if (limit - len < addr)
612 return -ENOMEM;
613 - if (!vma || addr + len <= vma->vm_start)
614 + if (check_heap_stack_gap(vma, addr, len))
615 return addr;
616 addr = vma->vm_end;
617 vma = vma->vm_next;
618 @@ -1348,6 +1348,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
619 merely specific addresses, but regions of memory -- perhaps
620 this feature should be incorporated into all ports? */
621
622 +#ifdef CONFIG_PAX_RANDMMAP
623 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
624 +#endif
625 +
626 if (addr) {
627 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
628 if (addr != (unsigned long) -ENOMEM)
629 @@ -1355,8 +1359,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
630 }
631
632 /* Next, try allocating at TASK_UNMAPPED_BASE. */
633 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
634 - len, limit);
635 + addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
636 +
637 if (addr != (unsigned long) -ENOMEM)
638 return addr;
639
640 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
641 index 5eecab1..609abc0 100644
642 --- a/arch/alpha/mm/fault.c
643 +++ b/arch/alpha/mm/fault.c
644 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
645 __reload_thread(pcb);
646 }
647
648 +#ifdef CONFIG_PAX_PAGEEXEC
649 +/*
650 + * PaX: decide what to do with offenders (regs->pc = fault address)
651 + *
652 + * returns 1 when task should be killed
653 + * 2 when patched PLT trampoline was detected
654 + * 3 when unpatched PLT trampoline was detected
655 + */
656 +static int pax_handle_fetch_fault(struct pt_regs *regs)
657 +{
658 +
659 +#ifdef CONFIG_PAX_EMUPLT
660 + int err;
661 +
662 + do { /* PaX: patched PLT emulation #1 */
663 + unsigned int ldah, ldq, jmp;
664 +
665 + err = get_user(ldah, (unsigned int *)regs->pc);
666 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
667 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
668 +
669 + if (err)
670 + break;
671 +
672 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
673 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
674 + jmp == 0x6BFB0000U)
675 + {
676 + unsigned long r27, addr;
677 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
678 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
679 +
680 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
681 + err = get_user(r27, (unsigned long *)addr);
682 + if (err)
683 + break;
684 +
685 + regs->r27 = r27;
686 + regs->pc = r27;
687 + return 2;
688 + }
689 + } while (0);
690 +
691 + do { /* PaX: patched PLT emulation #2 */
692 + unsigned int ldah, lda, br;
693 +
694 + err = get_user(ldah, (unsigned int *)regs->pc);
695 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
696 + err |= get_user(br, (unsigned int *)(regs->pc+8));
697 +
698 + if (err)
699 + break;
700 +
701 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
702 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
703 + (br & 0xFFE00000U) == 0xC3E00000U)
704 + {
705 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
706 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
707 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
708 +
709 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
710 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
711 + return 2;
712 + }
713 + } while (0);
714 +
715 + do { /* PaX: unpatched PLT emulation */
716 + unsigned int br;
717 +
718 + err = get_user(br, (unsigned int *)regs->pc);
719 +
720 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
721 + unsigned int br2, ldq, nop, jmp;
722 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
723 +
724 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
725 + err = get_user(br2, (unsigned int *)addr);
726 + err |= get_user(ldq, (unsigned int *)(addr+4));
727 + err |= get_user(nop, (unsigned int *)(addr+8));
728 + err |= get_user(jmp, (unsigned int *)(addr+12));
729 + err |= get_user(resolver, (unsigned long *)(addr+16));
730 +
731 + if (err)
732 + break;
733 +
734 + if (br2 == 0xC3600000U &&
735 + ldq == 0xA77B000CU &&
736 + nop == 0x47FF041FU &&
737 + jmp == 0x6B7B0000U)
738 + {
739 + regs->r28 = regs->pc+4;
740 + regs->r27 = addr+16;
741 + regs->pc = resolver;
742 + return 3;
743 + }
744 + }
745 + } while (0);
746 +#endif
747 +
748 + return 1;
749 +}
750 +
751 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
752 +{
753 + unsigned long i;
754 +
755 + printk(KERN_ERR "PAX: bytes at PC: ");
756 + for (i = 0; i < 5; i++) {
757 + unsigned int c;
758 + if (get_user(c, (unsigned int *)pc+i))
759 + printk(KERN_CONT "???????? ");
760 + else
761 + printk(KERN_CONT "%08x ", c);
762 + }
763 + printk("\n");
764 +}
765 +#endif
766
767 /*
768 * This routine handles page faults. It determines the address,
769 @@ -130,8 +248,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
770 good_area:
771 si_code = SEGV_ACCERR;
772 if (cause < 0) {
773 - if (!(vma->vm_flags & VM_EXEC))
774 + if (!(vma->vm_flags & VM_EXEC)) {
775 +
776 +#ifdef CONFIG_PAX_PAGEEXEC
777 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
778 + goto bad_area;
779 +
780 + up_read(&mm->mmap_sem);
781 + switch (pax_handle_fetch_fault(regs)) {
782 +
783 +#ifdef CONFIG_PAX_EMUPLT
784 + case 2:
785 + case 3:
786 + return;
787 +#endif
788 +
789 + }
790 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
791 + do_group_exit(SIGKILL);
792 +#else
793 goto bad_area;
794 +#endif
795 +
796 + }
797 } else if (!cause) {
798 /* Allow reads even for write-only mappings */
799 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
800 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
801 index c79f61f..9ac0642 100644
802 --- a/arch/arm/include/asm/atomic.h
803 +++ b/arch/arm/include/asm/atomic.h
804 @@ -17,17 +17,35 @@
805 #include <asm/barrier.h>
806 #include <asm/cmpxchg.h>
807
808 +#ifdef CONFIG_GENERIC_ATOMIC64
809 +#include <asm-generic/atomic64.h>
810 +#endif
811 +
812 #define ATOMIC_INIT(i) { (i) }
813
814 #ifdef __KERNEL__
815
816 +#define _ASM_EXTABLE(from, to) \
817 +" .pushsection __ex_table,\"a\"\n"\
818 +" .align 3\n" \
819 +" .long " #from ", " #to"\n" \
820 +" .popsection"
821 +
822 /*
823 * On ARM, ordinary assignment (str instruction) doesn't clear the local
824 * strex/ldrex monitor on some implementations. The reason we can use it for
825 * atomic_set() is the clrex or dummy strex done on every exception return.
826 */
827 #define atomic_read(v) (*(volatile int *)&(v)->counter)
828 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
829 +{
830 + return v->counter;
831 +}
832 #define atomic_set(v,i) (((v)->counter) = (i))
833 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
834 +{
835 + v->counter = i;
836 +}
837
838 #if __LINUX_ARM_ARCH__ >= 6
839
840 @@ -42,6 +60,35 @@ static inline void atomic_add(int i, atomic_t *v)
841 int result;
842
843 __asm__ __volatile__("@ atomic_add\n"
844 +"1: ldrex %1, [%3]\n"
845 +" adds %0, %1, %4\n"
846 +
847 +#ifdef CONFIG_PAX_REFCOUNT
848 +" bvc 3f\n"
849 +"2: bkpt 0xf103\n"
850 +"3:\n"
851 +#endif
852 +
853 +" strex %1, %0, [%3]\n"
854 +" teq %1, #0\n"
855 +" bne 1b"
856 +
857 +#ifdef CONFIG_PAX_REFCOUNT
858 +"\n4:\n"
859 + _ASM_EXTABLE(2b, 4b)
860 +#endif
861 +
862 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
863 + : "r" (&v->counter), "Ir" (i)
864 + : "cc");
865 +}
866 +
867 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
868 +{
869 + unsigned long tmp;
870 + int result;
871 +
872 + __asm__ __volatile__("@ atomic_add_unchecked\n"
873 "1: ldrex %0, [%3]\n"
874 " add %0, %0, %4\n"
875 " strex %1, %0, [%3]\n"
876 @@ -60,6 +107,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
877 smp_mb();
878
879 __asm__ __volatile__("@ atomic_add_return\n"
880 +"1: ldrex %1, [%3]\n"
881 +" adds %0, %1, %4\n"
882 +
883 +#ifdef CONFIG_PAX_REFCOUNT
884 +" bvc 3f\n"
885 +" mov %0, %1\n"
886 +"2: bkpt 0xf103\n"
887 +"3:\n"
888 +#endif
889 +
890 +" strex %1, %0, [%3]\n"
891 +" teq %1, #0\n"
892 +" bne 1b"
893 +
894 +#ifdef CONFIG_PAX_REFCOUNT
895 +"\n4:\n"
896 + _ASM_EXTABLE(2b, 4b)
897 +#endif
898 +
899 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
900 + : "r" (&v->counter), "Ir" (i)
901 + : "cc");
902 +
903 + smp_mb();
904 +
905 + return result;
906 +}
907 +
908 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
909 +{
910 + unsigned long tmp;
911 + int result;
912 +
913 + smp_mb();
914 +
915 + __asm__ __volatile__("@ atomic_add_return_unchecked\n"
916 "1: ldrex %0, [%3]\n"
917 " add %0, %0, %4\n"
918 " strex %1, %0, [%3]\n"
919 @@ -80,6 +163,35 @@ static inline void atomic_sub(int i, atomic_t *v)
920 int result;
921
922 __asm__ __volatile__("@ atomic_sub\n"
923 +"1: ldrex %1, [%3]\n"
924 +" subs %0, %1, %4\n"
925 +
926 +#ifdef CONFIG_PAX_REFCOUNT
927 +" bvc 3f\n"
928 +"2: bkpt 0xf103\n"
929 +"3:\n"
930 +#endif
931 +
932 +" strex %1, %0, [%3]\n"
933 +" teq %1, #0\n"
934 +" bne 1b"
935 +
936 +#ifdef CONFIG_PAX_REFCOUNT
937 +"\n4:\n"
938 + _ASM_EXTABLE(2b, 4b)
939 +#endif
940 +
941 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
942 + : "r" (&v->counter), "Ir" (i)
943 + : "cc");
944 +}
945 +
946 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
947 +{
948 + unsigned long tmp;
949 + int result;
950 +
951 + __asm__ __volatile__("@ atomic_sub_unchecked\n"
952 "1: ldrex %0, [%3]\n"
953 " sub %0, %0, %4\n"
954 " strex %1, %0, [%3]\n"
955 @@ -98,11 +210,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
956 smp_mb();
957
958 __asm__ __volatile__("@ atomic_sub_return\n"
959 -"1: ldrex %0, [%3]\n"
960 -" sub %0, %0, %4\n"
961 +"1: ldrex %1, [%3]\n"
962 +" subs %0, %1, %4\n"
963 +
964 +#ifdef CONFIG_PAX_REFCOUNT
965 +" bvc 3f\n"
966 +" mov %0, %1\n"
967 +"2: bkpt 0xf103\n"
968 +"3:\n"
969 +#endif
970 +
971 " strex %1, %0, [%3]\n"
972 " teq %1, #0\n"
973 " bne 1b"
974 +
975 +#ifdef CONFIG_PAX_REFCOUNT
976 +"\n4:\n"
977 + _ASM_EXTABLE(2b, 4b)
978 +#endif
979 +
980 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
981 : "r" (&v->counter), "Ir" (i)
982 : "cc");
983 @@ -134,6 +260,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
984 return oldval;
985 }
986
987 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
988 +{
989 + unsigned long oldval, res;
990 +
991 + smp_mb();
992 +
993 + do {
994 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
995 + "ldrex %1, [%3]\n"
996 + "mov %0, #0\n"
997 + "teq %1, %4\n"
998 + "strexeq %0, %5, [%3]\n"
999 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1000 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
1001 + : "cc");
1002 + } while (res);
1003 +
1004 + smp_mb();
1005 +
1006 + return oldval;
1007 +}
1008 +
1009 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1010 {
1011 unsigned long tmp, tmp2;
1012 @@ -167,7 +315,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1013
1014 return val;
1015 }
1016 +
1017 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1018 +{
1019 + return atomic_add_return(i, v);
1020 +}
1021 +
1022 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1023 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1024 +{
1025 + (void) atomic_add_return(i, v);
1026 +}
1027
1028 static inline int atomic_sub_return(int i, atomic_t *v)
1029 {
1030 @@ -182,6 +340,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1031 return val;
1032 }
1033 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1034 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1035 +{
1036 + (void) atomic_sub_return(i, v);
1037 +}
1038
1039 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1040 {
1041 @@ -197,6 +359,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1042 return ret;
1043 }
1044
1045 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1046 +{
1047 + return atomic_cmpxchg(v, old, new);
1048 +}
1049 +
1050 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1051 {
1052 unsigned long flags;
1053 @@ -209,6 +376,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1054 #endif /* __LINUX_ARM_ARCH__ */
1055
1056 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1057 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1058 +{
1059 + return xchg(&v->counter, new);
1060 +}
1061
1062 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1063 {
1064 @@ -221,11 +392,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1065 }
1066
1067 #define atomic_inc(v) atomic_add(1, v)
1068 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1069 +{
1070 + atomic_add_unchecked(1, v);
1071 +}
1072 #define atomic_dec(v) atomic_sub(1, v)
1073 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1074 +{
1075 + atomic_sub_unchecked(1, v);
1076 +}
1077
1078 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1079 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1080 +{
1081 + return atomic_add_return_unchecked(1, v) == 0;
1082 +}
1083 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1084 #define atomic_inc_return(v) (atomic_add_return(1, v))
1085 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1086 +{
1087 + return atomic_add_return_unchecked(1, v);
1088 +}
1089 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1090 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1091
1092 @@ -241,6 +428,14 @@ typedef struct {
1093 u64 __aligned(8) counter;
1094 } atomic64_t;
1095
1096 +#ifdef CONFIG_PAX_REFCOUNT
1097 +typedef struct {
1098 + u64 __aligned(8) counter;
1099 +} atomic64_unchecked_t;
1100 +#else
1101 +typedef atomic64_t atomic64_unchecked_t;
1102 +#endif
1103 +
1104 #define ATOMIC64_INIT(i) { (i) }
1105
1106 static inline u64 atomic64_read(const atomic64_t *v)
1107 @@ -256,6 +451,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1108 return result;
1109 }
1110
1111 +static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
1112 +{
1113 + u64 result;
1114 +
1115 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1116 +" ldrexd %0, %H0, [%1]"
1117 + : "=&r" (result)
1118 + : "r" (&v->counter), "Qo" (v->counter)
1119 + );
1120 +
1121 + return result;
1122 +}
1123 +
1124 static inline void atomic64_set(atomic64_t *v, u64 i)
1125 {
1126 u64 tmp;
1127 @@ -270,6 +478,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1128 : "cc");
1129 }
1130
1131 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1132 +{
1133 + u64 tmp;
1134 +
1135 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1136 +"1: ldrexd %0, %H0, [%2]\n"
1137 +" strexd %0, %3, %H3, [%2]\n"
1138 +" teq %0, #0\n"
1139 +" bne 1b"
1140 + : "=&r" (tmp), "=Qo" (v->counter)
1141 + : "r" (&v->counter), "r" (i)
1142 + : "cc");
1143 +}
1144 +
1145 static inline void atomic64_add(u64 i, atomic64_t *v)
1146 {
1147 u64 result;
1148 @@ -278,6 +500,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1149 __asm__ __volatile__("@ atomic64_add\n"
1150 "1: ldrexd %0, %H0, [%3]\n"
1151 " adds %0, %0, %4\n"
1152 +" adcs %H0, %H0, %H4\n"
1153 +
1154 +#ifdef CONFIG_PAX_REFCOUNT
1155 +" bvc 3f\n"
1156 +"2: bkpt 0xf103\n"
1157 +"3:\n"
1158 +#endif
1159 +
1160 +" strexd %1, %0, %H0, [%3]\n"
1161 +" teq %1, #0\n"
1162 +" bne 1b"
1163 +
1164 +#ifdef CONFIG_PAX_REFCOUNT
1165 +"\n4:\n"
1166 + _ASM_EXTABLE(2b, 4b)
1167 +#endif
1168 +
1169 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1170 + : "r" (&v->counter), "r" (i)
1171 + : "cc");
1172 +}
1173 +
1174 +static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1175 +{
1176 + u64 result;
1177 + unsigned long tmp;
1178 +
1179 + __asm__ __volatile__("@ atomic64_add_unchecked\n"
1180 +"1: ldrexd %0, %H0, [%3]\n"
1181 +" adds %0, %0, %4\n"
1182 " adc %H0, %H0, %H4\n"
1183 " strexd %1, %0, %H0, [%3]\n"
1184 " teq %1, #0\n"
1185 @@ -289,12 +541,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1186
1187 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1188 {
1189 - u64 result;
1190 - unsigned long tmp;
1191 + u64 result, tmp;
1192
1193 smp_mb();
1194
1195 __asm__ __volatile__("@ atomic64_add_return\n"
1196 +"1: ldrexd %1, %H1, [%3]\n"
1197 +" adds %0, %1, %4\n"
1198 +" adcs %H0, %H1, %H4\n"
1199 +
1200 +#ifdef CONFIG_PAX_REFCOUNT
1201 +" bvc 3f\n"
1202 +" mov %0, %1\n"
1203 +" mov %H0, %H1\n"
1204 +"2: bkpt 0xf103\n"
1205 +"3:\n"
1206 +#endif
1207 +
1208 +" strexd %1, %0, %H0, [%3]\n"
1209 +" teq %1, #0\n"
1210 +" bne 1b"
1211 +
1212 +#ifdef CONFIG_PAX_REFCOUNT
1213 +"\n4:\n"
1214 + _ASM_EXTABLE(2b, 4b)
1215 +#endif
1216 +
1217 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1218 + : "r" (&v->counter), "r" (i)
1219 + : "cc");
1220 +
1221 + smp_mb();
1222 +
1223 + return result;
1224 +}
1225 +
1226 +static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1227 +{
1228 + u64 result;
1229 + unsigned long tmp;
1230 +
1231 + smp_mb();
1232 +
1233 + __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1234 "1: ldrexd %0, %H0, [%3]\n"
1235 " adds %0, %0, %4\n"
1236 " adc %H0, %H0, %H4\n"
1237 @@ -318,6 +607,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1238 __asm__ __volatile__("@ atomic64_sub\n"
1239 "1: ldrexd %0, %H0, [%3]\n"
1240 " subs %0, %0, %4\n"
1241 +" sbcs %H0, %H0, %H4\n"
1242 +
1243 +#ifdef CONFIG_PAX_REFCOUNT
1244 +" bvc 3f\n"
1245 +"2: bkpt 0xf103\n"
1246 +"3:\n"
1247 +#endif
1248 +
1249 +" strexd %1, %0, %H0, [%3]\n"
1250 +" teq %1, #0\n"
1251 +" bne 1b"
1252 +
1253 +#ifdef CONFIG_PAX_REFCOUNT
1254 +"\n4:\n"
1255 + _ASM_EXTABLE(2b, 4b)
1256 +#endif
1257 +
1258 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1259 + : "r" (&v->counter), "r" (i)
1260 + : "cc");
1261 +}
1262 +
1263 +static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1264 +{
1265 + u64 result;
1266 + unsigned long tmp;
1267 +
1268 + __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1269 +"1: ldrexd %0, %H0, [%3]\n"
1270 +" subs %0, %0, %4\n"
1271 " sbc %H0, %H0, %H4\n"
1272 " strexd %1, %0, %H0, [%3]\n"
1273 " teq %1, #0\n"
1274 @@ -329,18 +648,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1275
1276 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1277 {
1278 - u64 result;
1279 - unsigned long tmp;
1280 + u64 result, tmp;
1281
1282 smp_mb();
1283
1284 __asm__ __volatile__("@ atomic64_sub_return\n"
1285 -"1: ldrexd %0, %H0, [%3]\n"
1286 -" subs %0, %0, %4\n"
1287 -" sbc %H0, %H0, %H4\n"
1288 +"1: ldrexd %1, %H1, [%3]\n"
1289 +" subs %0, %1, %4\n"
1290 +" sbcs %H0, %H1, %H4\n"
1291 +
1292 +#ifdef CONFIG_PAX_REFCOUNT
1293 +" bvc 3f\n"
1294 +" mov %0, %1\n"
1295 +" mov %H0, %H1\n"
1296 +"2: bkpt 0xf103\n"
1297 +"3:\n"
1298 +#endif
1299 +
1300 " strexd %1, %0, %H0, [%3]\n"
1301 " teq %1, #0\n"
1302 " bne 1b"
1303 +
1304 +#ifdef CONFIG_PAX_REFCOUNT
1305 +"\n4:\n"
1306 + _ASM_EXTABLE(2b, 4b)
1307 +#endif
1308 +
1309 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1310 : "r" (&v->counter), "r" (i)
1311 : "cc");
1312 @@ -374,6 +707,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1313 return oldval;
1314 }
1315
1316 +static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1317 +{
1318 + u64 oldval;
1319 + unsigned long res;
1320 +
1321 + smp_mb();
1322 +
1323 + do {
1324 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1325 + "ldrexd %1, %H1, [%3]\n"
1326 + "mov %0, #0\n"
1327 + "teq %1, %4\n"
1328 + "teqeq %H1, %H4\n"
1329 + "strexdeq %0, %5, %H5, [%3]"
1330 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1331 + : "r" (&ptr->counter), "r" (old), "r" (new)
1332 + : "cc");
1333 + } while (res);
1334 +
1335 + smp_mb();
1336 +
1337 + return oldval;
1338 +}
1339 +
1340 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1341 {
1342 u64 result;
1343 @@ -397,21 +754,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1344
1345 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1346 {
1347 - u64 result;
1348 - unsigned long tmp;
1349 + u64 result, tmp;
1350
1351 smp_mb();
1352
1353 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1354 -"1: ldrexd %0, %H0, [%3]\n"
1355 -" subs %0, %0, #1\n"
1356 -" sbc %H0, %H0, #0\n"
1357 +"1: ldrexd %1, %H1, [%3]\n"
1358 +" subs %0, %1, #1\n"
1359 +" sbcs %H0, %H1, #0\n"
1360 +
1361 +#ifdef CONFIG_PAX_REFCOUNT
1362 +" bvc 3f\n"
1363 +" mov %0, %1\n"
1364 +" mov %H0, %H1\n"
1365 +"2: bkpt 0xf103\n"
1366 +"3:\n"
1367 +#endif
1368 +
1369 " teq %H0, #0\n"
1370 -" bmi 2f\n"
1371 +" bmi 4f\n"
1372 " strexd %1, %0, %H0, [%3]\n"
1373 " teq %1, #0\n"
1374 " bne 1b\n"
1375 -"2:"
1376 +"4:\n"
1377 +
1378 +#ifdef CONFIG_PAX_REFCOUNT
1379 + _ASM_EXTABLE(2b, 4b)
1380 +#endif
1381 +
1382 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1383 : "r" (&v->counter)
1384 : "cc");
1385 @@ -434,13 +804,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1386 " teq %0, %5\n"
1387 " teqeq %H0, %H5\n"
1388 " moveq %1, #0\n"
1389 -" beq 2f\n"
1390 +" beq 4f\n"
1391 " adds %0, %0, %6\n"
1392 -" adc %H0, %H0, %H6\n"
1393 +" adcs %H0, %H0, %H6\n"
1394 +
1395 +#ifdef CONFIG_PAX_REFCOUNT
1396 +" bvc 3f\n"
1397 +"2: bkpt 0xf103\n"
1398 +"3:\n"
1399 +#endif
1400 +
1401 " strexd %2, %0, %H0, [%4]\n"
1402 " teq %2, #0\n"
1403 " bne 1b\n"
1404 -"2:"
1405 +"4:\n"
1406 +
1407 +#ifdef CONFIG_PAX_REFCOUNT
1408 + _ASM_EXTABLE(2b, 4b)
1409 +#endif
1410 +
1411 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1412 : "r" (&v->counter), "r" (u), "r" (a)
1413 : "cc");
1414 @@ -453,10 +835,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1415
1416 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1417 #define atomic64_inc(v) atomic64_add(1LL, (v))
1418 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1419 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1420 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1421 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1422 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1423 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1424 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1425 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1426 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1427 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1428 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1429 index 75fe66b..2255c86 100644
1430 --- a/arch/arm/include/asm/cache.h
1431 +++ b/arch/arm/include/asm/cache.h
1432 @@ -4,8 +4,10 @@
1433 #ifndef __ASMARM_CACHE_H
1434 #define __ASMARM_CACHE_H
1435
1436 +#include <linux/const.h>
1437 +
1438 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1439 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1440 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1441
1442 /*
1443 * Memory returned by kmalloc() may be used for DMA, so we must make
1444 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1445 index e4448e1..7bc86b7 100644
1446 --- a/arch/arm/include/asm/cacheflush.h
1447 +++ b/arch/arm/include/asm/cacheflush.h
1448 @@ -108,7 +108,7 @@ struct cpu_cache_fns {
1449 void (*dma_unmap_area)(const void *, size_t, int);
1450
1451 void (*dma_flush_range)(const void *, const void *);
1452 -};
1453 +} __no_const;
1454
1455 /*
1456 * Select the calling method
1457 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1458 index 7eb18c1..e38b6d2 100644
1459 --- a/arch/arm/include/asm/cmpxchg.h
1460 +++ b/arch/arm/include/asm/cmpxchg.h
1461 @@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1462
1463 #define xchg(ptr,x) \
1464 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1465 +#define xchg_unchecked(ptr,x) \
1466 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1467
1468 #include <asm-generic/cmpxchg-local.h>
1469
1470 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1471 index 38050b1..9d90e8b 100644
1472 --- a/arch/arm/include/asm/elf.h
1473 +++ b/arch/arm/include/asm/elf.h
1474 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1475 the loader. We need to make sure that it is out of the way of the program
1476 that it will "exec", and that there is sufficient room for the brk. */
1477
1478 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1479 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1480 +
1481 +#ifdef CONFIG_PAX_ASLR
1482 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1483 +
1484 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1485 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1486 +#endif
1487
1488 /* When the program starts, a1 contains a pointer to a function to be
1489 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1490 @@ -126,8 +133,4 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1491 extern void elf_set_personality(const struct elf32_hdr *);
1492 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1493
1494 -struct mm_struct;
1495 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1496 -#define arch_randomize_brk arch_randomize_brk
1497 -
1498 #endif
1499 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1500 index e51b1e8..32a3113 100644
1501 --- a/arch/arm/include/asm/kmap_types.h
1502 +++ b/arch/arm/include/asm/kmap_types.h
1503 @@ -21,6 +21,7 @@ enum km_type {
1504 KM_L1_CACHE,
1505 KM_L2_CACHE,
1506 KM_KDB,
1507 + KM_CLEARPAGE,
1508 KM_TYPE_NR
1509 };
1510
1511 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1512 index 53426c6..c7baff3 100644
1513 --- a/arch/arm/include/asm/outercache.h
1514 +++ b/arch/arm/include/asm/outercache.h
1515 @@ -35,7 +35,7 @@ struct outer_cache_fns {
1516 #endif
1517 void (*set_debug)(unsigned long);
1518 void (*resume)(void);
1519 -};
1520 +} __no_const;
1521
1522 #ifdef CONFIG_OUTER_CACHE
1523
1524 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1525 index ecf9019..b71d9a1 100644
1526 --- a/arch/arm/include/asm/page.h
1527 +++ b/arch/arm/include/asm/page.h
1528 @@ -114,7 +114,7 @@ struct cpu_user_fns {
1529 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1530 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1531 unsigned long vaddr, struct vm_area_struct *vma);
1532 -};
1533 +} __no_const;
1534
1535 #ifdef MULTI_USER
1536 extern struct cpu_user_fns cpu_user;
1537 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1538 index 943504f..bf8d667 100644
1539 --- a/arch/arm/include/asm/pgalloc.h
1540 +++ b/arch/arm/include/asm/pgalloc.h
1541 @@ -43,6 +43,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1542 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1543 }
1544
1545 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1546 +{
1547 + pud_populate(mm, pud, pmd);
1548 +}
1549 +
1550 #else /* !CONFIG_ARM_LPAE */
1551
1552 /*
1553 @@ -51,6 +56,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1554 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1555 #define pmd_free(mm, pmd) do { } while (0)
1556 #define pud_populate(mm,pmd,pte) BUG()
1557 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1558
1559 #endif /* CONFIG_ARM_LPAE */
1560
1561 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
1562 index af7b0bd..6750a8c 100644
1563 --- a/arch/arm/include/asm/thread_info.h
1564 +++ b/arch/arm/include/asm/thread_info.h
1565 @@ -148,6 +148,12 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
1566 #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
1567 #define TIF_SYSCALL_TRACE 8
1568 #define TIF_SYSCALL_AUDIT 9
1569 +
1570 +/* within 8 bits of TIF_SYSCALL_TRACE
1571 + to meet flexible second operand requirements
1572 +*/
1573 +#define TIF_GRSEC_SETXID 10
1574 +
1575 #define TIF_POLLING_NRFLAG 16
1576 #define TIF_USING_IWMMXT 17
1577 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
1578 @@ -163,9 +169,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
1579 #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
1580 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
1581 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
1582 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
1583
1584 /* Checks for any syscall work in entry-common.S */
1585 -#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
1586 +#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
1587 + _TIF_GRSEC_SETXID)
1588
1589 /*
1590 * Change these and you break ASM code in entry-common.S
1591 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1592 index 71f6536..602f279 100644
1593 --- a/arch/arm/include/asm/uaccess.h
1594 +++ b/arch/arm/include/asm/uaccess.h
1595 @@ -22,6 +22,8 @@
1596 #define VERIFY_READ 0
1597 #define VERIFY_WRITE 1
1598
1599 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
1600 +
1601 /*
1602 * The exception table consists of pairs of addresses: the first is the
1603 * address of an instruction that is allowed to fault, and the second is
1604 @@ -387,8 +389,23 @@ do { \
1605
1606
1607 #ifdef CONFIG_MMU
1608 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1609 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1610 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1611 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1612 +
1613 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1614 +{
1615 + if (!__builtin_constant_p(n))
1616 + check_object_size(to, n, false);
1617 + return ___copy_from_user(to, from, n);
1618 +}
1619 +
1620 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1621 +{
1622 + if (!__builtin_constant_p(n))
1623 + check_object_size(from, n, true);
1624 + return ___copy_to_user(to, from, n);
1625 +}
1626 +
1627 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1628 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1629 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1630 @@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
1631
1632 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1633 {
1634 + if ((long)n < 0)
1635 + return n;
1636 +
1637 if (access_ok(VERIFY_READ, from, n))
1638 n = __copy_from_user(to, from, n);
1639 else /* security hole - plug it */
1640 @@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1641
1642 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1643 {
1644 + if ((long)n < 0)
1645 + return n;
1646 +
1647 if (access_ok(VERIFY_WRITE, to, n))
1648 n = __copy_to_user(to, from, n);
1649 return n;
1650 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1651 index b57c75e..ed2d6b2 100644
1652 --- a/arch/arm/kernel/armksyms.c
1653 +++ b/arch/arm/kernel/armksyms.c
1654 @@ -94,8 +94,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
1655 #ifdef CONFIG_MMU
1656 EXPORT_SYMBOL(copy_page);
1657
1658 -EXPORT_SYMBOL(__copy_from_user);
1659 -EXPORT_SYMBOL(__copy_to_user);
1660 +EXPORT_SYMBOL(___copy_from_user);
1661 +EXPORT_SYMBOL(___copy_to_user);
1662 EXPORT_SYMBOL(__clear_user);
1663
1664 EXPORT_SYMBOL(__get_user_1);
1665 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1666 index 693b744..e684262 100644
1667 --- a/arch/arm/kernel/process.c
1668 +++ b/arch/arm/kernel/process.c
1669 @@ -28,7 +28,6 @@
1670 #include <linux/tick.h>
1671 #include <linux/utsname.h>
1672 #include <linux/uaccess.h>
1673 -#include <linux/random.h>
1674 #include <linux/hw_breakpoint.h>
1675 #include <linux/cpuidle.h>
1676
1677 @@ -256,9 +255,10 @@ void machine_power_off(void)
1678 machine_shutdown();
1679 if (pm_power_off)
1680 pm_power_off();
1681 + BUG();
1682 }
1683
1684 -void machine_restart(char *cmd)
1685 +__noreturn void machine_restart(char *cmd)
1686 {
1687 machine_shutdown();
1688
1689 @@ -501,12 +501,6 @@ unsigned long get_wchan(struct task_struct *p)
1690 return 0;
1691 }
1692
1693 -unsigned long arch_randomize_brk(struct mm_struct *mm)
1694 -{
1695 - unsigned long range_end = mm->brk + 0x02000000;
1696 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1697 -}
1698 -
1699 #ifdef CONFIG_MMU
1700 /*
1701 * The vectors page is always readable from user space for the
1702 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
1703 index 14e3826..d832d89 100644
1704 --- a/arch/arm/kernel/ptrace.c
1705 +++ b/arch/arm/kernel/ptrace.c
1706 @@ -907,10 +907,19 @@ long arch_ptrace(struct task_struct *child, long request,
1707 return ret;
1708 }
1709
1710 +#ifdef CONFIG_GRKERNSEC_SETXID
1711 +extern void gr_delayed_cred_worker(void);
1712 +#endif
1713 +
1714 asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
1715 {
1716 unsigned long ip;
1717
1718 +#ifdef CONFIG_GRKERNSEC_SETXID
1719 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
1720 + gr_delayed_cred_worker();
1721 +#endif
1722 +
1723 if (why)
1724 audit_syscall_exit(regs);
1725 else
1726 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1727 index e15d83b..8c466dd 100644
1728 --- a/arch/arm/kernel/setup.c
1729 +++ b/arch/arm/kernel/setup.c
1730 @@ -112,13 +112,13 @@ struct processor processor __read_mostly;
1731 struct cpu_tlb_fns cpu_tlb __read_mostly;
1732 #endif
1733 #ifdef MULTI_USER
1734 -struct cpu_user_fns cpu_user __read_mostly;
1735 +struct cpu_user_fns cpu_user __read_only;
1736 #endif
1737 #ifdef MULTI_CACHE
1738 -struct cpu_cache_fns cpu_cache __read_mostly;
1739 +struct cpu_cache_fns cpu_cache __read_only;
1740 #endif
1741 #ifdef CONFIG_OUTER_CACHE
1742 -struct outer_cache_fns outer_cache __read_mostly;
1743 +struct outer_cache_fns outer_cache __read_only;
1744 EXPORT_SYMBOL(outer_cache);
1745 #endif
1746
1747 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1748 index c7cae6b..e1e523c 100644
1749 --- a/arch/arm/kernel/traps.c
1750 +++ b/arch/arm/kernel/traps.c
1751 @@ -264,6 +264,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
1752
1753 static DEFINE_RAW_SPINLOCK(die_lock);
1754
1755 +extern void gr_handle_kernel_exploit(void);
1756 +
1757 /*
1758 * This function is protected against re-entrancy.
1759 */
1760 @@ -296,6 +298,9 @@ void die(const char *str, struct pt_regs *regs, int err)
1761 panic("Fatal exception in interrupt");
1762 if (panic_on_oops)
1763 panic("Fatal exception");
1764 +
1765 + gr_handle_kernel_exploit();
1766 +
1767 if (ret != NOTIFY_STOP)
1768 do_exit(SIGSEGV);
1769 }
1770 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1771 index 66a477a..bee61d3 100644
1772 --- a/arch/arm/lib/copy_from_user.S
1773 +++ b/arch/arm/lib/copy_from_user.S
1774 @@ -16,7 +16,7 @@
1775 /*
1776 * Prototype:
1777 *
1778 - * size_t __copy_from_user(void *to, const void *from, size_t n)
1779 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
1780 *
1781 * Purpose:
1782 *
1783 @@ -84,11 +84,11 @@
1784
1785 .text
1786
1787 -ENTRY(__copy_from_user)
1788 +ENTRY(___copy_from_user)
1789
1790 #include "copy_template.S"
1791
1792 -ENDPROC(__copy_from_user)
1793 +ENDPROC(___copy_from_user)
1794
1795 .pushsection .fixup,"ax"
1796 .align 0
1797 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1798 index 6ee2f67..d1cce76 100644
1799 --- a/arch/arm/lib/copy_page.S
1800 +++ b/arch/arm/lib/copy_page.S
1801 @@ -10,6 +10,7 @@
1802 * ASM optimised string functions
1803 */
1804 #include <linux/linkage.h>
1805 +#include <linux/const.h>
1806 #include <asm/assembler.h>
1807 #include <asm/asm-offsets.h>
1808 #include <asm/cache.h>
1809 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1810 index d066df6..df28194 100644
1811 --- a/arch/arm/lib/copy_to_user.S
1812 +++ b/arch/arm/lib/copy_to_user.S
1813 @@ -16,7 +16,7 @@
1814 /*
1815 * Prototype:
1816 *
1817 - * size_t __copy_to_user(void *to, const void *from, size_t n)
1818 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
1819 *
1820 * Purpose:
1821 *
1822 @@ -88,11 +88,11 @@
1823 .text
1824
1825 ENTRY(__copy_to_user_std)
1826 -WEAK(__copy_to_user)
1827 +WEAK(___copy_to_user)
1828
1829 #include "copy_template.S"
1830
1831 -ENDPROC(__copy_to_user)
1832 +ENDPROC(___copy_to_user)
1833 ENDPROC(__copy_to_user_std)
1834
1835 .pushsection .fixup,"ax"
1836 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1837 index 025f742..8432b08 100644
1838 --- a/arch/arm/lib/uaccess_with_memcpy.c
1839 +++ b/arch/arm/lib/uaccess_with_memcpy.c
1840 @@ -104,7 +104,7 @@ out:
1841 }
1842
1843 unsigned long
1844 -__copy_to_user(void __user *to, const void *from, unsigned long n)
1845 +___copy_to_user(void __user *to, const void *from, unsigned long n)
1846 {
1847 /*
1848 * This test is stubbed out of the main function above to keep
1849 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
1850 index f261cd2..4ae63fb 100644
1851 --- a/arch/arm/mach-kirkwood/common.c
1852 +++ b/arch/arm/mach-kirkwood/common.c
1853 @@ -128,7 +128,7 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
1854 clk_gate_ops.disable(hw);
1855 }
1856
1857 -static struct clk_ops clk_gate_fn_ops;
1858 +static clk_ops_no_const clk_gate_fn_ops;
1859
1860 static struct clk __init *clk_register_gate_fn(struct device *dev,
1861 const char *name,
1862 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1863 index 2c5d0ed..7d9099c 100644
1864 --- a/arch/arm/mach-omap2/board-n8x0.c
1865 +++ b/arch/arm/mach-omap2/board-n8x0.c
1866 @@ -594,7 +594,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1867 }
1868 #endif
1869
1870 -static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1871 +static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1872 .late_init = n8x0_menelaus_late_init,
1873 };
1874
1875 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1876 index c3bd834..e81ef02 100644
1877 --- a/arch/arm/mm/fault.c
1878 +++ b/arch/arm/mm/fault.c
1879 @@ -174,6 +174,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1880 }
1881 #endif
1882
1883 +#ifdef CONFIG_PAX_PAGEEXEC
1884 + if (fsr & FSR_LNX_PF) {
1885 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1886 + do_group_exit(SIGKILL);
1887 + }
1888 +#endif
1889 +
1890 tsk->thread.address = addr;
1891 tsk->thread.error_code = fsr;
1892 tsk->thread.trap_no = 14;
1893 @@ -397,6 +404,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1894 }
1895 #endif /* CONFIG_MMU */
1896
1897 +#ifdef CONFIG_PAX_PAGEEXEC
1898 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1899 +{
1900 + long i;
1901 +
1902 + printk(KERN_ERR "PAX: bytes at PC: ");
1903 + for (i = 0; i < 20; i++) {
1904 + unsigned char c;
1905 + if (get_user(c, (__force unsigned char __user *)pc+i))
1906 + printk(KERN_CONT "?? ");
1907 + else
1908 + printk(KERN_CONT "%02x ", c);
1909 + }
1910 + printk("\n");
1911 +
1912 + printk(KERN_ERR "PAX: bytes at SP-4: ");
1913 + for (i = -1; i < 20; i++) {
1914 + unsigned long c;
1915 + if (get_user(c, (__force unsigned long __user *)sp+i))
1916 + printk(KERN_CONT "???????? ");
1917 + else
1918 + printk(KERN_CONT "%08lx ", c);
1919 + }
1920 + printk("\n");
1921 +}
1922 +#endif
1923 +
1924 /*
1925 * First Level Translation Fault Handler
1926 *
1927 @@ -574,6 +608,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1928 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1929 struct siginfo info;
1930
1931 +#ifdef CONFIG_PAX_REFCOUNT
1932 + if (fsr_fs(ifsr) == 2) {
1933 + unsigned int bkpt;
1934 +
1935 + if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1936 + current->thread.error_code = ifsr;
1937 + current->thread.trap_no = 0;
1938 + pax_report_refcount_overflow(regs);
1939 + fixup_exception(regs);
1940 + return;
1941 + }
1942 + }
1943 +#endif
1944 +
1945 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1946 return;
1947
1948 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1949 index ce8cb19..3ec539d 100644
1950 --- a/arch/arm/mm/mmap.c
1951 +++ b/arch/arm/mm/mmap.c
1952 @@ -93,6 +93,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1953 if (len > TASK_SIZE)
1954 return -ENOMEM;
1955
1956 +#ifdef CONFIG_PAX_RANDMMAP
1957 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1958 +#endif
1959 +
1960 if (addr) {
1961 if (do_align)
1962 addr = COLOUR_ALIGN(addr, pgoff);
1963 @@ -100,15 +104,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1964 addr = PAGE_ALIGN(addr);
1965
1966 vma = find_vma(mm, addr);
1967 - if (TASK_SIZE - len >= addr &&
1968 - (!vma || addr + len <= vma->vm_start))
1969 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1970 return addr;
1971 }
1972 if (len > mm->cached_hole_size) {
1973 - start_addr = addr = mm->free_area_cache;
1974 + start_addr = addr = mm->free_area_cache;
1975 } else {
1976 - start_addr = addr = mm->mmap_base;
1977 - mm->cached_hole_size = 0;
1978 + start_addr = addr = mm->mmap_base;
1979 + mm->cached_hole_size = 0;
1980 }
1981
1982 full_search:
1983 @@ -124,14 +127,14 @@ full_search:
1984 * Start a new search - just in case we missed
1985 * some holes.
1986 */
1987 - if (start_addr != TASK_UNMAPPED_BASE) {
1988 - start_addr = addr = TASK_UNMAPPED_BASE;
1989 + if (start_addr != mm->mmap_base) {
1990 + start_addr = addr = mm->mmap_base;
1991 mm->cached_hole_size = 0;
1992 goto full_search;
1993 }
1994 return -ENOMEM;
1995 }
1996 - if (!vma || addr + len <= vma->vm_start) {
1997 + if (check_heap_stack_gap(vma, addr, len)) {
1998 /*
1999 * Remember the place where we stopped the search:
2000 */
2001 @@ -266,10 +269,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2002
2003 if (mmap_is_legacy()) {
2004 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
2005 +
2006 +#ifdef CONFIG_PAX_RANDMMAP
2007 + if (mm->pax_flags & MF_PAX_RANDMMAP)
2008 + mm->mmap_base += mm->delta_mmap;
2009 +#endif
2010 +
2011 mm->get_unmapped_area = arch_get_unmapped_area;
2012 mm->unmap_area = arch_unmap_area;
2013 } else {
2014 mm->mmap_base = mmap_base(random_factor);
2015 +
2016 +#ifdef CONFIG_PAX_RANDMMAP
2017 + if (mm->pax_flags & MF_PAX_RANDMMAP)
2018 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
2019 +#endif
2020 +
2021 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2022 mm->unmap_area = arch_unmap_area_topdown;
2023 }
2024 diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h
2025 index fd556f7..af2e7d2 100644
2026 --- a/arch/arm/plat-orion/include/plat/addr-map.h
2027 +++ b/arch/arm/plat-orion/include/plat/addr-map.h
2028 @@ -26,7 +26,7 @@ struct orion_addr_map_cfg {
2029 value in bridge_virt_base */
2030 void __iomem *(*win_cfg_base) (const struct orion_addr_map_cfg *cfg,
2031 const int win);
2032 -};
2033 +} __no_const;
2034
2035 /*
2036 * Information needed to setup one address mapping.
2037 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
2038 index 71a6827..e7fbc23 100644
2039 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
2040 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
2041 @@ -43,7 +43,7 @@ struct samsung_dma_ops {
2042 int (*started)(unsigned ch);
2043 int (*flush)(unsigned ch);
2044 int (*stop)(unsigned ch);
2045 -};
2046 +} __no_const;
2047
2048 extern void *samsung_dmadev_get_ops(void);
2049 extern void *s3c_dma_get_ops(void);
2050 diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
2051 index 5f28cae..3d23723 100644
2052 --- a/arch/arm/plat-samsung/include/plat/ehci.h
2053 +++ b/arch/arm/plat-samsung/include/plat/ehci.h
2054 @@ -14,7 +14,7 @@
2055 struct s5p_ehci_platdata {
2056 int (*phy_init)(struct platform_device *pdev, int type);
2057 int (*phy_exit)(struct platform_device *pdev, int type);
2058 -};
2059 +} __no_const;
2060
2061 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
2062
2063 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
2064 index c3a58a1..78fbf54 100644
2065 --- a/arch/avr32/include/asm/cache.h
2066 +++ b/arch/avr32/include/asm/cache.h
2067 @@ -1,8 +1,10 @@
2068 #ifndef __ASM_AVR32_CACHE_H
2069 #define __ASM_AVR32_CACHE_H
2070
2071 +#include <linux/const.h>
2072 +
2073 #define L1_CACHE_SHIFT 5
2074 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2075 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2076
2077 /*
2078 * Memory returned by kmalloc() may be used for DMA, so we must make
2079 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
2080 index 3b3159b..425ea94 100644
2081 --- a/arch/avr32/include/asm/elf.h
2082 +++ b/arch/avr32/include/asm/elf.h
2083 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
2084 the loader. We need to make sure that it is out of the way of the program
2085 that it will "exec", and that there is sufficient room for the brk. */
2086
2087 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
2088 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2089
2090 +#ifdef CONFIG_PAX_ASLR
2091 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
2092 +
2093 +#define PAX_DELTA_MMAP_LEN 15
2094 +#define PAX_DELTA_STACK_LEN 15
2095 +#endif
2096
2097 /* This yields a mask that user programs can use to figure out what
2098 instruction set this CPU supports. This could be done in user space,
2099 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
2100 index b7f5c68..556135c 100644
2101 --- a/arch/avr32/include/asm/kmap_types.h
2102 +++ b/arch/avr32/include/asm/kmap_types.h
2103 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
2104 D(11) KM_IRQ1,
2105 D(12) KM_SOFTIRQ0,
2106 D(13) KM_SOFTIRQ1,
2107 -D(14) KM_TYPE_NR
2108 +D(14) KM_CLEARPAGE,
2109 +D(15) KM_TYPE_NR
2110 };
2111
2112 #undef D
2113 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
2114 index f7040a1..db9f300 100644
2115 --- a/arch/avr32/mm/fault.c
2116 +++ b/arch/avr32/mm/fault.c
2117 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
2118
2119 int exception_trace = 1;
2120
2121 +#ifdef CONFIG_PAX_PAGEEXEC
2122 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2123 +{
2124 + unsigned long i;
2125 +
2126 + printk(KERN_ERR "PAX: bytes at PC: ");
2127 + for (i = 0; i < 20; i++) {
2128 + unsigned char c;
2129 + if (get_user(c, (unsigned char *)pc+i))
2130 + printk(KERN_CONT "???????? ");
2131 + else
2132 + printk(KERN_CONT "%02x ", c);
2133 + }
2134 + printk("\n");
2135 +}
2136 +#endif
2137 +
2138 /*
2139 * This routine handles page faults. It determines the address and the
2140 * problem, and then passes it off to one of the appropriate routines.
2141 @@ -156,6 +173,16 @@ bad_area:
2142 up_read(&mm->mmap_sem);
2143
2144 if (user_mode(regs)) {
2145 +
2146 +#ifdef CONFIG_PAX_PAGEEXEC
2147 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
2148 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
2149 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
2150 + do_group_exit(SIGKILL);
2151 + }
2152 + }
2153 +#endif
2154 +
2155 if (exception_trace && printk_ratelimit())
2156 printk("%s%s[%d]: segfault at %08lx pc %08lx "
2157 "sp %08lx ecr %lu\n",
2158 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
2159 index 568885a..f8008df 100644
2160 --- a/arch/blackfin/include/asm/cache.h
2161 +++ b/arch/blackfin/include/asm/cache.h
2162 @@ -7,6 +7,7 @@
2163 #ifndef __ARCH_BLACKFIN_CACHE_H
2164 #define __ARCH_BLACKFIN_CACHE_H
2165
2166 +#include <linux/const.h>
2167 #include <linux/linkage.h> /* for asmlinkage */
2168
2169 /*
2170 @@ -14,7 +15,7 @@
2171 * Blackfin loads 32 bytes for cache
2172 */
2173 #define L1_CACHE_SHIFT 5
2174 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2175 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2176 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2177
2178 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2179 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
2180 index aea2718..3639a60 100644
2181 --- a/arch/cris/include/arch-v10/arch/cache.h
2182 +++ b/arch/cris/include/arch-v10/arch/cache.h
2183 @@ -1,8 +1,9 @@
2184 #ifndef _ASM_ARCH_CACHE_H
2185 #define _ASM_ARCH_CACHE_H
2186
2187 +#include <linux/const.h>
2188 /* Etrax 100LX have 32-byte cache-lines. */
2189 -#define L1_CACHE_BYTES 32
2190 #define L1_CACHE_SHIFT 5
2191 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2192
2193 #endif /* _ASM_ARCH_CACHE_H */
2194 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2195 index 7caf25d..ee65ac5 100644
2196 --- a/arch/cris/include/arch-v32/arch/cache.h
2197 +++ b/arch/cris/include/arch-v32/arch/cache.h
2198 @@ -1,11 +1,12 @@
2199 #ifndef _ASM_CRIS_ARCH_CACHE_H
2200 #define _ASM_CRIS_ARCH_CACHE_H
2201
2202 +#include <linux/const.h>
2203 #include <arch/hwregs/dma.h>
2204
2205 /* A cache-line is 32 bytes. */
2206 -#define L1_CACHE_BYTES 32
2207 #define L1_CACHE_SHIFT 5
2208 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2209
2210 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
2211
2212 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2213 index b86329d..6709906 100644
2214 --- a/arch/frv/include/asm/atomic.h
2215 +++ b/arch/frv/include/asm/atomic.h
2216 @@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
2217 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2218 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2219
2220 +#define atomic64_read_unchecked(v) atomic64_read(v)
2221 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2222 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2223 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2224 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2225 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
2226 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2227 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
2228 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2229 +
2230 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2231 {
2232 int c, old;
2233 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2234 index 2797163..c2a401d 100644
2235 --- a/arch/frv/include/asm/cache.h
2236 +++ b/arch/frv/include/asm/cache.h
2237 @@ -12,10 +12,11 @@
2238 #ifndef __ASM_CACHE_H
2239 #define __ASM_CACHE_H
2240
2241 +#include <linux/const.h>
2242
2243 /* bytes per L1 cache line */
2244 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2245 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2246 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2247
2248 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2249 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2250 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2251 index f8e16b2..c73ff79 100644
2252 --- a/arch/frv/include/asm/kmap_types.h
2253 +++ b/arch/frv/include/asm/kmap_types.h
2254 @@ -23,6 +23,7 @@ enum km_type {
2255 KM_IRQ1,
2256 KM_SOFTIRQ0,
2257 KM_SOFTIRQ1,
2258 + KM_CLEARPAGE,
2259 KM_TYPE_NR
2260 };
2261
2262 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2263 index 385fd30..6c3d97e 100644
2264 --- a/arch/frv/mm/elf-fdpic.c
2265 +++ b/arch/frv/mm/elf-fdpic.c
2266 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2267 if (addr) {
2268 addr = PAGE_ALIGN(addr);
2269 vma = find_vma(current->mm, addr);
2270 - if (TASK_SIZE - len >= addr &&
2271 - (!vma || addr + len <= vma->vm_start))
2272 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2273 goto success;
2274 }
2275
2276 @@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2277 for (; vma; vma = vma->vm_next) {
2278 if (addr > limit)
2279 break;
2280 - if (addr + len <= vma->vm_start)
2281 + if (check_heap_stack_gap(vma, addr, len))
2282 goto success;
2283 addr = vma->vm_end;
2284 }
2285 @@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2286 for (; vma; vma = vma->vm_next) {
2287 if (addr > limit)
2288 break;
2289 - if (addr + len <= vma->vm_start)
2290 + if (check_heap_stack_gap(vma, addr, len))
2291 goto success;
2292 addr = vma->vm_end;
2293 }
2294 diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2295 index c635028..6d9445a 100644
2296 --- a/arch/h8300/include/asm/cache.h
2297 +++ b/arch/h8300/include/asm/cache.h
2298 @@ -1,8 +1,10 @@
2299 #ifndef __ARCH_H8300_CACHE_H
2300 #define __ARCH_H8300_CACHE_H
2301
2302 +#include <linux/const.h>
2303 +
2304 /* bytes per L1 cache line */
2305 -#define L1_CACHE_BYTES 4
2306 +#define L1_CACHE_BYTES _AC(4,UL)
2307
2308 /* m68k-elf-gcc 2.95.2 doesn't like these */
2309
2310 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2311 index 0f01de2..d37d309 100644
2312 --- a/arch/hexagon/include/asm/cache.h
2313 +++ b/arch/hexagon/include/asm/cache.h
2314 @@ -21,9 +21,11 @@
2315 #ifndef __ASM_CACHE_H
2316 #define __ASM_CACHE_H
2317
2318 +#include <linux/const.h>
2319 +
2320 /* Bytes per L1 cache line */
2321 -#define L1_CACHE_SHIFT (5)
2322 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2323 +#define L1_CACHE_SHIFT 5
2324 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2325
2326 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2327 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2328 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2329 index 6e6fe18..a6ae668 100644
2330 --- a/arch/ia64/include/asm/atomic.h
2331 +++ b/arch/ia64/include/asm/atomic.h
2332 @@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2333 #define atomic64_inc(v) atomic64_add(1, (v))
2334 #define atomic64_dec(v) atomic64_sub(1, (v))
2335
2336 +#define atomic64_read_unchecked(v) atomic64_read(v)
2337 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2338 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2339 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2340 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2341 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
2342 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2343 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
2344 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2345 +
2346 /* Atomic operations are already serializing */
2347 #define smp_mb__before_atomic_dec() barrier()
2348 #define smp_mb__after_atomic_dec() barrier()
2349 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2350 index 988254a..e1ee885 100644
2351 --- a/arch/ia64/include/asm/cache.h
2352 +++ b/arch/ia64/include/asm/cache.h
2353 @@ -1,6 +1,7 @@
2354 #ifndef _ASM_IA64_CACHE_H
2355 #define _ASM_IA64_CACHE_H
2356
2357 +#include <linux/const.h>
2358
2359 /*
2360 * Copyright (C) 1998-2000 Hewlett-Packard Co
2361 @@ -9,7 +10,7 @@
2362
2363 /* Bytes per L1 (data) cache line. */
2364 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2365 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2366 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2367
2368 #ifdef CONFIG_SMP
2369 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2370 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2371 index b5298eb..67c6e62 100644
2372 --- a/arch/ia64/include/asm/elf.h
2373 +++ b/arch/ia64/include/asm/elf.h
2374 @@ -42,6 +42,13 @@
2375 */
2376 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2377
2378 +#ifdef CONFIG_PAX_ASLR
2379 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2380 +
2381 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2382 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2383 +#endif
2384 +
2385 #define PT_IA_64_UNWIND 0x70000001
2386
2387 /* IA-64 relocations: */
2388 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
2389 index 96a8d92..617a1cf 100644
2390 --- a/arch/ia64/include/asm/pgalloc.h
2391 +++ b/arch/ia64/include/asm/pgalloc.h
2392 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
2393 pgd_val(*pgd_entry) = __pa(pud);
2394 }
2395
2396 +static inline void
2397 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
2398 +{
2399 + pgd_populate(mm, pgd_entry, pud);
2400 +}
2401 +
2402 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
2403 {
2404 return quicklist_alloc(0, GFP_KERNEL, NULL);
2405 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
2406 pud_val(*pud_entry) = __pa(pmd);
2407 }
2408
2409 +static inline void
2410 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
2411 +{
2412 + pud_populate(mm, pud_entry, pmd);
2413 +}
2414 +
2415 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
2416 {
2417 return quicklist_alloc(0, GFP_KERNEL, NULL);
2418 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2419 index 815810c..d60bd4c 100644
2420 --- a/arch/ia64/include/asm/pgtable.h
2421 +++ b/arch/ia64/include/asm/pgtable.h
2422 @@ -12,7 +12,7 @@
2423 * David Mosberger-Tang <davidm@hpl.hp.com>
2424 */
2425
2426 -
2427 +#include <linux/const.h>
2428 #include <asm/mman.h>
2429 #include <asm/page.h>
2430 #include <asm/processor.h>
2431 @@ -142,6 +142,17 @@
2432 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2433 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2434 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2435 +
2436 +#ifdef CONFIG_PAX_PAGEEXEC
2437 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2438 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2439 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2440 +#else
2441 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
2442 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
2443 +# define PAGE_COPY_NOEXEC PAGE_COPY
2444 +#endif
2445 +
2446 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2447 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2448 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2449 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2450 index 54ff557..70c88b7 100644
2451 --- a/arch/ia64/include/asm/spinlock.h
2452 +++ b/arch/ia64/include/asm/spinlock.h
2453 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2454 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2455
2456 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2457 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2458 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2459 }
2460
2461 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2462 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2463 index 449c8c0..432a3d2 100644
2464 --- a/arch/ia64/include/asm/uaccess.h
2465 +++ b/arch/ia64/include/asm/uaccess.h
2466 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2467 const void *__cu_from = (from); \
2468 long __cu_len = (n); \
2469 \
2470 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
2471 + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2472 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2473 __cu_len; \
2474 })
2475 @@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2476 long __cu_len = (n); \
2477 \
2478 __chk_user_ptr(__cu_from); \
2479 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
2480 + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2481 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2482 __cu_len; \
2483 })
2484 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2485 index 24603be..948052d 100644
2486 --- a/arch/ia64/kernel/module.c
2487 +++ b/arch/ia64/kernel/module.c
2488 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2489 void
2490 module_free (struct module *mod, void *module_region)
2491 {
2492 - if (mod && mod->arch.init_unw_table &&
2493 - module_region == mod->module_init) {
2494 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2495 unw_remove_unwind_table(mod->arch.init_unw_table);
2496 mod->arch.init_unw_table = NULL;
2497 }
2498 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2499 }
2500
2501 static inline int
2502 +in_init_rx (const struct module *mod, uint64_t addr)
2503 +{
2504 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2505 +}
2506 +
2507 +static inline int
2508 +in_init_rw (const struct module *mod, uint64_t addr)
2509 +{
2510 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2511 +}
2512 +
2513 +static inline int
2514 in_init (const struct module *mod, uint64_t addr)
2515 {
2516 - return addr - (uint64_t) mod->module_init < mod->init_size;
2517 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2518 +}
2519 +
2520 +static inline int
2521 +in_core_rx (const struct module *mod, uint64_t addr)
2522 +{
2523 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2524 +}
2525 +
2526 +static inline int
2527 +in_core_rw (const struct module *mod, uint64_t addr)
2528 +{
2529 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2530 }
2531
2532 static inline int
2533 in_core (const struct module *mod, uint64_t addr)
2534 {
2535 - return addr - (uint64_t) mod->module_core < mod->core_size;
2536 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2537 }
2538
2539 static inline int
2540 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2541 break;
2542
2543 case RV_BDREL:
2544 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2545 + if (in_init_rx(mod, val))
2546 + val -= (uint64_t) mod->module_init_rx;
2547 + else if (in_init_rw(mod, val))
2548 + val -= (uint64_t) mod->module_init_rw;
2549 + else if (in_core_rx(mod, val))
2550 + val -= (uint64_t) mod->module_core_rx;
2551 + else if (in_core_rw(mod, val))
2552 + val -= (uint64_t) mod->module_core_rw;
2553 break;
2554
2555 case RV_LTV:
2556 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2557 * addresses have been selected...
2558 */
2559 uint64_t gp;
2560 - if (mod->core_size > MAX_LTOFF)
2561 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2562 /*
2563 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2564 * at the end of the module.
2565 */
2566 - gp = mod->core_size - MAX_LTOFF / 2;
2567 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2568 else
2569 - gp = mod->core_size / 2;
2570 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2571 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2572 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2573 mod->arch.gp = gp;
2574 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2575 }
2576 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2577 index d9439ef..b9a4303 100644
2578 --- a/arch/ia64/kernel/sys_ia64.c
2579 +++ b/arch/ia64/kernel/sys_ia64.c
2580 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2581 if (REGION_NUMBER(addr) == RGN_HPAGE)
2582 addr = 0;
2583 #endif
2584 +
2585 +#ifdef CONFIG_PAX_RANDMMAP
2586 + if (mm->pax_flags & MF_PAX_RANDMMAP)
2587 + addr = mm->free_area_cache;
2588 + else
2589 +#endif
2590 +
2591 if (!addr)
2592 addr = mm->free_area_cache;
2593
2594 @@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2595 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2596 /* At this point: (!vma || addr < vma->vm_end). */
2597 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2598 - if (start_addr != TASK_UNMAPPED_BASE) {
2599 + if (start_addr != mm->mmap_base) {
2600 /* Start a new search --- just in case we missed some holes. */
2601 - addr = TASK_UNMAPPED_BASE;
2602 + addr = mm->mmap_base;
2603 goto full_search;
2604 }
2605 return -ENOMEM;
2606 }
2607 - if (!vma || addr + len <= vma->vm_start) {
2608 + if (check_heap_stack_gap(vma, addr, len)) {
2609 /* Remember the address where we stopped this search: */
2610 mm->free_area_cache = addr + len;
2611 return addr;
2612 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2613 index 0ccb28f..8992469 100644
2614 --- a/arch/ia64/kernel/vmlinux.lds.S
2615 +++ b/arch/ia64/kernel/vmlinux.lds.S
2616 @@ -198,7 +198,7 @@ SECTIONS {
2617 /* Per-cpu data: */
2618 . = ALIGN(PERCPU_PAGE_SIZE);
2619 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2620 - __phys_per_cpu_start = __per_cpu_load;
2621 + __phys_per_cpu_start = per_cpu_load;
2622 /*
2623 * ensure percpu data fits
2624 * into percpu page size
2625 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2626 index 02d29c2..ea893df 100644
2627 --- a/arch/ia64/mm/fault.c
2628 +++ b/arch/ia64/mm/fault.c
2629 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
2630 return pte_present(pte);
2631 }
2632
2633 +#ifdef CONFIG_PAX_PAGEEXEC
2634 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2635 +{
2636 + unsigned long i;
2637 +
2638 + printk(KERN_ERR "PAX: bytes at PC: ");
2639 + for (i = 0; i < 8; i++) {
2640 + unsigned int c;
2641 + if (get_user(c, (unsigned int *)pc+i))
2642 + printk(KERN_CONT "???????? ");
2643 + else
2644 + printk(KERN_CONT "%08x ", c);
2645 + }
2646 + printk("\n");
2647 +}
2648 +#endif
2649 +
2650 void __kprobes
2651 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
2652 {
2653 @@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
2654 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
2655 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
2656
2657 - if ((vma->vm_flags & mask) != mask)
2658 + if ((vma->vm_flags & mask) != mask) {
2659 +
2660 +#ifdef CONFIG_PAX_PAGEEXEC
2661 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2662 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2663 + goto bad_area;
2664 +
2665 + up_read(&mm->mmap_sem);
2666 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2667 + do_group_exit(SIGKILL);
2668 + }
2669 +#endif
2670 +
2671 goto bad_area;
2672
2673 + }
2674 +
2675 /*
2676 * If for any reason at all we couldn't handle the fault, make
2677 * sure we exit gracefully rather than endlessly redo the
2678 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2679 index 5ca674b..e0e1b70 100644
2680 --- a/arch/ia64/mm/hugetlbpage.c
2681 +++ b/arch/ia64/mm/hugetlbpage.c
2682 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2683 /* At this point: (!vmm || addr < vmm->vm_end). */
2684 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2685 return -ENOMEM;
2686 - if (!vmm || (addr + len) <= vmm->vm_start)
2687 + if (check_heap_stack_gap(vmm, addr, len))
2688 return addr;
2689 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2690 }
2691 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2692 index 0eab454..bd794f2 100644
2693 --- a/arch/ia64/mm/init.c
2694 +++ b/arch/ia64/mm/init.c
2695 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
2696 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2697 vma->vm_end = vma->vm_start + PAGE_SIZE;
2698 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2699 +
2700 +#ifdef CONFIG_PAX_PAGEEXEC
2701 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2702 + vma->vm_flags &= ~VM_EXEC;
2703 +
2704 +#ifdef CONFIG_PAX_MPROTECT
2705 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
2706 + vma->vm_flags &= ~VM_MAYEXEC;
2707 +#endif
2708 +
2709 + }
2710 +#endif
2711 +
2712 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2713 down_write(&current->mm->mmap_sem);
2714 if (insert_vm_struct(current->mm, vma)) {
2715 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2716 index 40b3ee9..8c2c112 100644
2717 --- a/arch/m32r/include/asm/cache.h
2718 +++ b/arch/m32r/include/asm/cache.h
2719 @@ -1,8 +1,10 @@
2720 #ifndef _ASM_M32R_CACHE_H
2721 #define _ASM_M32R_CACHE_H
2722
2723 +#include <linux/const.h>
2724 +
2725 /* L1 cache line size */
2726 #define L1_CACHE_SHIFT 4
2727 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2728 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2729
2730 #endif /* _ASM_M32R_CACHE_H */
2731 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2732 index 82abd15..d95ae5d 100644
2733 --- a/arch/m32r/lib/usercopy.c
2734 +++ b/arch/m32r/lib/usercopy.c
2735 @@ -14,6 +14,9 @@
2736 unsigned long
2737 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2738 {
2739 + if ((long)n < 0)
2740 + return n;
2741 +
2742 prefetch(from);
2743 if (access_ok(VERIFY_WRITE, to, n))
2744 __copy_user(to,from,n);
2745 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2746 unsigned long
2747 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2748 {
2749 + if ((long)n < 0)
2750 + return n;
2751 +
2752 prefetchw(to);
2753 if (access_ok(VERIFY_READ, from, n))
2754 __copy_user_zeroing(to,from,n);
2755 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2756 index 0395c51..5f26031 100644
2757 --- a/arch/m68k/include/asm/cache.h
2758 +++ b/arch/m68k/include/asm/cache.h
2759 @@ -4,9 +4,11 @@
2760 #ifndef __ARCH_M68K_CACHE_H
2761 #define __ARCH_M68K_CACHE_H
2762
2763 +#include <linux/const.h>
2764 +
2765 /* bytes per L1 cache line */
2766 #define L1_CACHE_SHIFT 4
2767 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2768 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2769
2770 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2771
2772 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2773 index 4efe96a..60e8699 100644
2774 --- a/arch/microblaze/include/asm/cache.h
2775 +++ b/arch/microblaze/include/asm/cache.h
2776 @@ -13,11 +13,12 @@
2777 #ifndef _ASM_MICROBLAZE_CACHE_H
2778 #define _ASM_MICROBLAZE_CACHE_H
2779
2780 +#include <linux/const.h>
2781 #include <asm/registers.h>
2782
2783 #define L1_CACHE_SHIFT 5
2784 /* word-granular cache in microblaze */
2785 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2786 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2787
2788 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2789
2790 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2791 index 3f4c5cb..3439c6e 100644
2792 --- a/arch/mips/include/asm/atomic.h
2793 +++ b/arch/mips/include/asm/atomic.h
2794 @@ -21,6 +21,10 @@
2795 #include <asm/cmpxchg.h>
2796 #include <asm/war.h>
2797
2798 +#ifdef CONFIG_GENERIC_ATOMIC64
2799 +#include <asm-generic/atomic64.h>
2800 +#endif
2801 +
2802 #define ATOMIC_INIT(i) { (i) }
2803
2804 /*
2805 @@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2806 */
2807 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2808
2809 +#define atomic64_read_unchecked(v) atomic64_read(v)
2810 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2811 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2812 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2813 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2814 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
2815 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2816 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
2817 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2818 +
2819 #endif /* CONFIG_64BIT */
2820
2821 /*
2822 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2823 index b4db69f..8f3b093 100644
2824 --- a/arch/mips/include/asm/cache.h
2825 +++ b/arch/mips/include/asm/cache.h
2826 @@ -9,10 +9,11 @@
2827 #ifndef _ASM_CACHE_H
2828 #define _ASM_CACHE_H
2829
2830 +#include <linux/const.h>
2831 #include <kmalloc.h>
2832
2833 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2834 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2835 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2836
2837 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2838 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2839 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2840 index 455c0ac..ad65fbe 100644
2841 --- a/arch/mips/include/asm/elf.h
2842 +++ b/arch/mips/include/asm/elf.h
2843 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
2844 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2845 #endif
2846
2847 +#ifdef CONFIG_PAX_ASLR
2848 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2849 +
2850 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2851 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2852 +#endif
2853 +
2854 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2855 struct linux_binprm;
2856 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2857 int uses_interp);
2858
2859 -struct mm_struct;
2860 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2861 -#define arch_randomize_brk arch_randomize_brk
2862 -
2863 #endif /* _ASM_ELF_H */
2864 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
2865 index c1f6afa..38cc6e9 100644
2866 --- a/arch/mips/include/asm/exec.h
2867 +++ b/arch/mips/include/asm/exec.h
2868 @@ -12,6 +12,6 @@
2869 #ifndef _ASM_EXEC_H
2870 #define _ASM_EXEC_H
2871
2872 -extern unsigned long arch_align_stack(unsigned long sp);
2873 +#define arch_align_stack(x) ((x) & ~0xfUL)
2874
2875 #endif /* _ASM_EXEC_H */
2876 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2877 index da9bd7d..91aa7ab 100644
2878 --- a/arch/mips/include/asm/page.h
2879 +++ b/arch/mips/include/asm/page.h
2880 @@ -98,7 +98,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2881 #ifdef CONFIG_CPU_MIPS32
2882 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2883 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2884 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2885 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2886 #else
2887 typedef struct { unsigned long long pte; } pte_t;
2888 #define pte_val(x) ((x).pte)
2889 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
2890 index 881d18b..cea38bc 100644
2891 --- a/arch/mips/include/asm/pgalloc.h
2892 +++ b/arch/mips/include/asm/pgalloc.h
2893 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
2894 {
2895 set_pud(pud, __pud((unsigned long)pmd));
2896 }
2897 +
2898 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
2899 +{
2900 + pud_populate(mm, pud, pmd);
2901 +}
2902 #endif
2903
2904 /*
2905 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
2906 index ca97e0e..cd08920 100644
2907 --- a/arch/mips/include/asm/thread_info.h
2908 +++ b/arch/mips/include/asm/thread_info.h
2909 @@ -111,6 +111,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
2910 #define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */
2911 #define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */
2912 #define TIF_LOAD_WATCH 25 /* If set, load watch registers */
2913 +/* li takes a 32bit immediate */
2914 +#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
2915 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */
2916
2917 #ifdef CONFIG_MIPS32_O32
2918 @@ -134,15 +136,18 @@ register struct thread_info *__current_thread_info __asm__("$28");
2919 #define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR)
2920 #define _TIF_FPUBOUND (1<<TIF_FPUBOUND)
2921 #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
2922 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
2923 +
2924 +#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
2925
2926 /* work to do in syscall_trace_leave() */
2927 -#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
2928 +#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
2929
2930 /* work to do on interrupt/exception return */
2931 #define _TIF_WORK_MASK (0x0000ffef & \
2932 ~(_TIF_SECCOMP | _TIF_SYSCALL_AUDIT))
2933 /* work to do on any return to u-space */
2934 -#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)
2935 +#define _TIF_ALLWORK_MASK ((0x8000ffff & ~_TIF_SECCOMP) | _TIF_GRSEC_SETXID)
2936
2937 #endif /* __KERNEL__ */
2938
2939 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2940 index 9fdd8bc..4bd7f1a 100644
2941 --- a/arch/mips/kernel/binfmt_elfn32.c
2942 +++ b/arch/mips/kernel/binfmt_elfn32.c
2943 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2944 #undef ELF_ET_DYN_BASE
2945 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2946
2947 +#ifdef CONFIG_PAX_ASLR
2948 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2949 +
2950 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2951 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2952 +#endif
2953 +
2954 #include <asm/processor.h>
2955 #include <linux/module.h>
2956 #include <linux/elfcore.h>
2957 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2958 index ff44823..97f8906 100644
2959 --- a/arch/mips/kernel/binfmt_elfo32.c
2960 +++ b/arch/mips/kernel/binfmt_elfo32.c
2961 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2962 #undef ELF_ET_DYN_BASE
2963 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2964
2965 +#ifdef CONFIG_PAX_ASLR
2966 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2967 +
2968 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2969 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2970 +#endif
2971 +
2972 #include <asm/processor.h>
2973
2974 /*
2975 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2976 index e9a5fd7..378809a 100644
2977 --- a/arch/mips/kernel/process.c
2978 +++ b/arch/mips/kernel/process.c
2979 @@ -480,15 +480,3 @@ unsigned long get_wchan(struct task_struct *task)
2980 out:
2981 return pc;
2982 }
2983 -
2984 -/*
2985 - * Don't forget that the stack pointer must be aligned on a 8 bytes
2986 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2987 - */
2988 -unsigned long arch_align_stack(unsigned long sp)
2989 -{
2990 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2991 - sp -= get_random_int() & ~PAGE_MASK;
2992 -
2993 - return sp & ALMASK;
2994 -}
2995 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
2996 index 4812c6d..2069554 100644
2997 --- a/arch/mips/kernel/ptrace.c
2998 +++ b/arch/mips/kernel/ptrace.c
2999 @@ -528,6 +528,10 @@ static inline int audit_arch(void)
3000 return arch;
3001 }
3002
3003 +#ifdef CONFIG_GRKERNSEC_SETXID
3004 +extern void gr_delayed_cred_worker(void);
3005 +#endif
3006 +
3007 /*
3008 * Notification of system call entry/exit
3009 * - triggered by current->work.syscall_trace
3010 @@ -537,6 +541,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
3011 /* do the secure computing check first */
3012 secure_computing_strict(regs->regs[2]);
3013
3014 +#ifdef CONFIG_GRKERNSEC_SETXID
3015 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3016 + gr_delayed_cred_worker();
3017 +#endif
3018 +
3019 if (!(current->ptrace & PT_PTRACED))
3020 goto out;
3021
3022 diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
3023 index a632bc1..0b77c7c 100644
3024 --- a/arch/mips/kernel/scall32-o32.S
3025 +++ b/arch/mips/kernel/scall32-o32.S
3026 @@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp)
3027
3028 stack_done:
3029 lw t0, TI_FLAGS($28) # syscall tracing enabled?
3030 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3031 + li t1, _TIF_SYSCALL_WORK
3032 and t0, t1
3033 bnez t0, syscall_trace_entry # -> yes
3034
3035 diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
3036 index 3b5a5e9..e1ee86d 100644
3037 --- a/arch/mips/kernel/scall64-64.S
3038 +++ b/arch/mips/kernel/scall64-64.S
3039 @@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
3040
3041 sd a3, PT_R26(sp) # save a3 for syscall restarting
3042
3043 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3044 + li t1, _TIF_SYSCALL_WORK
3045 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
3046 and t0, t1, t0
3047 bnez t0, syscall_trace_entry
3048 diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
3049 index 6be6f70..1859577 100644
3050 --- a/arch/mips/kernel/scall64-n32.S
3051 +++ b/arch/mips/kernel/scall64-n32.S
3052 @@ -53,7 +53,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
3053
3054 sd a3, PT_R26(sp) # save a3 for syscall restarting
3055
3056 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3057 + li t1, _TIF_SYSCALL_WORK
3058 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
3059 and t0, t1, t0
3060 bnez t0, n32_syscall_trace_entry
3061 diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
3062 index 5422855..74e63a3 100644
3063 --- a/arch/mips/kernel/scall64-o32.S
3064 +++ b/arch/mips/kernel/scall64-o32.S
3065 @@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp)
3066 PTR 4b, bad_stack
3067 .previous
3068
3069 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3070 + li t1, _TIF_SYSCALL_WORK
3071 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
3072 and t0, t1, t0
3073 bnez t0, trace_a_syscall
3074 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
3075 index c14f6df..537e729 100644
3076 --- a/arch/mips/mm/fault.c
3077 +++ b/arch/mips/mm/fault.c
3078 @@ -27,6 +27,23 @@
3079 #include <asm/highmem.h> /* For VMALLOC_END */
3080 #include <linux/kdebug.h>
3081
3082 +#ifdef CONFIG_PAX_PAGEEXEC
3083 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3084 +{
3085 + unsigned long i;
3086 +
3087 + printk(KERN_ERR "PAX: bytes at PC: ");
3088 + for (i = 0; i < 5; i++) {
3089 + unsigned int c;
3090 + if (get_user(c, (unsigned int *)pc+i))
3091 + printk(KERN_CONT "???????? ");
3092 + else
3093 + printk(KERN_CONT "%08x ", c);
3094 + }
3095 + printk("\n");
3096 +}
3097 +#endif
3098 +
3099 /*
3100 * This routine handles page faults. It determines the address,
3101 * and the problem, and then passes it off to one of the appropriate
3102 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
3103 index 302d779..7d35bf8 100644
3104 --- a/arch/mips/mm/mmap.c
3105 +++ b/arch/mips/mm/mmap.c
3106 @@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3107 do_color_align = 1;
3108
3109 /* requesting a specific address */
3110 +
3111 +#ifdef CONFIG_PAX_RANDMMAP
3112 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
3113 +#endif
3114 +
3115 if (addr) {
3116 if (do_color_align)
3117 addr = COLOUR_ALIGN(addr, pgoff);
3118 @@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3119 addr = PAGE_ALIGN(addr);
3120
3121 vma = find_vma(mm, addr);
3122 - if (TASK_SIZE - len >= addr &&
3123 - (!vma || addr + len <= vma->vm_start))
3124 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
3125 return addr;
3126 }
3127
3128 @@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3129 /* At this point: (!vma || addr < vma->vm_end). */
3130 if (TASK_SIZE - len < addr)
3131 return -ENOMEM;
3132 - if (!vma || addr + len <= vma->vm_start)
3133 + if (check_heap_stack_gap(vmm, addr, len))
3134 return addr;
3135 addr = vma->vm_end;
3136 if (do_color_align)
3137 @@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3138 /* make sure it can fit in the remaining address space */
3139 if (likely(addr > len)) {
3140 vma = find_vma(mm, addr - len);
3141 - if (!vma || addr <= vma->vm_start) {
3142 + if (check_heap_stack_gap(vmm, addr - len, len))
3143 /* cache the address as a hint for next time */
3144 return mm->free_area_cache = addr - len;
3145 }
3146 @@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3147 * return with success:
3148 */
3149 vma = find_vma(mm, addr);
3150 - if (likely(!vma || addr + len <= vma->vm_start)) {
3151 + if (check_heap_stack_gap(vmm, addr, len)) {
3152 /* cache the address as a hint for next time */
3153 return mm->free_area_cache = addr;
3154 }
3155 @@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
3156 mm->unmap_area = arch_unmap_area_topdown;
3157 }
3158 }
3159 -
3160 -static inline unsigned long brk_rnd(void)
3161 -{
3162 - unsigned long rnd = get_random_int();
3163 -
3164 - rnd = rnd << PAGE_SHIFT;
3165 - /* 8MB for 32bit, 256MB for 64bit */
3166 - if (TASK_IS_32BIT_ADDR)
3167 - rnd = rnd & 0x7ffffful;
3168 - else
3169 - rnd = rnd & 0xffffffful;
3170 -
3171 - return rnd;
3172 -}
3173 -
3174 -unsigned long arch_randomize_brk(struct mm_struct *mm)
3175 -{
3176 - unsigned long base = mm->brk;
3177 - unsigned long ret;
3178 -
3179 - ret = PAGE_ALIGN(base + brk_rnd());
3180 -
3181 - if (ret < mm->brk)
3182 - return mm->brk;
3183 -
3184 - return ret;
3185 -}
3186 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
3187 index 967d144..db12197 100644
3188 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
3189 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
3190 @@ -11,12 +11,14 @@
3191 #ifndef _ASM_PROC_CACHE_H
3192 #define _ASM_PROC_CACHE_H
3193
3194 +#include <linux/const.h>
3195 +
3196 /* L1 cache */
3197
3198 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
3199 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
3200 -#define L1_CACHE_BYTES 16 /* bytes per entry */
3201 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
3202 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
3203 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
3204
3205 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
3206 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
3207 index bcb5df2..84fabd2 100644
3208 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
3209 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
3210 @@ -16,13 +16,15 @@
3211 #ifndef _ASM_PROC_CACHE_H
3212 #define _ASM_PROC_CACHE_H
3213
3214 +#include <linux/const.h>
3215 +
3216 /*
3217 * L1 cache
3218 */
3219 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
3220 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
3221 -#define L1_CACHE_BYTES 32 /* bytes per entry */
3222 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
3223 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
3224 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
3225
3226 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
3227 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
3228 index 4ce7a01..449202a 100644
3229 --- a/arch/openrisc/include/asm/cache.h
3230 +++ b/arch/openrisc/include/asm/cache.h
3231 @@ -19,11 +19,13 @@
3232 #ifndef __ASM_OPENRISC_CACHE_H
3233 #define __ASM_OPENRISC_CACHE_H
3234
3235 +#include <linux/const.h>
3236 +
3237 /* FIXME: How can we replace these with values from the CPU...
3238 * they shouldn't be hard-coded!
3239 */
3240
3241 -#define L1_CACHE_BYTES 16
3242 #define L1_CACHE_SHIFT 4
3243 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3244
3245 #endif /* __ASM_OPENRISC_CACHE_H */
3246 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
3247 index 6c6defc..d30653d 100644
3248 --- a/arch/parisc/include/asm/atomic.h
3249 +++ b/arch/parisc/include/asm/atomic.h
3250 @@ -229,6 +229,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3251
3252 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3253
3254 +#define atomic64_read_unchecked(v) atomic64_read(v)
3255 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3256 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3257 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3258 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3259 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
3260 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3261 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
3262 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3263 +
3264 #endif /* !CONFIG_64BIT */
3265
3266
3267 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
3268 index 47f11c7..3420df2 100644
3269 --- a/arch/parisc/include/asm/cache.h
3270 +++ b/arch/parisc/include/asm/cache.h
3271 @@ -5,6 +5,7 @@
3272 #ifndef __ARCH_PARISC_CACHE_H
3273 #define __ARCH_PARISC_CACHE_H
3274
3275 +#include <linux/const.h>
3276
3277 /*
3278 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
3279 @@ -15,13 +16,13 @@
3280 * just ruin performance.
3281 */
3282 #ifdef CONFIG_PA20
3283 -#define L1_CACHE_BYTES 64
3284 #define L1_CACHE_SHIFT 6
3285 #else
3286 -#define L1_CACHE_BYTES 32
3287 #define L1_CACHE_SHIFT 5
3288 #endif
3289
3290 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3291 +
3292 #ifndef __ASSEMBLY__
3293
3294 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3295 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
3296 index 19f6cb1..6c78cf2 100644
3297 --- a/arch/parisc/include/asm/elf.h
3298 +++ b/arch/parisc/include/asm/elf.h
3299 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
3300
3301 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
3302
3303 +#ifdef CONFIG_PAX_ASLR
3304 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
3305 +
3306 +#define PAX_DELTA_MMAP_LEN 16
3307 +#define PAX_DELTA_STACK_LEN 16
3308 +#endif
3309 +
3310 /* This yields a mask that user programs can use to figure out what
3311 instruction set this CPU supports. This could be done in user space,
3312 but it's not easy, and we've already done it here. */
3313 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
3314 index fc987a1..6e068ef 100644
3315 --- a/arch/parisc/include/asm/pgalloc.h
3316 +++ b/arch/parisc/include/asm/pgalloc.h
3317 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
3318 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
3319 }
3320
3321 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
3322 +{
3323 + pgd_populate(mm, pgd, pmd);
3324 +}
3325 +
3326 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
3327 {
3328 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
3329 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
3330 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
3331 #define pmd_free(mm, x) do { } while (0)
3332 #define pgd_populate(mm, pmd, pte) BUG()
3333 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
3334
3335 #endif
3336
3337 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
3338 index ee99f23..802b0a1 100644
3339 --- a/arch/parisc/include/asm/pgtable.h
3340 +++ b/arch/parisc/include/asm/pgtable.h
3341 @@ -212,6 +212,17 @@ struct vm_area_struct;
3342 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
3343 #define PAGE_COPY PAGE_EXECREAD
3344 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
3345 +
3346 +#ifdef CONFIG_PAX_PAGEEXEC
3347 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
3348 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3349 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3350 +#else
3351 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
3352 +# define PAGE_COPY_NOEXEC PAGE_COPY
3353 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
3354 +#endif
3355 +
3356 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
3357 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
3358 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
3359 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
3360 index 4ba2c93..f5e3974 100644
3361 --- a/arch/parisc/include/asm/uaccess.h
3362 +++ b/arch/parisc/include/asm/uaccess.h
3363 @@ -251,10 +251,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
3364 const void __user *from,
3365 unsigned long n)
3366 {
3367 - int sz = __compiletime_object_size(to);
3368 + size_t sz = __compiletime_object_size(to);
3369 int ret = -EFAULT;
3370
3371 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
3372 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
3373 ret = __copy_from_user(to, from, n);
3374 else
3375 copy_from_user_overflow();
3376 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
3377 index 5e34ccf..672bc9c 100644
3378 --- a/arch/parisc/kernel/module.c
3379 +++ b/arch/parisc/kernel/module.c
3380 @@ -98,16 +98,38 @@
3381
3382 /* three functions to determine where in the module core
3383 * or init pieces the location is */
3384 +static inline int in_init_rx(struct module *me, void *loc)
3385 +{
3386 + return (loc >= me->module_init_rx &&
3387 + loc < (me->module_init_rx + me->init_size_rx));
3388 +}
3389 +
3390 +static inline int in_init_rw(struct module *me, void *loc)
3391 +{
3392 + return (loc >= me->module_init_rw &&
3393 + loc < (me->module_init_rw + me->init_size_rw));
3394 +}
3395 +
3396 static inline int in_init(struct module *me, void *loc)
3397 {
3398 - return (loc >= me->module_init &&
3399 - loc <= (me->module_init + me->init_size));
3400 + return in_init_rx(me, loc) || in_init_rw(me, loc);
3401 +}
3402 +
3403 +static inline int in_core_rx(struct module *me, void *loc)
3404 +{
3405 + return (loc >= me->module_core_rx &&
3406 + loc < (me->module_core_rx + me->core_size_rx));
3407 +}
3408 +
3409 +static inline int in_core_rw(struct module *me, void *loc)
3410 +{
3411 + return (loc >= me->module_core_rw &&
3412 + loc < (me->module_core_rw + me->core_size_rw));
3413 }
3414
3415 static inline int in_core(struct module *me, void *loc)
3416 {
3417 - return (loc >= me->module_core &&
3418 - loc <= (me->module_core + me->core_size));
3419 + return in_core_rx(me, loc) || in_core_rw(me, loc);
3420 }
3421
3422 static inline int in_local(struct module *me, void *loc)
3423 @@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3424 }
3425
3426 /* align things a bit */
3427 - me->core_size = ALIGN(me->core_size, 16);
3428 - me->arch.got_offset = me->core_size;
3429 - me->core_size += gots * sizeof(struct got_entry);
3430 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
3431 + me->arch.got_offset = me->core_size_rw;
3432 + me->core_size_rw += gots * sizeof(struct got_entry);
3433
3434 - me->core_size = ALIGN(me->core_size, 16);
3435 - me->arch.fdesc_offset = me->core_size;
3436 - me->core_size += fdescs * sizeof(Elf_Fdesc);
3437 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
3438 + me->arch.fdesc_offset = me->core_size_rw;
3439 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3440
3441 me->arch.got_max = gots;
3442 me->arch.fdesc_max = fdescs;
3443 @@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3444
3445 BUG_ON(value == 0);
3446
3447 - got = me->module_core + me->arch.got_offset;
3448 + got = me->module_core_rw + me->arch.got_offset;
3449 for (i = 0; got[i].addr; i++)
3450 if (got[i].addr == value)
3451 goto out;
3452 @@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3453 #ifdef CONFIG_64BIT
3454 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3455 {
3456 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3457 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3458
3459 if (!value) {
3460 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3461 @@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3462
3463 /* Create new one */
3464 fdesc->addr = value;
3465 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3466 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3467 return (Elf_Addr)fdesc;
3468 }
3469 #endif /* CONFIG_64BIT */
3470 @@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3471
3472 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3473 end = table + sechdrs[me->arch.unwind_section].sh_size;
3474 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3475 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3476
3477 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3478 me->arch.unwind_section, table, end, gp);
3479 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3480 index c9b9322..02d8940 100644
3481 --- a/arch/parisc/kernel/sys_parisc.c
3482 +++ b/arch/parisc/kernel/sys_parisc.c
3483 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3484 /* At this point: (!vma || addr < vma->vm_end). */
3485 if (TASK_SIZE - len < addr)
3486 return -ENOMEM;
3487 - if (!vma || addr + len <= vma->vm_start)
3488 + if (check_heap_stack_gap(vma, addr, len))
3489 return addr;
3490 addr = vma->vm_end;
3491 }
3492 @@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3493 /* At this point: (!vma || addr < vma->vm_end). */
3494 if (TASK_SIZE - len < addr)
3495 return -ENOMEM;
3496 - if (!vma || addr + len <= vma->vm_start)
3497 + if (check_heap_stack_gap(vma, addr, len))
3498 return addr;
3499 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3500 if (addr < vma->vm_end) /* handle wraparound */
3501 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3502 if (flags & MAP_FIXED)
3503 return addr;
3504 if (!addr)
3505 - addr = TASK_UNMAPPED_BASE;
3506 + addr = current->mm->mmap_base;
3507
3508 if (filp) {
3509 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3510 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3511 index 45ba99f..8e22c33 100644
3512 --- a/arch/parisc/kernel/traps.c
3513 +++ b/arch/parisc/kernel/traps.c
3514 @@ -732,9 +732,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3515
3516 down_read(&current->mm->mmap_sem);
3517 vma = find_vma(current->mm,regs->iaoq[0]);
3518 - if (vma && (regs->iaoq[0] >= vma->vm_start)
3519 - && (vma->vm_flags & VM_EXEC)) {
3520 -
3521 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3522 fault_address = regs->iaoq[0];
3523 fault_space = regs->iasq[0];
3524
3525 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3526 index 18162ce..94de376 100644
3527 --- a/arch/parisc/mm/fault.c
3528 +++ b/arch/parisc/mm/fault.c
3529 @@ -15,6 +15,7 @@
3530 #include <linux/sched.h>
3531 #include <linux/interrupt.h>
3532 #include <linux/module.h>
3533 +#include <linux/unistd.h>
3534
3535 #include <asm/uaccess.h>
3536 #include <asm/traps.h>
3537 @@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3538 static unsigned long
3539 parisc_acctyp(unsigned long code, unsigned int inst)
3540 {
3541 - if (code == 6 || code == 16)
3542 + if (code == 6 || code == 7 || code == 16)
3543 return VM_EXEC;
3544
3545 switch (inst & 0xf0000000) {
3546 @@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3547 }
3548 #endif
3549
3550 +#ifdef CONFIG_PAX_PAGEEXEC
3551 +/*
3552 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3553 + *
3554 + * returns 1 when task should be killed
3555 + * 2 when rt_sigreturn trampoline was detected
3556 + * 3 when unpatched PLT trampoline was detected
3557 + */
3558 +static int pax_handle_fetch_fault(struct pt_regs *regs)
3559 +{
3560 +
3561 +#ifdef CONFIG_PAX_EMUPLT
3562 + int err;
3563 +
3564 + do { /* PaX: unpatched PLT emulation */
3565 + unsigned int bl, depwi;
3566 +
3567 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3568 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3569 +
3570 + if (err)
3571 + break;
3572 +
3573 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3574 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3575 +
3576 + err = get_user(ldw, (unsigned int *)addr);
3577 + err |= get_user(bv, (unsigned int *)(addr+4));
3578 + err |= get_user(ldw2, (unsigned int *)(addr+8));
3579 +
3580 + if (err)
3581 + break;
3582 +
3583 + if (ldw == 0x0E801096U &&
3584 + bv == 0xEAC0C000U &&
3585 + ldw2 == 0x0E881095U)
3586 + {
3587 + unsigned int resolver, map;
3588 +
3589 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3590 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3591 + if (err)
3592 + break;
3593 +
3594 + regs->gr[20] = instruction_pointer(regs)+8;
3595 + regs->gr[21] = map;
3596 + regs->gr[22] = resolver;
3597 + regs->iaoq[0] = resolver | 3UL;
3598 + regs->iaoq[1] = regs->iaoq[0] + 4;
3599 + return 3;
3600 + }
3601 + }
3602 + } while (0);
3603 +#endif
3604 +
3605 +#ifdef CONFIG_PAX_EMUTRAMP
3606 +
3607 +#ifndef CONFIG_PAX_EMUSIGRT
3608 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3609 + return 1;
3610 +#endif
3611 +
3612 + do { /* PaX: rt_sigreturn emulation */
3613 + unsigned int ldi1, ldi2, bel, nop;
3614 +
3615 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3616 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3617 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3618 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3619 +
3620 + if (err)
3621 + break;
3622 +
3623 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3624 + ldi2 == 0x3414015AU &&
3625 + bel == 0xE4008200U &&
3626 + nop == 0x08000240U)
3627 + {
3628 + regs->gr[25] = (ldi1 & 2) >> 1;
3629 + regs->gr[20] = __NR_rt_sigreturn;
3630 + regs->gr[31] = regs->iaoq[1] + 16;
3631 + regs->sr[0] = regs->iasq[1];
3632 + regs->iaoq[0] = 0x100UL;
3633 + regs->iaoq[1] = regs->iaoq[0] + 4;
3634 + regs->iasq[0] = regs->sr[2];
3635 + regs->iasq[1] = regs->sr[2];
3636 + return 2;
3637 + }
3638 + } while (0);
3639 +#endif
3640 +
3641 + return 1;
3642 +}
3643 +
3644 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3645 +{
3646 + unsigned long i;
3647 +
3648 + printk(KERN_ERR "PAX: bytes at PC: ");
3649 + for (i = 0; i < 5; i++) {
3650 + unsigned int c;
3651 + if (get_user(c, (unsigned int *)pc+i))
3652 + printk(KERN_CONT "???????? ");
3653 + else
3654 + printk(KERN_CONT "%08x ", c);
3655 + }
3656 + printk("\n");
3657 +}
3658 +#endif
3659 +
3660 int fixup_exception(struct pt_regs *regs)
3661 {
3662 const struct exception_table_entry *fix;
3663 @@ -192,8 +303,33 @@ good_area:
3664
3665 acc_type = parisc_acctyp(code,regs->iir);
3666
3667 - if ((vma->vm_flags & acc_type) != acc_type)
3668 + if ((vma->vm_flags & acc_type) != acc_type) {
3669 +
3670 +#ifdef CONFIG_PAX_PAGEEXEC
3671 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3672 + (address & ~3UL) == instruction_pointer(regs))
3673 + {
3674 + up_read(&mm->mmap_sem);
3675 + switch (pax_handle_fetch_fault(regs)) {
3676 +
3677 +#ifdef CONFIG_PAX_EMUPLT
3678 + case 3:
3679 + return;
3680 +#endif
3681 +
3682 +#ifdef CONFIG_PAX_EMUTRAMP
3683 + case 2:
3684 + return;
3685 +#endif
3686 +
3687 + }
3688 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3689 + do_group_exit(SIGKILL);
3690 + }
3691 +#endif
3692 +
3693 goto bad_area;
3694 + }
3695
3696 /*
3697 * If for any reason at all we couldn't handle the fault, make
3698 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3699 index da29032..f76c24c 100644
3700 --- a/arch/powerpc/include/asm/atomic.h
3701 +++ b/arch/powerpc/include/asm/atomic.h
3702 @@ -522,6 +522,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
3703 return t1;
3704 }
3705
3706 +#define atomic64_read_unchecked(v) atomic64_read(v)
3707 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3708 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3709 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3710 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3711 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
3712 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3713 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
3714 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3715 +
3716 #endif /* __powerpc64__ */
3717
3718 #endif /* __KERNEL__ */
3719 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3720 index 9e495c9..b6878e5 100644
3721 --- a/arch/powerpc/include/asm/cache.h
3722 +++ b/arch/powerpc/include/asm/cache.h
3723 @@ -3,6 +3,7 @@
3724
3725 #ifdef __KERNEL__
3726
3727 +#include <linux/const.h>
3728
3729 /* bytes per L1 cache line */
3730 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3731 @@ -22,7 +23,7 @@
3732 #define L1_CACHE_SHIFT 7
3733 #endif
3734
3735 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3736 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3737
3738 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3739
3740 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3741 index 3bf9cca..e7457d0 100644
3742 --- a/arch/powerpc/include/asm/elf.h
3743 +++ b/arch/powerpc/include/asm/elf.h
3744 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3745 the loader. We need to make sure that it is out of the way of the program
3746 that it will "exec", and that there is sufficient room for the brk. */
3747
3748 -extern unsigned long randomize_et_dyn(unsigned long base);
3749 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3750 +#define ELF_ET_DYN_BASE (0x20000000)
3751 +
3752 +#ifdef CONFIG_PAX_ASLR
3753 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3754 +
3755 +#ifdef __powerpc64__
3756 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3757 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3758 +#else
3759 +#define PAX_DELTA_MMAP_LEN 15
3760 +#define PAX_DELTA_STACK_LEN 15
3761 +#endif
3762 +#endif
3763
3764 /*
3765 * Our registers are always unsigned longs, whether we're a 32 bit
3766 @@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3767 (0x7ff >> (PAGE_SHIFT - 12)) : \
3768 (0x3ffff >> (PAGE_SHIFT - 12)))
3769
3770 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3771 -#define arch_randomize_brk arch_randomize_brk
3772 -
3773 #endif /* __KERNEL__ */
3774
3775 /*
3776 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
3777 index 8196e9c..d83a9f3 100644
3778 --- a/arch/powerpc/include/asm/exec.h
3779 +++ b/arch/powerpc/include/asm/exec.h
3780 @@ -4,6 +4,6 @@
3781 #ifndef _ASM_POWERPC_EXEC_H
3782 #define _ASM_POWERPC_EXEC_H
3783
3784 -extern unsigned long arch_align_stack(unsigned long sp);
3785 +#define arch_align_stack(x) ((x) & ~0xfUL)
3786
3787 #endif /* _ASM_POWERPC_EXEC_H */
3788 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3789 index bca8fdc..61e9580 100644
3790 --- a/arch/powerpc/include/asm/kmap_types.h
3791 +++ b/arch/powerpc/include/asm/kmap_types.h
3792 @@ -27,6 +27,7 @@ enum km_type {
3793 KM_PPC_SYNC_PAGE,
3794 KM_PPC_SYNC_ICACHE,
3795 KM_KDB,
3796 + KM_CLEARPAGE,
3797 KM_TYPE_NR
3798 };
3799
3800 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3801 index d4a7f64..451de1c 100644
3802 --- a/arch/powerpc/include/asm/mman.h
3803 +++ b/arch/powerpc/include/asm/mman.h
3804 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3805 }
3806 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3807
3808 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3809 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3810 {
3811 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3812 }
3813 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3814 index f072e97..b436dee 100644
3815 --- a/arch/powerpc/include/asm/page.h
3816 +++ b/arch/powerpc/include/asm/page.h
3817 @@ -220,8 +220,9 @@ extern long long virt_phys_offset;
3818 * and needs to be executable. This means the whole heap ends
3819 * up being executable.
3820 */
3821 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3822 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3823 +#define VM_DATA_DEFAULT_FLAGS32 \
3824 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3825 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3826
3827 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3828 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3829 @@ -249,6 +250,9 @@ extern long long virt_phys_offset;
3830 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3831 #endif
3832
3833 +#define ktla_ktva(addr) (addr)
3834 +#define ktva_ktla(addr) (addr)
3835 +
3836 /*
3837 * Use the top bit of the higher-level page table entries to indicate whether
3838 * the entries we point to contain hugepages. This works because we know that
3839 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3840 index fed85e6..da5c71b 100644
3841 --- a/arch/powerpc/include/asm/page_64.h
3842 +++ b/arch/powerpc/include/asm/page_64.h
3843 @@ -146,15 +146,18 @@ do { \
3844 * stack by default, so in the absence of a PT_GNU_STACK program header
3845 * we turn execute permission off.
3846 */
3847 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3848 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3849 +#define VM_STACK_DEFAULT_FLAGS32 \
3850 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3851 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3852
3853 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3854 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3855
3856 +#ifndef CONFIG_PAX_PAGEEXEC
3857 #define VM_STACK_DEFAULT_FLAGS \
3858 (is_32bit_task() ? \
3859 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3860 +#endif
3861
3862 #include <asm-generic/getorder.h>
3863
3864 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
3865 index 292725c..f87ae14 100644
3866 --- a/arch/powerpc/include/asm/pgalloc-64.h
3867 +++ b/arch/powerpc/include/asm/pgalloc-64.h
3868 @@ -50,6 +50,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
3869 #ifndef CONFIG_PPC_64K_PAGES
3870
3871 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
3872 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
3873
3874 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
3875 {
3876 @@ -67,6 +68,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3877 pud_set(pud, (unsigned long)pmd);
3878 }
3879
3880 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3881 +{
3882 + pud_populate(mm, pud, pmd);
3883 +}
3884 +
3885 #define pmd_populate(mm, pmd, pte_page) \
3886 pmd_populate_kernel(mm, pmd, page_address(pte_page))
3887 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
3888 @@ -76,6 +82,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3889 #else /* CONFIG_PPC_64K_PAGES */
3890
3891 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
3892 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
3893
3894 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
3895 pte_t *pte)
3896 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3897 index 2e0e411..7899c68 100644
3898 --- a/arch/powerpc/include/asm/pgtable.h
3899 +++ b/arch/powerpc/include/asm/pgtable.h
3900 @@ -2,6 +2,7 @@
3901 #define _ASM_POWERPC_PGTABLE_H
3902 #ifdef __KERNEL__
3903
3904 +#include <linux/const.h>
3905 #ifndef __ASSEMBLY__
3906 #include <asm/processor.h> /* For TASK_SIZE */
3907 #include <asm/mmu.h>
3908 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3909 index 4aad413..85d86bf 100644
3910 --- a/arch/powerpc/include/asm/pte-hash32.h
3911 +++ b/arch/powerpc/include/asm/pte-hash32.h
3912 @@ -21,6 +21,7 @@
3913 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3914 #define _PAGE_USER 0x004 /* usermode access allowed */
3915 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3916 +#define _PAGE_EXEC _PAGE_GUARDED
3917 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3918 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3919 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3920 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3921 index 360585d..c3930ef 100644
3922 --- a/arch/powerpc/include/asm/reg.h
3923 +++ b/arch/powerpc/include/asm/reg.h
3924 @@ -212,6 +212,7 @@
3925 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3926 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3927 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3928 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3929 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3930 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3931 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3932 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
3933 index 68831e9..379c695 100644
3934 --- a/arch/powerpc/include/asm/thread_info.h
3935 +++ b/arch/powerpc/include/asm/thread_info.h
3936 @@ -91,12 +91,14 @@ static inline struct thread_info *current_thread_info(void)
3937 #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */
3938 #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
3939 #define TIF_SINGLESTEP 8 /* singlestepping active */
3940 -#define TIF_MEMDIE 9 /* is terminating due to OOM killer */
3941 #define TIF_SECCOMP 10 /* secure computing */
3942 #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */
3943 #define TIF_NOERROR 12 /* Force successful syscall return */
3944 #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */
3945 #define TIF_SYSCALL_TRACEPOINT 15 /* syscall tracepoint instrumentation */
3946 +#define TIF_MEMDIE 16 /* is terminating due to OOM killer */
3947 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
3948 +#define TIF_GRSEC_SETXID 9 /* update credentials on syscall entry/exit */
3949
3950 /* as above, but as bit values */
3951 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
3952 @@ -113,8 +115,10 @@ static inline struct thread_info *current_thread_info(void)
3953 #define _TIF_NOERROR (1<<TIF_NOERROR)
3954 #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
3955 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
3956 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
3957 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
3958 - _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT)
3959 + _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
3960 + _TIF_GRSEC_SETXID)
3961
3962 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
3963 _TIF_NOTIFY_RESUME)
3964 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3965 index 17bb40c..353c98b 100644
3966 --- a/arch/powerpc/include/asm/uaccess.h
3967 +++ b/arch/powerpc/include/asm/uaccess.h
3968 @@ -13,6 +13,8 @@
3969 #define VERIFY_READ 0
3970 #define VERIFY_WRITE 1
3971
3972 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
3973 +
3974 /*
3975 * The fs value determines whether argument validity checking should be
3976 * performed or not. If get_fs() == USER_DS, checking is performed, with
3977 @@ -329,52 +331,6 @@ do { \
3978 extern unsigned long __copy_tofrom_user(void __user *to,
3979 const void __user *from, unsigned long size);
3980
3981 -#ifndef __powerpc64__
3982 -
3983 -static inline unsigned long copy_from_user(void *to,
3984 - const void __user *from, unsigned long n)
3985 -{
3986 - unsigned long over;
3987 -
3988 - if (access_ok(VERIFY_READ, from, n))
3989 - return __copy_tofrom_user((__force void __user *)to, from, n);
3990 - if ((unsigned long)from < TASK_SIZE) {
3991 - over = (unsigned long)from + n - TASK_SIZE;
3992 - return __copy_tofrom_user((__force void __user *)to, from,
3993 - n - over) + over;
3994 - }
3995 - return n;
3996 -}
3997 -
3998 -static inline unsigned long copy_to_user(void __user *to,
3999 - const void *from, unsigned long n)
4000 -{
4001 - unsigned long over;
4002 -
4003 - if (access_ok(VERIFY_WRITE, to, n))
4004 - return __copy_tofrom_user(to, (__force void __user *)from, n);
4005 - if ((unsigned long)to < TASK_SIZE) {
4006 - over = (unsigned long)to + n - TASK_SIZE;
4007 - return __copy_tofrom_user(to, (__force void __user *)from,
4008 - n - over) + over;
4009 - }
4010 - return n;
4011 -}
4012 -
4013 -#else /* __powerpc64__ */
4014 -
4015 -#define __copy_in_user(to, from, size) \
4016 - __copy_tofrom_user((to), (from), (size))
4017 -
4018 -extern unsigned long copy_from_user(void *to, const void __user *from,
4019 - unsigned long n);
4020 -extern unsigned long copy_to_user(void __user *to, const void *from,
4021 - unsigned long n);
4022 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
4023 - unsigned long n);
4024 -
4025 -#endif /* __powerpc64__ */
4026 -
4027 static inline unsigned long __copy_from_user_inatomic(void *to,
4028 const void __user *from, unsigned long n)
4029 {
4030 @@ -398,6 +354,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
4031 if (ret == 0)
4032 return 0;
4033 }
4034 +
4035 + if (!__builtin_constant_p(n))
4036 + check_object_size(to, n, false);
4037 +
4038 return __copy_tofrom_user((__force void __user *)to, from, n);
4039 }
4040
4041 @@ -424,6 +384,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
4042 if (ret == 0)
4043 return 0;
4044 }
4045 +
4046 + if (!__builtin_constant_p(n))
4047 + check_object_size(from, n, true);
4048 +
4049 return __copy_tofrom_user(to, (__force const void __user *)from, n);
4050 }
4051
4052 @@ -441,6 +405,92 @@ static inline unsigned long __copy_to_user(void __user *to,
4053 return __copy_to_user_inatomic(to, from, size);
4054 }
4055
4056 +#ifndef __powerpc64__
4057 +
4058 +static inline unsigned long __must_check copy_from_user(void *to,
4059 + const void __user *from, unsigned long n)
4060 +{
4061 + unsigned long over;
4062 +
4063 + if ((long)n < 0)
4064 + return n;
4065 +
4066 + if (access_ok(VERIFY_READ, from, n)) {
4067 + if (!__builtin_constant_p(n))
4068 + check_object_size(to, n, false);
4069 + return __copy_tofrom_user((__force void __user *)to, from, n);
4070 + }
4071 + if ((unsigned long)from < TASK_SIZE) {
4072 + over = (unsigned long)from + n - TASK_SIZE;
4073 + if (!__builtin_constant_p(n - over))
4074 + check_object_size(to, n - over, false);
4075 + return __copy_tofrom_user((__force void __user *)to, from,
4076 + n - over) + over;
4077 + }
4078 + return n;
4079 +}
4080 +
4081 +static inline unsigned long __must_check copy_to_user(void __user *to,
4082 + const void *from, unsigned long n)
4083 +{
4084 + unsigned long over;
4085 +
4086 + if ((long)n < 0)
4087 + return n;
4088 +
4089 + if (access_ok(VERIFY_WRITE, to, n)) {
4090 + if (!__builtin_constant_p(n))
4091 + check_object_size(from, n, true);
4092 + return __copy_tofrom_user(to, (__force void __user *)from, n);
4093 + }
4094 + if ((unsigned long)to < TASK_SIZE) {
4095 + over = (unsigned long)to + n - TASK_SIZE;
4096 + if (!__builtin_constant_p(n))
4097 + check_object_size(from, n - over, true);
4098 + return __copy_tofrom_user(to, (__force void __user *)from,
4099 + n - over) + over;
4100 + }
4101 + return n;
4102 +}
4103 +
4104 +#else /* __powerpc64__ */
4105 +
4106 +#define __copy_in_user(to, from, size) \
4107 + __copy_tofrom_user((to), (from), (size))
4108 +
4109 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
4110 +{
4111 + if ((long)n < 0 || n > INT_MAX)
4112 + return n;
4113 +
4114 + if (!__builtin_constant_p(n))
4115 + check_object_size(to, n, false);
4116 +
4117 + if (likely(access_ok(VERIFY_READ, from, n)))
4118 + n = __copy_from_user(to, from, n);
4119 + else
4120 + memset(to, 0, n);
4121 + return n;
4122 +}
4123 +
4124 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
4125 +{
4126 + if ((long)n < 0 || n > INT_MAX)
4127 + return n;
4128 +
4129 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
4130 + if (!__builtin_constant_p(n))
4131 + check_object_size(from, n, true);
4132 + n = __copy_to_user(to, from, n);
4133 + }
4134 + return n;
4135 +}
4136 +
4137 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
4138 + unsigned long n);
4139 +
4140 +#endif /* __powerpc64__ */
4141 +
4142 extern unsigned long __clear_user(void __user *addr, unsigned long size);
4143
4144 static inline unsigned long clear_user(void __user *addr, unsigned long size)
4145 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
4146 index 7215cc2..a9730c1 100644
4147 --- a/arch/powerpc/kernel/exceptions-64e.S
4148 +++ b/arch/powerpc/kernel/exceptions-64e.S
4149 @@ -661,6 +661,7 @@ storage_fault_common:
4150 std r14,_DAR(r1)
4151 std r15,_DSISR(r1)
4152 addi r3,r1,STACK_FRAME_OVERHEAD
4153 + bl .save_nvgprs
4154 mr r4,r14
4155 mr r5,r15
4156 ld r14,PACA_EXGEN+EX_R14(r13)
4157 @@ -669,8 +670,7 @@ storage_fault_common:
4158 cmpdi r3,0
4159 bne- 1f
4160 b .ret_from_except_lite
4161 -1: bl .save_nvgprs
4162 - mr r5,r3
4163 +1: mr r5,r3
4164 addi r3,r1,STACK_FRAME_OVERHEAD
4165 ld r4,_DAR(r1)
4166 bl .bad_page_fault
4167 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
4168 index 1c06d29..c2a339b 100644
4169 --- a/arch/powerpc/kernel/exceptions-64s.S
4170 +++ b/arch/powerpc/kernel/exceptions-64s.S
4171 @@ -888,10 +888,10 @@ handle_page_fault:
4172 11: ld r4,_DAR(r1)
4173 ld r5,_DSISR(r1)
4174 addi r3,r1,STACK_FRAME_OVERHEAD
4175 + bl .save_nvgprs
4176 bl .do_page_fault
4177 cmpdi r3,0
4178 beq+ 12f
4179 - bl .save_nvgprs
4180 mr r5,r3
4181 addi r3,r1,STACK_FRAME_OVERHEAD
4182 lwz r4,_DAR(r1)
4183 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
4184 index 2e3200c..72095ce 100644
4185 --- a/arch/powerpc/kernel/module_32.c
4186 +++ b/arch/powerpc/kernel/module_32.c
4187 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
4188 me->arch.core_plt_section = i;
4189 }
4190 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
4191 - printk("Module doesn't contain .plt or .init.plt sections.\n");
4192 + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
4193 return -ENOEXEC;
4194 }
4195
4196 @@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
4197
4198 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
4199 /* Init, or core PLT? */
4200 - if (location >= mod->module_core
4201 - && location < mod->module_core + mod->core_size)
4202 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
4203 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
4204 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
4205 - else
4206 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
4207 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
4208 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
4209 + else {
4210 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
4211 + return ~0UL;
4212 + }
4213
4214 /* Find this entry, or if that fails, the next avail. entry */
4215 while (entry->jump[0]) {
4216 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
4217 index 710f400..d00ebe6 100644
4218 --- a/arch/powerpc/kernel/process.c
4219 +++ b/arch/powerpc/kernel/process.c
4220 @@ -681,8 +681,8 @@ void show_regs(struct pt_regs * regs)
4221 * Lookup NIP late so we have the best change of getting the
4222 * above info out without failing
4223 */
4224 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
4225 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
4226 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
4227 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
4228 #endif
4229 show_stack(current, (unsigned long *) regs->gpr[1]);
4230 if (!user_mode(regs))
4231 @@ -1189,10 +1189,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
4232 newsp = stack[0];
4233 ip = stack[STACK_FRAME_LR_SAVE];
4234 if (!firstframe || ip != lr) {
4235 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
4236 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
4237 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
4238 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
4239 - printk(" (%pS)",
4240 + printk(" (%pA)",
4241 (void *)current->ret_stack[curr_frame].ret);
4242 curr_frame--;
4243 }
4244 @@ -1212,7 +1212,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
4245 struct pt_regs *regs = (struct pt_regs *)
4246 (sp + STACK_FRAME_OVERHEAD);
4247 lr = regs->link;
4248 - printk("--- Exception: %lx at %pS\n LR = %pS\n",
4249 + printk("--- Exception: %lx at %pA\n LR = %pA\n",
4250 regs->trap, (void *)regs->nip, (void *)lr);
4251 firstframe = 1;
4252 }
4253 @@ -1254,58 +1254,3 @@ void __ppc64_runlatch_off(void)
4254 mtspr(SPRN_CTRLT, ctrl);
4255 }
4256 #endif /* CONFIG_PPC64 */
4257 -
4258 -unsigned long arch_align_stack(unsigned long sp)
4259 -{
4260 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4261 - sp -= get_random_int() & ~PAGE_MASK;
4262 - return sp & ~0xf;
4263 -}
4264 -
4265 -static inline unsigned long brk_rnd(void)
4266 -{
4267 - unsigned long rnd = 0;
4268 -
4269 - /* 8MB for 32bit, 1GB for 64bit */
4270 - if (is_32bit_task())
4271 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
4272 - else
4273 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
4274 -
4275 - return rnd << PAGE_SHIFT;
4276 -}
4277 -
4278 -unsigned long arch_randomize_brk(struct mm_struct *mm)
4279 -{
4280 - unsigned long base = mm->brk;
4281 - unsigned long ret;
4282 -
4283 -#ifdef CONFIG_PPC_STD_MMU_64
4284 - /*
4285 - * If we are using 1TB segments and we are allowed to randomise
4286 - * the heap, we can put it above 1TB so it is backed by a 1TB
4287 - * segment. Otherwise the heap will be in the bottom 1TB
4288 - * which always uses 256MB segments and this may result in a
4289 - * performance penalty.
4290 - */
4291 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
4292 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
4293 -#endif
4294 -
4295 - ret = PAGE_ALIGN(base + brk_rnd());
4296 -
4297 - if (ret < mm->brk)
4298 - return mm->brk;
4299 -
4300 - return ret;
4301 -}
4302 -
4303 -unsigned long randomize_et_dyn(unsigned long base)
4304 -{
4305 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4306 -
4307 - if (ret < base)
4308 - return base;
4309 -
4310 - return ret;
4311 -}
4312 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
4313 index c10fc28..c4ef063 100644
4314 --- a/arch/powerpc/kernel/ptrace.c
4315 +++ b/arch/powerpc/kernel/ptrace.c
4316 @@ -1660,6 +1660,10 @@ long arch_ptrace(struct task_struct *child, long request,
4317 return ret;
4318 }
4319
4320 +#ifdef CONFIG_GRKERNSEC_SETXID
4321 +extern void gr_delayed_cred_worker(void);
4322 +#endif
4323 +
4324 /*
4325 * We must return the syscall number to actually look up in the table.
4326 * This can be -1L to skip running any syscall at all.
4327 @@ -1670,6 +1674,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
4328
4329 secure_computing_strict(regs->gpr[0]);
4330
4331 +#ifdef CONFIG_GRKERNSEC_SETXID
4332 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
4333 + gr_delayed_cred_worker();
4334 +#endif
4335 +
4336 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
4337 tracehook_report_syscall_entry(regs))
4338 /*
4339 @@ -1704,6 +1713,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
4340 {
4341 int step;
4342
4343 +#ifdef CONFIG_GRKERNSEC_SETXID
4344 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
4345 + gr_delayed_cred_worker();
4346 +#endif
4347 +
4348 audit_syscall_exit(regs);
4349
4350 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
4351 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
4352 index 8b4c049..dcd6ef3 100644
4353 --- a/arch/powerpc/kernel/signal_32.c
4354 +++ b/arch/powerpc/kernel/signal_32.c
4355 @@ -852,7 +852,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
4356 /* Save user registers on the stack */
4357 frame = &rt_sf->uc.uc_mcontext;
4358 addr = frame;
4359 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
4360 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
4361 if (save_user_regs(regs, frame, 0, 1))
4362 goto badframe;
4363 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
4364 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
4365 index d183f87..1867f1a 100644
4366 --- a/arch/powerpc/kernel/signal_64.c
4367 +++ b/arch/powerpc/kernel/signal_64.c
4368 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
4369 current->thread.fpscr.val = 0;
4370
4371 /* Set up to return from userspace. */
4372 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
4373 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
4374 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
4375 } else {
4376 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
4377 diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
4378 index f2496f2..4e3cc47 100644
4379 --- a/arch/powerpc/kernel/syscalls.c
4380 +++ b/arch/powerpc/kernel/syscalls.c
4381 @@ -107,11 +107,11 @@ long ppc64_personality(unsigned long personality)
4382 long ret;
4383
4384 if (personality(current->personality) == PER_LINUX32
4385 - && personality == PER_LINUX)
4386 - personality = PER_LINUX32;
4387 + && personality(personality) == PER_LINUX)
4388 + personality = (personality & ~PER_MASK) | PER_LINUX32;
4389 ret = sys_personality(personality);
4390 - if (ret == PER_LINUX32)
4391 - ret = PER_LINUX;
4392 + if (personality(ret) == PER_LINUX32)
4393 + ret = (ret & ~PER_MASK) | PER_LINUX;
4394 return ret;
4395 }
4396 #endif
4397 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
4398 index 1589723..cefe690 100644
4399 --- a/arch/powerpc/kernel/traps.c
4400 +++ b/arch/powerpc/kernel/traps.c
4401 @@ -133,6 +133,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
4402 return flags;
4403 }
4404
4405 +extern void gr_handle_kernel_exploit(void);
4406 +
4407 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
4408 int signr)
4409 {
4410 @@ -182,6 +184,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
4411 panic("Fatal exception in interrupt");
4412 if (panic_on_oops)
4413 panic("Fatal exception");
4414 +
4415 + gr_handle_kernel_exploit();
4416 +
4417 do_exit(signr);
4418 }
4419
4420 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
4421 index 9eb5b9b..e45498a 100644
4422 --- a/arch/powerpc/kernel/vdso.c
4423 +++ b/arch/powerpc/kernel/vdso.c
4424 @@ -34,6 +34,7 @@
4425 #include <asm/firmware.h>
4426 #include <asm/vdso.h>
4427 #include <asm/vdso_datapage.h>
4428 +#include <asm/mman.h>
4429
4430 #include "setup.h"
4431
4432 @@ -218,7 +219,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
4433 vdso_base = VDSO32_MBASE;
4434 #endif
4435
4436 - current->mm->context.vdso_base = 0;
4437 + current->mm->context.vdso_base = ~0UL;
4438
4439 /* vDSO has a problem and was disabled, just don't "enable" it for the
4440 * process
4441 @@ -238,7 +239,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
4442 vdso_base = get_unmapped_area(NULL, vdso_base,
4443 (vdso_pages << PAGE_SHIFT) +
4444 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
4445 - 0, 0);
4446 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
4447 if (IS_ERR_VALUE(vdso_base)) {
4448 rc = vdso_base;
4449 goto fail_mmapsem;
4450 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
4451 index 5eea6f3..5d10396 100644
4452 --- a/arch/powerpc/lib/usercopy_64.c
4453 +++ b/arch/powerpc/lib/usercopy_64.c
4454 @@ -9,22 +9,6 @@
4455 #include <linux/module.h>
4456 #include <asm/uaccess.h>
4457
4458 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4459 -{
4460 - if (likely(access_ok(VERIFY_READ, from, n)))
4461 - n = __copy_from_user(to, from, n);
4462 - else
4463 - memset(to, 0, n);
4464 - return n;
4465 -}
4466 -
4467 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4468 -{
4469 - if (likely(access_ok(VERIFY_WRITE, to, n)))
4470 - n = __copy_to_user(to, from, n);
4471 - return n;
4472 -}
4473 -
4474 unsigned long copy_in_user(void __user *to, const void __user *from,
4475 unsigned long n)
4476 {
4477 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4478 return n;
4479 }
4480
4481 -EXPORT_SYMBOL(copy_from_user);
4482 -EXPORT_SYMBOL(copy_to_user);
4483 EXPORT_SYMBOL(copy_in_user);
4484
4485 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4486 index 08ffcf5..a0ab912 100644
4487 --- a/arch/powerpc/mm/fault.c
4488 +++ b/arch/powerpc/mm/fault.c
4489 @@ -32,6 +32,10 @@
4490 #include <linux/perf_event.h>
4491 #include <linux/magic.h>
4492 #include <linux/ratelimit.h>
4493 +#include <linux/slab.h>
4494 +#include <linux/pagemap.h>
4495 +#include <linux/compiler.h>
4496 +#include <linux/unistd.h>
4497
4498 #include <asm/firmware.h>
4499 #include <asm/page.h>
4500 @@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4501 }
4502 #endif
4503
4504 +#ifdef CONFIG_PAX_PAGEEXEC
4505 +/*
4506 + * PaX: decide what to do with offenders (regs->nip = fault address)
4507 + *
4508 + * returns 1 when task should be killed
4509 + */
4510 +static int pax_handle_fetch_fault(struct pt_regs *regs)
4511 +{
4512 + return 1;
4513 +}
4514 +
4515 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4516 +{
4517 + unsigned long i;
4518 +
4519 + printk(KERN_ERR "PAX: bytes at PC: ");
4520 + for (i = 0; i < 5; i++) {
4521 + unsigned int c;
4522 + if (get_user(c, (unsigned int __user *)pc+i))
4523 + printk(KERN_CONT "???????? ");
4524 + else
4525 + printk(KERN_CONT "%08x ", c);
4526 + }
4527 + printk("\n");
4528 +}
4529 +#endif
4530 +
4531 /*
4532 * Check whether the instruction at regs->nip is a store using
4533 * an update addressing form which will update r1.
4534 @@ -215,7 +246,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4535 * indicate errors in DSISR but can validly be set in SRR1.
4536 */
4537 if (trap == 0x400)
4538 - error_code &= 0x48200000;
4539 + error_code &= 0x58200000;
4540 else
4541 is_write = error_code & DSISR_ISSTORE;
4542 #else
4543 @@ -366,7 +397,7 @@ good_area:
4544 * "undefined". Of those that can be set, this is the only
4545 * one which seems bad.
4546 */
4547 - if (error_code & 0x10000000)
4548 + if (error_code & DSISR_GUARDED)
4549 /* Guarded storage error. */
4550 goto bad_area;
4551 #endif /* CONFIG_8xx */
4552 @@ -381,7 +412,7 @@ good_area:
4553 * processors use the same I/D cache coherency mechanism
4554 * as embedded.
4555 */
4556 - if (error_code & DSISR_PROTFAULT)
4557 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4558 goto bad_area;
4559 #endif /* CONFIG_PPC_STD_MMU */
4560
4561 @@ -463,6 +494,23 @@ bad_area:
4562 bad_area_nosemaphore:
4563 /* User mode accesses cause a SIGSEGV */
4564 if (user_mode(regs)) {
4565 +
4566 +#ifdef CONFIG_PAX_PAGEEXEC
4567 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4568 +#ifdef CONFIG_PPC_STD_MMU
4569 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4570 +#else
4571 + if (is_exec && regs->nip == address) {
4572 +#endif
4573 + switch (pax_handle_fetch_fault(regs)) {
4574 + }
4575 +
4576 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4577 + do_group_exit(SIGKILL);
4578 + }
4579 + }
4580 +#endif
4581 +
4582 _exception(SIGSEGV, regs, code, address);
4583 return 0;
4584 }
4585 diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4586 index 67a42ed..1c7210c 100644
4587 --- a/arch/powerpc/mm/mmap_64.c
4588 +++ b/arch/powerpc/mm/mmap_64.c
4589 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4590 */
4591 if (mmap_is_legacy()) {
4592 mm->mmap_base = TASK_UNMAPPED_BASE;
4593 +
4594 +#ifdef CONFIG_PAX_RANDMMAP
4595 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4596 + mm->mmap_base += mm->delta_mmap;
4597 +#endif
4598 +
4599 mm->get_unmapped_area = arch_get_unmapped_area;
4600 mm->unmap_area = arch_unmap_area;
4601 } else {
4602 mm->mmap_base = mmap_base();
4603 +
4604 +#ifdef CONFIG_PAX_RANDMMAP
4605 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4606 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4607 +#endif
4608 +
4609 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4610 mm->unmap_area = arch_unmap_area_topdown;
4611 }
4612 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4613 index 73709f7..6b90313 100644
4614 --- a/arch/powerpc/mm/slice.c
4615 +++ b/arch/powerpc/mm/slice.c
4616 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4617 if ((mm->task_size - len) < addr)
4618 return 0;
4619 vma = find_vma(mm, addr);
4620 - return (!vma || (addr + len) <= vma->vm_start);
4621 + return check_heap_stack_gap(vma, addr, len);
4622 }
4623
4624 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4625 @@ -256,7 +256,7 @@ full_search:
4626 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4627 continue;
4628 }
4629 - if (!vma || addr + len <= vma->vm_start) {
4630 + if (check_heap_stack_gap(vma, addr, len)) {
4631 /*
4632 * Remember the place where we stopped the search:
4633 */
4634 @@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4635 }
4636 }
4637
4638 - addr = mm->mmap_base;
4639 - while (addr > len) {
4640 + if (mm->mmap_base < len)
4641 + addr = -ENOMEM;
4642 + else
4643 + addr = mm->mmap_base - len;
4644 +
4645 + while (!IS_ERR_VALUE(addr)) {
4646 /* Go down by chunk size */
4647 - addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4648 + addr = _ALIGN_DOWN(addr, 1ul << pshift);
4649
4650 /* Check for hit with different page size */
4651 mask = slice_range_to_mask(addr, len);
4652 @@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4653 * return with success:
4654 */
4655 vma = find_vma(mm, addr);
4656 - if (!vma || (addr + len) <= vma->vm_start) {
4657 + if (check_heap_stack_gap(vma, addr, len)) {
4658 /* remember the address as a hint for next time */
4659 if (use_cache)
4660 mm->free_area_cache = addr;
4661 @@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4662 mm->cached_hole_size = vma->vm_start - addr;
4663
4664 /* try just below the current vma->vm_start */
4665 - addr = vma->vm_start;
4666 + addr = skip_heap_stack_gap(vma, len);
4667 }
4668
4669 /*
4670 @@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4671 if (fixed && addr > (mm->task_size - len))
4672 return -EINVAL;
4673
4674 +#ifdef CONFIG_PAX_RANDMMAP
4675 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4676 + addr = 0;
4677 +#endif
4678 +
4679 /* If hint, make sure it matches our alignment restrictions */
4680 if (!fixed && addr) {
4681 addr = _ALIGN_UP(addr, 1ul << pshift);
4682 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4683 index 748347b..81bc6c7 100644
4684 --- a/arch/s390/include/asm/atomic.h
4685 +++ b/arch/s390/include/asm/atomic.h
4686 @@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4687 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4688 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4689
4690 +#define atomic64_read_unchecked(v) atomic64_read(v)
4691 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4692 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4693 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4694 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4695 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4696 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4697 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4698 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4699 +
4700 #define smp_mb__before_atomic_dec() smp_mb()
4701 #define smp_mb__after_atomic_dec() smp_mb()
4702 #define smp_mb__before_atomic_inc() smp_mb()
4703 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4704 index 2a30d5a..5e5586f 100644
4705 --- a/arch/s390/include/asm/cache.h
4706 +++ b/arch/s390/include/asm/cache.h
4707 @@ -11,8 +11,10 @@
4708 #ifndef __ARCH_S390_CACHE_H
4709 #define __ARCH_S390_CACHE_H
4710
4711 -#define L1_CACHE_BYTES 256
4712 +#include <linux/const.h>
4713 +
4714 #define L1_CACHE_SHIFT 8
4715 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4716 #define NET_SKB_PAD 32
4717
4718 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4719 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4720 index 06151e6..c08cb52 100644
4721 --- a/arch/s390/include/asm/elf.h
4722 +++ b/arch/s390/include/asm/elf.h
4723 @@ -161,8 +161,14 @@ extern unsigned int vdso_enabled;
4724 the loader. We need to make sure that it is out of the way of the program
4725 that it will "exec", and that there is sufficient room for the brk. */
4726
4727 -extern unsigned long randomize_et_dyn(unsigned long base);
4728 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4729 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4730 +
4731 +#ifdef CONFIG_PAX_ASLR
4732 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4733 +
4734 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4735 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4736 +#endif
4737
4738 /* This yields a mask that user programs can use to figure out what
4739 instruction set this CPU supports. */
4740 @@ -210,7 +216,4 @@ struct linux_binprm;
4741 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4742 int arch_setup_additional_pages(struct linux_binprm *, int);
4743
4744 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4745 -#define arch_randomize_brk arch_randomize_brk
4746 -
4747 #endif
4748 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
4749 index c4a93d6..4d2a9b4 100644
4750 --- a/arch/s390/include/asm/exec.h
4751 +++ b/arch/s390/include/asm/exec.h
4752 @@ -7,6 +7,6 @@
4753 #ifndef __ASM_EXEC_H
4754 #define __ASM_EXEC_H
4755
4756 -extern unsigned long arch_align_stack(unsigned long sp);
4757 +#define arch_align_stack(x) ((x) & ~0xfUL)
4758
4759 #endif /* __ASM_EXEC_H */
4760 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4761 index 1f3a79b..44d7f9c 100644
4762 --- a/arch/s390/include/asm/uaccess.h
4763 +++ b/arch/s390/include/asm/uaccess.h
4764 @@ -241,6 +241,10 @@ static inline unsigned long __must_check
4765 copy_to_user(void __user *to, const void *from, unsigned long n)
4766 {
4767 might_fault();
4768 +
4769 + if ((long)n < 0)
4770 + return n;
4771 +
4772 if (access_ok(VERIFY_WRITE, to, n))
4773 n = __copy_to_user(to, from, n);
4774 return n;
4775 @@ -266,6 +270,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4776 static inline unsigned long __must_check
4777 __copy_from_user(void *to, const void __user *from, unsigned long n)
4778 {
4779 + if ((long)n < 0)
4780 + return n;
4781 +
4782 if (__builtin_constant_p(n) && (n <= 256))
4783 return uaccess.copy_from_user_small(n, from, to);
4784 else
4785 @@ -297,10 +304,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
4786 static inline unsigned long __must_check
4787 copy_from_user(void *to, const void __user *from, unsigned long n)
4788 {
4789 - unsigned int sz = __compiletime_object_size(to);
4790 + size_t sz = __compiletime_object_size(to);
4791
4792 might_fault();
4793 - if (unlikely(sz != -1 && sz < n)) {
4794 +
4795 + if ((long)n < 0)
4796 + return n;
4797 +
4798 + if (unlikely(sz != (size_t)-1 && sz < n)) {
4799 copy_from_user_overflow();
4800 return n;
4801 }
4802 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4803 index dfcb343..eda788a 100644
4804 --- a/arch/s390/kernel/module.c
4805 +++ b/arch/s390/kernel/module.c
4806 @@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4807
4808 /* Increase core size by size of got & plt and set start
4809 offsets for got and plt. */
4810 - me->core_size = ALIGN(me->core_size, 4);
4811 - me->arch.got_offset = me->core_size;
4812 - me->core_size += me->arch.got_size;
4813 - me->arch.plt_offset = me->core_size;
4814 - me->core_size += me->arch.plt_size;
4815 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
4816 + me->arch.got_offset = me->core_size_rw;
4817 + me->core_size_rw += me->arch.got_size;
4818 + me->arch.plt_offset = me->core_size_rx;
4819 + me->core_size_rx += me->arch.plt_size;
4820 return 0;
4821 }
4822
4823 @@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4824 if (info->got_initialized == 0) {
4825 Elf_Addr *gotent;
4826
4827 - gotent = me->module_core + me->arch.got_offset +
4828 + gotent = me->module_core_rw + me->arch.got_offset +
4829 info->got_offset;
4830 *gotent = val;
4831 info->got_initialized = 1;
4832 @@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4833 else if (r_type == R_390_GOTENT ||
4834 r_type == R_390_GOTPLTENT)
4835 *(unsigned int *) loc =
4836 - (val + (Elf_Addr) me->module_core - loc) >> 1;
4837 + (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4838 else if (r_type == R_390_GOT64 ||
4839 r_type == R_390_GOTPLT64)
4840 *(unsigned long *) loc = val;
4841 @@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4842 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4843 if (info->plt_initialized == 0) {
4844 unsigned int *ip;
4845 - ip = me->module_core + me->arch.plt_offset +
4846 + ip = me->module_core_rx + me->arch.plt_offset +
4847 info->plt_offset;
4848 #ifndef CONFIG_64BIT
4849 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4850 @@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4851 val - loc + 0xffffUL < 0x1ffffeUL) ||
4852 (r_type == R_390_PLT32DBL &&
4853 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4854 - val = (Elf_Addr) me->module_core +
4855 + val = (Elf_Addr) me->module_core_rx +
4856 me->arch.plt_offset +
4857 info->plt_offset;
4858 val += rela->r_addend - loc;
4859 @@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4860 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4861 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4862 val = val + rela->r_addend -
4863 - ((Elf_Addr) me->module_core + me->arch.got_offset);
4864 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4865 if (r_type == R_390_GOTOFF16)
4866 *(unsigned short *) loc = val;
4867 else if (r_type == R_390_GOTOFF32)
4868 @@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4869 break;
4870 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4871 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4872 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
4873 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4874 rela->r_addend - loc;
4875 if (r_type == R_390_GOTPC)
4876 *(unsigned int *) loc = val;
4877 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4878 index 60055ce..ee4b252 100644
4879 --- a/arch/s390/kernel/process.c
4880 +++ b/arch/s390/kernel/process.c
4881 @@ -316,39 +316,3 @@ unsigned long get_wchan(struct task_struct *p)
4882 }
4883 return 0;
4884 }
4885 -
4886 -unsigned long arch_align_stack(unsigned long sp)
4887 -{
4888 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4889 - sp -= get_random_int() & ~PAGE_MASK;
4890 - return sp & ~0xf;
4891 -}
4892 -
4893 -static inline unsigned long brk_rnd(void)
4894 -{
4895 - /* 8MB for 32bit, 1GB for 64bit */
4896 - if (is_32bit_task())
4897 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4898 - else
4899 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4900 -}
4901 -
4902 -unsigned long arch_randomize_brk(struct mm_struct *mm)
4903 -{
4904 - unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4905 -
4906 - if (ret < mm->brk)
4907 - return mm->brk;
4908 - return ret;
4909 -}
4910 -
4911 -unsigned long randomize_et_dyn(unsigned long base)
4912 -{
4913 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4914 -
4915 - if (!(current->flags & PF_RANDOMIZE))
4916 - return base;
4917 - if (ret < base)
4918 - return base;
4919 - return ret;
4920 -}
4921 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4922 index a64fe53..5c66963 100644
4923 --- a/arch/s390/mm/mmap.c
4924 +++ b/arch/s390/mm/mmap.c
4925 @@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4926 */
4927 if (mmap_is_legacy()) {
4928 mm->mmap_base = TASK_UNMAPPED_BASE;
4929 +
4930 +#ifdef CONFIG_PAX_RANDMMAP
4931 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4932 + mm->mmap_base += mm->delta_mmap;
4933 +#endif
4934 +
4935 mm->get_unmapped_area = arch_get_unmapped_area;
4936 mm->unmap_area = arch_unmap_area;
4937 } else {
4938 mm->mmap_base = mmap_base();
4939 +
4940 +#ifdef CONFIG_PAX_RANDMMAP
4941 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4942 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4943 +#endif
4944 +
4945 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4946 mm->unmap_area = arch_unmap_area_topdown;
4947 }
4948 @@ -174,10 +186,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4949 */
4950 if (mmap_is_legacy()) {
4951 mm->mmap_base = TASK_UNMAPPED_BASE;
4952 +
4953 +#ifdef CONFIG_PAX_RANDMMAP
4954 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4955 + mm->mmap_base += mm->delta_mmap;
4956 +#endif
4957 +
4958 mm->get_unmapped_area = s390_get_unmapped_area;
4959 mm->unmap_area = arch_unmap_area;
4960 } else {
4961 mm->mmap_base = mmap_base();
4962 +
4963 +#ifdef CONFIG_PAX_RANDMMAP
4964 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4965 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4966 +#endif
4967 +
4968 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4969 mm->unmap_area = arch_unmap_area_topdown;
4970 }
4971 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4972 index ae3d59f..f65f075 100644
4973 --- a/arch/score/include/asm/cache.h
4974 +++ b/arch/score/include/asm/cache.h
4975 @@ -1,7 +1,9 @@
4976 #ifndef _ASM_SCORE_CACHE_H
4977 #define _ASM_SCORE_CACHE_H
4978
4979 +#include <linux/const.h>
4980 +
4981 #define L1_CACHE_SHIFT 4
4982 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4983 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4984
4985 #endif /* _ASM_SCORE_CACHE_H */
4986 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
4987 index f9f3cd5..58ff438 100644
4988 --- a/arch/score/include/asm/exec.h
4989 +++ b/arch/score/include/asm/exec.h
4990 @@ -1,6 +1,6 @@
4991 #ifndef _ASM_SCORE_EXEC_H
4992 #define _ASM_SCORE_EXEC_H
4993
4994 -extern unsigned long arch_align_stack(unsigned long sp);
4995 +#define arch_align_stack(x) (x)
4996
4997 #endif /* _ASM_SCORE_EXEC_H */
4998 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4999 index 2707023..1c2a3b7 100644
5000 --- a/arch/score/kernel/process.c
5001 +++ b/arch/score/kernel/process.c
5002 @@ -159,8 +159,3 @@ unsigned long get_wchan(struct task_struct *task)
5003
5004 return task_pt_regs(task)->cp0_epc;
5005 }
5006 -
5007 -unsigned long arch_align_stack(unsigned long sp)
5008 -{
5009 - return sp;
5010 -}
5011 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
5012 index ef9e555..331bd29 100644
5013 --- a/arch/sh/include/asm/cache.h
5014 +++ b/arch/sh/include/asm/cache.h
5015 @@ -9,10 +9,11 @@
5016 #define __ASM_SH_CACHE_H
5017 #ifdef __KERNEL__
5018
5019 +#include <linux/const.h>
5020 #include <linux/init.h>
5021 #include <cpu/cache.h>
5022
5023 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5024 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5025
5026 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5027
5028 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
5029 index afeb710..d1d1289 100644
5030 --- a/arch/sh/mm/mmap.c
5031 +++ b/arch/sh/mm/mmap.c
5032 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
5033 addr = PAGE_ALIGN(addr);
5034
5035 vma = find_vma(mm, addr);
5036 - if (TASK_SIZE - len >= addr &&
5037 - (!vma || addr + len <= vma->vm_start))
5038 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
5039 return addr;
5040 }
5041
5042 @@ -106,7 +105,7 @@ full_search:
5043 }
5044 return -ENOMEM;
5045 }
5046 - if (likely(!vma || addr + len <= vma->vm_start)) {
5047 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5048 /*
5049 * Remember the place where we stopped the search:
5050 */
5051 @@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5052 addr = PAGE_ALIGN(addr);
5053
5054 vma = find_vma(mm, addr);
5055 - if (TASK_SIZE - len >= addr &&
5056 - (!vma || addr + len <= vma->vm_start))
5057 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
5058 return addr;
5059 }
5060
5061 @@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5062 /* make sure it can fit in the remaining address space */
5063 if (likely(addr > len)) {
5064 vma = find_vma(mm, addr-len);
5065 - if (!vma || addr <= vma->vm_start) {
5066 + if (check_heap_stack_gap(vma, addr - len, len)) {
5067 /* remember the address as a hint for next time */
5068 return (mm->free_area_cache = addr-len);
5069 }
5070 @@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5071 if (unlikely(mm->mmap_base < len))
5072 goto bottomup;
5073
5074 - addr = mm->mmap_base-len;
5075 - if (do_colour_align)
5076 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5077 + addr = mm->mmap_base - len;
5078
5079 do {
5080 + if (do_colour_align)
5081 + addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5082 /*
5083 * Lookup failure means no vma is above this address,
5084 * else if new region fits below vma->vm_start,
5085 * return with success:
5086 */
5087 vma = find_vma(mm, addr);
5088 - if (likely(!vma || addr+len <= vma->vm_start)) {
5089 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5090 /* remember the address as a hint for next time */
5091 return (mm->free_area_cache = addr);
5092 }
5093 @@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5094 mm->cached_hole_size = vma->vm_start - addr;
5095
5096 /* try just below the current vma->vm_start */
5097 - addr = vma->vm_start-len;
5098 - if (do_colour_align)
5099 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5100 - } while (likely(len < vma->vm_start));
5101 + addr = skip_heap_stack_gap(vma, len);
5102 + } while (!IS_ERR_VALUE(addr));
5103
5104 bottomup:
5105 /*
5106 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
5107 index ce35a1c..2e7b8f9 100644
5108 --- a/arch/sparc/include/asm/atomic_64.h
5109 +++ b/arch/sparc/include/asm/atomic_64.h
5110 @@ -14,18 +14,40 @@
5111 #define ATOMIC64_INIT(i) { (i) }
5112
5113 #define atomic_read(v) (*(volatile int *)&(v)->counter)
5114 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5115 +{
5116 + return v->counter;
5117 +}
5118 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
5119 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
5120 +{
5121 + return v->counter;
5122 +}
5123
5124 #define atomic_set(v, i) (((v)->counter) = i)
5125 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5126 +{
5127 + v->counter = i;
5128 +}
5129 #define atomic64_set(v, i) (((v)->counter) = i)
5130 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
5131 +{
5132 + v->counter = i;
5133 +}
5134
5135 extern void atomic_add(int, atomic_t *);
5136 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
5137 extern void atomic64_add(long, atomic64_t *);
5138 +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
5139 extern void atomic_sub(int, atomic_t *);
5140 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
5141 extern void atomic64_sub(long, atomic64_t *);
5142 +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
5143
5144 extern int atomic_add_ret(int, atomic_t *);
5145 +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
5146 extern long atomic64_add_ret(long, atomic64_t *);
5147 +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
5148 extern int atomic_sub_ret(int, atomic_t *);
5149 extern long atomic64_sub_ret(long, atomic64_t *);
5150
5151 @@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
5152 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
5153
5154 #define atomic_inc_return(v) atomic_add_ret(1, v)
5155 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5156 +{
5157 + return atomic_add_ret_unchecked(1, v);
5158 +}
5159 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
5160 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
5161 +{
5162 + return atomic64_add_ret_unchecked(1, v);
5163 +}
5164
5165 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
5166 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
5167
5168 #define atomic_add_return(i, v) atomic_add_ret(i, v)
5169 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5170 +{
5171 + return atomic_add_ret_unchecked(i, v);
5172 +}
5173 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
5174 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
5175 +{
5176 + return atomic64_add_ret_unchecked(i, v);
5177 +}
5178
5179 /*
5180 * atomic_inc_and_test - increment and test
5181 @@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
5182 * other cases.
5183 */
5184 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5185 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5186 +{
5187 + return atomic_inc_return_unchecked(v) == 0;
5188 +}
5189 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
5190
5191 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
5192 @@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
5193 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
5194
5195 #define atomic_inc(v) atomic_add(1, v)
5196 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
5197 +{
5198 + atomic_add_unchecked(1, v);
5199 +}
5200 #define atomic64_inc(v) atomic64_add(1, v)
5201 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
5202 +{
5203 + atomic64_add_unchecked(1, v);
5204 +}
5205
5206 #define atomic_dec(v) atomic_sub(1, v)
5207 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
5208 +{
5209 + atomic_sub_unchecked(1, v);
5210 +}
5211 #define atomic64_dec(v) atomic64_sub(1, v)
5212 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
5213 +{
5214 + atomic64_sub_unchecked(1, v);
5215 +}
5216
5217 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
5218 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
5219
5220 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5221 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
5222 +{
5223 + return cmpxchg(&v->counter, old, new);
5224 +}
5225 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
5226 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5227 +{
5228 + return xchg(&v->counter, new);
5229 +}
5230
5231 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
5232 {
5233 - int c, old;
5234 + int c, old, new;
5235 c = atomic_read(v);
5236 for (;;) {
5237 - if (unlikely(c == (u)))
5238 + if (unlikely(c == u))
5239 break;
5240 - old = atomic_cmpxchg((v), c, c + (a));
5241 +
5242 + asm volatile("addcc %2, %0, %0\n"
5243 +
5244 +#ifdef CONFIG_PAX_REFCOUNT
5245 + "tvs %%icc, 6\n"
5246 +#endif
5247 +
5248 + : "=r" (new)
5249 + : "0" (c), "ir" (a)
5250 + : "cc");
5251 +
5252 + old = atomic_cmpxchg(v, c, new);
5253 if (likely(old == c))
5254 break;
5255 c = old;
5256 @@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
5257 #define atomic64_cmpxchg(v, o, n) \
5258 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
5259 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
5260 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
5261 +{
5262 + return xchg(&v->counter, new);
5263 +}
5264
5265 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
5266 {
5267 - long c, old;
5268 + long c, old, new;
5269 c = atomic64_read(v);
5270 for (;;) {
5271 - if (unlikely(c == (u)))
5272 + if (unlikely(c == u))
5273 break;
5274 - old = atomic64_cmpxchg((v), c, c + (a));
5275 +
5276 + asm volatile("addcc %2, %0, %0\n"
5277 +
5278 +#ifdef CONFIG_PAX_REFCOUNT
5279 + "tvs %%xcc, 6\n"
5280 +#endif
5281 +
5282 + : "=r" (new)
5283 + : "0" (c), "ir" (a)
5284 + : "cc");
5285 +
5286 + old = atomic64_cmpxchg(v, c, new);
5287 if (likely(old == c))
5288 break;
5289 c = old;
5290 }
5291 - return c != (u);
5292 + return c != u;
5293 }
5294
5295 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
5296 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
5297 index 5bb6991..5c2132e 100644
5298 --- a/arch/sparc/include/asm/cache.h
5299 +++ b/arch/sparc/include/asm/cache.h
5300 @@ -7,10 +7,12 @@
5301 #ifndef _SPARC_CACHE_H
5302 #define _SPARC_CACHE_H
5303
5304 +#include <linux/const.h>
5305 +
5306 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
5307
5308 #define L1_CACHE_SHIFT 5
5309 -#define L1_CACHE_BYTES 32
5310 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5311
5312 #ifdef CONFIG_SPARC32
5313 #define SMP_CACHE_BYTES_SHIFT 5
5314 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
5315 index 2d4d755..81b6662 100644
5316 --- a/arch/sparc/include/asm/elf_32.h
5317 +++ b/arch/sparc/include/asm/elf_32.h
5318 @@ -114,6 +114,13 @@ typedef struct {
5319
5320 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
5321
5322 +#ifdef CONFIG_PAX_ASLR
5323 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
5324 +
5325 +#define PAX_DELTA_MMAP_LEN 16
5326 +#define PAX_DELTA_STACK_LEN 16
5327 +#endif
5328 +
5329 /* This yields a mask that user programs can use to figure out what
5330 instruction set this cpu supports. This can NOT be done in userspace
5331 on Sparc. */
5332 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
5333 index 7df8b7f..4946269 100644
5334 --- a/arch/sparc/include/asm/elf_64.h
5335 +++ b/arch/sparc/include/asm/elf_64.h
5336 @@ -180,6 +180,13 @@ typedef struct {
5337 #define ELF_ET_DYN_BASE 0x0000010000000000UL
5338 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
5339
5340 +#ifdef CONFIG_PAX_ASLR
5341 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
5342 +
5343 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
5344 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
5345 +#endif
5346 +
5347 extern unsigned long sparc64_elf_hwcap;
5348 #define ELF_HWCAP sparc64_elf_hwcap
5349
5350 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
5351 index e5b169b46..e90b4fa 100644
5352 --- a/arch/sparc/include/asm/pgalloc_32.h
5353 +++ b/arch/sparc/include/asm/pgalloc_32.h
5354 @@ -46,6 +46,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
5355 }
5356
5357 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
5358 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
5359
5360 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
5361 unsigned long address)
5362 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
5363 index 40b2d7a..22a665b 100644
5364 --- a/arch/sparc/include/asm/pgalloc_64.h
5365 +++ b/arch/sparc/include/asm/pgalloc_64.h
5366 @@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
5367 }
5368
5369 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
5370 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
5371
5372 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5373 {
5374 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
5375 index cbbbed5..0983069 100644
5376 --- a/arch/sparc/include/asm/pgtable_32.h
5377 +++ b/arch/sparc/include/asm/pgtable_32.h
5378 @@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
5379 #define PAGE_SHARED SRMMU_PAGE_SHARED
5380 #define PAGE_COPY SRMMU_PAGE_COPY
5381 #define PAGE_READONLY SRMMU_PAGE_RDONLY
5382 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
5383 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
5384 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
5385 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
5386
5387 /* Top-level page directory */
5388 @@ -61,18 +64,18 @@ extern unsigned long ptr_in_current_pgd;
5389
5390 /* xwr */
5391 #define __P000 PAGE_NONE
5392 -#define __P001 PAGE_READONLY
5393 -#define __P010 PAGE_COPY
5394 -#define __P011 PAGE_COPY
5395 +#define __P001 PAGE_READONLY_NOEXEC
5396 +#define __P010 PAGE_COPY_NOEXEC
5397 +#define __P011 PAGE_COPY_NOEXEC
5398 #define __P100 PAGE_READONLY
5399 #define __P101 PAGE_READONLY
5400 #define __P110 PAGE_COPY
5401 #define __P111 PAGE_COPY
5402
5403 #define __S000 PAGE_NONE
5404 -#define __S001 PAGE_READONLY
5405 -#define __S010 PAGE_SHARED
5406 -#define __S011 PAGE_SHARED
5407 +#define __S001 PAGE_READONLY_NOEXEC
5408 +#define __S010 PAGE_SHARE_NOEXEC
5409 +#define __S011 PAGE_SHARE_NOEXEC
5410 #define __S100 PAGE_READONLY
5411 #define __S101 PAGE_READONLY
5412 #define __S110 PAGE_SHARED
5413 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
5414 index 79da178..c2eede8 100644
5415 --- a/arch/sparc/include/asm/pgtsrmmu.h
5416 +++ b/arch/sparc/include/asm/pgtsrmmu.h
5417 @@ -115,6 +115,11 @@
5418 SRMMU_EXEC | SRMMU_REF)
5419 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
5420 SRMMU_EXEC | SRMMU_REF)
5421 +
5422 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
5423 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
5424 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
5425 +
5426 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
5427 SRMMU_DIRTY | SRMMU_REF)
5428
5429 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
5430 index 9689176..63c18ea 100644
5431 --- a/arch/sparc/include/asm/spinlock_64.h
5432 +++ b/arch/sparc/include/asm/spinlock_64.h
5433 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
5434
5435 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
5436
5437 -static void inline arch_read_lock(arch_rwlock_t *lock)
5438 +static inline void arch_read_lock(arch_rwlock_t *lock)
5439 {
5440 unsigned long tmp1, tmp2;
5441
5442 __asm__ __volatile__ (
5443 "1: ldsw [%2], %0\n"
5444 " brlz,pn %0, 2f\n"
5445 -"4: add %0, 1, %1\n"
5446 +"4: addcc %0, 1, %1\n"
5447 +
5448 +#ifdef CONFIG_PAX_REFCOUNT
5449 +" tvs %%icc, 6\n"
5450 +#endif
5451 +
5452 " cas [%2], %0, %1\n"
5453 " cmp %0, %1\n"
5454 " bne,pn %%icc, 1b\n"
5455 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5456 " .previous"
5457 : "=&r" (tmp1), "=&r" (tmp2)
5458 : "r" (lock)
5459 - : "memory");
5460 + : "memory", "cc");
5461 }
5462
5463 -static int inline arch_read_trylock(arch_rwlock_t *lock)
5464 +static inline int arch_read_trylock(arch_rwlock_t *lock)
5465 {
5466 int tmp1, tmp2;
5467
5468 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5469 "1: ldsw [%2], %0\n"
5470 " brlz,a,pn %0, 2f\n"
5471 " mov 0, %0\n"
5472 -" add %0, 1, %1\n"
5473 +" addcc %0, 1, %1\n"
5474 +
5475 +#ifdef CONFIG_PAX_REFCOUNT
5476 +" tvs %%icc, 6\n"
5477 +#endif
5478 +
5479 " cas [%2], %0, %1\n"
5480 " cmp %0, %1\n"
5481 " bne,pn %%icc, 1b\n"
5482 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5483 return tmp1;
5484 }
5485
5486 -static void inline arch_read_unlock(arch_rwlock_t *lock)
5487 +static inline void arch_read_unlock(arch_rwlock_t *lock)
5488 {
5489 unsigned long tmp1, tmp2;
5490
5491 __asm__ __volatile__(
5492 "1: lduw [%2], %0\n"
5493 -" sub %0, 1, %1\n"
5494 +" subcc %0, 1, %1\n"
5495 +
5496 +#ifdef CONFIG_PAX_REFCOUNT
5497 +" tvs %%icc, 6\n"
5498 +#endif
5499 +
5500 " cas [%2], %0, %1\n"
5501 " cmp %0, %1\n"
5502 " bne,pn %%xcc, 1b\n"
5503 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5504 : "memory");
5505 }
5506
5507 -static void inline arch_write_lock(arch_rwlock_t *lock)
5508 +static inline void arch_write_lock(arch_rwlock_t *lock)
5509 {
5510 unsigned long mask, tmp1, tmp2;
5511
5512 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5513 : "memory");
5514 }
5515
5516 -static void inline arch_write_unlock(arch_rwlock_t *lock)
5517 +static inline void arch_write_unlock(arch_rwlock_t *lock)
5518 {
5519 __asm__ __volatile__(
5520 " stw %%g0, [%0]"
5521 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5522 : "memory");
5523 }
5524
5525 -static int inline arch_write_trylock(arch_rwlock_t *lock)
5526 +static inline int arch_write_trylock(arch_rwlock_t *lock)
5527 {
5528 unsigned long mask, tmp1, tmp2, result;
5529
5530 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5531 index e6cd224..3a71793 100644
5532 --- a/arch/sparc/include/asm/thread_info_32.h
5533 +++ b/arch/sparc/include/asm/thread_info_32.h
5534 @@ -49,6 +49,8 @@ struct thread_info {
5535 unsigned long w_saved;
5536
5537 struct restart_block restart_block;
5538 +
5539 + unsigned long lowest_stack;
5540 };
5541
5542 /*
5543 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5544 index cfa8c38..13f30d3 100644
5545 --- a/arch/sparc/include/asm/thread_info_64.h
5546 +++ b/arch/sparc/include/asm/thread_info_64.h
5547 @@ -63,6 +63,8 @@ struct thread_info {
5548 struct pt_regs *kern_una_regs;
5549 unsigned int kern_una_insn;
5550
5551 + unsigned long lowest_stack;
5552 +
5553 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5554 };
5555
5556 @@ -193,10 +195,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
5557 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
5558 /* flag bit 6 is available */
5559 #define TIF_32BIT 7 /* 32-bit binary */
5560 -/* flag bit 8 is available */
5561 +#define TIF_GRSEC_SETXID 8 /* update credentials on syscall entry/exit */
5562 #define TIF_SECCOMP 9 /* secure computing */
5563 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
5564 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
5565 +
5566 /* NOTE: Thread flags >= 12 should be ones we have no interest
5567 * in using in assembly, else we can't use the mask as
5568 * an immediate value in instructions such as andcc.
5569 @@ -215,12 +218,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
5570 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
5571 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
5572 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
5573 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
5574
5575 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
5576 _TIF_DO_NOTIFY_RESUME_MASK | \
5577 _TIF_NEED_RESCHED)
5578 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
5579
5580 +#define _TIF_WORK_SYSCALL \
5581 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
5582 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
5583 +
5584 +
5585 /*
5586 * Thread-synchronous status.
5587 *
5588 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5589 index 0167d26..9acd8ed 100644
5590 --- a/arch/sparc/include/asm/uaccess.h
5591 +++ b/arch/sparc/include/asm/uaccess.h
5592 @@ -1,5 +1,13 @@
5593 #ifndef ___ASM_SPARC_UACCESS_H
5594 #define ___ASM_SPARC_UACCESS_H
5595 +
5596 +#ifdef __KERNEL__
5597 +#ifndef __ASSEMBLY__
5598 +#include <linux/types.h>
5599 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
5600 +#endif
5601 +#endif
5602 +
5603 #if defined(__sparc__) && defined(__arch64__)
5604 #include <asm/uaccess_64.h>
5605 #else
5606 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5607 index 53a28dd..50c38c3 100644
5608 --- a/arch/sparc/include/asm/uaccess_32.h
5609 +++ b/arch/sparc/include/asm/uaccess_32.h
5610 @@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5611
5612 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5613 {
5614 - if (n && __access_ok((unsigned long) to, n))
5615 + if ((long)n < 0)
5616 + return n;
5617 +
5618 + if (n && __access_ok((unsigned long) to, n)) {
5619 + if (!__builtin_constant_p(n))
5620 + check_object_size(from, n, true);
5621 return __copy_user(to, (__force void __user *) from, n);
5622 - else
5623 + } else
5624 return n;
5625 }
5626
5627 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5628 {
5629 + if ((long)n < 0)
5630 + return n;
5631 +
5632 + if (!__builtin_constant_p(n))
5633 + check_object_size(from, n, true);
5634 +
5635 return __copy_user(to, (__force void __user *) from, n);
5636 }
5637
5638 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5639 {
5640 - if (n && __access_ok((unsigned long) from, n))
5641 + if ((long)n < 0)
5642 + return n;
5643 +
5644 + if (n && __access_ok((unsigned long) from, n)) {
5645 + if (!__builtin_constant_p(n))
5646 + check_object_size(to, n, false);
5647 return __copy_user((__force void __user *) to, from, n);
5648 - else
5649 + } else
5650 return n;
5651 }
5652
5653 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5654 {
5655 + if ((long)n < 0)
5656 + return n;
5657 +
5658 return __copy_user((__force void __user *) to, from, n);
5659 }
5660
5661 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5662 index 7c831d8..d440ca7 100644
5663 --- a/arch/sparc/include/asm/uaccess_64.h
5664 +++ b/arch/sparc/include/asm/uaccess_64.h
5665 @@ -10,6 +10,7 @@
5666 #include <linux/compiler.h>
5667 #include <linux/string.h>
5668 #include <linux/thread_info.h>
5669 +#include <linux/kernel.h>
5670 #include <asm/asi.h>
5671 #include <asm/spitfire.h>
5672 #include <asm-generic/uaccess-unaligned.h>
5673 @@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5674 static inline unsigned long __must_check
5675 copy_from_user(void *to, const void __user *from, unsigned long size)
5676 {
5677 - unsigned long ret = ___copy_from_user(to, from, size);
5678 + unsigned long ret;
5679
5680 + if ((long)size < 0 || size > INT_MAX)
5681 + return size;
5682 +
5683 + if (!__builtin_constant_p(size))
5684 + check_object_size(to, size, false);
5685 +
5686 + ret = ___copy_from_user(to, from, size);
5687 if (unlikely(ret))
5688 ret = copy_from_user_fixup(to, from, size);
5689
5690 @@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5691 static inline unsigned long __must_check
5692 copy_to_user(void __user *to, const void *from, unsigned long size)
5693 {
5694 - unsigned long ret = ___copy_to_user(to, from, size);
5695 + unsigned long ret;
5696
5697 + if ((long)size < 0 || size > INT_MAX)
5698 + return size;
5699 +
5700 + if (!__builtin_constant_p(size))
5701 + check_object_size(from, size, true);
5702 +
5703 + ret = ___copy_to_user(to, from, size);
5704 if (unlikely(ret))
5705 ret = copy_to_user_fixup(to, from, size);
5706 return ret;
5707 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5708 index 6cf591b..b49e65a 100644
5709 --- a/arch/sparc/kernel/Makefile
5710 +++ b/arch/sparc/kernel/Makefile
5711 @@ -3,7 +3,7 @@
5712 #
5713
5714 asflags-y := -ansi
5715 -ccflags-y := -Werror
5716 +#ccflags-y := -Werror
5717
5718 extra-y := head_$(BITS).o
5719
5720 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5721 index cb36e82..1c1462f 100644
5722 --- a/arch/sparc/kernel/process_32.c
5723 +++ b/arch/sparc/kernel/process_32.c
5724 @@ -126,14 +126,14 @@ void show_regs(struct pt_regs *r)
5725
5726 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5727 r->psr, r->pc, r->npc, r->y, print_tainted());
5728 - printk("PC: <%pS>\n", (void *) r->pc);
5729 + printk("PC: <%pA>\n", (void *) r->pc);
5730 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5731 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5732 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5733 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5734 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5735 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5736 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5737 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5738
5739 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5740 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5741 @@ -168,7 +168,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5742 rw = (struct reg_window32 *) fp;
5743 pc = rw->ins[7];
5744 printk("[%08lx : ", pc);
5745 - printk("%pS ] ", (void *) pc);
5746 + printk("%pA ] ", (void *) pc);
5747 fp = rw->ins[6];
5748 } while (++count < 16);
5749 printk("\n");
5750 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5751 index aff0c72..9067b39 100644
5752 --- a/arch/sparc/kernel/process_64.c
5753 +++ b/arch/sparc/kernel/process_64.c
5754 @@ -179,14 +179,14 @@ static void show_regwindow(struct pt_regs *regs)
5755 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5756 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5757 if (regs->tstate & TSTATE_PRIV)
5758 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5759 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5760 }
5761
5762 void show_regs(struct pt_regs *regs)
5763 {
5764 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5765 regs->tpc, regs->tnpc, regs->y, print_tainted());
5766 - printk("TPC: <%pS>\n", (void *) regs->tpc);
5767 + printk("TPC: <%pA>\n", (void *) regs->tpc);
5768 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5769 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5770 regs->u_regs[3]);
5771 @@ -199,7 +199,7 @@ void show_regs(struct pt_regs *regs)
5772 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5773 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5774 regs->u_regs[15]);
5775 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5776 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5777 show_regwindow(regs);
5778 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5779 }
5780 @@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void)
5781 ((tp && tp->task) ? tp->task->pid : -1));
5782
5783 if (gp->tstate & TSTATE_PRIV) {
5784 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5785 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5786 (void *) gp->tpc,
5787 (void *) gp->o7,
5788 (void *) gp->i7,
5789 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
5790 index 484daba..0674139 100644
5791 --- a/arch/sparc/kernel/ptrace_64.c
5792 +++ b/arch/sparc/kernel/ptrace_64.c
5793 @@ -1057,6 +1057,10 @@ long arch_ptrace(struct task_struct *child, long request,
5794 return ret;
5795 }
5796
5797 +#ifdef CONFIG_GRKERNSEC_SETXID
5798 +extern void gr_delayed_cred_worker(void);
5799 +#endif
5800 +
5801 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
5802 {
5803 int ret = 0;
5804 @@ -1064,6 +1068,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
5805 /* do the secure computing check first */
5806 secure_computing_strict(regs->u_regs[UREG_G1]);
5807
5808 +#ifdef CONFIG_GRKERNSEC_SETXID
5809 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
5810 + gr_delayed_cred_worker();
5811 +#endif
5812 +
5813 if (test_thread_flag(TIF_SYSCALL_TRACE))
5814 ret = tracehook_report_syscall_entry(regs);
5815
5816 @@ -1084,6 +1093,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
5817
5818 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
5819 {
5820 +#ifdef CONFIG_GRKERNSEC_SETXID
5821 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
5822 + gr_delayed_cred_worker();
5823 +#endif
5824 +
5825 audit_syscall_exit(regs);
5826
5827 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
5828 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5829 index 0c9b31b..7cb7aee 100644
5830 --- a/arch/sparc/kernel/sys_sparc_32.c
5831 +++ b/arch/sparc/kernel/sys_sparc_32.c
5832 @@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5833 if (len > TASK_SIZE - PAGE_SIZE)
5834 return -ENOMEM;
5835 if (!addr)
5836 - addr = TASK_UNMAPPED_BASE;
5837 + addr = current->mm->mmap_base;
5838
5839 if (flags & MAP_SHARED)
5840 addr = COLOUR_ALIGN(addr);
5841 @@ -65,7 +65,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5842 /* At this point: (!vmm || addr < vmm->vm_end). */
5843 if (TASK_SIZE - PAGE_SIZE - len < addr)
5844 return -ENOMEM;
5845 - if (!vmm || addr + len <= vmm->vm_start)
5846 + if (check_heap_stack_gap(vmm, addr, len))
5847 return addr;
5848 addr = vmm->vm_end;
5849 if (flags & MAP_SHARED)
5850 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5851 index 275f74f..81bf5b8 100644
5852 --- a/arch/sparc/kernel/sys_sparc_64.c
5853 +++ b/arch/sparc/kernel/sys_sparc_64.c
5854 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5855 /* We do not accept a shared mapping if it would violate
5856 * cache aliasing constraints.
5857 */
5858 - if ((flags & MAP_SHARED) &&
5859 + if ((filp || (flags & MAP_SHARED)) &&
5860 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5861 return -EINVAL;
5862 return addr;
5863 @@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5864 if (filp || (flags & MAP_SHARED))
5865 do_color_align = 1;
5866
5867 +#ifdef CONFIG_PAX_RANDMMAP
5868 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5869 +#endif
5870 +
5871 if (addr) {
5872 if (do_color_align)
5873 addr = COLOUR_ALIGN(addr, pgoff);
5874 @@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5875 addr = PAGE_ALIGN(addr);
5876
5877 vma = find_vma(mm, addr);
5878 - if (task_size - len >= addr &&
5879 - (!vma || addr + len <= vma->vm_start))
5880 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5881 return addr;
5882 }
5883
5884 if (len > mm->cached_hole_size) {
5885 - start_addr = addr = mm->free_area_cache;
5886 + start_addr = addr = mm->free_area_cache;
5887 } else {
5888 - start_addr = addr = TASK_UNMAPPED_BASE;
5889 + start_addr = addr = mm->mmap_base;
5890 mm->cached_hole_size = 0;
5891 }
5892
5893 @@ -174,14 +177,14 @@ full_search:
5894 vma = find_vma(mm, VA_EXCLUDE_END);
5895 }
5896 if (unlikely(task_size < addr)) {
5897 - if (start_addr != TASK_UNMAPPED_BASE) {
5898 - start_addr = addr = TASK_UNMAPPED_BASE;
5899 + if (start_addr != mm->mmap_base) {
5900 + start_addr = addr = mm->mmap_base;
5901 mm->cached_hole_size = 0;
5902 goto full_search;
5903 }
5904 return -ENOMEM;
5905 }
5906 - if (likely(!vma || addr + len <= vma->vm_start)) {
5907 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5908 /*
5909 * Remember the place where we stopped the search:
5910 */
5911 @@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5912 /* We do not accept a shared mapping if it would violate
5913 * cache aliasing constraints.
5914 */
5915 - if ((flags & MAP_SHARED) &&
5916 + if ((filp || (flags & MAP_SHARED)) &&
5917 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5918 return -EINVAL;
5919 return addr;
5920 @@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5921 addr = PAGE_ALIGN(addr);
5922
5923 vma = find_vma(mm, addr);
5924 - if (task_size - len >= addr &&
5925 - (!vma || addr + len <= vma->vm_start))
5926 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5927 return addr;
5928 }
5929
5930 @@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5931 /* make sure it can fit in the remaining address space */
5932 if (likely(addr > len)) {
5933 vma = find_vma(mm, addr-len);
5934 - if (!vma || addr <= vma->vm_start) {
5935 + if (check_heap_stack_gap(vma, addr - len, len)) {
5936 /* remember the address as a hint for next time */
5937 return (mm->free_area_cache = addr-len);
5938 }
5939 @@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5940 if (unlikely(mm->mmap_base < len))
5941 goto bottomup;
5942
5943 - addr = mm->mmap_base-len;
5944 - if (do_color_align)
5945 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5946 + addr = mm->mmap_base - len;
5947
5948 do {
5949 + if (do_color_align)
5950 + addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5951 /*
5952 * Lookup failure means no vma is above this address,
5953 * else if new region fits below vma->vm_start,
5954 * return with success:
5955 */
5956 vma = find_vma(mm, addr);
5957 - if (likely(!vma || addr+len <= vma->vm_start)) {
5958 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5959 /* remember the address as a hint for next time */
5960 return (mm->free_area_cache = addr);
5961 }
5962 @@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5963 mm->cached_hole_size = vma->vm_start - addr;
5964
5965 /* try just below the current vma->vm_start */
5966 - addr = vma->vm_start-len;
5967 - if (do_color_align)
5968 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5969 - } while (likely(len < vma->vm_start));
5970 + addr = skip_heap_stack_gap(vma, len);
5971 + } while (!IS_ERR_VALUE(addr));
5972
5973 bottomup:
5974 /*
5975 @@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5976 gap == RLIM_INFINITY ||
5977 sysctl_legacy_va_layout) {
5978 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5979 +
5980 +#ifdef CONFIG_PAX_RANDMMAP
5981 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5982 + mm->mmap_base += mm->delta_mmap;
5983 +#endif
5984 +
5985 mm->get_unmapped_area = arch_get_unmapped_area;
5986 mm->unmap_area = arch_unmap_area;
5987 } else {
5988 @@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5989 gap = (task_size / 6 * 5);
5990
5991 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5992 +
5993 +#ifdef CONFIG_PAX_RANDMMAP
5994 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5995 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5996 +#endif
5997 +
5998 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5999 mm->unmap_area = arch_unmap_area_topdown;
6000 }
6001 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
6002 index 1d7e274..b39c527 100644
6003 --- a/arch/sparc/kernel/syscalls.S
6004 +++ b/arch/sparc/kernel/syscalls.S
6005 @@ -62,7 +62,7 @@ sys32_rt_sigreturn:
6006 #endif
6007 .align 32
6008 1: ldx [%g6 + TI_FLAGS], %l5
6009 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6010 + andcc %l5, _TIF_WORK_SYSCALL, %g0
6011 be,pt %icc, rtrap
6012 nop
6013 call syscall_trace_leave
6014 @@ -179,7 +179,7 @@ linux_sparc_syscall32:
6015
6016 srl %i5, 0, %o5 ! IEU1
6017 srl %i2, 0, %o2 ! IEU0 Group
6018 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6019 + andcc %l0, _TIF_WORK_SYSCALL, %g0
6020 bne,pn %icc, linux_syscall_trace32 ! CTI
6021 mov %i0, %l5 ! IEU1
6022 call %l7 ! CTI Group brk forced
6023 @@ -202,7 +202,7 @@ linux_sparc_syscall:
6024
6025 mov %i3, %o3 ! IEU1
6026 mov %i4, %o4 ! IEU0 Group
6027 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6028 + andcc %l0, _TIF_WORK_SYSCALL, %g0
6029 bne,pn %icc, linux_syscall_trace ! CTI Group
6030 mov %i0, %l5 ! IEU0
6031 2: call %l7 ! CTI Group brk forced
6032 @@ -226,7 +226,7 @@ ret_sys_call:
6033
6034 cmp %o0, -ERESTART_RESTARTBLOCK
6035 bgeu,pn %xcc, 1f
6036 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6
6037 + andcc %l0, _TIF_WORK_SYSCALL, %l6
6038 80:
6039 /* System call success, clear Carry condition code. */
6040 andn %g3, %g2, %g3
6041 @@ -241,7 +241,7 @@ ret_sys_call:
6042 /* System call failure, set Carry condition code.
6043 * Also, get abs(errno) to return to the process.
6044 */
6045 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6
6046 + andcc %l0, _TIF_WORK_SYSCALL, %l6
6047 sub %g0, %o0, %o0
6048 or %g3, %g2, %g3
6049 stx %o0, [%sp + PTREGS_OFF + PT_V9_I0]
6050 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
6051 index a5785ea..405c5f7 100644
6052 --- a/arch/sparc/kernel/traps_32.c
6053 +++ b/arch/sparc/kernel/traps_32.c
6054 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
6055 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
6056 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
6057
6058 +extern void gr_handle_kernel_exploit(void);
6059 +
6060 void die_if_kernel(char *str, struct pt_regs *regs)
6061 {
6062 static int die_counter;
6063 @@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
6064 count++ < 30 &&
6065 (((unsigned long) rw) >= PAGE_OFFSET) &&
6066 !(((unsigned long) rw) & 0x7)) {
6067 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
6068 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
6069 (void *) rw->ins[7]);
6070 rw = (struct reg_window32 *)rw->ins[6];
6071 }
6072 }
6073 printk("Instruction DUMP:");
6074 instruction_dump ((unsigned long *) regs->pc);
6075 - if(regs->psr & PSR_PS)
6076 + if(regs->psr & PSR_PS) {
6077 + gr_handle_kernel_exploit();
6078 do_exit(SIGKILL);
6079 + }
6080 do_exit(SIGSEGV);
6081 }
6082
6083 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
6084 index 3b05e66..6ea2917 100644
6085 --- a/arch/sparc/kernel/traps_64.c
6086 +++ b/arch/sparc/kernel/traps_64.c
6087 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
6088 i + 1,
6089 p->trapstack[i].tstate, p->trapstack[i].tpc,
6090 p->trapstack[i].tnpc, p->trapstack[i].tt);
6091 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
6092 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
6093 }
6094 }
6095
6096 @@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
6097
6098 lvl -= 0x100;
6099 if (regs->tstate & TSTATE_PRIV) {
6100 +
6101 +#ifdef CONFIG_PAX_REFCOUNT
6102 + if (lvl == 6)
6103 + pax_report_refcount_overflow(regs);
6104 +#endif
6105 +
6106 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
6107 die_if_kernel(buffer, regs);
6108 }
6109 @@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
6110 void bad_trap_tl1(struct pt_regs *regs, long lvl)
6111 {
6112 char buffer[32];
6113 -
6114 +
6115 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
6116 0, lvl, SIGTRAP) == NOTIFY_STOP)
6117 return;
6118
6119 +#ifdef CONFIG_PAX_REFCOUNT
6120 + if (lvl == 6)
6121 + pax_report_refcount_overflow(regs);
6122 +#endif
6123 +
6124 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
6125
6126 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
6127 @@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
6128 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
6129 printk("%s" "ERROR(%d): ",
6130 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
6131 - printk("TPC<%pS>\n", (void *) regs->tpc);
6132 + printk("TPC<%pA>\n", (void *) regs->tpc);
6133 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
6134 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
6135 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
6136 @@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
6137 smp_processor_id(),
6138 (type & 0x1) ? 'I' : 'D',
6139 regs->tpc);
6140 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
6141 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
6142 panic("Irrecoverable Cheetah+ parity error.");
6143 }
6144
6145 @@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
6146 smp_processor_id(),
6147 (type & 0x1) ? 'I' : 'D',
6148 regs->tpc);
6149 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
6150 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
6151 }
6152
6153 struct sun4v_error_entry {
6154 @@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
6155
6156 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
6157 regs->tpc, tl);
6158 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
6159 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
6160 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
6161 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
6162 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
6163 (void *) regs->u_regs[UREG_I7]);
6164 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
6165 "pte[%lx] error[%lx]\n",
6166 @@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
6167
6168 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
6169 regs->tpc, tl);
6170 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
6171 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
6172 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
6173 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
6174 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
6175 (void *) regs->u_regs[UREG_I7]);
6176 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
6177 "pte[%lx] error[%lx]\n",
6178 @@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
6179 fp = (unsigned long)sf->fp + STACK_BIAS;
6180 }
6181
6182 - printk(" [%016lx] %pS\n", pc, (void *) pc);
6183 + printk(" [%016lx] %pA\n", pc, (void *) pc);
6184 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
6185 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
6186 int index = tsk->curr_ret_stack;
6187 if (tsk->ret_stack && index >= graph) {
6188 pc = tsk->ret_stack[index - graph].ret;
6189 - printk(" [%016lx] %pS\n", pc, (void *) pc);
6190 + printk(" [%016lx] %pA\n", pc, (void *) pc);
6191 graph++;
6192 }
6193 }
6194 @@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
6195 return (struct reg_window *) (fp + STACK_BIAS);
6196 }
6197
6198 +extern void gr_handle_kernel_exploit(void);
6199 +
6200 void die_if_kernel(char *str, struct pt_regs *regs)
6201 {
6202 static int die_counter;
6203 @@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
6204 while (rw &&
6205 count++ < 30 &&
6206 kstack_valid(tp, (unsigned long) rw)) {
6207 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
6208 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
6209 (void *) rw->ins[7]);
6210
6211 rw = kernel_stack_up(rw);
6212 @@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
6213 }
6214 user_instruction_dump ((unsigned int __user *) regs->tpc);
6215 }
6216 - if (regs->tstate & TSTATE_PRIV)
6217 + if (regs->tstate & TSTATE_PRIV) {
6218 + gr_handle_kernel_exploit();
6219 do_exit(SIGKILL);
6220 + }
6221 do_exit(SIGSEGV);
6222 }
6223 EXPORT_SYMBOL(die_if_kernel);
6224 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
6225 index f81d038..e7a4680 100644
6226 --- a/arch/sparc/kernel/unaligned_64.c
6227 +++ b/arch/sparc/kernel/unaligned_64.c
6228 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs *regs)
6229 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
6230
6231 if (__ratelimit(&ratelimit)) {
6232 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
6233 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
6234 regs->tpc, (void *) regs->tpc);
6235 }
6236 }
6237 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
6238 index dff4096..bd9a388 100644
6239 --- a/arch/sparc/lib/Makefile
6240 +++ b/arch/sparc/lib/Makefile
6241 @@ -2,7 +2,7 @@
6242 #
6243
6244 asflags-y := -ansi -DST_DIV0=0x02
6245 -ccflags-y := -Werror
6246 +#ccflags-y := -Werror
6247
6248 lib-$(CONFIG_SPARC32) += ashrdi3.o
6249 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
6250 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
6251 index 4d502da..527c48d 100644
6252 --- a/arch/sparc/lib/atomic_64.S
6253 +++ b/arch/sparc/lib/atomic_64.S
6254 @@ -17,7 +17,12 @@
6255 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
6256 BACKOFF_SETUP(%o2)
6257 1: lduw [%o1], %g1
6258 - add %g1, %o0, %g7
6259 + addcc %g1, %o0, %g7
6260 +
6261 +#ifdef CONFIG_PAX_REFCOUNT
6262 + tvs %icc, 6
6263 +#endif
6264 +
6265 cas [%o1], %g1, %g7
6266 cmp %g1, %g7
6267 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6268 @@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
6269 2: BACKOFF_SPIN(%o2, %o3, 1b)
6270 ENDPROC(atomic_add)
6271
6272 +ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6273 + BACKOFF_SETUP(%o2)
6274 +1: lduw [%o1], %g1
6275 + add %g1, %o0, %g7
6276 + cas [%o1], %g1, %g7
6277 + cmp %g1, %g7
6278 + bne,pn %icc, 2f
6279 + nop
6280 + retl
6281 + nop
6282 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6283 +ENDPROC(atomic_add_unchecked)
6284 +
6285 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6286 BACKOFF_SETUP(%o2)
6287 1: lduw [%o1], %g1
6288 - sub %g1, %o0, %g7
6289 + subcc %g1, %o0, %g7
6290 +
6291 +#ifdef CONFIG_PAX_REFCOUNT
6292 + tvs %icc, 6
6293 +#endif
6294 +
6295 cas [%o1], %g1, %g7
6296 cmp %g1, %g7
6297 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6298 @@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6299 2: BACKOFF_SPIN(%o2, %o3, 1b)
6300 ENDPROC(atomic_sub)
6301
6302 +ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
6303 + BACKOFF_SETUP(%o2)
6304 +1: lduw [%o1], %g1
6305 + sub %g1, %o0, %g7
6306 + cas [%o1], %g1, %g7
6307 + cmp %g1, %g7
6308 + bne,pn %icc, 2f
6309 + nop
6310 + retl
6311 + nop
6312 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6313 +ENDPROC(atomic_sub_unchecked)
6314 +
6315 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6316 BACKOFF_SETUP(%o2)
6317 1: lduw [%o1], %g1
6318 - add %g1, %o0, %g7
6319 + addcc %g1, %o0, %g7
6320 +
6321 +#ifdef CONFIG_PAX_REFCOUNT
6322 + tvs %icc, 6
6323 +#endif
6324 +
6325 cas [%o1], %g1, %g7
6326 cmp %g1, %g7
6327 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6328 @@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6329 2: BACKOFF_SPIN(%o2, %o3, 1b)
6330 ENDPROC(atomic_add_ret)
6331
6332 +ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6333 + BACKOFF_SETUP(%o2)
6334 +1: lduw [%o1], %g1
6335 + addcc %g1, %o0, %g7
6336 + cas [%o1], %g1, %g7
6337 + cmp %g1, %g7
6338 + bne,pn %icc, 2f
6339 + add %g7, %o0, %g7
6340 + sra %g7, 0, %o0
6341 + retl
6342 + nop
6343 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6344 +ENDPROC(atomic_add_ret_unchecked)
6345 +
6346 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
6347 BACKOFF_SETUP(%o2)
6348 1: lduw [%o1], %g1
6349 - sub %g1, %o0, %g7
6350 + subcc %g1, %o0, %g7
6351 +
6352 +#ifdef CONFIG_PAX_REFCOUNT
6353 + tvs %icc, 6
6354 +#endif
6355 +
6356 cas [%o1], %g1, %g7
6357 cmp %g1, %g7
6358 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6359 @@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
6360 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
6361 BACKOFF_SETUP(%o2)
6362 1: ldx [%o1], %g1
6363 - add %g1, %o0, %g7
6364 + addcc %g1, %o0, %g7
6365 +
6366 +#ifdef CONFIG_PAX_REFCOUNT
6367 + tvs %xcc, 6
6368 +#endif
6369 +
6370 casx [%o1], %g1, %g7
6371 cmp %g1, %g7
6372 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6373 @@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
6374 2: BACKOFF_SPIN(%o2, %o3, 1b)
6375 ENDPROC(atomic64_add)
6376
6377 +ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6378 + BACKOFF_SETUP(%o2)
6379 +1: ldx [%o1], %g1
6380 + addcc %g1, %o0, %g7
6381 + casx [%o1], %g1, %g7
6382 + cmp %g1, %g7
6383 + bne,pn %xcc, 2f
6384 + nop
6385 + retl
6386 + nop
6387 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6388 +ENDPROC(atomic64_add_unchecked)
6389 +
6390 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6391 BACKOFF_SETUP(%o2)
6392 1: ldx [%o1], %g1
6393 - sub %g1, %o0, %g7
6394 + subcc %g1, %o0, %g7
6395 +
6396 +#ifdef CONFIG_PAX_REFCOUNT
6397 + tvs %xcc, 6
6398 +#endif
6399 +
6400 casx [%o1], %g1, %g7
6401 cmp %g1, %g7
6402 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6403 @@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6404 2: BACKOFF_SPIN(%o2, %o3, 1b)
6405 ENDPROC(atomic64_sub)
6406
6407 +ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
6408 + BACKOFF_SETUP(%o2)
6409 +1: ldx [%o1], %g1
6410 + subcc %g1, %o0, %g7
6411 + casx [%o1], %g1, %g7
6412 + cmp %g1, %g7
6413 + bne,pn %xcc, 2f
6414 + nop
6415 + retl
6416 + nop
6417 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6418 +ENDPROC(atomic64_sub_unchecked)
6419 +
6420 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6421 BACKOFF_SETUP(%o2)
6422 1: ldx [%o1], %g1
6423 - add %g1, %o0, %g7
6424 + addcc %g1, %o0, %g7
6425 +
6426 +#ifdef CONFIG_PAX_REFCOUNT
6427 + tvs %xcc, 6
6428 +#endif
6429 +
6430 casx [%o1], %g1, %g7
6431 cmp %g1, %g7
6432 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6433 @@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6434 2: BACKOFF_SPIN(%o2, %o3, 1b)
6435 ENDPROC(atomic64_add_ret)
6436
6437 +ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6438 + BACKOFF_SETUP(%o2)
6439 +1: ldx [%o1], %g1
6440 + addcc %g1, %o0, %g7
6441 + casx [%o1], %g1, %g7
6442 + cmp %g1, %g7
6443 + bne,pn %xcc, 2f
6444 + add %g7, %o0, %g7
6445 + mov %g7, %o0
6446 + retl
6447 + nop
6448 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6449 +ENDPROC(atomic64_add_ret_unchecked)
6450 +
6451 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
6452 BACKOFF_SETUP(%o2)
6453 1: ldx [%o1], %g1
6454 - sub %g1, %o0, %g7
6455 + subcc %g1, %o0, %g7
6456 +
6457 +#ifdef CONFIG_PAX_REFCOUNT
6458 + tvs %xcc, 6
6459 +#endif
6460 +
6461 casx [%o1], %g1, %g7
6462 cmp %g1, %g7
6463 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6464 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
6465 index 3b31218..345c609 100644
6466 --- a/arch/sparc/lib/ksyms.c
6467 +++ b/arch/sparc/lib/ksyms.c
6468 @@ -109,12 +109,18 @@ EXPORT_SYMBOL(__downgrade_write);
6469
6470 /* Atomic counter implementation. */
6471 EXPORT_SYMBOL(atomic_add);
6472 +EXPORT_SYMBOL(atomic_add_unchecked);
6473 EXPORT_SYMBOL(atomic_add_ret);
6474 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
6475 EXPORT_SYMBOL(atomic_sub);
6476 +EXPORT_SYMBOL(atomic_sub_unchecked);
6477 EXPORT_SYMBOL(atomic_sub_ret);
6478 EXPORT_SYMBOL(atomic64_add);
6479 +EXPORT_SYMBOL(atomic64_add_unchecked);
6480 EXPORT_SYMBOL(atomic64_add_ret);
6481 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
6482 EXPORT_SYMBOL(atomic64_sub);
6483 +EXPORT_SYMBOL(atomic64_sub_unchecked);
6484 EXPORT_SYMBOL(atomic64_sub_ret);
6485
6486 /* Atomic bit operations. */
6487 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
6488 index 30c3ecc..736f015 100644
6489 --- a/arch/sparc/mm/Makefile
6490 +++ b/arch/sparc/mm/Makefile
6491 @@ -2,7 +2,7 @@
6492 #
6493
6494 asflags-y := -ansi
6495 -ccflags-y := -Werror
6496 +#ccflags-y := -Werror
6497
6498 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
6499 obj-y += fault_$(BITS).o
6500 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
6501 index f46cf6b..cc0666bae 100644
6502 --- a/arch/sparc/mm/fault_32.c
6503 +++ b/arch/sparc/mm/fault_32.c
6504 @@ -21,6 +21,9 @@
6505 #include <linux/perf_event.h>
6506 #include <linux/interrupt.h>
6507 #include <linux/kdebug.h>
6508 +#include <linux/slab.h>
6509 +#include <linux/pagemap.h>
6510 +#include <linux/compiler.h>
6511
6512 #include <asm/page.h>
6513 #include <asm/pgtable.h>
6514 @@ -177,6 +180,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
6515 return safe_compute_effective_address(regs, insn);
6516 }
6517
6518 +#ifdef CONFIG_PAX_PAGEEXEC
6519 +#ifdef CONFIG_PAX_DLRESOLVE
6520 +static void pax_emuplt_close(struct vm_area_struct *vma)
6521 +{
6522 + vma->vm_mm->call_dl_resolve = 0UL;
6523 +}
6524 +
6525 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6526 +{
6527 + unsigned int *kaddr;
6528 +
6529 + vmf->page = alloc_page(GFP_HIGHUSER);
6530 + if (!vmf->page)
6531 + return VM_FAULT_OOM;
6532 +
6533 + kaddr = kmap(vmf->page);
6534 + memset(kaddr, 0, PAGE_SIZE);
6535 + kaddr[0] = 0x9DE3BFA8U; /* save */
6536 + flush_dcache_page(vmf->page);
6537 + kunmap(vmf->page);
6538 + return VM_FAULT_MAJOR;
6539 +}
6540 +
6541 +static const struct vm_operations_struct pax_vm_ops = {
6542 + .close = pax_emuplt_close,
6543 + .fault = pax_emuplt_fault
6544 +};
6545 +
6546 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6547 +{
6548 + int ret;
6549 +
6550 + INIT_LIST_HEAD(&vma->anon_vma_chain);
6551 + vma->vm_mm = current->mm;
6552 + vma->vm_start = addr;
6553 + vma->vm_end = addr + PAGE_SIZE;
6554 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6555 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6556 + vma->vm_ops = &pax_vm_ops;
6557 +
6558 + ret = insert_vm_struct(current->mm, vma);
6559 + if (ret)
6560 + return ret;
6561 +
6562 + ++current->mm->total_vm;
6563 + return 0;
6564 +}
6565 +#endif
6566 +
6567 +/*
6568 + * PaX: decide what to do with offenders (regs->pc = fault address)
6569 + *
6570 + * returns 1 when task should be killed
6571 + * 2 when patched PLT trampoline was detected
6572 + * 3 when unpatched PLT trampoline was detected
6573 + */
6574 +static int pax_handle_fetch_fault(struct pt_regs *regs)
6575 +{
6576 +
6577 +#ifdef CONFIG_PAX_EMUPLT
6578 + int err;
6579 +
6580 + do { /* PaX: patched PLT emulation #1 */
6581 + unsigned int sethi1, sethi2, jmpl;
6582 +
6583 + err = get_user(sethi1, (unsigned int *)regs->pc);
6584 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6585 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6586 +
6587 + if (err)
6588 + break;
6589 +
6590 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6591 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
6592 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
6593 + {
6594 + unsigned int addr;
6595 +
6596 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6597 + addr = regs->u_regs[UREG_G1];
6598 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6599 + regs->pc = addr;
6600 + regs->npc = addr+4;
6601 + return 2;
6602 + }
6603 + } while (0);
6604 +
6605 + do { /* PaX: patched PLT emulation #2 */
6606 + unsigned int ba;
6607 +
6608 + err = get_user(ba, (unsigned int *)regs->pc);
6609 +
6610 + if (err)
6611 + break;
6612 +
6613 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
6614 + unsigned int addr;
6615 +
6616 + if ((ba & 0xFFC00000U) == 0x30800000U)
6617 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6618 + else
6619 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6620 + regs->pc = addr;
6621 + regs->npc = addr+4;
6622 + return 2;
6623 + }
6624 + } while (0);
6625 +
6626 + do { /* PaX: patched PLT emulation #3 */
6627 + unsigned int sethi, bajmpl, nop;
6628 +
6629 + err = get_user(sethi, (unsigned int *)regs->pc);
6630 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
6631 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
6632 +
6633 + if (err)
6634 + break;
6635 +
6636 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6637 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
6638 + nop == 0x01000000U)
6639 + {
6640 + unsigned int addr;
6641 +
6642 + addr = (sethi & 0x003FFFFFU) << 10;
6643 + regs->u_regs[UREG_G1] = addr;
6644 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
6645 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6646 + else
6647 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6648 + regs->pc = addr;
6649 + regs->npc = addr+4;
6650 + return 2;
6651 + }
6652 + } while (0);
6653 +
6654 + do { /* PaX: unpatched PLT emulation step 1 */
6655 + unsigned int sethi, ba, nop;
6656 +
6657 + err = get_user(sethi, (unsigned int *)regs->pc);
6658 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
6659 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
6660 +
6661 + if (err)
6662 + break;
6663 +
6664 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6665 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6666 + nop == 0x01000000U)
6667 + {
6668 + unsigned int addr, save, call;
6669 +
6670 + if ((ba & 0xFFC00000U) == 0x30800000U)
6671 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6672 + else
6673 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6674 +
6675 + err = get_user(save, (unsigned int *)addr);
6676 + err |= get_user(call, (unsigned int *)(addr+4));
6677 + err |= get_user(nop, (unsigned int *)(addr+8));
6678 + if (err)
6679 + break;
6680 +
6681 +#ifdef CONFIG_PAX_DLRESOLVE
6682 + if (save == 0x9DE3BFA8U &&
6683 + (call & 0xC0000000U) == 0x40000000U &&
6684 + nop == 0x01000000U)
6685 + {
6686 + struct vm_area_struct *vma;
6687 + unsigned long call_dl_resolve;
6688 +
6689 + down_read(&current->mm->mmap_sem);
6690 + call_dl_resolve = current->mm->call_dl_resolve;
6691 + up_read(&current->mm->mmap_sem);
6692 + if (likely(call_dl_resolve))
6693 + goto emulate;
6694 +
6695 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6696 +
6697 + down_write(&current->mm->mmap_sem);
6698 + if (current->mm->call_dl_resolve) {
6699 + call_dl_resolve = current->mm->call_dl_resolve;
6700 + up_write(&current->mm->mmap_sem);
6701 + if (vma)
6702 + kmem_cache_free(vm_area_cachep, vma);
6703 + goto emulate;
6704 + }
6705 +
6706 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6707 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6708 + up_write(&current->mm->mmap_sem);
6709 + if (vma)
6710 + kmem_cache_free(vm_area_cachep, vma);
6711 + return 1;
6712 + }
6713 +
6714 + if (pax_insert_vma(vma, call_dl_resolve)) {
6715 + up_write(&current->mm->mmap_sem);
6716 + kmem_cache_free(vm_area_cachep, vma);
6717 + return 1;
6718 + }
6719 +
6720 + current->mm->call_dl_resolve = call_dl_resolve;
6721 + up_write(&current->mm->mmap_sem);
6722 +
6723 +emulate:
6724 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6725 + regs->pc = call_dl_resolve;
6726 + regs->npc = addr+4;
6727 + return 3;
6728 + }
6729 +#endif
6730 +
6731 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6732 + if ((save & 0xFFC00000U) == 0x05000000U &&
6733 + (call & 0xFFFFE000U) == 0x85C0A000U &&
6734 + nop == 0x01000000U)
6735 + {
6736 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6737 + regs->u_regs[UREG_G2] = addr + 4;
6738 + addr = (save & 0x003FFFFFU) << 10;
6739 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6740 + regs->pc = addr;
6741 + regs->npc = addr+4;
6742 + return 3;
6743 + }
6744 + }
6745 + } while (0);
6746 +
6747 + do { /* PaX: unpatched PLT emulation step 2 */
6748 + unsigned int save, call, nop;
6749 +
6750 + err = get_user(save, (unsigned int *)(regs->pc-4));
6751 + err |= get_user(call, (unsigned int *)regs->pc);
6752 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
6753 + if (err)
6754 + break;
6755 +
6756 + if (save == 0x9DE3BFA8U &&
6757 + (call & 0xC0000000U) == 0x40000000U &&
6758 + nop == 0x01000000U)
6759 + {
6760 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6761 +
6762 + regs->u_regs[UREG_RETPC] = regs->pc;
6763 + regs->pc = dl_resolve;
6764 + regs->npc = dl_resolve+4;
6765 + return 3;
6766 + }
6767 + } while (0);
6768 +#endif
6769 +
6770 + return 1;
6771 +}
6772 +
6773 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6774 +{
6775 + unsigned long i;
6776 +
6777 + printk(KERN_ERR "PAX: bytes at PC: ");
6778 + for (i = 0; i < 8; i++) {
6779 + unsigned int c;
6780 + if (get_user(c, (unsigned int *)pc+i))
6781 + printk(KERN_CONT "???????? ");
6782 + else
6783 + printk(KERN_CONT "%08x ", c);
6784 + }
6785 + printk("\n");
6786 +}
6787 +#endif
6788 +
6789 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6790 int text_fault)
6791 {
6792 @@ -248,6 +522,24 @@ good_area:
6793 if (!(vma->vm_flags & VM_WRITE))
6794 goto bad_area;
6795 } else {
6796 +
6797 +#ifdef CONFIG_PAX_PAGEEXEC
6798 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6799 + up_read(&mm->mmap_sem);
6800 + switch (pax_handle_fetch_fault(regs)) {
6801 +
6802 +#ifdef CONFIG_PAX_EMUPLT
6803 + case 2:
6804 + case 3:
6805 + return;
6806 +#endif
6807 +
6808 + }
6809 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6810 + do_group_exit(SIGKILL);
6811 + }
6812 +#endif
6813 +
6814 /* Allow reads even for write-only mappings */
6815 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
6816 goto bad_area;
6817 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6818 index 1fe0429..8dd5dd5 100644
6819 --- a/arch/sparc/mm/fault_64.c
6820 +++ b/arch/sparc/mm/fault_64.c
6821 @@ -21,6 +21,9 @@
6822 #include <linux/kprobes.h>
6823 #include <linux/kdebug.h>
6824 #include <linux/percpu.h>
6825 +#include <linux/slab.h>
6826 +#include <linux/pagemap.h>
6827 +#include <linux/compiler.h>
6828
6829 #include <asm/page.h>
6830 #include <asm/pgtable.h>
6831 @@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6832 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6833 regs->tpc);
6834 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6835 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6836 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6837 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6838 dump_stack();
6839 unhandled_fault(regs->tpc, current, regs);
6840 @@ -272,6 +275,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6841 show_regs(regs);
6842 }
6843
6844 +#ifdef CONFIG_PAX_PAGEEXEC
6845 +#ifdef CONFIG_PAX_DLRESOLVE
6846 +static void pax_emuplt_close(struct vm_area_struct *vma)
6847 +{
6848 + vma->vm_mm->call_dl_resolve = 0UL;
6849 +}
6850 +
6851 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6852 +{
6853 + unsigned int *kaddr;
6854 +
6855 + vmf->page = alloc_page(GFP_HIGHUSER);
6856 + if (!vmf->page)
6857 + return VM_FAULT_OOM;
6858 +
6859 + kaddr = kmap(vmf->page);
6860 + memset(kaddr, 0, PAGE_SIZE);
6861 + kaddr[0] = 0x9DE3BFA8U; /* save */
6862 + flush_dcache_page(vmf->page);
6863 + kunmap(vmf->page);
6864 + return VM_FAULT_MAJOR;
6865 +}
6866 +
6867 +static const struct vm_operations_struct pax_vm_ops = {
6868 + .close = pax_emuplt_close,
6869 + .fault = pax_emuplt_fault
6870 +};
6871 +
6872 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6873 +{
6874 + int ret;
6875 +
6876 + INIT_LIST_HEAD(&vma->anon_vma_chain);
6877 + vma->vm_mm = current->mm;
6878 + vma->vm_start = addr;
6879 + vma->vm_end = addr + PAGE_SIZE;
6880 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6881 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6882 + vma->vm_ops = &pax_vm_ops;
6883 +
6884 + ret = insert_vm_struct(current->mm, vma);
6885 + if (ret)
6886 + return ret;
6887 +
6888 + ++current->mm->total_vm;
6889 + return 0;
6890 +}
6891 +#endif
6892 +
6893 +/*
6894 + * PaX: decide what to do with offenders (regs->tpc = fault address)
6895 + *
6896 + * returns 1 when task should be killed
6897 + * 2 when patched PLT trampoline was detected
6898 + * 3 when unpatched PLT trampoline was detected
6899 + */
6900 +static int pax_handle_fetch_fault(struct pt_regs *regs)
6901 +{
6902 +
6903 +#ifdef CONFIG_PAX_EMUPLT
6904 + int err;
6905 +
6906 + do { /* PaX: patched PLT emulation #1 */
6907 + unsigned int sethi1, sethi2, jmpl;
6908 +
6909 + err = get_user(sethi1, (unsigned int *)regs->tpc);
6910 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6911 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6912 +
6913 + if (err)
6914 + break;
6915 +
6916 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6917 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
6918 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
6919 + {
6920 + unsigned long addr;
6921 +
6922 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6923 + addr = regs->u_regs[UREG_G1];
6924 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6925 +
6926 + if (test_thread_flag(TIF_32BIT))
6927 + addr &= 0xFFFFFFFFUL;
6928 +
6929 + regs->tpc = addr;
6930 + regs->tnpc = addr+4;
6931 + return 2;
6932 + }
6933 + } while (0);
6934 +
6935 + do { /* PaX: patched PLT emulation #2 */
6936 + unsigned int ba;
6937 +
6938 + err = get_user(ba, (unsigned int *)regs->tpc);
6939 +
6940 + if (err)
6941 + break;
6942 +
6943 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
6944 + unsigned long addr;
6945 +
6946 + if ((ba & 0xFFC00000U) == 0x30800000U)
6947 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6948 + else
6949 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6950 +
6951 + if (test_thread_flag(TIF_32BIT))
6952 + addr &= 0xFFFFFFFFUL;
6953 +
6954 + regs->tpc = addr;
6955 + regs->tnpc = addr+4;
6956 + return 2;
6957 + }
6958 + } while (0);
6959 +
6960 + do { /* PaX: patched PLT emulation #3 */
6961 + unsigned int sethi, bajmpl, nop;
6962 +
6963 + err = get_user(sethi, (unsigned int *)regs->tpc);
6964 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
6965 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6966 +
6967 + if (err)
6968 + break;
6969 +
6970 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6971 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
6972 + nop == 0x01000000U)
6973 + {
6974 + unsigned long addr;
6975 +
6976 + addr = (sethi & 0x003FFFFFU) << 10;
6977 + regs->u_regs[UREG_G1] = addr;
6978 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
6979 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6980 + else
6981 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6982 +
6983 + if (test_thread_flag(TIF_32BIT))
6984 + addr &= 0xFFFFFFFFUL;
6985 +
6986 + regs->tpc = addr;
6987 + regs->tnpc = addr+4;
6988 + return 2;
6989 + }
6990 + } while (0);
6991 +
6992 + do { /* PaX: patched PLT emulation #4 */
6993 + unsigned int sethi, mov1, call, mov2;
6994 +
6995 + err = get_user(sethi, (unsigned int *)regs->tpc);
6996 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6997 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
6998 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6999 +
7000 + if (err)
7001 + break;
7002 +
7003 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7004 + mov1 == 0x8210000FU &&
7005 + (call & 0xC0000000U) == 0x40000000U &&
7006 + mov2 == 0x9E100001U)
7007 + {
7008 + unsigned long addr;
7009 +
7010 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
7011 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
7012 +
7013 + if (test_thread_flag(TIF_32BIT))
7014 + addr &= 0xFFFFFFFFUL;
7015 +
7016 + regs->tpc = addr;
7017 + regs->tnpc = addr+4;
7018 + return 2;
7019 + }
7020 + } while (0);
7021 +
7022 + do { /* PaX: patched PLT emulation #5 */
7023 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
7024 +
7025 + err = get_user(sethi, (unsigned int *)regs->tpc);
7026 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
7027 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
7028 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
7029 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
7030 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
7031 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
7032 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
7033 +
7034 + if (err)
7035 + break;
7036 +
7037 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7038 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
7039 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
7040 + (or1 & 0xFFFFE000U) == 0x82106000U &&
7041 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
7042 + sllx == 0x83287020U &&
7043 + jmpl == 0x81C04005U &&
7044 + nop == 0x01000000U)
7045 + {
7046 + unsigned long addr;
7047 +
7048 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
7049 + regs->u_regs[UREG_G1] <<= 32;
7050 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
7051 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
7052 + regs->tpc = addr;
7053 + regs->tnpc = addr+4;
7054 + return 2;
7055 + }
7056 + } while (0);
7057 +
7058 + do { /* PaX: patched PLT emulation #6 */
7059 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
7060 +
7061 + err = get_user(sethi, (unsigned int *)regs->tpc);
7062 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
7063 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
7064 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
7065 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
7066 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
7067 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
7068 +
7069 + if (err)
7070 + break;
7071 +
7072 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7073 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
7074 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
7075 + sllx == 0x83287020U &&
7076 + (or & 0xFFFFE000U) == 0x8A116000U &&
7077 + jmpl == 0x81C04005U &&
7078 + nop == 0x01000000U)
7079 + {
7080 + unsigned long addr;
7081 +
7082 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
7083 + regs->u_regs[UREG_G1] <<= 32;
7084 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
7085 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
7086 + regs->tpc = addr;
7087 + regs->tnpc = addr+4;
7088 + return 2;
7089 + }
7090 + } while (0);
7091 +
7092 + do { /* PaX: unpatched PLT emulation step 1 */
7093 + unsigned int sethi, ba, nop;
7094 +
7095 + err = get_user(sethi, (unsigned int *)regs->tpc);
7096 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
7097 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
7098 +
7099 + if (err)
7100 + break;
7101 +
7102 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7103 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
7104 + nop == 0x01000000U)
7105 + {
7106 + unsigned long addr;
7107 + unsigned int save, call;
7108 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
7109 +
7110 + if ((ba & 0xFFC00000U) == 0x30800000U)
7111 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
7112 + else
7113 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
7114 +
7115 + if (test_thread_flag(TIF_32BIT))
7116 + addr &= 0xFFFFFFFFUL;
7117 +
7118 + err = get_user(save, (unsigned int *)addr);
7119 + err |= get_user(call, (unsigned int *)(addr+4));
7120 + err |= get_user(nop, (unsigned int *)(addr+8));
7121 + if (err)
7122 + break;
7123 +
7124 +#ifdef CONFIG_PAX_DLRESOLVE
7125 + if (save == 0x9DE3BFA8U &&
7126 + (call & 0xC0000000U) == 0x40000000U &&
7127 + nop == 0x01000000U)
7128 + {
7129 + struct vm_area_struct *vma;
7130 + unsigned long call_dl_resolve;
7131 +
7132 + down_read(&current->mm->mmap_sem);
7133 + call_dl_resolve = current->mm->call_dl_resolve;
7134 + up_read(&current->mm->mmap_sem);
7135 + if (likely(call_dl_resolve))
7136 + goto emulate;
7137 +
7138 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
7139 +
7140 + down_write(&current->mm->mmap_sem);
7141 + if (current->mm->call_dl_resolve) {
7142 + call_dl_resolve = current->mm->call_dl_resolve;
7143 + up_write(&current->mm->mmap_sem);
7144 + if (vma)
7145 + kmem_cache_free(vm_area_cachep, vma);
7146 + goto emulate;
7147 + }
7148 +
7149 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
7150 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
7151 + up_write(&current->mm->mmap_sem);
7152 + if (vma)
7153 + kmem_cache_free(vm_area_cachep, vma);
7154 + return 1;
7155 + }
7156 +
7157 + if (pax_insert_vma(vma, call_dl_resolve)) {
7158 + up_write(&current->mm->mmap_sem);
7159 + kmem_cache_free(vm_area_cachep, vma);
7160 + return 1;
7161 + }
7162 +
7163 + current->mm->call_dl_resolve = call_dl_resolve;
7164 + up_write(&current->mm->mmap_sem);
7165 +
7166 +emulate:
7167 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
7168 + regs->tpc = call_dl_resolve;
7169 + regs->tnpc = addr+4;
7170 + return 3;
7171 + }
7172 +#endif
7173 +
7174 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
7175 + if ((save & 0xFFC00000U) == 0x05000000U &&
7176 + (call & 0xFFFFE000U) == 0x85C0A000U &&
7177 + nop == 0x01000000U)
7178 + {
7179 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
7180 + regs->u_regs[UREG_G2] = addr + 4;
7181 + addr = (save & 0x003FFFFFU) << 10;
7182 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
7183 +
7184 + if (test_thread_flag(TIF_32BIT))
7185 + addr &= 0xFFFFFFFFUL;
7186 +
7187 + regs->tpc = addr;
7188 + regs->tnpc = addr+4;
7189 + return 3;
7190 + }
7191 +
7192 + /* PaX: 64-bit PLT stub */
7193 + err = get_user(sethi1, (unsigned int *)addr);
7194 + err |= get_user(sethi2, (unsigned int *)(addr+4));
7195 + err |= get_user(or1, (unsigned int *)(addr+8));
7196 + err |= get_user(or2, (unsigned int *)(addr+12));
7197 + err |= get_user(sllx, (unsigned int *)(addr+16));
7198 + err |= get_user(add, (unsigned int *)(addr+20));
7199 + err |= get_user(jmpl, (unsigned int *)(addr+24));
7200 + err |= get_user(nop, (unsigned int *)(addr+28));
7201 + if (err)
7202 + break;
7203 +
7204 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
7205 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
7206 + (or1 & 0xFFFFE000U) == 0x88112000U &&
7207 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
7208 + sllx == 0x89293020U &&
7209 + add == 0x8A010005U &&
7210 + jmpl == 0x89C14000U &&
7211 + nop == 0x01000000U)
7212 + {
7213 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
7214 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
7215 + regs->u_regs[UREG_G4] <<= 32;
7216 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
7217 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
7218 + regs->u_regs[UREG_G4] = addr + 24;
7219 + addr = regs->u_regs[UREG_G5];
7220 + regs->tpc = addr;
7221 + regs->tnpc = addr+4;
7222 + return 3;
7223 + }
7224 + }
7225 + } while (0);
7226 +
7227 +#ifdef CONFIG_PAX_DLRESOLVE
7228 + do { /* PaX: unpatched PLT emulation step 2 */
7229 + unsigned int save, call, nop;
7230 +
7231 + err = get_user(save, (unsigned int *)(regs->tpc-4));
7232 + err |= get_user(call, (unsigned int *)regs->tpc);
7233 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
7234 + if (err)
7235 + break;
7236 +
7237 + if (save == 0x9DE3BFA8U &&
7238 + (call & 0xC0000000U) == 0x40000000U &&
7239 + nop == 0x01000000U)
7240 + {
7241 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
7242 +
7243 + if (test_thread_flag(TIF_32BIT))
7244 + dl_resolve &= 0xFFFFFFFFUL;
7245 +
7246 + regs->u_regs[UREG_RETPC] = regs->tpc;
7247 + regs->tpc = dl_resolve;
7248 + regs->tnpc = dl_resolve+4;
7249 + return 3;
7250 + }
7251 + } while (0);
7252 +#endif
7253 +
7254 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
7255 + unsigned int sethi, ba, nop;
7256 +
7257 + err = get_user(sethi, (unsigned int *)regs->tpc);
7258 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
7259 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
7260 +
7261 + if (err)
7262 + break;
7263 +
7264 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7265 + (ba & 0xFFF00000U) == 0x30600000U &&
7266 + nop == 0x01000000U)
7267 + {
7268 + unsigned long addr;
7269 +
7270 + addr = (sethi & 0x003FFFFFU) << 10;
7271 + regs->u_regs[UREG_G1] = addr;
7272 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
7273 +
7274 + if (test_thread_flag(TIF_32BIT))
7275 + addr &= 0xFFFFFFFFUL;
7276 +
7277 + regs->tpc = addr;
7278 + regs->tnpc = addr+4;
7279 + return 2;
7280 + }
7281 + } while (0);
7282 +
7283 +#endif
7284 +
7285 + return 1;
7286 +}
7287 +
7288 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7289 +{
7290 + unsigned long i;
7291 +
7292 + printk(KERN_ERR "PAX: bytes at PC: ");
7293 + for (i = 0; i < 8; i++) {
7294 + unsigned int c;
7295 + if (get_user(c, (unsigned int *)pc+i))
7296 + printk(KERN_CONT "???????? ");
7297 + else
7298 + printk(KERN_CONT "%08x ", c);
7299 + }
7300 + printk("\n");
7301 +}
7302 +#endif
7303 +
7304 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
7305 {
7306 struct mm_struct *mm = current->mm;
7307 @@ -343,6 +806,29 @@ retry:
7308 if (!vma)
7309 goto bad_area;
7310
7311 +#ifdef CONFIG_PAX_PAGEEXEC
7312 + /* PaX: detect ITLB misses on non-exec pages */
7313 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
7314 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
7315 + {
7316 + if (address != regs->tpc)
7317 + goto good_area;
7318 +
7319 + up_read(&mm->mmap_sem);
7320 + switch (pax_handle_fetch_fault(regs)) {
7321 +
7322 +#ifdef CONFIG_PAX_EMUPLT
7323 + case 2:
7324 + case 3:
7325 + return;
7326 +#endif
7327 +
7328 + }
7329 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
7330 + do_group_exit(SIGKILL);
7331 + }
7332 +#endif
7333 +
7334 /* Pure DTLB misses do not tell us whether the fault causing
7335 * load/store/atomic was a write or not, it only says that there
7336 * was no match. So in such a case we (carefully) read the
7337 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
7338 index 07e1453..0a7d9e9 100644
7339 --- a/arch/sparc/mm/hugetlbpage.c
7340 +++ b/arch/sparc/mm/hugetlbpage.c
7341 @@ -67,7 +67,7 @@ full_search:
7342 }
7343 return -ENOMEM;
7344 }
7345 - if (likely(!vma || addr + len <= vma->vm_start)) {
7346 + if (likely(check_heap_stack_gap(vma, addr, len))) {
7347 /*
7348 * Remember the place where we stopped the search:
7349 */
7350 @@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7351 /* make sure it can fit in the remaining address space */
7352 if (likely(addr > len)) {
7353 vma = find_vma(mm, addr-len);
7354 - if (!vma || addr <= vma->vm_start) {
7355 + if (check_heap_stack_gap(vma, addr - len, len)) {
7356 /* remember the address as a hint for next time */
7357 return (mm->free_area_cache = addr-len);
7358 }
7359 @@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7360 if (unlikely(mm->mmap_base < len))
7361 goto bottomup;
7362
7363 - addr = (mm->mmap_base-len) & HPAGE_MASK;
7364 + addr = mm->mmap_base - len;
7365
7366 do {
7367 + addr &= HPAGE_MASK;
7368 /*
7369 * Lookup failure means no vma is above this address,
7370 * else if new region fits below vma->vm_start,
7371 * return with success:
7372 */
7373 vma = find_vma(mm, addr);
7374 - if (likely(!vma || addr+len <= vma->vm_start)) {
7375 + if (likely(check_heap_stack_gap(vma, addr, len))) {
7376 /* remember the address as a hint for next time */
7377 return (mm->free_area_cache = addr);
7378 }
7379 @@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7380 mm->cached_hole_size = vma->vm_start - addr;
7381
7382 /* try just below the current vma->vm_start */
7383 - addr = (vma->vm_start-len) & HPAGE_MASK;
7384 - } while (likely(len < vma->vm_start));
7385 + addr = skip_heap_stack_gap(vma, len);
7386 + } while (!IS_ERR_VALUE(addr));
7387
7388 bottomup:
7389 /*
7390 @@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
7391 if (addr) {
7392 addr = ALIGN(addr, HPAGE_SIZE);
7393 vma = find_vma(mm, addr);
7394 - if (task_size - len >= addr &&
7395 - (!vma || addr + len <= vma->vm_start))
7396 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
7397 return addr;
7398 }
7399 if (mm->get_unmapped_area == arch_get_unmapped_area)
7400 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
7401 index f4500c6..889656c 100644
7402 --- a/arch/tile/include/asm/atomic_64.h
7403 +++ b/arch/tile/include/asm/atomic_64.h
7404 @@ -143,6 +143,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
7405
7406 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
7407
7408 +#define atomic64_read_unchecked(v) atomic64_read(v)
7409 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7410 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7411 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7412 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7413 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7414 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7415 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7416 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7417 +
7418 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
7419 #define smp_mb__before_atomic_dec() smp_mb()
7420 #define smp_mb__after_atomic_dec() smp_mb()
7421 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
7422 index 392e533..536b092 100644
7423 --- a/arch/tile/include/asm/cache.h
7424 +++ b/arch/tile/include/asm/cache.h
7425 @@ -15,11 +15,12 @@
7426 #ifndef _ASM_TILE_CACHE_H
7427 #define _ASM_TILE_CACHE_H
7428
7429 +#include <linux/const.h>
7430 #include <arch/chip.h>
7431
7432 /* bytes per L1 data cache line */
7433 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
7434 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7435 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7436
7437 /* bytes per L2 cache line */
7438 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
7439 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
7440 index 9ab078a..d6635c2 100644
7441 --- a/arch/tile/include/asm/uaccess.h
7442 +++ b/arch/tile/include/asm/uaccess.h
7443 @@ -403,9 +403,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
7444 const void __user *from,
7445 unsigned long n)
7446 {
7447 - int sz = __compiletime_object_size(to);
7448 + size_t sz = __compiletime_object_size(to);
7449
7450 - if (likely(sz == -1 || sz >= n))
7451 + if (likely(sz == (size_t)-1 || sz >= n))
7452 n = _copy_from_user(to, from, n);
7453 else
7454 copy_from_user_overflow();
7455 diff --git a/arch/um/Makefile b/arch/um/Makefile
7456 index 0970910..13adb57a 100644
7457 --- a/arch/um/Makefile
7458 +++ b/arch/um/Makefile
7459 @@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
7460 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
7461 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
7462
7463 +ifdef CONSTIFY_PLUGIN
7464 +USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7465 +endif
7466 +
7467 #This will adjust *FLAGS accordingly to the platform.
7468 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
7469
7470 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
7471 index 19e1bdd..3665b77 100644
7472 --- a/arch/um/include/asm/cache.h
7473 +++ b/arch/um/include/asm/cache.h
7474 @@ -1,6 +1,7 @@
7475 #ifndef __UM_CACHE_H
7476 #define __UM_CACHE_H
7477
7478 +#include <linux/const.h>
7479
7480 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
7481 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
7482 @@ -12,6 +13,6 @@
7483 # define L1_CACHE_SHIFT 5
7484 #endif
7485
7486 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7487 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7488
7489 #endif
7490 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
7491 index 6c03acd..a5e0215 100644
7492 --- a/arch/um/include/asm/kmap_types.h
7493 +++ b/arch/um/include/asm/kmap_types.h
7494 @@ -23,6 +23,7 @@ enum km_type {
7495 KM_IRQ1,
7496 KM_SOFTIRQ0,
7497 KM_SOFTIRQ1,
7498 + KM_CLEARPAGE,
7499 KM_TYPE_NR
7500 };
7501
7502 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
7503 index 7cfc3ce..cbd1a58 100644
7504 --- a/arch/um/include/asm/page.h
7505 +++ b/arch/um/include/asm/page.h
7506 @@ -14,6 +14,9 @@
7507 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
7508 #define PAGE_MASK (~(PAGE_SIZE-1))
7509
7510 +#define ktla_ktva(addr) (addr)
7511 +#define ktva_ktla(addr) (addr)
7512 +
7513 #ifndef __ASSEMBLY__
7514
7515 struct page;
7516 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
7517 index 0032f92..cd151e0 100644
7518 --- a/arch/um/include/asm/pgtable-3level.h
7519 +++ b/arch/um/include/asm/pgtable-3level.h
7520 @@ -58,6 +58,7 @@
7521 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
7522 #define pud_populate(mm, pud, pmd) \
7523 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
7524 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
7525
7526 #ifdef CONFIG_64BIT
7527 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
7528 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
7529 index ccb9a9d..cc425bb 100644
7530 --- a/arch/um/kernel/process.c
7531 +++ b/arch/um/kernel/process.c
7532 @@ -407,22 +407,6 @@ int singlestepping(void * t)
7533 return 2;
7534 }
7535
7536 -/*
7537 - * Only x86 and x86_64 have an arch_align_stack().
7538 - * All other arches have "#define arch_align_stack(x) (x)"
7539 - * in their asm/system.h
7540 - * As this is included in UML from asm-um/system-generic.h,
7541 - * we can use it to behave as the subarch does.
7542 - */
7543 -#ifndef arch_align_stack
7544 -unsigned long arch_align_stack(unsigned long sp)
7545 -{
7546 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7547 - sp -= get_random_int() % 8192;
7548 - return sp & ~0xf;
7549 -}
7550 -#endif
7551 -
7552 unsigned long get_wchan(struct task_struct *p)
7553 {
7554 unsigned long stack_page, sp, ip;
7555 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7556 index ad8f795..2c7eec6 100644
7557 --- a/arch/unicore32/include/asm/cache.h
7558 +++ b/arch/unicore32/include/asm/cache.h
7559 @@ -12,8 +12,10 @@
7560 #ifndef __UNICORE_CACHE_H__
7561 #define __UNICORE_CACHE_H__
7562
7563 -#define L1_CACHE_SHIFT (5)
7564 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7565 +#include <linux/const.h>
7566 +
7567 +#define L1_CACHE_SHIFT 5
7568 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7569
7570 /*
7571 * Memory returned by kmalloc() may be used for DMA, so we must make
7572 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7573 index c70684f..698fa4b 100644
7574 --- a/arch/x86/Kconfig
7575 +++ b/arch/x86/Kconfig
7576 @@ -218,7 +218,7 @@ config X86_HT
7577
7578 config X86_32_LAZY_GS
7579 def_bool y
7580 - depends on X86_32 && !CC_STACKPROTECTOR
7581 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7582
7583 config ARCH_HWEIGHT_CFLAGS
7584 string
7585 @@ -1047,7 +1047,7 @@ choice
7586
7587 config NOHIGHMEM
7588 bool "off"
7589 - depends on !X86_NUMAQ
7590 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7591 ---help---
7592 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7593 However, the address space of 32-bit x86 processors is only 4
7594 @@ -1084,7 +1084,7 @@ config NOHIGHMEM
7595
7596 config HIGHMEM4G
7597 bool "4GB"
7598 - depends on !X86_NUMAQ
7599 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7600 ---help---
7601 Select this if you have a 32-bit processor and between 1 and 4
7602 gigabytes of physical RAM.
7603 @@ -1138,7 +1138,7 @@ config PAGE_OFFSET
7604 hex
7605 default 0xB0000000 if VMSPLIT_3G_OPT
7606 default 0x80000000 if VMSPLIT_2G
7607 - default 0x78000000 if VMSPLIT_2G_OPT
7608 + default 0x70000000 if VMSPLIT_2G_OPT
7609 default 0x40000000 if VMSPLIT_1G
7610 default 0xC0000000
7611 depends on X86_32
7612 @@ -1526,6 +1526,7 @@ config SECCOMP
7613
7614 config CC_STACKPROTECTOR
7615 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
7616 + depends on X86_64 || !PAX_MEMORY_UDEREF
7617 ---help---
7618 This option turns on the -fstack-protector GCC feature. This
7619 feature puts, at the beginning of functions, a canary value on
7620 @@ -1583,6 +1584,7 @@ config KEXEC_JUMP
7621 config PHYSICAL_START
7622 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7623 default "0x1000000"
7624 + range 0x400000 0x40000000
7625 ---help---
7626 This gives the physical address where the kernel is loaded.
7627
7628 @@ -1646,6 +1648,7 @@ config X86_NEED_RELOCS
7629 config PHYSICAL_ALIGN
7630 hex "Alignment value to which kernel should be aligned" if X86_32
7631 default "0x1000000"
7632 + range 0x400000 0x1000000 if PAX_KERNEXEC
7633 range 0x2000 0x1000000
7634 ---help---
7635 This value puts the alignment restrictions on physical address
7636 @@ -1677,9 +1680,10 @@ config HOTPLUG_CPU
7637 Say N if you want to disable CPU hotplug.
7638
7639 config COMPAT_VDSO
7640 - def_bool y
7641 + def_bool n
7642 prompt "Compat VDSO support"
7643 depends on X86_32 || IA32_EMULATION
7644 + depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7645 ---help---
7646 Map the 32-bit VDSO to the predictable old-style address too.
7647
7648 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7649 index 706e12e..62e4feb 100644
7650 --- a/arch/x86/Kconfig.cpu
7651 +++ b/arch/x86/Kconfig.cpu
7652 @@ -334,7 +334,7 @@ config X86_PPRO_FENCE
7653
7654 config X86_F00F_BUG
7655 def_bool y
7656 - depends on M586MMX || M586TSC || M586 || M486 || M386
7657 + depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7658
7659 config X86_INVD_BUG
7660 def_bool y
7661 @@ -358,7 +358,7 @@ config X86_POPAD_OK
7662
7663 config X86_ALIGNMENT_16
7664 def_bool y
7665 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7666 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7667
7668 config X86_INTEL_USERCOPY
7669 def_bool y
7670 @@ -404,7 +404,7 @@ config X86_CMPXCHG64
7671 # generates cmov.
7672 config X86_CMOV
7673 def_bool y
7674 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7675 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7676
7677 config X86_MINIMUM_CPU_FAMILY
7678 int
7679 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7680 index e46c214..ab62fd1 100644
7681 --- a/arch/x86/Kconfig.debug
7682 +++ b/arch/x86/Kconfig.debug
7683 @@ -84,7 +84,7 @@ config X86_PTDUMP
7684 config DEBUG_RODATA
7685 bool "Write protect kernel read-only data structures"
7686 default y
7687 - depends on DEBUG_KERNEL
7688 + depends on DEBUG_KERNEL && BROKEN
7689 ---help---
7690 Mark the kernel read-only data as write-protected in the pagetables,
7691 in order to catch accidental (and incorrect) writes to such const
7692 @@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
7693
7694 config DEBUG_SET_MODULE_RONX
7695 bool "Set loadable kernel module data as NX and text as RO"
7696 - depends on MODULES
7697 + depends on MODULES && BROKEN
7698 ---help---
7699 This option helps catch unintended modifications to loadable
7700 kernel module's text and read-only data. It also prevents execution
7701 @@ -275,7 +275,7 @@ config OPTIMIZE_INLINING
7702
7703 config DEBUG_STRICT_USER_COPY_CHECKS
7704 bool "Strict copy size checks"
7705 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
7706 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
7707 ---help---
7708 Enabling this option turns a certain set of sanity checks for user
7709 copy operations into compile time failures.
7710 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7711 index 1f25214..39422b3 100644
7712 --- a/arch/x86/Makefile
7713 +++ b/arch/x86/Makefile
7714 @@ -46,6 +46,7 @@ else
7715 UTS_MACHINE := x86_64
7716 CHECKFLAGS += -D__x86_64__ -m64
7717
7718 + biarch := $(call cc-option,-m64)
7719 KBUILD_AFLAGS += -m64
7720 KBUILD_CFLAGS += -m64
7721
7722 @@ -222,3 +223,12 @@ define archhelp
7723 echo ' FDARGS="..." arguments for the booted kernel'
7724 echo ' FDINITRD=file initrd for the booted kernel'
7725 endef
7726 +
7727 +define OLD_LD
7728 +
7729 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7730 +*** Please upgrade your binutils to 2.18 or newer
7731 +endef
7732 +
7733 +archprepare:
7734 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7735 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7736 index 5a747dd..ff7b12c 100644
7737 --- a/arch/x86/boot/Makefile
7738 +++ b/arch/x86/boot/Makefile
7739 @@ -64,6 +64,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7740 $(call cc-option, -fno-stack-protector) \
7741 $(call cc-option, -mpreferred-stack-boundary=2)
7742 KBUILD_CFLAGS += $(call cc-option, -m32)
7743 +ifdef CONSTIFY_PLUGIN
7744 +KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7745 +endif
7746 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7747 GCOV_PROFILE := n
7748
7749 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7750 index 878e4b9..20537ab 100644
7751 --- a/arch/x86/boot/bitops.h
7752 +++ b/arch/x86/boot/bitops.h
7753 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7754 u8 v;
7755 const u32 *p = (const u32 *)addr;
7756
7757 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7758 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7759 return v;
7760 }
7761
7762 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7763
7764 static inline void set_bit(int nr, void *addr)
7765 {
7766 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7767 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7768 }
7769
7770 #endif /* BOOT_BITOPS_H */
7771 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7772 index 18997e5..83d9c67 100644
7773 --- a/arch/x86/boot/boot.h
7774 +++ b/arch/x86/boot/boot.h
7775 @@ -85,7 +85,7 @@ static inline void io_delay(void)
7776 static inline u16 ds(void)
7777 {
7778 u16 seg;
7779 - asm("movw %%ds,%0" : "=rm" (seg));
7780 + asm volatile("movw %%ds,%0" : "=rm" (seg));
7781 return seg;
7782 }
7783
7784 @@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7785 static inline int memcmp(const void *s1, const void *s2, size_t len)
7786 {
7787 u8 diff;
7788 - asm("repe; cmpsb; setnz %0"
7789 + asm volatile("repe; cmpsb; setnz %0"
7790 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7791 return diff;
7792 }
7793 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7794 index e398bb5..3a382ca 100644
7795 --- a/arch/x86/boot/compressed/Makefile
7796 +++ b/arch/x86/boot/compressed/Makefile
7797 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7798 KBUILD_CFLAGS += $(cflags-y)
7799 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7800 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7801 +ifdef CONSTIFY_PLUGIN
7802 +KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7803 +endif
7804
7805 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7806 GCOV_PROFILE := n
7807 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
7808 index 4e85f5f..39fa641 100644
7809 --- a/arch/x86/boot/compressed/eboot.c
7810 +++ b/arch/x86/boot/compressed/eboot.c
7811 @@ -142,7 +142,6 @@ again:
7812 *addr = max_addr;
7813 }
7814
7815 -free_pool:
7816 efi_call_phys1(sys_table->boottime->free_pool, map);
7817
7818 fail:
7819 @@ -206,7 +205,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
7820 if (i == map_size / desc_size)
7821 status = EFI_NOT_FOUND;
7822
7823 -free_pool:
7824 efi_call_phys1(sys_table->boottime->free_pool, map);
7825 fail:
7826 return status;
7827 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7828 index c85e3ac..6f5aa80 100644
7829 --- a/arch/x86/boot/compressed/head_32.S
7830 +++ b/arch/x86/boot/compressed/head_32.S
7831 @@ -106,7 +106,7 @@ preferred_addr:
7832 notl %eax
7833 andl %eax, %ebx
7834 #else
7835 - movl $LOAD_PHYSICAL_ADDR, %ebx
7836 + movl $____LOAD_PHYSICAL_ADDR, %ebx
7837 #endif
7838
7839 /* Target address to relocate to for decompression */
7840 @@ -192,7 +192,7 @@ relocated:
7841 * and where it was actually loaded.
7842 */
7843 movl %ebp, %ebx
7844 - subl $LOAD_PHYSICAL_ADDR, %ebx
7845 + subl $____LOAD_PHYSICAL_ADDR, %ebx
7846 jz 2f /* Nothing to be done if loaded at compiled addr. */
7847 /*
7848 * Process relocations.
7849 @@ -200,8 +200,7 @@ relocated:
7850
7851 1: subl $4, %edi
7852 movl (%edi), %ecx
7853 - testl %ecx, %ecx
7854 - jz 2f
7855 + jecxz 2f
7856 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7857 jmp 1b
7858 2:
7859 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7860 index 87e03a1..0d94c76 100644
7861 --- a/arch/x86/boot/compressed/head_64.S
7862 +++ b/arch/x86/boot/compressed/head_64.S
7863 @@ -91,7 +91,7 @@ ENTRY(startup_32)
7864 notl %eax
7865 andl %eax, %ebx
7866 #else
7867 - movl $LOAD_PHYSICAL_ADDR, %ebx
7868 + movl $____LOAD_PHYSICAL_ADDR, %ebx
7869 #endif
7870
7871 /* Target address to relocate to for decompression */
7872 @@ -263,7 +263,7 @@ preferred_addr:
7873 notq %rax
7874 andq %rax, %rbp
7875 #else
7876 - movq $LOAD_PHYSICAL_ADDR, %rbp
7877 + movq $____LOAD_PHYSICAL_ADDR, %rbp
7878 #endif
7879
7880 /* Target address to relocate to for decompression */
7881 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7882 index 7116dcb..d9ae1d7 100644
7883 --- a/arch/x86/boot/compressed/misc.c
7884 +++ b/arch/x86/boot/compressed/misc.c
7885 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
7886 case PT_LOAD:
7887 #ifdef CONFIG_RELOCATABLE
7888 dest = output;
7889 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7890 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7891 #else
7892 dest = (void *)(phdr->p_paddr);
7893 #endif
7894 @@ -365,7 +365,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7895 error("Destination address too large");
7896 #endif
7897 #ifndef CONFIG_RELOCATABLE
7898 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7899 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7900 error("Wrong destination address");
7901 #endif
7902
7903 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7904 index 4d3ff03..e4972ff 100644
7905 --- a/arch/x86/boot/cpucheck.c
7906 +++ b/arch/x86/boot/cpucheck.c
7907 @@ -74,7 +74,7 @@ static int has_fpu(void)
7908 u16 fcw = -1, fsw = -1;
7909 u32 cr0;
7910
7911 - asm("movl %%cr0,%0" : "=r" (cr0));
7912 + asm volatile("movl %%cr0,%0" : "=r" (cr0));
7913 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7914 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7915 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7916 @@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7917 {
7918 u32 f0, f1;
7919
7920 - asm("pushfl ; "
7921 + asm volatile("pushfl ; "
7922 "pushfl ; "
7923 "popl %0 ; "
7924 "movl %0,%1 ; "
7925 @@ -115,7 +115,7 @@ static void get_flags(void)
7926 set_bit(X86_FEATURE_FPU, cpu.flags);
7927
7928 if (has_eflag(X86_EFLAGS_ID)) {
7929 - asm("cpuid"
7930 + asm volatile("cpuid"
7931 : "=a" (max_intel_level),
7932 "=b" (cpu_vendor[0]),
7933 "=d" (cpu_vendor[1]),
7934 @@ -124,7 +124,7 @@ static void get_flags(void)
7935
7936 if (max_intel_level >= 0x00000001 &&
7937 max_intel_level <= 0x0000ffff) {
7938 - asm("cpuid"
7939 + asm volatile("cpuid"
7940 : "=a" (tfms),
7941 "=c" (cpu.flags[4]),
7942 "=d" (cpu.flags[0])
7943 @@ -136,7 +136,7 @@ static void get_flags(void)
7944 cpu.model += ((tfms >> 16) & 0xf) << 4;
7945 }
7946
7947 - asm("cpuid"
7948 + asm volatile("cpuid"
7949 : "=a" (max_amd_level)
7950 : "a" (0x80000000)
7951 : "ebx", "ecx", "edx");
7952 @@ -144,7 +144,7 @@ static void get_flags(void)
7953 if (max_amd_level >= 0x80000001 &&
7954 max_amd_level <= 0x8000ffff) {
7955 u32 eax = 0x80000001;
7956 - asm("cpuid"
7957 + asm volatile("cpuid"
7958 : "+a" (eax),
7959 "=c" (cpu.flags[6]),
7960 "=d" (cpu.flags[1])
7961 @@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7962 u32 ecx = MSR_K7_HWCR;
7963 u32 eax, edx;
7964
7965 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7966 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7967 eax &= ~(1 << 15);
7968 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7969 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7970
7971 get_flags(); /* Make sure it really did something */
7972 err = check_flags();
7973 @@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7974 u32 ecx = MSR_VIA_FCR;
7975 u32 eax, edx;
7976
7977 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7978 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7979 eax |= (1<<1)|(1<<7);
7980 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7981 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7982
7983 set_bit(X86_FEATURE_CX8, cpu.flags);
7984 err = check_flags();
7985 @@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7986 u32 eax, edx;
7987 u32 level = 1;
7988
7989 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7990 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7991 - asm("cpuid"
7992 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7993 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7994 + asm volatile("cpuid"
7995 : "+a" (level), "=d" (cpu.flags[0])
7996 : : "ecx", "ebx");
7997 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7998 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7999
8000 err = check_flags();
8001 }
8002 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
8003 index efe5acf..22a3784 100644
8004 --- a/arch/x86/boot/header.S
8005 +++ b/arch/x86/boot/header.S
8006 @@ -391,10 +391,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
8007 # single linked list of
8008 # struct setup_data
8009
8010 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
8011 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
8012
8013 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
8014 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
8015 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
8016 +#else
8017 #define VO_INIT_SIZE (VO__end - VO__text)
8018 +#endif
8019 #if ZO_INIT_SIZE > VO_INIT_SIZE
8020 #define INIT_SIZE ZO_INIT_SIZE
8021 #else
8022 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
8023 index db75d07..8e6d0af 100644
8024 --- a/arch/x86/boot/memory.c
8025 +++ b/arch/x86/boot/memory.c
8026 @@ -19,7 +19,7 @@
8027
8028 static int detect_memory_e820(void)
8029 {
8030 - int count = 0;
8031 + unsigned int count = 0;
8032 struct biosregs ireg, oreg;
8033 struct e820entry *desc = boot_params.e820_map;
8034 static struct e820entry buf; /* static so it is zeroed */
8035 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
8036 index 11e8c6e..fdbb1ed 100644
8037 --- a/arch/x86/boot/video-vesa.c
8038 +++ b/arch/x86/boot/video-vesa.c
8039 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
8040
8041 boot_params.screen_info.vesapm_seg = oreg.es;
8042 boot_params.screen_info.vesapm_off = oreg.di;
8043 + boot_params.screen_info.vesapm_size = oreg.cx;
8044 }
8045
8046 /*
8047 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
8048 index 43eda28..5ab5fdb 100644
8049 --- a/arch/x86/boot/video.c
8050 +++ b/arch/x86/boot/video.c
8051 @@ -96,7 +96,7 @@ static void store_mode_params(void)
8052 static unsigned int get_entry(void)
8053 {
8054 char entry_buf[4];
8055 - int i, len = 0;
8056 + unsigned int i, len = 0;
8057 int key;
8058 unsigned int v;
8059
8060 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
8061 index 5b577d5..3c1fed4 100644
8062 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
8063 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
8064 @@ -8,6 +8,8 @@
8065 * including this sentence is retained in full.
8066 */
8067
8068 +#include <asm/alternative-asm.h>
8069 +
8070 .extern crypto_ft_tab
8071 .extern crypto_it_tab
8072 .extern crypto_fl_tab
8073 @@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
8074 je B192; \
8075 leaq 32(r9),r9;
8076
8077 +#define ret pax_force_retaddr 0, 1; ret
8078 +
8079 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
8080 movq r1,r2; \
8081 movq r3,r4; \
8082 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
8083 index 3470624..201259d 100644
8084 --- a/arch/x86/crypto/aesni-intel_asm.S
8085 +++ b/arch/x86/crypto/aesni-intel_asm.S
8086 @@ -31,6 +31,7 @@
8087
8088 #include <linux/linkage.h>
8089 #include <asm/inst.h>
8090 +#include <asm/alternative-asm.h>
8091
8092 #ifdef __x86_64__
8093 .data
8094 @@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
8095 pop %r14
8096 pop %r13
8097 pop %r12
8098 + pax_force_retaddr 0, 1
8099 ret
8100 +ENDPROC(aesni_gcm_dec)
8101
8102
8103 /*****************************************************************************
8104 @@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
8105 pop %r14
8106 pop %r13
8107 pop %r12
8108 + pax_force_retaddr 0, 1
8109 ret
8110 +ENDPROC(aesni_gcm_enc)
8111
8112 #endif
8113
8114 @@ -1714,6 +1719,7 @@ _key_expansion_256a:
8115 pxor %xmm1, %xmm0
8116 movaps %xmm0, (TKEYP)
8117 add $0x10, TKEYP
8118 + pax_force_retaddr_bts
8119 ret
8120
8121 .align 4
8122 @@ -1738,6 +1744,7 @@ _key_expansion_192a:
8123 shufps $0b01001110, %xmm2, %xmm1
8124 movaps %xmm1, 0x10(TKEYP)
8125 add $0x20, TKEYP
8126 + pax_force_retaddr_bts
8127 ret
8128
8129 .align 4
8130 @@ -1757,6 +1764,7 @@ _key_expansion_192b:
8131
8132 movaps %xmm0, (TKEYP)
8133 add $0x10, TKEYP
8134 + pax_force_retaddr_bts
8135 ret
8136
8137 .align 4
8138 @@ -1769,6 +1777,7 @@ _key_expansion_256b:
8139 pxor %xmm1, %xmm2
8140 movaps %xmm2, (TKEYP)
8141 add $0x10, TKEYP
8142 + pax_force_retaddr_bts
8143 ret
8144
8145 /*
8146 @@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
8147 #ifndef __x86_64__
8148 popl KEYP
8149 #endif
8150 + pax_force_retaddr 0, 1
8151 ret
8152 +ENDPROC(aesni_set_key)
8153
8154 /*
8155 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
8156 @@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
8157 popl KLEN
8158 popl KEYP
8159 #endif
8160 + pax_force_retaddr 0, 1
8161 ret
8162 +ENDPROC(aesni_enc)
8163
8164 /*
8165 * _aesni_enc1: internal ABI
8166 @@ -1959,6 +1972,7 @@ _aesni_enc1:
8167 AESENC KEY STATE
8168 movaps 0x70(TKEYP), KEY
8169 AESENCLAST KEY STATE
8170 + pax_force_retaddr_bts
8171 ret
8172
8173 /*
8174 @@ -2067,6 +2081,7 @@ _aesni_enc4:
8175 AESENCLAST KEY STATE2
8176 AESENCLAST KEY STATE3
8177 AESENCLAST KEY STATE4
8178 + pax_force_retaddr_bts
8179 ret
8180
8181 /*
8182 @@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
8183 popl KLEN
8184 popl KEYP
8185 #endif
8186 + pax_force_retaddr 0, 1
8187 ret
8188 +ENDPROC(aesni_dec)
8189
8190 /*
8191 * _aesni_dec1: internal ABI
8192 @@ -2146,6 +2163,7 @@ _aesni_dec1:
8193 AESDEC KEY STATE
8194 movaps 0x70(TKEYP), KEY
8195 AESDECLAST KEY STATE
8196 + pax_force_retaddr_bts
8197 ret
8198
8199 /*
8200 @@ -2254,6 +2272,7 @@ _aesni_dec4:
8201 AESDECLAST KEY STATE2
8202 AESDECLAST KEY STATE3
8203 AESDECLAST KEY STATE4
8204 + pax_force_retaddr_bts
8205 ret
8206
8207 /*
8208 @@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
8209 popl KEYP
8210 popl LEN
8211 #endif
8212 + pax_force_retaddr 0, 1
8213 ret
8214 +ENDPROC(aesni_ecb_enc)
8215
8216 /*
8217 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8218 @@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
8219 popl KEYP
8220 popl LEN
8221 #endif
8222 + pax_force_retaddr 0, 1
8223 ret
8224 +ENDPROC(aesni_ecb_dec)
8225
8226 /*
8227 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8228 @@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
8229 popl LEN
8230 popl IVP
8231 #endif
8232 + pax_force_retaddr 0, 1
8233 ret
8234 +ENDPROC(aesni_cbc_enc)
8235
8236 /*
8237 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8238 @@ -2500,7 +2525,9 @@ ENTRY(aesni_cbc_dec)
8239 popl LEN
8240 popl IVP
8241 #endif
8242 + pax_force_retaddr 0, 1
8243 ret
8244 +ENDPROC(aesni_cbc_dec)
8245
8246 #ifdef __x86_64__
8247 .align 16
8248 @@ -2526,6 +2553,7 @@ _aesni_inc_init:
8249 mov $1, TCTR_LOW
8250 MOVQ_R64_XMM TCTR_LOW INC
8251 MOVQ_R64_XMM CTR TCTR_LOW
8252 + pax_force_retaddr_bts
8253 ret
8254
8255 /*
8256 @@ -2554,6 +2582,7 @@ _aesni_inc:
8257 .Linc_low:
8258 movaps CTR, IV
8259 PSHUFB_XMM BSWAP_MASK IV
8260 + pax_force_retaddr_bts
8261 ret
8262
8263 /*
8264 @@ -2614,5 +2643,7 @@ ENTRY(aesni_ctr_enc)
8265 .Lctr_enc_ret:
8266 movups IV, (IVP)
8267 .Lctr_enc_just_ret:
8268 + pax_force_retaddr 0, 1
8269 ret
8270 +ENDPROC(aesni_ctr_enc)
8271 #endif
8272 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
8273 index 391d245..67f35c2 100644
8274 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
8275 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
8276 @@ -20,6 +20,8 @@
8277 *
8278 */
8279
8280 +#include <asm/alternative-asm.h>
8281 +
8282 .file "blowfish-x86_64-asm.S"
8283 .text
8284
8285 @@ -151,9 +153,11 @@ __blowfish_enc_blk:
8286 jnz __enc_xor;
8287
8288 write_block();
8289 + pax_force_retaddr 0, 1
8290 ret;
8291 __enc_xor:
8292 xor_block();
8293 + pax_force_retaddr 0, 1
8294 ret;
8295
8296 .align 8
8297 @@ -188,6 +192,7 @@ blowfish_dec_blk:
8298
8299 movq %r11, %rbp;
8300
8301 + pax_force_retaddr 0, 1
8302 ret;
8303
8304 /**********************************************************************
8305 @@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
8306
8307 popq %rbx;
8308 popq %rbp;
8309 + pax_force_retaddr 0, 1
8310 ret;
8311
8312 __enc_xor4:
8313 @@ -349,6 +355,7 @@ __enc_xor4:
8314
8315 popq %rbx;
8316 popq %rbp;
8317 + pax_force_retaddr 0, 1
8318 ret;
8319
8320 .align 8
8321 @@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
8322 popq %rbx;
8323 popq %rbp;
8324
8325 + pax_force_retaddr 0, 1
8326 ret;
8327
8328 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
8329 index 0b33743..7a56206 100644
8330 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
8331 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
8332 @@ -20,6 +20,8 @@
8333 *
8334 */
8335
8336 +#include <asm/alternative-asm.h>
8337 +
8338 .file "camellia-x86_64-asm_64.S"
8339 .text
8340
8341 @@ -229,12 +231,14 @@ __enc_done:
8342 enc_outunpack(mov, RT1);
8343
8344 movq RRBP, %rbp;
8345 + pax_force_retaddr 0, 1
8346 ret;
8347
8348 __enc_xor:
8349 enc_outunpack(xor, RT1);
8350
8351 movq RRBP, %rbp;
8352 + pax_force_retaddr 0, 1
8353 ret;
8354
8355 .global camellia_dec_blk;
8356 @@ -275,6 +279,7 @@ __dec_rounds16:
8357 dec_outunpack();
8358
8359 movq RRBP, %rbp;
8360 + pax_force_retaddr 0, 1
8361 ret;
8362
8363 /**********************************************************************
8364 @@ -468,6 +473,7 @@ __enc2_done:
8365
8366 movq RRBP, %rbp;
8367 popq %rbx;
8368 + pax_force_retaddr 0, 1
8369 ret;
8370
8371 __enc2_xor:
8372 @@ -475,6 +481,7 @@ __enc2_xor:
8373
8374 movq RRBP, %rbp;
8375 popq %rbx;
8376 + pax_force_retaddr 0, 1
8377 ret;
8378
8379 .global camellia_dec_blk_2way;
8380 @@ -517,4 +524,5 @@ __dec2_rounds16:
8381
8382 movq RRBP, %rbp;
8383 movq RXOR, %rbx;
8384 + pax_force_retaddr 0, 1
8385 ret;
8386 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
8387 index 6214a9b..1f4fc9a 100644
8388 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
8389 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
8390 @@ -1,3 +1,5 @@
8391 +#include <asm/alternative-asm.h>
8392 +
8393 # enter ECRYPT_encrypt_bytes
8394 .text
8395 .p2align 5
8396 @@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
8397 add %r11,%rsp
8398 mov %rdi,%rax
8399 mov %rsi,%rdx
8400 + pax_force_retaddr 0, 1
8401 ret
8402 # bytesatleast65:
8403 ._bytesatleast65:
8404 @@ -891,6 +894,7 @@ ECRYPT_keysetup:
8405 add %r11,%rsp
8406 mov %rdi,%rax
8407 mov %rsi,%rdx
8408 + pax_force_retaddr
8409 ret
8410 # enter ECRYPT_ivsetup
8411 .text
8412 @@ -917,4 +921,5 @@ ECRYPT_ivsetup:
8413 add %r11,%rsp
8414 mov %rdi,%rax
8415 mov %rsi,%rdx
8416 + pax_force_retaddr
8417 ret
8418 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8419 index 3ee1ff0..cbc568b 100644
8420 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8421 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8422 @@ -24,6 +24,8 @@
8423 *
8424 */
8425
8426 +#include <asm/alternative-asm.h>
8427 +
8428 .file "serpent-sse2-x86_64-asm_64.S"
8429 .text
8430
8431 @@ -692,12 +694,14 @@ __serpent_enc_blk_8way:
8432 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8433 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8434
8435 + pax_force_retaddr
8436 ret;
8437
8438 __enc_xor8:
8439 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8440 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8441
8442 + pax_force_retaddr
8443 ret;
8444
8445 .align 8
8446 @@ -755,4 +759,5 @@ serpent_dec_blk_8way:
8447 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
8448 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
8449
8450 + pax_force_retaddr
8451 ret;
8452 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
8453 index b2c2f57..8470cab 100644
8454 --- a/arch/x86/crypto/sha1_ssse3_asm.S
8455 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
8456 @@ -28,6 +28,8 @@
8457 * (at your option) any later version.
8458 */
8459
8460 +#include <asm/alternative-asm.h>
8461 +
8462 #define CTX %rdi // arg1
8463 #define BUF %rsi // arg2
8464 #define CNT %rdx // arg3
8465 @@ -104,6 +106,7 @@
8466 pop %r12
8467 pop %rbp
8468 pop %rbx
8469 + pax_force_retaddr 0, 1
8470 ret
8471
8472 .size \name, .-\name
8473 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8474 index 5b012a2..36d5364 100644
8475 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8476 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8477 @@ -20,6 +20,8 @@
8478 *
8479 */
8480
8481 +#include <asm/alternative-asm.h>
8482 +
8483 .file "twofish-x86_64-asm-3way.S"
8484 .text
8485
8486 @@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8487 popq %r13;
8488 popq %r14;
8489 popq %r15;
8490 + pax_force_retaddr 0, 1
8491 ret;
8492
8493 __enc_xor3:
8494 @@ -271,6 +274,7 @@ __enc_xor3:
8495 popq %r13;
8496 popq %r14;
8497 popq %r15;
8498 + pax_force_retaddr 0, 1
8499 ret;
8500
8501 .global twofish_dec_blk_3way
8502 @@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8503 popq %r13;
8504 popq %r14;
8505 popq %r15;
8506 + pax_force_retaddr 0, 1
8507 ret;
8508
8509 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8510 index 7bcf3fc..f53832f 100644
8511 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8512 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8513 @@ -21,6 +21,7 @@
8514 .text
8515
8516 #include <asm/asm-offsets.h>
8517 +#include <asm/alternative-asm.h>
8518
8519 #define a_offset 0
8520 #define b_offset 4
8521 @@ -268,6 +269,7 @@ twofish_enc_blk:
8522
8523 popq R1
8524 movq $1,%rax
8525 + pax_force_retaddr 0, 1
8526 ret
8527
8528 twofish_dec_blk:
8529 @@ -319,4 +321,5 @@ twofish_dec_blk:
8530
8531 popq R1
8532 movq $1,%rax
8533 + pax_force_retaddr 0, 1
8534 ret
8535 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8536 index 07b3a68..bd2a388 100644
8537 --- a/arch/x86/ia32/ia32_aout.c
8538 +++ b/arch/x86/ia32/ia32_aout.c
8539 @@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8540 unsigned long dump_start, dump_size;
8541 struct user32 dump;
8542
8543 + memset(&dump, 0, sizeof(dump));
8544 +
8545 fs = get_fs();
8546 set_fs(KERNEL_DS);
8547 has_dumped = 1;
8548 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8549 index 673ac9b..7a8c5df 100644
8550 --- a/arch/x86/ia32/ia32_signal.c
8551 +++ b/arch/x86/ia32/ia32_signal.c
8552 @@ -162,7 +162,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8553 }
8554 seg = get_fs();
8555 set_fs(KERNEL_DS);
8556 - ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8557 + ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8558 set_fs(seg);
8559 if (ret >= 0 && uoss_ptr) {
8560 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8561 @@ -361,7 +361,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8562 */
8563 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8564 size_t frame_size,
8565 - void **fpstate)
8566 + void __user **fpstate)
8567 {
8568 unsigned long sp;
8569
8570 @@ -382,7 +382,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8571
8572 if (used_math()) {
8573 sp = sp - sig_xstate_ia32_size;
8574 - *fpstate = (struct _fpstate_ia32 *) sp;
8575 + *fpstate = (struct _fpstate_ia32 __user *) sp;
8576 if (save_i387_xstate_ia32(*fpstate) < 0)
8577 return (void __user *) -1L;
8578 }
8579 @@ -390,7 +390,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8580 sp -= frame_size;
8581 /* Align the stack pointer according to the i386 ABI,
8582 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8583 - sp = ((sp + 4) & -16ul) - 4;
8584 + sp = ((sp - 12) & -16ul) - 4;
8585 return (void __user *) sp;
8586 }
8587
8588 @@ -448,7 +448,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8589 * These are actually not used anymore, but left because some
8590 * gdb versions depend on them as a marker.
8591 */
8592 - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8593 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8594 } put_user_catch(err);
8595
8596 if (err)
8597 @@ -490,7 +490,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8598 0xb8,
8599 __NR_ia32_rt_sigreturn,
8600 0x80cd,
8601 - 0,
8602 + 0
8603 };
8604
8605 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8606 @@ -520,16 +520,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8607
8608 if (ka->sa.sa_flags & SA_RESTORER)
8609 restorer = ka->sa.sa_restorer;
8610 + else if (current->mm->context.vdso)
8611 + /* Return stub is in 32bit vsyscall page */
8612 + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8613 else
8614 - restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8615 - rt_sigreturn);
8616 + restorer = &frame->retcode;
8617 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8618
8619 /*
8620 * Not actually used anymore, but left because some gdb
8621 * versions need it.
8622 */
8623 - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8624 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8625 } put_user_catch(err);
8626
8627 if (err)
8628 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8629 index 20e5f7b..f33c779 100644
8630 --- a/arch/x86/ia32/ia32entry.S
8631 +++ b/arch/x86/ia32/ia32entry.S
8632 @@ -14,8 +14,10 @@
8633 #include <asm/segment.h>
8634 #include <asm/irqflags.h>
8635 #include <asm/asm.h>
8636 +#include <asm/pgtable.h>
8637 #include <linux/linkage.h>
8638 #include <linux/err.h>
8639 +#include <asm/alternative-asm.h>
8640
8641 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8642 #include <linux/elf-em.h>
8643 @@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
8644 ENDPROC(native_irq_enable_sysexit)
8645 #endif
8646
8647 + .macro pax_enter_kernel_user
8648 + pax_set_fptr_mask
8649 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8650 + call pax_enter_kernel_user
8651 +#endif
8652 + .endm
8653 +
8654 + .macro pax_exit_kernel_user
8655 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8656 + call pax_exit_kernel_user
8657 +#endif
8658 +#ifdef CONFIG_PAX_RANDKSTACK
8659 + pushq %rax
8660 + pushq %r11
8661 + call pax_randomize_kstack
8662 + popq %r11
8663 + popq %rax
8664 +#endif
8665 + .endm
8666 +
8667 +.macro pax_erase_kstack
8668 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8669 + call pax_erase_kstack
8670 +#endif
8671 +.endm
8672 +
8673 /*
8674 * 32bit SYSENTER instruction entry.
8675 *
8676 @@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
8677 CFI_REGISTER rsp,rbp
8678 SWAPGS_UNSAFE_STACK
8679 movq PER_CPU_VAR(kernel_stack), %rsp
8680 - addq $(KERNEL_STACK_OFFSET),%rsp
8681 - /*
8682 - * No need to follow this irqs on/off section: the syscall
8683 - * disabled irqs, here we enable it straight after entry:
8684 - */
8685 - ENABLE_INTERRUPTS(CLBR_NONE)
8686 movl %ebp,%ebp /* zero extension */
8687 pushq_cfi $__USER32_DS
8688 /*CFI_REL_OFFSET ss,0*/
8689 @@ -134,22 +156,42 @@ ENTRY(ia32_sysenter_target)
8690 CFI_REL_OFFSET rsp,0
8691 pushfq_cfi
8692 /*CFI_REL_OFFSET rflags,0*/
8693 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
8694 - CFI_REGISTER rip,r10
8695 + orl $X86_EFLAGS_IF,(%rsp)
8696 + GET_THREAD_INFO(%r11)
8697 + movl TI_sysenter_return(%r11), %r11d
8698 + CFI_REGISTER rip,r11
8699 pushq_cfi $__USER32_CS
8700 /*CFI_REL_OFFSET cs,0*/
8701 movl %eax, %eax
8702 - pushq_cfi %r10
8703 + pushq_cfi %r11
8704 CFI_REL_OFFSET rip,0
8705 pushq_cfi %rax
8706 cld
8707 SAVE_ARGS 0,1,0
8708 + pax_enter_kernel_user
8709 +
8710 +#ifdef CONFIG_PAX_RANDKSTACK
8711 + pax_erase_kstack
8712 +#endif
8713 +
8714 + /*
8715 + * No need to follow this irqs on/off section: the syscall
8716 + * disabled irqs, here we enable it straight after entry:
8717 + */
8718 + ENABLE_INTERRUPTS(CLBR_NONE)
8719 /* no need to do an access_ok check here because rbp has been
8720 32bit zero extended */
8721 +
8722 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8723 + mov $PAX_USER_SHADOW_BASE,%r11
8724 + add %r11,%rbp
8725 +#endif
8726 +
8727 1: movl (%rbp),%ebp
8728 _ASM_EXTABLE(1b,ia32_badarg)
8729 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8730 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8731 + GET_THREAD_INFO(%r11)
8732 + orl $TS_COMPAT,TI_status(%r11)
8733 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8734 CFI_REMEMBER_STATE
8735 jnz sysenter_tracesys
8736 cmpq $(IA32_NR_syscalls-1),%rax
8737 @@ -159,12 +201,15 @@ sysenter_do_call:
8738 sysenter_dispatch:
8739 call *ia32_sys_call_table(,%rax,8)
8740 movq %rax,RAX-ARGOFFSET(%rsp)
8741 + GET_THREAD_INFO(%r11)
8742 DISABLE_INTERRUPTS(CLBR_NONE)
8743 TRACE_IRQS_OFF
8744 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8745 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8746 jnz sysexit_audit
8747 sysexit_from_sys_call:
8748 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8749 + pax_exit_kernel_user
8750 + pax_erase_kstack
8751 + andl $~TS_COMPAT,TI_status(%r11)
8752 /* clear IF, that popfq doesn't enable interrupts early */
8753 andl $~0x200,EFLAGS-R11(%rsp)
8754 movl RIP-R11(%rsp),%edx /* User %eip */
8755 @@ -190,6 +235,9 @@ sysexit_from_sys_call:
8756 movl %eax,%esi /* 2nd arg: syscall number */
8757 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8758 call __audit_syscall_entry
8759 +
8760 + pax_erase_kstack
8761 +
8762 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8763 cmpq $(IA32_NR_syscalls-1),%rax
8764 ja ia32_badsys
8765 @@ -201,7 +249,7 @@ sysexit_from_sys_call:
8766 .endm
8767
8768 .macro auditsys_exit exit
8769 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8770 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8771 jnz ia32_ret_from_sys_call
8772 TRACE_IRQS_ON
8773 sti
8774 @@ -212,11 +260,12 @@ sysexit_from_sys_call:
8775 1: setbe %al /* 1 if error, 0 if not */
8776 movzbl %al,%edi /* zero-extend that into %edi */
8777 call __audit_syscall_exit
8778 + GET_THREAD_INFO(%r11)
8779 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
8780 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8781 cli
8782 TRACE_IRQS_OFF
8783 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8784 + testl %edi,TI_flags(%r11)
8785 jz \exit
8786 CLEAR_RREGS -ARGOFFSET
8787 jmp int_with_check
8788 @@ -234,7 +283,7 @@ sysexit_audit:
8789
8790 sysenter_tracesys:
8791 #ifdef CONFIG_AUDITSYSCALL
8792 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8793 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8794 jz sysenter_auditsys
8795 #endif
8796 SAVE_REST
8797 @@ -246,6 +295,9 @@ sysenter_tracesys:
8798 RESTORE_REST
8799 cmpq $(IA32_NR_syscalls-1),%rax
8800 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
8801 +
8802 + pax_erase_kstack
8803 +
8804 jmp sysenter_do_call
8805 CFI_ENDPROC
8806 ENDPROC(ia32_sysenter_target)
8807 @@ -273,19 +325,25 @@ ENDPROC(ia32_sysenter_target)
8808 ENTRY(ia32_cstar_target)
8809 CFI_STARTPROC32 simple
8810 CFI_SIGNAL_FRAME
8811 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8812 + CFI_DEF_CFA rsp,0
8813 CFI_REGISTER rip,rcx
8814 /*CFI_REGISTER rflags,r11*/
8815 SWAPGS_UNSAFE_STACK
8816 movl %esp,%r8d
8817 CFI_REGISTER rsp,r8
8818 movq PER_CPU_VAR(kernel_stack),%rsp
8819 + SAVE_ARGS 8*6,0,0
8820 + pax_enter_kernel_user
8821 +
8822 +#ifdef CONFIG_PAX_RANDKSTACK
8823 + pax_erase_kstack
8824 +#endif
8825 +
8826 /*
8827 * No need to follow this irqs on/off section: the syscall
8828 * disabled irqs and here we enable it straight after entry:
8829 */
8830 ENABLE_INTERRUPTS(CLBR_NONE)
8831 - SAVE_ARGS 8,0,0
8832 movl %eax,%eax /* zero extension */
8833 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8834 movq %rcx,RIP-ARGOFFSET(%rsp)
8835 @@ -301,10 +359,17 @@ ENTRY(ia32_cstar_target)
8836 /* no need to do an access_ok check here because r8 has been
8837 32bit zero extended */
8838 /* hardware stack frame is complete now */
8839 +
8840 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8841 + mov $PAX_USER_SHADOW_BASE,%r11
8842 + add %r11,%r8
8843 +#endif
8844 +
8845 1: movl (%r8),%r9d
8846 _ASM_EXTABLE(1b,ia32_badarg)
8847 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8848 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8849 + GET_THREAD_INFO(%r11)
8850 + orl $TS_COMPAT,TI_status(%r11)
8851 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8852 CFI_REMEMBER_STATE
8853 jnz cstar_tracesys
8854 cmpq $IA32_NR_syscalls-1,%rax
8855 @@ -314,12 +379,15 @@ cstar_do_call:
8856 cstar_dispatch:
8857 call *ia32_sys_call_table(,%rax,8)
8858 movq %rax,RAX-ARGOFFSET(%rsp)
8859 + GET_THREAD_INFO(%r11)
8860 DISABLE_INTERRUPTS(CLBR_NONE)
8861 TRACE_IRQS_OFF
8862 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8863 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8864 jnz sysretl_audit
8865 sysretl_from_sys_call:
8866 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8867 + pax_exit_kernel_user
8868 + pax_erase_kstack
8869 + andl $~TS_COMPAT,TI_status(%r11)
8870 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8871 movl RIP-ARGOFFSET(%rsp),%ecx
8872 CFI_REGISTER rip,rcx
8873 @@ -347,7 +415,7 @@ sysretl_audit:
8874
8875 cstar_tracesys:
8876 #ifdef CONFIG_AUDITSYSCALL
8877 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8878 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8879 jz cstar_auditsys
8880 #endif
8881 xchgl %r9d,%ebp
8882 @@ -361,6 +429,9 @@ cstar_tracesys:
8883 xchgl %ebp,%r9d
8884 cmpq $(IA32_NR_syscalls-1),%rax
8885 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
8886 +
8887 + pax_erase_kstack
8888 +
8889 jmp cstar_do_call
8890 END(ia32_cstar_target)
8891
8892 @@ -401,19 +472,26 @@ ENTRY(ia32_syscall)
8893 CFI_REL_OFFSET rip,RIP-RIP
8894 PARAVIRT_ADJUST_EXCEPTION_FRAME
8895 SWAPGS
8896 - /*
8897 - * No need to follow this irqs on/off section: the syscall
8898 - * disabled irqs and here we enable it straight after entry:
8899 - */
8900 - ENABLE_INTERRUPTS(CLBR_NONE)
8901 movl %eax,%eax
8902 pushq_cfi %rax
8903 cld
8904 /* note the registers are not zero extended to the sf.
8905 this could be a problem. */
8906 SAVE_ARGS 0,1,0
8907 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8908 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8909 + pax_enter_kernel_user
8910 +
8911 +#ifdef CONFIG_PAX_RANDKSTACK
8912 + pax_erase_kstack
8913 +#endif
8914 +
8915 + /*
8916 + * No need to follow this irqs on/off section: the syscall
8917 + * disabled irqs and here we enable it straight after entry:
8918 + */
8919 + ENABLE_INTERRUPTS(CLBR_NONE)
8920 + GET_THREAD_INFO(%r11)
8921 + orl $TS_COMPAT,TI_status(%r11)
8922 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8923 jnz ia32_tracesys
8924 cmpq $(IA32_NR_syscalls-1),%rax
8925 ja ia32_badsys
8926 @@ -436,6 +514,9 @@ ia32_tracesys:
8927 RESTORE_REST
8928 cmpq $(IA32_NR_syscalls-1),%rax
8929 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
8930 +
8931 + pax_erase_kstack
8932 +
8933 jmp ia32_do_call
8934 END(ia32_syscall)
8935
8936 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8937 index 4540bec..714d913 100644
8938 --- a/arch/x86/ia32/sys_ia32.c
8939 +++ b/arch/x86/ia32/sys_ia32.c
8940 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8941 */
8942 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8943 {
8944 - typeof(ubuf->st_uid) uid = 0;
8945 - typeof(ubuf->st_gid) gid = 0;
8946 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
8947 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
8948 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
8949 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
8950 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8951 @@ -287,7 +287,7 @@ asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act,
8952 return ret;
8953 }
8954
8955 -asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
8956 +asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
8957 int options)
8958 {
8959 return compat_sys_wait4(pid, stat_addr, options, NULL);
8960 @@ -303,7 +303,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8961 mm_segment_t old_fs = get_fs();
8962
8963 set_fs(KERNEL_DS);
8964 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8965 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8966 set_fs(old_fs);
8967 if (put_compat_timespec(&t, interval))
8968 return -EFAULT;
8969 @@ -319,7 +319,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8970 mm_segment_t old_fs = get_fs();
8971
8972 set_fs(KERNEL_DS);
8973 - ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8974 + ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8975 set_fs(old_fs);
8976 if (!ret) {
8977 switch (_NSIG_WORDS) {
8978 @@ -344,7 +344,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8979 if (copy_siginfo_from_user32(&info, uinfo))
8980 return -EFAULT;
8981 set_fs(KERNEL_DS);
8982 - ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8983 + ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8984 set_fs(old_fs);
8985 return ret;
8986 }
8987 @@ -376,7 +376,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8988 return -EFAULT;
8989
8990 set_fs(KERNEL_DS);
8991 - ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8992 + ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8993 count);
8994 set_fs(old_fs);
8995
8996 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8997 index 952bd01..7692c6f 100644
8998 --- a/arch/x86/include/asm/alternative-asm.h
8999 +++ b/arch/x86/include/asm/alternative-asm.h
9000 @@ -15,6 +15,45 @@
9001 .endm
9002 #endif
9003
9004 +#ifdef KERNEXEC_PLUGIN
9005 + .macro pax_force_retaddr_bts rip=0
9006 + btsq $63,\rip(%rsp)
9007 + .endm
9008 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
9009 + .macro pax_force_retaddr rip=0, reload=0
9010 + btsq $63,\rip(%rsp)
9011 + .endm
9012 + .macro pax_force_fptr ptr
9013 + btsq $63,\ptr
9014 + .endm
9015 + .macro pax_set_fptr_mask
9016 + .endm
9017 +#endif
9018 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
9019 + .macro pax_force_retaddr rip=0, reload=0
9020 + .if \reload
9021 + pax_set_fptr_mask
9022 + .endif
9023 + orq %r10,\rip(%rsp)
9024 + .endm
9025 + .macro pax_force_fptr ptr
9026 + orq %r10,\ptr
9027 + .endm
9028 + .macro pax_set_fptr_mask
9029 + movabs $0x8000000000000000,%r10
9030 + .endm
9031 +#endif
9032 +#else
9033 + .macro pax_force_retaddr rip=0, reload=0
9034 + .endm
9035 + .macro pax_force_fptr ptr
9036 + .endm
9037 + .macro pax_force_retaddr_bts rip=0
9038 + .endm
9039 + .macro pax_set_fptr_mask
9040 + .endm
9041 +#endif
9042 +
9043 .macro altinstruction_entry orig alt feature orig_len alt_len
9044 .long \orig - .
9045 .long \alt - .
9046 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
9047 index 49331be..9706065 100644
9048 --- a/arch/x86/include/asm/alternative.h
9049 +++ b/arch/x86/include/asm/alternative.h
9050 @@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
9051 ".section .discard,\"aw\",@progbits\n" \
9052 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
9053 ".previous\n" \
9054 - ".section .altinstr_replacement, \"ax\"\n" \
9055 + ".section .altinstr_replacement, \"a\"\n" \
9056 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
9057 ".previous"
9058
9059 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
9060 index eaff479..3025a63 100644
9061 --- a/arch/x86/include/asm/apic.h
9062 +++ b/arch/x86/include/asm/apic.h
9063 @@ -44,7 +44,7 @@ static inline void generic_apic_probe(void)
9064
9065 #ifdef CONFIG_X86_LOCAL_APIC
9066
9067 -extern unsigned int apic_verbosity;
9068 +extern int apic_verbosity;
9069 extern int local_apic_timer_c2_ok;
9070
9071 extern int disable_apic;
9072 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
9073 index 20370c6..a2eb9b0 100644
9074 --- a/arch/x86/include/asm/apm.h
9075 +++ b/arch/x86/include/asm/apm.h
9076 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
9077 __asm__ __volatile__(APM_DO_ZERO_SEGS
9078 "pushl %%edi\n\t"
9079 "pushl %%ebp\n\t"
9080 - "lcall *%%cs:apm_bios_entry\n\t"
9081 + "lcall *%%ss:apm_bios_entry\n\t"
9082 "setc %%al\n\t"
9083 "popl %%ebp\n\t"
9084 "popl %%edi\n\t"
9085 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
9086 __asm__ __volatile__(APM_DO_ZERO_SEGS
9087 "pushl %%edi\n\t"
9088 "pushl %%ebp\n\t"
9089 - "lcall *%%cs:apm_bios_entry\n\t"
9090 + "lcall *%%ss:apm_bios_entry\n\t"
9091 "setc %%bl\n\t"
9092 "popl %%ebp\n\t"
9093 "popl %%edi\n\t"
9094 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
9095 index 58cb6d4..a4b806c 100644
9096 --- a/arch/x86/include/asm/atomic.h
9097 +++ b/arch/x86/include/asm/atomic.h
9098 @@ -22,7 +22,18 @@
9099 */
9100 static inline int atomic_read(const atomic_t *v)
9101 {
9102 - return (*(volatile int *)&(v)->counter);
9103 + return (*(volatile const int *)&(v)->counter);
9104 +}
9105 +
9106 +/**
9107 + * atomic_read_unchecked - read atomic variable
9108 + * @v: pointer of type atomic_unchecked_t
9109 + *
9110 + * Atomically reads the value of @v.
9111 + */
9112 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9113 +{
9114 + return (*(volatile const int *)&(v)->counter);
9115 }
9116
9117 /**
9118 @@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
9119 }
9120
9121 /**
9122 + * atomic_set_unchecked - set atomic variable
9123 + * @v: pointer of type atomic_unchecked_t
9124 + * @i: required value
9125 + *
9126 + * Atomically sets the value of @v to @i.
9127 + */
9128 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9129 +{
9130 + v->counter = i;
9131 +}
9132 +
9133 +/**
9134 * atomic_add - add integer to atomic variable
9135 * @i: integer value to add
9136 * @v: pointer of type atomic_t
9137 @@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
9138 */
9139 static inline void atomic_add(int i, atomic_t *v)
9140 {
9141 - asm volatile(LOCK_PREFIX "addl %1,%0"
9142 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
9143 +
9144 +#ifdef CONFIG_PAX_REFCOUNT
9145 + "jno 0f\n"
9146 + LOCK_PREFIX "subl %1,%0\n"
9147 + "int $4\n0:\n"
9148 + _ASM_EXTABLE(0b, 0b)
9149 +#endif
9150 +
9151 + : "+m" (v->counter)
9152 + : "ir" (i));
9153 +}
9154 +
9155 +/**
9156 + * atomic_add_unchecked - add integer to atomic variable
9157 + * @i: integer value to add
9158 + * @v: pointer of type atomic_unchecked_t
9159 + *
9160 + * Atomically adds @i to @v.
9161 + */
9162 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
9163 +{
9164 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
9165 : "+m" (v->counter)
9166 : "ir" (i));
9167 }
9168 @@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
9169 */
9170 static inline void atomic_sub(int i, atomic_t *v)
9171 {
9172 - asm volatile(LOCK_PREFIX "subl %1,%0"
9173 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
9174 +
9175 +#ifdef CONFIG_PAX_REFCOUNT
9176 + "jno 0f\n"
9177 + LOCK_PREFIX "addl %1,%0\n"
9178 + "int $4\n0:\n"
9179 + _ASM_EXTABLE(0b, 0b)
9180 +#endif
9181 +
9182 + : "+m" (v->counter)
9183 + : "ir" (i));
9184 +}
9185 +
9186 +/**
9187 + * atomic_sub_unchecked - subtract integer from atomic variable
9188 + * @i: integer value to subtract
9189 + * @v: pointer of type atomic_unchecked_t
9190 + *
9191 + * Atomically subtracts @i from @v.
9192 + */
9193 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
9194 +{
9195 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
9196 : "+m" (v->counter)
9197 : "ir" (i));
9198 }
9199 @@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
9200 {
9201 unsigned char c;
9202
9203 - asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
9204 + asm volatile(LOCK_PREFIX "subl %2,%0\n"
9205 +
9206 +#ifdef CONFIG_PAX_REFCOUNT
9207 + "jno 0f\n"
9208 + LOCK_PREFIX "addl %2,%0\n"
9209 + "int $4\n0:\n"
9210 + _ASM_EXTABLE(0b, 0b)
9211 +#endif
9212 +
9213 + "sete %1\n"
9214 : "+m" (v->counter), "=qm" (c)
9215 : "ir" (i) : "memory");
9216 return c;
9217 @@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
9218 */
9219 static inline void atomic_inc(atomic_t *v)
9220 {
9221 - asm volatile(LOCK_PREFIX "incl %0"
9222 + asm volatile(LOCK_PREFIX "incl %0\n"
9223 +
9224 +#ifdef CONFIG_PAX_REFCOUNT
9225 + "jno 0f\n"
9226 + LOCK_PREFIX "decl %0\n"
9227 + "int $4\n0:\n"
9228 + _ASM_EXTABLE(0b, 0b)
9229 +#endif
9230 +
9231 + : "+m" (v->counter));
9232 +}
9233 +
9234 +/**
9235 + * atomic_inc_unchecked - increment atomic variable
9236 + * @v: pointer of type atomic_unchecked_t
9237 + *
9238 + * Atomically increments @v by 1.
9239 + */
9240 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9241 +{
9242 + asm volatile(LOCK_PREFIX "incl %0\n"
9243 : "+m" (v->counter));
9244 }
9245
9246 @@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
9247 */
9248 static inline void atomic_dec(atomic_t *v)
9249 {
9250 - asm volatile(LOCK_PREFIX "decl %0"
9251 + asm volatile(LOCK_PREFIX "decl %0\n"
9252 +
9253 +#ifdef CONFIG_PAX_REFCOUNT
9254 + "jno 0f\n"
9255 + LOCK_PREFIX "incl %0\n"
9256 + "int $4\n0:\n"
9257 + _ASM_EXTABLE(0b, 0b)
9258 +#endif
9259 +
9260 + : "+m" (v->counter));
9261 +}
9262 +
9263 +/**
9264 + * atomic_dec_unchecked - decrement atomic variable
9265 + * @v: pointer of type atomic_unchecked_t
9266 + *
9267 + * Atomically decrements @v by 1.
9268 + */
9269 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9270 +{
9271 + asm volatile(LOCK_PREFIX "decl %0\n"
9272 : "+m" (v->counter));
9273 }
9274
9275 @@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
9276 {
9277 unsigned char c;
9278
9279 - asm volatile(LOCK_PREFIX "decl %0; sete %1"
9280 + asm volatile(LOCK_PREFIX "decl %0\n"
9281 +
9282 +#ifdef CONFIG_PAX_REFCOUNT
9283 + "jno 0f\n"
9284 + LOCK_PREFIX "incl %0\n"
9285 + "int $4\n0:\n"
9286 + _ASM_EXTABLE(0b, 0b)
9287 +#endif
9288 +
9289 + "sete %1\n"
9290 : "+m" (v->counter), "=qm" (c)
9291 : : "memory");
9292 return c != 0;
9293 @@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
9294 {
9295 unsigned char c;
9296
9297 - asm volatile(LOCK_PREFIX "incl %0; sete %1"
9298 + asm volatile(LOCK_PREFIX "incl %0\n"
9299 +
9300 +#ifdef CONFIG_PAX_REFCOUNT
9301 + "jno 0f\n"
9302 + LOCK_PREFIX "decl %0\n"
9303 + "int $4\n0:\n"
9304 + _ASM_EXTABLE(0b, 0b)
9305 +#endif
9306 +
9307 + "sete %1\n"
9308 + : "+m" (v->counter), "=qm" (c)
9309 + : : "memory");
9310 + return c != 0;
9311 +}
9312 +
9313 +/**
9314 + * atomic_inc_and_test_unchecked - increment and test
9315 + * @v: pointer of type atomic_unchecked_t
9316 + *
9317 + * Atomically increments @v by 1
9318 + * and returns true if the result is zero, or false for all
9319 + * other cases.
9320 + */
9321 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9322 +{
9323 + unsigned char c;
9324 +
9325 + asm volatile(LOCK_PREFIX "incl %0\n"
9326 + "sete %1\n"
9327 : "+m" (v->counter), "=qm" (c)
9328 : : "memory");
9329 return c != 0;
9330 @@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9331 {
9332 unsigned char c;
9333
9334 - asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
9335 + asm volatile(LOCK_PREFIX "addl %2,%0\n"
9336 +
9337 +#ifdef CONFIG_PAX_REFCOUNT
9338 + "jno 0f\n"
9339 + LOCK_PREFIX "subl %2,%0\n"
9340 + "int $4\n0:\n"
9341 + _ASM_EXTABLE(0b, 0b)
9342 +#endif
9343 +
9344 + "sets %1\n"
9345 : "+m" (v->counter), "=qm" (c)
9346 : "ir" (i) : "memory");
9347 return c;
9348 @@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
9349 goto no_xadd;
9350 #endif
9351 /* Modern 486+ processor */
9352 - return i + xadd(&v->counter, i);
9353 + return i + xadd_check_overflow(&v->counter, i);
9354
9355 #ifdef CONFIG_M386
9356 no_xadd: /* Legacy 386 processor */
9357 @@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
9358 }
9359
9360 /**
9361 + * atomic_add_return_unchecked - add integer and return
9362 + * @i: integer value to add
9363 + * @v: pointer of type atomic_unchecked_t
9364 + *
9365 + * Atomically adds @i to @v and returns @i + @v
9366 + */
9367 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9368 +{
9369 +#ifdef CONFIG_M386
9370 + int __i;
9371 + unsigned long flags;
9372 + if (unlikely(boot_cpu_data.x86 <= 3))
9373 + goto no_xadd;
9374 +#endif
9375 + /* Modern 486+ processor */
9376 + return i + xadd(&v->counter, i);
9377 +
9378 +#ifdef CONFIG_M386
9379 +no_xadd: /* Legacy 386 processor */
9380 + raw_local_irq_save(flags);
9381 + __i = atomic_read_unchecked(v);
9382 + atomic_set_unchecked(v, i + __i);
9383 + raw_local_irq_restore(flags);
9384 + return i + __i;
9385 +#endif
9386 +}
9387 +
9388 +/**
9389 * atomic_sub_return - subtract integer and return
9390 * @v: pointer of type atomic_t
9391 * @i: integer value to subtract
9392 @@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
9393 }
9394
9395 #define atomic_inc_return(v) (atomic_add_return(1, v))
9396 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9397 +{
9398 + return atomic_add_return_unchecked(1, v);
9399 +}
9400 #define atomic_dec_return(v) (atomic_sub_return(1, v))
9401
9402 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9403 @@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9404 return cmpxchg(&v->counter, old, new);
9405 }
9406
9407 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9408 +{
9409 + return cmpxchg(&v->counter, old, new);
9410 +}
9411 +
9412 static inline int atomic_xchg(atomic_t *v, int new)
9413 {
9414 return xchg(&v->counter, new);
9415 }
9416
9417 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9418 +{
9419 + return xchg(&v->counter, new);
9420 +}
9421 +
9422 /**
9423 * __atomic_add_unless - add unless the number is already a given value
9424 * @v: pointer of type atomic_t
9425 @@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9426 */
9427 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9428 {
9429 - int c, old;
9430 + int c, old, new;
9431 c = atomic_read(v);
9432 for (;;) {
9433 - if (unlikely(c == (u)))
9434 + if (unlikely(c == u))
9435 break;
9436 - old = atomic_cmpxchg((v), c, c + (a));
9437 +
9438 + asm volatile("addl %2,%0\n"
9439 +
9440 +#ifdef CONFIG_PAX_REFCOUNT
9441 + "jno 0f\n"
9442 + "subl %2,%0\n"
9443 + "int $4\n0:\n"
9444 + _ASM_EXTABLE(0b, 0b)
9445 +#endif
9446 +
9447 + : "=r" (new)
9448 + : "0" (c), "ir" (a));
9449 +
9450 + old = atomic_cmpxchg(v, c, new);
9451 if (likely(old == c))
9452 break;
9453 c = old;
9454 @@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9455 return c;
9456 }
9457
9458 +/**
9459 + * atomic_inc_not_zero_hint - increment if not null
9460 + * @v: pointer of type atomic_t
9461 + * @hint: probable value of the atomic before the increment
9462 + *
9463 + * This version of atomic_inc_not_zero() gives a hint of probable
9464 + * value of the atomic. This helps processor to not read the memory
9465 + * before doing the atomic read/modify/write cycle, lowering
9466 + * number of bus transactions on some arches.
9467 + *
9468 + * Returns: 0 if increment was not done, 1 otherwise.
9469 + */
9470 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9471 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9472 +{
9473 + int val, c = hint, new;
9474 +
9475 + /* sanity test, should be removed by compiler if hint is a constant */
9476 + if (!hint)
9477 + return __atomic_add_unless(v, 1, 0);
9478 +
9479 + do {
9480 + asm volatile("incl %0\n"
9481 +
9482 +#ifdef CONFIG_PAX_REFCOUNT
9483 + "jno 0f\n"
9484 + "decl %0\n"
9485 + "int $4\n0:\n"
9486 + _ASM_EXTABLE(0b, 0b)
9487 +#endif
9488 +
9489 + : "=r" (new)
9490 + : "0" (c));
9491 +
9492 + val = atomic_cmpxchg(v, c, new);
9493 + if (val == c)
9494 + return 1;
9495 + c = val;
9496 + } while (c);
9497 +
9498 + return 0;
9499 +}
9500
9501 /*
9502 * atomic_dec_if_positive - decrement by 1 if old value positive
9503 @@ -293,14 +552,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
9504 #endif
9505
9506 /* These are x86-specific, used by some header files */
9507 -#define atomic_clear_mask(mask, addr) \
9508 - asm volatile(LOCK_PREFIX "andl %0,%1" \
9509 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
9510 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
9511 +{
9512 + asm volatile(LOCK_PREFIX "andl %1,%0"
9513 + : "+m" (v->counter)
9514 + : "r" (~(mask))
9515 + : "memory");
9516 +}
9517
9518 -#define atomic_set_mask(mask, addr) \
9519 - asm volatile(LOCK_PREFIX "orl %0,%1" \
9520 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
9521 - : "memory")
9522 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
9523 +{
9524 + asm volatile(LOCK_PREFIX "andl %1,%0"
9525 + : "+m" (v->counter)
9526 + : "r" (~(mask))
9527 + : "memory");
9528 +}
9529 +
9530 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
9531 +{
9532 + asm volatile(LOCK_PREFIX "orl %1,%0"
9533 + : "+m" (v->counter)
9534 + : "r" (mask)
9535 + : "memory");
9536 +}
9537 +
9538 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
9539 +{
9540 + asm volatile(LOCK_PREFIX "orl %1,%0"
9541 + : "+m" (v->counter)
9542 + : "r" (mask)
9543 + : "memory");
9544 +}
9545
9546 /* Atomic operations are already serializing on x86 */
9547 #define smp_mb__before_atomic_dec() barrier()
9548 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9549 index b154de7..aadebd8 100644
9550 --- a/arch/x86/include/asm/atomic64_32.h
9551 +++ b/arch/x86/include/asm/atomic64_32.h
9552 @@ -12,6 +12,14 @@ typedef struct {
9553 u64 __aligned(8) counter;
9554 } atomic64_t;
9555
9556 +#ifdef CONFIG_PAX_REFCOUNT
9557 +typedef struct {
9558 + u64 __aligned(8) counter;
9559 +} atomic64_unchecked_t;
9560 +#else
9561 +typedef atomic64_t atomic64_unchecked_t;
9562 +#endif
9563 +
9564 #define ATOMIC64_INIT(val) { (val) }
9565
9566 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
9567 @@ -37,21 +45,31 @@ typedef struct {
9568 ATOMIC64_DECL_ONE(sym##_386)
9569
9570 ATOMIC64_DECL_ONE(add_386);
9571 +ATOMIC64_DECL_ONE(add_unchecked_386);
9572 ATOMIC64_DECL_ONE(sub_386);
9573 +ATOMIC64_DECL_ONE(sub_unchecked_386);
9574 ATOMIC64_DECL_ONE(inc_386);
9575 +ATOMIC64_DECL_ONE(inc_unchecked_386);
9576 ATOMIC64_DECL_ONE(dec_386);
9577 +ATOMIC64_DECL_ONE(dec_unchecked_386);
9578 #endif
9579
9580 #define alternative_atomic64(f, out, in...) \
9581 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
9582
9583 ATOMIC64_DECL(read);
9584 +ATOMIC64_DECL(read_unchecked);
9585 ATOMIC64_DECL(set);
9586 +ATOMIC64_DECL(set_unchecked);
9587 ATOMIC64_DECL(xchg);
9588 ATOMIC64_DECL(add_return);
9589 +ATOMIC64_DECL(add_return_unchecked);
9590 ATOMIC64_DECL(sub_return);
9591 +ATOMIC64_DECL(sub_return_unchecked);
9592 ATOMIC64_DECL(inc_return);
9593 +ATOMIC64_DECL(inc_return_unchecked);
9594 ATOMIC64_DECL(dec_return);
9595 +ATOMIC64_DECL(dec_return_unchecked);
9596 ATOMIC64_DECL(dec_if_positive);
9597 ATOMIC64_DECL(inc_not_zero);
9598 ATOMIC64_DECL(add_unless);
9599 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9600 }
9601
9602 /**
9603 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9604 + * @p: pointer to type atomic64_unchecked_t
9605 + * @o: expected value
9606 + * @n: new value
9607 + *
9608 + * Atomically sets @v to @n if it was equal to @o and returns
9609 + * the old value.
9610 + */
9611 +
9612 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9613 +{
9614 + return cmpxchg64(&v->counter, o, n);
9615 +}
9616 +
9617 +/**
9618 * atomic64_xchg - xchg atomic64 variable
9619 * @v: pointer to type atomic64_t
9620 * @n: value to assign
9621 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9622 }
9623
9624 /**
9625 + * atomic64_set_unchecked - set atomic64 variable
9626 + * @v: pointer to type atomic64_unchecked_t
9627 + * @n: value to assign
9628 + *
9629 + * Atomically sets the value of @v to @n.
9630 + */
9631 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9632 +{
9633 + unsigned high = (unsigned)(i >> 32);
9634 + unsigned low = (unsigned)i;
9635 + alternative_atomic64(set, /* no output */,
9636 + "S" (v), "b" (low), "c" (high)
9637 + : "eax", "edx", "memory");
9638 +}
9639 +
9640 +/**
9641 * atomic64_read - read atomic64 variable
9642 * @v: pointer to type atomic64_t
9643 *
9644 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
9645 }
9646
9647 /**
9648 + * atomic64_read_unchecked - read atomic64 variable
9649 + * @v: pointer to type atomic64_unchecked_t
9650 + *
9651 + * Atomically reads the value of @v and returns it.
9652 + */
9653 +static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9654 +{
9655 + long long r;
9656 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
9657 + return r;
9658 + }
9659 +
9660 +/**
9661 * atomic64_add_return - add and return
9662 * @i: integer value to add
9663 * @v: pointer to type atomic64_t
9664 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9665 return i;
9666 }
9667
9668 +/**
9669 + * atomic64_add_return_unchecked - add and return
9670 + * @i: integer value to add
9671 + * @v: pointer to type atomic64_unchecked_t
9672 + *
9673 + * Atomically adds @i to @v and returns @i + *@v
9674 + */
9675 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9676 +{
9677 + alternative_atomic64(add_return_unchecked,
9678 + ASM_OUTPUT2("+A" (i), "+c" (v)),
9679 + ASM_NO_INPUT_CLOBBER("memory"));
9680 + return i;
9681 +}
9682 +
9683 /*
9684 * Other variants with different arithmetic operators:
9685 */
9686 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9687 return a;
9688 }
9689
9690 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9691 +{
9692 + long long a;
9693 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
9694 + "S" (v) : "memory", "ecx");
9695 + return a;
9696 +}
9697 +
9698 static inline long long atomic64_dec_return(atomic64_t *v)
9699 {
9700 long long a;
9701 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9702 }
9703
9704 /**
9705 + * atomic64_add_unchecked - add integer to atomic64 variable
9706 + * @i: integer value to add
9707 + * @v: pointer to type atomic64_unchecked_t
9708 + *
9709 + * Atomically adds @i to @v.
9710 + */
9711 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9712 +{
9713 + __alternative_atomic64(add_unchecked, add_return_unchecked,
9714 + ASM_OUTPUT2("+A" (i), "+c" (v)),
9715 + ASM_NO_INPUT_CLOBBER("memory"));
9716 + return i;
9717 +}
9718 +
9719 +/**
9720 * atomic64_sub - subtract the atomic64 variable
9721 * @i: integer value to subtract
9722 * @v: pointer to type atomic64_t
9723 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9724 index 0e1cbfc..5623683 100644
9725 --- a/arch/x86/include/asm/atomic64_64.h
9726 +++ b/arch/x86/include/asm/atomic64_64.h
9727 @@ -18,7 +18,19 @@
9728 */
9729 static inline long atomic64_read(const atomic64_t *v)
9730 {
9731 - return (*(volatile long *)&(v)->counter);
9732 + return (*(volatile const long *)&(v)->counter);
9733 +}
9734 +
9735 +/**
9736 + * atomic64_read_unchecked - read atomic64 variable
9737 + * @v: pointer of type atomic64_unchecked_t
9738 + *
9739 + * Atomically reads the value of @v.
9740 + * Doesn't imply a read memory barrier.
9741 + */
9742 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9743 +{
9744 + return (*(volatile const long *)&(v)->counter);
9745 }
9746
9747 /**
9748 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9749 }
9750
9751 /**
9752 + * atomic64_set_unchecked - set atomic64 variable
9753 + * @v: pointer to type atomic64_unchecked_t
9754 + * @i: required value
9755 + *
9756 + * Atomically sets the value of @v to @i.
9757 + */
9758 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9759 +{
9760 + v->counter = i;
9761 +}
9762 +
9763 +/**
9764 * atomic64_add - add integer to atomic64 variable
9765 * @i: integer value to add
9766 * @v: pointer to type atomic64_t
9767 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9768 */
9769 static inline void atomic64_add(long i, atomic64_t *v)
9770 {
9771 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
9772 +
9773 +#ifdef CONFIG_PAX_REFCOUNT
9774 + "jno 0f\n"
9775 + LOCK_PREFIX "subq %1,%0\n"
9776 + "int $4\n0:\n"
9777 + _ASM_EXTABLE(0b, 0b)
9778 +#endif
9779 +
9780 + : "=m" (v->counter)
9781 + : "er" (i), "m" (v->counter));
9782 +}
9783 +
9784 +/**
9785 + * atomic64_add_unchecked - add integer to atomic64 variable
9786 + * @i: integer value to add
9787 + * @v: pointer to type atomic64_unchecked_t
9788 + *
9789 + * Atomically adds @i to @v.
9790 + */
9791 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9792 +{
9793 asm volatile(LOCK_PREFIX "addq %1,%0"
9794 : "=m" (v->counter)
9795 : "er" (i), "m" (v->counter));
9796 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9797 */
9798 static inline void atomic64_sub(long i, atomic64_t *v)
9799 {
9800 - asm volatile(LOCK_PREFIX "subq %1,%0"
9801 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
9802 +
9803 +#ifdef CONFIG_PAX_REFCOUNT
9804 + "jno 0f\n"
9805 + LOCK_PREFIX "addq %1,%0\n"
9806 + "int $4\n0:\n"
9807 + _ASM_EXTABLE(0b, 0b)
9808 +#endif
9809 +
9810 + : "=m" (v->counter)
9811 + : "er" (i), "m" (v->counter));
9812 +}
9813 +
9814 +/**
9815 + * atomic64_sub_unchecked - subtract the atomic64 variable
9816 + * @i: integer value to subtract
9817 + * @v: pointer to type atomic64_unchecked_t
9818 + *
9819 + * Atomically subtracts @i from @v.
9820 + */
9821 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9822 +{
9823 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
9824 : "=m" (v->counter)
9825 : "er" (i), "m" (v->counter));
9826 }
9827 @@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9828 {
9829 unsigned char c;
9830
9831 - asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9832 + asm volatile(LOCK_PREFIX "subq %2,%0\n"
9833 +
9834 +#ifdef CONFIG_PAX_REFCOUNT
9835 + "jno 0f\n"
9836 + LOCK_PREFIX "addq %2,%0\n"
9837 + "int $4\n0:\n"
9838 + _ASM_EXTABLE(0b, 0b)
9839 +#endif
9840 +
9841 + "sete %1\n"
9842 : "=m" (v->counter), "=qm" (c)
9843 : "er" (i), "m" (v->counter) : "memory");
9844 return c;
9845 @@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9846 */
9847 static inline void atomic64_inc(atomic64_t *v)
9848 {
9849 + asm volatile(LOCK_PREFIX "incq %0\n"
9850 +
9851 +#ifdef CONFIG_PAX_REFCOUNT
9852 + "jno 0f\n"
9853 + LOCK_PREFIX "decq %0\n"
9854 + "int $4\n0:\n"
9855 + _ASM_EXTABLE(0b, 0b)
9856 +#endif
9857 +
9858 + : "=m" (v->counter)
9859 + : "m" (v->counter));
9860 +}
9861 +
9862 +/**
9863 + * atomic64_inc_unchecked - increment atomic64 variable
9864 + * @v: pointer to type atomic64_unchecked_t
9865 + *
9866 + * Atomically increments @v by 1.
9867 + */
9868 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9869 +{
9870 asm volatile(LOCK_PREFIX "incq %0"
9871 : "=m" (v->counter)
9872 : "m" (v->counter));
9873 @@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9874 */
9875 static inline void atomic64_dec(atomic64_t *v)
9876 {
9877 - asm volatile(LOCK_PREFIX "decq %0"
9878 + asm volatile(LOCK_PREFIX "decq %0\n"
9879 +
9880 +#ifdef CONFIG_PAX_REFCOUNT
9881 + "jno 0f\n"
9882 + LOCK_PREFIX "incq %0\n"
9883 + "int $4\n0:\n"
9884 + _ASM_EXTABLE(0b, 0b)
9885 +#endif
9886 +
9887 + : "=m" (v->counter)
9888 + : "m" (v->counter));
9889 +}
9890 +
9891 +/**
9892 + * atomic64_dec_unchecked - decrement atomic64 variable
9893 + * @v: pointer to type atomic64_t
9894 + *
9895 + * Atomically decrements @v by 1.
9896 + */
9897 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9898 +{
9899 + asm volatile(LOCK_PREFIX "decq %0\n"
9900 : "=m" (v->counter)
9901 : "m" (v->counter));
9902 }
9903 @@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9904 {
9905 unsigned char c;
9906
9907 - asm volatile(LOCK_PREFIX "decq %0; sete %1"
9908 + asm volatile(LOCK_PREFIX "decq %0\n"
9909 +
9910 +#ifdef CONFIG_PAX_REFCOUNT
9911 + "jno 0f\n"
9912 + LOCK_PREFIX "incq %0\n"
9913 + "int $4\n0:\n"
9914 + _ASM_EXTABLE(0b, 0b)
9915 +#endif
9916 +
9917 + "sete %1\n"
9918 : "=m" (v->counter), "=qm" (c)
9919 : "m" (v->counter) : "memory");
9920 return c != 0;
9921 @@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9922 {
9923 unsigned char c;
9924
9925 - asm volatile(LOCK_PREFIX "incq %0; sete %1"
9926 + asm volatile(LOCK_PREFIX "incq %0\n"
9927 +
9928 +#ifdef CONFIG_PAX_REFCOUNT
9929 + "jno 0f\n"
9930 + LOCK_PREFIX "decq %0\n"
9931 + "int $4\n0:\n"
9932 + _ASM_EXTABLE(0b, 0b)
9933 +#endif
9934 +
9935 + "sete %1\n"
9936 : "=m" (v->counter), "=qm" (c)
9937 : "m" (v->counter) : "memory");
9938 return c != 0;
9939 @@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9940 {
9941 unsigned char c;
9942
9943 - asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9944 + asm volatile(LOCK_PREFIX "addq %2,%0\n"
9945 +
9946 +#ifdef CONFIG_PAX_REFCOUNT
9947 + "jno 0f\n"
9948 + LOCK_PREFIX "subq %2,%0\n"
9949 + "int $4\n0:\n"
9950 + _ASM_EXTABLE(0b, 0b)
9951 +#endif
9952 +
9953 + "sets %1\n"
9954 : "=m" (v->counter), "=qm" (c)
9955 : "er" (i), "m" (v->counter) : "memory");
9956 return c;
9957 @@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9958 */
9959 static inline long atomic64_add_return(long i, atomic64_t *v)
9960 {
9961 + return i + xadd_check_overflow(&v->counter, i);
9962 +}
9963 +
9964 +/**
9965 + * atomic64_add_return_unchecked - add and return
9966 + * @i: integer value to add
9967 + * @v: pointer to type atomic64_unchecked_t
9968 + *
9969 + * Atomically adds @i to @v and returns @i + @v
9970 + */
9971 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9972 +{
9973 return i + xadd(&v->counter, i);
9974 }
9975
9976 @@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9977 }
9978
9979 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9980 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9981 +{
9982 + return atomic64_add_return_unchecked(1, v);
9983 +}
9984 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9985
9986 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9987 @@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9988 return cmpxchg(&v->counter, old, new);
9989 }
9990
9991 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9992 +{
9993 + return cmpxchg(&v->counter, old, new);
9994 +}
9995 +
9996 static inline long atomic64_xchg(atomic64_t *v, long new)
9997 {
9998 return xchg(&v->counter, new);
9999 @@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
10000 */
10001 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
10002 {
10003 - long c, old;
10004 + long c, old, new;
10005 c = atomic64_read(v);
10006 for (;;) {
10007 - if (unlikely(c == (u)))
10008 + if (unlikely(c == u))
10009 break;
10010 - old = atomic64_cmpxchg((v), c, c + (a));
10011 +
10012 + asm volatile("add %2,%0\n"
10013 +
10014 +#ifdef CONFIG_PAX_REFCOUNT
10015 + "jno 0f\n"
10016 + "sub %2,%0\n"
10017 + "int $4\n0:\n"
10018 + _ASM_EXTABLE(0b, 0b)
10019 +#endif
10020 +
10021 + : "=r" (new)
10022 + : "0" (c), "ir" (a));
10023 +
10024 + old = atomic64_cmpxchg(v, c, new);
10025 if (likely(old == c))
10026 break;
10027 c = old;
10028 }
10029 - return c != (u);
10030 + return c != u;
10031 }
10032
10033 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10034 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
10035 index a6983b2..63f48a2 100644
10036 --- a/arch/x86/include/asm/bitops.h
10037 +++ b/arch/x86/include/asm/bitops.h
10038 @@ -40,7 +40,7 @@
10039 * a mask operation on a byte.
10040 */
10041 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
10042 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
10043 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
10044 #define CONST_MASK(nr) (1 << ((nr) & 7))
10045
10046 /**
10047 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
10048 index b13fe63..0dab13a 100644
10049 --- a/arch/x86/include/asm/boot.h
10050 +++ b/arch/x86/include/asm/boot.h
10051 @@ -11,10 +11,15 @@
10052 #include <asm/pgtable_types.h>
10053
10054 /* Physical address where kernel should be loaded. */
10055 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
10056 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
10057 + (CONFIG_PHYSICAL_ALIGN - 1)) \
10058 & ~(CONFIG_PHYSICAL_ALIGN - 1))
10059
10060 +#ifndef __ASSEMBLY__
10061 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
10062 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
10063 +#endif
10064 +
10065 /* Minimum kernel alignment, as a power of two */
10066 #ifdef CONFIG_X86_64
10067 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
10068 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
10069 index 48f99f1..d78ebf9 100644
10070 --- a/arch/x86/include/asm/cache.h
10071 +++ b/arch/x86/include/asm/cache.h
10072 @@ -5,12 +5,13 @@
10073
10074 /* L1 cache line size */
10075 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
10076 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
10077 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10078
10079 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
10080 +#define __read_only __attribute__((__section__(".data..read_only")))
10081
10082 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
10083 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
10084 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
10085
10086 #ifdef CONFIG_X86_VSMP
10087 #ifdef CONFIG_SMP
10088 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
10089 index 9863ee3..4a1f8e1 100644
10090 --- a/arch/x86/include/asm/cacheflush.h
10091 +++ b/arch/x86/include/asm/cacheflush.h
10092 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
10093 unsigned long pg_flags = pg->flags & _PGMT_MASK;
10094
10095 if (pg_flags == _PGMT_DEFAULT)
10096 - return -1;
10097 + return ~0UL;
10098 else if (pg_flags == _PGMT_WC)
10099 return _PAGE_CACHE_WC;
10100 else if (pg_flags == _PGMT_UC_MINUS)
10101 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
10102 index 46fc474..b02b0f9 100644
10103 --- a/arch/x86/include/asm/checksum_32.h
10104 +++ b/arch/x86/include/asm/checksum_32.h
10105 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
10106 int len, __wsum sum,
10107 int *src_err_ptr, int *dst_err_ptr);
10108
10109 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
10110 + int len, __wsum sum,
10111 + int *src_err_ptr, int *dst_err_ptr);
10112 +
10113 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
10114 + int len, __wsum sum,
10115 + int *src_err_ptr, int *dst_err_ptr);
10116 +
10117 /*
10118 * Note: when you get a NULL pointer exception here this means someone
10119 * passed in an incorrect kernel address to one of these functions.
10120 @@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
10121 int *err_ptr)
10122 {
10123 might_sleep();
10124 - return csum_partial_copy_generic((__force void *)src, dst,
10125 + return csum_partial_copy_generic_from_user((__force void *)src, dst,
10126 len, sum, err_ptr, NULL);
10127 }
10128
10129 @@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
10130 {
10131 might_sleep();
10132 if (access_ok(VERIFY_WRITE, dst, len))
10133 - return csum_partial_copy_generic(src, (__force void *)dst,
10134 + return csum_partial_copy_generic_to_user(src, (__force void *)dst,
10135 len, sum, NULL, err_ptr);
10136
10137 if (len)
10138 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
10139 index 99480e5..d81165b 100644
10140 --- a/arch/x86/include/asm/cmpxchg.h
10141 +++ b/arch/x86/include/asm/cmpxchg.h
10142 @@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
10143 __compiletime_error("Bad argument size for cmpxchg");
10144 extern void __xadd_wrong_size(void)
10145 __compiletime_error("Bad argument size for xadd");
10146 +extern void __xadd_check_overflow_wrong_size(void)
10147 + __compiletime_error("Bad argument size for xadd_check_overflow");
10148 extern void __add_wrong_size(void)
10149 __compiletime_error("Bad argument size for add");
10150 +extern void __add_check_overflow_wrong_size(void)
10151 + __compiletime_error("Bad argument size for add_check_overflow");
10152
10153 /*
10154 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
10155 @@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
10156 __ret; \
10157 })
10158
10159 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
10160 + ({ \
10161 + __typeof__ (*(ptr)) __ret = (arg); \
10162 + switch (sizeof(*(ptr))) { \
10163 + case __X86_CASE_L: \
10164 + asm volatile (lock #op "l %0, %1\n" \
10165 + "jno 0f\n" \
10166 + "mov %0,%1\n" \
10167 + "int $4\n0:\n" \
10168 + _ASM_EXTABLE(0b, 0b) \
10169 + : "+r" (__ret), "+m" (*(ptr)) \
10170 + : : "memory", "cc"); \
10171 + break; \
10172 + case __X86_CASE_Q: \
10173 + asm volatile (lock #op "q %q0, %1\n" \
10174 + "jno 0f\n" \
10175 + "mov %0,%1\n" \
10176 + "int $4\n0:\n" \
10177 + _ASM_EXTABLE(0b, 0b) \
10178 + : "+r" (__ret), "+m" (*(ptr)) \
10179 + : : "memory", "cc"); \
10180 + break; \
10181 + default: \
10182 + __ ## op ## _check_overflow_wrong_size(); \
10183 + } \
10184 + __ret; \
10185 + })
10186 +
10187 /*
10188 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
10189 * Since this is generally used to protect other memory information, we
10190 @@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
10191 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
10192 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
10193
10194 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
10195 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
10196 +
10197 #define __add(ptr, inc, lock) \
10198 ({ \
10199 __typeof__ (*(ptr)) __ret = (inc); \
10200 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
10201 index f91e80f..7f9bd27 100644
10202 --- a/arch/x86/include/asm/cpufeature.h
10203 +++ b/arch/x86/include/asm/cpufeature.h
10204 @@ -371,7 +371,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
10205 ".section .discard,\"aw\",@progbits\n"
10206 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
10207 ".previous\n"
10208 - ".section .altinstr_replacement,\"ax\"\n"
10209 + ".section .altinstr_replacement,\"a\"\n"
10210 "3: movb $1,%0\n"
10211 "4:\n"
10212 ".previous\n"
10213 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
10214 index 8bf1c06..f723dfd 100644
10215 --- a/arch/x86/include/asm/desc.h
10216 +++ b/arch/x86/include/asm/desc.h
10217 @@ -4,6 +4,7 @@
10218 #include <asm/desc_defs.h>
10219 #include <asm/ldt.h>
10220 #include <asm/mmu.h>
10221 +#include <asm/pgtable.h>
10222
10223 #include <linux/smp.h>
10224 #include <linux/percpu.h>
10225 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
10226
10227 desc->type = (info->read_exec_only ^ 1) << 1;
10228 desc->type |= info->contents << 2;
10229 + desc->type |= info->seg_not_present ^ 1;
10230
10231 desc->s = 1;
10232 desc->dpl = 0x3;
10233 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
10234 }
10235
10236 extern struct desc_ptr idt_descr;
10237 -extern gate_desc idt_table[];
10238 extern struct desc_ptr nmi_idt_descr;
10239 -extern gate_desc nmi_idt_table[];
10240 -
10241 -struct gdt_page {
10242 - struct desc_struct gdt[GDT_ENTRIES];
10243 -} __attribute__((aligned(PAGE_SIZE)));
10244 -
10245 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
10246 +extern gate_desc idt_table[256];
10247 +extern gate_desc nmi_idt_table[256];
10248
10249 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
10250 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
10251 {
10252 - return per_cpu(gdt_page, cpu).gdt;
10253 + return cpu_gdt_table[cpu];
10254 }
10255
10256 #ifdef CONFIG_X86_64
10257 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
10258 unsigned long base, unsigned dpl, unsigned flags,
10259 unsigned short seg)
10260 {
10261 - gate->a = (seg << 16) | (base & 0xffff);
10262 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
10263 + gate->gate.offset_low = base;
10264 + gate->gate.seg = seg;
10265 + gate->gate.reserved = 0;
10266 + gate->gate.type = type;
10267 + gate->gate.s = 0;
10268 + gate->gate.dpl = dpl;
10269 + gate->gate.p = 1;
10270 + gate->gate.offset_high = base >> 16;
10271 }
10272
10273 #endif
10274 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
10275
10276 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
10277 {
10278 + pax_open_kernel();
10279 memcpy(&idt[entry], gate, sizeof(*gate));
10280 + pax_close_kernel();
10281 }
10282
10283 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
10284 {
10285 + pax_open_kernel();
10286 memcpy(&ldt[entry], desc, 8);
10287 + pax_close_kernel();
10288 }
10289
10290 static inline void
10291 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
10292 default: size = sizeof(*gdt); break;
10293 }
10294
10295 + pax_open_kernel();
10296 memcpy(&gdt[entry], desc, size);
10297 + pax_close_kernel();
10298 }
10299
10300 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
10301 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
10302
10303 static inline void native_load_tr_desc(void)
10304 {
10305 + pax_open_kernel();
10306 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
10307 + pax_close_kernel();
10308 }
10309
10310 static inline void native_load_gdt(const struct desc_ptr *dtr)
10311 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
10312 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
10313 unsigned int i;
10314
10315 + pax_open_kernel();
10316 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
10317 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
10318 + pax_close_kernel();
10319 }
10320
10321 #define _LDT_empty(info) \
10322 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
10323 }
10324
10325 #ifdef CONFIG_X86_64
10326 -static inline void set_nmi_gate(int gate, void *addr)
10327 +static inline void set_nmi_gate(int gate, const void *addr)
10328 {
10329 gate_desc s;
10330
10331 @@ -320,7 +333,7 @@ static inline void set_nmi_gate(int gate, void *addr)
10332 }
10333 #endif
10334
10335 -static inline void _set_gate(int gate, unsigned type, void *addr,
10336 +static inline void _set_gate(int gate, unsigned type, const void *addr,
10337 unsigned dpl, unsigned ist, unsigned seg)
10338 {
10339 gate_desc s;
10340 @@ -339,7 +352,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
10341 * Pentium F0 0F bugfix can have resulted in the mapped
10342 * IDT being write-protected.
10343 */
10344 -static inline void set_intr_gate(unsigned int n, void *addr)
10345 +static inline void set_intr_gate(unsigned int n, const void *addr)
10346 {
10347 BUG_ON((unsigned)n > 0xFF);
10348 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
10349 @@ -369,19 +382,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
10350 /*
10351 * This routine sets up an interrupt gate at directory privilege level 3.
10352 */
10353 -static inline void set_system_intr_gate(unsigned int n, void *addr)
10354 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
10355 {
10356 BUG_ON((unsigned)n > 0xFF);
10357 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
10358 }
10359
10360 -static inline void set_system_trap_gate(unsigned int n, void *addr)
10361 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
10362 {
10363 BUG_ON((unsigned)n > 0xFF);
10364 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
10365 }
10366
10367 -static inline void set_trap_gate(unsigned int n, void *addr)
10368 +static inline void set_trap_gate(unsigned int n, const void *addr)
10369 {
10370 BUG_ON((unsigned)n > 0xFF);
10371 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
10372 @@ -390,19 +403,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
10373 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
10374 {
10375 BUG_ON((unsigned)n > 0xFF);
10376 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
10377 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
10378 }
10379
10380 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
10381 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
10382 {
10383 BUG_ON((unsigned)n > 0xFF);
10384 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
10385 }
10386
10387 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
10388 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
10389 {
10390 BUG_ON((unsigned)n > 0xFF);
10391 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
10392 }
10393
10394 +#ifdef CONFIG_X86_32
10395 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
10396 +{
10397 + struct desc_struct d;
10398 +
10399 + if (likely(limit))
10400 + limit = (limit - 1UL) >> PAGE_SHIFT;
10401 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
10402 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
10403 +}
10404 +#endif
10405 +
10406 #endif /* _ASM_X86_DESC_H */
10407 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
10408 index 278441f..b95a174 100644
10409 --- a/arch/x86/include/asm/desc_defs.h
10410 +++ b/arch/x86/include/asm/desc_defs.h
10411 @@ -31,6 +31,12 @@ struct desc_struct {
10412 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
10413 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
10414 };
10415 + struct {
10416 + u16 offset_low;
10417 + u16 seg;
10418 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
10419 + unsigned offset_high: 16;
10420 + } gate;
10421 };
10422 } __attribute__((packed));
10423
10424 diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
10425 index 3778256..c5d4fce 100644
10426 --- a/arch/x86/include/asm/e820.h
10427 +++ b/arch/x86/include/asm/e820.h
10428 @@ -69,7 +69,7 @@ struct e820map {
10429 #define ISA_START_ADDRESS 0xa0000
10430 #define ISA_END_ADDRESS 0x100000
10431
10432 -#define BIOS_BEGIN 0x000a0000
10433 +#define BIOS_BEGIN 0x000c0000
10434 #define BIOS_END 0x00100000
10435
10436 #define BIOS_ROM_BASE 0xffe00000
10437 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
10438 index 5939f44..f8845f6 100644
10439 --- a/arch/x86/include/asm/elf.h
10440 +++ b/arch/x86/include/asm/elf.h
10441 @@ -243,7 +243,25 @@ extern int force_personality32;
10442 the loader. We need to make sure that it is out of the way of the program
10443 that it will "exec", and that there is sufficient room for the brk. */
10444
10445 +#ifdef CONFIG_PAX_SEGMEXEC
10446 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
10447 +#else
10448 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
10449 +#endif
10450 +
10451 +#ifdef CONFIG_PAX_ASLR
10452 +#ifdef CONFIG_X86_32
10453 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
10454 +
10455 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
10456 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
10457 +#else
10458 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
10459 +
10460 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
10461 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
10462 +#endif
10463 +#endif
10464
10465 /* This yields a mask that user programs can use to figure out what
10466 instruction set this CPU supports. This could be done in user space,
10467 @@ -296,16 +314,12 @@ do { \
10468
10469 #define ARCH_DLINFO \
10470 do { \
10471 - if (vdso_enabled) \
10472 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10473 - (unsigned long)current->mm->context.vdso); \
10474 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10475 } while (0)
10476
10477 #define ARCH_DLINFO_X32 \
10478 do { \
10479 - if (vdso_enabled) \
10480 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10481 - (unsigned long)current->mm->context.vdso); \
10482 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10483 } while (0)
10484
10485 #define AT_SYSINFO 32
10486 @@ -320,7 +334,7 @@ else \
10487
10488 #endif /* !CONFIG_X86_32 */
10489
10490 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
10491 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10492
10493 #define VDSO_ENTRY \
10494 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10495 @@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
10496 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10497 #define compat_arch_setup_additional_pages syscall32_setup_pages
10498
10499 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10500 -#define arch_randomize_brk arch_randomize_brk
10501 -
10502 /*
10503 * True on X86_32 or when emulating IA32 on X86_64
10504 */
10505 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10506 index cc70c1c..d96d011 100644
10507 --- a/arch/x86/include/asm/emergency-restart.h
10508 +++ b/arch/x86/include/asm/emergency-restart.h
10509 @@ -15,6 +15,6 @@ enum reboot_type {
10510
10511 extern enum reboot_type reboot_type;
10512
10513 -extern void machine_emergency_restart(void);
10514 +extern void machine_emergency_restart(void) __noreturn;
10515
10516 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10517 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
10518 index 75f4c6d..ee3eb8f 100644
10519 --- a/arch/x86/include/asm/fpu-internal.h
10520 +++ b/arch/x86/include/asm/fpu-internal.h
10521 @@ -86,6 +86,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10522 {
10523 int err;
10524
10525 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10526 + if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10527 + fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10528 +#endif
10529 +
10530 /* See comment in fxsave() below. */
10531 #ifdef CONFIG_AS_FXSAVEQ
10532 asm volatile("1: fxrstorq %[fx]\n\t"
10533 @@ -115,6 +120,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10534 {
10535 int err;
10536
10537 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10538 + if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10539 + fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10540 +#endif
10541 +
10542 /*
10543 * Clear the bytes not touched by the fxsave and reserved
10544 * for the SW usage.
10545 @@ -271,7 +281,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
10546 "emms\n\t" /* clear stack tags */
10547 "fildl %P[addr]", /* set F?P to defined value */
10548 X86_FEATURE_FXSAVE_LEAK,
10549 - [addr] "m" (tsk->thread.fpu.has_fpu));
10550 + [addr] "m" (init_tss[smp_processor_id()].x86_tss.sp0));
10551
10552 return fpu_restore_checking(&tsk->thread.fpu);
10553 }
10554 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10555 index 71ecbcb..bac10b7 100644
10556 --- a/arch/x86/include/asm/futex.h
10557 +++ b/arch/x86/include/asm/futex.h
10558 @@ -11,16 +11,18 @@
10559 #include <asm/processor.h>
10560
10561 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10562 + typecheck(u32 __user *, uaddr); \
10563 asm volatile("1:\t" insn "\n" \
10564 "2:\t.section .fixup,\"ax\"\n" \
10565 "3:\tmov\t%3, %1\n" \
10566 "\tjmp\t2b\n" \
10567 "\t.previous\n" \
10568 _ASM_EXTABLE(1b, 3b) \
10569 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10570 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10571 : "i" (-EFAULT), "0" (oparg), "1" (0))
10572
10573 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10574 + typecheck(u32 __user *, uaddr); \
10575 asm volatile("1:\tmovl %2, %0\n" \
10576 "\tmovl\t%0, %3\n" \
10577 "\t" insn "\n" \
10578 @@ -33,7 +35,7 @@
10579 _ASM_EXTABLE(1b, 4b) \
10580 _ASM_EXTABLE(2b, 4b) \
10581 : "=&a" (oldval), "=&r" (ret), \
10582 - "+m" (*uaddr), "=&r" (tem) \
10583 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10584 : "r" (oparg), "i" (-EFAULT), "1" (0))
10585
10586 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10587 @@ -60,10 +62,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10588
10589 switch (op) {
10590 case FUTEX_OP_SET:
10591 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10592 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10593 break;
10594 case FUTEX_OP_ADD:
10595 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10596 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10597 uaddr, oparg);
10598 break;
10599 case FUTEX_OP_OR:
10600 @@ -122,13 +124,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10601 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10602 return -EFAULT;
10603
10604 - asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10605 + asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10606 "2:\t.section .fixup, \"ax\"\n"
10607 "3:\tmov %3, %0\n"
10608 "\tjmp 2b\n"
10609 "\t.previous\n"
10610 _ASM_EXTABLE(1b, 3b)
10611 - : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10612 + : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10613 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10614 : "memory"
10615 );
10616 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10617 index eb92a6e..b98b2f4 100644
10618 --- a/arch/x86/include/asm/hw_irq.h
10619 +++ b/arch/x86/include/asm/hw_irq.h
10620 @@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10621 extern void enable_IO_APIC(void);
10622
10623 /* Statistics */
10624 -extern atomic_t irq_err_count;
10625 -extern atomic_t irq_mis_count;
10626 +extern atomic_unchecked_t irq_err_count;
10627 +extern atomic_unchecked_t irq_mis_count;
10628
10629 /* EISA */
10630 extern void eisa_set_level_irq(unsigned int irq);
10631 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10632 index d8e8eef..99f81ae 100644
10633 --- a/arch/x86/include/asm/io.h
10634 +++ b/arch/x86/include/asm/io.h
10635 @@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10636
10637 #include <linux/vmalloc.h>
10638
10639 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10640 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10641 +{
10642 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10643 +}
10644 +
10645 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10646 +{
10647 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10648 +}
10649 +
10650 /*
10651 * Convert a virtual cached pointer to an uncached pointer
10652 */
10653 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10654 index bba3cf8..06bc8da 100644
10655 --- a/arch/x86/include/asm/irqflags.h
10656 +++ b/arch/x86/include/asm/irqflags.h
10657 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10658 sti; \
10659 sysexit
10660
10661 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
10662 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10663 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
10664 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10665 +
10666 #else
10667 #define INTERRUPT_RETURN iret
10668 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10669 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10670 index 5478825..839e88c 100644
10671 --- a/arch/x86/include/asm/kprobes.h
10672 +++ b/arch/x86/include/asm/kprobes.h
10673 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10674 #define RELATIVEJUMP_SIZE 5
10675 #define RELATIVECALL_OPCODE 0xe8
10676 #define RELATIVE_ADDR_SIZE 4
10677 -#define MAX_STACK_SIZE 64
10678 -#define MIN_STACK_SIZE(ADDR) \
10679 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10680 - THREAD_SIZE - (unsigned long)(ADDR))) \
10681 - ? (MAX_STACK_SIZE) \
10682 - : (((unsigned long)current_thread_info()) + \
10683 - THREAD_SIZE - (unsigned long)(ADDR)))
10684 +#define MAX_STACK_SIZE 64UL
10685 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10686
10687 #define flush_insn_slot(p) do { } while (0)
10688
10689 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10690 index db7c1f2..92f130a 100644
10691 --- a/arch/x86/include/asm/kvm_host.h
10692 +++ b/arch/x86/include/asm/kvm_host.h
10693 @@ -680,7 +680,7 @@ struct kvm_x86_ops {
10694 int (*check_intercept)(struct kvm_vcpu *vcpu,
10695 struct x86_instruction_info *info,
10696 enum x86_intercept_stage stage);
10697 -};
10698 +} __do_const;
10699
10700 struct kvm_arch_async_pf {
10701 u32 token;
10702 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10703 index c8bed0d..e5721fa 100644
10704 --- a/arch/x86/include/asm/local.h
10705 +++ b/arch/x86/include/asm/local.h
10706 @@ -17,26 +17,58 @@ typedef struct {
10707
10708 static inline void local_inc(local_t *l)
10709 {
10710 - asm volatile(_ASM_INC "%0"
10711 + asm volatile(_ASM_INC "%0\n"
10712 +
10713 +#ifdef CONFIG_PAX_REFCOUNT
10714 + "jno 0f\n"
10715 + _ASM_DEC "%0\n"
10716 + "int $4\n0:\n"
10717 + _ASM_EXTABLE(0b, 0b)
10718 +#endif
10719 +
10720 : "+m" (l->a.counter));
10721 }
10722
10723 static inline void local_dec(local_t *l)
10724 {
10725 - asm volatile(_ASM_DEC "%0"
10726 + asm volatile(_ASM_DEC "%0\n"
10727 +
10728 +#ifdef CONFIG_PAX_REFCOUNT
10729 + "jno 0f\n"
10730 + _ASM_INC "%0\n"
10731 + "int $4\n0:\n"
10732 + _ASM_EXTABLE(0b, 0b)
10733 +#endif
10734 +
10735 : "+m" (l->a.counter));
10736 }
10737
10738 static inline void local_add(long i, local_t *l)
10739 {
10740 - asm volatile(_ASM_ADD "%1,%0"
10741 + asm volatile(_ASM_ADD "%1,%0\n"
10742 +
10743 +#ifdef CONFIG_PAX_REFCOUNT
10744 + "jno 0f\n"
10745 + _ASM_SUB "%1,%0\n"
10746 + "int $4\n0:\n"
10747 + _ASM_EXTABLE(0b, 0b)
10748 +#endif
10749 +
10750 : "+m" (l->a.counter)
10751 : "ir" (i));
10752 }
10753
10754 static inline void local_sub(long i, local_t *l)
10755 {
10756 - asm volatile(_ASM_SUB "%1,%0"
10757 + asm volatile(_ASM_SUB "%1,%0\n"
10758 +
10759 +#ifdef CONFIG_PAX_REFCOUNT
10760 + "jno 0f\n"
10761 + _ASM_ADD "%1,%0\n"
10762 + "int $4\n0:\n"
10763 + _ASM_EXTABLE(0b, 0b)
10764 +#endif
10765 +
10766 : "+m" (l->a.counter)
10767 : "ir" (i));
10768 }
10769 @@ -54,7 +86,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10770 {
10771 unsigned char c;
10772
10773 - asm volatile(_ASM_SUB "%2,%0; sete %1"
10774 + asm volatile(_ASM_SUB "%2,%0\n"
10775 +
10776 +#ifdef CONFIG_PAX_REFCOUNT
10777 + "jno 0f\n"
10778 + _ASM_ADD "%2,%0\n"
10779 + "int $4\n0:\n"
10780 + _ASM_EXTABLE(0b, 0b)
10781 +#endif
10782 +
10783 + "sete %1\n"
10784 : "+m" (l->a.counter), "=qm" (c)
10785 : "ir" (i) : "memory");
10786 return c;
10787 @@ -72,7 +113,16 @@ static inline int local_dec_and_test(local_t *l)
10788 {
10789 unsigned char c;
10790
10791 - asm volatile(_ASM_DEC "%0; sete %1"
10792 + asm volatile(_ASM_DEC "%0\n"
10793 +
10794 +#ifdef CONFIG_PAX_REFCOUNT
10795 + "jno 0f\n"
10796 + _ASM_INC "%0\n"
10797 + "int $4\n0:\n"
10798 + _ASM_EXTABLE(0b, 0b)
10799 +#endif
10800 +
10801 + "sete %1\n"
10802 : "+m" (l->a.counter), "=qm" (c)
10803 : : "memory");
10804 return c != 0;
10805 @@ -90,7 +140,16 @@ static inline int local_inc_and_test(local_t *l)
10806 {
10807 unsigned char c;
10808
10809 - asm volatile(_ASM_INC "%0; sete %1"
10810 + asm volatile(_ASM_INC "%0\n"
10811 +
10812 +#ifdef CONFIG_PAX_REFCOUNT
10813 + "jno 0f\n"
10814 + _ASM_DEC "%0\n"
10815 + "int $4\n0:\n"
10816 + _ASM_EXTABLE(0b, 0b)
10817 +#endif
10818 +
10819 + "sete %1\n"
10820 : "+m" (l->a.counter), "=qm" (c)
10821 : : "memory");
10822 return c != 0;
10823 @@ -109,7 +168,16 @@ static inline int local_add_negative(long i, local_t *l)
10824 {
10825 unsigned char c;
10826
10827 - asm volatile(_ASM_ADD "%2,%0; sets %1"
10828 + asm volatile(_ASM_ADD "%2,%0\n"
10829 +
10830 +#ifdef CONFIG_PAX_REFCOUNT
10831 + "jno 0f\n"
10832 + _ASM_SUB "%2,%0\n"
10833 + "int $4\n0:\n"
10834 + _ASM_EXTABLE(0b, 0b)
10835 +#endif
10836 +
10837 + "sets %1\n"
10838 : "+m" (l->a.counter), "=qm" (c)
10839 : "ir" (i) : "memory");
10840 return c;
10841 @@ -132,7 +200,15 @@ static inline long local_add_return(long i, local_t *l)
10842 #endif
10843 /* Modern 486+ processor */
10844 __i = i;
10845 - asm volatile(_ASM_XADD "%0, %1;"
10846 + asm volatile(_ASM_XADD "%0, %1\n"
10847 +
10848 +#ifdef CONFIG_PAX_REFCOUNT
10849 + "jno 0f\n"
10850 + _ASM_MOV "%0,%1\n"
10851 + "int $4\n0:\n"
10852 + _ASM_EXTABLE(0b, 0b)
10853 +#endif
10854 +
10855 : "+r" (i), "+m" (l->a.counter)
10856 : : "memory");
10857 return i + __i;
10858 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10859 index 593e51d..fa69c9a 100644
10860 --- a/arch/x86/include/asm/mman.h
10861 +++ b/arch/x86/include/asm/mman.h
10862 @@ -5,4 +5,14 @@
10863
10864 #include <asm-generic/mman.h>
10865
10866 +#ifdef __KERNEL__
10867 +#ifndef __ASSEMBLY__
10868 +#ifdef CONFIG_X86_32
10869 +#define arch_mmap_check i386_mmap_check
10870 +int i386_mmap_check(unsigned long addr, unsigned long len,
10871 + unsigned long flags);
10872 +#endif
10873 +#endif
10874 +#endif
10875 +
10876 #endif /* _ASM_X86_MMAN_H */
10877 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10878 index 5f55e69..e20bfb1 100644
10879 --- a/arch/x86/include/asm/mmu.h
10880 +++ b/arch/x86/include/asm/mmu.h
10881 @@ -9,7 +9,7 @@
10882 * we put the segment information here.
10883 */
10884 typedef struct {
10885 - void *ldt;
10886 + struct desc_struct *ldt;
10887 int size;
10888
10889 #ifdef CONFIG_X86_64
10890 @@ -18,7 +18,19 @@ typedef struct {
10891 #endif
10892
10893 struct mutex lock;
10894 - void *vdso;
10895 + unsigned long vdso;
10896 +
10897 +#ifdef CONFIG_X86_32
10898 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10899 + unsigned long user_cs_base;
10900 + unsigned long user_cs_limit;
10901 +
10902 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10903 + cpumask_t cpu_user_cs_mask;
10904 +#endif
10905 +
10906 +#endif
10907 +#endif
10908 } mm_context_t;
10909
10910 #ifdef CONFIG_SMP
10911 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10912 index cdbf367..adb37ac 100644
10913 --- a/arch/x86/include/asm/mmu_context.h
10914 +++ b/arch/x86/include/asm/mmu_context.h
10915 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10916
10917 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10918 {
10919 +
10920 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10921 + unsigned int i;
10922 + pgd_t *pgd;
10923 +
10924 + pax_open_kernel();
10925 + pgd = get_cpu_pgd(smp_processor_id());
10926 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10927 + set_pgd_batched(pgd+i, native_make_pgd(0));
10928 + pax_close_kernel();
10929 +#endif
10930 +
10931 #ifdef CONFIG_SMP
10932 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10933 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10934 @@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10935 struct task_struct *tsk)
10936 {
10937 unsigned cpu = smp_processor_id();
10938 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10939 + int tlbstate = TLBSTATE_OK;
10940 +#endif
10941
10942 if (likely(prev != next)) {
10943 #ifdef CONFIG_SMP
10944 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10945 + tlbstate = this_cpu_read(cpu_tlbstate.state);
10946 +#endif
10947 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10948 this_cpu_write(cpu_tlbstate.active_mm, next);
10949 #endif
10950 cpumask_set_cpu(cpu, mm_cpumask(next));
10951
10952 /* Re-load page tables */
10953 +#ifdef CONFIG_PAX_PER_CPU_PGD
10954 + pax_open_kernel();
10955 + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd);
10956 + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd);
10957 + pax_close_kernel();
10958 + load_cr3(get_cpu_pgd(cpu));
10959 +#else
10960 load_cr3(next->pgd);
10961 +#endif
10962
10963 /* stop flush ipis for the previous mm */
10964 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10965 @@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10966 */
10967 if (unlikely(prev->context.ldt != next->context.ldt))
10968 load_LDT_nolock(&next->context);
10969 - }
10970 +
10971 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10972 + if (!(__supported_pte_mask & _PAGE_NX)) {
10973 + smp_mb__before_clear_bit();
10974 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10975 + smp_mb__after_clear_bit();
10976 + cpu_set(cpu, next->context.cpu_user_cs_mask);
10977 + }
10978 +#endif
10979 +
10980 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10981 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10982 + prev->context.user_cs_limit != next->context.user_cs_limit))
10983 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10984 #ifdef CONFIG_SMP
10985 + else if (unlikely(tlbstate != TLBSTATE_OK))
10986 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10987 +#endif
10988 +#endif
10989 +
10990 + }
10991 else {
10992 +
10993 +#ifdef CONFIG_PAX_PER_CPU_PGD
10994 + pax_open_kernel();
10995 + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd);
10996 + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd);
10997 + pax_close_kernel();
10998 + load_cr3(get_cpu_pgd(cpu));
10999 +#endif
11000 +
11001 +#ifdef CONFIG_SMP
11002 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
11003 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
11004
11005 @@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
11006 * tlb flush IPI delivery. We must reload CR3
11007 * to make sure to use no freed page tables.
11008 */
11009 +
11010 +#ifndef CONFIG_PAX_PER_CPU_PGD
11011 load_cr3(next->pgd);
11012 +#endif
11013 +
11014 load_LDT_nolock(&next->context);
11015 +
11016 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
11017 + if (!(__supported_pte_mask & _PAGE_NX))
11018 + cpu_set(cpu, next->context.cpu_user_cs_mask);
11019 +#endif
11020 +
11021 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
11022 +#ifdef CONFIG_PAX_PAGEEXEC
11023 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
11024 +#endif
11025 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
11026 +#endif
11027 +
11028 }
11029 +#endif
11030 }
11031 -#endif
11032 }
11033
11034 #define activate_mm(prev, next) \
11035 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
11036 index 9eae775..c914fea 100644
11037 --- a/arch/x86/include/asm/module.h
11038 +++ b/arch/x86/include/asm/module.h
11039 @@ -5,6 +5,7 @@
11040
11041 #ifdef CONFIG_X86_64
11042 /* X86_64 does not define MODULE_PROC_FAMILY */
11043 +#define MODULE_PROC_FAMILY ""
11044 #elif defined CONFIG_M386
11045 #define MODULE_PROC_FAMILY "386 "
11046 #elif defined CONFIG_M486
11047 @@ -59,8 +60,20 @@
11048 #error unknown processor family
11049 #endif
11050
11051 -#ifdef CONFIG_X86_32
11052 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
11053 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
11054 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
11055 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
11056 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
11057 +#else
11058 +#define MODULE_PAX_KERNEXEC ""
11059 #endif
11060
11061 +#ifdef CONFIG_PAX_MEMORY_UDEREF
11062 +#define MODULE_PAX_UDEREF "UDEREF "
11063 +#else
11064 +#define MODULE_PAX_UDEREF ""
11065 +#endif
11066 +
11067 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
11068 +
11069 #endif /* _ASM_X86_MODULE_H */
11070 diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
11071 index 320f7bb..e89f8f8 100644
11072 --- a/arch/x86/include/asm/page_64_types.h
11073 +++ b/arch/x86/include/asm/page_64_types.h
11074 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
11075
11076 /* duplicated to the one in bootmem.h */
11077 extern unsigned long max_pfn;
11078 -extern unsigned long phys_base;
11079 +extern const unsigned long phys_base;
11080
11081 extern unsigned long __phys_addr(unsigned long);
11082 #define __phys_reloc_hide(x) (x)
11083 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
11084 index 6cbbabf..11b3aed 100644
11085 --- a/arch/x86/include/asm/paravirt.h
11086 +++ b/arch/x86/include/asm/paravirt.h
11087 @@ -668,6 +668,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
11088 val);
11089 }
11090
11091 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11092 +{
11093 + pgdval_t val = native_pgd_val(pgd);
11094 +
11095 + if (sizeof(pgdval_t) > sizeof(long))
11096 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
11097 + val, (u64)val >> 32);
11098 + else
11099 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
11100 + val);
11101 +}
11102 +
11103 static inline void pgd_clear(pgd_t *pgdp)
11104 {
11105 set_pgd(pgdp, __pgd(0));
11106 @@ -749,6 +761,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
11107 pv_mmu_ops.set_fixmap(idx, phys, flags);
11108 }
11109
11110 +#ifdef CONFIG_PAX_KERNEXEC
11111 +static inline unsigned long pax_open_kernel(void)
11112 +{
11113 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
11114 +}
11115 +
11116 +static inline unsigned long pax_close_kernel(void)
11117 +{
11118 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
11119 +}
11120 +#else
11121 +static inline unsigned long pax_open_kernel(void) { return 0; }
11122 +static inline unsigned long pax_close_kernel(void) { return 0; }
11123 +#endif
11124 +
11125 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
11126
11127 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
11128 @@ -965,7 +992,7 @@ extern void default_banner(void);
11129
11130 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
11131 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
11132 -#define PARA_INDIRECT(addr) *%cs:addr
11133 +#define PARA_INDIRECT(addr) *%ss:addr
11134 #endif
11135
11136 #define INTERRUPT_RETURN \
11137 @@ -1040,6 +1067,21 @@ extern void default_banner(void);
11138 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
11139 CLBR_NONE, \
11140 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
11141 +
11142 +#define GET_CR0_INTO_RDI \
11143 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
11144 + mov %rax,%rdi
11145 +
11146 +#define SET_RDI_INTO_CR0 \
11147 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
11148 +
11149 +#define GET_CR3_INTO_RDI \
11150 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
11151 + mov %rax,%rdi
11152 +
11153 +#define SET_RDI_INTO_CR3 \
11154 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
11155 +
11156 #endif /* CONFIG_X86_32 */
11157
11158 #endif /* __ASSEMBLY__ */
11159 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
11160 index 8e8b9a4..f07d725 100644
11161 --- a/arch/x86/include/asm/paravirt_types.h
11162 +++ b/arch/x86/include/asm/paravirt_types.h
11163 @@ -84,20 +84,20 @@ struct pv_init_ops {
11164 */
11165 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
11166 unsigned long addr, unsigned len);
11167 -};
11168 +} __no_const;
11169
11170
11171 struct pv_lazy_ops {
11172 /* Set deferred update mode, used for batching operations. */
11173 void (*enter)(void);
11174 void (*leave)(void);
11175 -};
11176 +} __no_const;
11177
11178 struct pv_time_ops {
11179 unsigned long long (*sched_clock)(void);
11180 unsigned long long (*steal_clock)(int cpu);
11181 unsigned long (*get_tsc_khz)(void);
11182 -};
11183 +} __no_const;
11184
11185 struct pv_cpu_ops {
11186 /* hooks for various privileged instructions */
11187 @@ -193,7 +193,7 @@ struct pv_cpu_ops {
11188
11189 void (*start_context_switch)(struct task_struct *prev);
11190 void (*end_context_switch)(struct task_struct *next);
11191 -};
11192 +} __no_const;
11193
11194 struct pv_irq_ops {
11195 /*
11196 @@ -224,7 +224,7 @@ struct pv_apic_ops {
11197 unsigned long start_eip,
11198 unsigned long start_esp);
11199 #endif
11200 -};
11201 +} __no_const;
11202
11203 struct pv_mmu_ops {
11204 unsigned long (*read_cr2)(void);
11205 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
11206 struct paravirt_callee_save make_pud;
11207
11208 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
11209 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
11210 #endif /* PAGETABLE_LEVELS == 4 */
11211 #endif /* PAGETABLE_LEVELS >= 3 */
11212
11213 @@ -324,6 +325,12 @@ struct pv_mmu_ops {
11214 an mfn. We can tell which is which from the index. */
11215 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
11216 phys_addr_t phys, pgprot_t flags);
11217 +
11218 +#ifdef CONFIG_PAX_KERNEXEC
11219 + unsigned long (*pax_open_kernel)(void);
11220 + unsigned long (*pax_close_kernel)(void);
11221 +#endif
11222 +
11223 };
11224
11225 struct arch_spinlock;
11226 @@ -334,7 +341,7 @@ struct pv_lock_ops {
11227 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
11228 int (*spin_trylock)(struct arch_spinlock *lock);
11229 void (*spin_unlock)(struct arch_spinlock *lock);
11230 -};
11231 +} __no_const;
11232
11233 /* This contains all the paravirt structures: we get a convenient
11234 * number for each function using the offset which we use to indicate
11235 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
11236 index b4389a4..7024269 100644
11237 --- a/arch/x86/include/asm/pgalloc.h
11238 +++ b/arch/x86/include/asm/pgalloc.h
11239 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
11240 pmd_t *pmd, pte_t *pte)
11241 {
11242 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
11243 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
11244 +}
11245 +
11246 +static inline void pmd_populate_user(struct mm_struct *mm,
11247 + pmd_t *pmd, pte_t *pte)
11248 +{
11249 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
11250 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
11251 }
11252
11253 @@ -99,12 +106,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
11254
11255 #ifdef CONFIG_X86_PAE
11256 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
11257 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
11258 +{
11259 + pud_populate(mm, pudp, pmd);
11260 +}
11261 #else /* !CONFIG_X86_PAE */
11262 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
11263 {
11264 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
11265 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
11266 }
11267 +
11268 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
11269 +{
11270 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
11271 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
11272 +}
11273 #endif /* CONFIG_X86_PAE */
11274
11275 #if PAGETABLE_LEVELS > 3
11276 @@ -114,6 +131,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
11277 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
11278 }
11279
11280 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
11281 +{
11282 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
11283 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
11284 +}
11285 +
11286 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
11287 {
11288 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
11289 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
11290 index 98391db..8f6984e 100644
11291 --- a/arch/x86/include/asm/pgtable-2level.h
11292 +++ b/arch/x86/include/asm/pgtable-2level.h
11293 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
11294
11295 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11296 {
11297 + pax_open_kernel();
11298 *pmdp = pmd;
11299 + pax_close_kernel();
11300 }
11301
11302 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11303 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
11304 index cb00ccc..17e9054 100644
11305 --- a/arch/x86/include/asm/pgtable-3level.h
11306 +++ b/arch/x86/include/asm/pgtable-3level.h
11307 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11308
11309 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11310 {
11311 + pax_open_kernel();
11312 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
11313 + pax_close_kernel();
11314 }
11315
11316 static inline void native_set_pud(pud_t *pudp, pud_t pud)
11317 {
11318 + pax_open_kernel();
11319 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
11320 + pax_close_kernel();
11321 }
11322
11323 /*
11324 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
11325 index 49afb3f..91a8c63 100644
11326 --- a/arch/x86/include/asm/pgtable.h
11327 +++ b/arch/x86/include/asm/pgtable.h
11328 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
11329
11330 #ifndef __PAGETABLE_PUD_FOLDED
11331 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
11332 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
11333 #define pgd_clear(pgd) native_pgd_clear(pgd)
11334 #endif
11335
11336 @@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
11337
11338 #define arch_end_context_switch(prev) do {} while(0)
11339
11340 +#define pax_open_kernel() native_pax_open_kernel()
11341 +#define pax_close_kernel() native_pax_close_kernel()
11342 #endif /* CONFIG_PARAVIRT */
11343
11344 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
11345 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
11346 +
11347 +#ifdef CONFIG_PAX_KERNEXEC
11348 +static inline unsigned long native_pax_open_kernel(void)
11349 +{
11350 + unsigned long cr0;
11351 +
11352 + preempt_disable();
11353 + barrier();
11354 + cr0 = read_cr0() ^ X86_CR0_WP;
11355 + BUG_ON(unlikely(cr0 & X86_CR0_WP));
11356 + write_cr0(cr0);
11357 + return cr0 ^ X86_CR0_WP;
11358 +}
11359 +
11360 +static inline unsigned long native_pax_close_kernel(void)
11361 +{
11362 + unsigned long cr0;
11363 +
11364 + cr0 = read_cr0() ^ X86_CR0_WP;
11365 + BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
11366 + write_cr0(cr0);
11367 + barrier();
11368 + preempt_enable_no_resched();
11369 + return cr0 ^ X86_CR0_WP;
11370 +}
11371 +#else
11372 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
11373 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
11374 +#endif
11375 +
11376 /*
11377 * The following only work if pte_present() is true.
11378 * Undefined behaviour if not..
11379 */
11380 +static inline int pte_user(pte_t pte)
11381 +{
11382 + return pte_val(pte) & _PAGE_USER;
11383 +}
11384 +
11385 static inline int pte_dirty(pte_t pte)
11386 {
11387 return pte_flags(pte) & _PAGE_DIRTY;
11388 @@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
11389 return pte_clear_flags(pte, _PAGE_RW);
11390 }
11391
11392 +static inline pte_t pte_mkread(pte_t pte)
11393 +{
11394 + return __pte(pte_val(pte) | _PAGE_USER);
11395 +}
11396 +
11397 static inline pte_t pte_mkexec(pte_t pte)
11398 {
11399 - return pte_clear_flags(pte, _PAGE_NX);
11400 +#ifdef CONFIG_X86_PAE
11401 + if (__supported_pte_mask & _PAGE_NX)
11402 + return pte_clear_flags(pte, _PAGE_NX);
11403 + else
11404 +#endif
11405 + return pte_set_flags(pte, _PAGE_USER);
11406 +}
11407 +
11408 +static inline pte_t pte_exprotect(pte_t pte)
11409 +{
11410 +#ifdef CONFIG_X86_PAE
11411 + if (__supported_pte_mask & _PAGE_NX)
11412 + return pte_set_flags(pte, _PAGE_NX);
11413 + else
11414 +#endif
11415 + return pte_clear_flags(pte, _PAGE_USER);
11416 }
11417
11418 static inline pte_t pte_mkdirty(pte_t pte)
11419 @@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
11420 #endif
11421
11422 #ifndef __ASSEMBLY__
11423 +
11424 +#ifdef CONFIG_PAX_PER_CPU_PGD
11425 +extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
11426 +static inline pgd_t *get_cpu_pgd(unsigned int cpu)
11427 +{
11428 + return cpu_pgd[cpu];
11429 +}
11430 +#endif
11431 +
11432 #include <linux/mm_types.h>
11433
11434 static inline int pte_none(pte_t pte)
11435 @@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
11436
11437 static inline int pgd_bad(pgd_t pgd)
11438 {
11439 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
11440 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
11441 }
11442
11443 static inline int pgd_none(pgd_t pgd)
11444 @@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
11445 * pgd_offset() returns a (pgd_t *)
11446 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
11447 */
11448 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
11449 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
11450 +
11451 +#ifdef CONFIG_PAX_PER_CPU_PGD
11452 +#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
11453 +#endif
11454 +
11455 /*
11456 * a shortcut which implies the use of the kernel's pgd, instead
11457 * of a process's
11458 @@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
11459 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
11460 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
11461
11462 +#ifdef CONFIG_X86_32
11463 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
11464 +#else
11465 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
11466 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
11467 +
11468 +#ifdef CONFIG_PAX_MEMORY_UDEREF
11469 +#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
11470 +#else
11471 +#define PAX_USER_SHADOW_BASE (_AC(0,UL))
11472 +#endif
11473 +
11474 +#endif
11475 +
11476 #ifndef __ASSEMBLY__
11477
11478 extern int direct_gbpages;
11479 @@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
11480 * dst and src can be on the same page, but the range must not overlap,
11481 * and must not cross a page boundary.
11482 */
11483 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11484 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11485 {
11486 - memcpy(dst, src, count * sizeof(pgd_t));
11487 + pax_open_kernel();
11488 + while (count--)
11489 + *dst++ = *src++;
11490 + pax_close_kernel();
11491 }
11492
11493 +#ifdef CONFIG_PAX_PER_CPU_PGD
11494 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
11495 +#endif
11496 +
11497 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11498 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
11499 +#else
11500 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
11501 +#endif
11502
11503 #include <asm-generic/pgtable.h>
11504 #endif /* __ASSEMBLY__ */
11505 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11506 index 0c92113..34a77c6 100644
11507 --- a/arch/x86/include/asm/pgtable_32.h
11508 +++ b/arch/x86/include/asm/pgtable_32.h
11509 @@ -25,9 +25,6 @@
11510 struct mm_struct;
11511 struct vm_area_struct;
11512
11513 -extern pgd_t swapper_pg_dir[1024];
11514 -extern pgd_t initial_page_table[1024];
11515 -
11516 static inline void pgtable_cache_init(void) { }
11517 static inline void check_pgt_cache(void) { }
11518 void paging_init(void);
11519 @@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11520 # include <asm/pgtable-2level.h>
11521 #endif
11522
11523 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11524 +extern pgd_t initial_page_table[PTRS_PER_PGD];
11525 +#ifdef CONFIG_X86_PAE
11526 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11527 +#endif
11528 +
11529 #if defined(CONFIG_HIGHPTE)
11530 #define pte_offset_map(dir, address) \
11531 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11532 @@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11533 /* Clear a kernel PTE and flush it from the TLB */
11534 #define kpte_clear_flush(ptep, vaddr) \
11535 do { \
11536 + pax_open_kernel(); \
11537 pte_clear(&init_mm, (vaddr), (ptep)); \
11538 + pax_close_kernel(); \
11539 __flush_tlb_one((vaddr)); \
11540 } while (0)
11541
11542 @@ -74,6 +79,9 @@ do { \
11543
11544 #endif /* !__ASSEMBLY__ */
11545
11546 +#define HAVE_ARCH_UNMAPPED_AREA
11547 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11548 +
11549 /*
11550 * kern_addr_valid() is (1) for FLATMEM and (0) for
11551 * SPARSEMEM and DISCONTIGMEM
11552 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11553 index ed5903b..c7fe163 100644
11554 --- a/arch/x86/include/asm/pgtable_32_types.h
11555 +++ b/arch/x86/include/asm/pgtable_32_types.h
11556 @@ -8,7 +8,7 @@
11557 */
11558 #ifdef CONFIG_X86_PAE
11559 # include <asm/pgtable-3level_types.h>
11560 -# define PMD_SIZE (1UL << PMD_SHIFT)
11561 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11562 # define PMD_MASK (~(PMD_SIZE - 1))
11563 #else
11564 # include <asm/pgtable-2level_types.h>
11565 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11566 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11567 #endif
11568
11569 +#ifdef CONFIG_PAX_KERNEXEC
11570 +#ifndef __ASSEMBLY__
11571 +extern unsigned char MODULES_EXEC_VADDR[];
11572 +extern unsigned char MODULES_EXEC_END[];
11573 +#endif
11574 +#include <asm/boot.h>
11575 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11576 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11577 +#else
11578 +#define ktla_ktva(addr) (addr)
11579 +#define ktva_ktla(addr) (addr)
11580 +#endif
11581 +
11582 #define MODULES_VADDR VMALLOC_START
11583 #define MODULES_END VMALLOC_END
11584 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11585 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11586 index 975f709..9f779c9 100644
11587 --- a/arch/x86/include/asm/pgtable_64.h
11588 +++ b/arch/x86/include/asm/pgtable_64.h
11589 @@ -16,10 +16,14 @@
11590
11591 extern pud_t level3_kernel_pgt[512];
11592 extern pud_t level3_ident_pgt[512];
11593 +extern pud_t level3_vmalloc_start_pgt[512];
11594 +extern pud_t level3_vmalloc_end_pgt[512];
11595 +extern pud_t level3_vmemmap_pgt[512];
11596 +extern pud_t level2_vmemmap_pgt[512];
11597 extern pmd_t level2_kernel_pgt[512];
11598 extern pmd_t level2_fixmap_pgt[512];
11599 -extern pmd_t level2_ident_pgt[512];
11600 -extern pgd_t init_level4_pgt[];
11601 +extern pmd_t level2_ident_pgt[512*2];
11602 +extern pgd_t init_level4_pgt[512];
11603
11604 #define swapper_pg_dir init_level4_pgt
11605
11606 @@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11607
11608 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11609 {
11610 + pax_open_kernel();
11611 *pmdp = pmd;
11612 + pax_close_kernel();
11613 }
11614
11615 static inline void native_pmd_clear(pmd_t *pmd)
11616 @@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
11617
11618 static inline void native_set_pud(pud_t *pudp, pud_t pud)
11619 {
11620 + pax_open_kernel();
11621 *pudp = pud;
11622 + pax_close_kernel();
11623 }
11624
11625 static inline void native_pud_clear(pud_t *pud)
11626 @@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
11627
11628 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11629 {
11630 + pax_open_kernel();
11631 + *pgdp = pgd;
11632 + pax_close_kernel();
11633 +}
11634 +
11635 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11636 +{
11637 *pgdp = pgd;
11638 }
11639
11640 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11641 index 766ea16..5b96cb3 100644
11642 --- a/arch/x86/include/asm/pgtable_64_types.h
11643 +++ b/arch/x86/include/asm/pgtable_64_types.h
11644 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11645 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11646 #define MODULES_END _AC(0xffffffffff000000, UL)
11647 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11648 +#define MODULES_EXEC_VADDR MODULES_VADDR
11649 +#define MODULES_EXEC_END MODULES_END
11650 +
11651 +#define ktla_ktva(addr) (addr)
11652 +#define ktva_ktla(addr) (addr)
11653
11654 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11655 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11656 index 013286a..8b42f4f 100644
11657 --- a/arch/x86/include/asm/pgtable_types.h
11658 +++ b/arch/x86/include/asm/pgtable_types.h
11659 @@ -16,13 +16,12 @@
11660 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11661 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11662 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11663 -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11664 +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11665 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11666 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11667 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11668 -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11669 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11670 -#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11671 +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11672 +#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11673 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11674
11675 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11676 @@ -40,7 +39,6 @@
11677 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11678 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11679 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11680 -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11681 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11682 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11683 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11684 @@ -57,8 +55,10 @@
11685
11686 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11687 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11688 -#else
11689 +#elif defined(CONFIG_KMEMCHECK)
11690 #define _PAGE_NX (_AT(pteval_t, 0))
11691 +#else
11692 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11693 #endif
11694
11695 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11696 @@ -96,6 +96,9 @@
11697 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11698 _PAGE_ACCESSED)
11699
11700 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
11701 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
11702 +
11703 #define __PAGE_KERNEL_EXEC \
11704 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11705 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11706 @@ -106,7 +109,7 @@
11707 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11708 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11709 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11710 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11711 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11712 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11713 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11714 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11715 @@ -168,8 +171,8 @@
11716 * bits are combined, this will alow user to access the high address mapped
11717 * VDSO in the presence of CONFIG_COMPAT_VDSO
11718 */
11719 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11720 -#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11721 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11722 +#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11723 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11724 #endif
11725
11726 @@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11727 {
11728 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11729 }
11730 +#endif
11731
11732 +#if PAGETABLE_LEVELS == 3
11733 +#include <asm-generic/pgtable-nopud.h>
11734 +#endif
11735 +
11736 +#if PAGETABLE_LEVELS == 2
11737 +#include <asm-generic/pgtable-nopmd.h>
11738 +#endif
11739 +
11740 +#ifndef __ASSEMBLY__
11741 #if PAGETABLE_LEVELS > 3
11742 typedef struct { pudval_t pud; } pud_t;
11743
11744 @@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11745 return pud.pud;
11746 }
11747 #else
11748 -#include <asm-generic/pgtable-nopud.h>
11749 -
11750 static inline pudval_t native_pud_val(pud_t pud)
11751 {
11752 return native_pgd_val(pud.pgd);
11753 @@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11754 return pmd.pmd;
11755 }
11756 #else
11757 -#include <asm-generic/pgtable-nopmd.h>
11758 -
11759 static inline pmdval_t native_pmd_val(pmd_t pmd)
11760 {
11761 return native_pgd_val(pmd.pud.pgd);
11762 @@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11763
11764 extern pteval_t __supported_pte_mask;
11765 extern void set_nx(void);
11766 -extern int nx_enabled;
11767
11768 #define pgprot_writecombine pgprot_writecombine
11769 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11770 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11771 index 39bc577..538233f 100644
11772 --- a/arch/x86/include/asm/processor.h
11773 +++ b/arch/x86/include/asm/processor.h
11774 @@ -276,7 +276,7 @@ struct tss_struct {
11775
11776 } ____cacheline_aligned;
11777
11778 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11779 +extern struct tss_struct init_tss[NR_CPUS];
11780
11781 /*
11782 * Save the original ist values for checking stack pointers during debugging
11783 @@ -809,11 +809,18 @@ static inline void spin_lock_prefetch(const void *x)
11784 */
11785 #define TASK_SIZE PAGE_OFFSET
11786 #define TASK_SIZE_MAX TASK_SIZE
11787 +
11788 +#ifdef CONFIG_PAX_SEGMEXEC
11789 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11790 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11791 +#else
11792 #define STACK_TOP TASK_SIZE
11793 -#define STACK_TOP_MAX STACK_TOP
11794 +#endif
11795 +
11796 +#define STACK_TOP_MAX TASK_SIZE
11797
11798 #define INIT_THREAD { \
11799 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
11800 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11801 .vm86_info = NULL, \
11802 .sysenter_cs = __KERNEL_CS, \
11803 .io_bitmap_ptr = NULL, \
11804 @@ -827,7 +834,7 @@ static inline void spin_lock_prefetch(const void *x)
11805 */
11806 #define INIT_TSS { \
11807 .x86_tss = { \
11808 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
11809 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11810 .ss0 = __KERNEL_DS, \
11811 .ss1 = __KERNEL_CS, \
11812 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11813 @@ -838,11 +845,7 @@ static inline void spin_lock_prefetch(const void *x)
11814 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11815
11816 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11817 -#define KSTK_TOP(info) \
11818 -({ \
11819 - unsigned long *__ptr = (unsigned long *)(info); \
11820 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11821 -})
11822 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11823
11824 /*
11825 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11826 @@ -857,7 +860,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11827 #define task_pt_regs(task) \
11828 ({ \
11829 struct pt_regs *__regs__; \
11830 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11831 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11832 __regs__ - 1; \
11833 })
11834
11835 @@ -867,13 +870,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11836 /*
11837 * User space process size. 47bits minus one guard page.
11838 */
11839 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11840 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11841
11842 /* This decides where the kernel will search for a free chunk of vm
11843 * space during mmap's.
11844 */
11845 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11846 - 0xc0000000 : 0xFFFFe000)
11847 + 0xc0000000 : 0xFFFFf000)
11848
11849 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
11850 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11851 @@ -884,11 +887,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11852 #define STACK_TOP_MAX TASK_SIZE_MAX
11853
11854 #define INIT_THREAD { \
11855 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11856 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11857 }
11858
11859 #define INIT_TSS { \
11860 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11861 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11862 }
11863
11864 /*
11865 @@ -916,6 +919,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11866 */
11867 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11868
11869 +#ifdef CONFIG_PAX_SEGMEXEC
11870 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11871 +#endif
11872 +
11873 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11874
11875 /* Get/set a process' ability to use the timestamp counter instruction */
11876 @@ -976,12 +983,12 @@ extern bool cpu_has_amd_erratum(const int *);
11877 #define cpu_has_amd_erratum(x) (false)
11878 #endif /* CONFIG_CPU_SUP_AMD */
11879
11880 -extern unsigned long arch_align_stack(unsigned long sp);
11881 +#define arch_align_stack(x) ((x) & ~0xfUL)
11882 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11883
11884 void default_idle(void);
11885 bool set_pm_idle_to_default(void);
11886
11887 -void stop_this_cpu(void *dummy);
11888 +void stop_this_cpu(void *dummy) __noreturn;
11889
11890 #endif /* _ASM_X86_PROCESSOR_H */
11891 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11892 index dcfde52..dbfea06 100644
11893 --- a/arch/x86/include/asm/ptrace.h
11894 +++ b/arch/x86/include/asm/ptrace.h
11895 @@ -155,28 +155,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11896 }
11897
11898 /*
11899 - * user_mode_vm(regs) determines whether a register set came from user mode.
11900 + * user_mode(regs) determines whether a register set came from user mode.
11901 * This is true if V8086 mode was enabled OR if the register set was from
11902 * protected mode with RPL-3 CS value. This tricky test checks that with
11903 * one comparison. Many places in the kernel can bypass this full check
11904 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11905 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11906 + * be used.
11907 */
11908 -static inline int user_mode(struct pt_regs *regs)
11909 +static inline int user_mode_novm(struct pt_regs *regs)
11910 {
11911 #ifdef CONFIG_X86_32
11912 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11913 #else
11914 - return !!(regs->cs & 3);
11915 + return !!(regs->cs & SEGMENT_RPL_MASK);
11916 #endif
11917 }
11918
11919 -static inline int user_mode_vm(struct pt_regs *regs)
11920 +static inline int user_mode(struct pt_regs *regs)
11921 {
11922 #ifdef CONFIG_X86_32
11923 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11924 USER_RPL;
11925 #else
11926 - return user_mode(regs);
11927 + return user_mode_novm(regs);
11928 #endif
11929 }
11930
11931 @@ -192,15 +193,16 @@ static inline int v8086_mode(struct pt_regs *regs)
11932 #ifdef CONFIG_X86_64
11933 static inline bool user_64bit_mode(struct pt_regs *regs)
11934 {
11935 + unsigned long cs = regs->cs & 0xffff;
11936 #ifndef CONFIG_PARAVIRT
11937 /*
11938 * On non-paravirt systems, this is the only long mode CPL 3
11939 * selector. We do not allow long mode selectors in the LDT.
11940 */
11941 - return regs->cs == __USER_CS;
11942 + return cs == __USER_CS;
11943 #else
11944 /* Headers are too twisted for this to go in paravirt.h. */
11945 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
11946 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
11947 #endif
11948 }
11949 #endif
11950 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
11951 index fce3f4a..3f69f2a 100644
11952 --- a/arch/x86/include/asm/realmode.h
11953 +++ b/arch/x86/include/asm/realmode.h
11954 @@ -30,7 +30,7 @@ struct real_mode_header {
11955 struct trampoline_header {
11956 #ifdef CONFIG_X86_32
11957 u32 start;
11958 - u16 gdt_pad;
11959 + u16 boot_cs;
11960 u16 gdt_limit;
11961 u32 gdt_base;
11962 #else
11963 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11964 index 92f29706..a79cbbb 100644
11965 --- a/arch/x86/include/asm/reboot.h
11966 +++ b/arch/x86/include/asm/reboot.h
11967 @@ -6,19 +6,19 @@
11968 struct pt_regs;
11969
11970 struct machine_ops {
11971 - void (*restart)(char *cmd);
11972 - void (*halt)(void);
11973 - void (*power_off)(void);
11974 + void (* __noreturn restart)(char *cmd);
11975 + void (* __noreturn halt)(void);
11976 + void (* __noreturn power_off)(void);
11977 void (*shutdown)(void);
11978 void (*crash_shutdown)(struct pt_regs *);
11979 - void (*emergency_restart)(void);
11980 -};
11981 + void (* __noreturn emergency_restart)(void);
11982 +} __no_const;
11983
11984 extern struct machine_ops machine_ops;
11985
11986 void native_machine_crash_shutdown(struct pt_regs *regs);
11987 void native_machine_shutdown(void);
11988 -void machine_real_restart(unsigned int type);
11989 +void machine_real_restart(unsigned int type) __noreturn;
11990 /* These must match dispatch_table in reboot_32.S */
11991 #define MRR_BIOS 0
11992 #define MRR_APM 1
11993 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11994 index 2dbe4a7..ce1db00 100644
11995 --- a/arch/x86/include/asm/rwsem.h
11996 +++ b/arch/x86/include/asm/rwsem.h
11997 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11998 {
11999 asm volatile("# beginning down_read\n\t"
12000 LOCK_PREFIX _ASM_INC "(%1)\n\t"
12001 +
12002 +#ifdef CONFIG_PAX_REFCOUNT
12003 + "jno 0f\n"
12004 + LOCK_PREFIX _ASM_DEC "(%1)\n"
12005 + "int $4\n0:\n"
12006 + _ASM_EXTABLE(0b, 0b)
12007 +#endif
12008 +
12009 /* adds 0x00000001 */
12010 " jns 1f\n"
12011 " call call_rwsem_down_read_failed\n"
12012 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
12013 "1:\n\t"
12014 " mov %1,%2\n\t"
12015 " add %3,%2\n\t"
12016 +
12017 +#ifdef CONFIG_PAX_REFCOUNT
12018 + "jno 0f\n"
12019 + "sub %3,%2\n"
12020 + "int $4\n0:\n"
12021 + _ASM_EXTABLE(0b, 0b)
12022 +#endif
12023 +
12024 " jle 2f\n\t"
12025 LOCK_PREFIX " cmpxchg %2,%0\n\t"
12026 " jnz 1b\n\t"
12027 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
12028 long tmp;
12029 asm volatile("# beginning down_write\n\t"
12030 LOCK_PREFIX " xadd %1,(%2)\n\t"
12031 +
12032 +#ifdef CONFIG_PAX_REFCOUNT
12033 + "jno 0f\n"
12034 + "mov %1,(%2)\n"
12035 + "int $4\n0:\n"
12036 + _ASM_EXTABLE(0b, 0b)
12037 +#endif
12038 +
12039 /* adds 0xffff0001, returns the old value */
12040 " test %1,%1\n\t"
12041 /* was the count 0 before? */
12042 @@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
12043 long tmp;
12044 asm volatile("# beginning __up_read\n\t"
12045 LOCK_PREFIX " xadd %1,(%2)\n\t"
12046 +
12047 +#ifdef CONFIG_PAX_REFCOUNT
12048 + "jno 0f\n"
12049 + "mov %1,(%2)\n"
12050 + "int $4\n0:\n"
12051 + _ASM_EXTABLE(0b, 0b)
12052 +#endif
12053 +
12054 /* subtracts 1, returns the old value */
12055 " jns 1f\n\t"
12056 " call call_rwsem_wake\n" /* expects old value in %edx */
12057 @@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
12058 long tmp;
12059 asm volatile("# beginning __up_write\n\t"
12060 LOCK_PREFIX " xadd %1,(%2)\n\t"
12061 +
12062 +#ifdef CONFIG_PAX_REFCOUNT
12063 + "jno 0f\n"
12064 + "mov %1,(%2)\n"
12065 + "int $4\n0:\n"
12066 + _ASM_EXTABLE(0b, 0b)
12067 +#endif
12068 +
12069 /* subtracts 0xffff0001, returns the old value */
12070 " jns 1f\n\t"
12071 " call call_rwsem_wake\n" /* expects old value in %edx */
12072 @@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
12073 {
12074 asm volatile("# beginning __downgrade_write\n\t"
12075 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
12076 +
12077 +#ifdef CONFIG_PAX_REFCOUNT
12078 + "jno 0f\n"
12079 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
12080 + "int $4\n0:\n"
12081 + _ASM_EXTABLE(0b, 0b)
12082 +#endif
12083 +
12084 /*
12085 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
12086 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
12087 @@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
12088 */
12089 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
12090 {
12091 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
12092 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
12093 +
12094 +#ifdef CONFIG_PAX_REFCOUNT
12095 + "jno 0f\n"
12096 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
12097 + "int $4\n0:\n"
12098 + _ASM_EXTABLE(0b, 0b)
12099 +#endif
12100 +
12101 : "+m" (sem->count)
12102 : "er" (delta));
12103 }
12104 @@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
12105 */
12106 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
12107 {
12108 - return delta + xadd(&sem->count, delta);
12109 + return delta + xadd_check_overflow(&sem->count, delta);
12110 }
12111
12112 #endif /* __KERNEL__ */
12113 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
12114 index c48a950..c6d7468 100644
12115 --- a/arch/x86/include/asm/segment.h
12116 +++ b/arch/x86/include/asm/segment.h
12117 @@ -64,10 +64,15 @@
12118 * 26 - ESPFIX small SS
12119 * 27 - per-cpu [ offset to per-cpu data area ]
12120 * 28 - stack_canary-20 [ for stack protector ]
12121 - * 29 - unused
12122 - * 30 - unused
12123 + * 29 - PCI BIOS CS
12124 + * 30 - PCI BIOS DS
12125 * 31 - TSS for double fault handler
12126 */
12127 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
12128 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
12129 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
12130 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
12131 +
12132 #define GDT_ENTRY_TLS_MIN 6
12133 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
12134
12135 @@ -79,6 +84,8 @@
12136
12137 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
12138
12139 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
12140 +
12141 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
12142
12143 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
12144 @@ -104,6 +111,12 @@
12145 #define __KERNEL_STACK_CANARY 0
12146 #endif
12147
12148 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
12149 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
12150 +
12151 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
12152 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
12153 +
12154 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
12155
12156 /*
12157 @@ -141,7 +154,7 @@
12158 */
12159
12160 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
12161 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
12162 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
12163
12164
12165 #else
12166 @@ -165,6 +178,8 @@
12167 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
12168 #define __USER32_DS __USER_DS
12169
12170 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
12171 +
12172 #define GDT_ENTRY_TSS 8 /* needs two entries */
12173 #define GDT_ENTRY_LDT 10 /* needs two entries */
12174 #define GDT_ENTRY_TLS_MIN 12
12175 @@ -185,6 +200,7 @@
12176 #endif
12177
12178 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
12179 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
12180 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
12181 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
12182 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
12183 @@ -265,7 +281,7 @@ static inline unsigned long get_limit(unsigned long segment)
12184 {
12185 unsigned long __limit;
12186 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
12187 - return __limit + 1;
12188 + return __limit;
12189 }
12190
12191 #endif /* !__ASSEMBLY__ */
12192 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
12193 index f483945..64a7851 100644
12194 --- a/arch/x86/include/asm/smp.h
12195 +++ b/arch/x86/include/asm/smp.h
12196 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
12197 /* cpus sharing the last level cache: */
12198 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
12199 DECLARE_PER_CPU(u16, cpu_llc_id);
12200 -DECLARE_PER_CPU(int, cpu_number);
12201 +DECLARE_PER_CPU(unsigned int, cpu_number);
12202
12203 static inline struct cpumask *cpu_sibling_mask(int cpu)
12204 {
12205 @@ -79,7 +79,7 @@ struct smp_ops {
12206
12207 void (*send_call_func_ipi)(const struct cpumask *mask);
12208 void (*send_call_func_single_ipi)(int cpu);
12209 -};
12210 +} __no_const;
12211
12212 /* Globals due to paravirt */
12213 extern void set_cpu_sibling_map(int cpu);
12214 @@ -195,14 +195,8 @@ extern unsigned disabled_cpus __cpuinitdata;
12215 extern int safe_smp_processor_id(void);
12216
12217 #elif defined(CONFIG_X86_64_SMP)
12218 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
12219 -
12220 -#define stack_smp_processor_id() \
12221 -({ \
12222 - struct thread_info *ti; \
12223 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
12224 - ti->cpu; \
12225 -})
12226 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
12227 +#define stack_smp_processor_id() raw_smp_processor_id()
12228 #define safe_smp_processor_id() smp_processor_id()
12229
12230 #endif
12231 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
12232 index b315a33..8849ab0 100644
12233 --- a/arch/x86/include/asm/spinlock.h
12234 +++ b/arch/x86/include/asm/spinlock.h
12235 @@ -173,6 +173,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
12236 static inline void arch_read_lock(arch_rwlock_t *rw)
12237 {
12238 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
12239 +
12240 +#ifdef CONFIG_PAX_REFCOUNT
12241 + "jno 0f\n"
12242 + LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
12243 + "int $4\n0:\n"
12244 + _ASM_EXTABLE(0b, 0b)
12245 +#endif
12246 +
12247 "jns 1f\n"
12248 "call __read_lock_failed\n\t"
12249 "1:\n"
12250 @@ -182,6 +190,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
12251 static inline void arch_write_lock(arch_rwlock_t *rw)
12252 {
12253 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
12254 +
12255 +#ifdef CONFIG_PAX_REFCOUNT
12256 + "jno 0f\n"
12257 + LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
12258 + "int $4\n0:\n"
12259 + _ASM_EXTABLE(0b, 0b)
12260 +#endif
12261 +
12262 "jz 1f\n"
12263 "call __write_lock_failed\n\t"
12264 "1:\n"
12265 @@ -211,13 +227,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
12266
12267 static inline void arch_read_unlock(arch_rwlock_t *rw)
12268 {
12269 - asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
12270 + asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
12271 +
12272 +#ifdef CONFIG_PAX_REFCOUNT
12273 + "jno 0f\n"
12274 + LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
12275 + "int $4\n0:\n"
12276 + _ASM_EXTABLE(0b, 0b)
12277 +#endif
12278 +
12279 :"+m" (rw->lock) : : "memory");
12280 }
12281
12282 static inline void arch_write_unlock(arch_rwlock_t *rw)
12283 {
12284 - asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
12285 + asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
12286 +
12287 +#ifdef CONFIG_PAX_REFCOUNT
12288 + "jno 0f\n"
12289 + LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
12290 + "int $4\n0:\n"
12291 + _ASM_EXTABLE(0b, 0b)
12292 +#endif
12293 +
12294 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
12295 }
12296
12297 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
12298 index 6a99859..03cb807 100644
12299 --- a/arch/x86/include/asm/stackprotector.h
12300 +++ b/arch/x86/include/asm/stackprotector.h
12301 @@ -47,7 +47,7 @@
12302 * head_32 for boot CPU and setup_per_cpu_areas() for others.
12303 */
12304 #define GDT_STACK_CANARY_INIT \
12305 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
12306 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
12307
12308 /*
12309 * Initialize the stackprotector canary value.
12310 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
12311
12312 static inline void load_stack_canary_segment(void)
12313 {
12314 -#ifdef CONFIG_X86_32
12315 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
12316 asm volatile ("mov %0, %%gs" : : "r" (0));
12317 #endif
12318 }
12319 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
12320 index 70bbe39..4ae2bd4 100644
12321 --- a/arch/x86/include/asm/stacktrace.h
12322 +++ b/arch/x86/include/asm/stacktrace.h
12323 @@ -11,28 +11,20 @@
12324
12325 extern int kstack_depth_to_print;
12326
12327 -struct thread_info;
12328 +struct task_struct;
12329 struct stacktrace_ops;
12330
12331 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
12332 - unsigned long *stack,
12333 - unsigned long bp,
12334 - const struct stacktrace_ops *ops,
12335 - void *data,
12336 - unsigned long *end,
12337 - int *graph);
12338 +typedef unsigned long walk_stack_t(struct task_struct *task,
12339 + void *stack_start,
12340 + unsigned long *stack,
12341 + unsigned long bp,
12342 + const struct stacktrace_ops *ops,
12343 + void *data,
12344 + unsigned long *end,
12345 + int *graph);
12346
12347 -extern unsigned long
12348 -print_context_stack(struct thread_info *tinfo,
12349 - unsigned long *stack, unsigned long bp,
12350 - const struct stacktrace_ops *ops, void *data,
12351 - unsigned long *end, int *graph);
12352 -
12353 -extern unsigned long
12354 -print_context_stack_bp(struct thread_info *tinfo,
12355 - unsigned long *stack, unsigned long bp,
12356 - const struct stacktrace_ops *ops, void *data,
12357 - unsigned long *end, int *graph);
12358 +extern walk_stack_t print_context_stack;
12359 +extern walk_stack_t print_context_stack_bp;
12360
12361 /* Generic stack tracer with callbacks */
12362
12363 @@ -40,7 +32,7 @@ struct stacktrace_ops {
12364 void (*address)(void *data, unsigned long address, int reliable);
12365 /* On negative return stop dumping */
12366 int (*stack)(void *data, char *name);
12367 - walk_stack_t walk_stack;
12368 + walk_stack_t *walk_stack;
12369 };
12370
12371 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
12372 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
12373 index 4ec45b3..a4f0a8a 100644
12374 --- a/arch/x86/include/asm/switch_to.h
12375 +++ b/arch/x86/include/asm/switch_to.h
12376 @@ -108,7 +108,7 @@ do { \
12377 "call __switch_to\n\t" \
12378 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
12379 __switch_canary \
12380 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
12381 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
12382 "movq %%rax,%%rdi\n\t" \
12383 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
12384 "jnz ret_from_fork\n\t" \
12385 @@ -119,7 +119,7 @@ do { \
12386 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
12387 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
12388 [_tif_fork] "i" (_TIF_FORK), \
12389 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
12390 + [thread_info] "m" (current_tinfo), \
12391 [current_task] "m" (current_task) \
12392 __switch_canary_iparam \
12393 : "memory", "cc" __EXTRA_CLOBBER)
12394 diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
12395 index 3fda9db4..4ca1c61 100644
12396 --- a/arch/x86/include/asm/sys_ia32.h
12397 +++ b/arch/x86/include/asm/sys_ia32.h
12398 @@ -40,7 +40,7 @@ asmlinkage long sys32_sigaction(int, struct old_sigaction32 __user *,
12399 struct old_sigaction32 __user *);
12400 asmlinkage long sys32_alarm(unsigned int);
12401
12402 -asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
12403 +asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
12404 asmlinkage long sys32_sysfs(int, u32, u32);
12405
12406 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
12407 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
12408 index 89f794f..1422765 100644
12409 --- a/arch/x86/include/asm/thread_info.h
12410 +++ b/arch/x86/include/asm/thread_info.h
12411 @@ -10,6 +10,7 @@
12412 #include <linux/compiler.h>
12413 #include <asm/page.h>
12414 #include <asm/types.h>
12415 +#include <asm/percpu.h>
12416
12417 /*
12418 * low level task data that entry.S needs immediate access to
12419 @@ -24,7 +25,6 @@ struct exec_domain;
12420 #include <linux/atomic.h>
12421
12422 struct thread_info {
12423 - struct task_struct *task; /* main task structure */
12424 struct exec_domain *exec_domain; /* execution domain */
12425 __u32 flags; /* low level flags */
12426 __u32 status; /* thread synchronous flags */
12427 @@ -34,19 +34,13 @@ struct thread_info {
12428 mm_segment_t addr_limit;
12429 struct restart_block restart_block;
12430 void __user *sysenter_return;
12431 -#ifdef CONFIG_X86_32
12432 - unsigned long previous_esp; /* ESP of the previous stack in
12433 - case of nested (IRQ) stacks
12434 - */
12435 - __u8 supervisor_stack[0];
12436 -#endif
12437 + unsigned long lowest_stack;
12438 unsigned int sig_on_uaccess_error:1;
12439 unsigned int uaccess_err:1; /* uaccess failed */
12440 };
12441
12442 -#define INIT_THREAD_INFO(tsk) \
12443 +#define INIT_THREAD_INFO \
12444 { \
12445 - .task = &tsk, \
12446 .exec_domain = &default_exec_domain, \
12447 .flags = 0, \
12448 .cpu = 0, \
12449 @@ -57,7 +51,7 @@ struct thread_info {
12450 }, \
12451 }
12452
12453 -#define init_thread_info (init_thread_union.thread_info)
12454 +#define init_thread_info (init_thread_union.stack)
12455 #define init_stack (init_thread_union.stack)
12456
12457 #else /* !__ASSEMBLY__ */
12458 @@ -98,6 +92,7 @@ struct thread_info {
12459 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
12460 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
12461 #define TIF_X32 30 /* 32-bit native x86-64 binary */
12462 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
12463
12464 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
12465 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
12466 @@ -122,16 +117,18 @@ struct thread_info {
12467 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
12468 #define _TIF_ADDR32 (1 << TIF_ADDR32)
12469 #define _TIF_X32 (1 << TIF_X32)
12470 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
12471
12472 /* work to do in syscall_trace_enter() */
12473 #define _TIF_WORK_SYSCALL_ENTRY \
12474 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
12475 - _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT)
12476 + _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
12477 + _TIF_GRSEC_SETXID)
12478
12479 /* work to do in syscall_trace_leave() */
12480 #define _TIF_WORK_SYSCALL_EXIT \
12481 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
12482 - _TIF_SYSCALL_TRACEPOINT)
12483 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
12484
12485 /* work to do on interrupt/exception return */
12486 #define _TIF_WORK_MASK \
12487 @@ -141,7 +138,8 @@ struct thread_info {
12488
12489 /* work to do on any return to user space */
12490 #define _TIF_ALLWORK_MASK \
12491 - ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT)
12492 + ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
12493 + _TIF_GRSEC_SETXID)
12494
12495 /* Only used for 64 bit */
12496 #define _TIF_DO_NOTIFY_MASK \
12497 @@ -157,45 +155,40 @@ struct thread_info {
12498
12499 #define PREEMPT_ACTIVE 0x10000000
12500
12501 -#ifdef CONFIG_X86_32
12502 -
12503 -#define STACK_WARN (THREAD_SIZE/8)
12504 -/*
12505 - * macros/functions for gaining access to the thread information structure
12506 - *
12507 - * preempt_count needs to be 1 initially, until the scheduler is functional.
12508 - */
12509 -#ifndef __ASSEMBLY__
12510 -
12511 -
12512 -/* how to get the current stack pointer from C */
12513 -register unsigned long current_stack_pointer asm("esp") __used;
12514 -
12515 -/* how to get the thread information struct from C */
12516 -static inline struct thread_info *current_thread_info(void)
12517 -{
12518 - return (struct thread_info *)
12519 - (current_stack_pointer & ~(THREAD_SIZE - 1));
12520 -}
12521 -
12522 -#else /* !__ASSEMBLY__ */
12523 -
12524 +#ifdef __ASSEMBLY__
12525 /* how to get the thread information struct from ASM */
12526 #define GET_THREAD_INFO(reg) \
12527 - movl $-THREAD_SIZE, reg; \
12528 - andl %esp, reg
12529 + mov PER_CPU_VAR(current_tinfo), reg
12530
12531 /* use this one if reg already contains %esp */
12532 -#define GET_THREAD_INFO_WITH_ESP(reg) \
12533 - andl $-THREAD_SIZE, reg
12534 +#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12535 +#else
12536 +/* how to get the thread information struct from C */
12537 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12538 +
12539 +static __always_inline struct thread_info *current_thread_info(void)
12540 +{
12541 + return this_cpu_read_stable(current_tinfo);
12542 +}
12543 +#endif
12544 +
12545 +#ifdef CONFIG_X86_32
12546 +
12547 +#define STACK_WARN (THREAD_SIZE/8)
12548 +/*
12549 + * macros/functions for gaining access to the thread information structure
12550 + *
12551 + * preempt_count needs to be 1 initially, until the scheduler is functional.
12552 + */
12553 +#ifndef __ASSEMBLY__
12554 +
12555 +/* how to get the current stack pointer from C */
12556 +register unsigned long current_stack_pointer asm("esp") __used;
12557
12558 #endif
12559
12560 #else /* X86_32 */
12561
12562 -#include <asm/percpu.h>
12563 -#define KERNEL_STACK_OFFSET (5*8)
12564 -
12565 /*
12566 * macros/functions for gaining access to the thread information structure
12567 * preempt_count needs to be 1 initially, until the scheduler is functional.
12568 @@ -203,27 +196,8 @@ static inline struct thread_info *current_thread_info(void)
12569 #ifndef __ASSEMBLY__
12570 DECLARE_PER_CPU(unsigned long, kernel_stack);
12571
12572 -static inline struct thread_info *current_thread_info(void)
12573 -{
12574 - struct thread_info *ti;
12575 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
12576 - KERNEL_STACK_OFFSET - THREAD_SIZE);
12577 - return ti;
12578 -}
12579 -
12580 -#else /* !__ASSEMBLY__ */
12581 -
12582 -/* how to get the thread information struct from ASM */
12583 -#define GET_THREAD_INFO(reg) \
12584 - movq PER_CPU_VAR(kernel_stack),reg ; \
12585 - subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12586 -
12587 -/*
12588 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
12589 - * a certain register (to be used in assembler memory operands).
12590 - */
12591 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
12592 -
12593 +/* how to get the current stack pointer from C */
12594 +register unsigned long current_stack_pointer asm("rsp") __used;
12595 #endif
12596
12597 #endif /* !X86_32 */
12598 @@ -284,5 +258,12 @@ static inline bool is_ia32_task(void)
12599 extern void arch_task_cache_init(void);
12600 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12601 extern void arch_release_task_struct(struct task_struct *tsk);
12602 +
12603 +#define __HAVE_THREAD_FUNCTIONS
12604 +#define task_thread_info(task) (&(task)->tinfo)
12605 +#define task_stack_page(task) ((task)->stack)
12606 +#define setup_thread_stack(p, org) do {} while (0)
12607 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12608 +
12609 #endif
12610 #endif /* _ASM_X86_THREAD_INFO_H */
12611 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12612 index e1f3a17..1ab364d 100644
12613 --- a/arch/x86/include/asm/uaccess.h
12614 +++ b/arch/x86/include/asm/uaccess.h
12615 @@ -7,12 +7,15 @@
12616 #include <linux/compiler.h>
12617 #include <linux/thread_info.h>
12618 #include <linux/string.h>
12619 +#include <linux/sched.h>
12620 #include <asm/asm.h>
12621 #include <asm/page.h>
12622
12623 #define VERIFY_READ 0
12624 #define VERIFY_WRITE 1
12625
12626 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
12627 +
12628 /*
12629 * The fs value determines whether argument validity checking should be
12630 * performed or not. If get_fs() == USER_DS, checking is performed, with
12631 @@ -28,7 +31,12 @@
12632
12633 #define get_ds() (KERNEL_DS)
12634 #define get_fs() (current_thread_info()->addr_limit)
12635 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12636 +void __set_fs(mm_segment_t x);
12637 +void set_fs(mm_segment_t x);
12638 +#else
12639 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12640 +#endif
12641
12642 #define segment_eq(a, b) ((a).seg == (b).seg)
12643
12644 @@ -76,8 +84,33 @@
12645 * checks that the pointer is in the user space range - after calling
12646 * this function, memory access functions may still return -EFAULT.
12647 */
12648 -#define access_ok(type, addr, size) \
12649 - (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
12650 +#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
12651 +#define access_ok(type, addr, size) \
12652 +({ \
12653 + long __size = size; \
12654 + unsigned long __addr = (unsigned long)addr; \
12655 + unsigned long __addr_ao = __addr & PAGE_MASK; \
12656 + unsigned long __end_ao = __addr + __size - 1; \
12657 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
12658 + if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12659 + while(__addr_ao <= __end_ao) { \
12660 + char __c_ao; \
12661 + __addr_ao += PAGE_SIZE; \
12662 + if (__size > PAGE_SIZE) \
12663 + cond_resched(); \
12664 + if (__get_user(__c_ao, (char __user *)__addr)) \
12665 + break; \
12666 + if (type != VERIFY_WRITE) { \
12667 + __addr = __addr_ao; \
12668 + continue; \
12669 + } \
12670 + if (__put_user(__c_ao, (char __user *)__addr)) \
12671 + break; \
12672 + __addr = __addr_ao; \
12673 + } \
12674 + } \
12675 + __ret_ao; \
12676 +})
12677
12678 /*
12679 * The exception table consists of pairs of addresses relative to the
12680 @@ -188,12 +221,20 @@ extern int __get_user_bad(void);
12681 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12682 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12683
12684 -
12685 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12686 +#define __copyuser_seg "gs;"
12687 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12688 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12689 +#else
12690 +#define __copyuser_seg
12691 +#define __COPYUSER_SET_ES
12692 +#define __COPYUSER_RESTORE_ES
12693 +#endif
12694
12695 #ifdef CONFIG_X86_32
12696 #define __put_user_asm_u64(x, addr, err, errret) \
12697 - asm volatile("1: movl %%eax,0(%2)\n" \
12698 - "2: movl %%edx,4(%2)\n" \
12699 + asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12700 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12701 "3:\n" \
12702 ".section .fixup,\"ax\"\n" \
12703 "4: movl %3,%0\n" \
12704 @@ -205,8 +246,8 @@ extern int __get_user_bad(void);
12705 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12706
12707 #define __put_user_asm_ex_u64(x, addr) \
12708 - asm volatile("1: movl %%eax,0(%1)\n" \
12709 - "2: movl %%edx,4(%1)\n" \
12710 + asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12711 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12712 "3:\n" \
12713 _ASM_EXTABLE_EX(1b, 2b) \
12714 _ASM_EXTABLE_EX(2b, 3b) \
12715 @@ -258,7 +299,7 @@ extern void __put_user_8(void);
12716 __typeof__(*(ptr)) __pu_val; \
12717 __chk_user_ptr(ptr); \
12718 might_fault(); \
12719 - __pu_val = x; \
12720 + __pu_val = (x); \
12721 switch (sizeof(*(ptr))) { \
12722 case 1: \
12723 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12724 @@ -379,7 +420,7 @@ do { \
12725 } while (0)
12726
12727 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12728 - asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12729 + asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12730 "2:\n" \
12731 ".section .fixup,\"ax\"\n" \
12732 "3: mov %3,%0\n" \
12733 @@ -387,7 +428,7 @@ do { \
12734 " jmp 2b\n" \
12735 ".previous\n" \
12736 _ASM_EXTABLE(1b, 3b) \
12737 - : "=r" (err), ltype(x) \
12738 + : "=r" (err), ltype (x) \
12739 : "m" (__m(addr)), "i" (errret), "0" (err))
12740
12741 #define __get_user_size_ex(x, ptr, size) \
12742 @@ -412,7 +453,7 @@ do { \
12743 } while (0)
12744
12745 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12746 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12747 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12748 "2:\n" \
12749 _ASM_EXTABLE_EX(1b, 2b) \
12750 : ltype(x) : "m" (__m(addr)))
12751 @@ -429,13 +470,24 @@ do { \
12752 int __gu_err; \
12753 unsigned long __gu_val; \
12754 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12755 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
12756 + (x) = (__typeof__(*(ptr)))__gu_val; \
12757 __gu_err; \
12758 })
12759
12760 /* FIXME: this hack is definitely wrong -AK */
12761 struct __large_struct { unsigned long buf[100]; };
12762 -#define __m(x) (*(struct __large_struct __user *)(x))
12763 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12764 +#define ____m(x) \
12765 +({ \
12766 + unsigned long ____x = (unsigned long)(x); \
12767 + if (____x < PAX_USER_SHADOW_BASE) \
12768 + ____x += PAX_USER_SHADOW_BASE; \
12769 + (void __user *)____x; \
12770 +})
12771 +#else
12772 +#define ____m(x) (x)
12773 +#endif
12774 +#define __m(x) (*(struct __large_struct __user *)____m(x))
12775
12776 /*
12777 * Tell gcc we read from memory instead of writing: this is because
12778 @@ -443,7 +495,7 @@ struct __large_struct { unsigned long buf[100]; };
12779 * aliasing issues.
12780 */
12781 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12782 - asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12783 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12784 "2:\n" \
12785 ".section .fixup,\"ax\"\n" \
12786 "3: mov %3,%0\n" \
12787 @@ -451,10 +503,10 @@ struct __large_struct { unsigned long buf[100]; };
12788 ".previous\n" \
12789 _ASM_EXTABLE(1b, 3b) \
12790 : "=r"(err) \
12791 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12792 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12793
12794 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12795 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12796 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12797 "2:\n" \
12798 _ASM_EXTABLE_EX(1b, 2b) \
12799 : : ltype(x), "m" (__m(addr)))
12800 @@ -493,8 +545,12 @@ struct __large_struct { unsigned long buf[100]; };
12801 * On error, the variable @x is set to zero.
12802 */
12803
12804 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12805 +#define __get_user(x, ptr) get_user((x), (ptr))
12806 +#else
12807 #define __get_user(x, ptr) \
12808 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12809 +#endif
12810
12811 /**
12812 * __put_user: - Write a simple value into user space, with less checking.
12813 @@ -516,8 +572,12 @@ struct __large_struct { unsigned long buf[100]; };
12814 * Returns zero on success, or -EFAULT on error.
12815 */
12816
12817 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12818 +#define __put_user(x, ptr) put_user((x), (ptr))
12819 +#else
12820 #define __put_user(x, ptr) \
12821 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12822 +#endif
12823
12824 #define __get_user_unaligned __get_user
12825 #define __put_user_unaligned __put_user
12826 @@ -535,7 +595,7 @@ struct __large_struct { unsigned long buf[100]; };
12827 #define get_user_ex(x, ptr) do { \
12828 unsigned long __gue_val; \
12829 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12830 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
12831 + (x) = (__typeof__(*(ptr)))__gue_val; \
12832 } while (0)
12833
12834 #ifdef CONFIG_X86_WP_WORKS_OK
12835 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12836 index 576e39b..ccd0a39 100644
12837 --- a/arch/x86/include/asm/uaccess_32.h
12838 +++ b/arch/x86/include/asm/uaccess_32.h
12839 @@ -11,15 +11,15 @@
12840 #include <asm/page.h>
12841
12842 unsigned long __must_check __copy_to_user_ll
12843 - (void __user *to, const void *from, unsigned long n);
12844 + (void __user *to, const void *from, unsigned long n) __size_overflow(3);
12845 unsigned long __must_check __copy_from_user_ll
12846 - (void *to, const void __user *from, unsigned long n);
12847 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12848 unsigned long __must_check __copy_from_user_ll_nozero
12849 - (void *to, const void __user *from, unsigned long n);
12850 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12851 unsigned long __must_check __copy_from_user_ll_nocache
12852 - (void *to, const void __user *from, unsigned long n);
12853 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12854 unsigned long __must_check __copy_from_user_ll_nocache_nozero
12855 - (void *to, const void __user *from, unsigned long n);
12856 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12857
12858 /**
12859 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
12860 @@ -43,6 +43,9 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12861 static __always_inline unsigned long __must_check
12862 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12863 {
12864 + if ((long)n < 0)
12865 + return n;
12866 +
12867 if (__builtin_constant_p(n)) {
12868 unsigned long ret;
12869
12870 @@ -61,6 +64,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12871 return ret;
12872 }
12873 }
12874 + if (!__builtin_constant_p(n))
12875 + check_object_size(from, n, true);
12876 return __copy_to_user_ll(to, from, n);
12877 }
12878
12879 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
12880 __copy_to_user(void __user *to, const void *from, unsigned long n)
12881 {
12882 might_fault();
12883 +
12884 return __copy_to_user_inatomic(to, from, n);
12885 }
12886
12887 static __always_inline unsigned long
12888 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12889 {
12890 + if ((long)n < 0)
12891 + return n;
12892 +
12893 /* Avoid zeroing the tail if the copy fails..
12894 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12895 * but as the zeroing behaviour is only significant when n is not
12896 @@ -137,6 +146,10 @@ static __always_inline unsigned long
12897 __copy_from_user(void *to, const void __user *from, unsigned long n)
12898 {
12899 might_fault();
12900 +
12901 + if ((long)n < 0)
12902 + return n;
12903 +
12904 if (__builtin_constant_p(n)) {
12905 unsigned long ret;
12906
12907 @@ -152,6 +165,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12908 return ret;
12909 }
12910 }
12911 + if (!__builtin_constant_p(n))
12912 + check_object_size(to, n, false);
12913 return __copy_from_user_ll(to, from, n);
12914 }
12915
12916 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12917 const void __user *from, unsigned long n)
12918 {
12919 might_fault();
12920 +
12921 + if ((long)n < 0)
12922 + return n;
12923 +
12924 if (__builtin_constant_p(n)) {
12925 unsigned long ret;
12926
12927 @@ -181,15 +200,19 @@ static __always_inline unsigned long
12928 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12929 unsigned long n)
12930 {
12931 - return __copy_from_user_ll_nocache_nozero(to, from, n);
12932 + if ((long)n < 0)
12933 + return n;
12934 +
12935 + return __copy_from_user_ll_nocache_nozero(to, from, n);
12936 }
12937
12938 -unsigned long __must_check copy_to_user(void __user *to,
12939 - const void *from, unsigned long n);
12940 -unsigned long __must_check _copy_from_user(void *to,
12941 - const void __user *from,
12942 - unsigned long n);
12943 -
12944 +extern void copy_to_user_overflow(void)
12945 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12946 + __compiletime_error("copy_to_user() buffer size is not provably correct")
12947 +#else
12948 + __compiletime_warning("copy_to_user() buffer size is not provably correct")
12949 +#endif
12950 +;
12951
12952 extern void copy_from_user_overflow(void)
12953 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12954 @@ -199,21 +222,65 @@ extern void copy_from_user_overflow(void)
12955 #endif
12956 ;
12957
12958 -static inline unsigned long __must_check copy_from_user(void *to,
12959 - const void __user *from,
12960 - unsigned long n)
12961 +/**
12962 + * copy_to_user: - Copy a block of data into user space.
12963 + * @to: Destination address, in user space.
12964 + * @from: Source address, in kernel space.
12965 + * @n: Number of bytes to copy.
12966 + *
12967 + * Context: User context only. This function may sleep.
12968 + *
12969 + * Copy data from kernel space to user space.
12970 + *
12971 + * Returns number of bytes that could not be copied.
12972 + * On success, this will be zero.
12973 + */
12974 +static inline unsigned long __must_check
12975 +copy_to_user(void __user *to, const void *from, unsigned long n)
12976 {
12977 - int sz = __compiletime_object_size(to);
12978 + size_t sz = __compiletime_object_size(from);
12979
12980 - if (likely(sz == -1 || sz >= n))
12981 - n = _copy_from_user(to, from, n);
12982 - else
12983 + if (unlikely(sz != (size_t)-1 && sz < n))
12984 + copy_to_user_overflow();
12985 + else if (access_ok(VERIFY_WRITE, to, n))
12986 + n = __copy_to_user(to, from, n);
12987 + return n;
12988 +}
12989 +
12990 +/**
12991 + * copy_from_user: - Copy a block of data from user space.
12992 + * @to: Destination address, in kernel space.
12993 + * @from: Source address, in user space.
12994 + * @n: Number of bytes to copy.
12995 + *
12996 + * Context: User context only. This function may sleep.
12997 + *
12998 + * Copy data from user space to kernel space.
12999 + *
13000 + * Returns number of bytes that could not be copied.
13001 + * On success, this will be zero.
13002 + *
13003 + * If some data could not be copied, this function will pad the copied
13004 + * data to the requested size using zero bytes.
13005 + */
13006 +static inline unsigned long __must_check
13007 +copy_from_user(void *to, const void __user *from, unsigned long n)
13008 +{
13009 + size_t sz = __compiletime_object_size(to);
13010 +
13011 + if (unlikely(sz != (size_t)-1 && sz < n))
13012 copy_from_user_overflow();
13013 -
13014 + else if (access_ok(VERIFY_READ, from, n))
13015 + n = __copy_from_user(to, from, n);
13016 + else if ((long)n > 0) {
13017 + if (!__builtin_constant_p(n))
13018 + check_object_size(to, n, false);
13019 + memset(to, 0, n);
13020 + }
13021 return n;
13022 }
13023
13024 -unsigned long __must_check clear_user(void __user *mem, unsigned long len);
13025 -unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
13026 +unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13027 +unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13028
13029 #endif /* _ASM_X86_UACCESS_32_H */
13030 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
13031 index 8e796fb..72fd934 100644
13032 --- a/arch/x86/include/asm/uaccess_64.h
13033 +++ b/arch/x86/include/asm/uaccess_64.h
13034 @@ -10,6 +10,9 @@
13035 #include <asm/alternative.h>
13036 #include <asm/cpufeature.h>
13037 #include <asm/page.h>
13038 +#include <asm/pgtable.h>
13039 +
13040 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
13041
13042 /*
13043 * Copy To/From Userspace
13044 @@ -17,12 +20,14 @@
13045
13046 /* Handles exceptions in both to and from, but doesn't do access_ok */
13047 __must_check unsigned long
13048 -copy_user_generic_string(void *to, const void *from, unsigned len);
13049 +copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
13050 __must_check unsigned long
13051 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
13052 +copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
13053
13054 static __always_inline __must_check unsigned long
13055 -copy_user_generic(void *to, const void *from, unsigned len)
13056 +copy_user_generic(void *to, const void *from, unsigned long len) __size_overflow(3);
13057 +static __always_inline __must_check unsigned long
13058 +copy_user_generic(void *to, const void *from, unsigned long len)
13059 {
13060 unsigned ret;
13061
13062 @@ -32,142 +37,238 @@ copy_user_generic(void *to, const void *from, unsigned len)
13063 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
13064 "=d" (len)),
13065 "1" (to), "2" (from), "3" (len)
13066 - : "memory", "rcx", "r8", "r9", "r10", "r11");
13067 + : "memory", "rcx", "r8", "r9", "r11");
13068 return ret;
13069 }
13070
13071 +static __always_inline __must_check unsigned long
13072 +__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
13073 +static __always_inline __must_check unsigned long
13074 +__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
13075 __must_check unsigned long
13076 -_copy_to_user(void __user *to, const void *from, unsigned len);
13077 -__must_check unsigned long
13078 -_copy_from_user(void *to, const void __user *from, unsigned len);
13079 -__must_check unsigned long
13080 -copy_in_user(void __user *to, const void __user *from, unsigned len);
13081 +copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
13082 +
13083 +extern void copy_to_user_overflow(void)
13084 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
13085 + __compiletime_error("copy_to_user() buffer size is not provably correct")
13086 +#else
13087 + __compiletime_warning("copy_to_user() buffer size is not provably correct")
13088 +#endif
13089 +;
13090 +
13091 +extern void copy_from_user_overflow(void)
13092 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
13093 + __compiletime_error("copy_from_user() buffer size is not provably correct")
13094 +#else
13095 + __compiletime_warning("copy_from_user() buffer size is not provably correct")
13096 +#endif
13097 +;
13098
13099 static inline unsigned long __must_check copy_from_user(void *to,
13100 const void __user *from,
13101 unsigned long n)
13102 {
13103 - int sz = __compiletime_object_size(to);
13104 -
13105 might_fault();
13106 - if (likely(sz == -1 || sz >= n))
13107 - n = _copy_from_user(to, from, n);
13108 -#ifdef CONFIG_DEBUG_VM
13109 - else
13110 - WARN(1, "Buffer overflow detected!\n");
13111 -#endif
13112 +
13113 + if (access_ok(VERIFY_READ, from, n))
13114 + n = __copy_from_user(to, from, n);
13115 + else if (n < INT_MAX) {
13116 + if (!__builtin_constant_p(n))
13117 + check_object_size(to, n, false);
13118 + memset(to, 0, n);
13119 + }
13120 return n;
13121 }
13122
13123 static __always_inline __must_check
13124 -int copy_to_user(void __user *dst, const void *src, unsigned size)
13125 +int copy_to_user(void __user *dst, const void *src, unsigned long size)
13126 {
13127 might_fault();
13128
13129 - return _copy_to_user(dst, src, size);
13130 + if (access_ok(VERIFY_WRITE, dst, size))
13131 + size = __copy_to_user(dst, src, size);
13132 + return size;
13133 }
13134
13135 static __always_inline __must_check
13136 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
13137 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
13138 {
13139 - int ret = 0;
13140 + size_t sz = __compiletime_object_size(dst);
13141 + unsigned ret = 0;
13142
13143 might_fault();
13144 - if (!__builtin_constant_p(size))
13145 - return copy_user_generic(dst, (__force void *)src, size);
13146 +
13147 + if (size > INT_MAX)
13148 + return size;
13149 +
13150 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13151 + if (!__access_ok(VERIFY_READ, src, size))
13152 + return size;
13153 +#endif
13154 +
13155 + if (unlikely(sz != (size_t)-1 && sz < size)) {
13156 + copy_from_user_overflow();
13157 + return size;
13158 + }
13159 +
13160 + if (!__builtin_constant_p(size)) {
13161 + check_object_size(dst, size, false);
13162 +
13163 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13164 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13165 + src += PAX_USER_SHADOW_BASE;
13166 +#endif
13167 +
13168 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
13169 + }
13170 switch (size) {
13171 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
13172 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
13173 ret, "b", "b", "=q", 1);
13174 return ret;
13175 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
13176 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
13177 ret, "w", "w", "=r", 2);
13178 return ret;
13179 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
13180 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
13181 ret, "l", "k", "=r", 4);
13182 return ret;
13183 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
13184 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
13185 ret, "q", "", "=r", 8);
13186 return ret;
13187 case 10:
13188 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
13189 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
13190 ret, "q", "", "=r", 10);
13191 if (unlikely(ret))
13192 return ret;
13193 __get_user_asm(*(u16 *)(8 + (char *)dst),
13194 - (u16 __user *)(8 + (char __user *)src),
13195 + (const u16 __user *)(8 + (const char __user *)src),
13196 ret, "w", "w", "=r", 2);
13197 return ret;
13198 case 16:
13199 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
13200 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
13201 ret, "q", "", "=r", 16);
13202 if (unlikely(ret))
13203 return ret;
13204 __get_user_asm(*(u64 *)(8 + (char *)dst),
13205 - (u64 __user *)(8 + (char __user *)src),
13206 + (const u64 __user *)(8 + (const char __user *)src),
13207 ret, "q", "", "=r", 8);
13208 return ret;
13209 default:
13210 - return copy_user_generic(dst, (__force void *)src, size);
13211 +
13212 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13213 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13214 + src += PAX_USER_SHADOW_BASE;
13215 +#endif
13216 +
13217 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
13218 }
13219 }
13220
13221 static __always_inline __must_check
13222 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
13223 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
13224 {
13225 - int ret = 0;
13226 + size_t sz = __compiletime_object_size(src);
13227 + unsigned ret = 0;
13228
13229 might_fault();
13230 - if (!__builtin_constant_p(size))
13231 - return copy_user_generic((__force void *)dst, src, size);
13232 +
13233 + if (size > INT_MAX)
13234 + return size;
13235 +
13236 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13237 + if (!__access_ok(VERIFY_WRITE, dst, size))
13238 + return size;
13239 +#endif
13240 +
13241 + if (unlikely(sz != (size_t)-1 && sz < size)) {
13242 + copy_to_user_overflow();
13243 + return size;
13244 + }
13245 +
13246 + if (!__builtin_constant_p(size)) {
13247 + check_object_size(src, size, true);
13248 +
13249 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13250 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13251 + dst += PAX_USER_SHADOW_BASE;
13252 +#endif
13253 +
13254 + return copy_user_generic((__force_kernel void *)dst, src, size);
13255 + }
13256 switch (size) {
13257 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
13258 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
13259 ret, "b", "b", "iq", 1);
13260 return ret;
13261 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
13262 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
13263 ret, "w", "w", "ir", 2);
13264 return ret;
13265 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
13266 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
13267 ret, "l", "k", "ir", 4);
13268 return ret;
13269 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
13270 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13271 ret, "q", "", "er", 8);
13272 return ret;
13273 case 10:
13274 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
13275 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13276 ret, "q", "", "er", 10);
13277 if (unlikely(ret))
13278 return ret;
13279 asm("":::"memory");
13280 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
13281 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
13282 ret, "w", "w", "ir", 2);
13283 return ret;
13284 case 16:
13285 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
13286 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13287 ret, "q", "", "er", 16);
13288 if (unlikely(ret))
13289 return ret;
13290 asm("":::"memory");
13291 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
13292 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
13293 ret, "q", "", "er", 8);
13294 return ret;
13295 default:
13296 - return copy_user_generic((__force void *)dst, src, size);
13297 +
13298 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13299 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13300 + dst += PAX_USER_SHADOW_BASE;
13301 +#endif
13302 +
13303 + return copy_user_generic((__force_kernel void *)dst, src, size);
13304 }
13305 }
13306
13307 static __always_inline __must_check
13308 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13309 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
13310 {
13311 - int ret = 0;
13312 + unsigned ret = 0;
13313
13314 might_fault();
13315 - if (!__builtin_constant_p(size))
13316 - return copy_user_generic((__force void *)dst,
13317 - (__force void *)src, size);
13318 +
13319 + if (size > INT_MAX)
13320 + return size;
13321 +
13322 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13323 + if (!__access_ok(VERIFY_READ, src, size))
13324 + return size;
13325 + if (!__access_ok(VERIFY_WRITE, dst, size))
13326 + return size;
13327 +#endif
13328 +
13329 + if (!__builtin_constant_p(size)) {
13330 +
13331 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13332 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13333 + src += PAX_USER_SHADOW_BASE;
13334 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13335 + dst += PAX_USER_SHADOW_BASE;
13336 +#endif
13337 +
13338 + return copy_user_generic((__force_kernel void *)dst,
13339 + (__force_kernel const void *)src, size);
13340 + }
13341 switch (size) {
13342 case 1: {
13343 u8 tmp;
13344 - __get_user_asm(tmp, (u8 __user *)src,
13345 + __get_user_asm(tmp, (const u8 __user *)src,
13346 ret, "b", "b", "=q", 1);
13347 if (likely(!ret))
13348 __put_user_asm(tmp, (u8 __user *)dst,
13349 @@ -176,7 +277,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13350 }
13351 case 2: {
13352 u16 tmp;
13353 - __get_user_asm(tmp, (u16 __user *)src,
13354 + __get_user_asm(tmp, (const u16 __user *)src,
13355 ret, "w", "w", "=r", 2);
13356 if (likely(!ret))
13357 __put_user_asm(tmp, (u16 __user *)dst,
13358 @@ -186,7 +287,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13359
13360 case 4: {
13361 u32 tmp;
13362 - __get_user_asm(tmp, (u32 __user *)src,
13363 + __get_user_asm(tmp, (const u32 __user *)src,
13364 ret, "l", "k", "=r", 4);
13365 if (likely(!ret))
13366 __put_user_asm(tmp, (u32 __user *)dst,
13367 @@ -195,7 +296,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13368 }
13369 case 8: {
13370 u64 tmp;
13371 - __get_user_asm(tmp, (u64 __user *)src,
13372 + __get_user_asm(tmp, (const u64 __user *)src,
13373 ret, "q", "", "=r", 8);
13374 if (likely(!ret))
13375 __put_user_asm(tmp, (u64 __user *)dst,
13376 @@ -203,44 +304,89 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13377 return ret;
13378 }
13379 default:
13380 - return copy_user_generic((__force void *)dst,
13381 - (__force void *)src, size);
13382 +
13383 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13384 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13385 + src += PAX_USER_SHADOW_BASE;
13386 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13387 + dst += PAX_USER_SHADOW_BASE;
13388 +#endif
13389 +
13390 + return copy_user_generic((__force_kernel void *)dst,
13391 + (__force_kernel const void *)src, size);
13392 }
13393 }
13394
13395 -__must_check unsigned long clear_user(void __user *mem, unsigned long len);
13396 -__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
13397 +__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13398 +__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13399
13400 static __must_check __always_inline int
13401 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
13402 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
13403 {
13404 - return copy_user_generic(dst, (__force const void *)src, size);
13405 + if (size > INT_MAX)
13406 + return size;
13407 +
13408 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13409 + if (!__access_ok(VERIFY_READ, src, size))
13410 + return size;
13411 +
13412 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13413 + src += PAX_USER_SHADOW_BASE;
13414 +#endif
13415 +
13416 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
13417 }
13418
13419 -static __must_check __always_inline int
13420 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
13421 +static __must_check __always_inline unsigned long
13422 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
13423 {
13424 - return copy_user_generic((__force void *)dst, src, size);
13425 + if (size > INT_MAX)
13426 + return size;
13427 +
13428 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13429 + if (!__access_ok(VERIFY_WRITE, dst, size))
13430 + return size;
13431 +
13432 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13433 + dst += PAX_USER_SHADOW_BASE;
13434 +#endif
13435 +
13436 + return copy_user_generic((__force_kernel void *)dst, src, size);
13437 }
13438
13439 -extern long __copy_user_nocache(void *dst, const void __user *src,
13440 - unsigned size, int zerorest);
13441 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
13442 + unsigned long size, int zerorest) __size_overflow(3);
13443
13444 -static inline int
13445 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
13446 +static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
13447 {
13448 might_sleep();
13449 +
13450 + if (size > INT_MAX)
13451 + return size;
13452 +
13453 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13454 + if (!__access_ok(VERIFY_READ, src, size))
13455 + return size;
13456 +#endif
13457 +
13458 return __copy_user_nocache(dst, src, size, 1);
13459 }
13460
13461 -static inline int
13462 -__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13463 - unsigned size)
13464 +static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13465 + unsigned long size)
13466 {
13467 + if (size > INT_MAX)
13468 + return size;
13469 +
13470 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13471 + if (!__access_ok(VERIFY_READ, src, size))
13472 + return size;
13473 +#endif
13474 +
13475 return __copy_user_nocache(dst, src, size, 0);
13476 }
13477
13478 -unsigned long
13479 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
13480 +extern unsigned long
13481 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
13482
13483 #endif /* _ASM_X86_UACCESS_64_H */
13484 diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
13485 index bb05228..d763d5b 100644
13486 --- a/arch/x86/include/asm/vdso.h
13487 +++ b/arch/x86/include/asm/vdso.h
13488 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
13489 #define VDSO32_SYMBOL(base, name) \
13490 ({ \
13491 extern const char VDSO32_##name[]; \
13492 - (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13493 + (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13494 })
13495 #endif
13496
13497 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
13498 index 5b238981..77fdd78 100644
13499 --- a/arch/x86/include/asm/word-at-a-time.h
13500 +++ b/arch/x86/include/asm/word-at-a-time.h
13501 @@ -11,7 +11,7 @@
13502 * and shift, for example.
13503 */
13504 struct word_at_a_time {
13505 - const unsigned long one_bits, high_bits;
13506 + unsigned long one_bits, high_bits;
13507 };
13508
13509 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
13510 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13511 index c090af1..7e7bf16 100644
13512 --- a/arch/x86/include/asm/x86_init.h
13513 +++ b/arch/x86/include/asm/x86_init.h
13514 @@ -29,7 +29,7 @@ struct x86_init_mpparse {
13515 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13516 void (*find_smp_config)(void);
13517 void (*get_smp_config)(unsigned int early);
13518 -};
13519 +} __no_const;
13520
13521 /**
13522 * struct x86_init_resources - platform specific resource related ops
13523 @@ -43,7 +43,7 @@ struct x86_init_resources {
13524 void (*probe_roms)(void);
13525 void (*reserve_resources)(void);
13526 char *(*memory_setup)(void);
13527 -};
13528 +} __no_const;
13529
13530 /**
13531 * struct x86_init_irqs - platform specific interrupt setup
13532 @@ -56,7 +56,7 @@ struct x86_init_irqs {
13533 void (*pre_vector_init)(void);
13534 void (*intr_init)(void);
13535 void (*trap_init)(void);
13536 -};
13537 +} __no_const;
13538
13539 /**
13540 * struct x86_init_oem - oem platform specific customizing functions
13541 @@ -66,7 +66,7 @@ struct x86_init_irqs {
13542 struct x86_init_oem {
13543 void (*arch_setup)(void);
13544 void (*banner)(void);
13545 -};
13546 +} __no_const;
13547
13548 /**
13549 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13550 @@ -77,7 +77,7 @@ struct x86_init_oem {
13551 */
13552 struct x86_init_mapping {
13553 void (*pagetable_reserve)(u64 start, u64 end);
13554 -};
13555 +} __no_const;
13556
13557 /**
13558 * struct x86_init_paging - platform specific paging functions
13559 @@ -87,7 +87,7 @@ struct x86_init_mapping {
13560 struct x86_init_paging {
13561 void (*pagetable_setup_start)(pgd_t *base);
13562 void (*pagetable_setup_done)(pgd_t *base);
13563 -};
13564 +} __no_const;
13565
13566 /**
13567 * struct x86_init_timers - platform specific timer setup
13568 @@ -102,7 +102,7 @@ struct x86_init_timers {
13569 void (*tsc_pre_init)(void);
13570 void (*timer_init)(void);
13571 void (*wallclock_init)(void);
13572 -};
13573 +} __no_const;
13574
13575 /**
13576 * struct x86_init_iommu - platform specific iommu setup
13577 @@ -110,7 +110,7 @@ struct x86_init_timers {
13578 */
13579 struct x86_init_iommu {
13580 int (*iommu_init)(void);
13581 -};
13582 +} __no_const;
13583
13584 /**
13585 * struct x86_init_pci - platform specific pci init functions
13586 @@ -124,7 +124,7 @@ struct x86_init_pci {
13587 int (*init)(void);
13588 void (*init_irq)(void);
13589 void (*fixup_irqs)(void);
13590 -};
13591 +} __no_const;
13592
13593 /**
13594 * struct x86_init_ops - functions for platform specific setup
13595 @@ -140,7 +140,7 @@ struct x86_init_ops {
13596 struct x86_init_timers timers;
13597 struct x86_init_iommu iommu;
13598 struct x86_init_pci pci;
13599 -};
13600 +} __no_const;
13601
13602 /**
13603 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13604 @@ -151,7 +151,7 @@ struct x86_cpuinit_ops {
13605 void (*setup_percpu_clockev)(void);
13606 void (*early_percpu_clock_init)(void);
13607 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
13608 -};
13609 +} __no_const;
13610
13611 /**
13612 * struct x86_platform_ops - platform specific runtime functions
13613 @@ -177,7 +177,7 @@ struct x86_platform_ops {
13614 int (*i8042_detect)(void);
13615 void (*save_sched_clock_state)(void);
13616 void (*restore_sched_clock_state)(void);
13617 -};
13618 +} __no_const;
13619
13620 struct pci_dev;
13621
13622 @@ -186,14 +186,14 @@ struct x86_msi_ops {
13623 void (*teardown_msi_irq)(unsigned int irq);
13624 void (*teardown_msi_irqs)(struct pci_dev *dev);
13625 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
13626 -};
13627 +} __no_const;
13628
13629 struct x86_io_apic_ops {
13630 void (*init) (void);
13631 unsigned int (*read) (unsigned int apic, unsigned int reg);
13632 void (*write) (unsigned int apic, unsigned int reg, unsigned int value);
13633 void (*modify)(unsigned int apic, unsigned int reg, unsigned int value);
13634 -};
13635 +} __no_const;
13636
13637 extern struct x86_init_ops x86_init;
13638 extern struct x86_cpuinit_ops x86_cpuinit;
13639 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13640 index 8a1b6f9..a29c4e4 100644
13641 --- a/arch/x86/include/asm/xsave.h
13642 +++ b/arch/x86/include/asm/xsave.h
13643 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13644 {
13645 int err;
13646
13647 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13648 + if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13649 + buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13650 +#endif
13651 +
13652 /*
13653 * Clear the xsave header first, so that reserved fields are
13654 * initialized to zero.
13655 @@ -93,10 +98,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13656 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13657 {
13658 int err;
13659 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13660 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13661 u32 lmask = mask;
13662 u32 hmask = mask >> 32;
13663
13664 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13665 + if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13666 + xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13667 +#endif
13668 +
13669 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13670 "2:\n"
13671 ".section .fixup,\"ax\"\n"
13672 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13673 index 95bf99de..de9235c 100644
13674 --- a/arch/x86/kernel/acpi/sleep.c
13675 +++ b/arch/x86/kernel/acpi/sleep.c
13676 @@ -73,8 +73,12 @@ int acpi_suspend_lowlevel(void)
13677 #else /* CONFIG_64BIT */
13678 #ifdef CONFIG_SMP
13679 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13680 +
13681 + pax_open_kernel();
13682 early_gdt_descr.address =
13683 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13684 + pax_close_kernel();
13685 +
13686 initial_gs = per_cpu_offset(smp_processor_id());
13687 #endif
13688 initial_code = (unsigned long)wakeup_long64;
13689 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13690 index 7261083..5c12053 100644
13691 --- a/arch/x86/kernel/acpi/wakeup_32.S
13692 +++ b/arch/x86/kernel/acpi/wakeup_32.S
13693 @@ -30,13 +30,11 @@ wakeup_pmode_return:
13694 # and restore the stack ... but you need gdt for this to work
13695 movl saved_context_esp, %esp
13696
13697 - movl %cs:saved_magic, %eax
13698 - cmpl $0x12345678, %eax
13699 + cmpl $0x12345678, saved_magic
13700 jne bogus_magic
13701
13702 # jump to place where we left off
13703 - movl saved_eip, %eax
13704 - jmp *%eax
13705 + jmp *(saved_eip)
13706
13707 bogus_magic:
13708 jmp bogus_magic
13709 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13710 index 73ef56c..0238021 100644
13711 --- a/arch/x86/kernel/alternative.c
13712 +++ b/arch/x86/kernel/alternative.c
13713 @@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13714 */
13715 for (a = start; a < end; a++) {
13716 instr = (u8 *)&a->instr_offset + a->instr_offset;
13717 +
13718 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13719 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13720 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13721 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13722 +#endif
13723 +
13724 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13725 BUG_ON(a->replacementlen > a->instrlen);
13726 BUG_ON(a->instrlen > sizeof(insnbuf));
13727 @@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
13728 for (poff = start; poff < end; poff++) {
13729 u8 *ptr = (u8 *)poff + *poff;
13730
13731 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13732 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13733 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13734 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13735 +#endif
13736 +
13737 if (!*poff || ptr < text || ptr >= text_end)
13738 continue;
13739 /* turn DS segment override prefix into lock prefix */
13740 - if (*ptr == 0x3e)
13741 + if (*ktla_ktva(ptr) == 0x3e)
13742 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13743 };
13744 mutex_unlock(&text_mutex);
13745 @@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13746 for (poff = start; poff < end; poff++) {
13747 u8 *ptr = (u8 *)poff + *poff;
13748
13749 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13750 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13751 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13752 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13753 +#endif
13754 +
13755 if (!*poff || ptr < text || ptr >= text_end)
13756 continue;
13757 /* turn lock prefix into DS segment override prefix */
13758 - if (*ptr == 0xf0)
13759 + if (*ktla_ktva(ptr) == 0xf0)
13760 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13761 };
13762 mutex_unlock(&text_mutex);
13763 @@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13764
13765 BUG_ON(p->len > MAX_PATCH_LEN);
13766 /* prep the buffer with the original instructions */
13767 - memcpy(insnbuf, p->instr, p->len);
13768 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13769 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13770 (unsigned long)p->instr, p->len);
13771
13772 @@ -568,7 +587,7 @@ void __init alternative_instructions(void)
13773 if (smp_alt_once)
13774 free_init_pages("SMP alternatives",
13775 (unsigned long)__smp_locks,
13776 - (unsigned long)__smp_locks_end);
13777 + PAGE_ALIGN((unsigned long)__smp_locks_end));
13778
13779 restart_nmi();
13780 }
13781 @@ -585,13 +604,17 @@ void __init alternative_instructions(void)
13782 * instructions. And on the local CPU you need to be protected again NMI or MCE
13783 * handlers seeing an inconsistent instruction while you patch.
13784 */
13785 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
13786 +void *__kprobes text_poke_early(void *addr, const void *opcode,
13787 size_t len)
13788 {
13789 unsigned long flags;
13790 local_irq_save(flags);
13791 - memcpy(addr, opcode, len);
13792 +
13793 + pax_open_kernel();
13794 + memcpy(ktla_ktva(addr), opcode, len);
13795 sync_core();
13796 + pax_close_kernel();
13797 +
13798 local_irq_restore(flags);
13799 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13800 that causes hangs on some VIA CPUs. */
13801 @@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13802 */
13803 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13804 {
13805 - unsigned long flags;
13806 - char *vaddr;
13807 + unsigned char *vaddr = ktla_ktva(addr);
13808 struct page *pages[2];
13809 - int i;
13810 + size_t i;
13811
13812 if (!core_kernel_text((unsigned long)addr)) {
13813 - pages[0] = vmalloc_to_page(addr);
13814 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13815 + pages[0] = vmalloc_to_page(vaddr);
13816 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13817 } else {
13818 - pages[0] = virt_to_page(addr);
13819 + pages[0] = virt_to_page(vaddr);
13820 WARN_ON(!PageReserved(pages[0]));
13821 - pages[1] = virt_to_page(addr + PAGE_SIZE);
13822 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13823 }
13824 BUG_ON(!pages[0]);
13825 - local_irq_save(flags);
13826 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13827 - if (pages[1])
13828 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13829 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13830 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13831 - clear_fixmap(FIX_TEXT_POKE0);
13832 - if (pages[1])
13833 - clear_fixmap(FIX_TEXT_POKE1);
13834 - local_flush_tlb();
13835 - sync_core();
13836 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
13837 - that causes hangs on some VIA CPUs. */
13838 + text_poke_early(addr, opcode, len);
13839 for (i = 0; i < len; i++)
13840 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13841 - local_irq_restore(flags);
13842 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13843 return addr;
13844 }
13845
13846 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13847 index 39a222e..85a7767 100644
13848 --- a/arch/x86/kernel/apic/apic.c
13849 +++ b/arch/x86/kernel/apic/apic.c
13850 @@ -185,7 +185,7 @@ int first_system_vector = 0xfe;
13851 /*
13852 * Debug level, exported for io_apic.c
13853 */
13854 -unsigned int apic_verbosity;
13855 +int apic_verbosity;
13856
13857 int pic_mode;
13858
13859 @@ -1923,7 +1923,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13860 apic_write(APIC_ESR, 0);
13861 v1 = apic_read(APIC_ESR);
13862 ack_APIC_irq();
13863 - atomic_inc(&irq_err_count);
13864 + atomic_inc_unchecked(&irq_err_count);
13865
13866 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13867 smp_processor_id(), v0 , v1);
13868 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13869 index 5f0ff59..f9e01bc 100644
13870 --- a/arch/x86/kernel/apic/io_apic.c
13871 +++ b/arch/x86/kernel/apic/io_apic.c
13872 @@ -1084,7 +1084,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13873 }
13874 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13875
13876 -void lock_vector_lock(void)
13877 +void lock_vector_lock(void) __acquires(vector_lock)
13878 {
13879 /* Used to the online set of cpus does not change
13880 * during assign_irq_vector.
13881 @@ -1092,7 +1092,7 @@ void lock_vector_lock(void)
13882 raw_spin_lock(&vector_lock);
13883 }
13884
13885 -void unlock_vector_lock(void)
13886 +void unlock_vector_lock(void) __releases(vector_lock)
13887 {
13888 raw_spin_unlock(&vector_lock);
13889 }
13890 @@ -2369,7 +2369,7 @@ static void ack_apic_edge(struct irq_data *data)
13891 ack_APIC_irq();
13892 }
13893
13894 -atomic_t irq_mis_count;
13895 +atomic_unchecked_t irq_mis_count;
13896
13897 #ifdef CONFIG_GENERIC_PENDING_IRQ
13898 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
13899 @@ -2510,7 +2510,7 @@ static void ack_apic_level(struct irq_data *data)
13900 * at the cpu.
13901 */
13902 if (!(v & (1 << (i & 0x1f)))) {
13903 - atomic_inc(&irq_mis_count);
13904 + atomic_inc_unchecked(&irq_mis_count);
13905
13906 eoi_ioapic_irq(irq, cfg);
13907 }
13908 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13909 index 07b0c0d..1df6f42 100644
13910 --- a/arch/x86/kernel/apm_32.c
13911 +++ b/arch/x86/kernel/apm_32.c
13912 @@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
13913 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13914 * even though they are called in protected mode.
13915 */
13916 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13917 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13918 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13919
13920 static const char driver_version[] = "1.16ac"; /* no spaces */
13921 @@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call)
13922 BUG_ON(cpu != 0);
13923 gdt = get_cpu_gdt_table(cpu);
13924 save_desc_40 = gdt[0x40 / 8];
13925 +
13926 + pax_open_kernel();
13927 gdt[0x40 / 8] = bad_bios_desc;
13928 + pax_close_kernel();
13929
13930 apm_irq_save(flags);
13931 APM_DO_SAVE_SEGS;
13932 @@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call)
13933 &call->esi);
13934 APM_DO_RESTORE_SEGS;
13935 apm_irq_restore(flags);
13936 +
13937 + pax_open_kernel();
13938 gdt[0x40 / 8] = save_desc_40;
13939 + pax_close_kernel();
13940 +
13941 put_cpu();
13942
13943 return call->eax & 0xff;
13944 @@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void *_call)
13945 BUG_ON(cpu != 0);
13946 gdt = get_cpu_gdt_table(cpu);
13947 save_desc_40 = gdt[0x40 / 8];
13948 +
13949 + pax_open_kernel();
13950 gdt[0x40 / 8] = bad_bios_desc;
13951 + pax_close_kernel();
13952
13953 apm_irq_save(flags);
13954 APM_DO_SAVE_SEGS;
13955 @@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void *_call)
13956 &call->eax);
13957 APM_DO_RESTORE_SEGS;
13958 apm_irq_restore(flags);
13959 +
13960 + pax_open_kernel();
13961 gdt[0x40 / 8] = save_desc_40;
13962 + pax_close_kernel();
13963 +
13964 put_cpu();
13965 return error;
13966 }
13967 @@ -2345,12 +2359,15 @@ static int __init apm_init(void)
13968 * code to that CPU.
13969 */
13970 gdt = get_cpu_gdt_table(0);
13971 +
13972 + pax_open_kernel();
13973 set_desc_base(&gdt[APM_CS >> 3],
13974 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13975 set_desc_base(&gdt[APM_CS_16 >> 3],
13976 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13977 set_desc_base(&gdt[APM_DS >> 3],
13978 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13979 + pax_close_kernel();
13980
13981 proc_create("apm", 0, NULL, &apm_file_ops);
13982
13983 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
13984 index 68de2dc..1f3c720 100644
13985 --- a/arch/x86/kernel/asm-offsets.c
13986 +++ b/arch/x86/kernel/asm-offsets.c
13987 @@ -33,6 +33,8 @@ void common(void) {
13988 OFFSET(TI_status, thread_info, status);
13989 OFFSET(TI_addr_limit, thread_info, addr_limit);
13990 OFFSET(TI_preempt_count, thread_info, preempt_count);
13991 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13992 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13993
13994 BLANK();
13995 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
13996 @@ -53,8 +55,26 @@ void common(void) {
13997 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13998 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13999 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
14000 +
14001 +#ifdef CONFIG_PAX_KERNEXEC
14002 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
14003 #endif
14004
14005 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14006 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
14007 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
14008 +#ifdef CONFIG_X86_64
14009 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
14010 +#endif
14011 +#endif
14012 +
14013 +#endif
14014 +
14015 + BLANK();
14016 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
14017 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
14018 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
14019 +
14020 #ifdef CONFIG_XEN
14021 BLANK();
14022 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
14023 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
14024 index 1b4754f..fbb4227 100644
14025 --- a/arch/x86/kernel/asm-offsets_64.c
14026 +++ b/arch/x86/kernel/asm-offsets_64.c
14027 @@ -76,6 +76,7 @@ int main(void)
14028 BLANK();
14029 #undef ENTRY
14030
14031 + DEFINE(TSS_size, sizeof(struct tss_struct));
14032 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
14033 BLANK();
14034
14035 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
14036 index 6ab6aa2..8f71507 100644
14037 --- a/arch/x86/kernel/cpu/Makefile
14038 +++ b/arch/x86/kernel/cpu/Makefile
14039 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
14040 CFLAGS_REMOVE_perf_event.o = -pg
14041 endif
14042
14043 -# Make sure load_percpu_segment has no stackprotector
14044 -nostackp := $(call cc-option, -fno-stack-protector)
14045 -CFLAGS_common.o := $(nostackp)
14046 -
14047 obj-y := intel_cacheinfo.o scattered.o topology.o
14048 obj-y += proc.o capflags.o powerflags.o common.o
14049 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
14050 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
14051 index 146bb62..ac9c74a 100644
14052 --- a/arch/x86/kernel/cpu/amd.c
14053 +++ b/arch/x86/kernel/cpu/amd.c
14054 @@ -691,7 +691,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
14055 unsigned int size)
14056 {
14057 /* AMD errata T13 (order #21922) */
14058 - if ((c->x86 == 6)) {
14059 + if (c->x86 == 6) {
14060 /* Duron Rev A0 */
14061 if (c->x86_model == 3 && c->x86_mask == 0)
14062 size = 64;
14063 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
14064 index 6b9333b..4c3083a 100644
14065 --- a/arch/x86/kernel/cpu/common.c
14066 +++ b/arch/x86/kernel/cpu/common.c
14067 @@ -86,60 +86,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
14068
14069 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
14070
14071 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
14072 -#ifdef CONFIG_X86_64
14073 - /*
14074 - * We need valid kernel segments for data and code in long mode too
14075 - * IRET will check the segment types kkeil 2000/10/28
14076 - * Also sysret mandates a special GDT layout
14077 - *
14078 - * TLS descriptors are currently at a different place compared to i386.
14079 - * Hopefully nobody expects them at a fixed place (Wine?)
14080 - */
14081 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
14082 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
14083 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
14084 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
14085 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
14086 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
14087 -#else
14088 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
14089 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
14090 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
14091 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
14092 - /*
14093 - * Segments used for calling PnP BIOS have byte granularity.
14094 - * They code segments and data segments have fixed 64k limits,
14095 - * the transfer segment sizes are set at run time.
14096 - */
14097 - /* 32-bit code */
14098 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
14099 - /* 16-bit code */
14100 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
14101 - /* 16-bit data */
14102 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
14103 - /* 16-bit data */
14104 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
14105 - /* 16-bit data */
14106 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
14107 - /*
14108 - * The APM segments have byte granularity and their bases
14109 - * are set at run time. All have 64k limits.
14110 - */
14111 - /* 32-bit code */
14112 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
14113 - /* 16-bit code */
14114 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
14115 - /* data */
14116 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
14117 -
14118 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
14119 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
14120 - GDT_STACK_CANARY_INIT
14121 -#endif
14122 -} };
14123 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
14124 -
14125 static int __init x86_xsave_setup(char *s)
14126 {
14127 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
14128 @@ -374,7 +320,7 @@ void switch_to_new_gdt(int cpu)
14129 {
14130 struct desc_ptr gdt_descr;
14131
14132 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
14133 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
14134 gdt_descr.size = GDT_SIZE - 1;
14135 load_gdt(&gdt_descr);
14136 /* Reload the per-cpu base */
14137 @@ -841,6 +787,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
14138 /* Filter out anything that depends on CPUID levels we don't have */
14139 filter_cpuid_features(c, true);
14140
14141 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
14142 + setup_clear_cpu_cap(X86_FEATURE_SEP);
14143 +#endif
14144 +
14145 /* If the model name is still unset, do table lookup. */
14146 if (!c->x86_model_id[0]) {
14147 const char *p;
14148 @@ -1021,10 +971,12 @@ static __init int setup_disablecpuid(char *arg)
14149 }
14150 __setup("clearcpuid=", setup_disablecpuid);
14151
14152 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
14153 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
14154 +
14155 #ifdef CONFIG_X86_64
14156 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
14157 -struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
14158 - (unsigned long) nmi_idt_table };
14159 +struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table };
14160
14161 DEFINE_PER_CPU_FIRST(union irq_stack_union,
14162 irq_stack_union) __aligned(PAGE_SIZE);
14163 @@ -1038,7 +990,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
14164 EXPORT_PER_CPU_SYMBOL(current_task);
14165
14166 DEFINE_PER_CPU(unsigned long, kernel_stack) =
14167 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
14168 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
14169 EXPORT_PER_CPU_SYMBOL(kernel_stack);
14170
14171 DEFINE_PER_CPU(char *, irq_stack_ptr) =
14172 @@ -1132,7 +1084,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
14173 {
14174 memset(regs, 0, sizeof(struct pt_regs));
14175 regs->fs = __KERNEL_PERCPU;
14176 - regs->gs = __KERNEL_STACK_CANARY;
14177 + savesegment(gs, regs->gs);
14178
14179 return regs;
14180 }
14181 @@ -1187,7 +1139,7 @@ void __cpuinit cpu_init(void)
14182 int i;
14183
14184 cpu = stack_smp_processor_id();
14185 - t = &per_cpu(init_tss, cpu);
14186 + t = init_tss + cpu;
14187 oist = &per_cpu(orig_ist, cpu);
14188
14189 #ifdef CONFIG_NUMA
14190 @@ -1213,7 +1165,7 @@ void __cpuinit cpu_init(void)
14191 switch_to_new_gdt(cpu);
14192 loadsegment(fs, 0);
14193
14194 - load_idt((const struct desc_ptr *)&idt_descr);
14195 + load_idt(&idt_descr);
14196
14197 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
14198 syscall_init();
14199 @@ -1222,7 +1174,6 @@ void __cpuinit cpu_init(void)
14200 wrmsrl(MSR_KERNEL_GS_BASE, 0);
14201 barrier();
14202
14203 - x86_configure_nx();
14204 if (cpu != 0)
14205 enable_x2apic();
14206
14207 @@ -1278,7 +1229,7 @@ void __cpuinit cpu_init(void)
14208 {
14209 int cpu = smp_processor_id();
14210 struct task_struct *curr = current;
14211 - struct tss_struct *t = &per_cpu(init_tss, cpu);
14212 + struct tss_struct *t = init_tss + cpu;
14213 struct thread_struct *thread = &curr->thread;
14214
14215 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
14216 diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
14217 index 3e6ff6c..54b4992 100644
14218 --- a/arch/x86/kernel/cpu/intel.c
14219 +++ b/arch/x86/kernel/cpu/intel.c
14220 @@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
14221 * Update the IDT descriptor and reload the IDT so that
14222 * it uses the read-only mapped virtual address.
14223 */
14224 - idt_descr.address = fix_to_virt(FIX_F00F_IDT);
14225 + idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
14226 load_idt(&idt_descr);
14227 }
14228 #endif
14229 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
14230 index c46ed49..5dc0a53 100644
14231 --- a/arch/x86/kernel/cpu/mcheck/mce.c
14232 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
14233 @@ -42,6 +42,7 @@
14234 #include <asm/processor.h>
14235 #include <asm/mce.h>
14236 #include <asm/msr.h>
14237 +#include <asm/local.h>
14238
14239 #include "mce-internal.h"
14240
14241 @@ -250,7 +251,7 @@ static void print_mce(struct mce *m)
14242 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
14243 m->cs, m->ip);
14244
14245 - if (m->cs == __KERNEL_CS)
14246 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
14247 print_symbol("{%s}", m->ip);
14248 pr_cont("\n");
14249 }
14250 @@ -283,10 +284,10 @@ static void print_mce(struct mce *m)
14251
14252 #define PANIC_TIMEOUT 5 /* 5 seconds */
14253
14254 -static atomic_t mce_paniced;
14255 +static atomic_unchecked_t mce_paniced;
14256
14257 static int fake_panic;
14258 -static atomic_t mce_fake_paniced;
14259 +static atomic_unchecked_t mce_fake_paniced;
14260
14261 /* Panic in progress. Enable interrupts and wait for final IPI */
14262 static void wait_for_panic(void)
14263 @@ -310,7 +311,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
14264 /*
14265 * Make sure only one CPU runs in machine check panic
14266 */
14267 - if (atomic_inc_return(&mce_paniced) > 1)
14268 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
14269 wait_for_panic();
14270 barrier();
14271
14272 @@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
14273 console_verbose();
14274 } else {
14275 /* Don't log too much for fake panic */
14276 - if (atomic_inc_return(&mce_fake_paniced) > 1)
14277 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
14278 return;
14279 }
14280 /* First print corrected ones that are still unlogged */
14281 @@ -686,7 +687,7 @@ static int mce_timed_out(u64 *t)
14282 * might have been modified by someone else.
14283 */
14284 rmb();
14285 - if (atomic_read(&mce_paniced))
14286 + if (atomic_read_unchecked(&mce_paniced))
14287 wait_for_panic();
14288 if (!monarch_timeout)
14289 goto out;
14290 @@ -1581,7 +1582,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
14291 }
14292
14293 /* Call the installed machine check handler for this CPU setup. */
14294 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
14295 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
14296 unexpected_machine_check;
14297
14298 /*
14299 @@ -1604,7 +1605,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
14300 return;
14301 }
14302
14303 + pax_open_kernel();
14304 machine_check_vector = do_machine_check;
14305 + pax_close_kernel();
14306
14307 __mcheck_cpu_init_generic();
14308 __mcheck_cpu_init_vendor(c);
14309 @@ -1618,7 +1621,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
14310 */
14311
14312 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
14313 -static int mce_chrdev_open_count; /* #times opened */
14314 +static local_t mce_chrdev_open_count; /* #times opened */
14315 static int mce_chrdev_open_exclu; /* already open exclusive? */
14316
14317 static int mce_chrdev_open(struct inode *inode, struct file *file)
14318 @@ -1626,7 +1629,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
14319 spin_lock(&mce_chrdev_state_lock);
14320
14321 if (mce_chrdev_open_exclu ||
14322 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
14323 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
14324 spin_unlock(&mce_chrdev_state_lock);
14325
14326 return -EBUSY;
14327 @@ -1634,7 +1637,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
14328
14329 if (file->f_flags & O_EXCL)
14330 mce_chrdev_open_exclu = 1;
14331 - mce_chrdev_open_count++;
14332 + local_inc(&mce_chrdev_open_count);
14333
14334 spin_unlock(&mce_chrdev_state_lock);
14335
14336 @@ -1645,7 +1648,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
14337 {
14338 spin_lock(&mce_chrdev_state_lock);
14339
14340 - mce_chrdev_open_count--;
14341 + local_dec(&mce_chrdev_open_count);
14342 mce_chrdev_open_exclu = 0;
14343
14344 spin_unlock(&mce_chrdev_state_lock);
14345 @@ -2370,7 +2373,7 @@ struct dentry *mce_get_debugfs_dir(void)
14346 static void mce_reset(void)
14347 {
14348 cpu_missing = 0;
14349 - atomic_set(&mce_fake_paniced, 0);
14350 + atomic_set_unchecked(&mce_fake_paniced, 0);
14351 atomic_set(&mce_executing, 0);
14352 atomic_set(&mce_callin, 0);
14353 atomic_set(&global_nwo, 0);
14354 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
14355 index 2d5454c..51987eb 100644
14356 --- a/arch/x86/kernel/cpu/mcheck/p5.c
14357 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
14358 @@ -11,6 +11,7 @@
14359 #include <asm/processor.h>
14360 #include <asm/mce.h>
14361 #include <asm/msr.h>
14362 +#include <asm/pgtable.h>
14363
14364 /* By default disabled */
14365 int mce_p5_enabled __read_mostly;
14366 @@ -49,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
14367 if (!cpu_has(c, X86_FEATURE_MCE))
14368 return;
14369
14370 + pax_open_kernel();
14371 machine_check_vector = pentium_machine_check;
14372 + pax_close_kernel();
14373 /* Make sure the vector pointer is visible before we enable MCEs: */
14374 wmb();
14375
14376 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
14377 index 2d7998f..17c9de1 100644
14378 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
14379 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
14380 @@ -10,6 +10,7 @@
14381 #include <asm/processor.h>
14382 #include <asm/mce.h>
14383 #include <asm/msr.h>
14384 +#include <asm/pgtable.h>
14385
14386 /* Machine check handler for WinChip C6: */
14387 static void winchip_machine_check(struct pt_regs *regs, long error_code)
14388 @@ -23,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
14389 {
14390 u32 lo, hi;
14391
14392 + pax_open_kernel();
14393 machine_check_vector = winchip_machine_check;
14394 + pax_close_kernel();
14395 /* Make sure the vector pointer is visible before we enable MCEs: */
14396 wmb();
14397
14398 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
14399 index 6b96110..0da73eb 100644
14400 --- a/arch/x86/kernel/cpu/mtrr/main.c
14401 +++ b/arch/x86/kernel/cpu/mtrr/main.c
14402 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
14403 u64 size_or_mask, size_and_mask;
14404 static bool mtrr_aps_delayed_init;
14405
14406 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
14407 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
14408
14409 const struct mtrr_ops *mtrr_if;
14410
14411 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
14412 index df5e41f..816c719 100644
14413 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
14414 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
14415 @@ -25,7 +25,7 @@ struct mtrr_ops {
14416 int (*validate_add_page)(unsigned long base, unsigned long size,
14417 unsigned int type);
14418 int (*have_wrcomb)(void);
14419 -};
14420 +} __do_const;
14421
14422 extern int generic_get_free_region(unsigned long base, unsigned long size,
14423 int replace_reg);
14424 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
14425 index c4706cf..264b0f7 100644
14426 --- a/arch/x86/kernel/cpu/perf_event.c
14427 +++ b/arch/x86/kernel/cpu/perf_event.c
14428 @@ -1837,7 +1837,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
14429 break;
14430
14431 perf_callchain_store(entry, frame.return_address);
14432 - fp = frame.next_frame;
14433 + fp = (const void __force_user *)frame.next_frame;
14434 }
14435 }
14436
14437 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
14438 index 13ad899..f642b9a 100644
14439 --- a/arch/x86/kernel/crash.c
14440 +++ b/arch/x86/kernel/crash.c
14441 @@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
14442 {
14443 #ifdef CONFIG_X86_32
14444 struct pt_regs fixed_regs;
14445 -#endif
14446
14447 -#ifdef CONFIG_X86_32
14448 - if (!user_mode_vm(regs)) {
14449 + if (!user_mode(regs)) {
14450 crash_fixup_ss_esp(&fixed_regs, regs);
14451 regs = &fixed_regs;
14452 }
14453 diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14454 index 37250fe..bf2ec74 100644
14455 --- a/arch/x86/kernel/doublefault_32.c
14456 +++ b/arch/x86/kernel/doublefault_32.c
14457 @@ -11,7 +11,7 @@
14458
14459 #define DOUBLEFAULT_STACKSIZE (1024)
14460 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14461 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14462 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14463
14464 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14465
14466 @@ -21,7 +21,7 @@ static void doublefault_fn(void)
14467 unsigned long gdt, tss;
14468
14469 store_gdt(&gdt_desc);
14470 - gdt = gdt_desc.address;
14471 + gdt = (unsigned long)gdt_desc.address;
14472
14473 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14474
14475 @@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14476 /* 0x2 bit is always set */
14477 .flags = X86_EFLAGS_SF | 0x2,
14478 .sp = STACK_START,
14479 - .es = __USER_DS,
14480 + .es = __KERNEL_DS,
14481 .cs = __KERNEL_CS,
14482 .ss = __KERNEL_DS,
14483 - .ds = __USER_DS,
14484 + .ds = __KERNEL_DS,
14485 .fs = __KERNEL_PERCPU,
14486
14487 .__cr3 = __pa_nodebug(swapper_pg_dir),
14488 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14489 index 571246d..81f335c 100644
14490 --- a/arch/x86/kernel/dumpstack.c
14491 +++ b/arch/x86/kernel/dumpstack.c
14492 @@ -2,6 +2,9 @@
14493 * Copyright (C) 1991, 1992 Linus Torvalds
14494 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14495 */
14496 +#ifdef CONFIG_GRKERNSEC_HIDESYM
14497 +#define __INCLUDED_BY_HIDESYM 1
14498 +#endif
14499 #include <linux/kallsyms.h>
14500 #include <linux/kprobes.h>
14501 #include <linux/uaccess.h>
14502 @@ -35,16 +38,14 @@ void printk_address(unsigned long address, int reliable)
14503 static void
14504 print_ftrace_graph_addr(unsigned long addr, void *data,
14505 const struct stacktrace_ops *ops,
14506 - struct thread_info *tinfo, int *graph)
14507 + struct task_struct *task, int *graph)
14508 {
14509 - struct task_struct *task;
14510 unsigned long ret_addr;
14511 int index;
14512
14513 if (addr != (unsigned long)return_to_handler)
14514 return;
14515
14516 - task = tinfo->task;
14517 index = task->curr_ret_stack;
14518
14519 if (!task->ret_stack || index < *graph)
14520 @@ -61,7 +62,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14521 static inline void
14522 print_ftrace_graph_addr(unsigned long addr, void *data,
14523 const struct stacktrace_ops *ops,
14524 - struct thread_info *tinfo, int *graph)
14525 + struct task_struct *task, int *graph)
14526 { }
14527 #endif
14528
14529 @@ -72,10 +73,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14530 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14531 */
14532
14533 -static inline int valid_stack_ptr(struct thread_info *tinfo,
14534 - void *p, unsigned int size, void *end)
14535 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14536 {
14537 - void *t = tinfo;
14538 if (end) {
14539 if (p < end && p >= (end-THREAD_SIZE))
14540 return 1;
14541 @@ -86,14 +85,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14542 }
14543
14544 unsigned long
14545 -print_context_stack(struct thread_info *tinfo,
14546 +print_context_stack(struct task_struct *task, void *stack_start,
14547 unsigned long *stack, unsigned long bp,
14548 const struct stacktrace_ops *ops, void *data,
14549 unsigned long *end, int *graph)
14550 {
14551 struct stack_frame *frame = (struct stack_frame *)bp;
14552
14553 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14554 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14555 unsigned long addr;
14556
14557 addr = *stack;
14558 @@ -105,7 +104,7 @@ print_context_stack(struct thread_info *tinfo,
14559 } else {
14560 ops->address(data, addr, 0);
14561 }
14562 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14563 + print_ftrace_graph_addr(addr, data, ops, task, graph);
14564 }
14565 stack++;
14566 }
14567 @@ -114,7 +113,7 @@ print_context_stack(struct thread_info *tinfo,
14568 EXPORT_SYMBOL_GPL(print_context_stack);
14569
14570 unsigned long
14571 -print_context_stack_bp(struct thread_info *tinfo,
14572 +print_context_stack_bp(struct task_struct *task, void *stack_start,
14573 unsigned long *stack, unsigned long bp,
14574 const struct stacktrace_ops *ops, void *data,
14575 unsigned long *end, int *graph)
14576 @@ -122,7 +121,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14577 struct stack_frame *frame = (struct stack_frame *)bp;
14578 unsigned long *ret_addr = &frame->return_address;
14579
14580 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14581 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14582 unsigned long addr = *ret_addr;
14583
14584 if (!__kernel_text_address(addr))
14585 @@ -131,7 +130,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14586 ops->address(data, addr, 1);
14587 frame = frame->next_frame;
14588 ret_addr = &frame->return_address;
14589 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14590 + print_ftrace_graph_addr(addr, data, ops, task, graph);
14591 }
14592
14593 return (unsigned long)frame;
14594 @@ -189,7 +188,7 @@ void dump_stack(void)
14595
14596 bp = stack_frame(current, NULL);
14597 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14598 - current->pid, current->comm, print_tainted(),
14599 + task_pid_nr(current), current->comm, print_tainted(),
14600 init_utsname()->release,
14601 (int)strcspn(init_utsname()->version, " "),
14602 init_utsname()->version);
14603 @@ -225,6 +224,8 @@ unsigned __kprobes long oops_begin(void)
14604 }
14605 EXPORT_SYMBOL_GPL(oops_begin);
14606
14607 +extern void gr_handle_kernel_exploit(void);
14608 +
14609 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14610 {
14611 if (regs && kexec_should_crash(current))
14612 @@ -246,7 +247,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14613 panic("Fatal exception in interrupt");
14614 if (panic_on_oops)
14615 panic("Fatal exception");
14616 - do_exit(signr);
14617 +
14618 + gr_handle_kernel_exploit();
14619 +
14620 + do_group_exit(signr);
14621 }
14622
14623 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14624 @@ -273,7 +277,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14625
14626 show_regs(regs);
14627 #ifdef CONFIG_X86_32
14628 - if (user_mode_vm(regs)) {
14629 + if (user_mode(regs)) {
14630 sp = regs->sp;
14631 ss = regs->ss & 0xffff;
14632 } else {
14633 @@ -301,7 +305,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14634 unsigned long flags = oops_begin();
14635 int sig = SIGSEGV;
14636
14637 - if (!user_mode_vm(regs))
14638 + if (!user_mode(regs))
14639 report_bug(regs->ip, regs);
14640
14641 if (__die(str, regs, err))
14642 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14643 index e0b1d78..a8ade5e 100644
14644 --- a/arch/x86/kernel/dumpstack_32.c
14645 +++ b/arch/x86/kernel/dumpstack_32.c
14646 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14647 bp = stack_frame(task, regs);
14648
14649 for (;;) {
14650 - struct thread_info *context;
14651 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14652
14653 - context = (struct thread_info *)
14654 - ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14655 - bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14656 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14657
14658 - stack = (unsigned long *)context->previous_esp;
14659 - if (!stack)
14660 + if (stack_start == task_stack_page(task))
14661 break;
14662 + stack = *(unsigned long **)stack_start;
14663 if (ops->stack(data, "IRQ") < 0)
14664 break;
14665 touch_nmi_watchdog();
14666 @@ -87,7 +85,7 @@ void show_regs(struct pt_regs *regs)
14667 int i;
14668
14669 print_modules();
14670 - __show_regs(regs, !user_mode_vm(regs));
14671 + __show_regs(regs, !user_mode(regs));
14672
14673 printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",
14674 TASK_COMM_LEN, current->comm, task_pid_nr(current),
14675 @@ -96,21 +94,22 @@ void show_regs(struct pt_regs *regs)
14676 * When in-kernel, we also print out the stack and code at the
14677 * time of the fault..
14678 */
14679 - if (!user_mode_vm(regs)) {
14680 + if (!user_mode(regs)) {
14681 unsigned int code_prologue = code_bytes * 43 / 64;
14682 unsigned int code_len = code_bytes;
14683 unsigned char c;
14684 u8 *ip;
14685 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14686
14687 printk(KERN_EMERG "Stack:\n");
14688 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14689
14690 printk(KERN_EMERG "Code: ");
14691
14692 - ip = (u8 *)regs->ip - code_prologue;
14693 + ip = (u8 *)regs->ip - code_prologue + cs_base;
14694 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14695 /* try starting at IP */
14696 - ip = (u8 *)regs->ip;
14697 + ip = (u8 *)regs->ip + cs_base;
14698 code_len = code_len - code_prologue + 1;
14699 }
14700 for (i = 0; i < code_len; i++, ip++) {
14701 @@ -119,7 +118,7 @@ void show_regs(struct pt_regs *regs)
14702 printk(KERN_CONT " Bad EIP value.");
14703 break;
14704 }
14705 - if (ip == (u8 *)regs->ip)
14706 + if (ip == (u8 *)regs->ip + cs_base)
14707 printk(KERN_CONT "<%02x> ", c);
14708 else
14709 printk(KERN_CONT "%02x ", c);
14710 @@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
14711 {
14712 unsigned short ud2;
14713
14714 + ip = ktla_ktva(ip);
14715 if (ip < PAGE_OFFSET)
14716 return 0;
14717 if (probe_kernel_address((unsigned short *)ip, ud2))
14718 @@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
14719
14720 return ud2 == 0x0b0f;
14721 }
14722 +
14723 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14724 +void pax_check_alloca(unsigned long size)
14725 +{
14726 + unsigned long sp = (unsigned long)&sp, stack_left;
14727 +
14728 + /* all kernel stacks are of the same size */
14729 + stack_left = sp & (THREAD_SIZE - 1);
14730 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14731 +}
14732 +EXPORT_SYMBOL(pax_check_alloca);
14733 +#endif
14734 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14735 index 791b761..2ab6e33 100644
14736 --- a/arch/x86/kernel/dumpstack_64.c
14737 +++ b/arch/x86/kernel/dumpstack_64.c
14738 @@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14739 unsigned long *irq_stack_end =
14740 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14741 unsigned used = 0;
14742 - struct thread_info *tinfo;
14743 int graph = 0;
14744 unsigned long dummy;
14745 + void *stack_start;
14746
14747 if (!task)
14748 task = current;
14749 @@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14750 * current stack address. If the stacks consist of nested
14751 * exceptions
14752 */
14753 - tinfo = task_thread_info(task);
14754 for (;;) {
14755 char *id;
14756 unsigned long *estack_end;
14757 +
14758 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14759 &used, &id);
14760
14761 @@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14762 if (ops->stack(data, id) < 0)
14763 break;
14764
14765 - bp = ops->walk_stack(tinfo, stack, bp, ops,
14766 + bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14767 data, estack_end, &graph);
14768 ops->stack(data, "<EOE>");
14769 /*
14770 @@ -161,6 +161,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14771 * second-to-last pointer (index -2 to end) in the
14772 * exception stack:
14773 */
14774 + if ((u16)estack_end[-1] != __KERNEL_DS)
14775 + goto out;
14776 stack = (unsigned long *) estack_end[-2];
14777 continue;
14778 }
14779 @@ -172,7 +174,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14780 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14781 if (ops->stack(data, "IRQ") < 0)
14782 break;
14783 - bp = ops->walk_stack(tinfo, stack, bp,
14784 + bp = ops->walk_stack(task, irq_stack, stack, bp,
14785 ops, data, irq_stack_end, &graph);
14786 /*
14787 * We link to the next stack (which would be
14788 @@ -191,7 +193,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14789 /*
14790 * This handles the process stack:
14791 */
14792 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14793 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14794 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14795 +out:
14796 put_cpu();
14797 }
14798 EXPORT_SYMBOL(dump_trace);
14799 @@ -305,3 +309,50 @@ int is_valid_bugaddr(unsigned long ip)
14800
14801 return ud2 == 0x0b0f;
14802 }
14803 +
14804 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14805 +void pax_check_alloca(unsigned long size)
14806 +{
14807 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14808 + unsigned cpu, used;
14809 + char *id;
14810 +
14811 + /* check the process stack first */
14812 + stack_start = (unsigned long)task_stack_page(current);
14813 + stack_end = stack_start + THREAD_SIZE;
14814 + if (likely(stack_start <= sp && sp < stack_end)) {
14815 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
14816 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14817 + return;
14818 + }
14819 +
14820 + cpu = get_cpu();
14821 +
14822 + /* check the irq stacks */
14823 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14824 + stack_start = stack_end - IRQ_STACK_SIZE;
14825 + if (stack_start <= sp && sp < stack_end) {
14826 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14827 + put_cpu();
14828 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14829 + return;
14830 + }
14831 +
14832 + /* check the exception stacks */
14833 + used = 0;
14834 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14835 + stack_start = stack_end - EXCEPTION_STKSZ;
14836 + if (stack_end && stack_start <= sp && sp < stack_end) {
14837 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14838 + put_cpu();
14839 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14840 + return;
14841 + }
14842 +
14843 + put_cpu();
14844 +
14845 + /* unknown stack */
14846 + BUG();
14847 +}
14848 +EXPORT_SYMBOL(pax_check_alloca);
14849 +#endif
14850 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14851 index 9b9f18b..9fcaa04 100644
14852 --- a/arch/x86/kernel/early_printk.c
14853 +++ b/arch/x86/kernel/early_printk.c
14854 @@ -7,6 +7,7 @@
14855 #include <linux/pci_regs.h>
14856 #include <linux/pci_ids.h>
14857 #include <linux/errno.h>
14858 +#include <linux/sched.h>
14859 #include <asm/io.h>
14860 #include <asm/processor.h>
14861 #include <asm/fcntl.h>
14862 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14863 index 623f288..8bdd78a 100644
14864 --- a/arch/x86/kernel/entry_32.S
14865 +++ b/arch/x86/kernel/entry_32.S
14866 @@ -176,13 +176,153 @@
14867 /*CFI_REL_OFFSET gs, PT_GS*/
14868 .endm
14869 .macro SET_KERNEL_GS reg
14870 +
14871 +#ifdef CONFIG_CC_STACKPROTECTOR
14872 movl $(__KERNEL_STACK_CANARY), \reg
14873 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14874 + movl $(__USER_DS), \reg
14875 +#else
14876 + xorl \reg, \reg
14877 +#endif
14878 +
14879 movl \reg, %gs
14880 .endm
14881
14882 #endif /* CONFIG_X86_32_LAZY_GS */
14883
14884 -.macro SAVE_ALL
14885 +.macro pax_enter_kernel
14886 +#ifdef CONFIG_PAX_KERNEXEC
14887 + call pax_enter_kernel
14888 +#endif
14889 +.endm
14890 +
14891 +.macro pax_exit_kernel
14892 +#ifdef CONFIG_PAX_KERNEXEC
14893 + call pax_exit_kernel
14894 +#endif
14895 +.endm
14896 +
14897 +#ifdef CONFIG_PAX_KERNEXEC
14898 +ENTRY(pax_enter_kernel)
14899 +#ifdef CONFIG_PARAVIRT
14900 + pushl %eax
14901 + pushl %ecx
14902 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14903 + mov %eax, %esi
14904 +#else
14905 + mov %cr0, %esi
14906 +#endif
14907 + bts $16, %esi
14908 + jnc 1f
14909 + mov %cs, %esi
14910 + cmp $__KERNEL_CS, %esi
14911 + jz 3f
14912 + ljmp $__KERNEL_CS, $3f
14913 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14914 +2:
14915 +#ifdef CONFIG_PARAVIRT
14916 + mov %esi, %eax
14917 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14918 +#else
14919 + mov %esi, %cr0
14920 +#endif
14921 +3:
14922 +#ifdef CONFIG_PARAVIRT
14923 + popl %ecx
14924 + popl %eax
14925 +#endif
14926 + ret
14927 +ENDPROC(pax_enter_kernel)
14928 +
14929 +ENTRY(pax_exit_kernel)
14930 +#ifdef CONFIG_PARAVIRT
14931 + pushl %eax
14932 + pushl %ecx
14933 +#endif
14934 + mov %cs, %esi
14935 + cmp $__KERNEXEC_KERNEL_CS, %esi
14936 + jnz 2f
14937 +#ifdef CONFIG_PARAVIRT
14938 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14939 + mov %eax, %esi
14940 +#else
14941 + mov %cr0, %esi
14942 +#endif
14943 + btr $16, %esi
14944 + ljmp $__KERNEL_CS, $1f
14945 +1:
14946 +#ifdef CONFIG_PARAVIRT
14947 + mov %esi, %eax
14948 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14949 +#else
14950 + mov %esi, %cr0
14951 +#endif
14952 +2:
14953 +#ifdef CONFIG_PARAVIRT
14954 + popl %ecx
14955 + popl %eax
14956 +#endif
14957 + ret
14958 +ENDPROC(pax_exit_kernel)
14959 +#endif
14960 +
14961 +.macro pax_erase_kstack
14962 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14963 + call pax_erase_kstack
14964 +#endif
14965 +.endm
14966 +
14967 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14968 +/*
14969 + * ebp: thread_info
14970 + */
14971 +ENTRY(pax_erase_kstack)
14972 + pushl %edi
14973 + pushl %ecx
14974 + pushl %eax
14975 +
14976 + mov TI_lowest_stack(%ebp), %edi
14977 + mov $-0xBEEF, %eax
14978 + std
14979 +
14980 +1: mov %edi, %ecx
14981 + and $THREAD_SIZE_asm - 1, %ecx
14982 + shr $2, %ecx
14983 + repne scasl
14984 + jecxz 2f
14985 +
14986 + cmp $2*16, %ecx
14987 + jc 2f
14988 +
14989 + mov $2*16, %ecx
14990 + repe scasl
14991 + jecxz 2f
14992 + jne 1b
14993 +
14994 +2: cld
14995 + mov %esp, %ecx
14996 + sub %edi, %ecx
14997 +
14998 + cmp $THREAD_SIZE_asm, %ecx
14999 + jb 3f
15000 + ud2
15001 +3:
15002 +
15003 + shr $2, %ecx
15004 + rep stosl
15005 +
15006 + mov TI_task_thread_sp0(%ebp), %edi
15007 + sub $128, %edi
15008 + mov %edi, TI_lowest_stack(%ebp)
15009 +
15010 + popl %eax
15011 + popl %ecx
15012 + popl %edi
15013 + ret
15014 +ENDPROC(pax_erase_kstack)
15015 +#endif
15016 +
15017 +.macro __SAVE_ALL _DS
15018 cld
15019 PUSH_GS
15020 pushl_cfi %fs
15021 @@ -205,7 +345,7 @@
15022 CFI_REL_OFFSET ecx, 0
15023 pushl_cfi %ebx
15024 CFI_REL_OFFSET ebx, 0
15025 - movl $(__USER_DS), %edx
15026 + movl $\_DS, %edx
15027 movl %edx, %ds
15028 movl %edx, %es
15029 movl $(__KERNEL_PERCPU), %edx
15030 @@ -213,6 +353,15 @@
15031 SET_KERNEL_GS %edx
15032 .endm
15033
15034 +.macro SAVE_ALL
15035 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
15036 + __SAVE_ALL __KERNEL_DS
15037 + pax_enter_kernel
15038 +#else
15039 + __SAVE_ALL __USER_DS
15040 +#endif
15041 +.endm
15042 +
15043 .macro RESTORE_INT_REGS
15044 popl_cfi %ebx
15045 CFI_RESTORE ebx
15046 @@ -296,7 +445,7 @@ ENTRY(ret_from_fork)
15047 popfl_cfi
15048 jmp syscall_exit
15049 CFI_ENDPROC
15050 -END(ret_from_fork)
15051 +ENDPROC(ret_from_fork)
15052
15053 /*
15054 * Interrupt exit functions should be protected against kprobes
15055 @@ -329,7 +478,15 @@ ret_from_intr:
15056 andl $SEGMENT_RPL_MASK, %eax
15057 #endif
15058 cmpl $USER_RPL, %eax
15059 +
15060 +#ifdef CONFIG_PAX_KERNEXEC
15061 + jae resume_userspace
15062 +
15063 + pax_exit_kernel
15064 + jmp resume_kernel
15065 +#else
15066 jb resume_kernel # not returning to v8086 or userspace
15067 +#endif
15068
15069 ENTRY(resume_userspace)
15070 LOCKDEP_SYS_EXIT
15071 @@ -341,8 +498,8 @@ ENTRY(resume_userspace)
15072 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
15073 # int/exception return?
15074 jne work_pending
15075 - jmp restore_all
15076 -END(ret_from_exception)
15077 + jmp restore_all_pax
15078 +ENDPROC(ret_from_exception)
15079
15080 #ifdef CONFIG_PREEMPT
15081 ENTRY(resume_kernel)
15082 @@ -357,7 +514,7 @@ need_resched:
15083 jz restore_all
15084 call preempt_schedule_irq
15085 jmp need_resched
15086 -END(resume_kernel)
15087 +ENDPROC(resume_kernel)
15088 #endif
15089 CFI_ENDPROC
15090 /*
15091 @@ -391,28 +548,43 @@ sysenter_past_esp:
15092 /*CFI_REL_OFFSET cs, 0*/
15093 /*
15094 * Push current_thread_info()->sysenter_return to the stack.
15095 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
15096 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
15097 */
15098 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
15099 + pushl_cfi $0
15100 CFI_REL_OFFSET eip, 0
15101
15102 pushl_cfi %eax
15103 SAVE_ALL
15104 + GET_THREAD_INFO(%ebp)
15105 + movl TI_sysenter_return(%ebp),%ebp
15106 + movl %ebp,PT_EIP(%esp)
15107 ENABLE_INTERRUPTS(CLBR_NONE)
15108
15109 /*
15110 * Load the potential sixth argument from user stack.
15111 * Careful about security.
15112 */
15113 + movl PT_OLDESP(%esp),%ebp
15114 +
15115 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15116 + mov PT_OLDSS(%esp),%ds
15117 +1: movl %ds:(%ebp),%ebp
15118 + push %ss
15119 + pop %ds
15120 +#else
15121 cmpl $__PAGE_OFFSET-3,%ebp
15122 jae syscall_fault
15123 1: movl (%ebp),%ebp
15124 +#endif
15125 +
15126 movl %ebp,PT_EBP(%esp)
15127 _ASM_EXTABLE(1b,syscall_fault)
15128
15129 GET_THREAD_INFO(%ebp)
15130
15131 +#ifdef CONFIG_PAX_RANDKSTACK
15132 + pax_erase_kstack
15133 +#endif
15134 +
15135 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
15136 jnz sysenter_audit
15137 sysenter_do_call:
15138 @@ -427,12 +599,24 @@ sysenter_do_call:
15139 testl $_TIF_ALLWORK_MASK, %ecx
15140 jne sysexit_audit
15141 sysenter_exit:
15142 +
15143 +#ifdef CONFIG_PAX_RANDKSTACK
15144 + pushl_cfi %eax
15145 + movl %esp, %eax
15146 + call pax_randomize_kstack
15147 + popl_cfi %eax
15148 +#endif
15149 +
15150 + pax_erase_kstack
15151 +
15152 /* if something modifies registers it must also disable sysexit */
15153 movl PT_EIP(%esp), %edx
15154 movl PT_OLDESP(%esp), %ecx
15155 xorl %ebp,%ebp
15156 TRACE_IRQS_ON
15157 1: mov PT_FS(%esp), %fs
15158 +2: mov PT_DS(%esp), %ds
15159 +3: mov PT_ES(%esp), %es
15160 PTGS_TO_GS
15161 ENABLE_INTERRUPTS_SYSEXIT
15162
15163 @@ -449,6 +633,9 @@ sysenter_audit:
15164 movl %eax,%edx /* 2nd arg: syscall number */
15165 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
15166 call __audit_syscall_entry
15167 +
15168 + pax_erase_kstack
15169 +
15170 pushl_cfi %ebx
15171 movl PT_EAX(%esp),%eax /* reload syscall number */
15172 jmp sysenter_do_call
15173 @@ -474,10 +661,16 @@ sysexit_audit:
15174
15175 CFI_ENDPROC
15176 .pushsection .fixup,"ax"
15177 -2: movl $0,PT_FS(%esp)
15178 +4: movl $0,PT_FS(%esp)
15179 + jmp 1b
15180 +5: movl $0,PT_DS(%esp)
15181 + jmp 1b
15182 +6: movl $0,PT_ES(%esp)
15183 jmp 1b
15184 .popsection
15185 - _ASM_EXTABLE(1b,2b)
15186 + _ASM_EXTABLE(1b,4b)
15187 + _ASM_EXTABLE(2b,5b)
15188 + _ASM_EXTABLE(3b,6b)
15189 PTGS_TO_GS_EX
15190 ENDPROC(ia32_sysenter_target)
15191
15192 @@ -491,6 +684,11 @@ ENTRY(system_call)
15193 pushl_cfi %eax # save orig_eax
15194 SAVE_ALL
15195 GET_THREAD_INFO(%ebp)
15196 +
15197 +#ifdef CONFIG_PAX_RANDKSTACK
15198 + pax_erase_kstack
15199 +#endif
15200 +
15201 # system call tracing in operation / emulation
15202 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
15203 jnz syscall_trace_entry
15204 @@ -509,6 +707,15 @@ syscall_exit:
15205 testl $_TIF_ALLWORK_MASK, %ecx # current->work
15206 jne syscall_exit_work
15207
15208 +restore_all_pax:
15209 +
15210 +#ifdef CONFIG_PAX_RANDKSTACK
15211 + movl %esp, %eax
15212 + call pax_randomize_kstack
15213 +#endif
15214 +
15215 + pax_erase_kstack
15216 +
15217 restore_all:
15218 TRACE_IRQS_IRET
15219 restore_all_notrace:
15220 @@ -565,14 +772,34 @@ ldt_ss:
15221 * compensating for the offset by changing to the ESPFIX segment with
15222 * a base address that matches for the difference.
15223 */
15224 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
15225 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
15226 mov %esp, %edx /* load kernel esp */
15227 mov PT_OLDESP(%esp), %eax /* load userspace esp */
15228 mov %dx, %ax /* eax: new kernel esp */
15229 sub %eax, %edx /* offset (low word is 0) */
15230 +#ifdef CONFIG_SMP
15231 + movl PER_CPU_VAR(cpu_number), %ebx
15232 + shll $PAGE_SHIFT_asm, %ebx
15233 + addl $cpu_gdt_table, %ebx
15234 +#else
15235 + movl $cpu_gdt_table, %ebx
15236 +#endif
15237 shr $16, %edx
15238 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
15239 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
15240 +
15241 +#ifdef CONFIG_PAX_KERNEXEC
15242 + mov %cr0, %esi
15243 + btr $16, %esi
15244 + mov %esi, %cr0
15245 +#endif
15246 +
15247 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
15248 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
15249 +
15250 +#ifdef CONFIG_PAX_KERNEXEC
15251 + bts $16, %esi
15252 + mov %esi, %cr0
15253 +#endif
15254 +
15255 pushl_cfi $__ESPFIX_SS
15256 pushl_cfi %eax /* new kernel esp */
15257 /* Disable interrupts, but do not irqtrace this section: we
15258 @@ -601,35 +828,23 @@ work_resched:
15259 movl TI_flags(%ebp), %ecx
15260 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
15261 # than syscall tracing?
15262 - jz restore_all
15263 + jz restore_all_pax
15264 testb $_TIF_NEED_RESCHED, %cl
15265 jnz work_resched
15266
15267 work_notifysig: # deal with pending signals and
15268 # notify-resume requests
15269 + movl %esp, %eax
15270 #ifdef CONFIG_VM86
15271 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
15272 - movl %esp, %eax
15273 - jne work_notifysig_v86 # returning to kernel-space or
15274 + jz 1f # returning to kernel-space or
15275 # vm86-space
15276 - TRACE_IRQS_ON
15277 - ENABLE_INTERRUPTS(CLBR_NONE)
15278 - movb PT_CS(%esp), %bl
15279 - andb $SEGMENT_RPL_MASK, %bl
15280 - cmpb $USER_RPL, %bl
15281 - jb resume_kernel
15282 - xorl %edx, %edx
15283 - call do_notify_resume
15284 - jmp resume_userspace
15285
15286 - ALIGN
15287 -work_notifysig_v86:
15288 pushl_cfi %ecx # save ti_flags for do_notify_resume
15289 call save_v86_state # %eax contains pt_regs pointer
15290 popl_cfi %ecx
15291 movl %eax, %esp
15292 -#else
15293 - movl %esp, %eax
15294 +1:
15295 #endif
15296 TRACE_IRQS_ON
15297 ENABLE_INTERRUPTS(CLBR_NONE)
15298 @@ -640,7 +855,7 @@ work_notifysig_v86:
15299 xorl %edx, %edx
15300 call do_notify_resume
15301 jmp resume_userspace
15302 -END(work_pending)
15303 +ENDPROC(work_pending)
15304
15305 # perform syscall exit tracing
15306 ALIGN
15307 @@ -648,11 +863,14 @@ syscall_trace_entry:
15308 movl $-ENOSYS,PT_EAX(%esp)
15309 movl %esp, %eax
15310 call syscall_trace_enter
15311 +
15312 + pax_erase_kstack
15313 +
15314 /* What it returned is what we'll actually use. */
15315 cmpl $(NR_syscalls), %eax
15316 jnae syscall_call
15317 jmp syscall_exit
15318 -END(syscall_trace_entry)
15319 +ENDPROC(syscall_trace_entry)
15320
15321 # perform syscall exit tracing
15322 ALIGN
15323 @@ -665,20 +883,24 @@ syscall_exit_work:
15324 movl %esp, %eax
15325 call syscall_trace_leave
15326 jmp resume_userspace
15327 -END(syscall_exit_work)
15328 +ENDPROC(syscall_exit_work)
15329 CFI_ENDPROC
15330
15331 RING0_INT_FRAME # can't unwind into user space anyway
15332 syscall_fault:
15333 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15334 + push %ss
15335 + pop %ds
15336 +#endif
15337 GET_THREAD_INFO(%ebp)
15338 movl $-EFAULT,PT_EAX(%esp)
15339 jmp resume_userspace
15340 -END(syscall_fault)
15341 +ENDPROC(syscall_fault)
15342
15343 syscall_badsys:
15344 movl $-ENOSYS,PT_EAX(%esp)
15345 jmp resume_userspace
15346 -END(syscall_badsys)
15347 +ENDPROC(syscall_badsys)
15348 CFI_ENDPROC
15349 /*
15350 * End of kprobes section
15351 @@ -750,6 +972,36 @@ ENTRY(ptregs_clone)
15352 CFI_ENDPROC
15353 ENDPROC(ptregs_clone)
15354
15355 + ALIGN;
15356 +ENTRY(kernel_execve)
15357 + CFI_STARTPROC
15358 + pushl_cfi %ebp
15359 + sub $PT_OLDSS+4,%esp
15360 + pushl_cfi %edi
15361 + pushl_cfi %ecx
15362 + pushl_cfi %eax
15363 + lea 3*4(%esp),%edi
15364 + mov $PT_OLDSS/4+1,%ecx
15365 + xorl %eax,%eax
15366 + rep stosl
15367 + popl_cfi %eax
15368 + popl_cfi %ecx
15369 + popl_cfi %edi
15370 + movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
15371 + pushl_cfi %esp
15372 + call sys_execve
15373 + add $4,%esp
15374 + CFI_ADJUST_CFA_OFFSET -4
15375 + GET_THREAD_INFO(%ebp)
15376 + test %eax,%eax
15377 + jz syscall_exit
15378 + add $PT_OLDSS+4,%esp
15379 + CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
15380 + popl_cfi %ebp
15381 + ret
15382 + CFI_ENDPROC
15383 +ENDPROC(kernel_execve)
15384 +
15385 .macro FIXUP_ESPFIX_STACK
15386 /*
15387 * Switch back for ESPFIX stack to the normal zerobased stack
15388 @@ -759,8 +1011,15 @@ ENDPROC(ptregs_clone)
15389 * normal stack and adjusts ESP with the matching offset.
15390 */
15391 /* fixup the stack */
15392 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
15393 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
15394 +#ifdef CONFIG_SMP
15395 + movl PER_CPU_VAR(cpu_number), %ebx
15396 + shll $PAGE_SHIFT_asm, %ebx
15397 + addl $cpu_gdt_table, %ebx
15398 +#else
15399 + movl $cpu_gdt_table, %ebx
15400 +#endif
15401 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
15402 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
15403 shl $16, %eax
15404 addl %esp, %eax /* the adjusted stack pointer */
15405 pushl_cfi $__KERNEL_DS
15406 @@ -813,7 +1072,7 @@ vector=vector+1
15407 .endr
15408 2: jmp common_interrupt
15409 .endr
15410 -END(irq_entries_start)
15411 +ENDPROC(irq_entries_start)
15412
15413 .previous
15414 END(interrupt)
15415 @@ -861,7 +1120,7 @@ ENTRY(coprocessor_error)
15416 pushl_cfi $do_coprocessor_error
15417 jmp error_code
15418 CFI_ENDPROC
15419 -END(coprocessor_error)
15420 +ENDPROC(coprocessor_error)
15421
15422 ENTRY(simd_coprocessor_error)
15423 RING0_INT_FRAME
15424 @@ -882,7 +1141,7 @@ ENTRY(simd_coprocessor_error)
15425 #endif
15426 jmp error_code
15427 CFI_ENDPROC
15428 -END(simd_coprocessor_error)
15429 +ENDPROC(simd_coprocessor_error)
15430
15431 ENTRY(device_not_available)
15432 RING0_INT_FRAME
15433 @@ -890,18 +1149,18 @@ ENTRY(device_not_available)
15434 pushl_cfi $do_device_not_available
15435 jmp error_code
15436 CFI_ENDPROC
15437 -END(device_not_available)
15438 +ENDPROC(device_not_available)
15439
15440 #ifdef CONFIG_PARAVIRT
15441 ENTRY(native_iret)
15442 iret
15443 _ASM_EXTABLE(native_iret, iret_exc)
15444 -END(native_iret)
15445 +ENDPROC(native_iret)
15446
15447 ENTRY(native_irq_enable_sysexit)
15448 sti
15449 sysexit
15450 -END(native_irq_enable_sysexit)
15451 +ENDPROC(native_irq_enable_sysexit)
15452 #endif
15453
15454 ENTRY(overflow)
15455 @@ -910,7 +1169,7 @@ ENTRY(overflow)
15456 pushl_cfi $do_overflow
15457 jmp error_code
15458 CFI_ENDPROC
15459 -END(overflow)
15460 +ENDPROC(overflow)
15461
15462 ENTRY(bounds)
15463 RING0_INT_FRAME
15464 @@ -918,7 +1177,7 @@ ENTRY(bounds)
15465 pushl_cfi $do_bounds
15466 jmp error_code
15467 CFI_ENDPROC
15468 -END(bounds)
15469 +ENDPROC(bounds)
15470
15471 ENTRY(invalid_op)
15472 RING0_INT_FRAME
15473 @@ -926,7 +1185,7 @@ ENTRY(invalid_op)
15474 pushl_cfi $do_invalid_op
15475 jmp error_code
15476 CFI_ENDPROC
15477 -END(invalid_op)
15478 +ENDPROC(invalid_op)
15479
15480 ENTRY(coprocessor_segment_overrun)
15481 RING0_INT_FRAME
15482 @@ -934,35 +1193,35 @@ ENTRY(coprocessor_segment_overrun)
15483 pushl_cfi $do_coprocessor_segment_overrun
15484 jmp error_code
15485 CFI_ENDPROC
15486 -END(coprocessor_segment_overrun)
15487 +ENDPROC(coprocessor_segment_overrun)
15488
15489 ENTRY(invalid_TSS)
15490 RING0_EC_FRAME
15491 pushl_cfi $do_invalid_TSS
15492 jmp error_code
15493 CFI_ENDPROC
15494 -END(invalid_TSS)
15495 +ENDPROC(invalid_TSS)
15496
15497 ENTRY(segment_not_present)
15498 RING0_EC_FRAME
15499 pushl_cfi $do_segment_not_present
15500 jmp error_code
15501 CFI_ENDPROC
15502 -END(segment_not_present)
15503 +ENDPROC(segment_not_present)
15504
15505 ENTRY(stack_segment)
15506 RING0_EC_FRAME
15507 pushl_cfi $do_stack_segment
15508 jmp error_code
15509 CFI_ENDPROC
15510 -END(stack_segment)
15511 +ENDPROC(stack_segment)
15512
15513 ENTRY(alignment_check)
15514 RING0_EC_FRAME
15515 pushl_cfi $do_alignment_check
15516 jmp error_code
15517 CFI_ENDPROC
15518 -END(alignment_check)
15519 +ENDPROC(alignment_check)
15520
15521 ENTRY(divide_error)
15522 RING0_INT_FRAME
15523 @@ -970,7 +1229,7 @@ ENTRY(divide_error)
15524 pushl_cfi $do_divide_error
15525 jmp error_code
15526 CFI_ENDPROC
15527 -END(divide_error)
15528 +ENDPROC(divide_error)
15529
15530 #ifdef CONFIG_X86_MCE
15531 ENTRY(machine_check)
15532 @@ -979,7 +1238,7 @@ ENTRY(machine_check)
15533 pushl_cfi machine_check_vector
15534 jmp error_code
15535 CFI_ENDPROC
15536 -END(machine_check)
15537 +ENDPROC(machine_check)
15538 #endif
15539
15540 ENTRY(spurious_interrupt_bug)
15541 @@ -988,7 +1247,7 @@ ENTRY(spurious_interrupt_bug)
15542 pushl_cfi $do_spurious_interrupt_bug
15543 jmp error_code
15544 CFI_ENDPROC
15545 -END(spurious_interrupt_bug)
15546 +ENDPROC(spurious_interrupt_bug)
15547 /*
15548 * End of kprobes section
15549 */
15550 @@ -1100,7 +1359,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15551
15552 ENTRY(mcount)
15553 ret
15554 -END(mcount)
15555 +ENDPROC(mcount)
15556
15557 ENTRY(ftrace_caller)
15558 cmpl $0, function_trace_stop
15559 @@ -1129,7 +1388,7 @@ ftrace_graph_call:
15560 .globl ftrace_stub
15561 ftrace_stub:
15562 ret
15563 -END(ftrace_caller)
15564 +ENDPROC(ftrace_caller)
15565
15566 #else /* ! CONFIG_DYNAMIC_FTRACE */
15567
15568 @@ -1165,7 +1424,7 @@ trace:
15569 popl %ecx
15570 popl %eax
15571 jmp ftrace_stub
15572 -END(mcount)
15573 +ENDPROC(mcount)
15574 #endif /* CONFIG_DYNAMIC_FTRACE */
15575 #endif /* CONFIG_FUNCTION_TRACER */
15576
15577 @@ -1186,7 +1445,7 @@ ENTRY(ftrace_graph_caller)
15578 popl %ecx
15579 popl %eax
15580 ret
15581 -END(ftrace_graph_caller)
15582 +ENDPROC(ftrace_graph_caller)
15583
15584 .globl return_to_handler
15585 return_to_handler:
15586 @@ -1241,15 +1500,18 @@ error_code:
15587 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15588 REG_TO_PTGS %ecx
15589 SET_KERNEL_GS %ecx
15590 - movl $(__USER_DS), %ecx
15591 + movl $(__KERNEL_DS), %ecx
15592 movl %ecx, %ds
15593 movl %ecx, %es
15594 +
15595 + pax_enter_kernel
15596 +
15597 TRACE_IRQS_OFF
15598 movl %esp,%eax # pt_regs pointer
15599 call *%edi
15600 jmp ret_from_exception
15601 CFI_ENDPROC
15602 -END(page_fault)
15603 +ENDPROC(page_fault)
15604
15605 /*
15606 * Debug traps and NMI can happen at the one SYSENTER instruction
15607 @@ -1291,7 +1553,7 @@ debug_stack_correct:
15608 call do_debug
15609 jmp ret_from_exception
15610 CFI_ENDPROC
15611 -END(debug)
15612 +ENDPROC(debug)
15613
15614 /*
15615 * NMI is doubly nasty. It can happen _while_ we're handling
15616 @@ -1328,6 +1590,9 @@ nmi_stack_correct:
15617 xorl %edx,%edx # zero error code
15618 movl %esp,%eax # pt_regs pointer
15619 call do_nmi
15620 +
15621 + pax_exit_kernel
15622 +
15623 jmp restore_all_notrace
15624 CFI_ENDPROC
15625
15626 @@ -1364,12 +1629,15 @@ nmi_espfix_stack:
15627 FIXUP_ESPFIX_STACK # %eax == %esp
15628 xorl %edx,%edx # zero error code
15629 call do_nmi
15630 +
15631 + pax_exit_kernel
15632 +
15633 RESTORE_REGS
15634 lss 12+4(%esp), %esp # back to espfix stack
15635 CFI_ADJUST_CFA_OFFSET -24
15636 jmp irq_return
15637 CFI_ENDPROC
15638 -END(nmi)
15639 +ENDPROC(nmi)
15640
15641 ENTRY(int3)
15642 RING0_INT_FRAME
15643 @@ -1381,14 +1649,14 @@ ENTRY(int3)
15644 call do_int3
15645 jmp ret_from_exception
15646 CFI_ENDPROC
15647 -END(int3)
15648 +ENDPROC(int3)
15649
15650 ENTRY(general_protection)
15651 RING0_EC_FRAME
15652 pushl_cfi $do_general_protection
15653 jmp error_code
15654 CFI_ENDPROC
15655 -END(general_protection)
15656 +ENDPROC(general_protection)
15657
15658 #ifdef CONFIG_KVM_GUEST
15659 ENTRY(async_page_fault)
15660 @@ -1396,7 +1664,7 @@ ENTRY(async_page_fault)
15661 pushl_cfi $do_async_page_fault
15662 jmp error_code
15663 CFI_ENDPROC
15664 -END(async_page_fault)
15665 +ENDPROC(async_page_fault)
15666 #endif
15667
15668 /*
15669 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15670 index 7d65133..c888d5f 100644
15671 --- a/arch/x86/kernel/entry_64.S
15672 +++ b/arch/x86/kernel/entry_64.S
15673 @@ -57,6 +57,8 @@
15674 #include <asm/percpu.h>
15675 #include <asm/asm.h>
15676 #include <linux/err.h>
15677 +#include <asm/pgtable.h>
15678 +#include <asm/alternative-asm.h>
15679
15680 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15681 #include <linux/elf-em.h>
15682 @@ -70,8 +72,9 @@
15683 #ifdef CONFIG_FUNCTION_TRACER
15684 #ifdef CONFIG_DYNAMIC_FTRACE
15685 ENTRY(mcount)
15686 + pax_force_retaddr
15687 retq
15688 -END(mcount)
15689 +ENDPROC(mcount)
15690
15691 ENTRY(ftrace_caller)
15692 cmpl $0, function_trace_stop
15693 @@ -94,8 +97,9 @@ GLOBAL(ftrace_graph_call)
15694 #endif
15695
15696 GLOBAL(ftrace_stub)
15697 + pax_force_retaddr
15698 retq
15699 -END(ftrace_caller)
15700 +ENDPROC(ftrace_caller)
15701
15702 #else /* ! CONFIG_DYNAMIC_FTRACE */
15703 ENTRY(mcount)
15704 @@ -114,6 +118,7 @@ ENTRY(mcount)
15705 #endif
15706
15707 GLOBAL(ftrace_stub)
15708 + pax_force_retaddr
15709 retq
15710
15711 trace:
15712 @@ -123,12 +128,13 @@ trace:
15713 movq 8(%rbp), %rsi
15714 subq $MCOUNT_INSN_SIZE, %rdi
15715
15716 + pax_force_fptr ftrace_trace_function
15717 call *ftrace_trace_function
15718
15719 MCOUNT_RESTORE_FRAME
15720
15721 jmp ftrace_stub
15722 -END(mcount)
15723 +ENDPROC(mcount)
15724 #endif /* CONFIG_DYNAMIC_FTRACE */
15725 #endif /* CONFIG_FUNCTION_TRACER */
15726
15727 @@ -148,8 +154,9 @@ ENTRY(ftrace_graph_caller)
15728
15729 MCOUNT_RESTORE_FRAME
15730
15731 + pax_force_retaddr
15732 retq
15733 -END(ftrace_graph_caller)
15734 +ENDPROC(ftrace_graph_caller)
15735
15736 GLOBAL(return_to_handler)
15737 subq $24, %rsp
15738 @@ -165,6 +172,7 @@ GLOBAL(return_to_handler)
15739 movq 8(%rsp), %rdx
15740 movq (%rsp), %rax
15741 addq $24, %rsp
15742 + pax_force_fptr %rdi
15743 jmp *%rdi
15744 #endif
15745
15746 @@ -180,6 +188,280 @@ ENTRY(native_usergs_sysret64)
15747 ENDPROC(native_usergs_sysret64)
15748 #endif /* CONFIG_PARAVIRT */
15749
15750 + .macro ljmpq sel, off
15751 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15752 + .byte 0x48; ljmp *1234f(%rip)
15753 + .pushsection .rodata
15754 + .align 16
15755 + 1234: .quad \off; .word \sel
15756 + .popsection
15757 +#else
15758 + pushq $\sel
15759 + pushq $\off
15760 + lretq
15761 +#endif
15762 + .endm
15763 +
15764 + .macro pax_enter_kernel
15765 + pax_set_fptr_mask
15766 +#ifdef CONFIG_PAX_KERNEXEC
15767 + call pax_enter_kernel
15768 +#endif
15769 + .endm
15770 +
15771 + .macro pax_exit_kernel
15772 +#ifdef CONFIG_PAX_KERNEXEC
15773 + call pax_exit_kernel
15774 +#endif
15775 + .endm
15776 +
15777 +#ifdef CONFIG_PAX_KERNEXEC
15778 +ENTRY(pax_enter_kernel)
15779 + pushq %rdi
15780 +
15781 +#ifdef CONFIG_PARAVIRT
15782 + PV_SAVE_REGS(CLBR_RDI)
15783 +#endif
15784 +
15785 + GET_CR0_INTO_RDI
15786 + bts $16,%rdi
15787 + jnc 3f
15788 + mov %cs,%edi
15789 + cmp $__KERNEL_CS,%edi
15790 + jnz 2f
15791 +1:
15792 +
15793 +#ifdef CONFIG_PARAVIRT
15794 + PV_RESTORE_REGS(CLBR_RDI)
15795 +#endif
15796 +
15797 + popq %rdi
15798 + pax_force_retaddr
15799 + retq
15800 +
15801 +2: ljmpq __KERNEL_CS,1f
15802 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
15803 +4: SET_RDI_INTO_CR0
15804 + jmp 1b
15805 +ENDPROC(pax_enter_kernel)
15806 +
15807 +ENTRY(pax_exit_kernel)
15808 + pushq %rdi
15809 +
15810 +#ifdef CONFIG_PARAVIRT
15811 + PV_SAVE_REGS(CLBR_RDI)
15812 +#endif
15813 +
15814 + mov %cs,%rdi
15815 + cmp $__KERNEXEC_KERNEL_CS,%edi
15816 + jz 2f
15817 +1:
15818 +
15819 +#ifdef CONFIG_PARAVIRT
15820 + PV_RESTORE_REGS(CLBR_RDI);
15821 +#endif
15822 +
15823 + popq %rdi
15824 + pax_force_retaddr
15825 + retq
15826 +
15827 +2: GET_CR0_INTO_RDI
15828 + btr $16,%rdi
15829 + ljmpq __KERNEL_CS,3f
15830 +3: SET_RDI_INTO_CR0
15831 + jmp 1b
15832 +#ifdef CONFIG_PARAVIRT
15833 + PV_RESTORE_REGS(CLBR_RDI);
15834 +#endif
15835 +
15836 + popq %rdi
15837 + pax_force_retaddr
15838 + retq
15839 +ENDPROC(pax_exit_kernel)
15840 +#endif
15841 +
15842 + .macro pax_enter_kernel_user
15843 + pax_set_fptr_mask
15844 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15845 + call pax_enter_kernel_user
15846 +#endif
15847 + .endm
15848 +
15849 + .macro pax_exit_kernel_user
15850 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15851 + call pax_exit_kernel_user
15852 +#endif
15853 +#ifdef CONFIG_PAX_RANDKSTACK
15854 + pushq %rax
15855 + call pax_randomize_kstack
15856 + popq %rax
15857 +#endif
15858 + .endm
15859 +
15860 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15861 +ENTRY(pax_enter_kernel_user)
15862 + pushq %rdi
15863 + pushq %rbx
15864 +
15865 +#ifdef CONFIG_PARAVIRT
15866 + PV_SAVE_REGS(CLBR_RDI)
15867 +#endif
15868 +
15869 + GET_CR3_INTO_RDI
15870 + mov %rdi,%rbx
15871 + add $__START_KERNEL_map,%rbx
15872 + sub phys_base(%rip),%rbx
15873 +
15874 +#ifdef CONFIG_PARAVIRT
15875 + pushq %rdi
15876 + cmpl $0, pv_info+PARAVIRT_enabled
15877 + jz 1f
15878 + i = 0
15879 + .rept USER_PGD_PTRS
15880 + mov i*8(%rbx),%rsi
15881 + mov $0,%sil
15882 + lea i*8(%rbx),%rdi
15883 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15884 + i = i + 1
15885 + .endr
15886 + jmp 2f
15887 +1:
15888 +#endif
15889 +
15890 + i = 0
15891 + .rept USER_PGD_PTRS
15892 + movb $0,i*8(%rbx)
15893 + i = i + 1
15894 + .endr
15895 +
15896 +#ifdef CONFIG_PARAVIRT
15897 +2: popq %rdi
15898 +#endif
15899 + SET_RDI_INTO_CR3
15900 +
15901 +#ifdef CONFIG_PAX_KERNEXEC
15902 + GET_CR0_INTO_RDI
15903 + bts $16,%rdi
15904 + SET_RDI_INTO_CR0
15905 +#endif
15906 +
15907 +#ifdef CONFIG_PARAVIRT
15908 + PV_RESTORE_REGS(CLBR_RDI)
15909 +#endif
15910 +
15911 + popq %rbx
15912 + popq %rdi
15913 + pax_force_retaddr
15914 + retq
15915 +ENDPROC(pax_enter_kernel_user)
15916 +
15917 +ENTRY(pax_exit_kernel_user)
15918 + push %rdi
15919 +
15920 +#ifdef CONFIG_PARAVIRT
15921 + pushq %rbx
15922 + PV_SAVE_REGS(CLBR_RDI)
15923 +#endif
15924 +
15925 +#ifdef CONFIG_PAX_KERNEXEC
15926 + GET_CR0_INTO_RDI
15927 + btr $16,%rdi
15928 + SET_RDI_INTO_CR0
15929 +#endif
15930 +
15931 + GET_CR3_INTO_RDI
15932 + add $__START_KERNEL_map,%rdi
15933 + sub phys_base(%rip),%rdi
15934 +
15935 +#ifdef CONFIG_PARAVIRT
15936 + cmpl $0, pv_info+PARAVIRT_enabled
15937 + jz 1f
15938 + mov %rdi,%rbx
15939 + i = 0
15940 + .rept USER_PGD_PTRS
15941 + mov i*8(%rbx),%rsi
15942 + mov $0x67,%sil
15943 + lea i*8(%rbx),%rdi
15944 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15945 + i = i + 1
15946 + .endr
15947 + jmp 2f
15948 +1:
15949 +#endif
15950 +
15951 + i = 0
15952 + .rept USER_PGD_PTRS
15953 + movb $0x67,i*8(%rdi)
15954 + i = i + 1
15955 + .endr
15956 +
15957 +#ifdef CONFIG_PARAVIRT
15958 +2: PV_RESTORE_REGS(CLBR_RDI)
15959 + popq %rbx
15960 +#endif
15961 +
15962 + popq %rdi
15963 + pax_force_retaddr
15964 + retq
15965 +ENDPROC(pax_exit_kernel_user)
15966 +#endif
15967 +
15968 +.macro pax_erase_kstack
15969 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15970 + call pax_erase_kstack
15971 +#endif
15972 +.endm
15973 +
15974 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15975 +ENTRY(pax_erase_kstack)
15976 + pushq %rdi
15977 + pushq %rcx
15978 + pushq %rax
15979 + pushq %r11
15980 +
15981 + GET_THREAD_INFO(%r11)
15982 + mov TI_lowest_stack(%r11), %rdi
15983 + mov $-0xBEEF, %rax
15984 + std
15985 +
15986 +1: mov %edi, %ecx
15987 + and $THREAD_SIZE_asm - 1, %ecx
15988 + shr $3, %ecx
15989 + repne scasq
15990 + jecxz 2f
15991 +
15992 + cmp $2*8, %ecx
15993 + jc 2f
15994 +
15995 + mov $2*8, %ecx
15996 + repe scasq
15997 + jecxz 2f
15998 + jne 1b
15999 +
16000 +2: cld
16001 + mov %esp, %ecx
16002 + sub %edi, %ecx
16003 +
16004 + cmp $THREAD_SIZE_asm, %rcx
16005 + jb 3f
16006 + ud2
16007 +3:
16008 +
16009 + shr $3, %ecx
16010 + rep stosq
16011 +
16012 + mov TI_task_thread_sp0(%r11), %rdi
16013 + sub $256, %rdi
16014 + mov %rdi, TI_lowest_stack(%r11)
16015 +
16016 + popq %r11
16017 + popq %rax
16018 + popq %rcx
16019 + popq %rdi
16020 + pax_force_retaddr
16021 + ret
16022 +ENDPROC(pax_erase_kstack)
16023 +#endif
16024
16025 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
16026 #ifdef CONFIG_TRACE_IRQFLAGS
16027 @@ -271,8 +553,8 @@ ENDPROC(native_usergs_sysret64)
16028 .endm
16029
16030 .macro UNFAKE_STACK_FRAME
16031 - addq $8*6, %rsp
16032 - CFI_ADJUST_CFA_OFFSET -(6*8)
16033 + addq $8*6 + ARG_SKIP, %rsp
16034 + CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
16035 .endm
16036
16037 /*
16038 @@ -359,7 +641,7 @@ ENDPROC(native_usergs_sysret64)
16039 movq %rsp, %rsi
16040
16041 leaq -RBP(%rsp),%rdi /* arg1 for handler */
16042 - testl $3, CS-RBP(%rsi)
16043 + testb $3, CS-RBP(%rsi)
16044 je 1f
16045 SWAPGS
16046 /*
16047 @@ -394,9 +676,10 @@ ENTRY(save_rest)
16048 movq_cfi r15, R15+16
16049 movq %r11, 8(%rsp) /* return address */
16050 FIXUP_TOP_OF_STACK %r11, 16
16051 + pax_force_retaddr
16052 ret
16053 CFI_ENDPROC
16054 -END(save_rest)
16055 +ENDPROC(save_rest)
16056
16057 /* save complete stack frame */
16058 .pushsection .kprobes.text, "ax"
16059 @@ -425,9 +708,10 @@ ENTRY(save_paranoid)
16060 js 1f /* negative -> in kernel */
16061 SWAPGS
16062 xorl %ebx,%ebx
16063 -1: ret
16064 +1: pax_force_retaddr_bts
16065 + ret
16066 CFI_ENDPROC
16067 -END(save_paranoid)
16068 +ENDPROC(save_paranoid)
16069 .popsection
16070
16071 /*
16072 @@ -449,7 +733,7 @@ ENTRY(ret_from_fork)
16073
16074 RESTORE_REST
16075
16076 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16077 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16078 jz retint_restore_args
16079
16080 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
16081 @@ -459,7 +743,7 @@ ENTRY(ret_from_fork)
16082 jmp ret_from_sys_call # go to the SYSRET fastpath
16083
16084 CFI_ENDPROC
16085 -END(ret_from_fork)
16086 +ENDPROC(ret_from_fork)
16087
16088 /*
16089 * System call entry. Up to 6 arguments in registers are supported.
16090 @@ -495,7 +779,7 @@ END(ret_from_fork)
16091 ENTRY(system_call)
16092 CFI_STARTPROC simple
16093 CFI_SIGNAL_FRAME
16094 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
16095 + CFI_DEF_CFA rsp,0
16096 CFI_REGISTER rip,rcx
16097 /*CFI_REGISTER rflags,r11*/
16098 SWAPGS_UNSAFE_STACK
16099 @@ -508,16 +792,23 @@ GLOBAL(system_call_after_swapgs)
16100
16101 movq %rsp,PER_CPU_VAR(old_rsp)
16102 movq PER_CPU_VAR(kernel_stack),%rsp
16103 + SAVE_ARGS 8*6,0
16104 + pax_enter_kernel_user
16105 +
16106 +#ifdef CONFIG_PAX_RANDKSTACK
16107 + pax_erase_kstack
16108 +#endif
16109 +
16110 /*
16111 * No need to follow this irqs off/on section - it's straight
16112 * and short:
16113 */
16114 ENABLE_INTERRUPTS(CLBR_NONE)
16115 - SAVE_ARGS 8,0
16116 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
16117 movq %rcx,RIP-ARGOFFSET(%rsp)
16118 CFI_REL_OFFSET rip,RIP-ARGOFFSET
16119 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
16120 + GET_THREAD_INFO(%rcx)
16121 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
16122 jnz tracesys
16123 system_call_fastpath:
16124 #if __SYSCALL_MASK == ~0
16125 @@ -527,7 +818,7 @@ system_call_fastpath:
16126 cmpl $__NR_syscall_max,%eax
16127 #endif
16128 ja badsys
16129 - movq %r10,%rcx
16130 + movq R10-ARGOFFSET(%rsp),%rcx
16131 call *sys_call_table(,%rax,8) # XXX: rip relative
16132 movq %rax,RAX-ARGOFFSET(%rsp)
16133 /*
16134 @@ -541,10 +832,13 @@ sysret_check:
16135 LOCKDEP_SYS_EXIT
16136 DISABLE_INTERRUPTS(CLBR_NONE)
16137 TRACE_IRQS_OFF
16138 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
16139 + GET_THREAD_INFO(%rcx)
16140 + movl TI_flags(%rcx),%edx
16141 andl %edi,%edx
16142 jnz sysret_careful
16143 CFI_REMEMBER_STATE
16144 + pax_exit_kernel_user
16145 + pax_erase_kstack
16146 /*
16147 * sysretq will re-enable interrupts:
16148 */
16149 @@ -596,14 +890,18 @@ badsys:
16150 * jump back to the normal fast path.
16151 */
16152 auditsys:
16153 - movq %r10,%r9 /* 6th arg: 4th syscall arg */
16154 + movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
16155 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
16156 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
16157 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
16158 movq %rax,%rsi /* 2nd arg: syscall number */
16159 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
16160 call __audit_syscall_entry
16161 +
16162 + pax_erase_kstack
16163 +
16164 LOAD_ARGS 0 /* reload call-clobbered registers */
16165 + pax_set_fptr_mask
16166 jmp system_call_fastpath
16167
16168 /*
16169 @@ -624,7 +922,7 @@ sysret_audit:
16170 /* Do syscall tracing */
16171 tracesys:
16172 #ifdef CONFIG_AUDITSYSCALL
16173 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
16174 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
16175 jz auditsys
16176 #endif
16177 SAVE_REST
16178 @@ -632,12 +930,16 @@ tracesys:
16179 FIXUP_TOP_OF_STACK %rdi
16180 movq %rsp,%rdi
16181 call syscall_trace_enter
16182 +
16183 + pax_erase_kstack
16184 +
16185 /*
16186 * Reload arg registers from stack in case ptrace changed them.
16187 * We don't reload %rax because syscall_trace_enter() returned
16188 * the value it wants us to use in the table lookup.
16189 */
16190 LOAD_ARGS ARGOFFSET, 1
16191 + pax_set_fptr_mask
16192 RESTORE_REST
16193 #if __SYSCALL_MASK == ~0
16194 cmpq $__NR_syscall_max,%rax
16195 @@ -646,7 +948,7 @@ tracesys:
16196 cmpl $__NR_syscall_max,%eax
16197 #endif
16198 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
16199 - movq %r10,%rcx /* fixup for C */
16200 + movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
16201 call *sys_call_table(,%rax,8)
16202 movq %rax,RAX-ARGOFFSET(%rsp)
16203 /* Use IRET because user could have changed frame */
16204 @@ -667,7 +969,9 @@ GLOBAL(int_with_check)
16205 andl %edi,%edx
16206 jnz int_careful
16207 andl $~TS_COMPAT,TI_status(%rcx)
16208 - jmp retint_swapgs
16209 + pax_exit_kernel_user
16210 + pax_erase_kstack
16211 + jmp retint_swapgs_pax
16212
16213 /* Either reschedule or signal or syscall exit tracking needed. */
16214 /* First do a reschedule test. */
16215 @@ -713,7 +1017,7 @@ int_restore_rest:
16216 TRACE_IRQS_OFF
16217 jmp int_with_check
16218 CFI_ENDPROC
16219 -END(system_call)
16220 +ENDPROC(system_call)
16221
16222 /*
16223 * Certain special system calls that need to save a complete full stack frame.
16224 @@ -729,7 +1033,7 @@ ENTRY(\label)
16225 call \func
16226 jmp ptregscall_common
16227 CFI_ENDPROC
16228 -END(\label)
16229 +ENDPROC(\label)
16230 .endm
16231
16232 PTREGSCALL stub_clone, sys_clone, %r8
16233 @@ -747,9 +1051,10 @@ ENTRY(ptregscall_common)
16234 movq_cfi_restore R12+8, r12
16235 movq_cfi_restore RBP+8, rbp
16236 movq_cfi_restore RBX+8, rbx
16237 + pax_force_retaddr
16238 ret $REST_SKIP /* pop extended registers */
16239 CFI_ENDPROC
16240 -END(ptregscall_common)
16241 +ENDPROC(ptregscall_common)
16242
16243 ENTRY(stub_execve)
16244 CFI_STARTPROC
16245 @@ -764,7 +1069,7 @@ ENTRY(stub_execve)
16246 RESTORE_REST
16247 jmp int_ret_from_sys_call
16248 CFI_ENDPROC
16249 -END(stub_execve)
16250 +ENDPROC(stub_execve)
16251
16252 /*
16253 * sigreturn is special because it needs to restore all registers on return.
16254 @@ -782,7 +1087,7 @@ ENTRY(stub_rt_sigreturn)
16255 RESTORE_REST
16256 jmp int_ret_from_sys_call
16257 CFI_ENDPROC
16258 -END(stub_rt_sigreturn)
16259 +ENDPROC(stub_rt_sigreturn)
16260
16261 #ifdef CONFIG_X86_X32_ABI
16262 PTREGSCALL stub_x32_sigaltstack, sys32_sigaltstack, %rdx
16263 @@ -851,7 +1156,7 @@ vector=vector+1
16264 2: jmp common_interrupt
16265 .endr
16266 CFI_ENDPROC
16267 -END(irq_entries_start)
16268 +ENDPROC(irq_entries_start)
16269
16270 .previous
16271 END(interrupt)
16272 @@ -871,6 +1176,16 @@ END(interrupt)
16273 subq $ORIG_RAX-RBP, %rsp
16274 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
16275 SAVE_ARGS_IRQ
16276 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16277 + testb $3, CS(%rdi)
16278 + jnz 1f
16279 + pax_enter_kernel
16280 + jmp 2f
16281 +1: pax_enter_kernel_user
16282 +2:
16283 +#else
16284 + pax_enter_kernel
16285 +#endif
16286 call \func
16287 .endm
16288
16289 @@ -902,7 +1217,7 @@ ret_from_intr:
16290
16291 exit_intr:
16292 GET_THREAD_INFO(%rcx)
16293 - testl $3,CS-ARGOFFSET(%rsp)
16294 + testb $3,CS-ARGOFFSET(%rsp)
16295 je retint_kernel
16296
16297 /* Interrupt came from user space */
16298 @@ -924,12 +1239,16 @@ retint_swapgs: /* return to user-space */
16299 * The iretq could re-enable interrupts:
16300 */
16301 DISABLE_INTERRUPTS(CLBR_ANY)
16302 + pax_exit_kernel_user
16303 +retint_swapgs_pax:
16304 TRACE_IRQS_IRETQ
16305 SWAPGS
16306 jmp restore_args
16307
16308 retint_restore_args: /* return to kernel space */
16309 DISABLE_INTERRUPTS(CLBR_ANY)
16310 + pax_exit_kernel
16311 + pax_force_retaddr RIP-ARGOFFSET
16312 /*
16313 * The iretq could re-enable interrupts:
16314 */
16315 @@ -1012,7 +1331,7 @@ ENTRY(retint_kernel)
16316 #endif
16317
16318 CFI_ENDPROC
16319 -END(common_interrupt)
16320 +ENDPROC(common_interrupt)
16321 /*
16322 * End of kprobes section
16323 */
16324 @@ -1029,7 +1348,7 @@ ENTRY(\sym)
16325 interrupt \do_sym
16326 jmp ret_from_intr
16327 CFI_ENDPROC
16328 -END(\sym)
16329 +ENDPROC(\sym)
16330 .endm
16331
16332 #ifdef CONFIG_SMP
16333 @@ -1102,12 +1421,22 @@ ENTRY(\sym)
16334 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16335 call error_entry
16336 DEFAULT_FRAME 0
16337 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16338 + testb $3, CS(%rsp)
16339 + jnz 1f
16340 + pax_enter_kernel
16341 + jmp 2f
16342 +1: pax_enter_kernel_user
16343 +2:
16344 +#else
16345 + pax_enter_kernel
16346 +#endif
16347 movq %rsp,%rdi /* pt_regs pointer */
16348 xorl %esi,%esi /* no error code */
16349 call \do_sym
16350 jmp error_exit /* %ebx: no swapgs flag */
16351 CFI_ENDPROC
16352 -END(\sym)
16353 +ENDPROC(\sym)
16354 .endm
16355
16356 .macro paranoidzeroentry sym do_sym
16357 @@ -1119,15 +1448,25 @@ ENTRY(\sym)
16358 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16359 call save_paranoid
16360 TRACE_IRQS_OFF
16361 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16362 + testb $3, CS(%rsp)
16363 + jnz 1f
16364 + pax_enter_kernel
16365 + jmp 2f
16366 +1: pax_enter_kernel_user
16367 +2:
16368 +#else
16369 + pax_enter_kernel
16370 +#endif
16371 movq %rsp,%rdi /* pt_regs pointer */
16372 xorl %esi,%esi /* no error code */
16373 call \do_sym
16374 jmp paranoid_exit /* %ebx: no swapgs flag */
16375 CFI_ENDPROC
16376 -END(\sym)
16377 +ENDPROC(\sym)
16378 .endm
16379
16380 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
16381 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
16382 .macro paranoidzeroentry_ist sym do_sym ist
16383 ENTRY(\sym)
16384 INTR_FRAME
16385 @@ -1137,14 +1476,30 @@ ENTRY(\sym)
16386 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16387 call save_paranoid
16388 TRACE_IRQS_OFF_DEBUG
16389 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16390 + testb $3, CS(%rsp)
16391 + jnz 1f
16392 + pax_enter_kernel
16393 + jmp 2f
16394 +1: pax_enter_kernel_user
16395 +2:
16396 +#else
16397 + pax_enter_kernel
16398 +#endif
16399 movq %rsp,%rdi /* pt_regs pointer */
16400 xorl %esi,%esi /* no error code */
16401 +#ifdef CONFIG_SMP
16402 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
16403 + lea init_tss(%r12), %r12
16404 +#else
16405 + lea init_tss(%rip), %r12
16406 +#endif
16407 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
16408 call \do_sym
16409 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
16410 jmp paranoid_exit /* %ebx: no swapgs flag */
16411 CFI_ENDPROC
16412 -END(\sym)
16413 +ENDPROC(\sym)
16414 .endm
16415
16416 .macro errorentry sym do_sym
16417 @@ -1155,13 +1510,23 @@ ENTRY(\sym)
16418 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16419 call error_entry
16420 DEFAULT_FRAME 0
16421 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16422 + testb $3, CS(%rsp)
16423 + jnz 1f
16424 + pax_enter_kernel
16425 + jmp 2f
16426 +1: pax_enter_kernel_user
16427 +2:
16428 +#else
16429 + pax_enter_kernel
16430 +#endif
16431 movq %rsp,%rdi /* pt_regs pointer */
16432 movq ORIG_RAX(%rsp),%rsi /* get error code */
16433 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16434 call \do_sym
16435 jmp error_exit /* %ebx: no swapgs flag */
16436 CFI_ENDPROC
16437 -END(\sym)
16438 +ENDPROC(\sym)
16439 .endm
16440
16441 /* error code is on the stack already */
16442 @@ -1174,13 +1539,23 @@ ENTRY(\sym)
16443 call save_paranoid
16444 DEFAULT_FRAME 0
16445 TRACE_IRQS_OFF
16446 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16447 + testb $3, CS(%rsp)
16448 + jnz 1f
16449 + pax_enter_kernel
16450 + jmp 2f
16451 +1: pax_enter_kernel_user
16452 +2:
16453 +#else
16454 + pax_enter_kernel
16455 +#endif
16456 movq %rsp,%rdi /* pt_regs pointer */
16457 movq ORIG_RAX(%rsp),%rsi /* get error code */
16458 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16459 call \do_sym
16460 jmp paranoid_exit /* %ebx: no swapgs flag */
16461 CFI_ENDPROC
16462 -END(\sym)
16463 +ENDPROC(\sym)
16464 .endm
16465
16466 zeroentry divide_error do_divide_error
16467 @@ -1210,9 +1585,10 @@ gs_change:
16468 2: mfence /* workaround */
16469 SWAPGS
16470 popfq_cfi
16471 + pax_force_retaddr
16472 ret
16473 CFI_ENDPROC
16474 -END(native_load_gs_index)
16475 +ENDPROC(native_load_gs_index)
16476
16477 _ASM_EXTABLE(gs_change,bad_gs)
16478 .section .fixup,"ax"
16479 @@ -1231,13 +1607,14 @@ ENTRY(kernel_thread_helper)
16480 * Here we are in the child and the registers are set as they were
16481 * at kernel_thread() invocation in the parent.
16482 */
16483 + pax_force_fptr %rsi
16484 call *%rsi
16485 # exit
16486 mov %eax, %edi
16487 call do_exit
16488 ud2 # padding for call trace
16489 CFI_ENDPROC
16490 -END(kernel_thread_helper)
16491 +ENDPROC(kernel_thread_helper)
16492
16493 /*
16494 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
16495 @@ -1264,11 +1641,11 @@ ENTRY(kernel_execve)
16496 RESTORE_REST
16497 testq %rax,%rax
16498 je int_ret_from_sys_call
16499 - RESTORE_ARGS
16500 UNFAKE_STACK_FRAME
16501 + pax_force_retaddr
16502 ret
16503 CFI_ENDPROC
16504 -END(kernel_execve)
16505 +ENDPROC(kernel_execve)
16506
16507 /* Call softirq on interrupt stack. Interrupts are off. */
16508 ENTRY(call_softirq)
16509 @@ -1286,9 +1663,10 @@ ENTRY(call_softirq)
16510 CFI_DEF_CFA_REGISTER rsp
16511 CFI_ADJUST_CFA_OFFSET -8
16512 decl PER_CPU_VAR(irq_count)
16513 + pax_force_retaddr
16514 ret
16515 CFI_ENDPROC
16516 -END(call_softirq)
16517 +ENDPROC(call_softirq)
16518
16519 #ifdef CONFIG_XEN
16520 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16521 @@ -1326,7 +1704,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16522 decl PER_CPU_VAR(irq_count)
16523 jmp error_exit
16524 CFI_ENDPROC
16525 -END(xen_do_hypervisor_callback)
16526 +ENDPROC(xen_do_hypervisor_callback)
16527
16528 /*
16529 * Hypervisor uses this for application faults while it executes.
16530 @@ -1385,7 +1763,7 @@ ENTRY(xen_failsafe_callback)
16531 SAVE_ALL
16532 jmp error_exit
16533 CFI_ENDPROC
16534 -END(xen_failsafe_callback)
16535 +ENDPROC(xen_failsafe_callback)
16536
16537 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16538 xen_hvm_callback_vector xen_evtchn_do_upcall
16539 @@ -1434,16 +1812,31 @@ ENTRY(paranoid_exit)
16540 TRACE_IRQS_OFF_DEBUG
16541 testl %ebx,%ebx /* swapgs needed? */
16542 jnz paranoid_restore
16543 - testl $3,CS(%rsp)
16544 + testb $3,CS(%rsp)
16545 jnz paranoid_userspace
16546 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16547 + pax_exit_kernel
16548 + TRACE_IRQS_IRETQ 0
16549 + SWAPGS_UNSAFE_STACK
16550 + RESTORE_ALL 8
16551 + pax_force_retaddr_bts
16552 + jmp irq_return
16553 +#endif
16554 paranoid_swapgs:
16555 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16556 + pax_exit_kernel_user
16557 +#else
16558 + pax_exit_kernel
16559 +#endif
16560 TRACE_IRQS_IRETQ 0
16561 SWAPGS_UNSAFE_STACK
16562 RESTORE_ALL 8
16563 jmp irq_return
16564 paranoid_restore:
16565 + pax_exit_kernel
16566 TRACE_IRQS_IRETQ_DEBUG 0
16567 RESTORE_ALL 8
16568 + pax_force_retaddr_bts
16569 jmp irq_return
16570 paranoid_userspace:
16571 GET_THREAD_INFO(%rcx)
16572 @@ -1472,7 +1865,7 @@ paranoid_schedule:
16573 TRACE_IRQS_OFF
16574 jmp paranoid_userspace
16575 CFI_ENDPROC
16576 -END(paranoid_exit)
16577 +ENDPROC(paranoid_exit)
16578
16579 /*
16580 * Exception entry point. This expects an error code/orig_rax on the stack.
16581 @@ -1499,12 +1892,13 @@ ENTRY(error_entry)
16582 movq_cfi r14, R14+8
16583 movq_cfi r15, R15+8
16584 xorl %ebx,%ebx
16585 - testl $3,CS+8(%rsp)
16586 + testb $3,CS+8(%rsp)
16587 je error_kernelspace
16588 error_swapgs:
16589 SWAPGS
16590 error_sti:
16591 TRACE_IRQS_OFF
16592 + pax_force_retaddr_bts
16593 ret
16594
16595 /*
16596 @@ -1531,7 +1925,7 @@ bstep_iret:
16597 movq %rcx,RIP+8(%rsp)
16598 jmp error_swapgs
16599 CFI_ENDPROC
16600 -END(error_entry)
16601 +ENDPROC(error_entry)
16602
16603
16604 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16605 @@ -1551,7 +1945,7 @@ ENTRY(error_exit)
16606 jnz retint_careful
16607 jmp retint_swapgs
16608 CFI_ENDPROC
16609 -END(error_exit)
16610 +ENDPROC(error_exit)
16611
16612 /*
16613 * Test if a given stack is an NMI stack or not.
16614 @@ -1609,9 +2003,11 @@ ENTRY(nmi)
16615 * If %cs was not the kernel segment, then the NMI triggered in user
16616 * space, which means it is definitely not nested.
16617 */
16618 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
16619 + je 1f
16620 cmpl $__KERNEL_CS, 16(%rsp)
16621 jne first_nmi
16622 -
16623 +1:
16624 /*
16625 * Check the special variable on the stack to see if NMIs are
16626 * executing.
16627 @@ -1758,6 +2154,16 @@ end_repeat_nmi:
16628 */
16629 call save_paranoid
16630 DEFAULT_FRAME 0
16631 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16632 + testb $3, CS(%rsp)
16633 + jnz 1f
16634 + pax_enter_kernel
16635 + jmp 2f
16636 +1: pax_enter_kernel_user
16637 +2:
16638 +#else
16639 + pax_enter_kernel
16640 +#endif
16641 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16642 movq %rsp,%rdi
16643 movq $-1,%rsi
16644 @@ -1765,21 +2171,32 @@ end_repeat_nmi:
16645 testl %ebx,%ebx /* swapgs needed? */
16646 jnz nmi_restore
16647 nmi_swapgs:
16648 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16649 + pax_exit_kernel_user
16650 +#else
16651 + pax_exit_kernel
16652 +#endif
16653 SWAPGS_UNSAFE_STACK
16654 + RESTORE_ALL 8
16655 + /* Clear the NMI executing stack variable */
16656 + movq $0, 10*8(%rsp)
16657 + jmp irq_return
16658 nmi_restore:
16659 + pax_exit_kernel
16660 RESTORE_ALL 8
16661 + pax_force_retaddr_bts
16662 /* Clear the NMI executing stack variable */
16663 movq $0, 10*8(%rsp)
16664 jmp irq_return
16665 CFI_ENDPROC
16666 -END(nmi)
16667 +ENDPROC(nmi)
16668
16669 ENTRY(ignore_sysret)
16670 CFI_STARTPROC
16671 mov $-ENOSYS,%eax
16672 sysret
16673 CFI_ENDPROC
16674 -END(ignore_sysret)
16675 +ENDPROC(ignore_sysret)
16676
16677 /*
16678 * End of kprobes section
16679 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16680 index c3a7cb4..3ad00dc 100644
16681 --- a/arch/x86/kernel/ftrace.c
16682 +++ b/arch/x86/kernel/ftrace.c
16683 @@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
16684 {
16685 unsigned char replaced[MCOUNT_INSN_SIZE];
16686
16687 + ip = ktla_ktva(ip);
16688 +
16689 /*
16690 * Note: Due to modules and __init, code can
16691 * disappear and change, we need to protect against faulting
16692 @@ -212,7 +214,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16693 unsigned char old[MCOUNT_INSN_SIZE], *new;
16694 int ret;
16695
16696 - memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16697 + memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16698 new = ftrace_call_replace(ip, (unsigned long)func);
16699
16700 /* See comment above by declaration of modifying_ftrace_code */
16701 @@ -605,6 +607,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16702 {
16703 unsigned char code[MCOUNT_INSN_SIZE];
16704
16705 + ip = ktla_ktva(ip);
16706 +
16707 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16708 return -EFAULT;
16709
16710 diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16711 index c18f59d..9c0c9f6 100644
16712 --- a/arch/x86/kernel/head32.c
16713 +++ b/arch/x86/kernel/head32.c
16714 @@ -18,6 +18,7 @@
16715 #include <asm/io_apic.h>
16716 #include <asm/bios_ebda.h>
16717 #include <asm/tlbflush.h>
16718 +#include <asm/boot.h>
16719
16720 static void __init i386_default_early_setup(void)
16721 {
16722 @@ -30,8 +31,7 @@ static void __init i386_default_early_setup(void)
16723
16724 void __init i386_start_kernel(void)
16725 {
16726 - memblock_reserve(__pa_symbol(&_text),
16727 - __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
16728 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop) - LOAD_PHYSICAL_ADDR);
16729
16730 #ifdef CONFIG_BLK_DEV_INITRD
16731 /* Reserve INITRD */
16732 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16733 index d42ab17..cb1b997 100644
16734 --- a/arch/x86/kernel/head_32.S
16735 +++ b/arch/x86/kernel/head_32.S
16736 @@ -26,6 +26,12 @@
16737 /* Physical address */
16738 #define pa(X) ((X) - __PAGE_OFFSET)
16739
16740 +#ifdef CONFIG_PAX_KERNEXEC
16741 +#define ta(X) (X)
16742 +#else
16743 +#define ta(X) ((X) - __PAGE_OFFSET)
16744 +#endif
16745 +
16746 /*
16747 * References to members of the new_cpu_data structure.
16748 */
16749 @@ -55,11 +61,7 @@
16750 * and small than max_low_pfn, otherwise will waste some page table entries
16751 */
16752
16753 -#if PTRS_PER_PMD > 1
16754 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16755 -#else
16756 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16757 -#endif
16758 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16759
16760 /* Number of possible pages in the lowmem region */
16761 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16762 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16763 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16764
16765 /*
16766 + * Real beginning of normal "text" segment
16767 + */
16768 +ENTRY(stext)
16769 +ENTRY(_stext)
16770 +
16771 +/*
16772 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16773 * %esi points to the real-mode code as a 32-bit pointer.
16774 * CS and DS must be 4 GB flat segments, but we don't depend on
16775 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16776 * can.
16777 */
16778 __HEAD
16779 +
16780 +#ifdef CONFIG_PAX_KERNEXEC
16781 + jmp startup_32
16782 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16783 +.fill PAGE_SIZE-5,1,0xcc
16784 +#endif
16785 +
16786 ENTRY(startup_32)
16787 movl pa(stack_start),%ecx
16788
16789 @@ -106,6 +121,57 @@ ENTRY(startup_32)
16790 2:
16791 leal -__PAGE_OFFSET(%ecx),%esp
16792
16793 +#ifdef CONFIG_SMP
16794 + movl $pa(cpu_gdt_table),%edi
16795 + movl $__per_cpu_load,%eax
16796 + movw %ax,__KERNEL_PERCPU + 2(%edi)
16797 + rorl $16,%eax
16798 + movb %al,__KERNEL_PERCPU + 4(%edi)
16799 + movb %ah,__KERNEL_PERCPU + 7(%edi)
16800 + movl $__per_cpu_end - 1,%eax
16801 + subl $__per_cpu_start,%eax
16802 + movw %ax,__KERNEL_PERCPU + 0(%edi)
16803 +#endif
16804 +
16805 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16806 + movl $NR_CPUS,%ecx
16807 + movl $pa(cpu_gdt_table),%edi
16808 +1:
16809 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16810 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16811 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16812 + addl $PAGE_SIZE_asm,%edi
16813 + loop 1b
16814 +#endif
16815 +
16816 +#ifdef CONFIG_PAX_KERNEXEC
16817 + movl $pa(boot_gdt),%edi
16818 + movl $__LOAD_PHYSICAL_ADDR,%eax
16819 + movw %ax,__BOOT_CS + 2(%edi)
16820 + rorl $16,%eax
16821 + movb %al,__BOOT_CS + 4(%edi)
16822 + movb %ah,__BOOT_CS + 7(%edi)
16823 + rorl $16,%eax
16824 +
16825 + ljmp $(__BOOT_CS),$1f
16826 +1:
16827 +
16828 + movl $NR_CPUS,%ecx
16829 + movl $pa(cpu_gdt_table),%edi
16830 + addl $__PAGE_OFFSET,%eax
16831 +1:
16832 + movw %ax,__KERNEL_CS + 2(%edi)
16833 + movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16834 + rorl $16,%eax
16835 + movb %al,__KERNEL_CS + 4(%edi)
16836 + movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16837 + movb %ah,__KERNEL_CS + 7(%edi)
16838 + movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16839 + rorl $16,%eax
16840 + addl $PAGE_SIZE_asm,%edi
16841 + loop 1b
16842 +#endif
16843 +
16844 /*
16845 * Clear BSS first so that there are no surprises...
16846 */
16847 @@ -196,8 +262,11 @@ ENTRY(startup_32)
16848 movl %eax, pa(max_pfn_mapped)
16849
16850 /* Do early initialization of the fixmap area */
16851 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16852 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
16853 +#ifdef CONFIG_COMPAT_VDSO
16854 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
16855 +#else
16856 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
16857 +#endif
16858 #else /* Not PAE */
16859
16860 page_pde_offset = (__PAGE_OFFSET >> 20);
16861 @@ -227,8 +296,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16862 movl %eax, pa(max_pfn_mapped)
16863
16864 /* Do early initialization of the fixmap area */
16865 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16866 - movl %eax,pa(initial_page_table+0xffc)
16867 +#ifdef CONFIG_COMPAT_VDSO
16868 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
16869 +#else
16870 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
16871 +#endif
16872 #endif
16873
16874 #ifdef CONFIG_PARAVIRT
16875 @@ -242,9 +314,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16876 cmpl $num_subarch_entries, %eax
16877 jae bad_subarch
16878
16879 - movl pa(subarch_entries)(,%eax,4), %eax
16880 - subl $__PAGE_OFFSET, %eax
16881 - jmp *%eax
16882 + jmp *pa(subarch_entries)(,%eax,4)
16883
16884 bad_subarch:
16885 WEAK(lguest_entry)
16886 @@ -256,10 +326,10 @@ WEAK(xen_entry)
16887 __INITDATA
16888
16889 subarch_entries:
16890 - .long default_entry /* normal x86/PC */
16891 - .long lguest_entry /* lguest hypervisor */
16892 - .long xen_entry /* Xen hypervisor */
16893 - .long default_entry /* Moorestown MID */
16894 + .long ta(default_entry) /* normal x86/PC */
16895 + .long ta(lguest_entry) /* lguest hypervisor */
16896 + .long ta(xen_entry) /* Xen hypervisor */
16897 + .long ta(default_entry) /* Moorestown MID */
16898 num_subarch_entries = (. - subarch_entries) / 4
16899 .previous
16900 #else
16901 @@ -310,6 +380,7 @@ default_entry:
16902 orl %edx,%eax
16903 movl %eax,%cr4
16904
16905 +#ifdef CONFIG_X86_PAE
16906 testb $X86_CR4_PAE, %al # check if PAE is enabled
16907 jz 6f
16908
16909 @@ -338,6 +409,9 @@ default_entry:
16910 /* Make changes effective */
16911 wrmsr
16912
16913 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16914 +#endif
16915 +
16916 6:
16917
16918 /*
16919 @@ -436,14 +510,20 @@ is386: movl $2,%ecx # set MP
16920 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16921 movl %eax,%ss # after changing gdt.
16922
16923 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
16924 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16925 movl %eax,%ds
16926 movl %eax,%es
16927
16928 movl $(__KERNEL_PERCPU), %eax
16929 movl %eax,%fs # set this cpu's percpu
16930
16931 +#ifdef CONFIG_CC_STACKPROTECTOR
16932 movl $(__KERNEL_STACK_CANARY),%eax
16933 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
16934 + movl $(__USER_DS),%eax
16935 +#else
16936 + xorl %eax,%eax
16937 +#endif
16938 movl %eax,%gs
16939
16940 xorl %eax,%eax # Clear LDT
16941 @@ -520,8 +600,11 @@ setup_once:
16942 * relocation. Manually set base address in stack canary
16943 * segment descriptor.
16944 */
16945 - movl $gdt_page,%eax
16946 + movl $cpu_gdt_table,%eax
16947 movl $stack_canary,%ecx
16948 +#ifdef CONFIG_SMP
16949 + addl $__per_cpu_load,%ecx
16950 +#endif
16951 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
16952 shrl $16, %ecx
16953 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
16954 @@ -552,7 +635,7 @@ ENDPROC(early_idt_handlers)
16955 /* This is global to keep gas from relaxing the jumps */
16956 ENTRY(early_idt_handler)
16957 cld
16958 - cmpl $2,%ss:early_recursion_flag
16959 + cmpl $1,%ss:early_recursion_flag
16960 je hlt_loop
16961 incl %ss:early_recursion_flag
16962
16963 @@ -590,8 +673,8 @@ ENTRY(early_idt_handler)
16964 pushl (20+6*4)(%esp) /* trapno */
16965 pushl $fault_msg
16966 call printk
16967 -#endif
16968 call dump_stack
16969 +#endif
16970 hlt_loop:
16971 hlt
16972 jmp hlt_loop
16973 @@ -610,8 +693,11 @@ ENDPROC(early_idt_handler)
16974 /* This is the default interrupt "handler" :-) */
16975 ALIGN
16976 ignore_int:
16977 - cld
16978 #ifdef CONFIG_PRINTK
16979 + cmpl $2,%ss:early_recursion_flag
16980 + je hlt_loop
16981 + incl %ss:early_recursion_flag
16982 + cld
16983 pushl %eax
16984 pushl %ecx
16985 pushl %edx
16986 @@ -620,9 +706,6 @@ ignore_int:
16987 movl $(__KERNEL_DS),%eax
16988 movl %eax,%ds
16989 movl %eax,%es
16990 - cmpl $2,early_recursion_flag
16991 - je hlt_loop
16992 - incl early_recursion_flag
16993 pushl 16(%esp)
16994 pushl 24(%esp)
16995 pushl 32(%esp)
16996 @@ -656,29 +739,43 @@ ENTRY(setup_once_ref)
16997 /*
16998 * BSS section
16999 */
17000 -__PAGE_ALIGNED_BSS
17001 - .align PAGE_SIZE
17002 #ifdef CONFIG_X86_PAE
17003 +.section .initial_pg_pmd,"a",@progbits
17004 initial_pg_pmd:
17005 .fill 1024*KPMDS,4,0
17006 #else
17007 +.section .initial_page_table,"a",@progbits
17008 ENTRY(initial_page_table)
17009 .fill 1024,4,0
17010 #endif
17011 +.section .initial_pg_fixmap,"a",@progbits
17012 initial_pg_fixmap:
17013 .fill 1024,4,0
17014 +.section .empty_zero_page,"a",@progbits
17015 ENTRY(empty_zero_page)
17016 .fill 4096,1,0
17017 +.section .swapper_pg_dir,"a",@progbits
17018 ENTRY(swapper_pg_dir)
17019 +#ifdef CONFIG_X86_PAE
17020 + .fill 4,8,0
17021 +#else
17022 .fill 1024,4,0
17023 +#endif
17024 +
17025 +/*
17026 + * The IDT has to be page-aligned to simplify the Pentium
17027 + * F0 0F bug workaround.. We have a special link segment
17028 + * for this.
17029 + */
17030 +.section .idt,"a",@progbits
17031 +ENTRY(idt_table)
17032 + .fill 256,8,0
17033
17034 /*
17035 * This starts the data section.
17036 */
17037 #ifdef CONFIG_X86_PAE
17038 -__PAGE_ALIGNED_DATA
17039 - /* Page-aligned for the benefit of paravirt? */
17040 - .align PAGE_SIZE
17041 +.section .initial_page_table,"a",@progbits
17042 ENTRY(initial_page_table)
17043 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
17044 # if KPMDS == 3
17045 @@ -697,12 +794,20 @@ ENTRY(initial_page_table)
17046 # error "Kernel PMDs should be 1, 2 or 3"
17047 # endif
17048 .align PAGE_SIZE /* needs to be page-sized too */
17049 +
17050 +#ifdef CONFIG_PAX_PER_CPU_PGD
17051 +ENTRY(cpu_pgd)
17052 + .rept NR_CPUS
17053 + .fill 4,8,0
17054 + .endr
17055 +#endif
17056 +
17057 #endif
17058
17059 .data
17060 .balign 4
17061 ENTRY(stack_start)
17062 - .long init_thread_union+THREAD_SIZE
17063 + .long init_thread_union+THREAD_SIZE-8
17064
17065 __INITRODATA
17066 int_msg:
17067 @@ -730,7 +835,7 @@ fault_msg:
17068 * segment size, and 32-bit linear address value:
17069 */
17070
17071 - .data
17072 +.section .rodata,"a",@progbits
17073 .globl boot_gdt_descr
17074 .globl idt_descr
17075
17076 @@ -739,7 +844,7 @@ fault_msg:
17077 .word 0 # 32 bit align gdt_desc.address
17078 boot_gdt_descr:
17079 .word __BOOT_DS+7
17080 - .long boot_gdt - __PAGE_OFFSET
17081 + .long pa(boot_gdt)
17082
17083 .word 0 # 32-bit align idt_desc.address
17084 idt_descr:
17085 @@ -750,7 +855,7 @@ idt_descr:
17086 .word 0 # 32 bit align gdt_desc.address
17087 ENTRY(early_gdt_descr)
17088 .word GDT_ENTRIES*8-1
17089 - .long gdt_page /* Overwritten for secondary CPUs */
17090 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
17091
17092 /*
17093 * The boot_gdt must mirror the equivalent in setup.S and is
17094 @@ -759,5 +864,65 @@ ENTRY(early_gdt_descr)
17095 .align L1_CACHE_BYTES
17096 ENTRY(boot_gdt)
17097 .fill GDT_ENTRY_BOOT_CS,8,0
17098 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
17099 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
17100 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
17101 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
17102 +
17103 + .align PAGE_SIZE_asm
17104 +ENTRY(cpu_gdt_table)
17105 + .rept NR_CPUS
17106 + .quad 0x0000000000000000 /* NULL descriptor */
17107 + .quad 0x0000000000000000 /* 0x0b reserved */
17108 + .quad 0x0000000000000000 /* 0x13 reserved */
17109 + .quad 0x0000000000000000 /* 0x1b reserved */
17110 +
17111 +#ifdef CONFIG_PAX_KERNEXEC
17112 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
17113 +#else
17114 + .quad 0x0000000000000000 /* 0x20 unused */
17115 +#endif
17116 +
17117 + .quad 0x0000000000000000 /* 0x28 unused */
17118 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
17119 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
17120 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
17121 + .quad 0x0000000000000000 /* 0x4b reserved */
17122 + .quad 0x0000000000000000 /* 0x53 reserved */
17123 + .quad 0x0000000000000000 /* 0x5b reserved */
17124 +
17125 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
17126 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
17127 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
17128 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
17129 +
17130 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
17131 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
17132 +
17133 + /*
17134 + * Segments used for calling PnP BIOS have byte granularity.
17135 + * The code segments and data segments have fixed 64k limits,
17136 + * the transfer segment sizes are set at run time.
17137 + */
17138 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
17139 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
17140 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
17141 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
17142 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
17143 +
17144 + /*
17145 + * The APM segments have byte granularity and their bases
17146 + * are set at run time. All have 64k limits.
17147 + */
17148 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
17149 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
17150 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
17151 +
17152 + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
17153 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
17154 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
17155 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
17156 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
17157 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
17158 +
17159 + /* Be sure this is zeroed to avoid false validations in Xen */
17160 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
17161 + .endr
17162 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
17163 index 94bf9cc..400455a 100644
17164 --- a/arch/x86/kernel/head_64.S
17165 +++ b/arch/x86/kernel/head_64.S
17166 @@ -20,6 +20,8 @@
17167 #include <asm/processor-flags.h>
17168 #include <asm/percpu.h>
17169 #include <asm/nops.h>
17170 +#include <asm/cpufeature.h>
17171 +#include <asm/alternative-asm.h>
17172
17173 #ifdef CONFIG_PARAVIRT
17174 #include <asm/asm-offsets.h>
17175 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
17176 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
17177 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
17178 L3_START_KERNEL = pud_index(__START_KERNEL_map)
17179 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
17180 +L3_VMALLOC_START = pud_index(VMALLOC_START)
17181 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
17182 +L3_VMALLOC_END = pud_index(VMALLOC_END)
17183 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
17184 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
17185
17186 .text
17187 __HEAD
17188 @@ -88,35 +96,23 @@ startup_64:
17189 */
17190 addq %rbp, init_level4_pgt + 0(%rip)
17191 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
17192 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
17193 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
17194 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
17195 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
17196
17197 addq %rbp, level3_ident_pgt + 0(%rip)
17198 +#ifndef CONFIG_XEN
17199 + addq %rbp, level3_ident_pgt + 8(%rip)
17200 +#endif
17201
17202 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
17203 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
17204 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
17205 +
17206 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
17207 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
17208
17209 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
17210 -
17211 - /* Add an Identity mapping if I am above 1G */
17212 - leaq _text(%rip), %rdi
17213 - andq $PMD_PAGE_MASK, %rdi
17214 -
17215 - movq %rdi, %rax
17216 - shrq $PUD_SHIFT, %rax
17217 - andq $(PTRS_PER_PUD - 1), %rax
17218 - jz ident_complete
17219 -
17220 - leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
17221 - leaq level3_ident_pgt(%rip), %rbx
17222 - movq %rdx, 0(%rbx, %rax, 8)
17223 -
17224 - movq %rdi, %rax
17225 - shrq $PMD_SHIFT, %rax
17226 - andq $(PTRS_PER_PMD - 1), %rax
17227 - leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
17228 - leaq level2_spare_pgt(%rip), %rbx
17229 - movq %rdx, 0(%rbx, %rax, 8)
17230 -ident_complete:
17231 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
17232
17233 /*
17234 * Fixup the kernel text+data virtual addresses. Note that
17235 @@ -159,8 +155,8 @@ ENTRY(secondary_startup_64)
17236 * after the boot processor executes this code.
17237 */
17238
17239 - /* Enable PAE mode and PGE */
17240 - movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
17241 + /* Enable PAE mode and PSE/PGE */
17242 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
17243 movq %rax, %cr4
17244
17245 /* Setup early boot stage 4 level pagetables. */
17246 @@ -182,9 +178,17 @@ ENTRY(secondary_startup_64)
17247 movl $MSR_EFER, %ecx
17248 rdmsr
17249 btsl $_EFER_SCE, %eax /* Enable System Call */
17250 - btl $20,%edi /* No Execute supported? */
17251 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
17252 jnc 1f
17253 btsl $_EFER_NX, %eax
17254 + leaq init_level4_pgt(%rip), %rdi
17255 +#ifndef CONFIG_EFI
17256 + btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
17257 +#endif
17258 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
17259 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
17260 + btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
17261 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
17262 1: wrmsr /* Make changes effective */
17263
17264 /* Setup cr0 */
17265 @@ -246,6 +250,7 @@ ENTRY(secondary_startup_64)
17266 * jump. In addition we need to ensure %cs is set so we make this
17267 * a far return.
17268 */
17269 + pax_set_fptr_mask
17270 movq initial_code(%rip),%rax
17271 pushq $0 # fake return address to stop unwinder
17272 pushq $__KERNEL_CS # set correct cs
17273 @@ -268,7 +273,7 @@ ENTRY(secondary_startup_64)
17274 bad_address:
17275 jmp bad_address
17276
17277 - .section ".init.text","ax"
17278 + __INIT
17279 .globl early_idt_handlers
17280 early_idt_handlers:
17281 # 104(%rsp) %rflags
17282 @@ -347,11 +352,15 @@ ENTRY(early_idt_handler)
17283 addq $16,%rsp # drop vector number and error code
17284 decl early_recursion_flag(%rip)
17285 INTERRUPT_RETURN
17286 + .previous
17287
17288 + __INITDATA
17289 .balign 4
17290 early_recursion_flag:
17291 .long 0
17292 + .previous
17293
17294 + .section .rodata,"a",@progbits
17295 #ifdef CONFIG_EARLY_PRINTK
17296 early_idt_msg:
17297 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
17298 @@ -360,6 +369,7 @@ early_idt_ripmsg:
17299 #endif /* CONFIG_EARLY_PRINTK */
17300 .previous
17301
17302 + .section .rodata,"a",@progbits
17303 #define NEXT_PAGE(name) \
17304 .balign PAGE_SIZE; \
17305 ENTRY(name)
17306 @@ -372,7 +382,6 @@ ENTRY(name)
17307 i = i + 1 ; \
17308 .endr
17309
17310 - .data
17311 /*
17312 * This default setting generates an ident mapping at address 0x100000
17313 * and a mapping for the kernel that precisely maps virtual address
17314 @@ -383,13 +392,41 @@ NEXT_PAGE(init_level4_pgt)
17315 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17316 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
17317 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17318 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
17319 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
17320 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
17321 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
17322 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
17323 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17324 .org init_level4_pgt + L4_START_KERNEL*8, 0
17325 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
17326 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
17327
17328 +#ifdef CONFIG_PAX_PER_CPU_PGD
17329 +NEXT_PAGE(cpu_pgd)
17330 + .rept NR_CPUS
17331 + .fill 512,8,0
17332 + .endr
17333 +#endif
17334 +
17335 NEXT_PAGE(level3_ident_pgt)
17336 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17337 +#ifdef CONFIG_XEN
17338 .fill 511,8,0
17339 +#else
17340 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
17341 + .fill 510,8,0
17342 +#endif
17343 +
17344 +NEXT_PAGE(level3_vmalloc_start_pgt)
17345 + .fill 512,8,0
17346 +
17347 +NEXT_PAGE(level3_vmalloc_end_pgt)
17348 + .fill 512,8,0
17349 +
17350 +NEXT_PAGE(level3_vmemmap_pgt)
17351 + .fill L3_VMEMMAP_START,8,0
17352 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17353
17354 NEXT_PAGE(level3_kernel_pgt)
17355 .fill L3_START_KERNEL,8,0
17356 @@ -397,20 +434,23 @@ NEXT_PAGE(level3_kernel_pgt)
17357 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
17358 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17359
17360 +NEXT_PAGE(level2_vmemmap_pgt)
17361 + .fill 512,8,0
17362 +
17363 NEXT_PAGE(level2_fixmap_pgt)
17364 - .fill 506,8,0
17365 - .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17366 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
17367 - .fill 5,8,0
17368 + .fill 507,8,0
17369 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
17370 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
17371 + .fill 4,8,0
17372
17373 -NEXT_PAGE(level1_fixmap_pgt)
17374 +NEXT_PAGE(level1_vsyscall_pgt)
17375 .fill 512,8,0
17376
17377 -NEXT_PAGE(level2_ident_pgt)
17378 - /* Since I easily can, map the first 1G.
17379 + /* Since I easily can, map the first 2G.
17380 * Don't set NX because code runs from these pages.
17381 */
17382 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
17383 +NEXT_PAGE(level2_ident_pgt)
17384 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
17385
17386 NEXT_PAGE(level2_kernel_pgt)
17387 /*
17388 @@ -423,37 +463,59 @@ NEXT_PAGE(level2_kernel_pgt)
17389 * If you want to increase this then increase MODULES_VADDR
17390 * too.)
17391 */
17392 - PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
17393 - KERNEL_IMAGE_SIZE/PMD_SIZE)
17394 -
17395 -NEXT_PAGE(level2_spare_pgt)
17396 - .fill 512, 8, 0
17397 + PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
17398
17399 #undef PMDS
17400 #undef NEXT_PAGE
17401
17402 - .data
17403 + .align PAGE_SIZE
17404 +ENTRY(cpu_gdt_table)
17405 + .rept NR_CPUS
17406 + .quad 0x0000000000000000 /* NULL descriptor */
17407 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
17408 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
17409 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
17410 + .quad 0x00cffb000000ffff /* __USER32_CS */
17411 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
17412 + .quad 0x00affb000000ffff /* __USER_CS */
17413 +
17414 +#ifdef CONFIG_PAX_KERNEXEC
17415 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
17416 +#else
17417 + .quad 0x0 /* unused */
17418 +#endif
17419 +
17420 + .quad 0,0 /* TSS */
17421 + .quad 0,0 /* LDT */
17422 + .quad 0,0,0 /* three TLS descriptors */
17423 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
17424 + /* asm/segment.h:GDT_ENTRIES must match this */
17425 +
17426 + /* zero the remaining page */
17427 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
17428 + .endr
17429 +
17430 .align 16
17431 .globl early_gdt_descr
17432 early_gdt_descr:
17433 .word GDT_ENTRIES*8-1
17434 early_gdt_descr_base:
17435 - .quad INIT_PER_CPU_VAR(gdt_page)
17436 + .quad cpu_gdt_table
17437
17438 ENTRY(phys_base)
17439 /* This must match the first entry in level2_kernel_pgt */
17440 .quad 0x0000000000000000
17441
17442 #include "../../x86/xen/xen-head.S"
17443 -
17444 - .section .bss, "aw", @nobits
17445 +
17446 + .section .rodata,"a",@progbits
17447 .align L1_CACHE_BYTES
17448 ENTRY(idt_table)
17449 - .skip IDT_ENTRIES * 16
17450 + .fill 512,8,0
17451
17452 .align L1_CACHE_BYTES
17453 ENTRY(nmi_idt_table)
17454 - .skip IDT_ENTRIES * 16
17455 + .fill 512,8,0
17456
17457 __PAGE_ALIGNED_BSS
17458 .align PAGE_SIZE
17459 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
17460 index 9c3bd4a..e1d9b35 100644
17461 --- a/arch/x86/kernel/i386_ksyms_32.c
17462 +++ b/arch/x86/kernel/i386_ksyms_32.c
17463 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
17464 EXPORT_SYMBOL(cmpxchg8b_emu);
17465 #endif
17466
17467 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
17468 +
17469 /* Networking helper routines. */
17470 EXPORT_SYMBOL(csum_partial_copy_generic);
17471 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
17472 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
17473
17474 EXPORT_SYMBOL(__get_user_1);
17475 EXPORT_SYMBOL(__get_user_2);
17476 @@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
17477
17478 EXPORT_SYMBOL(csum_partial);
17479 EXPORT_SYMBOL(empty_zero_page);
17480 +
17481 +#ifdef CONFIG_PAX_KERNEXEC
17482 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17483 +#endif
17484 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
17485 index f250431..54097e7 100644
17486 --- a/arch/x86/kernel/i387.c
17487 +++ b/arch/x86/kernel/i387.c
17488 @@ -59,7 +59,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
17489 static inline bool interrupted_user_mode(void)
17490 {
17491 struct pt_regs *regs = get_irq_regs();
17492 - return regs && user_mode_vm(regs);
17493 + return regs && user_mode(regs);
17494 }
17495
17496 /*
17497 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17498 index 36d1853..bf25736 100644
17499 --- a/arch/x86/kernel/i8259.c
17500 +++ b/arch/x86/kernel/i8259.c
17501 @@ -209,7 +209,7 @@ spurious_8259A_irq:
17502 "spurious 8259A interrupt: IRQ%d.\n", irq);
17503 spurious_irq_mask |= irqmask;
17504 }
17505 - atomic_inc(&irq_err_count);
17506 + atomic_inc_unchecked(&irq_err_count);
17507 /*
17508 * Theoretically we do not have to handle this IRQ,
17509 * but in Linux this does not cause problems and is
17510 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17511 index 8c96897..be66bfa 100644
17512 --- a/arch/x86/kernel/ioport.c
17513 +++ b/arch/x86/kernel/ioport.c
17514 @@ -6,6 +6,7 @@
17515 #include <linux/sched.h>
17516 #include <linux/kernel.h>
17517 #include <linux/capability.h>
17518 +#include <linux/security.h>
17519 #include <linux/errno.h>
17520 #include <linux/types.h>
17521 #include <linux/ioport.h>
17522 @@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17523
17524 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17525 return -EINVAL;
17526 +#ifdef CONFIG_GRKERNSEC_IO
17527 + if (turn_on && grsec_disable_privio) {
17528 + gr_handle_ioperm();
17529 + return -EPERM;
17530 + }
17531 +#endif
17532 if (turn_on && !capable(CAP_SYS_RAWIO))
17533 return -EPERM;
17534
17535 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17536 * because the ->io_bitmap_max value must match the bitmap
17537 * contents:
17538 */
17539 - tss = &per_cpu(init_tss, get_cpu());
17540 + tss = init_tss + get_cpu();
17541
17542 if (turn_on)
17543 bitmap_clear(t->io_bitmap_ptr, from, num);
17544 @@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17545 return -EINVAL;
17546 /* Trying to gain more privileges? */
17547 if (level > old) {
17548 +#ifdef CONFIG_GRKERNSEC_IO
17549 + if (grsec_disable_privio) {
17550 + gr_handle_iopl();
17551 + return -EPERM;
17552 + }
17553 +#endif
17554 if (!capable(CAP_SYS_RAWIO))
17555 return -EPERM;
17556 }
17557 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17558 index 3dafc60..aa8e9c4 100644
17559 --- a/arch/x86/kernel/irq.c
17560 +++ b/arch/x86/kernel/irq.c
17561 @@ -18,7 +18,7 @@
17562 #include <asm/mce.h>
17563 #include <asm/hw_irq.h>
17564
17565 -atomic_t irq_err_count;
17566 +atomic_unchecked_t irq_err_count;
17567
17568 /* Function pointer for generic interrupt vector handling */
17569 void (*x86_platform_ipi_callback)(void) = NULL;
17570 @@ -121,9 +121,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17571 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17572 seq_printf(p, " Machine check polls\n");
17573 #endif
17574 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17575 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17576 #if defined(CONFIG_X86_IO_APIC)
17577 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17578 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17579 #endif
17580 return 0;
17581 }
17582 @@ -164,10 +164,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17583
17584 u64 arch_irq_stat(void)
17585 {
17586 - u64 sum = atomic_read(&irq_err_count);
17587 + u64 sum = atomic_read_unchecked(&irq_err_count);
17588
17589 #ifdef CONFIG_X86_IO_APIC
17590 - sum += atomic_read(&irq_mis_count);
17591 + sum += atomic_read_unchecked(&irq_mis_count);
17592 #endif
17593 return sum;
17594 }
17595 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17596 index 344faf8..355f60d 100644
17597 --- a/arch/x86/kernel/irq_32.c
17598 +++ b/arch/x86/kernel/irq_32.c
17599 @@ -39,7 +39,7 @@ static int check_stack_overflow(void)
17600 __asm__ __volatile__("andl %%esp,%0" :
17601 "=r" (sp) : "0" (THREAD_SIZE - 1));
17602
17603 - return sp < (sizeof(struct thread_info) + STACK_WARN);
17604 + return sp < STACK_WARN;
17605 }
17606
17607 static void print_stack_overflow(void)
17608 @@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
17609 * per-CPU IRQ handling contexts (thread information and stack)
17610 */
17611 union irq_ctx {
17612 - struct thread_info tinfo;
17613 - u32 stack[THREAD_SIZE/sizeof(u32)];
17614 + unsigned long previous_esp;
17615 + u32 stack[THREAD_SIZE/sizeof(u32)];
17616 } __attribute__((aligned(THREAD_SIZE)));
17617
17618 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17619 @@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
17620 static inline int
17621 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17622 {
17623 - union irq_ctx *curctx, *irqctx;
17624 + union irq_ctx *irqctx;
17625 u32 *isp, arg1, arg2;
17626
17627 - curctx = (union irq_ctx *) current_thread_info();
17628 irqctx = __this_cpu_read(hardirq_ctx);
17629
17630 /*
17631 @@ -92,16 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17632 * handler) we can't do that and just have to keep using the
17633 * current stack (which is the irq stack already after all)
17634 */
17635 - if (unlikely(curctx == irqctx))
17636 + if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17637 return 0;
17638
17639 /* build the stack frame on the IRQ stack */
17640 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17641 - irqctx->tinfo.task = curctx->tinfo.task;
17642 - irqctx->tinfo.previous_esp = current_stack_pointer;
17643 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17644 + irqctx->previous_esp = current_stack_pointer;
17645
17646 - /* Copy the preempt_count so that the [soft]irq checks work. */
17647 - irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
17648 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17649 + __set_fs(MAKE_MM_SEG(0));
17650 +#endif
17651
17652 if (unlikely(overflow))
17653 call_on_stack(print_stack_overflow, isp);
17654 @@ -113,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17655 : "0" (irq), "1" (desc), "2" (isp),
17656 "D" (desc->handle_irq)
17657 : "memory", "cc", "ecx");
17658 +
17659 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17660 + __set_fs(current_thread_info()->addr_limit);
17661 +#endif
17662 +
17663 return 1;
17664 }
17665
17666 @@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17667 */
17668 void __cpuinit irq_ctx_init(int cpu)
17669 {
17670 - union irq_ctx *irqctx;
17671 -
17672 if (per_cpu(hardirq_ctx, cpu))
17673 return;
17674
17675 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17676 - THREADINFO_GFP,
17677 - THREAD_SIZE_ORDER));
17678 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17679 - irqctx->tinfo.cpu = cpu;
17680 - irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17681 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17682 -
17683 - per_cpu(hardirq_ctx, cpu) = irqctx;
17684 -
17685 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17686 - THREADINFO_GFP,
17687 - THREAD_SIZE_ORDER));
17688 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17689 - irqctx->tinfo.cpu = cpu;
17690 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17691 -
17692 - per_cpu(softirq_ctx, cpu) = irqctx;
17693 + per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
17694 + per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
17695 +
17696 + printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17697 + cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17698
17699 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17700 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17701 @@ -152,7 +141,6 @@ void __cpuinit irq_ctx_init(int cpu)
17702 asmlinkage void do_softirq(void)
17703 {
17704 unsigned long flags;
17705 - struct thread_info *curctx;
17706 union irq_ctx *irqctx;
17707 u32 *isp;
17708
17709 @@ -162,15 +150,22 @@ asmlinkage void do_softirq(void)
17710 local_irq_save(flags);
17711
17712 if (local_softirq_pending()) {
17713 - curctx = current_thread_info();
17714 irqctx = __this_cpu_read(softirq_ctx);
17715 - irqctx->tinfo.task = curctx->task;
17716 - irqctx->tinfo.previous_esp = current_stack_pointer;
17717 + irqctx->previous_esp = current_stack_pointer;
17718
17719 /* build the stack frame on the softirq stack */
17720 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17721 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17722 +
17723 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17724 + __set_fs(MAKE_MM_SEG(0));
17725 +#endif
17726
17727 call_on_stack(__do_softirq, isp);
17728 +
17729 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17730 + __set_fs(current_thread_info()->addr_limit);
17731 +#endif
17732 +
17733 /*
17734 * Shouldn't happen, we returned above if in_interrupt():
17735 */
17736 @@ -191,7 +186,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
17737 if (unlikely(!desc))
17738 return false;
17739
17740 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
17741 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
17742 if (unlikely(overflow))
17743 print_stack_overflow();
17744 desc->handle_irq(irq, desc);
17745 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17746 index d04d3ec..ea4b374 100644
17747 --- a/arch/x86/kernel/irq_64.c
17748 +++ b/arch/x86/kernel/irq_64.c
17749 @@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17750 u64 estack_top, estack_bottom;
17751 u64 curbase = (u64)task_stack_page(current);
17752
17753 - if (user_mode_vm(regs))
17754 + if (user_mode(regs))
17755 return;
17756
17757 if (regs->sp >= curbase + sizeof(struct thread_info) +
17758 diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
17759 index 1d5d31e..72731d4 100644
17760 --- a/arch/x86/kernel/kdebugfs.c
17761 +++ b/arch/x86/kernel/kdebugfs.c
17762 @@ -27,7 +27,7 @@ struct setup_data_node {
17763 u32 len;
17764 };
17765
17766 -static ssize_t setup_data_read(struct file *file, char __user *user_buf,
17767 +static ssize_t __size_overflow(3) setup_data_read(struct file *file, char __user *user_buf,
17768 size_t count, loff_t *ppos)
17769 {
17770 struct setup_data_node *node = file->private_data;
17771 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17772 index 3f61904..873cea9 100644
17773 --- a/arch/x86/kernel/kgdb.c
17774 +++ b/arch/x86/kernel/kgdb.c
17775 @@ -127,11 +127,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17776 #ifdef CONFIG_X86_32
17777 switch (regno) {
17778 case GDB_SS:
17779 - if (!user_mode_vm(regs))
17780 + if (!user_mode(regs))
17781 *(unsigned long *)mem = __KERNEL_DS;
17782 break;
17783 case GDB_SP:
17784 - if (!user_mode_vm(regs))
17785 + if (!user_mode(regs))
17786 *(unsigned long *)mem = kernel_stack_pointer(regs);
17787 break;
17788 case GDB_GS:
17789 @@ -476,12 +476,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17790 case 'k':
17791 /* clear the trace bit */
17792 linux_regs->flags &= ~X86_EFLAGS_TF;
17793 - atomic_set(&kgdb_cpu_doing_single_step, -1);
17794 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17795
17796 /* set the trace bit if we're stepping */
17797 if (remcomInBuffer[0] == 's') {
17798 linux_regs->flags |= X86_EFLAGS_TF;
17799 - atomic_set(&kgdb_cpu_doing_single_step,
17800 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17801 raw_smp_processor_id());
17802 }
17803
17804 @@ -546,7 +546,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17805
17806 switch (cmd) {
17807 case DIE_DEBUG:
17808 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17809 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17810 if (user_mode(regs))
17811 return single_step_cont(regs, args);
17812 break;
17813 diff --git a/arch/x86/kernel/kprobes-opt.c b/arch/x86/kernel/kprobes-opt.c
17814 index c5e410e..da6aaf9 100644
17815 --- a/arch/x86/kernel/kprobes-opt.c
17816 +++ b/arch/x86/kernel/kprobes-opt.c
17817 @@ -338,7 +338,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17818 * Verify if the address gap is in 2GB range, because this uses
17819 * a relative jump.
17820 */
17821 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17822 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17823 if (abs(rel) > 0x7fffffff)
17824 return -ERANGE;
17825
17826 @@ -359,11 +359,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17827 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17828
17829 /* Set probe function call */
17830 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17831 + synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17832
17833 /* Set returning jmp instruction at the tail of out-of-line buffer */
17834 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17835 - (u8 *)op->kp.addr + op->optinsn.size);
17836 + (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17837
17838 flush_icache_range((unsigned long) buf,
17839 (unsigned long) buf + TMPL_END_IDX +
17840 @@ -385,7 +385,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
17841 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
17842
17843 /* Backup instructions which will be replaced by jump address */
17844 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
17845 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
17846 RELATIVE_ADDR_SIZE);
17847
17848 insn_buf[0] = RELATIVEJUMP_OPCODE;
17849 diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17850 index e2f751e..dffa2a0 100644
17851 --- a/arch/x86/kernel/kprobes.c
17852 +++ b/arch/x86/kernel/kprobes.c
17853 @@ -120,8 +120,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
17854 } __attribute__((packed)) *insn;
17855
17856 insn = (struct __arch_relative_insn *)from;
17857 +
17858 + pax_open_kernel();
17859 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
17860 insn->op = op;
17861 + pax_close_kernel();
17862 }
17863
17864 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
17865 @@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
17866 kprobe_opcode_t opcode;
17867 kprobe_opcode_t *orig_opcodes = opcodes;
17868
17869 - if (search_exception_tables((unsigned long)opcodes))
17870 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17871 return 0; /* Page fault may occur on this address. */
17872
17873 retry:
17874 @@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
17875 /* Another subsystem puts a breakpoint, failed to recover */
17876 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
17877 return 0;
17878 + pax_open_kernel();
17879 memcpy(dest, insn.kaddr, insn.length);
17880 + pax_close_kernel();
17881
17882 #ifdef CONFIG_X86_64
17883 if (insn_rip_relative(&insn)) {
17884 @@ -355,7 +360,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
17885 newdisp = (u8 *) src + (s64) insn.displacement.value - (u8 *) dest;
17886 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
17887 disp = (u8 *) dest + insn_offset_displacement(&insn);
17888 + pax_open_kernel();
17889 *(s32 *) disp = (s32) newdisp;
17890 + pax_close_kernel();
17891 }
17892 #endif
17893 return insn.length;
17894 @@ -485,7 +492,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
17895 * nor set current_kprobe, because it doesn't use single
17896 * stepping.
17897 */
17898 - regs->ip = (unsigned long)p->ainsn.insn;
17899 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17900 preempt_enable_no_resched();
17901 return;
17902 }
17903 @@ -504,7 +511,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
17904 if (p->opcode == BREAKPOINT_INSTRUCTION)
17905 regs->ip = (unsigned long)p->addr;
17906 else
17907 - regs->ip = (unsigned long)p->ainsn.insn;
17908 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17909 }
17910
17911 /*
17912 @@ -583,7 +590,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17913 setup_singlestep(p, regs, kcb, 0);
17914 return 1;
17915 }
17916 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
17917 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17918 /*
17919 * The breakpoint instruction was removed right
17920 * after we hit it. Another cpu has removed
17921 @@ -628,6 +635,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17922 " movq %rax, 152(%rsp)\n"
17923 RESTORE_REGS_STRING
17924 " popfq\n"
17925 +#ifdef KERNEXEC_PLUGIN
17926 + " btsq $63,(%rsp)\n"
17927 +#endif
17928 #else
17929 " pushf\n"
17930 SAVE_REGS_STRING
17931 @@ -765,7 +775,7 @@ static void __kprobes
17932 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17933 {
17934 unsigned long *tos = stack_addr(regs);
17935 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17936 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17937 unsigned long orig_ip = (unsigned long)p->addr;
17938 kprobe_opcode_t *insn = p->ainsn.insn;
17939
17940 @@ -947,7 +957,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
17941 struct die_args *args = data;
17942 int ret = NOTIFY_DONE;
17943
17944 - if (args->regs && user_mode_vm(args->regs))
17945 + if (args->regs && user_mode(args->regs))
17946 return ret;
17947
17948 switch (val) {
17949 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
17950 index ebc9873..1b9724b 100644
17951 --- a/arch/x86/kernel/ldt.c
17952 +++ b/arch/x86/kernel/ldt.c
17953 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
17954 if (reload) {
17955 #ifdef CONFIG_SMP
17956 preempt_disable();
17957 - load_LDT(pc);
17958 + load_LDT_nolock(pc);
17959 if (!cpumask_equal(mm_cpumask(current->mm),
17960 cpumask_of(smp_processor_id())))
17961 smp_call_function(flush_ldt, current->mm, 1);
17962 preempt_enable();
17963 #else
17964 - load_LDT(pc);
17965 + load_LDT_nolock(pc);
17966 #endif
17967 }
17968 if (oldsize) {
17969 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
17970 return err;
17971
17972 for (i = 0; i < old->size; i++)
17973 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
17974 + write_ldt_entry(new->ldt, i, old->ldt + i);
17975 return 0;
17976 }
17977
17978 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
17979 retval = copy_ldt(&mm->context, &old_mm->context);
17980 mutex_unlock(&old_mm->context.lock);
17981 }
17982 +
17983 + if (tsk == current) {
17984 + mm->context.vdso = 0;
17985 +
17986 +#ifdef CONFIG_X86_32
17987 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17988 + mm->context.user_cs_base = 0UL;
17989 + mm->context.user_cs_limit = ~0UL;
17990 +
17991 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17992 + cpus_clear(mm->context.cpu_user_cs_mask);
17993 +#endif
17994 +
17995 +#endif
17996 +#endif
17997 +
17998 + }
17999 +
18000 return retval;
18001 }
18002
18003 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
18004 }
18005 }
18006
18007 +#ifdef CONFIG_PAX_SEGMEXEC
18008 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
18009 + error = -EINVAL;
18010 + goto out_unlock;
18011 + }
18012 +#endif
18013 +
18014 fill_ldt(&ldt, &ldt_info);
18015 if (oldmode)
18016 ldt.avl = 0;
18017 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
18018 index 5b19e4d..6476a76 100644
18019 --- a/arch/x86/kernel/machine_kexec_32.c
18020 +++ b/arch/x86/kernel/machine_kexec_32.c
18021 @@ -26,7 +26,7 @@
18022 #include <asm/cacheflush.h>
18023 #include <asm/debugreg.h>
18024
18025 -static void set_idt(void *newidt, __u16 limit)
18026 +static void set_idt(struct desc_struct *newidt, __u16 limit)
18027 {
18028 struct desc_ptr curidt;
18029
18030 @@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
18031 }
18032
18033
18034 -static void set_gdt(void *newgdt, __u16 limit)
18035 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
18036 {
18037 struct desc_ptr curgdt;
18038
18039 @@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
18040 }
18041
18042 control_page = page_address(image->control_code_page);
18043 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
18044 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
18045
18046 relocate_kernel_ptr = control_page;
18047 page_list[PA_CONTROL_PAGE] = __pa(control_page);
18048 diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
18049 index 0327e2b..e43737b 100644
18050 --- a/arch/x86/kernel/microcode_intel.c
18051 +++ b/arch/x86/kernel/microcode_intel.c
18052 @@ -430,13 +430,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
18053
18054 static int get_ucode_user(void *to, const void *from, size_t n)
18055 {
18056 - return copy_from_user(to, from, n);
18057 + return copy_from_user(to, (const void __force_user *)from, n);
18058 }
18059
18060 static enum ucode_state
18061 request_microcode_user(int cpu, const void __user *buf, size_t size)
18062 {
18063 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
18064 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
18065 }
18066
18067 static void microcode_fini_cpu(int cpu)
18068 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
18069 index f21fd94..61565cd 100644
18070 --- a/arch/x86/kernel/module.c
18071 +++ b/arch/x86/kernel/module.c
18072 @@ -35,15 +35,60 @@
18073 #define DEBUGP(fmt...)
18074 #endif
18075
18076 -void *module_alloc(unsigned long size)
18077 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
18078 {
18079 - if (PAGE_ALIGN(size) > MODULES_LEN)
18080 + if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
18081 return NULL;
18082 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
18083 - GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
18084 + GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
18085 -1, __builtin_return_address(0));
18086 }
18087
18088 +void *module_alloc(unsigned long size)
18089 +{
18090 +
18091 +#ifdef CONFIG_PAX_KERNEXEC
18092 + return __module_alloc(size, PAGE_KERNEL);
18093 +#else
18094 + return __module_alloc(size, PAGE_KERNEL_EXEC);
18095 +#endif
18096 +
18097 +}
18098 +
18099 +#ifdef CONFIG_PAX_KERNEXEC
18100 +#ifdef CONFIG_X86_32
18101 +void *module_alloc_exec(unsigned long size)
18102 +{
18103 + struct vm_struct *area;
18104 +
18105 + if (size == 0)
18106 + return NULL;
18107 +
18108 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
18109 + return area ? area->addr : NULL;
18110 +}
18111 +EXPORT_SYMBOL(module_alloc_exec);
18112 +
18113 +void module_free_exec(struct module *mod, void *module_region)
18114 +{
18115 + vunmap(module_region);
18116 +}
18117 +EXPORT_SYMBOL(module_free_exec);
18118 +#else
18119 +void module_free_exec(struct module *mod, void *module_region)
18120 +{
18121 + module_free(mod, module_region);
18122 +}
18123 +EXPORT_SYMBOL(module_free_exec);
18124 +
18125 +void *module_alloc_exec(unsigned long size)
18126 +{
18127 + return __module_alloc(size, PAGE_KERNEL_RX);
18128 +}
18129 +EXPORT_SYMBOL(module_alloc_exec);
18130 +#endif
18131 +#endif
18132 +
18133 #ifdef CONFIG_X86_32
18134 int apply_relocate(Elf32_Shdr *sechdrs,
18135 const char *strtab,
18136 @@ -54,14 +99,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18137 unsigned int i;
18138 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
18139 Elf32_Sym *sym;
18140 - uint32_t *location;
18141 + uint32_t *plocation, location;
18142
18143 DEBUGP("Applying relocate section %u to %u\n", relsec,
18144 sechdrs[relsec].sh_info);
18145 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
18146 /* This is where to make the change */
18147 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
18148 - + rel[i].r_offset;
18149 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
18150 + location = (uint32_t)plocation;
18151 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
18152 + plocation = ktla_ktva((void *)plocation);
18153 /* This is the symbol it is referring to. Note that all
18154 undefined symbols have been resolved. */
18155 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
18156 @@ -70,11 +117,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18157 switch (ELF32_R_TYPE(rel[i].r_info)) {
18158 case R_386_32:
18159 /* We add the value into the location given */
18160 - *location += sym->st_value;
18161 + pax_open_kernel();
18162 + *plocation += sym->st_value;
18163 + pax_close_kernel();
18164 break;
18165 case R_386_PC32:
18166 /* Add the value, subtract its postition */
18167 - *location += sym->st_value - (uint32_t)location;
18168 + pax_open_kernel();
18169 + *plocation += sym->st_value - location;
18170 + pax_close_kernel();
18171 break;
18172 default:
18173 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
18174 @@ -119,21 +170,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
18175 case R_X86_64_NONE:
18176 break;
18177 case R_X86_64_64:
18178 + pax_open_kernel();
18179 *(u64 *)loc = val;
18180 + pax_close_kernel();
18181 break;
18182 case R_X86_64_32:
18183 + pax_open_kernel();
18184 *(u32 *)loc = val;
18185 + pax_close_kernel();
18186 if (val != *(u32 *)loc)
18187 goto overflow;
18188 break;
18189 case R_X86_64_32S:
18190 + pax_open_kernel();
18191 *(s32 *)loc = val;
18192 + pax_close_kernel();
18193 if ((s64)val != *(s32 *)loc)
18194 goto overflow;
18195 break;
18196 case R_X86_64_PC32:
18197 val -= (u64)loc;
18198 + pax_open_kernel();
18199 *(u32 *)loc = val;
18200 + pax_close_kernel();
18201 +
18202 #if 0
18203 if ((s64)val != *(s32 *)loc)
18204 goto overflow;
18205 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
18206 index a0b2f84..875ab81 100644
18207 --- a/arch/x86/kernel/nmi.c
18208 +++ b/arch/x86/kernel/nmi.c
18209 @@ -460,6 +460,17 @@ static inline void nmi_nesting_postprocess(void)
18210 dotraplinkage notrace __kprobes void
18211 do_nmi(struct pt_regs *regs, long error_code)
18212 {
18213 +
18214 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18215 + if (!user_mode(regs)) {
18216 + unsigned long cs = regs->cs & 0xFFFF;
18217 + unsigned long ip = ktva_ktla(regs->ip);
18218 +
18219 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
18220 + regs->ip = ip;
18221 + }
18222 +#endif
18223 +
18224 nmi_nesting_preprocess(regs);
18225
18226 nmi_enter();
18227 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
18228 index 676b8c7..870ba04 100644
18229 --- a/arch/x86/kernel/paravirt-spinlocks.c
18230 +++ b/arch/x86/kernel/paravirt-spinlocks.c
18231 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
18232 arch_spin_lock(lock);
18233 }
18234
18235 -struct pv_lock_ops pv_lock_ops = {
18236 +struct pv_lock_ops pv_lock_ops __read_only = {
18237 #ifdef CONFIG_SMP
18238 .spin_is_locked = __ticket_spin_is_locked,
18239 .spin_is_contended = __ticket_spin_is_contended,
18240 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
18241 index 9ce8859..b49bf51 100644
18242 --- a/arch/x86/kernel/paravirt.c
18243 +++ b/arch/x86/kernel/paravirt.c
18244 @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
18245 {
18246 return x;
18247 }
18248 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18249 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
18250 +#endif
18251
18252 void __init default_banner(void)
18253 {
18254 @@ -147,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
18255 if (opfunc == NULL)
18256 /* If there's no function, patch it with a ud2a (BUG) */
18257 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
18258 - else if (opfunc == _paravirt_nop)
18259 + else if (opfunc == (void *)_paravirt_nop)
18260 /* If the operation is a nop, then nop the callsite */
18261 ret = paravirt_patch_nop();
18262
18263 /* identity functions just return their single argument */
18264 - else if (opfunc == _paravirt_ident_32)
18265 + else if (opfunc == (void *)_paravirt_ident_32)
18266 ret = paravirt_patch_ident_32(insnbuf, len);
18267 - else if (opfunc == _paravirt_ident_64)
18268 + else if (opfunc == (void *)_paravirt_ident_64)
18269 ret = paravirt_patch_ident_64(insnbuf, len);
18270 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18271 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
18272 + ret = paravirt_patch_ident_64(insnbuf, len);
18273 +#endif
18274
18275 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
18276 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
18277 @@ -180,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
18278 if (insn_len > len || start == NULL)
18279 insn_len = len;
18280 else
18281 - memcpy(insnbuf, start, insn_len);
18282 + memcpy(insnbuf, ktla_ktva(start), insn_len);
18283
18284 return insn_len;
18285 }
18286 @@ -304,7 +311,7 @@ void arch_flush_lazy_mmu_mode(void)
18287 preempt_enable();
18288 }
18289
18290 -struct pv_info pv_info = {
18291 +struct pv_info pv_info __read_only = {
18292 .name = "bare hardware",
18293 .paravirt_enabled = 0,
18294 .kernel_rpl = 0,
18295 @@ -315,16 +322,16 @@ struct pv_info pv_info = {
18296 #endif
18297 };
18298
18299 -struct pv_init_ops pv_init_ops = {
18300 +struct pv_init_ops pv_init_ops __read_only = {
18301 .patch = native_patch,
18302 };
18303
18304 -struct pv_time_ops pv_time_ops = {
18305 +struct pv_time_ops pv_time_ops __read_only = {
18306 .sched_clock = native_sched_clock,
18307 .steal_clock = native_steal_clock,
18308 };
18309
18310 -struct pv_irq_ops pv_irq_ops = {
18311 +struct pv_irq_ops pv_irq_ops __read_only = {
18312 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
18313 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
18314 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
18315 @@ -336,7 +343,7 @@ struct pv_irq_ops pv_irq_ops = {
18316 #endif
18317 };
18318
18319 -struct pv_cpu_ops pv_cpu_ops = {
18320 +struct pv_cpu_ops pv_cpu_ops __read_only = {
18321 .cpuid = native_cpuid,
18322 .get_debugreg = native_get_debugreg,
18323 .set_debugreg = native_set_debugreg,
18324 @@ -397,21 +404,26 @@ struct pv_cpu_ops pv_cpu_ops = {
18325 .end_context_switch = paravirt_nop,
18326 };
18327
18328 -struct pv_apic_ops pv_apic_ops = {
18329 +struct pv_apic_ops pv_apic_ops __read_only = {
18330 #ifdef CONFIG_X86_LOCAL_APIC
18331 .startup_ipi_hook = paravirt_nop,
18332 #endif
18333 };
18334
18335 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
18336 +#ifdef CONFIG_X86_32
18337 +#ifdef CONFIG_X86_PAE
18338 +/* 64-bit pagetable entries */
18339 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
18340 +#else
18341 /* 32-bit pagetable entries */
18342 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
18343 +#endif
18344 #else
18345 /* 64-bit pagetable entries */
18346 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
18347 #endif
18348
18349 -struct pv_mmu_ops pv_mmu_ops = {
18350 +struct pv_mmu_ops pv_mmu_ops __read_only = {
18351
18352 .read_cr2 = native_read_cr2,
18353 .write_cr2 = native_write_cr2,
18354 @@ -461,6 +473,7 @@ struct pv_mmu_ops pv_mmu_ops = {
18355 .make_pud = PTE_IDENT,
18356
18357 .set_pgd = native_set_pgd,
18358 + .set_pgd_batched = native_set_pgd_batched,
18359 #endif
18360 #endif /* PAGETABLE_LEVELS >= 3 */
18361
18362 @@ -480,6 +493,12 @@ struct pv_mmu_ops pv_mmu_ops = {
18363 },
18364
18365 .set_fixmap = native_set_fixmap,
18366 +
18367 +#ifdef CONFIG_PAX_KERNEXEC
18368 + .pax_open_kernel = native_pax_open_kernel,
18369 + .pax_close_kernel = native_pax_close_kernel,
18370 +#endif
18371 +
18372 };
18373
18374 EXPORT_SYMBOL_GPL(pv_time_ops);
18375 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
18376 index 35ccf75..7a15747 100644
18377 --- a/arch/x86/kernel/pci-iommu_table.c
18378 +++ b/arch/x86/kernel/pci-iommu_table.c
18379 @@ -2,7 +2,7 @@
18380 #include <asm/iommu_table.h>
18381 #include <linux/string.h>
18382 #include <linux/kallsyms.h>
18383 -
18384 +#include <linux/sched.h>
18385
18386 #define DEBUG 1
18387
18388 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18389 index 735279e..5008677 100644
18390 --- a/arch/x86/kernel/process.c
18391 +++ b/arch/x86/kernel/process.c
18392 @@ -34,7 +34,8 @@
18393 * section. Since TSS's are completely CPU-local, we want them
18394 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
18395 */
18396 -DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
18397 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
18398 +EXPORT_SYMBOL(init_tss);
18399
18400 #ifdef CONFIG_X86_64
18401 static DEFINE_PER_CPU(unsigned char, is_idle);
18402 @@ -92,7 +93,7 @@ void arch_task_cache_init(void)
18403 task_xstate_cachep =
18404 kmem_cache_create("task_xstate", xstate_size,
18405 __alignof__(union thread_xstate),
18406 - SLAB_PANIC | SLAB_NOTRACK, NULL);
18407 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18408 }
18409
18410 static inline void drop_fpu(struct task_struct *tsk)
18411 @@ -115,7 +116,7 @@ void exit_thread(void)
18412 unsigned long *bp = t->io_bitmap_ptr;
18413
18414 if (bp) {
18415 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18416 + struct tss_struct *tss = init_tss + get_cpu();
18417
18418 t->io_bitmap_ptr = NULL;
18419 clear_thread_flag(TIF_IO_BITMAP);
18420 @@ -147,7 +148,7 @@ void show_regs_common(void)
18421
18422 printk(KERN_CONT "\n");
18423 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
18424 - current->pid, current->comm, print_tainted(),
18425 + task_pid_nr(current), current->comm, print_tainted(),
18426 init_utsname()->release,
18427 (int)strcspn(init_utsname()->version, " "),
18428 init_utsname()->version);
18429 @@ -161,6 +162,9 @@ void flush_thread(void)
18430 {
18431 struct task_struct *tsk = current;
18432
18433 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18434 + loadsegment(gs, 0);
18435 +#endif
18436 flush_ptrace_hw_breakpoint(tsk);
18437 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18438 drop_fpu(tsk);
18439 @@ -318,10 +322,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18440 regs.di = (unsigned long) arg;
18441
18442 #ifdef CONFIG_X86_32
18443 - regs.ds = __USER_DS;
18444 - regs.es = __USER_DS;
18445 + regs.ds = __KERNEL_DS;
18446 + regs.es = __KERNEL_DS;
18447 regs.fs = __KERNEL_PERCPU;
18448 - regs.gs = __KERNEL_STACK_CANARY;
18449 + savesegment(gs, regs.gs);
18450 #else
18451 regs.ss = __KERNEL_DS;
18452 #endif
18453 @@ -407,7 +411,7 @@ static void __exit_idle(void)
18454 void exit_idle(void)
18455 {
18456 /* idle loop has pid 0 */
18457 - if (current->pid)
18458 + if (task_pid_nr(current))
18459 return;
18460 __exit_idle();
18461 }
18462 @@ -516,7 +520,7 @@ bool set_pm_idle_to_default(void)
18463
18464 return ret;
18465 }
18466 -void stop_this_cpu(void *dummy)
18467 +__noreturn void stop_this_cpu(void *dummy)
18468 {
18469 local_irq_disable();
18470 /*
18471 @@ -746,16 +750,37 @@ static int __init idle_setup(char *str)
18472 }
18473 early_param("idle", idle_setup);
18474
18475 -unsigned long arch_align_stack(unsigned long sp)
18476 +#ifdef CONFIG_PAX_RANDKSTACK
18477 +void pax_randomize_kstack(struct pt_regs *regs)
18478 {
18479 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18480 - sp -= get_random_int() % 8192;
18481 - return sp & ~0xf;
18482 -}
18483 + struct thread_struct *thread = &current->thread;
18484 + unsigned long time;
18485
18486 -unsigned long arch_randomize_brk(struct mm_struct *mm)
18487 -{
18488 - unsigned long range_end = mm->brk + 0x02000000;
18489 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18490 -}
18491 + if (!randomize_va_space)
18492 + return;
18493 +
18494 + if (v8086_mode(regs))
18495 + return;
18496
18497 + rdtscl(time);
18498 +
18499 + /* P4 seems to return a 0 LSB, ignore it */
18500 +#ifdef CONFIG_MPENTIUM4
18501 + time &= 0x3EUL;
18502 + time <<= 2;
18503 +#elif defined(CONFIG_X86_64)
18504 + time &= 0xFUL;
18505 + time <<= 4;
18506 +#else
18507 + time &= 0x1FUL;
18508 + time <<= 3;
18509 +#endif
18510 +
18511 + thread->sp0 ^= time;
18512 + load_sp0(init_tss + smp_processor_id(), thread);
18513 +
18514 +#ifdef CONFIG_X86_64
18515 + this_cpu_write(kernel_stack, thread->sp0);
18516 +#endif
18517 +}
18518 +#endif
18519 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18520 index 516fa18..80bd9e6 100644
18521 --- a/arch/x86/kernel/process_32.c
18522 +++ b/arch/x86/kernel/process_32.c
18523 @@ -64,6 +64,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18524 unsigned long thread_saved_pc(struct task_struct *tsk)
18525 {
18526 return ((unsigned long *)tsk->thread.sp)[3];
18527 +//XXX return tsk->thread.eip;
18528 }
18529
18530 void __show_regs(struct pt_regs *regs, int all)
18531 @@ -73,15 +74,14 @@ void __show_regs(struct pt_regs *regs, int all)
18532 unsigned long sp;
18533 unsigned short ss, gs;
18534
18535 - if (user_mode_vm(regs)) {
18536 + if (user_mode(regs)) {
18537 sp = regs->sp;
18538 ss = regs->ss & 0xffff;
18539 - gs = get_user_gs(regs);
18540 } else {
18541 sp = kernel_stack_pointer(regs);
18542 savesegment(ss, ss);
18543 - savesegment(gs, gs);
18544 }
18545 + gs = get_user_gs(regs);
18546
18547 show_regs_common();
18548
18549 @@ -134,13 +134,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18550 struct task_struct *tsk;
18551 int err;
18552
18553 - childregs = task_pt_regs(p);
18554 + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18555 *childregs = *regs;
18556 childregs->ax = 0;
18557 childregs->sp = sp;
18558
18559 p->thread.sp = (unsigned long) childregs;
18560 p->thread.sp0 = (unsigned long) (childregs+1);
18561 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18562
18563 p->thread.ip = (unsigned long) ret_from_fork;
18564
18565 @@ -231,7 +232,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18566 struct thread_struct *prev = &prev_p->thread,
18567 *next = &next_p->thread;
18568 int cpu = smp_processor_id();
18569 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
18570 + struct tss_struct *tss = init_tss + cpu;
18571 fpu_switch_t fpu;
18572
18573 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18574 @@ -255,6 +256,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18575 */
18576 lazy_save_gs(prev->gs);
18577
18578 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18579 + __set_fs(task_thread_info(next_p)->addr_limit);
18580 +#endif
18581 +
18582 /*
18583 * Load the per-thread Thread-Local Storage descriptor.
18584 */
18585 @@ -285,6 +290,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18586 */
18587 arch_end_context_switch(next_p);
18588
18589 + this_cpu_write(current_task, next_p);
18590 + this_cpu_write(current_tinfo, &next_p->tinfo);
18591 +
18592 /*
18593 * Restore %gs if needed (which is common)
18594 */
18595 @@ -293,8 +301,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18596
18597 switch_fpu_finish(next_p, fpu);
18598
18599 - this_cpu_write(current_task, next_p);
18600 -
18601 return prev_p;
18602 }
18603
18604 @@ -324,4 +330,3 @@ unsigned long get_wchan(struct task_struct *p)
18605 } while (count++ < 16);
18606 return 0;
18607 }
18608 -
18609 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18610 index 61cdf7f..797f06a 100644
18611 --- a/arch/x86/kernel/process_64.c
18612 +++ b/arch/x86/kernel/process_64.c
18613 @@ -153,8 +153,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18614 struct pt_regs *childregs;
18615 struct task_struct *me = current;
18616
18617 - childregs = ((struct pt_regs *)
18618 - (THREAD_SIZE + task_stack_page(p))) - 1;
18619 + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18620 *childregs = *regs;
18621
18622 childregs->ax = 0;
18623 @@ -166,6 +165,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18624 p->thread.sp = (unsigned long) childregs;
18625 p->thread.sp0 = (unsigned long) (childregs+1);
18626 p->thread.usersp = me->thread.usersp;
18627 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18628
18629 set_tsk_thread_flag(p, TIF_FORK);
18630
18631 @@ -271,7 +271,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18632 struct thread_struct *prev = &prev_p->thread;
18633 struct thread_struct *next = &next_p->thread;
18634 int cpu = smp_processor_id();
18635 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
18636 + struct tss_struct *tss = init_tss + cpu;
18637 unsigned fsindex, gsindex;
18638 fpu_switch_t fpu;
18639
18640 @@ -353,10 +353,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18641 prev->usersp = this_cpu_read(old_rsp);
18642 this_cpu_write(old_rsp, next->usersp);
18643 this_cpu_write(current_task, next_p);
18644 + this_cpu_write(current_tinfo, &next_p->tinfo);
18645
18646 - this_cpu_write(kernel_stack,
18647 - (unsigned long)task_stack_page(next_p) +
18648 - THREAD_SIZE - KERNEL_STACK_OFFSET);
18649 + this_cpu_write(kernel_stack, next->sp0);
18650
18651 /*
18652 * Now maybe reload the debug registers and handle I/O bitmaps
18653 @@ -425,12 +424,11 @@ unsigned long get_wchan(struct task_struct *p)
18654 if (!p || p == current || p->state == TASK_RUNNING)
18655 return 0;
18656 stack = (unsigned long)task_stack_page(p);
18657 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18658 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18659 return 0;
18660 fp = *(u64 *)(p->thread.sp);
18661 do {
18662 - if (fp < (unsigned long)stack ||
18663 - fp >= (unsigned long)stack+THREAD_SIZE)
18664 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18665 return 0;
18666 ip = *(u64 *)(fp+8);
18667 if (!in_sched_functions(ip))
18668 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18669 index c4c6a5c..905f440 100644
18670 --- a/arch/x86/kernel/ptrace.c
18671 +++ b/arch/x86/kernel/ptrace.c
18672 @@ -824,7 +824,7 @@ long arch_ptrace(struct task_struct *child, long request,
18673 unsigned long addr, unsigned long data)
18674 {
18675 int ret;
18676 - unsigned long __user *datap = (unsigned long __user *)data;
18677 + unsigned long __user *datap = (__force unsigned long __user *)data;
18678
18679 switch (request) {
18680 /* read the word at location addr in the USER area. */
18681 @@ -909,14 +909,14 @@ long arch_ptrace(struct task_struct *child, long request,
18682 if ((int) addr < 0)
18683 return -EIO;
18684 ret = do_get_thread_area(child, addr,
18685 - (struct user_desc __user *)data);
18686 + (__force struct user_desc __user *) data);
18687 break;
18688
18689 case PTRACE_SET_THREAD_AREA:
18690 if ((int) addr < 0)
18691 return -EIO;
18692 ret = do_set_thread_area(child, addr,
18693 - (struct user_desc __user *)data, 0);
18694 + (__force struct user_desc __user *) data, 0);
18695 break;
18696 #endif
18697
18698 @@ -1426,7 +1426,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18699 memset(info, 0, sizeof(*info));
18700 info->si_signo = SIGTRAP;
18701 info->si_code = si_code;
18702 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18703 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18704 }
18705
18706 void user_single_step_siginfo(struct task_struct *tsk,
18707 @@ -1455,6 +1455,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
18708 # define IS_IA32 0
18709 #endif
18710
18711 +#ifdef CONFIG_GRKERNSEC_SETXID
18712 +extern void gr_delayed_cred_worker(void);
18713 +#endif
18714 +
18715 /*
18716 * We must return the syscall number to actually look up in the table.
18717 * This can be -1L to skip running any syscall at all.
18718 @@ -1463,6 +1467,11 @@ long syscall_trace_enter(struct pt_regs *regs)
18719 {
18720 long ret = 0;
18721
18722 +#ifdef CONFIG_GRKERNSEC_SETXID
18723 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
18724 + gr_delayed_cred_worker();
18725 +#endif
18726 +
18727 /*
18728 * If we stepped into a sysenter/syscall insn, it trapped in
18729 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
18730 @@ -1511,6 +1520,11 @@ void syscall_trace_leave(struct pt_regs *regs)
18731 {
18732 bool step;
18733
18734 +#ifdef CONFIG_GRKERNSEC_SETXID
18735 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
18736 + gr_delayed_cred_worker();
18737 +#endif
18738 +
18739 audit_syscall_exit(regs);
18740
18741 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
18742 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18743 index 42eb330..139955c 100644
18744 --- a/arch/x86/kernel/pvclock.c
18745 +++ b/arch/x86/kernel/pvclock.c
18746 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18747 return pv_tsc_khz;
18748 }
18749
18750 -static atomic64_t last_value = ATOMIC64_INIT(0);
18751 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18752
18753 void pvclock_resume(void)
18754 {
18755 - atomic64_set(&last_value, 0);
18756 + atomic64_set_unchecked(&last_value, 0);
18757 }
18758
18759 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18760 @@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18761 * updating at the same time, and one of them could be slightly behind,
18762 * making the assumption that last_value always go forward fail to hold.
18763 */
18764 - last = atomic64_read(&last_value);
18765 + last = atomic64_read_unchecked(&last_value);
18766 do {
18767 if (ret < last)
18768 return last;
18769 - last = atomic64_cmpxchg(&last_value, last, ret);
18770 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18771 } while (unlikely(last != ret));
18772
18773 return ret;
18774 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18775 index 5de92f1..2732385 100644
18776 --- a/arch/x86/kernel/reboot.c
18777 +++ b/arch/x86/kernel/reboot.c
18778 @@ -36,7 +36,7 @@ void (*pm_power_off)(void);
18779 EXPORT_SYMBOL(pm_power_off);
18780
18781 static const struct desc_ptr no_idt = {};
18782 -static int reboot_mode;
18783 +static unsigned short reboot_mode;
18784 enum reboot_type reboot_type = BOOT_ACPI;
18785 int reboot_force;
18786
18787 @@ -157,11 +157,15 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
18788 return 0;
18789 }
18790
18791 -void machine_real_restart(unsigned int type)
18792 +__noreturn void machine_real_restart(unsigned int type)
18793 {
18794 - void (*restart_lowmem)(unsigned int) = (void (*)(unsigned int))
18795 + void (* restart_lowmem)(unsigned int) = (void (*)(unsigned int))
18796 real_mode_header->machine_real_restart_asm;
18797
18798 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18799 + struct desc_struct *gdt;
18800 +#endif
18801 +
18802 local_irq_disable();
18803
18804 /*
18805 @@ -189,10 +193,36 @@ void machine_real_restart(unsigned int type)
18806 * boot)". This seems like a fairly standard thing that gets set by
18807 * REBOOT.COM programs, and the previous reset routine did this
18808 * too. */
18809 - *((unsigned short *)0x472) = reboot_mode;
18810 + *(unsigned short *)(__va(0x472)) = reboot_mode;
18811
18812 /* Jump to the identity-mapped low memory code */
18813 +
18814 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18815 + gdt = get_cpu_gdt_table(smp_processor_id());
18816 + pax_open_kernel();
18817 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18818 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18819 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18820 + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
18821 +#endif
18822 +#ifdef CONFIG_PAX_KERNEXEC
18823 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18824 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18825 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18826 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18827 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18828 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18829 +#endif
18830 + pax_close_kernel();
18831 +#endif
18832 +
18833 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18834 + asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
18835 + unreachable();
18836 +#else
18837 restart_lowmem(type);
18838 +#endif
18839 +
18840 }
18841 #ifdef CONFIG_APM_MODULE
18842 EXPORT_SYMBOL(machine_real_restart);
18843 @@ -543,7 +573,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18844 * try to force a triple fault and then cycle between hitting the keyboard
18845 * controller and doing that
18846 */
18847 -static void native_machine_emergency_restart(void)
18848 +__noreturn static void native_machine_emergency_restart(void)
18849 {
18850 int i;
18851 int attempt = 0;
18852 @@ -670,13 +700,13 @@ void native_machine_shutdown(void)
18853 #endif
18854 }
18855
18856 -static void __machine_emergency_restart(int emergency)
18857 +static __noreturn void __machine_emergency_restart(int emergency)
18858 {
18859 reboot_emergency = emergency;
18860 machine_ops.emergency_restart();
18861 }
18862
18863 -static void native_machine_restart(char *__unused)
18864 +static __noreturn void native_machine_restart(char *__unused)
18865 {
18866 printk("machine restart\n");
18867
18868 @@ -685,7 +715,7 @@ static void native_machine_restart(char *__unused)
18869 __machine_emergency_restart(0);
18870 }
18871
18872 -static void native_machine_halt(void)
18873 +static __noreturn void native_machine_halt(void)
18874 {
18875 /* Stop other cpus and apics */
18876 machine_shutdown();
18877 @@ -695,7 +725,7 @@ static void native_machine_halt(void)
18878 stop_this_cpu(NULL);
18879 }
18880
18881 -static void native_machine_power_off(void)
18882 +__noreturn static void native_machine_power_off(void)
18883 {
18884 if (pm_power_off) {
18885 if (!reboot_force)
18886 @@ -704,6 +734,7 @@ static void native_machine_power_off(void)
18887 }
18888 /* A fallback in case there is no PM info available */
18889 tboot_shutdown(TB_SHUTDOWN_HALT);
18890 + unreachable();
18891 }
18892
18893 struct machine_ops machine_ops = {
18894 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
18895 index 7a6f3b3..bed145d7 100644
18896 --- a/arch/x86/kernel/relocate_kernel_64.S
18897 +++ b/arch/x86/kernel/relocate_kernel_64.S
18898 @@ -11,6 +11,7 @@
18899 #include <asm/kexec.h>
18900 #include <asm/processor-flags.h>
18901 #include <asm/pgtable_types.h>
18902 +#include <asm/alternative-asm.h>
18903
18904 /*
18905 * Must be relocatable PIC code callable as a C function
18906 @@ -160,13 +161,14 @@ identity_mapped:
18907 xorq %rbp, %rbp
18908 xorq %r8, %r8
18909 xorq %r9, %r9
18910 - xorq %r10, %r9
18911 + xorq %r10, %r10
18912 xorq %r11, %r11
18913 xorq %r12, %r12
18914 xorq %r13, %r13
18915 xorq %r14, %r14
18916 xorq %r15, %r15
18917
18918 + pax_force_retaddr 0, 1
18919 ret
18920
18921 1:
18922 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
18923 index 16be6dc..4686132 100644
18924 --- a/arch/x86/kernel/setup.c
18925 +++ b/arch/x86/kernel/setup.c
18926 @@ -440,7 +440,7 @@ static void __init parse_setup_data(void)
18927
18928 switch (data->type) {
18929 case SETUP_E820_EXT:
18930 - parse_e820_ext(data);
18931 + parse_e820_ext((struct setup_data __force_kernel *)data);
18932 break;
18933 case SETUP_DTB:
18934 add_dtb(pa_data);
18935 @@ -632,7 +632,7 @@ static void __init trim_bios_range(void)
18936 * area (640->1Mb) as ram even though it is not.
18937 * take them out.
18938 */
18939 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
18940 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
18941 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
18942 }
18943
18944 @@ -755,14 +755,14 @@ void __init setup_arch(char **cmdline_p)
18945
18946 if (!boot_params.hdr.root_flags)
18947 root_mountflags &= ~MS_RDONLY;
18948 - init_mm.start_code = (unsigned long) _text;
18949 - init_mm.end_code = (unsigned long) _etext;
18950 + init_mm.start_code = ktla_ktva((unsigned long) _text);
18951 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
18952 init_mm.end_data = (unsigned long) _edata;
18953 init_mm.brk = _brk_end;
18954
18955 - code_resource.start = virt_to_phys(_text);
18956 - code_resource.end = virt_to_phys(_etext)-1;
18957 - data_resource.start = virt_to_phys(_etext);
18958 + code_resource.start = virt_to_phys(ktla_ktva(_text));
18959 + code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
18960 + data_resource.start = virt_to_phys(_sdata);
18961 data_resource.end = virt_to_phys(_edata)-1;
18962 bss_resource.start = virt_to_phys(&__bss_start);
18963 bss_resource.end = virt_to_phys(&__bss_stop)-1;
18964 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
18965 index 5a98aa2..2f9288d 100644
18966 --- a/arch/x86/kernel/setup_percpu.c
18967 +++ b/arch/x86/kernel/setup_percpu.c
18968 @@ -21,19 +21,17 @@
18969 #include <asm/cpu.h>
18970 #include <asm/stackprotector.h>
18971
18972 -DEFINE_PER_CPU(int, cpu_number);
18973 +#ifdef CONFIG_SMP
18974 +DEFINE_PER_CPU(unsigned int, cpu_number);
18975 EXPORT_PER_CPU_SYMBOL(cpu_number);
18976 +#endif
18977
18978 -#ifdef CONFIG_X86_64
18979 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
18980 -#else
18981 -#define BOOT_PERCPU_OFFSET 0
18982 -#endif
18983
18984 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
18985 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
18986
18987 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
18988 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
18989 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
18990 };
18991 EXPORT_SYMBOL(__per_cpu_offset);
18992 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
18993 {
18994 #ifdef CONFIG_X86_32
18995 struct desc_struct gdt;
18996 + unsigned long base = per_cpu_offset(cpu);
18997
18998 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
18999 - 0x2 | DESCTYPE_S, 0x8);
19000 - gdt.s = 1;
19001 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
19002 + 0x83 | DESCTYPE_S, 0xC);
19003 write_gdt_entry(get_cpu_gdt_table(cpu),
19004 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
19005 #endif
19006 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
19007 /* alrighty, percpu areas up and running */
19008 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
19009 for_each_possible_cpu(cpu) {
19010 +#ifdef CONFIG_CC_STACKPROTECTOR
19011 +#ifdef CONFIG_X86_32
19012 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
19013 +#endif
19014 +#endif
19015 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
19016 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
19017 per_cpu(cpu_number, cpu) = cpu;
19018 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
19019 */
19020 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
19021 #endif
19022 +#ifdef CONFIG_CC_STACKPROTECTOR
19023 +#ifdef CONFIG_X86_32
19024 + if (!cpu)
19025 + per_cpu(stack_canary.canary, cpu) = canary;
19026 +#endif
19027 +#endif
19028 /*
19029 * Up to this point, the boot CPU has been using .init.data
19030 * area. Reload any changed state for the boot CPU.
19031 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
19032 index 21af737..fb45e22 100644
19033 --- a/arch/x86/kernel/signal.c
19034 +++ b/arch/x86/kernel/signal.c
19035 @@ -191,7 +191,7 @@ static unsigned long align_sigframe(unsigned long sp)
19036 * Align the stack pointer according to the i386 ABI,
19037 * i.e. so that on function entry ((sp + 4) & 15) == 0.
19038 */
19039 - sp = ((sp + 4) & -16ul) - 4;
19040 + sp = ((sp - 12) & -16ul) - 4;
19041 #else /* !CONFIG_X86_32 */
19042 sp = round_down(sp, 16) - 8;
19043 #endif
19044 @@ -242,11 +242,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
19045 * Return an always-bogus address instead so we will die with SIGSEGV.
19046 */
19047 if (onsigstack && !likely(on_sig_stack(sp)))
19048 - return (void __user *)-1L;
19049 + return (__force void __user *)-1L;
19050
19051 /* save i387 state */
19052 if (used_math() && save_i387_xstate(*fpstate) < 0)
19053 - return (void __user *)-1L;
19054 + return (__force void __user *)-1L;
19055
19056 return (void __user *)sp;
19057 }
19058 @@ -301,9 +301,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19059 }
19060
19061 if (current->mm->context.vdso)
19062 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19063 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19064 else
19065 - restorer = &frame->retcode;
19066 + restorer = (void __user *)&frame->retcode;
19067 if (ka->sa.sa_flags & SA_RESTORER)
19068 restorer = ka->sa.sa_restorer;
19069
19070 @@ -317,7 +317,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19071 * reasons and because gdb uses it as a signature to notice
19072 * signal handler stack frames.
19073 */
19074 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
19075 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
19076
19077 if (err)
19078 return -EFAULT;
19079 @@ -371,7 +371,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19080 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
19081
19082 /* Set up to return from userspace. */
19083 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19084 + if (current->mm->context.vdso)
19085 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19086 + else
19087 + restorer = (void __user *)&frame->retcode;
19088 if (ka->sa.sa_flags & SA_RESTORER)
19089 restorer = ka->sa.sa_restorer;
19090 put_user_ex(restorer, &frame->pretcode);
19091 @@ -383,7 +386,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19092 * reasons and because gdb uses it as a signature to notice
19093 * signal handler stack frames.
19094 */
19095 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
19096 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
19097 } put_user_catch(err);
19098
19099 if (err)
19100 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
19101 index 7bd8a08..2659b5b 100644
19102 --- a/arch/x86/kernel/smpboot.c
19103 +++ b/arch/x86/kernel/smpboot.c
19104 @@ -679,6 +679,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
19105 idle->thread.sp = (unsigned long) (((struct pt_regs *)
19106 (THREAD_SIZE + task_stack_page(idle))) - 1);
19107 per_cpu(current_task, cpu) = idle;
19108 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
19109
19110 #ifdef CONFIG_X86_32
19111 /* Stack for startup_32 can be just as for start_secondary onwards */
19112 @@ -686,11 +687,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
19113 #else
19114 clear_tsk_thread_flag(idle, TIF_FORK);
19115 initial_gs = per_cpu_offset(cpu);
19116 - per_cpu(kernel_stack, cpu) =
19117 - (unsigned long)task_stack_page(idle) -
19118 - KERNEL_STACK_OFFSET + THREAD_SIZE;
19119 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
19120 #endif
19121 +
19122 + pax_open_kernel();
19123 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
19124 + pax_close_kernel();
19125 +
19126 initial_code = (unsigned long)start_secondary;
19127 stack_start = idle->thread.sp;
19128
19129 @@ -826,6 +829,12 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
19130
19131 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
19132
19133 +#ifdef CONFIG_PAX_PER_CPU_PGD
19134 + clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
19135 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19136 + KERNEL_PGD_PTRS);
19137 +#endif
19138 +
19139 err = do_boot_cpu(apicid, cpu, tidle);
19140 if (err) {
19141 pr_debug("do_boot_cpu failed %d\n", err);
19142 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
19143 index c346d11..d43b163 100644
19144 --- a/arch/x86/kernel/step.c
19145 +++ b/arch/x86/kernel/step.c
19146 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19147 struct desc_struct *desc;
19148 unsigned long base;
19149
19150 - seg &= ~7UL;
19151 + seg >>= 3;
19152
19153 mutex_lock(&child->mm->context.lock);
19154 - if (unlikely((seg >> 3) >= child->mm->context.size))
19155 + if (unlikely(seg >= child->mm->context.size))
19156 addr = -1L; /* bogus selector, access would fault */
19157 else {
19158 desc = child->mm->context.ldt + seg;
19159 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19160 addr += base;
19161 }
19162 mutex_unlock(&child->mm->context.lock);
19163 - }
19164 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
19165 + addr = ktla_ktva(addr);
19166
19167 return addr;
19168 }
19169 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19170 unsigned char opcode[15];
19171 unsigned long addr = convert_ip_to_linear(child, regs);
19172
19173 + if (addr == -EINVAL)
19174 + return 0;
19175 +
19176 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
19177 for (i = 0; i < copied; i++) {
19178 switch (opcode[i]) {
19179 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
19180 index 0b0cb5f..db6b9ed 100644
19181 --- a/arch/x86/kernel/sys_i386_32.c
19182 +++ b/arch/x86/kernel/sys_i386_32.c
19183 @@ -24,17 +24,224 @@
19184
19185 #include <asm/syscalls.h>
19186
19187 -/*
19188 - * Do a system call from kernel instead of calling sys_execve so we
19189 - * end up with proper pt_regs.
19190 - */
19191 -int kernel_execve(const char *filename,
19192 - const char *const argv[],
19193 - const char *const envp[])
19194 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
19195 {
19196 - long __res;
19197 - asm volatile ("int $0x80"
19198 - : "=a" (__res)
19199 - : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
19200 - return __res;
19201 + unsigned long pax_task_size = TASK_SIZE;
19202 +
19203 +#ifdef CONFIG_PAX_SEGMEXEC
19204 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
19205 + pax_task_size = SEGMEXEC_TASK_SIZE;
19206 +#endif
19207 +
19208 + if (len > pax_task_size || addr > pax_task_size - len)
19209 + return -EINVAL;
19210 +
19211 + return 0;
19212 +}
19213 +
19214 +unsigned long
19215 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
19216 + unsigned long len, unsigned long pgoff, unsigned long flags)
19217 +{
19218 + struct mm_struct *mm = current->mm;
19219 + struct vm_area_struct *vma;
19220 + unsigned long start_addr, pax_task_size = TASK_SIZE;
19221 +
19222 +#ifdef CONFIG_PAX_SEGMEXEC
19223 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19224 + pax_task_size = SEGMEXEC_TASK_SIZE;
19225 +#endif
19226 +
19227 + pax_task_size -= PAGE_SIZE;
19228 +
19229 + if (len > pax_task_size)
19230 + return -ENOMEM;
19231 +
19232 + if (flags & MAP_FIXED)
19233 + return addr;
19234 +
19235 +#ifdef CONFIG_PAX_RANDMMAP
19236 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19237 +#endif
19238 +
19239 + if (addr) {
19240 + addr = PAGE_ALIGN(addr);
19241 + if (pax_task_size - len >= addr) {
19242 + vma = find_vma(mm, addr);
19243 + if (check_heap_stack_gap(vma, addr, len))
19244 + return addr;
19245 + }
19246 + }
19247 + if (len > mm->cached_hole_size) {
19248 + start_addr = addr = mm->free_area_cache;
19249 + } else {
19250 + start_addr = addr = mm->mmap_base;
19251 + mm->cached_hole_size = 0;
19252 + }
19253 +
19254 +#ifdef CONFIG_PAX_PAGEEXEC
19255 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
19256 + start_addr = 0x00110000UL;
19257 +
19258 +#ifdef CONFIG_PAX_RANDMMAP
19259 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19260 + start_addr += mm->delta_mmap & 0x03FFF000UL;
19261 +#endif
19262 +
19263 + if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
19264 + start_addr = addr = mm->mmap_base;
19265 + else
19266 + addr = start_addr;
19267 + }
19268 +#endif
19269 +
19270 +full_search:
19271 + for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
19272 + /* At this point: (!vma || addr < vma->vm_end). */
19273 + if (pax_task_size - len < addr) {
19274 + /*
19275 + * Start a new search - just in case we missed
19276 + * some holes.
19277 + */
19278 + if (start_addr != mm->mmap_base) {
19279 + start_addr = addr = mm->mmap_base;
19280 + mm->cached_hole_size = 0;
19281 + goto full_search;
19282 + }
19283 + return -ENOMEM;
19284 + }
19285 + if (check_heap_stack_gap(vma, addr, len))
19286 + break;
19287 + if (addr + mm->cached_hole_size < vma->vm_start)
19288 + mm->cached_hole_size = vma->vm_start - addr;
19289 + addr = vma->vm_end;
19290 + if (mm->start_brk <= addr && addr < mm->mmap_base) {
19291 + start_addr = addr = mm->mmap_base;
19292 + mm->cached_hole_size = 0;
19293 + goto full_search;
19294 + }
19295 + }
19296 +
19297 + /*
19298 + * Remember the place where we stopped the search:
19299 + */
19300 + mm->free_area_cache = addr + len;
19301 + return addr;
19302 +}
19303 +
19304 +unsigned long
19305 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19306 + const unsigned long len, const unsigned long pgoff,
19307 + const unsigned long flags)
19308 +{
19309 + struct vm_area_struct *vma;
19310 + struct mm_struct *mm = current->mm;
19311 + unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
19312 +
19313 +#ifdef CONFIG_PAX_SEGMEXEC
19314 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19315 + pax_task_size = SEGMEXEC_TASK_SIZE;
19316 +#endif
19317 +
19318 + pax_task_size -= PAGE_SIZE;
19319 +
19320 + /* requested length too big for entire address space */
19321 + if (len > pax_task_size)
19322 + return -ENOMEM;
19323 +
19324 + if (flags & MAP_FIXED)
19325 + return addr;
19326 +
19327 +#ifdef CONFIG_PAX_PAGEEXEC
19328 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
19329 + goto bottomup;
19330 +#endif
19331 +
19332 +#ifdef CONFIG_PAX_RANDMMAP
19333 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19334 +#endif
19335 +
19336 + /* requesting a specific address */
19337 + if (addr) {
19338 + addr = PAGE_ALIGN(addr);
19339 + if (pax_task_size - len >= addr) {
19340 + vma = find_vma(mm, addr);
19341 + if (check_heap_stack_gap(vma, addr, len))
19342 + return addr;
19343 + }
19344 + }
19345 +
19346 + /* check if free_area_cache is useful for us */
19347 + if (len <= mm->cached_hole_size) {
19348 + mm->cached_hole_size = 0;
19349 + mm->free_area_cache = mm->mmap_base;
19350 + }
19351 +
19352 + /* either no address requested or can't fit in requested address hole */
19353 + addr = mm->free_area_cache;
19354 +
19355 + /* make sure it can fit in the remaining address space */
19356 + if (addr > len) {
19357 + vma = find_vma(mm, addr-len);
19358 + if (check_heap_stack_gap(vma, addr - len, len))
19359 + /* remember the address as a hint for next time */
19360 + return (mm->free_area_cache = addr-len);
19361 + }
19362 +
19363 + if (mm->mmap_base < len)
19364 + goto bottomup;
19365 +
19366 + addr = mm->mmap_base-len;
19367 +
19368 + do {
19369 + /*
19370 + * Lookup failure means no vma is above this address,
19371 + * else if new region fits below vma->vm_start,
19372 + * return with success:
19373 + */
19374 + vma = find_vma(mm, addr);
19375 + if (check_heap_stack_gap(vma, addr, len))
19376 + /* remember the address as a hint for next time */
19377 + return (mm->free_area_cache = addr);
19378 +
19379 + /* remember the largest hole we saw so far */
19380 + if (addr + mm->cached_hole_size < vma->vm_start)
19381 + mm->cached_hole_size = vma->vm_start - addr;
19382 +
19383 + /* try just below the current vma->vm_start */
19384 + addr = skip_heap_stack_gap(vma, len);
19385 + } while (!IS_ERR_VALUE(addr));
19386 +
19387 +bottomup:
19388 + /*
19389 + * A failed mmap() very likely causes application failure,
19390 + * so fall back to the bottom-up function here. This scenario
19391 + * can happen with large stack limits and large mmap()
19392 + * allocations.
19393 + */
19394 +
19395 +#ifdef CONFIG_PAX_SEGMEXEC
19396 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19397 + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19398 + else
19399 +#endif
19400 +
19401 + mm->mmap_base = TASK_UNMAPPED_BASE;
19402 +
19403 +#ifdef CONFIG_PAX_RANDMMAP
19404 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19405 + mm->mmap_base += mm->delta_mmap;
19406 +#endif
19407 +
19408 + mm->free_area_cache = mm->mmap_base;
19409 + mm->cached_hole_size = ~0UL;
19410 + addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19411 + /*
19412 + * Restore the topdown base:
19413 + */
19414 + mm->mmap_base = base;
19415 + mm->free_area_cache = base;
19416 + mm->cached_hole_size = ~0UL;
19417 +
19418 + return addr;
19419 }
19420 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19421 index b4d3c39..82bb73b 100644
19422 --- a/arch/x86/kernel/sys_x86_64.c
19423 +++ b/arch/x86/kernel/sys_x86_64.c
19424 @@ -95,8 +95,8 @@ out:
19425 return error;
19426 }
19427
19428 -static void find_start_end(unsigned long flags, unsigned long *begin,
19429 - unsigned long *end)
19430 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
19431 + unsigned long *begin, unsigned long *end)
19432 {
19433 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
19434 unsigned long new_begin;
19435 @@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19436 *begin = new_begin;
19437 }
19438 } else {
19439 - *begin = TASK_UNMAPPED_BASE;
19440 + *begin = mm->mmap_base;
19441 *end = TASK_SIZE;
19442 }
19443 }
19444 @@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19445 if (flags & MAP_FIXED)
19446 return addr;
19447
19448 - find_start_end(flags, &begin, &end);
19449 + find_start_end(mm, flags, &begin, &end);
19450
19451 if (len > end)
19452 return -ENOMEM;
19453
19454 +#ifdef CONFIG_PAX_RANDMMAP
19455 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19456 +#endif
19457 +
19458 if (addr) {
19459 addr = PAGE_ALIGN(addr);
19460 vma = find_vma(mm, addr);
19461 - if (end - len >= addr &&
19462 - (!vma || addr + len <= vma->vm_start))
19463 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19464 return addr;
19465 }
19466 if (((flags & MAP_32BIT) || test_thread_flag(TIF_ADDR32))
19467 @@ -172,7 +175,7 @@ full_search:
19468 }
19469 return -ENOMEM;
19470 }
19471 - if (!vma || addr + len <= vma->vm_start) {
19472 + if (check_heap_stack_gap(vma, addr, len)) {
19473 /*
19474 * Remember the place where we stopped the search:
19475 */
19476 @@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19477 {
19478 struct vm_area_struct *vma;
19479 struct mm_struct *mm = current->mm;
19480 - unsigned long addr = addr0, start_addr;
19481 + unsigned long base = mm->mmap_base, addr = addr0, start_addr;
19482
19483 /* requested length too big for entire address space */
19484 if (len > TASK_SIZE)
19485 @@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19486 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
19487 goto bottomup;
19488
19489 +#ifdef CONFIG_PAX_RANDMMAP
19490 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19491 +#endif
19492 +
19493 /* requesting a specific address */
19494 if (addr) {
19495 addr = PAGE_ALIGN(addr);
19496 - vma = find_vma(mm, addr);
19497 - if (TASK_SIZE - len >= addr &&
19498 - (!vma || addr + len <= vma->vm_start))
19499 - return addr;
19500 + if (TASK_SIZE - len >= addr) {
19501 + vma = find_vma(mm, addr);
19502 + if (check_heap_stack_gap(vma, addr, len))
19503 + return addr;
19504 + }
19505 }
19506
19507 /* check if free_area_cache is useful for us */
19508 @@ -240,7 +248,7 @@ try_again:
19509 * return with success:
19510 */
19511 vma = find_vma(mm, addr);
19512 - if (!vma || addr+len <= vma->vm_start)
19513 + if (check_heap_stack_gap(vma, addr, len))
19514 /* remember the address as a hint for next time */
19515 return mm->free_area_cache = addr;
19516
19517 @@ -249,8 +257,8 @@ try_again:
19518 mm->cached_hole_size = vma->vm_start - addr;
19519
19520 /* try just below the current vma->vm_start */
19521 - addr = vma->vm_start-len;
19522 - } while (len < vma->vm_start);
19523 + addr = skip_heap_stack_gap(vma, len);
19524 + } while (!IS_ERR_VALUE(addr));
19525
19526 fail:
19527 /*
19528 @@ -270,13 +278,21 @@ bottomup:
19529 * can happen with large stack limits and large mmap()
19530 * allocations.
19531 */
19532 + mm->mmap_base = TASK_UNMAPPED_BASE;
19533 +
19534 +#ifdef CONFIG_PAX_RANDMMAP
19535 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19536 + mm->mmap_base += mm->delta_mmap;
19537 +#endif
19538 +
19539 + mm->free_area_cache = mm->mmap_base;
19540 mm->cached_hole_size = ~0UL;
19541 - mm->free_area_cache = TASK_UNMAPPED_BASE;
19542 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19543 /*
19544 * Restore the topdown base:
19545 */
19546 - mm->free_area_cache = mm->mmap_base;
19547 + mm->mmap_base = base;
19548 + mm->free_area_cache = base;
19549 mm->cached_hole_size = ~0UL;
19550
19551 return addr;
19552 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19553 index f84fe00..93fe08f 100644
19554 --- a/arch/x86/kernel/tboot.c
19555 +++ b/arch/x86/kernel/tboot.c
19556 @@ -220,7 +220,7 @@ static int tboot_setup_sleep(void)
19557
19558 void tboot_shutdown(u32 shutdown_type)
19559 {
19560 - void (*shutdown)(void);
19561 + void (* __noreturn shutdown)(void);
19562
19563 if (!tboot_enabled())
19564 return;
19565 @@ -242,7 +242,7 @@ void tboot_shutdown(u32 shutdown_type)
19566
19567 switch_to_tboot_pt();
19568
19569 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19570 + shutdown = (void *)tboot->shutdown_entry;
19571 shutdown();
19572
19573 /* should not reach here */
19574 @@ -300,7 +300,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19575 return 0;
19576 }
19577
19578 -static atomic_t ap_wfs_count;
19579 +static atomic_unchecked_t ap_wfs_count;
19580
19581 static int tboot_wait_for_aps(int num_aps)
19582 {
19583 @@ -324,9 +324,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19584 {
19585 switch (action) {
19586 case CPU_DYING:
19587 - atomic_inc(&ap_wfs_count);
19588 + atomic_inc_unchecked(&ap_wfs_count);
19589 if (num_online_cpus() == 1)
19590 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19591 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19592 return NOTIFY_BAD;
19593 break;
19594 }
19595 @@ -345,7 +345,7 @@ static __init int tboot_late_init(void)
19596
19597 tboot_create_trampoline();
19598
19599 - atomic_set(&ap_wfs_count, 0);
19600 + atomic_set_unchecked(&ap_wfs_count, 0);
19601 register_hotcpu_notifier(&tboot_cpu_notifier);
19602
19603 acpi_os_set_prepare_sleep(&tboot_sleep);
19604 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19605 index 24d3c91..d06b473 100644
19606 --- a/arch/x86/kernel/time.c
19607 +++ b/arch/x86/kernel/time.c
19608 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
19609 {
19610 unsigned long pc = instruction_pointer(regs);
19611
19612 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19613 + if (!user_mode(regs) && in_lock_functions(pc)) {
19614 #ifdef CONFIG_FRAME_POINTER
19615 - return *(unsigned long *)(regs->bp + sizeof(long));
19616 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19617 #else
19618 unsigned long *sp =
19619 (unsigned long *)kernel_stack_pointer(regs);
19620 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19621 * or above a saved flags. Eflags has bits 22-31 zero,
19622 * kernel addresses don't.
19623 */
19624 +
19625 +#ifdef CONFIG_PAX_KERNEXEC
19626 + return ktla_ktva(sp[0]);
19627 +#else
19628 if (sp[0] >> 22)
19629 return sp[0];
19630 if (sp[1] >> 22)
19631 return sp[1];
19632 #endif
19633 +
19634 +#endif
19635 }
19636 return pc;
19637 }
19638 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19639 index 9d9d2f9..ed344e4 100644
19640 --- a/arch/x86/kernel/tls.c
19641 +++ b/arch/x86/kernel/tls.c
19642 @@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19643 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19644 return -EINVAL;
19645
19646 +#ifdef CONFIG_PAX_SEGMEXEC
19647 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19648 + return -EINVAL;
19649 +#endif
19650 +
19651 set_tls_desc(p, idx, &info, 1);
19652
19653 return 0;
19654 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19655 index 05b31d9..501d3ba 100644
19656 --- a/arch/x86/kernel/traps.c
19657 +++ b/arch/x86/kernel/traps.c
19658 @@ -67,12 +67,6 @@ asmlinkage int system_call(void);
19659
19660 /* Do we ignore FPU interrupts ? */
19661 char ignore_fpu_irq;
19662 -
19663 -/*
19664 - * The IDT has to be page-aligned to simplify the Pentium
19665 - * F0 0F bug workaround.
19666 - */
19667 -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
19668 #endif
19669
19670 DECLARE_BITMAP(used_vectors, NR_VECTORS);
19671 @@ -105,13 +99,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
19672 }
19673
19674 static void __kprobes
19675 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19676 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
19677 long error_code, siginfo_t *info)
19678 {
19679 struct task_struct *tsk = current;
19680
19681 #ifdef CONFIG_X86_32
19682 - if (regs->flags & X86_VM_MASK) {
19683 + if (v8086_mode(regs)) {
19684 /*
19685 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
19686 * On nmi (interrupt 2), do_trap should not be called.
19687 @@ -122,7 +116,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19688 }
19689 #endif
19690
19691 - if (!user_mode(regs))
19692 + if (!user_mode_novm(regs))
19693 goto kernel_trap;
19694
19695 #ifdef CONFIG_X86_32
19696 @@ -145,7 +139,7 @@ trap_signal:
19697 printk_ratelimit()) {
19698 printk(KERN_INFO
19699 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
19700 - tsk->comm, tsk->pid, str,
19701 + tsk->comm, task_pid_nr(tsk), str,
19702 regs->ip, regs->sp, error_code);
19703 print_vma_addr(" in ", regs->ip);
19704 printk("\n");
19705 @@ -162,8 +156,20 @@ kernel_trap:
19706 if (!fixup_exception(regs)) {
19707 tsk->thread.error_code = error_code;
19708 tsk->thread.trap_nr = trapnr;
19709 +
19710 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19711 + if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
19712 + str = "PAX: suspicious stack segment fault";
19713 +#endif
19714 +
19715 die(str, regs, error_code);
19716 }
19717 +
19718 +#ifdef CONFIG_PAX_REFCOUNT
19719 + if (trapnr == 4)
19720 + pax_report_refcount_overflow(regs);
19721 +#endif
19722 +
19723 return;
19724
19725 #ifdef CONFIG_X86_32
19726 @@ -256,14 +262,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
19727 conditional_sti(regs);
19728
19729 #ifdef CONFIG_X86_32
19730 - if (regs->flags & X86_VM_MASK)
19731 + if (v8086_mode(regs))
19732 goto gp_in_vm86;
19733 #endif
19734
19735 tsk = current;
19736 - if (!user_mode(regs))
19737 + if (!user_mode_novm(regs))
19738 goto gp_in_kernel;
19739
19740 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
19741 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
19742 + struct mm_struct *mm = tsk->mm;
19743 + unsigned long limit;
19744 +
19745 + down_write(&mm->mmap_sem);
19746 + limit = mm->context.user_cs_limit;
19747 + if (limit < TASK_SIZE) {
19748 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
19749 + up_write(&mm->mmap_sem);
19750 + return;
19751 + }
19752 + up_write(&mm->mmap_sem);
19753 + }
19754 +#endif
19755 +
19756 tsk->thread.error_code = error_code;
19757 tsk->thread.trap_nr = X86_TRAP_GP;
19758
19759 @@ -296,6 +318,13 @@ gp_in_kernel:
19760 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
19761 X86_TRAP_GP, SIGSEGV) == NOTIFY_STOP)
19762 return;
19763 +
19764 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19765 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
19766 + die("PAX: suspicious general protection fault", regs, error_code);
19767 + else
19768 +#endif
19769 +
19770 die("general protection fault", regs, error_code);
19771 }
19772
19773 @@ -431,7 +460,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19774 /* It's safe to allow irq's after DR6 has been saved */
19775 preempt_conditional_sti(regs);
19776
19777 - if (regs->flags & X86_VM_MASK) {
19778 + if (v8086_mode(regs)) {
19779 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
19780 X86_TRAP_DB);
19781 preempt_conditional_cli(regs);
19782 @@ -446,7 +475,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19783 * We already checked v86 mode above, so we can check for kernel mode
19784 * by just checking the CPL of CS.
19785 */
19786 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
19787 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
19788 tsk->thread.debugreg6 &= ~DR_STEP;
19789 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
19790 regs->flags &= ~X86_EFLAGS_TF;
19791 @@ -477,7 +506,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
19792 return;
19793 conditional_sti(regs);
19794
19795 - if (!user_mode_vm(regs))
19796 + if (!user_mode(regs))
19797 {
19798 if (!fixup_exception(regs)) {
19799 task->thread.error_code = error_code;
19800 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
19801 index dc4e910..c9dedab 100644
19802 --- a/arch/x86/kernel/uprobes.c
19803 +++ b/arch/x86/kernel/uprobes.c
19804 @@ -606,7 +606,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
19805 int ret = NOTIFY_DONE;
19806
19807 /* We are only interested in userspace traps */
19808 - if (regs && !user_mode_vm(regs))
19809 + if (regs && !user_mode(regs))
19810 return NOTIFY_DONE;
19811
19812 switch (val) {
19813 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19814 index b9242ba..50c5edd 100644
19815 --- a/arch/x86/kernel/verify_cpu.S
19816 +++ b/arch/x86/kernel/verify_cpu.S
19817 @@ -20,6 +20,7 @@
19818 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19819 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19820 * arch/x86/kernel/head_32.S: processor startup
19821 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19822 *
19823 * verify_cpu, returns the status of longmode and SSE in register %eax.
19824 * 0: Success 1: Failure
19825 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19826 index 255f58a..5e91150 100644
19827 --- a/arch/x86/kernel/vm86_32.c
19828 +++ b/arch/x86/kernel/vm86_32.c
19829 @@ -41,6 +41,7 @@
19830 #include <linux/ptrace.h>
19831 #include <linux/audit.h>
19832 #include <linux/stddef.h>
19833 +#include <linux/grsecurity.h>
19834
19835 #include <asm/uaccess.h>
19836 #include <asm/io.h>
19837 @@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19838 do_exit(SIGSEGV);
19839 }
19840
19841 - tss = &per_cpu(init_tss, get_cpu());
19842 + tss = init_tss + get_cpu();
19843 current->thread.sp0 = current->thread.saved_sp0;
19844 current->thread.sysenter_cs = __KERNEL_CS;
19845 load_sp0(tss, &current->thread);
19846 @@ -210,6 +211,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
19847 struct task_struct *tsk;
19848 int tmp, ret = -EPERM;
19849
19850 +#ifdef CONFIG_GRKERNSEC_VM86
19851 + if (!capable(CAP_SYS_RAWIO)) {
19852 + gr_handle_vm86();
19853 + goto out;
19854 + }
19855 +#endif
19856 +
19857 tsk = current;
19858 if (tsk->thread.saved_sp0)
19859 goto out;
19860 @@ -240,6 +248,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
19861 int tmp, ret;
19862 struct vm86plus_struct __user *v86;
19863
19864 +#ifdef CONFIG_GRKERNSEC_VM86
19865 + if (!capable(CAP_SYS_RAWIO)) {
19866 + gr_handle_vm86();
19867 + ret = -EPERM;
19868 + goto out;
19869 + }
19870 +#endif
19871 +
19872 tsk = current;
19873 switch (cmd) {
19874 case VM86_REQUEST_IRQ:
19875 @@ -326,7 +342,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
19876 tsk->thread.saved_fs = info->regs32->fs;
19877 tsk->thread.saved_gs = get_user_gs(info->regs32);
19878
19879 - tss = &per_cpu(init_tss, get_cpu());
19880 + tss = init_tss + get_cpu();
19881 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
19882 if (cpu_has_sep)
19883 tsk->thread.sysenter_cs = 0;
19884 @@ -533,7 +549,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
19885 goto cannot_handle;
19886 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
19887 goto cannot_handle;
19888 - intr_ptr = (unsigned long __user *) (i << 2);
19889 + intr_ptr = (__force unsigned long __user *) (i << 2);
19890 if (get_user(segoffs, intr_ptr))
19891 goto cannot_handle;
19892 if ((segoffs >> 16) == BIOSSEG)
19893 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
19894 index 22a1530..8fbaaad 100644
19895 --- a/arch/x86/kernel/vmlinux.lds.S
19896 +++ b/arch/x86/kernel/vmlinux.lds.S
19897 @@ -26,6 +26,13 @@
19898 #include <asm/page_types.h>
19899 #include <asm/cache.h>
19900 #include <asm/boot.h>
19901 +#include <asm/segment.h>
19902 +
19903 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19904 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
19905 +#else
19906 +#define __KERNEL_TEXT_OFFSET 0
19907 +#endif
19908
19909 #undef i386 /* in case the preprocessor is a 32bit one */
19910
19911 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
19912
19913 PHDRS {
19914 text PT_LOAD FLAGS(5); /* R_E */
19915 +#ifdef CONFIG_X86_32
19916 + module PT_LOAD FLAGS(5); /* R_E */
19917 +#endif
19918 +#ifdef CONFIG_XEN
19919 + rodata PT_LOAD FLAGS(5); /* R_E */
19920 +#else
19921 + rodata PT_LOAD FLAGS(4); /* R__ */
19922 +#endif
19923 data PT_LOAD FLAGS(6); /* RW_ */
19924 -#ifdef CONFIG_X86_64
19925 + init.begin PT_LOAD FLAGS(6); /* RW_ */
19926 #ifdef CONFIG_SMP
19927 percpu PT_LOAD FLAGS(6); /* RW_ */
19928 #endif
19929 + text.init PT_LOAD FLAGS(5); /* R_E */
19930 + text.exit PT_LOAD FLAGS(5); /* R_E */
19931 init PT_LOAD FLAGS(7); /* RWE */
19932 -#endif
19933 note PT_NOTE FLAGS(0); /* ___ */
19934 }
19935
19936 SECTIONS
19937 {
19938 #ifdef CONFIG_X86_32
19939 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
19940 - phys_startup_32 = startup_32 - LOAD_OFFSET;
19941 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
19942 #else
19943 - . = __START_KERNEL;
19944 - phys_startup_64 = startup_64 - LOAD_OFFSET;
19945 + . = __START_KERNEL;
19946 #endif
19947
19948 /* Text and read-only data */
19949 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
19950 - _text = .;
19951 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19952 /* bootstrapping code */
19953 +#ifdef CONFIG_X86_32
19954 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19955 +#else
19956 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19957 +#endif
19958 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19959 + _text = .;
19960 HEAD_TEXT
19961 #ifdef CONFIG_X86_32
19962 . = ALIGN(PAGE_SIZE);
19963 @@ -108,13 +128,48 @@ SECTIONS
19964 IRQENTRY_TEXT
19965 *(.fixup)
19966 *(.gnu.warning)
19967 - /* End of text section */
19968 - _etext = .;
19969 } :text = 0x9090
19970
19971 - NOTES :text :note
19972 + . += __KERNEL_TEXT_OFFSET;
19973
19974 - EXCEPTION_TABLE(16) :text = 0x9090
19975 +#ifdef CONFIG_X86_32
19976 + . = ALIGN(PAGE_SIZE);
19977 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
19978 +
19979 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
19980 + MODULES_EXEC_VADDR = .;
19981 + BYTE(0)
19982 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
19983 + . = ALIGN(HPAGE_SIZE) - 1;
19984 + MODULES_EXEC_END = .;
19985 +#endif
19986 +
19987 + } :module
19988 +#endif
19989 +
19990 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
19991 + /* End of text section */
19992 + BYTE(0)
19993 + _etext = . - __KERNEL_TEXT_OFFSET;
19994 + }
19995 +
19996 +#ifdef CONFIG_X86_32
19997 + . = ALIGN(PAGE_SIZE);
19998 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
19999 + *(.idt)
20000 + . = ALIGN(PAGE_SIZE);
20001 + *(.empty_zero_page)
20002 + *(.initial_pg_fixmap)
20003 + *(.initial_pg_pmd)
20004 + *(.initial_page_table)
20005 + *(.swapper_pg_dir)
20006 + } :rodata
20007 +#endif
20008 +
20009 + . = ALIGN(PAGE_SIZE);
20010 + NOTES :rodata :note
20011 +
20012 + EXCEPTION_TABLE(16) :rodata
20013
20014 #if defined(CONFIG_DEBUG_RODATA)
20015 /* .text should occupy whole number of pages */
20016 @@ -126,16 +181,20 @@ SECTIONS
20017
20018 /* Data */
20019 .data : AT(ADDR(.data) - LOAD_OFFSET) {
20020 +
20021 +#ifdef CONFIG_PAX_KERNEXEC
20022 + . = ALIGN(HPAGE_SIZE);
20023 +#else
20024 + . = ALIGN(PAGE_SIZE);
20025 +#endif
20026 +
20027 /* Start of data section */
20028 _sdata = .;
20029
20030 /* init_task */
20031 INIT_TASK_DATA(THREAD_SIZE)
20032
20033 -#ifdef CONFIG_X86_32
20034 - /* 32 bit has nosave before _edata */
20035 NOSAVE_DATA
20036 -#endif
20037
20038 PAGE_ALIGNED_DATA(PAGE_SIZE)
20039
20040 @@ -176,12 +235,19 @@ SECTIONS
20041 #endif /* CONFIG_X86_64 */
20042
20043 /* Init code and data - will be freed after init */
20044 - . = ALIGN(PAGE_SIZE);
20045 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
20046 + BYTE(0)
20047 +
20048 +#ifdef CONFIG_PAX_KERNEXEC
20049 + . = ALIGN(HPAGE_SIZE);
20050 +#else
20051 + . = ALIGN(PAGE_SIZE);
20052 +#endif
20053 +
20054 __init_begin = .; /* paired with __init_end */
20055 - }
20056 + } :init.begin
20057
20058 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
20059 +#ifdef CONFIG_SMP
20060 /*
20061 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
20062 * output PHDR, so the next output section - .init.text - should
20063 @@ -190,12 +256,27 @@ SECTIONS
20064 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
20065 #endif
20066
20067 - INIT_TEXT_SECTION(PAGE_SIZE)
20068 -#ifdef CONFIG_X86_64
20069 - :init
20070 -#endif
20071 + . = ALIGN(PAGE_SIZE);
20072 + init_begin = .;
20073 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
20074 + VMLINUX_SYMBOL(_sinittext) = .;
20075 + INIT_TEXT
20076 + VMLINUX_SYMBOL(_einittext) = .;
20077 + . = ALIGN(PAGE_SIZE);
20078 + } :text.init
20079
20080 - INIT_DATA_SECTION(16)
20081 + /*
20082 + * .exit.text is discard at runtime, not link time, to deal with
20083 + * references from .altinstructions and .eh_frame
20084 + */
20085 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20086 + EXIT_TEXT
20087 + . = ALIGN(16);
20088 + } :text.exit
20089 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
20090 +
20091 + . = ALIGN(PAGE_SIZE);
20092 + INIT_DATA_SECTION(16) :init
20093
20094 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
20095 __x86_cpu_dev_start = .;
20096 @@ -257,19 +338,12 @@ SECTIONS
20097 }
20098
20099 . = ALIGN(8);
20100 - /*
20101 - * .exit.text is discard at runtime, not link time, to deal with
20102 - * references from .altinstructions and .eh_frame
20103 - */
20104 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
20105 - EXIT_TEXT
20106 - }
20107
20108 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
20109 EXIT_DATA
20110 }
20111
20112 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
20113 +#ifndef CONFIG_SMP
20114 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
20115 #endif
20116
20117 @@ -288,16 +362,10 @@ SECTIONS
20118 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
20119 __smp_locks = .;
20120 *(.smp_locks)
20121 - . = ALIGN(PAGE_SIZE);
20122 __smp_locks_end = .;
20123 + . = ALIGN(PAGE_SIZE);
20124 }
20125
20126 -#ifdef CONFIG_X86_64
20127 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
20128 - NOSAVE_DATA
20129 - }
20130 -#endif
20131 -
20132 /* BSS */
20133 . = ALIGN(PAGE_SIZE);
20134 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
20135 @@ -313,6 +381,7 @@ SECTIONS
20136 __brk_base = .;
20137 . += 64 * 1024; /* 64k alignment slop space */
20138 *(.brk_reservation) /* areas brk users have reserved */
20139 + . = ALIGN(HPAGE_SIZE);
20140 __brk_limit = .;
20141 }
20142
20143 @@ -339,13 +408,12 @@ SECTIONS
20144 * for the boot processor.
20145 */
20146 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
20147 -INIT_PER_CPU(gdt_page);
20148 INIT_PER_CPU(irq_stack_union);
20149
20150 /*
20151 * Build-time check on the image size:
20152 */
20153 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
20154 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
20155 "kernel image bigger than KERNEL_IMAGE_SIZE");
20156
20157 #ifdef CONFIG_SMP
20158 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
20159 index 5db36ca..2938af9 100644
20160 --- a/arch/x86/kernel/vsyscall_64.c
20161 +++ b/arch/x86/kernel/vsyscall_64.c
20162 @@ -54,15 +54,13 @@
20163 DEFINE_VVAR(int, vgetcpu_mode);
20164 DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
20165
20166 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
20167 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
20168
20169 static int __init vsyscall_setup(char *str)
20170 {
20171 if (str) {
20172 if (!strcmp("emulate", str))
20173 vsyscall_mode = EMULATE;
20174 - else if (!strcmp("native", str))
20175 - vsyscall_mode = NATIVE;
20176 else if (!strcmp("none", str))
20177 vsyscall_mode = NONE;
20178 else
20179 @@ -309,8 +307,7 @@ done:
20180 return true;
20181
20182 sigsegv:
20183 - force_sig(SIGSEGV, current);
20184 - return true;
20185 + do_group_exit(SIGKILL);
20186 }
20187
20188 /*
20189 @@ -363,10 +360,7 @@ void __init map_vsyscall(void)
20190 extern char __vvar_page;
20191 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
20192
20193 - __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
20194 - vsyscall_mode == NATIVE
20195 - ? PAGE_KERNEL_VSYSCALL
20196 - : PAGE_KERNEL_VVAR);
20197 + __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
20198 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
20199 (unsigned long)VSYSCALL_START);
20200
20201 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
20202 index 9796c2f..f686fbf 100644
20203 --- a/arch/x86/kernel/x8664_ksyms_64.c
20204 +++ b/arch/x86/kernel/x8664_ksyms_64.c
20205 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
20206 EXPORT_SYMBOL(copy_user_generic_string);
20207 EXPORT_SYMBOL(copy_user_generic_unrolled);
20208 EXPORT_SYMBOL(__copy_user_nocache);
20209 -EXPORT_SYMBOL(_copy_from_user);
20210 -EXPORT_SYMBOL(_copy_to_user);
20211
20212 EXPORT_SYMBOL(copy_page);
20213 EXPORT_SYMBOL(clear_page);
20214 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
20215 index bd18149..2ea0183 100644
20216 --- a/arch/x86/kernel/xsave.c
20217 +++ b/arch/x86/kernel/xsave.c
20218 @@ -129,7 +129,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
20219 fx_sw_user->xstate_size > fx_sw_user->extended_size)
20220 return -EINVAL;
20221
20222 - err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
20223 + err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
20224 fx_sw_user->extended_size -
20225 FP_XSTATE_MAGIC2_SIZE));
20226 if (err)
20227 @@ -265,7 +265,7 @@ fx_only:
20228 * the other extended state.
20229 */
20230 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
20231 - return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
20232 + return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
20233 }
20234
20235 /*
20236 @@ -294,7 +294,7 @@ int restore_i387_xstate(void __user *buf)
20237 if (use_xsave())
20238 err = restore_user_xstate(buf);
20239 else
20240 - err = fxrstor_checking((__force struct i387_fxsave_struct *)
20241 + err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
20242 buf);
20243 if (unlikely(err)) {
20244 /*
20245 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
20246 index 7df1c6d..9ea7c79 100644
20247 --- a/arch/x86/kvm/cpuid.c
20248 +++ b/arch/x86/kvm/cpuid.c
20249 @@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
20250 struct kvm_cpuid2 *cpuid,
20251 struct kvm_cpuid_entry2 __user *entries)
20252 {
20253 - int r;
20254 + int r, i;
20255
20256 r = -E2BIG;
20257 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
20258 goto out;
20259 r = -EFAULT;
20260 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20261 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20262 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20263 goto out;
20264 + for (i = 0; i < cpuid->nent; ++i) {
20265 + struct kvm_cpuid_entry2 cpuid_entry;
20266 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20267 + goto out;
20268 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
20269 + }
20270 vcpu->arch.cpuid_nent = cpuid->nent;
20271 kvm_apic_set_version(vcpu);
20272 kvm_x86_ops->cpuid_update(vcpu);
20273 @@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20274 struct kvm_cpuid2 *cpuid,
20275 struct kvm_cpuid_entry2 __user *entries)
20276 {
20277 - int r;
20278 + int r, i;
20279
20280 r = -E2BIG;
20281 if (cpuid->nent < vcpu->arch.cpuid_nent)
20282 goto out;
20283 r = -EFAULT;
20284 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20285 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20286 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20287 goto out;
20288 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20289 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20290 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20291 + goto out;
20292 + }
20293 return 0;
20294
20295 out:
20296 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
20297 index 4837375..2cc9722 100644
20298 --- a/arch/x86/kvm/emulate.c
20299 +++ b/arch/x86/kvm/emulate.c
20300 @@ -256,6 +256,7 @@ struct gprefix {
20301
20302 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
20303 do { \
20304 + unsigned long _tmp; \
20305 __asm__ __volatile__ ( \
20306 _PRE_EFLAGS("0", "4", "2") \
20307 _op _suffix " %"_x"3,%1; " \
20308 @@ -270,8 +271,6 @@ struct gprefix {
20309 /* Raw emulation: instruction has two explicit operands. */
20310 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
20311 do { \
20312 - unsigned long _tmp; \
20313 - \
20314 switch ((ctxt)->dst.bytes) { \
20315 case 2: \
20316 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
20317 @@ -287,7 +286,6 @@ struct gprefix {
20318
20319 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
20320 do { \
20321 - unsigned long _tmp; \
20322 switch ((ctxt)->dst.bytes) { \
20323 case 1: \
20324 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
20325 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
20326 index 93c1574..d6097dc 100644
20327 --- a/arch/x86/kvm/lapic.c
20328 +++ b/arch/x86/kvm/lapic.c
20329 @@ -54,7 +54,7 @@
20330 #define APIC_BUS_CYCLE_NS 1
20331
20332 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
20333 -#define apic_debug(fmt, arg...)
20334 +#define apic_debug(fmt, arg...) do {} while (0)
20335
20336 #define APIC_LVT_NUM 6
20337 /* 14 is the version for Xeon and Pentium 8.4.8*/
20338 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20339 index 34f9709..8eca2d5 100644
20340 --- a/arch/x86/kvm/paging_tmpl.h
20341 +++ b/arch/x86/kvm/paging_tmpl.h
20342 @@ -197,7 +197,7 @@ retry_walk:
20343 if (unlikely(kvm_is_error_hva(host_addr)))
20344 goto error;
20345
20346 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20347 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20348 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20349 goto error;
20350
20351 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20352 index f75af40..285b18f 100644
20353 --- a/arch/x86/kvm/svm.c
20354 +++ b/arch/x86/kvm/svm.c
20355 @@ -3516,7 +3516,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20356 int cpu = raw_smp_processor_id();
20357
20358 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20359 +
20360 + pax_open_kernel();
20361 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20362 + pax_close_kernel();
20363 +
20364 load_TR_desc();
20365 }
20366
20367 @@ -3894,6 +3898,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20368 #endif
20369 #endif
20370
20371 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20372 + __set_fs(current_thread_info()->addr_limit);
20373 +#endif
20374 +
20375 reload_tss(vcpu);
20376
20377 local_irq_disable();
20378 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20379 index 86c8704..e8ee2ac 100644
20380 --- a/arch/x86/kvm/vmx.c
20381 +++ b/arch/x86/kvm/vmx.c
20382 @@ -1317,7 +1317,11 @@ static void reload_tss(void)
20383 struct desc_struct *descs;
20384
20385 descs = (void *)gdt->address;
20386 +
20387 + pax_open_kernel();
20388 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20389 + pax_close_kernel();
20390 +
20391 load_TR_desc();
20392 }
20393
20394 @@ -2650,8 +2654,11 @@ static __init int hardware_setup(void)
20395 if (!cpu_has_vmx_flexpriority())
20396 flexpriority_enabled = 0;
20397
20398 - if (!cpu_has_vmx_tpr_shadow())
20399 - kvm_x86_ops->update_cr8_intercept = NULL;
20400 + if (!cpu_has_vmx_tpr_shadow()) {
20401 + pax_open_kernel();
20402 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20403 + pax_close_kernel();
20404 + }
20405
20406 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20407 kvm_disable_largepages();
20408 @@ -3719,7 +3726,7 @@ static void vmx_set_constant_host_state(void)
20409 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20410
20411 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20412 - vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20413 + vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20414
20415 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20416 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20417 @@ -6257,6 +6264,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20418 "jmp .Lkvm_vmx_return \n\t"
20419 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20420 ".Lkvm_vmx_return: "
20421 +
20422 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20423 + "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20424 + ".Lkvm_vmx_return2: "
20425 +#endif
20426 +
20427 /* Save guest registers, load host registers, keep flags */
20428 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20429 "pop %0 \n\t"
20430 @@ -6305,6 +6318,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20431 #endif
20432 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20433 [wordsize]"i"(sizeof(ulong))
20434 +
20435 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20436 + ,[cs]"i"(__KERNEL_CS)
20437 +#endif
20438 +
20439 : "cc", "memory"
20440 , R"ax", R"bx", R"di", R"si"
20441 #ifdef CONFIG_X86_64
20442 @@ -6312,7 +6330,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20443 #endif
20444 );
20445
20446 -#ifndef CONFIG_X86_64
20447 +#ifdef CONFIG_X86_32
20448 /*
20449 * The sysexit path does not restore ds/es, so we must set them to
20450 * a reasonable value ourselves.
20451 @@ -6321,8 +6339,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20452 * may be executed in interrupt context, which saves and restore segments
20453 * around it, nullifying its effect.
20454 */
20455 - loadsegment(ds, __USER_DS);
20456 - loadsegment(es, __USER_DS);
20457 + loadsegment(ds, __KERNEL_DS);
20458 + loadsegment(es, __KERNEL_DS);
20459 + loadsegment(ss, __KERNEL_DS);
20460 +
20461 +#ifdef CONFIG_PAX_KERNEXEC
20462 + loadsegment(fs, __KERNEL_PERCPU);
20463 +#endif
20464 +
20465 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20466 + __set_fs(current_thread_info()->addr_limit);
20467 +#endif
20468 +
20469 #endif
20470
20471 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
20472 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20473 index 14c290d..0dae6e5 100644
20474 --- a/arch/x86/kvm/x86.c
20475 +++ b/arch/x86/kvm/x86.c
20476 @@ -1361,8 +1361,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20477 {
20478 struct kvm *kvm = vcpu->kvm;
20479 int lm = is_long_mode(vcpu);
20480 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20481 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20482 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20483 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20484 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20485 : kvm->arch.xen_hvm_config.blob_size_32;
20486 u32 page_num = data & ~PAGE_MASK;
20487 @@ -2218,6 +2218,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20488 if (n < msr_list.nmsrs)
20489 goto out;
20490 r = -EFAULT;
20491 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20492 + goto out;
20493 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20494 num_msrs_to_save * sizeof(u32)))
20495 goto out;
20496 @@ -2343,7 +2345,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20497 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20498 struct kvm_interrupt *irq)
20499 {
20500 - if (irq->irq < 0 || irq->irq >= 256)
20501 + if (irq->irq >= 256)
20502 return -EINVAL;
20503 if (irqchip_in_kernel(vcpu->kvm))
20504 return -ENXIO;
20505 @@ -4880,7 +4882,7 @@ static void kvm_set_mmio_spte_mask(void)
20506 kvm_mmu_set_mmio_spte_mask(mask);
20507 }
20508
20509 -int kvm_arch_init(void *opaque)
20510 +int kvm_arch_init(const void *opaque)
20511 {
20512 int r;
20513 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20514 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20515 index 642d880..44e0f3f 100644
20516 --- a/arch/x86/lguest/boot.c
20517 +++ b/arch/x86/lguest/boot.c
20518 @@ -1200,9 +1200,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20519 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20520 * Launcher to reboot us.
20521 */
20522 -static void lguest_restart(char *reason)
20523 +static __noreturn void lguest_restart(char *reason)
20524 {
20525 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20526 + BUG();
20527 }
20528
20529 /*G:050
20530 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20531 index 00933d5..3a64af9 100644
20532 --- a/arch/x86/lib/atomic64_386_32.S
20533 +++ b/arch/x86/lib/atomic64_386_32.S
20534 @@ -48,6 +48,10 @@ BEGIN(read)
20535 movl (v), %eax
20536 movl 4(v), %edx
20537 RET_ENDP
20538 +BEGIN(read_unchecked)
20539 + movl (v), %eax
20540 + movl 4(v), %edx
20541 +RET_ENDP
20542 #undef v
20543
20544 #define v %esi
20545 @@ -55,6 +59,10 @@ BEGIN(set)
20546 movl %ebx, (v)
20547 movl %ecx, 4(v)
20548 RET_ENDP
20549 +BEGIN(set_unchecked)
20550 + movl %ebx, (v)
20551 + movl %ecx, 4(v)
20552 +RET_ENDP
20553 #undef v
20554
20555 #define v %esi
20556 @@ -70,6 +78,20 @@ RET_ENDP
20557 BEGIN(add)
20558 addl %eax, (v)
20559 adcl %edx, 4(v)
20560 +
20561 +#ifdef CONFIG_PAX_REFCOUNT
20562 + jno 0f
20563 + subl %eax, (v)
20564 + sbbl %edx, 4(v)
20565 + int $4
20566 +0:
20567 + _ASM_EXTABLE(0b, 0b)
20568 +#endif
20569 +
20570 +RET_ENDP
20571 +BEGIN(add_unchecked)
20572 + addl %eax, (v)
20573 + adcl %edx, 4(v)
20574 RET_ENDP
20575 #undef v
20576
20577 @@ -77,6 +99,24 @@ RET_ENDP
20578 BEGIN(add_return)
20579 addl (v), %eax
20580 adcl 4(v), %edx
20581 +
20582 +#ifdef CONFIG_PAX_REFCOUNT
20583 + into
20584 +1234:
20585 + _ASM_EXTABLE(1234b, 2f)
20586 +#endif
20587 +
20588 + movl %eax, (v)
20589 + movl %edx, 4(v)
20590 +
20591 +#ifdef CONFIG_PAX_REFCOUNT
20592 +2:
20593 +#endif
20594 +
20595 +RET_ENDP
20596 +BEGIN(add_return_unchecked)
20597 + addl (v), %eax
20598 + adcl 4(v), %edx
20599 movl %eax, (v)
20600 movl %edx, 4(v)
20601 RET_ENDP
20602 @@ -86,6 +126,20 @@ RET_ENDP
20603 BEGIN(sub)
20604 subl %eax, (v)
20605 sbbl %edx, 4(v)
20606 +
20607 +#ifdef CONFIG_PAX_REFCOUNT
20608 + jno 0f
20609 + addl %eax, (v)
20610 + adcl %edx, 4(v)
20611 + int $4
20612 +0:
20613 + _ASM_EXTABLE(0b, 0b)
20614 +#endif
20615 +
20616 +RET_ENDP
20617 +BEGIN(sub_unchecked)
20618 + subl %eax, (v)
20619 + sbbl %edx, 4(v)
20620 RET_ENDP
20621 #undef v
20622
20623 @@ -96,6 +150,27 @@ BEGIN(sub_return)
20624 sbbl $0, %edx
20625 addl (v), %eax
20626 adcl 4(v), %edx
20627 +
20628 +#ifdef CONFIG_PAX_REFCOUNT
20629 + into
20630 +1234:
20631 + _ASM_EXTABLE(1234b, 2f)
20632 +#endif
20633 +
20634 + movl %eax, (v)
20635 + movl %edx, 4(v)
20636 +
20637 +#ifdef CONFIG_PAX_REFCOUNT
20638 +2:
20639 +#endif
20640 +
20641 +RET_ENDP
20642 +BEGIN(sub_return_unchecked)
20643 + negl %edx
20644 + negl %eax
20645 + sbbl $0, %edx
20646 + addl (v), %eax
20647 + adcl 4(v), %edx
20648 movl %eax, (v)
20649 movl %edx, 4(v)
20650 RET_ENDP
20651 @@ -105,6 +180,20 @@ RET_ENDP
20652 BEGIN(inc)
20653 addl $1, (v)
20654 adcl $0, 4(v)
20655 +
20656 +#ifdef CONFIG_PAX_REFCOUNT
20657 + jno 0f
20658 + subl $1, (v)
20659 + sbbl $0, 4(v)
20660 + int $4
20661 +0:
20662 + _ASM_EXTABLE(0b, 0b)
20663 +#endif
20664 +
20665 +RET_ENDP
20666 +BEGIN(inc_unchecked)
20667 + addl $1, (v)
20668 + adcl $0, 4(v)
20669 RET_ENDP
20670 #undef v
20671
20672 @@ -114,6 +203,26 @@ BEGIN(inc_return)
20673 movl 4(v), %edx
20674 addl $1, %eax
20675 adcl $0, %edx
20676 +
20677 +#ifdef CONFIG_PAX_REFCOUNT
20678 + into
20679 +1234:
20680 + _ASM_EXTABLE(1234b, 2f)
20681 +#endif
20682 +
20683 + movl %eax, (v)
20684 + movl %edx, 4(v)
20685 +
20686 +#ifdef CONFIG_PAX_REFCOUNT
20687 +2:
20688 +#endif
20689 +
20690 +RET_ENDP
20691 +BEGIN(inc_return_unchecked)
20692 + movl (v), %eax
20693 + movl 4(v), %edx
20694 + addl $1, %eax
20695 + adcl $0, %edx
20696 movl %eax, (v)
20697 movl %edx, 4(v)
20698 RET_ENDP
20699 @@ -123,6 +232,20 @@ RET_ENDP
20700 BEGIN(dec)
20701 subl $1, (v)
20702 sbbl $0, 4(v)
20703 +
20704 +#ifdef CONFIG_PAX_REFCOUNT
20705 + jno 0f
20706 + addl $1, (v)
20707 + adcl $0, 4(v)
20708 + int $4
20709 +0:
20710 + _ASM_EXTABLE(0b, 0b)
20711 +#endif
20712 +
20713 +RET_ENDP
20714 +BEGIN(dec_unchecked)
20715 + subl $1, (v)
20716 + sbbl $0, 4(v)
20717 RET_ENDP
20718 #undef v
20719
20720 @@ -132,6 +255,26 @@ BEGIN(dec_return)
20721 movl 4(v), %edx
20722 subl $1, %eax
20723 sbbl $0, %edx
20724 +
20725 +#ifdef CONFIG_PAX_REFCOUNT
20726 + into
20727 +1234:
20728 + _ASM_EXTABLE(1234b, 2f)
20729 +#endif
20730 +
20731 + movl %eax, (v)
20732 + movl %edx, 4(v)
20733 +
20734 +#ifdef CONFIG_PAX_REFCOUNT
20735 +2:
20736 +#endif
20737 +
20738 +RET_ENDP
20739 +BEGIN(dec_return_unchecked)
20740 + movl (v), %eax
20741 + movl 4(v), %edx
20742 + subl $1, %eax
20743 + sbbl $0, %edx
20744 movl %eax, (v)
20745 movl %edx, 4(v)
20746 RET_ENDP
20747 @@ -143,6 +286,13 @@ BEGIN(add_unless)
20748 adcl %edx, %edi
20749 addl (v), %eax
20750 adcl 4(v), %edx
20751 +
20752 +#ifdef CONFIG_PAX_REFCOUNT
20753 + into
20754 +1234:
20755 + _ASM_EXTABLE(1234b, 2f)
20756 +#endif
20757 +
20758 cmpl %eax, %ecx
20759 je 3f
20760 1:
20761 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20762 1:
20763 addl $1, %eax
20764 adcl $0, %edx
20765 +
20766 +#ifdef CONFIG_PAX_REFCOUNT
20767 + into
20768 +1234:
20769 + _ASM_EXTABLE(1234b, 2f)
20770 +#endif
20771 +
20772 movl %eax, (v)
20773 movl %edx, 4(v)
20774 movl $1, %eax
20775 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
20776 movl 4(v), %edx
20777 subl $1, %eax
20778 sbbl $0, %edx
20779 +
20780 +#ifdef CONFIG_PAX_REFCOUNT
20781 + into
20782 +1234:
20783 + _ASM_EXTABLE(1234b, 1f)
20784 +#endif
20785 +
20786 js 1f
20787 movl %eax, (v)
20788 movl %edx, 4(v)
20789 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
20790 index f5cc9eb..51fa319 100644
20791 --- a/arch/x86/lib/atomic64_cx8_32.S
20792 +++ b/arch/x86/lib/atomic64_cx8_32.S
20793 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
20794 CFI_STARTPROC
20795
20796 read64 %ecx
20797 + pax_force_retaddr
20798 ret
20799 CFI_ENDPROC
20800 ENDPROC(atomic64_read_cx8)
20801
20802 +ENTRY(atomic64_read_unchecked_cx8)
20803 + CFI_STARTPROC
20804 +
20805 + read64 %ecx
20806 + pax_force_retaddr
20807 + ret
20808 + CFI_ENDPROC
20809 +ENDPROC(atomic64_read_unchecked_cx8)
20810 +
20811 ENTRY(atomic64_set_cx8)
20812 CFI_STARTPROC
20813
20814 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
20815 cmpxchg8b (%esi)
20816 jne 1b
20817
20818 + pax_force_retaddr
20819 ret
20820 CFI_ENDPROC
20821 ENDPROC(atomic64_set_cx8)
20822
20823 +ENTRY(atomic64_set_unchecked_cx8)
20824 + CFI_STARTPROC
20825 +
20826 +1:
20827 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
20828 + * are atomic on 586 and newer */
20829 + cmpxchg8b (%esi)
20830 + jne 1b
20831 +
20832 + pax_force_retaddr
20833 + ret
20834 + CFI_ENDPROC
20835 +ENDPROC(atomic64_set_unchecked_cx8)
20836 +
20837 ENTRY(atomic64_xchg_cx8)
20838 CFI_STARTPROC
20839
20840 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
20841 cmpxchg8b (%esi)
20842 jne 1b
20843
20844 + pax_force_retaddr
20845 ret
20846 CFI_ENDPROC
20847 ENDPROC(atomic64_xchg_cx8)
20848
20849 -.macro addsub_return func ins insc
20850 -ENTRY(atomic64_\func\()_return_cx8)
20851 +.macro addsub_return func ins insc unchecked=""
20852 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20853 CFI_STARTPROC
20854 SAVE ebp
20855 SAVE ebx
20856 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
20857 movl %edx, %ecx
20858 \ins\()l %esi, %ebx
20859 \insc\()l %edi, %ecx
20860 +
20861 +.ifb \unchecked
20862 +#ifdef CONFIG_PAX_REFCOUNT
20863 + into
20864 +2:
20865 + _ASM_EXTABLE(2b, 3f)
20866 +#endif
20867 +.endif
20868 +
20869 LOCK_PREFIX
20870 cmpxchg8b (%ebp)
20871 jne 1b
20872 -
20873 -10:
20874 movl %ebx, %eax
20875 movl %ecx, %edx
20876 +
20877 +.ifb \unchecked
20878 +#ifdef CONFIG_PAX_REFCOUNT
20879 +3:
20880 +#endif
20881 +.endif
20882 +
20883 RESTORE edi
20884 RESTORE esi
20885 RESTORE ebx
20886 RESTORE ebp
20887 + pax_force_retaddr
20888 ret
20889 CFI_ENDPROC
20890 -ENDPROC(atomic64_\func\()_return_cx8)
20891 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20892 .endm
20893
20894 addsub_return add add adc
20895 addsub_return sub sub sbb
20896 +addsub_return add add adc _unchecked
20897 +addsub_return sub sub sbb _unchecked
20898
20899 -.macro incdec_return func ins insc
20900 -ENTRY(atomic64_\func\()_return_cx8)
20901 +.macro incdec_return func ins insc unchecked=""
20902 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20903 CFI_STARTPROC
20904 SAVE ebx
20905
20906 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
20907 movl %edx, %ecx
20908 \ins\()l $1, %ebx
20909 \insc\()l $0, %ecx
20910 +
20911 +.ifb \unchecked
20912 +#ifdef CONFIG_PAX_REFCOUNT
20913 + into
20914 +2:
20915 + _ASM_EXTABLE(2b, 3f)
20916 +#endif
20917 +.endif
20918 +
20919 LOCK_PREFIX
20920 cmpxchg8b (%esi)
20921 jne 1b
20922
20923 -10:
20924 movl %ebx, %eax
20925 movl %ecx, %edx
20926 +
20927 +.ifb \unchecked
20928 +#ifdef CONFIG_PAX_REFCOUNT
20929 +3:
20930 +#endif
20931 +.endif
20932 +
20933 RESTORE ebx
20934 + pax_force_retaddr
20935 ret
20936 CFI_ENDPROC
20937 -ENDPROC(atomic64_\func\()_return_cx8)
20938 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20939 .endm
20940
20941 incdec_return inc add adc
20942 incdec_return dec sub sbb
20943 +incdec_return inc add adc _unchecked
20944 +incdec_return dec sub sbb _unchecked
20945
20946 ENTRY(atomic64_dec_if_positive_cx8)
20947 CFI_STARTPROC
20948 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
20949 movl %edx, %ecx
20950 subl $1, %ebx
20951 sbb $0, %ecx
20952 +
20953 +#ifdef CONFIG_PAX_REFCOUNT
20954 + into
20955 +1234:
20956 + _ASM_EXTABLE(1234b, 2f)
20957 +#endif
20958 +
20959 js 2f
20960 LOCK_PREFIX
20961 cmpxchg8b (%esi)
20962 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
20963 movl %ebx, %eax
20964 movl %ecx, %edx
20965 RESTORE ebx
20966 + pax_force_retaddr
20967 ret
20968 CFI_ENDPROC
20969 ENDPROC(atomic64_dec_if_positive_cx8)
20970 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
20971 movl %edx, %ecx
20972 addl %ebp, %ebx
20973 adcl %edi, %ecx
20974 +
20975 +#ifdef CONFIG_PAX_REFCOUNT
20976 + into
20977 +1234:
20978 + _ASM_EXTABLE(1234b, 3f)
20979 +#endif
20980 +
20981 LOCK_PREFIX
20982 cmpxchg8b (%esi)
20983 jne 1b
20984 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
20985 CFI_ADJUST_CFA_OFFSET -8
20986 RESTORE ebx
20987 RESTORE ebp
20988 + pax_force_retaddr
20989 ret
20990 4:
20991 cmpl %edx, 4(%esp)
20992 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
20993 xorl %ecx, %ecx
20994 addl $1, %ebx
20995 adcl %edx, %ecx
20996 +
20997 +#ifdef CONFIG_PAX_REFCOUNT
20998 + into
20999 +1234:
21000 + _ASM_EXTABLE(1234b, 3f)
21001 +#endif
21002 +
21003 LOCK_PREFIX
21004 cmpxchg8b (%esi)
21005 jne 1b
21006 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
21007 movl $1, %eax
21008 3:
21009 RESTORE ebx
21010 + pax_force_retaddr
21011 ret
21012 CFI_ENDPROC
21013 ENDPROC(atomic64_inc_not_zero_cx8)
21014 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
21015 index 2af5df3..62b1a5a 100644
21016 --- a/arch/x86/lib/checksum_32.S
21017 +++ b/arch/x86/lib/checksum_32.S
21018 @@ -29,7 +29,8 @@
21019 #include <asm/dwarf2.h>
21020 #include <asm/errno.h>
21021 #include <asm/asm.h>
21022 -
21023 +#include <asm/segment.h>
21024 +
21025 /*
21026 * computes a partial checksum, e.g. for TCP/UDP fragments
21027 */
21028 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
21029
21030 #define ARGBASE 16
21031 #define FP 12
21032 -
21033 -ENTRY(csum_partial_copy_generic)
21034 +
21035 +ENTRY(csum_partial_copy_generic_to_user)
21036 CFI_STARTPROC
21037 +
21038 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21039 + pushl_cfi %gs
21040 + popl_cfi %es
21041 + jmp csum_partial_copy_generic
21042 +#endif
21043 +
21044 +ENTRY(csum_partial_copy_generic_from_user)
21045 +
21046 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21047 + pushl_cfi %gs
21048 + popl_cfi %ds
21049 +#endif
21050 +
21051 +ENTRY(csum_partial_copy_generic)
21052 subl $4,%esp
21053 CFI_ADJUST_CFA_OFFSET 4
21054 pushl_cfi %edi
21055 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
21056 jmp 4f
21057 SRC(1: movw (%esi), %bx )
21058 addl $2, %esi
21059 -DST( movw %bx, (%edi) )
21060 +DST( movw %bx, %es:(%edi) )
21061 addl $2, %edi
21062 addw %bx, %ax
21063 adcl $0, %eax
21064 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
21065 SRC(1: movl (%esi), %ebx )
21066 SRC( movl 4(%esi), %edx )
21067 adcl %ebx, %eax
21068 -DST( movl %ebx, (%edi) )
21069 +DST( movl %ebx, %es:(%edi) )
21070 adcl %edx, %eax
21071 -DST( movl %edx, 4(%edi) )
21072 +DST( movl %edx, %es:4(%edi) )
21073
21074 SRC( movl 8(%esi), %ebx )
21075 SRC( movl 12(%esi), %edx )
21076 adcl %ebx, %eax
21077 -DST( movl %ebx, 8(%edi) )
21078 +DST( movl %ebx, %es:8(%edi) )
21079 adcl %edx, %eax
21080 -DST( movl %edx, 12(%edi) )
21081 +DST( movl %edx, %es:12(%edi) )
21082
21083 SRC( movl 16(%esi), %ebx )
21084 SRC( movl 20(%esi), %edx )
21085 adcl %ebx, %eax
21086 -DST( movl %ebx, 16(%edi) )
21087 +DST( movl %ebx, %es:16(%edi) )
21088 adcl %edx, %eax
21089 -DST( movl %edx, 20(%edi) )
21090 +DST( movl %edx, %es:20(%edi) )
21091
21092 SRC( movl 24(%esi), %ebx )
21093 SRC( movl 28(%esi), %edx )
21094 adcl %ebx, %eax
21095 -DST( movl %ebx, 24(%edi) )
21096 +DST( movl %ebx, %es:24(%edi) )
21097 adcl %edx, %eax
21098 -DST( movl %edx, 28(%edi) )
21099 +DST( movl %edx, %es:28(%edi) )
21100
21101 lea 32(%esi), %esi
21102 lea 32(%edi), %edi
21103 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
21104 shrl $2, %edx # This clears CF
21105 SRC(3: movl (%esi), %ebx )
21106 adcl %ebx, %eax
21107 -DST( movl %ebx, (%edi) )
21108 +DST( movl %ebx, %es:(%edi) )
21109 lea 4(%esi), %esi
21110 lea 4(%edi), %edi
21111 dec %edx
21112 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
21113 jb 5f
21114 SRC( movw (%esi), %cx )
21115 leal 2(%esi), %esi
21116 -DST( movw %cx, (%edi) )
21117 +DST( movw %cx, %es:(%edi) )
21118 leal 2(%edi), %edi
21119 je 6f
21120 shll $16,%ecx
21121 SRC(5: movb (%esi), %cl )
21122 -DST( movb %cl, (%edi) )
21123 +DST( movb %cl, %es:(%edi) )
21124 6: addl %ecx, %eax
21125 adcl $0, %eax
21126 7:
21127 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
21128
21129 6001:
21130 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21131 - movl $-EFAULT, (%ebx)
21132 + movl $-EFAULT, %ss:(%ebx)
21133
21134 # zero the complete destination - computing the rest
21135 # is too much work
21136 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
21137
21138 6002:
21139 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21140 - movl $-EFAULT,(%ebx)
21141 + movl $-EFAULT,%ss:(%ebx)
21142 jmp 5000b
21143
21144 .previous
21145
21146 + pushl_cfi %ss
21147 + popl_cfi %ds
21148 + pushl_cfi %ss
21149 + popl_cfi %es
21150 popl_cfi %ebx
21151 CFI_RESTORE ebx
21152 popl_cfi %esi
21153 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
21154 popl_cfi %ecx # equivalent to addl $4,%esp
21155 ret
21156 CFI_ENDPROC
21157 -ENDPROC(csum_partial_copy_generic)
21158 +ENDPROC(csum_partial_copy_generic_to_user)
21159
21160 #else
21161
21162 /* Version for PentiumII/PPro */
21163
21164 #define ROUND1(x) \
21165 + nop; nop; nop; \
21166 SRC(movl x(%esi), %ebx ) ; \
21167 addl %ebx, %eax ; \
21168 - DST(movl %ebx, x(%edi) ) ;
21169 + DST(movl %ebx, %es:x(%edi)) ;
21170
21171 #define ROUND(x) \
21172 + nop; nop; nop; \
21173 SRC(movl x(%esi), %ebx ) ; \
21174 adcl %ebx, %eax ; \
21175 - DST(movl %ebx, x(%edi) ) ;
21176 + DST(movl %ebx, %es:x(%edi)) ;
21177
21178 #define ARGBASE 12
21179 -
21180 -ENTRY(csum_partial_copy_generic)
21181 +
21182 +ENTRY(csum_partial_copy_generic_to_user)
21183 CFI_STARTPROC
21184 +
21185 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21186 + pushl_cfi %gs
21187 + popl_cfi %es
21188 + jmp csum_partial_copy_generic
21189 +#endif
21190 +
21191 +ENTRY(csum_partial_copy_generic_from_user)
21192 +
21193 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21194 + pushl_cfi %gs
21195 + popl_cfi %ds
21196 +#endif
21197 +
21198 +ENTRY(csum_partial_copy_generic)
21199 pushl_cfi %ebx
21200 CFI_REL_OFFSET ebx, 0
21201 pushl_cfi %edi
21202 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
21203 subl %ebx, %edi
21204 lea -1(%esi),%edx
21205 andl $-32,%edx
21206 - lea 3f(%ebx,%ebx), %ebx
21207 + lea 3f(%ebx,%ebx,2), %ebx
21208 testl %esi, %esi
21209 jmp *%ebx
21210 1: addl $64,%esi
21211 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
21212 jb 5f
21213 SRC( movw (%esi), %dx )
21214 leal 2(%esi), %esi
21215 -DST( movw %dx, (%edi) )
21216 +DST( movw %dx, %es:(%edi) )
21217 leal 2(%edi), %edi
21218 je 6f
21219 shll $16,%edx
21220 5:
21221 SRC( movb (%esi), %dl )
21222 -DST( movb %dl, (%edi) )
21223 +DST( movb %dl, %es:(%edi) )
21224 6: addl %edx, %eax
21225 adcl $0, %eax
21226 7:
21227 .section .fixup, "ax"
21228 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21229 - movl $-EFAULT, (%ebx)
21230 + movl $-EFAULT, %ss:(%ebx)
21231 # zero the complete destination (computing the rest is too much work)
21232 movl ARGBASE+8(%esp),%edi # dst
21233 movl ARGBASE+12(%esp),%ecx # len
21234 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
21235 rep; stosb
21236 jmp 7b
21237 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21238 - movl $-EFAULT, (%ebx)
21239 + movl $-EFAULT, %ss:(%ebx)
21240 jmp 7b
21241 .previous
21242
21243 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21244 + pushl_cfi %ss
21245 + popl_cfi %ds
21246 + pushl_cfi %ss
21247 + popl_cfi %es
21248 +#endif
21249 +
21250 popl_cfi %esi
21251 CFI_RESTORE esi
21252 popl_cfi %edi
21253 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
21254 CFI_RESTORE ebx
21255 ret
21256 CFI_ENDPROC
21257 -ENDPROC(csum_partial_copy_generic)
21258 +ENDPROC(csum_partial_copy_generic_to_user)
21259
21260 #undef ROUND
21261 #undef ROUND1
21262 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21263 index f2145cf..cea889d 100644
21264 --- a/arch/x86/lib/clear_page_64.S
21265 +++ b/arch/x86/lib/clear_page_64.S
21266 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21267 movl $4096/8,%ecx
21268 xorl %eax,%eax
21269 rep stosq
21270 + pax_force_retaddr
21271 ret
21272 CFI_ENDPROC
21273 ENDPROC(clear_page_c)
21274 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21275 movl $4096,%ecx
21276 xorl %eax,%eax
21277 rep stosb
21278 + pax_force_retaddr
21279 ret
21280 CFI_ENDPROC
21281 ENDPROC(clear_page_c_e)
21282 @@ -43,6 +45,7 @@ ENTRY(clear_page)
21283 leaq 64(%rdi),%rdi
21284 jnz .Lloop
21285 nop
21286 + pax_force_retaddr
21287 ret
21288 CFI_ENDPROC
21289 .Lclear_page_end:
21290 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
21291
21292 #include <asm/cpufeature.h>
21293
21294 - .section .altinstr_replacement,"ax"
21295 + .section .altinstr_replacement,"a"
21296 1: .byte 0xeb /* jmp <disp8> */
21297 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21298 2: .byte 0xeb /* jmp <disp8> */
21299 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21300 index 1e572c5..2a162cd 100644
21301 --- a/arch/x86/lib/cmpxchg16b_emu.S
21302 +++ b/arch/x86/lib/cmpxchg16b_emu.S
21303 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21304
21305 popf
21306 mov $1, %al
21307 + pax_force_retaddr
21308 ret
21309
21310 not_same:
21311 popf
21312 xor %al,%al
21313 + pax_force_retaddr
21314 ret
21315
21316 CFI_ENDPROC
21317 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21318 index 6b34d04..dccb07f 100644
21319 --- a/arch/x86/lib/copy_page_64.S
21320 +++ b/arch/x86/lib/copy_page_64.S
21321 @@ -9,6 +9,7 @@ copy_page_c:
21322 CFI_STARTPROC
21323 movl $4096/8,%ecx
21324 rep movsq
21325 + pax_force_retaddr
21326 ret
21327 CFI_ENDPROC
21328 ENDPROC(copy_page_c)
21329 @@ -20,12 +21,14 @@ ENDPROC(copy_page_c)
21330
21331 ENTRY(copy_page)
21332 CFI_STARTPROC
21333 - subq $2*8,%rsp
21334 - CFI_ADJUST_CFA_OFFSET 2*8
21335 + subq $3*8,%rsp
21336 + CFI_ADJUST_CFA_OFFSET 3*8
21337 movq %rbx,(%rsp)
21338 CFI_REL_OFFSET rbx, 0
21339 movq %r12,1*8(%rsp)
21340 CFI_REL_OFFSET r12, 1*8
21341 + movq %r13,2*8(%rsp)
21342 + CFI_REL_OFFSET r13, 2*8
21343
21344 movl $(4096/64)-5,%ecx
21345 .p2align 4
21346 @@ -37,7 +40,7 @@ ENTRY(copy_page)
21347 movq 16 (%rsi), %rdx
21348 movq 24 (%rsi), %r8
21349 movq 32 (%rsi), %r9
21350 - movq 40 (%rsi), %r10
21351 + movq 40 (%rsi), %r13
21352 movq 48 (%rsi), %r11
21353 movq 56 (%rsi), %r12
21354
21355 @@ -48,7 +51,7 @@ ENTRY(copy_page)
21356 movq %rdx, 16 (%rdi)
21357 movq %r8, 24 (%rdi)
21358 movq %r9, 32 (%rdi)
21359 - movq %r10, 40 (%rdi)
21360 + movq %r13, 40 (%rdi)
21361 movq %r11, 48 (%rdi)
21362 movq %r12, 56 (%rdi)
21363
21364 @@ -67,7 +70,7 @@ ENTRY(copy_page)
21365 movq 16 (%rsi), %rdx
21366 movq 24 (%rsi), %r8
21367 movq 32 (%rsi), %r9
21368 - movq 40 (%rsi), %r10
21369 + movq 40 (%rsi), %r13
21370 movq 48 (%rsi), %r11
21371 movq 56 (%rsi), %r12
21372
21373 @@ -76,7 +79,7 @@ ENTRY(copy_page)
21374 movq %rdx, 16 (%rdi)
21375 movq %r8, 24 (%rdi)
21376 movq %r9, 32 (%rdi)
21377 - movq %r10, 40 (%rdi)
21378 + movq %r13, 40 (%rdi)
21379 movq %r11, 48 (%rdi)
21380 movq %r12, 56 (%rdi)
21381
21382 @@ -89,8 +92,11 @@ ENTRY(copy_page)
21383 CFI_RESTORE rbx
21384 movq 1*8(%rsp),%r12
21385 CFI_RESTORE r12
21386 - addq $2*8,%rsp
21387 - CFI_ADJUST_CFA_OFFSET -2*8
21388 + movq 2*8(%rsp),%r13
21389 + CFI_RESTORE r13
21390 + addq $3*8,%rsp
21391 + CFI_ADJUST_CFA_OFFSET -3*8
21392 + pax_force_retaddr
21393 ret
21394 .Lcopy_page_end:
21395 CFI_ENDPROC
21396 @@ -101,7 +107,7 @@ ENDPROC(copy_page)
21397
21398 #include <asm/cpufeature.h>
21399
21400 - .section .altinstr_replacement,"ax"
21401 + .section .altinstr_replacement,"a"
21402 1: .byte 0xeb /* jmp <disp8> */
21403 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21404 2:
21405 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21406 index 5b2995f..78e7644 100644
21407 --- a/arch/x86/lib/copy_user_64.S
21408 +++ b/arch/x86/lib/copy_user_64.S
21409 @@ -17,6 +17,7 @@
21410 #include <asm/cpufeature.h>
21411 #include <asm/alternative-asm.h>
21412 #include <asm/asm.h>
21413 +#include <asm/pgtable.h>
21414
21415 /*
21416 * By placing feature2 after feature1 in altinstructions section, we logically
21417 @@ -30,7 +31,7 @@
21418 .byte 0xe9 /* 32bit jump */
21419 .long \orig-1f /* by default jump to orig */
21420 1:
21421 - .section .altinstr_replacement,"ax"
21422 + .section .altinstr_replacement,"a"
21423 2: .byte 0xe9 /* near jump with 32bit immediate */
21424 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21425 3: .byte 0xe9 /* near jump with 32bit immediate */
21426 @@ -69,47 +70,20 @@
21427 #endif
21428 .endm
21429
21430 -/* Standard copy_to_user with segment limit checking */
21431 -ENTRY(_copy_to_user)
21432 - CFI_STARTPROC
21433 - GET_THREAD_INFO(%rax)
21434 - movq %rdi,%rcx
21435 - addq %rdx,%rcx
21436 - jc bad_to_user
21437 - cmpq TI_addr_limit(%rax),%rcx
21438 - ja bad_to_user
21439 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21440 - copy_user_generic_unrolled,copy_user_generic_string, \
21441 - copy_user_enhanced_fast_string
21442 - CFI_ENDPROC
21443 -ENDPROC(_copy_to_user)
21444 -
21445 -/* Standard copy_from_user with segment limit checking */
21446 -ENTRY(_copy_from_user)
21447 - CFI_STARTPROC
21448 - GET_THREAD_INFO(%rax)
21449 - movq %rsi,%rcx
21450 - addq %rdx,%rcx
21451 - jc bad_from_user
21452 - cmpq TI_addr_limit(%rax),%rcx
21453 - ja bad_from_user
21454 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21455 - copy_user_generic_unrolled,copy_user_generic_string, \
21456 - copy_user_enhanced_fast_string
21457 - CFI_ENDPROC
21458 -ENDPROC(_copy_from_user)
21459 -
21460 .section .fixup,"ax"
21461 /* must zero dest */
21462 ENTRY(bad_from_user)
21463 bad_from_user:
21464 CFI_STARTPROC
21465 + testl %edx,%edx
21466 + js bad_to_user
21467 movl %edx,%ecx
21468 xorl %eax,%eax
21469 rep
21470 stosb
21471 bad_to_user:
21472 movl %edx,%eax
21473 + pax_force_retaddr
21474 ret
21475 CFI_ENDPROC
21476 ENDPROC(bad_from_user)
21477 @@ -139,19 +113,19 @@ ENTRY(copy_user_generic_unrolled)
21478 jz 17f
21479 1: movq (%rsi),%r8
21480 2: movq 1*8(%rsi),%r9
21481 -3: movq 2*8(%rsi),%r10
21482 +3: movq 2*8(%rsi),%rax
21483 4: movq 3*8(%rsi),%r11
21484 5: movq %r8,(%rdi)
21485 6: movq %r9,1*8(%rdi)
21486 -7: movq %r10,2*8(%rdi)
21487 +7: movq %rax,2*8(%rdi)
21488 8: movq %r11,3*8(%rdi)
21489 9: movq 4*8(%rsi),%r8
21490 10: movq 5*8(%rsi),%r9
21491 -11: movq 6*8(%rsi),%r10
21492 +11: movq 6*8(%rsi),%rax
21493 12: movq 7*8(%rsi),%r11
21494 13: movq %r8,4*8(%rdi)
21495 14: movq %r9,5*8(%rdi)
21496 -15: movq %r10,6*8(%rdi)
21497 +15: movq %rax,6*8(%rdi)
21498 16: movq %r11,7*8(%rdi)
21499 leaq 64(%rsi),%rsi
21500 leaq 64(%rdi),%rdi
21501 @@ -177,6 +151,7 @@ ENTRY(copy_user_generic_unrolled)
21502 decl %ecx
21503 jnz 21b
21504 23: xor %eax,%eax
21505 + pax_force_retaddr
21506 ret
21507
21508 .section .fixup,"ax"
21509 @@ -246,6 +221,7 @@ ENTRY(copy_user_generic_string)
21510 3: rep
21511 movsb
21512 4: xorl %eax,%eax
21513 + pax_force_retaddr
21514 ret
21515
21516 .section .fixup,"ax"
21517 @@ -279,6 +255,7 @@ ENTRY(copy_user_enhanced_fast_string)
21518 1: rep
21519 movsb
21520 2: xorl %eax,%eax
21521 + pax_force_retaddr
21522 ret
21523
21524 .section .fixup,"ax"
21525 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21526 index cacddc7..09d49e4 100644
21527 --- a/arch/x86/lib/copy_user_nocache_64.S
21528 +++ b/arch/x86/lib/copy_user_nocache_64.S
21529 @@ -8,6 +8,7 @@
21530
21531 #include <linux/linkage.h>
21532 #include <asm/dwarf2.h>
21533 +#include <asm/alternative-asm.h>
21534
21535 #define FIX_ALIGNMENT 1
21536
21537 @@ -15,6 +16,7 @@
21538 #include <asm/asm-offsets.h>
21539 #include <asm/thread_info.h>
21540 #include <asm/asm.h>
21541 +#include <asm/pgtable.h>
21542
21543 .macro ALIGN_DESTINATION
21544 #ifdef FIX_ALIGNMENT
21545 @@ -48,6 +50,15 @@
21546 */
21547 ENTRY(__copy_user_nocache)
21548 CFI_STARTPROC
21549 +
21550 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21551 + mov $PAX_USER_SHADOW_BASE,%rcx
21552 + cmp %rcx,%rsi
21553 + jae 1f
21554 + add %rcx,%rsi
21555 +1:
21556 +#endif
21557 +
21558 cmpl $8,%edx
21559 jb 20f /* less then 8 bytes, go to byte copy loop */
21560 ALIGN_DESTINATION
21561 @@ -57,19 +68,19 @@ ENTRY(__copy_user_nocache)
21562 jz 17f
21563 1: movq (%rsi),%r8
21564 2: movq 1*8(%rsi),%r9
21565 -3: movq 2*8(%rsi),%r10
21566 +3: movq 2*8(%rsi),%rax
21567 4: movq 3*8(%rsi),%r11
21568 5: movnti %r8,(%rdi)
21569 6: movnti %r9,1*8(%rdi)
21570 -7: movnti %r10,2*8(%rdi)
21571 +7: movnti %rax,2*8(%rdi)
21572 8: movnti %r11,3*8(%rdi)
21573 9: movq 4*8(%rsi),%r8
21574 10: movq 5*8(%rsi),%r9
21575 -11: movq 6*8(%rsi),%r10
21576 +11: movq 6*8(%rsi),%rax
21577 12: movq 7*8(%rsi),%r11
21578 13: movnti %r8,4*8(%rdi)
21579 14: movnti %r9,5*8(%rdi)
21580 -15: movnti %r10,6*8(%rdi)
21581 +15: movnti %rax,6*8(%rdi)
21582 16: movnti %r11,7*8(%rdi)
21583 leaq 64(%rsi),%rsi
21584 leaq 64(%rdi),%rdi
21585 @@ -96,6 +107,7 @@ ENTRY(__copy_user_nocache)
21586 jnz 21b
21587 23: xorl %eax,%eax
21588 sfence
21589 + pax_force_retaddr
21590 ret
21591
21592 .section .fixup,"ax"
21593 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21594 index 2419d5f..953ee51 100644
21595 --- a/arch/x86/lib/csum-copy_64.S
21596 +++ b/arch/x86/lib/csum-copy_64.S
21597 @@ -9,6 +9,7 @@
21598 #include <asm/dwarf2.h>
21599 #include <asm/errno.h>
21600 #include <asm/asm.h>
21601 +#include <asm/alternative-asm.h>
21602
21603 /*
21604 * Checksum copy with exception handling.
21605 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
21606 CFI_RESTORE rbp
21607 addq $7*8, %rsp
21608 CFI_ADJUST_CFA_OFFSET -7*8
21609 + pax_force_retaddr 0, 1
21610 ret
21611 CFI_RESTORE_STATE
21612
21613 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21614 index 25b7ae8..3b52ccd 100644
21615 --- a/arch/x86/lib/csum-wrappers_64.c
21616 +++ b/arch/x86/lib/csum-wrappers_64.c
21617 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21618 len -= 2;
21619 }
21620 }
21621 - isum = csum_partial_copy_generic((__force const void *)src,
21622 +
21623 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21624 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21625 + src += PAX_USER_SHADOW_BASE;
21626 +#endif
21627 +
21628 + isum = csum_partial_copy_generic((const void __force_kernel *)src,
21629 dst, len, isum, errp, NULL);
21630 if (unlikely(*errp))
21631 goto out_err;
21632 @@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21633 }
21634
21635 *errp = 0;
21636 - return csum_partial_copy_generic(src, (void __force *)dst,
21637 +
21638 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21639 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21640 + dst += PAX_USER_SHADOW_BASE;
21641 +#endif
21642 +
21643 + return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21644 len, isum, NULL, errp);
21645 }
21646 EXPORT_SYMBOL(csum_partial_copy_to_user);
21647 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21648 index b33b1fb..219f389 100644
21649 --- a/arch/x86/lib/getuser.S
21650 +++ b/arch/x86/lib/getuser.S
21651 @@ -33,15 +33,38 @@
21652 #include <asm/asm-offsets.h>
21653 #include <asm/thread_info.h>
21654 #include <asm/asm.h>
21655 +#include <asm/segment.h>
21656 +#include <asm/pgtable.h>
21657 +#include <asm/alternative-asm.h>
21658 +
21659 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21660 +#define __copyuser_seg gs;
21661 +#else
21662 +#define __copyuser_seg
21663 +#endif
21664
21665 .text
21666 ENTRY(__get_user_1)
21667 CFI_STARTPROC
21668 +
21669 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21670 GET_THREAD_INFO(%_ASM_DX)
21671 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21672 jae bad_get_user
21673 -1: movzb (%_ASM_AX),%edx
21674 +
21675 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21676 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21677 + cmp %_ASM_DX,%_ASM_AX
21678 + jae 1234f
21679 + add %_ASM_DX,%_ASM_AX
21680 +1234:
21681 +#endif
21682 +
21683 +#endif
21684 +
21685 +1: __copyuser_seg movzb (%_ASM_AX),%edx
21686 xor %eax,%eax
21687 + pax_force_retaddr
21688 ret
21689 CFI_ENDPROC
21690 ENDPROC(__get_user_1)
21691 @@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21692 ENTRY(__get_user_2)
21693 CFI_STARTPROC
21694 add $1,%_ASM_AX
21695 +
21696 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21697 jc bad_get_user
21698 GET_THREAD_INFO(%_ASM_DX)
21699 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21700 jae bad_get_user
21701 -2: movzwl -1(%_ASM_AX),%edx
21702 +
21703 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21704 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21705 + cmp %_ASM_DX,%_ASM_AX
21706 + jae 1234f
21707 + add %_ASM_DX,%_ASM_AX
21708 +1234:
21709 +#endif
21710 +
21711 +#endif
21712 +
21713 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21714 xor %eax,%eax
21715 + pax_force_retaddr
21716 ret
21717 CFI_ENDPROC
21718 ENDPROC(__get_user_2)
21719 @@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21720 ENTRY(__get_user_4)
21721 CFI_STARTPROC
21722 add $3,%_ASM_AX
21723 +
21724 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21725 jc bad_get_user
21726 GET_THREAD_INFO(%_ASM_DX)
21727 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21728 jae bad_get_user
21729 -3: mov -3(%_ASM_AX),%edx
21730 +
21731 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21732 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21733 + cmp %_ASM_DX,%_ASM_AX
21734 + jae 1234f
21735 + add %_ASM_DX,%_ASM_AX
21736 +1234:
21737 +#endif
21738 +
21739 +#endif
21740 +
21741 +3: __copyuser_seg mov -3(%_ASM_AX),%edx
21742 xor %eax,%eax
21743 + pax_force_retaddr
21744 ret
21745 CFI_ENDPROC
21746 ENDPROC(__get_user_4)
21747 @@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21748 GET_THREAD_INFO(%_ASM_DX)
21749 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21750 jae bad_get_user
21751 +
21752 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21753 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21754 + cmp %_ASM_DX,%_ASM_AX
21755 + jae 1234f
21756 + add %_ASM_DX,%_ASM_AX
21757 +1234:
21758 +#endif
21759 +
21760 4: movq -7(%_ASM_AX),%_ASM_DX
21761 xor %eax,%eax
21762 + pax_force_retaddr
21763 ret
21764 CFI_ENDPROC
21765 ENDPROC(__get_user_8)
21766 @@ -91,6 +152,7 @@ bad_get_user:
21767 CFI_STARTPROC
21768 xor %edx,%edx
21769 mov $(-EFAULT),%_ASM_AX
21770 + pax_force_retaddr
21771 ret
21772 CFI_ENDPROC
21773 END(bad_get_user)
21774 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
21775 index b1e6c4b..21ae8fc 100644
21776 --- a/arch/x86/lib/insn.c
21777 +++ b/arch/x86/lib/insn.c
21778 @@ -21,6 +21,11 @@
21779 #include <linux/string.h>
21780 #include <asm/inat.h>
21781 #include <asm/insn.h>
21782 +#ifdef __KERNEL__
21783 +#include <asm/pgtable_types.h>
21784 +#else
21785 +#define ktla_ktva(addr) addr
21786 +#endif
21787
21788 /* Verify next sizeof(t) bytes can be on the same instruction */
21789 #define validate_next(t, insn, n) \
21790 @@ -49,8 +54,8 @@
21791 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
21792 {
21793 memset(insn, 0, sizeof(*insn));
21794 - insn->kaddr = kaddr;
21795 - insn->next_byte = kaddr;
21796 + insn->kaddr = ktla_ktva(kaddr);
21797 + insn->next_byte = ktla_ktva(kaddr);
21798 insn->x86_64 = x86_64 ? 1 : 0;
21799 insn->opnd_bytes = 4;
21800 if (x86_64)
21801 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
21802 index 05a95e7..326f2fa 100644
21803 --- a/arch/x86/lib/iomap_copy_64.S
21804 +++ b/arch/x86/lib/iomap_copy_64.S
21805 @@ -17,6 +17,7 @@
21806
21807 #include <linux/linkage.h>
21808 #include <asm/dwarf2.h>
21809 +#include <asm/alternative-asm.h>
21810
21811 /*
21812 * override generic version in lib/iomap_copy.c
21813 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
21814 CFI_STARTPROC
21815 movl %edx,%ecx
21816 rep movsd
21817 + pax_force_retaddr
21818 ret
21819 CFI_ENDPROC
21820 ENDPROC(__iowrite32_copy)
21821 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
21822 index 1c273be..da9cc0e 100644
21823 --- a/arch/x86/lib/memcpy_64.S
21824 +++ b/arch/x86/lib/memcpy_64.S
21825 @@ -33,6 +33,7 @@
21826 rep movsq
21827 movl %edx, %ecx
21828 rep movsb
21829 + pax_force_retaddr
21830 ret
21831 .Lmemcpy_e:
21832 .previous
21833 @@ -49,6 +50,7 @@
21834 movq %rdi, %rax
21835 movq %rdx, %rcx
21836 rep movsb
21837 + pax_force_retaddr
21838 ret
21839 .Lmemcpy_e_e:
21840 .previous
21841 @@ -76,13 +78,13 @@ ENTRY(memcpy)
21842 */
21843 movq 0*8(%rsi), %r8
21844 movq 1*8(%rsi), %r9
21845 - movq 2*8(%rsi), %r10
21846 + movq 2*8(%rsi), %rcx
21847 movq 3*8(%rsi), %r11
21848 leaq 4*8(%rsi), %rsi
21849
21850 movq %r8, 0*8(%rdi)
21851 movq %r9, 1*8(%rdi)
21852 - movq %r10, 2*8(%rdi)
21853 + movq %rcx, 2*8(%rdi)
21854 movq %r11, 3*8(%rdi)
21855 leaq 4*8(%rdi), %rdi
21856 jae .Lcopy_forward_loop
21857 @@ -105,12 +107,12 @@ ENTRY(memcpy)
21858 subq $0x20, %rdx
21859 movq -1*8(%rsi), %r8
21860 movq -2*8(%rsi), %r9
21861 - movq -3*8(%rsi), %r10
21862 + movq -3*8(%rsi), %rcx
21863 movq -4*8(%rsi), %r11
21864 leaq -4*8(%rsi), %rsi
21865 movq %r8, -1*8(%rdi)
21866 movq %r9, -2*8(%rdi)
21867 - movq %r10, -3*8(%rdi)
21868 + movq %rcx, -3*8(%rdi)
21869 movq %r11, -4*8(%rdi)
21870 leaq -4*8(%rdi), %rdi
21871 jae .Lcopy_backward_loop
21872 @@ -130,12 +132,13 @@ ENTRY(memcpy)
21873 */
21874 movq 0*8(%rsi), %r8
21875 movq 1*8(%rsi), %r9
21876 - movq -2*8(%rsi, %rdx), %r10
21877 + movq -2*8(%rsi, %rdx), %rcx
21878 movq -1*8(%rsi, %rdx), %r11
21879 movq %r8, 0*8(%rdi)
21880 movq %r9, 1*8(%rdi)
21881 - movq %r10, -2*8(%rdi, %rdx)
21882 + movq %rcx, -2*8(%rdi, %rdx)
21883 movq %r11, -1*8(%rdi, %rdx)
21884 + pax_force_retaddr
21885 retq
21886 .p2align 4
21887 .Lless_16bytes:
21888 @@ -148,6 +151,7 @@ ENTRY(memcpy)
21889 movq -1*8(%rsi, %rdx), %r9
21890 movq %r8, 0*8(%rdi)
21891 movq %r9, -1*8(%rdi, %rdx)
21892 + pax_force_retaddr
21893 retq
21894 .p2align 4
21895 .Lless_8bytes:
21896 @@ -161,6 +165,7 @@ ENTRY(memcpy)
21897 movl -4(%rsi, %rdx), %r8d
21898 movl %ecx, (%rdi)
21899 movl %r8d, -4(%rdi, %rdx)
21900 + pax_force_retaddr
21901 retq
21902 .p2align 4
21903 .Lless_3bytes:
21904 @@ -179,6 +184,7 @@ ENTRY(memcpy)
21905 movb %cl, (%rdi)
21906
21907 .Lend:
21908 + pax_force_retaddr
21909 retq
21910 CFI_ENDPROC
21911 ENDPROC(memcpy)
21912 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
21913 index ee16461..c39c199 100644
21914 --- a/arch/x86/lib/memmove_64.S
21915 +++ b/arch/x86/lib/memmove_64.S
21916 @@ -61,13 +61,13 @@ ENTRY(memmove)
21917 5:
21918 sub $0x20, %rdx
21919 movq 0*8(%rsi), %r11
21920 - movq 1*8(%rsi), %r10
21921 + movq 1*8(%rsi), %rcx
21922 movq 2*8(%rsi), %r9
21923 movq 3*8(%rsi), %r8
21924 leaq 4*8(%rsi), %rsi
21925
21926 movq %r11, 0*8(%rdi)
21927 - movq %r10, 1*8(%rdi)
21928 + movq %rcx, 1*8(%rdi)
21929 movq %r9, 2*8(%rdi)
21930 movq %r8, 3*8(%rdi)
21931 leaq 4*8(%rdi), %rdi
21932 @@ -81,10 +81,10 @@ ENTRY(memmove)
21933 4:
21934 movq %rdx, %rcx
21935 movq -8(%rsi, %rdx), %r11
21936 - lea -8(%rdi, %rdx), %r10
21937 + lea -8(%rdi, %rdx), %r9
21938 shrq $3, %rcx
21939 rep movsq
21940 - movq %r11, (%r10)
21941 + movq %r11, (%r9)
21942 jmp 13f
21943 .Lmemmove_end_forward:
21944
21945 @@ -95,14 +95,14 @@ ENTRY(memmove)
21946 7:
21947 movq %rdx, %rcx
21948 movq (%rsi), %r11
21949 - movq %rdi, %r10
21950 + movq %rdi, %r9
21951 leaq -8(%rsi, %rdx), %rsi
21952 leaq -8(%rdi, %rdx), %rdi
21953 shrq $3, %rcx
21954 std
21955 rep movsq
21956 cld
21957 - movq %r11, (%r10)
21958 + movq %r11, (%r9)
21959 jmp 13f
21960
21961 /*
21962 @@ -127,13 +127,13 @@ ENTRY(memmove)
21963 8:
21964 subq $0x20, %rdx
21965 movq -1*8(%rsi), %r11
21966 - movq -2*8(%rsi), %r10
21967 + movq -2*8(%rsi), %rcx
21968 movq -3*8(%rsi), %r9
21969 movq -4*8(%rsi), %r8
21970 leaq -4*8(%rsi), %rsi
21971
21972 movq %r11, -1*8(%rdi)
21973 - movq %r10, -2*8(%rdi)
21974 + movq %rcx, -2*8(%rdi)
21975 movq %r9, -3*8(%rdi)
21976 movq %r8, -4*8(%rdi)
21977 leaq -4*8(%rdi), %rdi
21978 @@ -151,11 +151,11 @@ ENTRY(memmove)
21979 * Move data from 16 bytes to 31 bytes.
21980 */
21981 movq 0*8(%rsi), %r11
21982 - movq 1*8(%rsi), %r10
21983 + movq 1*8(%rsi), %rcx
21984 movq -2*8(%rsi, %rdx), %r9
21985 movq -1*8(%rsi, %rdx), %r8
21986 movq %r11, 0*8(%rdi)
21987 - movq %r10, 1*8(%rdi)
21988 + movq %rcx, 1*8(%rdi)
21989 movq %r9, -2*8(%rdi, %rdx)
21990 movq %r8, -1*8(%rdi, %rdx)
21991 jmp 13f
21992 @@ -167,9 +167,9 @@ ENTRY(memmove)
21993 * Move data from 8 bytes to 15 bytes.
21994 */
21995 movq 0*8(%rsi), %r11
21996 - movq -1*8(%rsi, %rdx), %r10
21997 + movq -1*8(%rsi, %rdx), %r9
21998 movq %r11, 0*8(%rdi)
21999 - movq %r10, -1*8(%rdi, %rdx)
22000 + movq %r9, -1*8(%rdi, %rdx)
22001 jmp 13f
22002 10:
22003 cmpq $4, %rdx
22004 @@ -178,9 +178,9 @@ ENTRY(memmove)
22005 * Move data from 4 bytes to 7 bytes.
22006 */
22007 movl (%rsi), %r11d
22008 - movl -4(%rsi, %rdx), %r10d
22009 + movl -4(%rsi, %rdx), %r9d
22010 movl %r11d, (%rdi)
22011 - movl %r10d, -4(%rdi, %rdx)
22012 + movl %r9d, -4(%rdi, %rdx)
22013 jmp 13f
22014 11:
22015 cmp $2, %rdx
22016 @@ -189,9 +189,9 @@ ENTRY(memmove)
22017 * Move data from 2 bytes to 3 bytes.
22018 */
22019 movw (%rsi), %r11w
22020 - movw -2(%rsi, %rdx), %r10w
22021 + movw -2(%rsi, %rdx), %r9w
22022 movw %r11w, (%rdi)
22023 - movw %r10w, -2(%rdi, %rdx)
22024 + movw %r9w, -2(%rdi, %rdx)
22025 jmp 13f
22026 12:
22027 cmp $1, %rdx
22028 @@ -202,6 +202,7 @@ ENTRY(memmove)
22029 movb (%rsi), %r11b
22030 movb %r11b, (%rdi)
22031 13:
22032 + pax_force_retaddr
22033 retq
22034 CFI_ENDPROC
22035
22036 @@ -210,6 +211,7 @@ ENTRY(memmove)
22037 /* Forward moving data. */
22038 movq %rdx, %rcx
22039 rep movsb
22040 + pax_force_retaddr
22041 retq
22042 .Lmemmove_end_forward_efs:
22043 .previous
22044 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
22045 index 2dcb380..963660a 100644
22046 --- a/arch/x86/lib/memset_64.S
22047 +++ b/arch/x86/lib/memset_64.S
22048 @@ -30,6 +30,7 @@
22049 movl %edx,%ecx
22050 rep stosb
22051 movq %r9,%rax
22052 + pax_force_retaddr
22053 ret
22054 .Lmemset_e:
22055 .previous
22056 @@ -52,6 +53,7 @@
22057 movq %rdx,%rcx
22058 rep stosb
22059 movq %r9,%rax
22060 + pax_force_retaddr
22061 ret
22062 .Lmemset_e_e:
22063 .previous
22064 @@ -59,7 +61,7 @@
22065 ENTRY(memset)
22066 ENTRY(__memset)
22067 CFI_STARTPROC
22068 - movq %rdi,%r10
22069 + movq %rdi,%r11
22070
22071 /* expand byte value */
22072 movzbl %sil,%ecx
22073 @@ -117,7 +119,8 @@ ENTRY(__memset)
22074 jnz .Lloop_1
22075
22076 .Lende:
22077 - movq %r10,%rax
22078 + movq %r11,%rax
22079 + pax_force_retaddr
22080 ret
22081
22082 CFI_RESTORE_STATE
22083 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
22084 index c9f2d9b..e7fd2c0 100644
22085 --- a/arch/x86/lib/mmx_32.c
22086 +++ b/arch/x86/lib/mmx_32.c
22087 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22088 {
22089 void *p;
22090 int i;
22091 + unsigned long cr0;
22092
22093 if (unlikely(in_interrupt()))
22094 return __memcpy(to, from, len);
22095 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22096 kernel_fpu_begin();
22097
22098 __asm__ __volatile__ (
22099 - "1: prefetch (%0)\n" /* This set is 28 bytes */
22100 - " prefetch 64(%0)\n"
22101 - " prefetch 128(%0)\n"
22102 - " prefetch 192(%0)\n"
22103 - " prefetch 256(%0)\n"
22104 + "1: prefetch (%1)\n" /* This set is 28 bytes */
22105 + " prefetch 64(%1)\n"
22106 + " prefetch 128(%1)\n"
22107 + " prefetch 192(%1)\n"
22108 + " prefetch 256(%1)\n"
22109 "2: \n"
22110 ".section .fixup, \"ax\"\n"
22111 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22112 + "3: \n"
22113 +
22114 +#ifdef CONFIG_PAX_KERNEXEC
22115 + " movl %%cr0, %0\n"
22116 + " movl %0, %%eax\n"
22117 + " andl $0xFFFEFFFF, %%eax\n"
22118 + " movl %%eax, %%cr0\n"
22119 +#endif
22120 +
22121 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22122 +
22123 +#ifdef CONFIG_PAX_KERNEXEC
22124 + " movl %0, %%cr0\n"
22125 +#endif
22126 +
22127 " jmp 2b\n"
22128 ".previous\n"
22129 _ASM_EXTABLE(1b, 3b)
22130 - : : "r" (from));
22131 + : "=&r" (cr0) : "r" (from) : "ax");
22132
22133 for ( ; i > 5; i--) {
22134 __asm__ __volatile__ (
22135 - "1: prefetch 320(%0)\n"
22136 - "2: movq (%0), %%mm0\n"
22137 - " movq 8(%0), %%mm1\n"
22138 - " movq 16(%0), %%mm2\n"
22139 - " movq 24(%0), %%mm3\n"
22140 - " movq %%mm0, (%1)\n"
22141 - " movq %%mm1, 8(%1)\n"
22142 - " movq %%mm2, 16(%1)\n"
22143 - " movq %%mm3, 24(%1)\n"
22144 - " movq 32(%0), %%mm0\n"
22145 - " movq 40(%0), %%mm1\n"
22146 - " movq 48(%0), %%mm2\n"
22147 - " movq 56(%0), %%mm3\n"
22148 - " movq %%mm0, 32(%1)\n"
22149 - " movq %%mm1, 40(%1)\n"
22150 - " movq %%mm2, 48(%1)\n"
22151 - " movq %%mm3, 56(%1)\n"
22152 + "1: prefetch 320(%1)\n"
22153 + "2: movq (%1), %%mm0\n"
22154 + " movq 8(%1), %%mm1\n"
22155 + " movq 16(%1), %%mm2\n"
22156 + " movq 24(%1), %%mm3\n"
22157 + " movq %%mm0, (%2)\n"
22158 + " movq %%mm1, 8(%2)\n"
22159 + " movq %%mm2, 16(%2)\n"
22160 + " movq %%mm3, 24(%2)\n"
22161 + " movq 32(%1), %%mm0\n"
22162 + " movq 40(%1), %%mm1\n"
22163 + " movq 48(%1), %%mm2\n"
22164 + " movq 56(%1), %%mm3\n"
22165 + " movq %%mm0, 32(%2)\n"
22166 + " movq %%mm1, 40(%2)\n"
22167 + " movq %%mm2, 48(%2)\n"
22168 + " movq %%mm3, 56(%2)\n"
22169 ".section .fixup, \"ax\"\n"
22170 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22171 + "3:\n"
22172 +
22173 +#ifdef CONFIG_PAX_KERNEXEC
22174 + " movl %%cr0, %0\n"
22175 + " movl %0, %%eax\n"
22176 + " andl $0xFFFEFFFF, %%eax\n"
22177 + " movl %%eax, %%cr0\n"
22178 +#endif
22179 +
22180 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22181 +
22182 +#ifdef CONFIG_PAX_KERNEXEC
22183 + " movl %0, %%cr0\n"
22184 +#endif
22185 +
22186 " jmp 2b\n"
22187 ".previous\n"
22188 _ASM_EXTABLE(1b, 3b)
22189 - : : "r" (from), "r" (to) : "memory");
22190 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22191
22192 from += 64;
22193 to += 64;
22194 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22195 static void fast_copy_page(void *to, void *from)
22196 {
22197 int i;
22198 + unsigned long cr0;
22199
22200 kernel_fpu_begin();
22201
22202 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22203 * but that is for later. -AV
22204 */
22205 __asm__ __volatile__(
22206 - "1: prefetch (%0)\n"
22207 - " prefetch 64(%0)\n"
22208 - " prefetch 128(%0)\n"
22209 - " prefetch 192(%0)\n"
22210 - " prefetch 256(%0)\n"
22211 + "1: prefetch (%1)\n"
22212 + " prefetch 64(%1)\n"
22213 + " prefetch 128(%1)\n"
22214 + " prefetch 192(%1)\n"
22215 + " prefetch 256(%1)\n"
22216 "2: \n"
22217 ".section .fixup, \"ax\"\n"
22218 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22219 + "3: \n"
22220 +
22221 +#ifdef CONFIG_PAX_KERNEXEC
22222 + " movl %%cr0, %0\n"
22223 + " movl %0, %%eax\n"
22224 + " andl $0xFFFEFFFF, %%eax\n"
22225 + " movl %%eax, %%cr0\n"
22226 +#endif
22227 +
22228 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22229 +
22230 +#ifdef CONFIG_PAX_KERNEXEC
22231 + " movl %0, %%cr0\n"
22232 +#endif
22233 +
22234 " jmp 2b\n"
22235 ".previous\n"
22236 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
22237 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22238
22239 for (i = 0; i < (4096-320)/64; i++) {
22240 __asm__ __volatile__ (
22241 - "1: prefetch 320(%0)\n"
22242 - "2: movq (%0), %%mm0\n"
22243 - " movntq %%mm0, (%1)\n"
22244 - " movq 8(%0), %%mm1\n"
22245 - " movntq %%mm1, 8(%1)\n"
22246 - " movq 16(%0), %%mm2\n"
22247 - " movntq %%mm2, 16(%1)\n"
22248 - " movq 24(%0), %%mm3\n"
22249 - " movntq %%mm3, 24(%1)\n"
22250 - " movq 32(%0), %%mm4\n"
22251 - " movntq %%mm4, 32(%1)\n"
22252 - " movq 40(%0), %%mm5\n"
22253 - " movntq %%mm5, 40(%1)\n"
22254 - " movq 48(%0), %%mm6\n"
22255 - " movntq %%mm6, 48(%1)\n"
22256 - " movq 56(%0), %%mm7\n"
22257 - " movntq %%mm7, 56(%1)\n"
22258 + "1: prefetch 320(%1)\n"
22259 + "2: movq (%1), %%mm0\n"
22260 + " movntq %%mm0, (%2)\n"
22261 + " movq 8(%1), %%mm1\n"
22262 + " movntq %%mm1, 8(%2)\n"
22263 + " movq 16(%1), %%mm2\n"
22264 + " movntq %%mm2, 16(%2)\n"
22265 + " movq 24(%1), %%mm3\n"
22266 + " movntq %%mm3, 24(%2)\n"
22267 + " movq 32(%1), %%mm4\n"
22268 + " movntq %%mm4, 32(%2)\n"
22269 + " movq 40(%1), %%mm5\n"
22270 + " movntq %%mm5, 40(%2)\n"
22271 + " movq 48(%1), %%mm6\n"
22272 + " movntq %%mm6, 48(%2)\n"
22273 + " movq 56(%1), %%mm7\n"
22274 + " movntq %%mm7, 56(%2)\n"
22275 ".section .fixup, \"ax\"\n"
22276 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22277 + "3:\n"
22278 +
22279 +#ifdef CONFIG_PAX_KERNEXEC
22280 + " movl %%cr0, %0\n"
22281 + " movl %0, %%eax\n"
22282 + " andl $0xFFFEFFFF, %%eax\n"
22283 + " movl %%eax, %%cr0\n"
22284 +#endif
22285 +
22286 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22287 +
22288 +#ifdef CONFIG_PAX_KERNEXEC
22289 + " movl %0, %%cr0\n"
22290 +#endif
22291 +
22292 " jmp 2b\n"
22293 ".previous\n"
22294 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22295 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22296
22297 from += 64;
22298 to += 64;
22299 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22300 static void fast_copy_page(void *to, void *from)
22301 {
22302 int i;
22303 + unsigned long cr0;
22304
22305 kernel_fpu_begin();
22306
22307 __asm__ __volatile__ (
22308 - "1: prefetch (%0)\n"
22309 - " prefetch 64(%0)\n"
22310 - " prefetch 128(%0)\n"
22311 - " prefetch 192(%0)\n"
22312 - " prefetch 256(%0)\n"
22313 + "1: prefetch (%1)\n"
22314 + " prefetch 64(%1)\n"
22315 + " prefetch 128(%1)\n"
22316 + " prefetch 192(%1)\n"
22317 + " prefetch 256(%1)\n"
22318 "2: \n"
22319 ".section .fixup, \"ax\"\n"
22320 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22321 + "3: \n"
22322 +
22323 +#ifdef CONFIG_PAX_KERNEXEC
22324 + " movl %%cr0, %0\n"
22325 + " movl %0, %%eax\n"
22326 + " andl $0xFFFEFFFF, %%eax\n"
22327 + " movl %%eax, %%cr0\n"
22328 +#endif
22329 +
22330 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22331 +
22332 +#ifdef CONFIG_PAX_KERNEXEC
22333 + " movl %0, %%cr0\n"
22334 +#endif
22335 +
22336 " jmp 2b\n"
22337 ".previous\n"
22338 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
22339 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22340
22341 for (i = 0; i < 4096/64; i++) {
22342 __asm__ __volatile__ (
22343 - "1: prefetch 320(%0)\n"
22344 - "2: movq (%0), %%mm0\n"
22345 - " movq 8(%0), %%mm1\n"
22346 - " movq 16(%0), %%mm2\n"
22347 - " movq 24(%0), %%mm3\n"
22348 - " movq %%mm0, (%1)\n"
22349 - " movq %%mm1, 8(%1)\n"
22350 - " movq %%mm2, 16(%1)\n"
22351 - " movq %%mm3, 24(%1)\n"
22352 - " movq 32(%0), %%mm0\n"
22353 - " movq 40(%0), %%mm1\n"
22354 - " movq 48(%0), %%mm2\n"
22355 - " movq 56(%0), %%mm3\n"
22356 - " movq %%mm0, 32(%1)\n"
22357 - " movq %%mm1, 40(%1)\n"
22358 - " movq %%mm2, 48(%1)\n"
22359 - " movq %%mm3, 56(%1)\n"
22360 + "1: prefetch 320(%1)\n"
22361 + "2: movq (%1), %%mm0\n"
22362 + " movq 8(%1), %%mm1\n"
22363 + " movq 16(%1), %%mm2\n"
22364 + " movq 24(%1), %%mm3\n"
22365 + " movq %%mm0, (%2)\n"
22366 + " movq %%mm1, 8(%2)\n"
22367 + " movq %%mm2, 16(%2)\n"
22368 + " movq %%mm3, 24(%2)\n"
22369 + " movq 32(%1), %%mm0\n"
22370 + " movq 40(%1), %%mm1\n"
22371 + " movq 48(%1), %%mm2\n"
22372 + " movq 56(%1), %%mm3\n"
22373 + " movq %%mm0, 32(%2)\n"
22374 + " movq %%mm1, 40(%2)\n"
22375 + " movq %%mm2, 48(%2)\n"
22376 + " movq %%mm3, 56(%2)\n"
22377 ".section .fixup, \"ax\"\n"
22378 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22379 + "3:\n"
22380 +
22381 +#ifdef CONFIG_PAX_KERNEXEC
22382 + " movl %%cr0, %0\n"
22383 + " movl %0, %%eax\n"
22384 + " andl $0xFFFEFFFF, %%eax\n"
22385 + " movl %%eax, %%cr0\n"
22386 +#endif
22387 +
22388 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22389 +
22390 +#ifdef CONFIG_PAX_KERNEXEC
22391 + " movl %0, %%cr0\n"
22392 +#endif
22393 +
22394 " jmp 2b\n"
22395 ".previous\n"
22396 _ASM_EXTABLE(1b, 3b)
22397 - : : "r" (from), "r" (to) : "memory");
22398 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22399
22400 from += 64;
22401 to += 64;
22402 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22403 index 69fa106..adda88b 100644
22404 --- a/arch/x86/lib/msr-reg.S
22405 +++ b/arch/x86/lib/msr-reg.S
22406 @@ -3,6 +3,7 @@
22407 #include <asm/dwarf2.h>
22408 #include <asm/asm.h>
22409 #include <asm/msr.h>
22410 +#include <asm/alternative-asm.h>
22411
22412 #ifdef CONFIG_X86_64
22413 /*
22414 @@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22415 CFI_STARTPROC
22416 pushq_cfi %rbx
22417 pushq_cfi %rbp
22418 - movq %rdi, %r10 /* Save pointer */
22419 + movq %rdi, %r9 /* Save pointer */
22420 xorl %r11d, %r11d /* Return value */
22421 movl (%rdi), %eax
22422 movl 4(%rdi), %ecx
22423 @@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22424 movl 28(%rdi), %edi
22425 CFI_REMEMBER_STATE
22426 1: \op
22427 -2: movl %eax, (%r10)
22428 +2: movl %eax, (%r9)
22429 movl %r11d, %eax /* Return value */
22430 - movl %ecx, 4(%r10)
22431 - movl %edx, 8(%r10)
22432 - movl %ebx, 12(%r10)
22433 - movl %ebp, 20(%r10)
22434 - movl %esi, 24(%r10)
22435 - movl %edi, 28(%r10)
22436 + movl %ecx, 4(%r9)
22437 + movl %edx, 8(%r9)
22438 + movl %ebx, 12(%r9)
22439 + movl %ebp, 20(%r9)
22440 + movl %esi, 24(%r9)
22441 + movl %edi, 28(%r9)
22442 popq_cfi %rbp
22443 popq_cfi %rbx
22444 + pax_force_retaddr
22445 ret
22446 3:
22447 CFI_RESTORE_STATE
22448 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22449 index 7f951c8..ebd573a 100644
22450 --- a/arch/x86/lib/putuser.S
22451 +++ b/arch/x86/lib/putuser.S
22452 @@ -15,7 +15,9 @@
22453 #include <asm/thread_info.h>
22454 #include <asm/errno.h>
22455 #include <asm/asm.h>
22456 -
22457 +#include <asm/segment.h>
22458 +#include <asm/pgtable.h>
22459 +#include <asm/alternative-asm.h>
22460
22461 /*
22462 * __put_user_X
22463 @@ -29,52 +31,119 @@
22464 * as they get called from within inline assembly.
22465 */
22466
22467 -#define ENTER CFI_STARTPROC ; \
22468 - GET_THREAD_INFO(%_ASM_BX)
22469 -#define EXIT ret ; \
22470 +#define ENTER CFI_STARTPROC
22471 +#define EXIT pax_force_retaddr; ret ; \
22472 CFI_ENDPROC
22473
22474 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22475 +#define _DEST %_ASM_CX,%_ASM_BX
22476 +#else
22477 +#define _DEST %_ASM_CX
22478 +#endif
22479 +
22480 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22481 +#define __copyuser_seg gs;
22482 +#else
22483 +#define __copyuser_seg
22484 +#endif
22485 +
22486 .text
22487 ENTRY(__put_user_1)
22488 ENTER
22489 +
22490 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22491 + GET_THREAD_INFO(%_ASM_BX)
22492 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22493 jae bad_put_user
22494 -1: movb %al,(%_ASM_CX)
22495 +
22496 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22497 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22498 + cmp %_ASM_BX,%_ASM_CX
22499 + jb 1234f
22500 + xor %ebx,%ebx
22501 +1234:
22502 +#endif
22503 +
22504 +#endif
22505 +
22506 +1: __copyuser_seg movb %al,(_DEST)
22507 xor %eax,%eax
22508 EXIT
22509 ENDPROC(__put_user_1)
22510
22511 ENTRY(__put_user_2)
22512 ENTER
22513 +
22514 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22515 + GET_THREAD_INFO(%_ASM_BX)
22516 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22517 sub $1,%_ASM_BX
22518 cmp %_ASM_BX,%_ASM_CX
22519 jae bad_put_user
22520 -2: movw %ax,(%_ASM_CX)
22521 +
22522 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22523 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22524 + cmp %_ASM_BX,%_ASM_CX
22525 + jb 1234f
22526 + xor %ebx,%ebx
22527 +1234:
22528 +#endif
22529 +
22530 +#endif
22531 +
22532 +2: __copyuser_seg movw %ax,(_DEST)
22533 xor %eax,%eax
22534 EXIT
22535 ENDPROC(__put_user_2)
22536
22537 ENTRY(__put_user_4)
22538 ENTER
22539 +
22540 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22541 + GET_THREAD_INFO(%_ASM_BX)
22542 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22543 sub $3,%_ASM_BX
22544 cmp %_ASM_BX,%_ASM_CX
22545 jae bad_put_user
22546 -3: movl %eax,(%_ASM_CX)
22547 +
22548 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22549 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22550 + cmp %_ASM_BX,%_ASM_CX
22551 + jb 1234f
22552 + xor %ebx,%ebx
22553 +1234:
22554 +#endif
22555 +
22556 +#endif
22557 +
22558 +3: __copyuser_seg movl %eax,(_DEST)
22559 xor %eax,%eax
22560 EXIT
22561 ENDPROC(__put_user_4)
22562
22563 ENTRY(__put_user_8)
22564 ENTER
22565 +
22566 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22567 + GET_THREAD_INFO(%_ASM_BX)
22568 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22569 sub $7,%_ASM_BX
22570 cmp %_ASM_BX,%_ASM_CX
22571 jae bad_put_user
22572 -4: mov %_ASM_AX,(%_ASM_CX)
22573 +
22574 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22575 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22576 + cmp %_ASM_BX,%_ASM_CX
22577 + jb 1234f
22578 + xor %ebx,%ebx
22579 +1234:
22580 +#endif
22581 +
22582 +#endif
22583 +
22584 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
22585 #ifdef CONFIG_X86_32
22586 -5: movl %edx,4(%_ASM_CX)
22587 +5: __copyuser_seg movl %edx,4(_DEST)
22588 #endif
22589 xor %eax,%eax
22590 EXIT
22591 diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22592 index 1cad221..de671ee 100644
22593 --- a/arch/x86/lib/rwlock.S
22594 +++ b/arch/x86/lib/rwlock.S
22595 @@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22596 FRAME
22597 0: LOCK_PREFIX
22598 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22599 +
22600 +#ifdef CONFIG_PAX_REFCOUNT
22601 + jno 1234f
22602 + LOCK_PREFIX
22603 + WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22604 + int $4
22605 +1234:
22606 + _ASM_EXTABLE(1234b, 1234b)
22607 +#endif
22608 +
22609 1: rep; nop
22610 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22611 jne 1b
22612 LOCK_PREFIX
22613 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22614 +
22615 +#ifdef CONFIG_PAX_REFCOUNT
22616 + jno 1234f
22617 + LOCK_PREFIX
22618 + WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22619 + int $4
22620 +1234:
22621 + _ASM_EXTABLE(1234b, 1234b)
22622 +#endif
22623 +
22624 jnz 0b
22625 ENDFRAME
22626 + pax_force_retaddr
22627 ret
22628 CFI_ENDPROC
22629 END(__write_lock_failed)
22630 @@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22631 FRAME
22632 0: LOCK_PREFIX
22633 READ_LOCK_SIZE(inc) (%__lock_ptr)
22634 +
22635 +#ifdef CONFIG_PAX_REFCOUNT
22636 + jno 1234f
22637 + LOCK_PREFIX
22638 + READ_LOCK_SIZE(dec) (%__lock_ptr)
22639 + int $4
22640 +1234:
22641 + _ASM_EXTABLE(1234b, 1234b)
22642 +#endif
22643 +
22644 1: rep; nop
22645 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22646 js 1b
22647 LOCK_PREFIX
22648 READ_LOCK_SIZE(dec) (%__lock_ptr)
22649 +
22650 +#ifdef CONFIG_PAX_REFCOUNT
22651 + jno 1234f
22652 + LOCK_PREFIX
22653 + READ_LOCK_SIZE(inc) (%__lock_ptr)
22654 + int $4
22655 +1234:
22656 + _ASM_EXTABLE(1234b, 1234b)
22657 +#endif
22658 +
22659 js 0b
22660 ENDFRAME
22661 + pax_force_retaddr
22662 ret
22663 CFI_ENDPROC
22664 END(__read_lock_failed)
22665 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22666 index 5dff5f0..cadebf4 100644
22667 --- a/arch/x86/lib/rwsem.S
22668 +++ b/arch/x86/lib/rwsem.S
22669 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22670 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22671 CFI_RESTORE __ASM_REG(dx)
22672 restore_common_regs
22673 + pax_force_retaddr
22674 ret
22675 CFI_ENDPROC
22676 ENDPROC(call_rwsem_down_read_failed)
22677 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22678 movq %rax,%rdi
22679 call rwsem_down_write_failed
22680 restore_common_regs
22681 + pax_force_retaddr
22682 ret
22683 CFI_ENDPROC
22684 ENDPROC(call_rwsem_down_write_failed)
22685 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22686 movq %rax,%rdi
22687 call rwsem_wake
22688 restore_common_regs
22689 -1: ret
22690 +1: pax_force_retaddr
22691 + ret
22692 CFI_ENDPROC
22693 ENDPROC(call_rwsem_wake)
22694
22695 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22696 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22697 CFI_RESTORE __ASM_REG(dx)
22698 restore_common_regs
22699 + pax_force_retaddr
22700 ret
22701 CFI_ENDPROC
22702 ENDPROC(call_rwsem_downgrade_wake)
22703 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22704 index a63efd6..ccecad8 100644
22705 --- a/arch/x86/lib/thunk_64.S
22706 +++ b/arch/x86/lib/thunk_64.S
22707 @@ -8,6 +8,7 @@
22708 #include <linux/linkage.h>
22709 #include <asm/dwarf2.h>
22710 #include <asm/calling.h>
22711 +#include <asm/alternative-asm.h>
22712
22713 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22714 .macro THUNK name, func, put_ret_addr_in_rdi=0
22715 @@ -41,5 +42,6 @@
22716 SAVE_ARGS
22717 restore:
22718 RESTORE_ARGS
22719 + pax_force_retaddr
22720 ret
22721 CFI_ENDPROC
22722 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22723 index 1781b2f..90368dd 100644
22724 --- a/arch/x86/lib/usercopy_32.c
22725 +++ b/arch/x86/lib/usercopy_32.c
22726 @@ -42,10 +42,12 @@ do { \
22727 int __d0; \
22728 might_fault(); \
22729 __asm__ __volatile__( \
22730 + __COPYUSER_SET_ES \
22731 "0: rep; stosl\n" \
22732 " movl %2,%0\n" \
22733 "1: rep; stosb\n" \
22734 "2:\n" \
22735 + __COPYUSER_RESTORE_ES \
22736 ".section .fixup,\"ax\"\n" \
22737 "3: lea 0(%2,%0,4),%0\n" \
22738 " jmp 2b\n" \
22739 @@ -97,7 +99,7 @@ EXPORT_SYMBOL(__clear_user);
22740
22741 #ifdef CONFIG_X86_INTEL_USERCOPY
22742 static unsigned long
22743 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
22744 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22745 {
22746 int d0, d1;
22747 __asm__ __volatile__(
22748 @@ -109,36 +111,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22749 " .align 2,0x90\n"
22750 "3: movl 0(%4), %%eax\n"
22751 "4: movl 4(%4), %%edx\n"
22752 - "5: movl %%eax, 0(%3)\n"
22753 - "6: movl %%edx, 4(%3)\n"
22754 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22755 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22756 "7: movl 8(%4), %%eax\n"
22757 "8: movl 12(%4),%%edx\n"
22758 - "9: movl %%eax, 8(%3)\n"
22759 - "10: movl %%edx, 12(%3)\n"
22760 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22761 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22762 "11: movl 16(%4), %%eax\n"
22763 "12: movl 20(%4), %%edx\n"
22764 - "13: movl %%eax, 16(%3)\n"
22765 - "14: movl %%edx, 20(%3)\n"
22766 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
22767 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
22768 "15: movl 24(%4), %%eax\n"
22769 "16: movl 28(%4), %%edx\n"
22770 - "17: movl %%eax, 24(%3)\n"
22771 - "18: movl %%edx, 28(%3)\n"
22772 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
22773 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
22774 "19: movl 32(%4), %%eax\n"
22775 "20: movl 36(%4), %%edx\n"
22776 - "21: movl %%eax, 32(%3)\n"
22777 - "22: movl %%edx, 36(%3)\n"
22778 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
22779 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
22780 "23: movl 40(%4), %%eax\n"
22781 "24: movl 44(%4), %%edx\n"
22782 - "25: movl %%eax, 40(%3)\n"
22783 - "26: movl %%edx, 44(%3)\n"
22784 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
22785 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
22786 "27: movl 48(%4), %%eax\n"
22787 "28: movl 52(%4), %%edx\n"
22788 - "29: movl %%eax, 48(%3)\n"
22789 - "30: movl %%edx, 52(%3)\n"
22790 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
22791 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
22792 "31: movl 56(%4), %%eax\n"
22793 "32: movl 60(%4), %%edx\n"
22794 - "33: movl %%eax, 56(%3)\n"
22795 - "34: movl %%edx, 60(%3)\n"
22796 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
22797 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
22798 " addl $-64, %0\n"
22799 " addl $64, %4\n"
22800 " addl $64, %3\n"
22801 @@ -148,10 +150,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22802 " shrl $2, %0\n"
22803 " andl $3, %%eax\n"
22804 " cld\n"
22805 + __COPYUSER_SET_ES
22806 "99: rep; movsl\n"
22807 "36: movl %%eax, %0\n"
22808 "37: rep; movsb\n"
22809 "100:\n"
22810 + __COPYUSER_RESTORE_ES
22811 ".section .fixup,\"ax\"\n"
22812 "101: lea 0(%%eax,%0,4),%0\n"
22813 " jmp 100b\n"
22814 @@ -201,46 +205,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22815 }
22816
22817 static unsigned long
22818 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
22819 +{
22820 + int d0, d1;
22821 + __asm__ __volatile__(
22822 + " .align 2,0x90\n"
22823 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
22824 + " cmpl $67, %0\n"
22825 + " jbe 3f\n"
22826 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
22827 + " .align 2,0x90\n"
22828 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
22829 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
22830 + "5: movl %%eax, 0(%3)\n"
22831 + "6: movl %%edx, 4(%3)\n"
22832 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
22833 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
22834 + "9: movl %%eax, 8(%3)\n"
22835 + "10: movl %%edx, 12(%3)\n"
22836 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
22837 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
22838 + "13: movl %%eax, 16(%3)\n"
22839 + "14: movl %%edx, 20(%3)\n"
22840 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
22841 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
22842 + "17: movl %%eax, 24(%3)\n"
22843 + "18: movl %%edx, 28(%3)\n"
22844 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
22845 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
22846 + "21: movl %%eax, 32(%3)\n"
22847 + "22: movl %%edx, 36(%3)\n"
22848 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
22849 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
22850 + "25: movl %%eax, 40(%3)\n"
22851 + "26: movl %%edx, 44(%3)\n"
22852 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
22853 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
22854 + "29: movl %%eax, 48(%3)\n"
22855 + "30: movl %%edx, 52(%3)\n"
22856 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
22857 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
22858 + "33: movl %%eax, 56(%3)\n"
22859 + "34: movl %%edx, 60(%3)\n"
22860 + " addl $-64, %0\n"
22861 + " addl $64, %4\n"
22862 + " addl $64, %3\n"
22863 + " cmpl $63, %0\n"
22864 + " ja 1b\n"
22865 + "35: movl %0, %%eax\n"
22866 + " shrl $2, %0\n"
22867 + " andl $3, %%eax\n"
22868 + " cld\n"
22869 + "99: rep; "__copyuser_seg" movsl\n"
22870 + "36: movl %%eax, %0\n"
22871 + "37: rep; "__copyuser_seg" movsb\n"
22872 + "100:\n"
22873 + ".section .fixup,\"ax\"\n"
22874 + "101: lea 0(%%eax,%0,4),%0\n"
22875 + " jmp 100b\n"
22876 + ".previous\n"
22877 + _ASM_EXTABLE(1b,100b)
22878 + _ASM_EXTABLE(2b,100b)
22879 + _ASM_EXTABLE(3b,100b)
22880 + _ASM_EXTABLE(4b,100b)
22881 + _ASM_EXTABLE(5b,100b)
22882 + _ASM_EXTABLE(6b,100b)
22883 + _ASM_EXTABLE(7b,100b)
22884 + _ASM_EXTABLE(8b,100b)
22885 + _ASM_EXTABLE(9b,100b)
22886 + _ASM_EXTABLE(10b,100b)
22887 + _ASM_EXTABLE(11b,100b)
22888 + _ASM_EXTABLE(12b,100b)
22889 + _ASM_EXTABLE(13b,100b)
22890 + _ASM_EXTABLE(14b,100b)
22891 + _ASM_EXTABLE(15b,100b)
22892 + _ASM_EXTABLE(16b,100b)
22893 + _ASM_EXTABLE(17b,100b)
22894 + _ASM_EXTABLE(18b,100b)
22895 + _ASM_EXTABLE(19b,100b)
22896 + _ASM_EXTABLE(20b,100b)
22897 + _ASM_EXTABLE(21b,100b)
22898 + _ASM_EXTABLE(22b,100b)
22899 + _ASM_EXTABLE(23b,100b)
22900 + _ASM_EXTABLE(24b,100b)
22901 + _ASM_EXTABLE(25b,100b)
22902 + _ASM_EXTABLE(26b,100b)
22903 + _ASM_EXTABLE(27b,100b)
22904 + _ASM_EXTABLE(28b,100b)
22905 + _ASM_EXTABLE(29b,100b)
22906 + _ASM_EXTABLE(30b,100b)
22907 + _ASM_EXTABLE(31b,100b)
22908 + _ASM_EXTABLE(32b,100b)
22909 + _ASM_EXTABLE(33b,100b)
22910 + _ASM_EXTABLE(34b,100b)
22911 + _ASM_EXTABLE(35b,100b)
22912 + _ASM_EXTABLE(36b,100b)
22913 + _ASM_EXTABLE(37b,100b)
22914 + _ASM_EXTABLE(99b,101b)
22915 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
22916 + : "1"(to), "2"(from), "0"(size)
22917 + : "eax", "edx", "memory");
22918 + return size;
22919 +}
22920 +
22921 +static unsigned long __size_overflow(3)
22922 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22923 {
22924 int d0, d1;
22925 __asm__ __volatile__(
22926 " .align 2,0x90\n"
22927 - "0: movl 32(%4), %%eax\n"
22928 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22929 " cmpl $67, %0\n"
22930 " jbe 2f\n"
22931 - "1: movl 64(%4), %%eax\n"
22932 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22933 " .align 2,0x90\n"
22934 - "2: movl 0(%4), %%eax\n"
22935 - "21: movl 4(%4), %%edx\n"
22936 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22937 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22938 " movl %%eax, 0(%3)\n"
22939 " movl %%edx, 4(%3)\n"
22940 - "3: movl 8(%4), %%eax\n"
22941 - "31: movl 12(%4),%%edx\n"
22942 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22943 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22944 " movl %%eax, 8(%3)\n"
22945 " movl %%edx, 12(%3)\n"
22946 - "4: movl 16(%4), %%eax\n"
22947 - "41: movl 20(%4), %%edx\n"
22948 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22949 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22950 " movl %%eax, 16(%3)\n"
22951 " movl %%edx, 20(%3)\n"
22952 - "10: movl 24(%4), %%eax\n"
22953 - "51: movl 28(%4), %%edx\n"
22954 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22955 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22956 " movl %%eax, 24(%3)\n"
22957 " movl %%edx, 28(%3)\n"
22958 - "11: movl 32(%4), %%eax\n"
22959 - "61: movl 36(%4), %%edx\n"
22960 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22961 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22962 " movl %%eax, 32(%3)\n"
22963 " movl %%edx, 36(%3)\n"
22964 - "12: movl 40(%4), %%eax\n"
22965 - "71: movl 44(%4), %%edx\n"
22966 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22967 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22968 " movl %%eax, 40(%3)\n"
22969 " movl %%edx, 44(%3)\n"
22970 - "13: movl 48(%4), %%eax\n"
22971 - "81: movl 52(%4), %%edx\n"
22972 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22973 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22974 " movl %%eax, 48(%3)\n"
22975 " movl %%edx, 52(%3)\n"
22976 - "14: movl 56(%4), %%eax\n"
22977 - "91: movl 60(%4), %%edx\n"
22978 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22979 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22980 " movl %%eax, 56(%3)\n"
22981 " movl %%edx, 60(%3)\n"
22982 " addl $-64, %0\n"
22983 @@ -252,9 +360,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22984 " shrl $2, %0\n"
22985 " andl $3, %%eax\n"
22986 " cld\n"
22987 - "6: rep; movsl\n"
22988 + "6: rep; "__copyuser_seg" movsl\n"
22989 " movl %%eax,%0\n"
22990 - "7: rep; movsb\n"
22991 + "7: rep; "__copyuser_seg" movsb\n"
22992 "8:\n"
22993 ".section .fixup,\"ax\"\n"
22994 "9: lea 0(%%eax,%0,4),%0\n"
22995 @@ -297,48 +405,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22996 * hyoshiok@miraclelinux.com
22997 */
22998
22999 -static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23000 +static unsigned long __size_overflow(3) __copy_user_zeroing_intel_nocache(void *to,
23001 const void __user *from, unsigned long size)
23002 {
23003 int d0, d1;
23004
23005 __asm__ __volatile__(
23006 " .align 2,0x90\n"
23007 - "0: movl 32(%4), %%eax\n"
23008 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23009 " cmpl $67, %0\n"
23010 " jbe 2f\n"
23011 - "1: movl 64(%4), %%eax\n"
23012 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23013 " .align 2,0x90\n"
23014 - "2: movl 0(%4), %%eax\n"
23015 - "21: movl 4(%4), %%edx\n"
23016 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23017 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23018 " movnti %%eax, 0(%3)\n"
23019 " movnti %%edx, 4(%3)\n"
23020 - "3: movl 8(%4), %%eax\n"
23021 - "31: movl 12(%4),%%edx\n"
23022 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23023 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23024 " movnti %%eax, 8(%3)\n"
23025 " movnti %%edx, 12(%3)\n"
23026 - "4: movl 16(%4), %%eax\n"
23027 - "41: movl 20(%4), %%edx\n"
23028 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23029 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23030 " movnti %%eax, 16(%3)\n"
23031 " movnti %%edx, 20(%3)\n"
23032 - "10: movl 24(%4), %%eax\n"
23033 - "51: movl 28(%4), %%edx\n"
23034 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23035 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23036 " movnti %%eax, 24(%3)\n"
23037 " movnti %%edx, 28(%3)\n"
23038 - "11: movl 32(%4), %%eax\n"
23039 - "61: movl 36(%4), %%edx\n"
23040 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23041 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23042 " movnti %%eax, 32(%3)\n"
23043 " movnti %%edx, 36(%3)\n"
23044 - "12: movl 40(%4), %%eax\n"
23045 - "71: movl 44(%4), %%edx\n"
23046 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23047 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23048 " movnti %%eax, 40(%3)\n"
23049 " movnti %%edx, 44(%3)\n"
23050 - "13: movl 48(%4), %%eax\n"
23051 - "81: movl 52(%4), %%edx\n"
23052 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23053 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23054 " movnti %%eax, 48(%3)\n"
23055 " movnti %%edx, 52(%3)\n"
23056 - "14: movl 56(%4), %%eax\n"
23057 - "91: movl 60(%4), %%edx\n"
23058 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23059 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23060 " movnti %%eax, 56(%3)\n"
23061 " movnti %%edx, 60(%3)\n"
23062 " addl $-64, %0\n"
23063 @@ -351,9 +459,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23064 " shrl $2, %0\n"
23065 " andl $3, %%eax\n"
23066 " cld\n"
23067 - "6: rep; movsl\n"
23068 + "6: rep; "__copyuser_seg" movsl\n"
23069 " movl %%eax,%0\n"
23070 - "7: rep; movsb\n"
23071 + "7: rep; "__copyuser_seg" movsb\n"
23072 "8:\n"
23073 ".section .fixup,\"ax\"\n"
23074 "9: lea 0(%%eax,%0,4),%0\n"
23075 @@ -391,48 +499,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23076 return size;
23077 }
23078
23079 -static unsigned long __copy_user_intel_nocache(void *to,
23080 +static unsigned long __size_overflow(3) __copy_user_intel_nocache(void *to,
23081 const void __user *from, unsigned long size)
23082 {
23083 int d0, d1;
23084
23085 __asm__ __volatile__(
23086 " .align 2,0x90\n"
23087 - "0: movl 32(%4), %%eax\n"
23088 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23089 " cmpl $67, %0\n"
23090 " jbe 2f\n"
23091 - "1: movl 64(%4), %%eax\n"
23092 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23093 " .align 2,0x90\n"
23094 - "2: movl 0(%4), %%eax\n"
23095 - "21: movl 4(%4), %%edx\n"
23096 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23097 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23098 " movnti %%eax, 0(%3)\n"
23099 " movnti %%edx, 4(%3)\n"
23100 - "3: movl 8(%4), %%eax\n"
23101 - "31: movl 12(%4),%%edx\n"
23102 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23103 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23104 " movnti %%eax, 8(%3)\n"
23105 " movnti %%edx, 12(%3)\n"
23106 - "4: movl 16(%4), %%eax\n"
23107 - "41: movl 20(%4), %%edx\n"
23108 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23109 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23110 " movnti %%eax, 16(%3)\n"
23111 " movnti %%edx, 20(%3)\n"
23112 - "10: movl 24(%4), %%eax\n"
23113 - "51: movl 28(%4), %%edx\n"
23114 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23115 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23116 " movnti %%eax, 24(%3)\n"
23117 " movnti %%edx, 28(%3)\n"
23118 - "11: movl 32(%4), %%eax\n"
23119 - "61: movl 36(%4), %%edx\n"
23120 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23121 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23122 " movnti %%eax, 32(%3)\n"
23123 " movnti %%edx, 36(%3)\n"
23124 - "12: movl 40(%4), %%eax\n"
23125 - "71: movl 44(%4), %%edx\n"
23126 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23127 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23128 " movnti %%eax, 40(%3)\n"
23129 " movnti %%edx, 44(%3)\n"
23130 - "13: movl 48(%4), %%eax\n"
23131 - "81: movl 52(%4), %%edx\n"
23132 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23133 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23134 " movnti %%eax, 48(%3)\n"
23135 " movnti %%edx, 52(%3)\n"
23136 - "14: movl 56(%4), %%eax\n"
23137 - "91: movl 60(%4), %%edx\n"
23138 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23139 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23140 " movnti %%eax, 56(%3)\n"
23141 " movnti %%edx, 60(%3)\n"
23142 " addl $-64, %0\n"
23143 @@ -445,9 +553,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23144 " shrl $2, %0\n"
23145 " andl $3, %%eax\n"
23146 " cld\n"
23147 - "6: rep; movsl\n"
23148 + "6: rep; "__copyuser_seg" movsl\n"
23149 " movl %%eax,%0\n"
23150 - "7: rep; movsb\n"
23151 + "7: rep; "__copyuser_seg" movsb\n"
23152 "8:\n"
23153 ".section .fixup,\"ax\"\n"
23154 "9: lea 0(%%eax,%0,4),%0\n"
23155 @@ -487,32 +595,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23156 */
23157 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23158 unsigned long size);
23159 -unsigned long __copy_user_intel(void __user *to, const void *from,
23160 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23161 + unsigned long size);
23162 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23163 unsigned long size);
23164 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23165 const void __user *from, unsigned long size);
23166 #endif /* CONFIG_X86_INTEL_USERCOPY */
23167
23168 /* Generic arbitrary sized copy. */
23169 -#define __copy_user(to, from, size) \
23170 +#define __copy_user(to, from, size, prefix, set, restore) \
23171 do { \
23172 int __d0, __d1, __d2; \
23173 __asm__ __volatile__( \
23174 + set \
23175 " cmp $7,%0\n" \
23176 " jbe 1f\n" \
23177 " movl %1,%0\n" \
23178 " negl %0\n" \
23179 " andl $7,%0\n" \
23180 " subl %0,%3\n" \
23181 - "4: rep; movsb\n" \
23182 + "4: rep; "prefix"movsb\n" \
23183 " movl %3,%0\n" \
23184 " shrl $2,%0\n" \
23185 " andl $3,%3\n" \
23186 " .align 2,0x90\n" \
23187 - "0: rep; movsl\n" \
23188 + "0: rep; "prefix"movsl\n" \
23189 " movl %3,%0\n" \
23190 - "1: rep; movsb\n" \
23191 + "1: rep; "prefix"movsb\n" \
23192 "2:\n" \
23193 + restore \
23194 ".section .fixup,\"ax\"\n" \
23195 "5: addl %3,%0\n" \
23196 " jmp 2b\n" \
23197 @@ -537,14 +649,14 @@ do { \
23198 " negl %0\n" \
23199 " andl $7,%0\n" \
23200 " subl %0,%3\n" \
23201 - "4: rep; movsb\n" \
23202 + "4: rep; "__copyuser_seg"movsb\n" \
23203 " movl %3,%0\n" \
23204 " shrl $2,%0\n" \
23205 " andl $3,%3\n" \
23206 " .align 2,0x90\n" \
23207 - "0: rep; movsl\n" \
23208 + "0: rep; "__copyuser_seg"movsl\n" \
23209 " movl %3,%0\n" \
23210 - "1: rep; movsb\n" \
23211 + "1: rep; "__copyuser_seg"movsb\n" \
23212 "2:\n" \
23213 ".section .fixup,\"ax\"\n" \
23214 "5: addl %3,%0\n" \
23215 @@ -627,9 +739,9 @@ survive:
23216 }
23217 #endif
23218 if (movsl_is_ok(to, from, n))
23219 - __copy_user(to, from, n);
23220 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23221 else
23222 - n = __copy_user_intel(to, from, n);
23223 + n = __generic_copy_to_user_intel(to, from, n);
23224 return n;
23225 }
23226 EXPORT_SYMBOL(__copy_to_user_ll);
23227 @@ -649,10 +761,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23228 unsigned long n)
23229 {
23230 if (movsl_is_ok(to, from, n))
23231 - __copy_user(to, from, n);
23232 + __copy_user(to, from, n, __copyuser_seg, "", "");
23233 else
23234 - n = __copy_user_intel((void __user *)to,
23235 - (const void *)from, n);
23236 + n = __generic_copy_from_user_intel(to, from, n);
23237 return n;
23238 }
23239 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23240 @@ -679,65 +790,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23241 if (n > 64 && cpu_has_xmm2)
23242 n = __copy_user_intel_nocache(to, from, n);
23243 else
23244 - __copy_user(to, from, n);
23245 + __copy_user(to, from, n, __copyuser_seg, "", "");
23246 #else
23247 - __copy_user(to, from, n);
23248 + __copy_user(to, from, n, __copyuser_seg, "", "");
23249 #endif
23250 return n;
23251 }
23252 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23253
23254 -/**
23255 - * copy_to_user: - Copy a block of data into user space.
23256 - * @to: Destination address, in user space.
23257 - * @from: Source address, in kernel space.
23258 - * @n: Number of bytes to copy.
23259 - *
23260 - * Context: User context only. This function may sleep.
23261 - *
23262 - * Copy data from kernel space to user space.
23263 - *
23264 - * Returns number of bytes that could not be copied.
23265 - * On success, this will be zero.
23266 - */
23267 -unsigned long
23268 -copy_to_user(void __user *to, const void *from, unsigned long n)
23269 -{
23270 - if (access_ok(VERIFY_WRITE, to, n))
23271 - n = __copy_to_user(to, from, n);
23272 - return n;
23273 -}
23274 -EXPORT_SYMBOL(copy_to_user);
23275 -
23276 -/**
23277 - * copy_from_user: - Copy a block of data from user space.
23278 - * @to: Destination address, in kernel space.
23279 - * @from: Source address, in user space.
23280 - * @n: Number of bytes to copy.
23281 - *
23282 - * Context: User context only. This function may sleep.
23283 - *
23284 - * Copy data from user space to kernel space.
23285 - *
23286 - * Returns number of bytes that could not be copied.
23287 - * On success, this will be zero.
23288 - *
23289 - * If some data could not be copied, this function will pad the copied
23290 - * data to the requested size using zero bytes.
23291 - */
23292 -unsigned long
23293 -_copy_from_user(void *to, const void __user *from, unsigned long n)
23294 -{
23295 - if (access_ok(VERIFY_READ, from, n))
23296 - n = __copy_from_user(to, from, n);
23297 - else
23298 - memset(to, 0, n);
23299 - return n;
23300 -}
23301 -EXPORT_SYMBOL(_copy_from_user);
23302 -
23303 void copy_from_user_overflow(void)
23304 {
23305 WARN(1, "Buffer overflow detected!\n");
23306 }
23307 EXPORT_SYMBOL(copy_from_user_overflow);
23308 +
23309 +void copy_to_user_overflow(void)
23310 +{
23311 + WARN(1, "Buffer overflow detected!\n");
23312 +}
23313 +EXPORT_SYMBOL(copy_to_user_overflow);
23314 +
23315 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23316 +void __set_fs(mm_segment_t x)
23317 +{
23318 + switch (x.seg) {
23319 + case 0:
23320 + loadsegment(gs, 0);
23321 + break;
23322 + case TASK_SIZE_MAX:
23323 + loadsegment(gs, __USER_DS);
23324 + break;
23325 + case -1UL:
23326 + loadsegment(gs, __KERNEL_DS);
23327 + break;
23328 + default:
23329 + BUG();
23330 + }
23331 + return;
23332 +}
23333 +EXPORT_SYMBOL(__set_fs);
23334 +
23335 +void set_fs(mm_segment_t x)
23336 +{
23337 + current_thread_info()->addr_limit = x;
23338 + __set_fs(x);
23339 +}
23340 +EXPORT_SYMBOL(set_fs);
23341 +#endif
23342 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23343 index e5b130b..6690d31 100644
23344 --- a/arch/x86/lib/usercopy_64.c
23345 +++ b/arch/x86/lib/usercopy_64.c
23346 @@ -16,6 +16,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23347 {
23348 long __d0;
23349 might_fault();
23350 +
23351 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23352 + if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23353 + addr += PAX_USER_SHADOW_BASE;
23354 +#endif
23355 +
23356 /* no memory constraint because it doesn't change any memory gcc knows
23357 about */
23358 asm volatile(
23359 @@ -52,12 +58,20 @@ unsigned long clear_user(void __user *to, unsigned long n)
23360 }
23361 EXPORT_SYMBOL(clear_user);
23362
23363 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23364 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23365 {
23366 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23367 - return copy_user_generic((__force void *)to, (__force void *)from, len);
23368 - }
23369 - return len;
23370 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23371 +
23372 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23373 + if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23374 + to += PAX_USER_SHADOW_BASE;
23375 + if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23376 + from += PAX_USER_SHADOW_BASE;
23377 +#endif
23378 +
23379 + return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23380 + }
23381 + return len;
23382 }
23383 EXPORT_SYMBOL(copy_in_user);
23384
23385 @@ -67,7 +81,7 @@ EXPORT_SYMBOL(copy_in_user);
23386 * it is not necessary to optimize tail handling.
23387 */
23388 unsigned long
23389 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23390 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23391 {
23392 char c;
23393 unsigned zero_len;
23394 @@ -84,3 +98,15 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23395 break;
23396 return len;
23397 }
23398 +
23399 +void copy_from_user_overflow(void)
23400 +{
23401 + WARN(1, "Buffer overflow detected!\n");
23402 +}
23403 +EXPORT_SYMBOL(copy_from_user_overflow);
23404 +
23405 +void copy_to_user_overflow(void)
23406 +{
23407 + WARN(1, "Buffer overflow detected!\n");
23408 +}
23409 +EXPORT_SYMBOL(copy_to_user_overflow);
23410 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23411 index 903ec1e..af8e064 100644
23412 --- a/arch/x86/mm/extable.c
23413 +++ b/arch/x86/mm/extable.c
23414 @@ -6,12 +6,24 @@
23415 static inline unsigned long
23416 ex_insn_addr(const struct exception_table_entry *x)
23417 {
23418 - return (unsigned long)&x->insn + x->insn;
23419 + unsigned long reloc = 0;
23420 +
23421 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
23422 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
23423 +#endif
23424 +
23425 + return (unsigned long)&x->insn + x->insn + reloc;
23426 }
23427 static inline unsigned long
23428 ex_fixup_addr(const struct exception_table_entry *x)
23429 {
23430 - return (unsigned long)&x->fixup + x->fixup;
23431 + unsigned long reloc = 0;
23432 +
23433 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
23434 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
23435 +#endif
23436 +
23437 + return (unsigned long)&x->fixup + x->fixup + reloc;
23438 }
23439
23440 int fixup_exception(struct pt_regs *regs)
23441 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
23442 unsigned long new_ip;
23443
23444 #ifdef CONFIG_PNPBIOS
23445 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23446 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23447 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23448 extern u32 pnp_bios_is_utter_crap;
23449 pnp_bios_is_utter_crap = 1;
23450 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23451 index 76dcd9d..e9dffde 100644
23452 --- a/arch/x86/mm/fault.c
23453 +++ b/arch/x86/mm/fault.c
23454 @@ -13,11 +13,18 @@
23455 #include <linux/perf_event.h> /* perf_sw_event */
23456 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23457 #include <linux/prefetch.h> /* prefetchw */
23458 +#include <linux/unistd.h>
23459 +#include <linux/compiler.h>
23460
23461 #include <asm/traps.h> /* dotraplinkage, ... */
23462 #include <asm/pgalloc.h> /* pgd_*(), ... */
23463 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23464 #include <asm/fixmap.h> /* VSYSCALL_START */
23465 +#include <asm/tlbflush.h>
23466 +
23467 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23468 +#include <asm/stacktrace.h>
23469 +#endif
23470
23471 /*
23472 * Page fault error code bits:
23473 @@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23474 int ret = 0;
23475
23476 /* kprobe_running() needs smp_processor_id() */
23477 - if (kprobes_built_in() && !user_mode_vm(regs)) {
23478 + if (kprobes_built_in() && !user_mode(regs)) {
23479 preempt_disable();
23480 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23481 ret = 1;
23482 @@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23483 return !instr_lo || (instr_lo>>1) == 1;
23484 case 0x00:
23485 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23486 - if (probe_kernel_address(instr, opcode))
23487 + if (user_mode(regs)) {
23488 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23489 + return 0;
23490 + } else if (probe_kernel_address(instr, opcode))
23491 return 0;
23492
23493 *prefetch = (instr_lo == 0xF) &&
23494 @@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23495 while (instr < max_instr) {
23496 unsigned char opcode;
23497
23498 - if (probe_kernel_address(instr, opcode))
23499 + if (user_mode(regs)) {
23500 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23501 + break;
23502 + } else if (probe_kernel_address(instr, opcode))
23503 break;
23504
23505 instr++;
23506 @@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23507 force_sig_info(si_signo, &info, tsk);
23508 }
23509
23510 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23511 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23512 +#endif
23513 +
23514 +#ifdef CONFIG_PAX_EMUTRAMP
23515 +static int pax_handle_fetch_fault(struct pt_regs *regs);
23516 +#endif
23517 +
23518 +#ifdef CONFIG_PAX_PAGEEXEC
23519 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23520 +{
23521 + pgd_t *pgd;
23522 + pud_t *pud;
23523 + pmd_t *pmd;
23524 +
23525 + pgd = pgd_offset(mm, address);
23526 + if (!pgd_present(*pgd))
23527 + return NULL;
23528 + pud = pud_offset(pgd, address);
23529 + if (!pud_present(*pud))
23530 + return NULL;
23531 + pmd = pmd_offset(pud, address);
23532 + if (!pmd_present(*pmd))
23533 + return NULL;
23534 + return pmd;
23535 +}
23536 +#endif
23537 +
23538 DEFINE_SPINLOCK(pgd_lock);
23539 LIST_HEAD(pgd_list);
23540
23541 @@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23542 for (address = VMALLOC_START & PMD_MASK;
23543 address >= TASK_SIZE && address < FIXADDR_TOP;
23544 address += PMD_SIZE) {
23545 +
23546 +#ifdef CONFIG_PAX_PER_CPU_PGD
23547 + unsigned long cpu;
23548 +#else
23549 struct page *page;
23550 +#endif
23551
23552 spin_lock(&pgd_lock);
23553 +
23554 +#ifdef CONFIG_PAX_PER_CPU_PGD
23555 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23556 + pgd_t *pgd = get_cpu_pgd(cpu);
23557 + pmd_t *ret;
23558 +#else
23559 list_for_each_entry(page, &pgd_list, lru) {
23560 + pgd_t *pgd = page_address(page);
23561 spinlock_t *pgt_lock;
23562 pmd_t *ret;
23563
23564 @@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23565 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23566
23567 spin_lock(pgt_lock);
23568 - ret = vmalloc_sync_one(page_address(page), address);
23569 +#endif
23570 +
23571 + ret = vmalloc_sync_one(pgd, address);
23572 +
23573 +#ifndef CONFIG_PAX_PER_CPU_PGD
23574 spin_unlock(pgt_lock);
23575 +#endif
23576
23577 if (!ret)
23578 break;
23579 @@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23580 * an interrupt in the middle of a task switch..
23581 */
23582 pgd_paddr = read_cr3();
23583 +
23584 +#ifdef CONFIG_PAX_PER_CPU_PGD
23585 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23586 +#endif
23587 +
23588 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23589 if (!pmd_k)
23590 return -1;
23591 @@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23592 * happen within a race in page table update. In the later
23593 * case just flush:
23594 */
23595 +
23596 +#ifdef CONFIG_PAX_PER_CPU_PGD
23597 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23598 + pgd = pgd_offset_cpu(smp_processor_id(), address);
23599 +#else
23600 pgd = pgd_offset(current->active_mm, address);
23601 +#endif
23602 +
23603 pgd_ref = pgd_offset_k(address);
23604 if (pgd_none(*pgd_ref))
23605 return -1;
23606 @@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23607 static int is_errata100(struct pt_regs *regs, unsigned long address)
23608 {
23609 #ifdef CONFIG_X86_64
23610 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23611 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23612 return 1;
23613 #endif
23614 return 0;
23615 @@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23616 }
23617
23618 static const char nx_warning[] = KERN_CRIT
23619 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23620 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23621
23622 static void
23623 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23624 @@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23625 if (!oops_may_print())
23626 return;
23627
23628 - if (error_code & PF_INSTR) {
23629 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23630 unsigned int level;
23631
23632 pte_t *pte = lookup_address(address, &level);
23633
23634 if (pte && pte_present(*pte) && !pte_exec(*pte))
23635 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
23636 + printk(nx_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
23637 }
23638
23639 +#ifdef CONFIG_PAX_KERNEXEC
23640 + if (init_mm.start_code <= address && address < init_mm.end_code) {
23641 + if (current->signal->curr_ip)
23642 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23643 + &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23644 + else
23645 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23646 + current->comm, task_pid_nr(current), current_uid(), current_euid());
23647 + }
23648 +#endif
23649 +
23650 printk(KERN_ALERT "BUG: unable to handle kernel ");
23651 if (address < PAGE_SIZE)
23652 printk(KERN_CONT "NULL pointer dereference");
23653 @@ -748,6 +829,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23654 }
23655 #endif
23656
23657 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23658 + if (pax_is_fetch_fault(regs, error_code, address)) {
23659 +
23660 +#ifdef CONFIG_PAX_EMUTRAMP
23661 + switch (pax_handle_fetch_fault(regs)) {
23662 + case 2:
23663 + return;
23664 + }
23665 +#endif
23666 +
23667 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23668 + do_group_exit(SIGKILL);
23669 + }
23670 +#endif
23671 +
23672 if (unlikely(show_unhandled_signals))
23673 show_signal_msg(regs, error_code, address, tsk);
23674
23675 @@ -844,7 +940,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23676 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23677 printk(KERN_ERR
23678 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23679 - tsk->comm, tsk->pid, address);
23680 + tsk->comm, task_pid_nr(tsk), address);
23681 code = BUS_MCEERR_AR;
23682 }
23683 #endif
23684 @@ -900,6 +996,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23685 return 1;
23686 }
23687
23688 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23689 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23690 +{
23691 + pte_t *pte;
23692 + pmd_t *pmd;
23693 + spinlock_t *ptl;
23694 + unsigned char pte_mask;
23695 +
23696 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23697 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
23698 + return 0;
23699 +
23700 + /* PaX: it's our fault, let's handle it if we can */
23701 +
23702 + /* PaX: take a look at read faults before acquiring any locks */
23703 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23704 + /* instruction fetch attempt from a protected page in user mode */
23705 + up_read(&mm->mmap_sem);
23706 +
23707 +#ifdef CONFIG_PAX_EMUTRAMP
23708 + switch (pax_handle_fetch_fault(regs)) {
23709 + case 2:
23710 + return 1;
23711 + }
23712 +#endif
23713 +
23714 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23715 + do_group_exit(SIGKILL);
23716 + }
23717 +
23718 + pmd = pax_get_pmd(mm, address);
23719 + if (unlikely(!pmd))
23720 + return 0;
23721 +
23722 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23723 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23724 + pte_unmap_unlock(pte, ptl);
23725 + return 0;
23726 + }
23727 +
23728 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23729 + /* write attempt to a protected page in user mode */
23730 + pte_unmap_unlock(pte, ptl);
23731 + return 0;
23732 + }
23733 +
23734 +#ifdef CONFIG_SMP
23735 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23736 +#else
23737 + if (likely(address > get_limit(regs->cs)))
23738 +#endif
23739 + {
23740 + set_pte(pte, pte_mkread(*pte));
23741 + __flush_tlb_one(address);
23742 + pte_unmap_unlock(pte, ptl);
23743 + up_read(&mm->mmap_sem);
23744 + return 1;
23745 + }
23746 +
23747 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23748 +
23749 + /*
23750 + * PaX: fill DTLB with user rights and retry
23751 + */
23752 + __asm__ __volatile__ (
23753 + "orb %2,(%1)\n"
23754 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
23755 +/*
23756 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
23757 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
23758 + * page fault when examined during a TLB load attempt. this is true not only
23759 + * for PTEs holding a non-present entry but also present entries that will
23760 + * raise a page fault (such as those set up by PaX, or the copy-on-write
23761 + * mechanism). in effect it means that we do *not* need to flush the TLBs
23762 + * for our target pages since their PTEs are simply not in the TLBs at all.
23763 +
23764 + * the best thing in omitting it is that we gain around 15-20% speed in the
23765 + * fast path of the page fault handler and can get rid of tracing since we
23766 + * can no longer flush unintended entries.
23767 + */
23768 + "invlpg (%0)\n"
23769 +#endif
23770 + __copyuser_seg"testb $0,(%0)\n"
23771 + "xorb %3,(%1)\n"
23772 + :
23773 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
23774 + : "memory", "cc");
23775 + pte_unmap_unlock(pte, ptl);
23776 + up_read(&mm->mmap_sem);
23777 + return 1;
23778 +}
23779 +#endif
23780 +
23781 /*
23782 * Handle a spurious fault caused by a stale TLB entry.
23783 *
23784 @@ -972,6 +1161,9 @@ int show_unhandled_signals = 1;
23785 static inline int
23786 access_error(unsigned long error_code, struct vm_area_struct *vma)
23787 {
23788 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
23789 + return 1;
23790 +
23791 if (error_code & PF_WRITE) {
23792 /* write, present and write, not present: */
23793 if (unlikely(!(vma->vm_flags & VM_WRITE)))
23794 @@ -1005,18 +1197,33 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23795 {
23796 struct vm_area_struct *vma;
23797 struct task_struct *tsk;
23798 - unsigned long address;
23799 struct mm_struct *mm;
23800 int fault;
23801 int write = error_code & PF_WRITE;
23802 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
23803 (write ? FAULT_FLAG_WRITE : 0);
23804
23805 - tsk = current;
23806 - mm = tsk->mm;
23807 -
23808 /* Get the faulting address: */
23809 - address = read_cr2();
23810 + unsigned long address = read_cr2();
23811 +
23812 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23813 + if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
23814 + if (!search_exception_tables(regs->ip)) {
23815 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23816 + bad_area_nosemaphore(regs, error_code, address);
23817 + return;
23818 + }
23819 + if (address < PAX_USER_SHADOW_BASE) {
23820 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23821 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
23822 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
23823 + } else
23824 + address -= PAX_USER_SHADOW_BASE;
23825 + }
23826 +#endif
23827 +
23828 + tsk = current;
23829 + mm = tsk->mm;
23830
23831 /*
23832 * Detect and handle instructions that would cause a page fault for
23833 @@ -1077,7 +1284,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23834 * User-mode registers count as a user access even for any
23835 * potential system fault or CPU buglet:
23836 */
23837 - if (user_mode_vm(regs)) {
23838 + if (user_mode(regs)) {
23839 local_irq_enable();
23840 error_code |= PF_USER;
23841 } else {
23842 @@ -1132,6 +1339,11 @@ retry:
23843 might_sleep();
23844 }
23845
23846 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23847 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
23848 + return;
23849 +#endif
23850 +
23851 vma = find_vma(mm, address);
23852 if (unlikely(!vma)) {
23853 bad_area(regs, error_code, address);
23854 @@ -1143,18 +1355,24 @@ retry:
23855 bad_area(regs, error_code, address);
23856 return;
23857 }
23858 - if (error_code & PF_USER) {
23859 - /*
23860 - * Accessing the stack below %sp is always a bug.
23861 - * The large cushion allows instructions like enter
23862 - * and pusha to work. ("enter $65535, $31" pushes
23863 - * 32 pointers and then decrements %sp by 65535.)
23864 - */
23865 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
23866 - bad_area(regs, error_code, address);
23867 - return;
23868 - }
23869 + /*
23870 + * Accessing the stack below %sp is always a bug.
23871 + * The large cushion allows instructions like enter
23872 + * and pusha to work. ("enter $65535, $31" pushes
23873 + * 32 pointers and then decrements %sp by 65535.)
23874 + */
23875 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
23876 + bad_area(regs, error_code, address);
23877 + return;
23878 }
23879 +
23880 +#ifdef CONFIG_PAX_SEGMEXEC
23881 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
23882 + bad_area(regs, error_code, address);
23883 + return;
23884 + }
23885 +#endif
23886 +
23887 if (unlikely(expand_stack(vma, address))) {
23888 bad_area(regs, error_code, address);
23889 return;
23890 @@ -1209,3 +1427,292 @@ good_area:
23891
23892 up_read(&mm->mmap_sem);
23893 }
23894 +
23895 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23896 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
23897 +{
23898 + struct mm_struct *mm = current->mm;
23899 + unsigned long ip = regs->ip;
23900 +
23901 + if (v8086_mode(regs))
23902 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
23903 +
23904 +#ifdef CONFIG_PAX_PAGEEXEC
23905 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
23906 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
23907 + return true;
23908 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
23909 + return true;
23910 + return false;
23911 + }
23912 +#endif
23913 +
23914 +#ifdef CONFIG_PAX_SEGMEXEC
23915 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
23916 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
23917 + return true;
23918 + return false;
23919 + }
23920 +#endif
23921 +
23922 + return false;
23923 +}
23924 +#endif
23925 +
23926 +#ifdef CONFIG_PAX_EMUTRAMP
23927 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
23928 +{
23929 + int err;
23930 +
23931 + do { /* PaX: libffi trampoline emulation */
23932 + unsigned char mov, jmp;
23933 + unsigned int addr1, addr2;
23934 +
23935 +#ifdef CONFIG_X86_64
23936 + if ((regs->ip + 9) >> 32)
23937 + break;
23938 +#endif
23939 +
23940 + err = get_user(mov, (unsigned char __user *)regs->ip);
23941 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23942 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23943 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23944 +
23945 + if (err)
23946 + break;
23947 +
23948 + if (mov == 0xB8 && jmp == 0xE9) {
23949 + regs->ax = addr1;
23950 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23951 + return 2;
23952 + }
23953 + } while (0);
23954 +
23955 + do { /* PaX: gcc trampoline emulation #1 */
23956 + unsigned char mov1, mov2;
23957 + unsigned short jmp;
23958 + unsigned int addr1, addr2;
23959 +
23960 +#ifdef CONFIG_X86_64
23961 + if ((regs->ip + 11) >> 32)
23962 + break;
23963 +#endif
23964 +
23965 + err = get_user(mov1, (unsigned char __user *)regs->ip);
23966 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23967 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
23968 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23969 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
23970 +
23971 + if (err)
23972 + break;
23973 +
23974 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
23975 + regs->cx = addr1;
23976 + regs->ax = addr2;
23977 + regs->ip = addr2;
23978 + return 2;
23979 + }
23980 + } while (0);
23981 +
23982 + do { /* PaX: gcc trampoline emulation #2 */
23983 + unsigned char mov, jmp;
23984 + unsigned int addr1, addr2;
23985 +
23986 +#ifdef CONFIG_X86_64
23987 + if ((regs->ip + 9) >> 32)
23988 + break;
23989 +#endif
23990 +
23991 + err = get_user(mov, (unsigned char __user *)regs->ip);
23992 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23993 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23994 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23995 +
23996 + if (err)
23997 + break;
23998 +
23999 + if (mov == 0xB9 && jmp == 0xE9) {
24000 + regs->cx = addr1;
24001 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24002 + return 2;
24003 + }
24004 + } while (0);
24005 +
24006 + return 1; /* PaX in action */
24007 +}
24008 +
24009 +#ifdef CONFIG_X86_64
24010 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
24011 +{
24012 + int err;
24013 +
24014 + do { /* PaX: libffi trampoline emulation */
24015 + unsigned short mov1, mov2, jmp1;
24016 + unsigned char stcclc, jmp2;
24017 + unsigned long addr1, addr2;
24018 +
24019 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24020 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24021 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24022 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24023 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
24024 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
24025 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
24026 +
24027 + if (err)
24028 + break;
24029 +
24030 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24031 + regs->r11 = addr1;
24032 + regs->r10 = addr2;
24033 + if (stcclc == 0xF8)
24034 + regs->flags &= ~X86_EFLAGS_CF;
24035 + else
24036 + regs->flags |= X86_EFLAGS_CF;
24037 + regs->ip = addr1;
24038 + return 2;
24039 + }
24040 + } while (0);
24041 +
24042 + do { /* PaX: gcc trampoline emulation #1 */
24043 + unsigned short mov1, mov2, jmp1;
24044 + unsigned char jmp2;
24045 + unsigned int addr1;
24046 + unsigned long addr2;
24047 +
24048 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24049 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24050 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24051 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24052 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24053 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24054 +
24055 + if (err)
24056 + break;
24057 +
24058 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24059 + regs->r11 = addr1;
24060 + regs->r10 = addr2;
24061 + regs->ip = addr1;
24062 + return 2;
24063 + }
24064 + } while (0);
24065 +
24066 + do { /* PaX: gcc trampoline emulation #2 */
24067 + unsigned short mov1, mov2, jmp1;
24068 + unsigned char jmp2;
24069 + unsigned long addr1, addr2;
24070 +
24071 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24072 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24073 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24074 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24075 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24076 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24077 +
24078 + if (err)
24079 + break;
24080 +
24081 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24082 + regs->r11 = addr1;
24083 + regs->r10 = addr2;
24084 + regs->ip = addr1;
24085 + return 2;
24086 + }
24087 + } while (0);
24088 +
24089 + return 1; /* PaX in action */
24090 +}
24091 +#endif
24092 +
24093 +/*
24094 + * PaX: decide what to do with offenders (regs->ip = fault address)
24095 + *
24096 + * returns 1 when task should be killed
24097 + * 2 when gcc trampoline was detected
24098 + */
24099 +static int pax_handle_fetch_fault(struct pt_regs *regs)
24100 +{
24101 + if (v8086_mode(regs))
24102 + return 1;
24103 +
24104 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24105 + return 1;
24106 +
24107 +#ifdef CONFIG_X86_32
24108 + return pax_handle_fetch_fault_32(regs);
24109 +#else
24110 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24111 + return pax_handle_fetch_fault_32(regs);
24112 + else
24113 + return pax_handle_fetch_fault_64(regs);
24114 +#endif
24115 +}
24116 +#endif
24117 +
24118 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24119 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24120 +{
24121 + long i;
24122 +
24123 + printk(KERN_ERR "PAX: bytes at PC: ");
24124 + for (i = 0; i < 20; i++) {
24125 + unsigned char c;
24126 + if (get_user(c, (unsigned char __force_user *)pc+i))
24127 + printk(KERN_CONT "?? ");
24128 + else
24129 + printk(KERN_CONT "%02x ", c);
24130 + }
24131 + printk("\n");
24132 +
24133 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24134 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
24135 + unsigned long c;
24136 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
24137 +#ifdef CONFIG_X86_32
24138 + printk(KERN_CONT "???????? ");
24139 +#else
24140 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24141 + printk(KERN_CONT "???????? ???????? ");
24142 + else
24143 + printk(KERN_CONT "???????????????? ");
24144 +#endif
24145 + } else {
24146 +#ifdef CONFIG_X86_64
24147 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24148 + printk(KERN_CONT "%08x ", (unsigned int)c);
24149 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24150 + } else
24151 +#endif
24152 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24153 + }
24154 + }
24155 + printk("\n");
24156 +}
24157 +#endif
24158 +
24159 +/**
24160 + * probe_kernel_write(): safely attempt to write to a location
24161 + * @dst: address to write to
24162 + * @src: pointer to the data that shall be written
24163 + * @size: size of the data chunk
24164 + *
24165 + * Safely write to address @dst from the buffer at @src. If a kernel fault
24166 + * happens, handle that and return -EFAULT.
24167 + */
24168 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24169 +{
24170 + long ret;
24171 + mm_segment_t old_fs = get_fs();
24172 +
24173 + set_fs(KERNEL_DS);
24174 + pagefault_disable();
24175 + pax_open_kernel();
24176 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24177 + pax_close_kernel();
24178 + pagefault_enable();
24179 + set_fs(old_fs);
24180 +
24181 + return ret ? -EFAULT : 0;
24182 +}
24183 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24184 index dd74e46..7d26398 100644
24185 --- a/arch/x86/mm/gup.c
24186 +++ b/arch/x86/mm/gup.c
24187 @@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24188 addr = start;
24189 len = (unsigned long) nr_pages << PAGE_SHIFT;
24190 end = start + len;
24191 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24192 + if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24193 (void __user *)start, len)))
24194 return 0;
24195
24196 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24197 index 6f31ee5..8ee4164 100644
24198 --- a/arch/x86/mm/highmem_32.c
24199 +++ b/arch/x86/mm/highmem_32.c
24200 @@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24201 idx = type + KM_TYPE_NR*smp_processor_id();
24202 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24203 BUG_ON(!pte_none(*(kmap_pte-idx)));
24204 +
24205 + pax_open_kernel();
24206 set_pte(kmap_pte-idx, mk_pte(page, prot));
24207 + pax_close_kernel();
24208 +
24209 arch_flush_lazy_mmu_mode();
24210
24211 return (void *)vaddr;
24212 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24213 index f6679a7..8f795a3 100644
24214 --- a/arch/x86/mm/hugetlbpage.c
24215 +++ b/arch/x86/mm/hugetlbpage.c
24216 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24217 struct hstate *h = hstate_file(file);
24218 struct mm_struct *mm = current->mm;
24219 struct vm_area_struct *vma;
24220 - unsigned long start_addr;
24221 + unsigned long start_addr, pax_task_size = TASK_SIZE;
24222 +
24223 +#ifdef CONFIG_PAX_SEGMEXEC
24224 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24225 + pax_task_size = SEGMEXEC_TASK_SIZE;
24226 +#endif
24227 +
24228 + pax_task_size -= PAGE_SIZE;
24229
24230 if (len > mm->cached_hole_size) {
24231 - start_addr = mm->free_area_cache;
24232 + start_addr = mm->free_area_cache;
24233 } else {
24234 - start_addr = TASK_UNMAPPED_BASE;
24235 - mm->cached_hole_size = 0;
24236 + start_addr = mm->mmap_base;
24237 + mm->cached_hole_size = 0;
24238 }
24239
24240 full_search:
24241 @@ -280,26 +287,27 @@ full_search:
24242
24243 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24244 /* At this point: (!vma || addr < vma->vm_end). */
24245 - if (TASK_SIZE - len < addr) {
24246 + if (pax_task_size - len < addr) {
24247 /*
24248 * Start a new search - just in case we missed
24249 * some holes.
24250 */
24251 - if (start_addr != TASK_UNMAPPED_BASE) {
24252 - start_addr = TASK_UNMAPPED_BASE;
24253 + if (start_addr != mm->mmap_base) {
24254 + start_addr = mm->mmap_base;
24255 mm->cached_hole_size = 0;
24256 goto full_search;
24257 }
24258 return -ENOMEM;
24259 }
24260 - if (!vma || addr + len <= vma->vm_start) {
24261 - mm->free_area_cache = addr + len;
24262 - return addr;
24263 - }
24264 + if (check_heap_stack_gap(vma, addr, len))
24265 + break;
24266 if (addr + mm->cached_hole_size < vma->vm_start)
24267 mm->cached_hole_size = vma->vm_start - addr;
24268 addr = ALIGN(vma->vm_end, huge_page_size(h));
24269 }
24270 +
24271 + mm->free_area_cache = addr + len;
24272 + return addr;
24273 }
24274
24275 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24276 @@ -310,9 +318,8 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24277 struct mm_struct *mm = current->mm;
24278 struct vm_area_struct *vma;
24279 unsigned long base = mm->mmap_base;
24280 - unsigned long addr = addr0;
24281 + unsigned long addr;
24282 unsigned long largest_hole = mm->cached_hole_size;
24283 - unsigned long start_addr;
24284
24285 /* don't allow allocations above current base */
24286 if (mm->free_area_cache > base)
24287 @@ -322,16 +329,15 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24288 largest_hole = 0;
24289 mm->free_area_cache = base;
24290 }
24291 -try_again:
24292 - start_addr = mm->free_area_cache;
24293
24294 /* make sure it can fit in the remaining address space */
24295 if (mm->free_area_cache < len)
24296 goto fail;
24297
24298 /* either no address requested or can't fit in requested address hole */
24299 - addr = (mm->free_area_cache - len) & huge_page_mask(h);
24300 + addr = mm->free_area_cache - len;
24301 do {
24302 + addr &= huge_page_mask(h);
24303 /*
24304 * Lookup failure means no vma is above this address,
24305 * i.e. return with success:
24306 @@ -340,10 +346,10 @@ try_again:
24307 if (!vma)
24308 return addr;
24309
24310 - if (addr + len <= vma->vm_start) {
24311 + if (check_heap_stack_gap(vma, addr, len)) {
24312 /* remember the address as a hint for next time */
24313 - mm->cached_hole_size = largest_hole;
24314 - return (mm->free_area_cache = addr);
24315 + mm->cached_hole_size = largest_hole;
24316 + return (mm->free_area_cache = addr);
24317 } else if (mm->free_area_cache == vma->vm_end) {
24318 /* pull free_area_cache down to the first hole */
24319 mm->free_area_cache = vma->vm_start;
24320 @@ -352,29 +358,34 @@ try_again:
24321
24322 /* remember the largest hole we saw so far */
24323 if (addr + largest_hole < vma->vm_start)
24324 - largest_hole = vma->vm_start - addr;
24325 + largest_hole = vma->vm_start - addr;
24326
24327 /* try just below the current vma->vm_start */
24328 - addr = (vma->vm_start - len) & huge_page_mask(h);
24329 - } while (len <= vma->vm_start);
24330 + addr = skip_heap_stack_gap(vma, len);
24331 + } while (!IS_ERR_VALUE(addr));
24332
24333 fail:
24334 /*
24335 - * if hint left us with no space for the requested
24336 - * mapping then try again:
24337 - */
24338 - if (start_addr != base) {
24339 - mm->free_area_cache = base;
24340 - largest_hole = 0;
24341 - goto try_again;
24342 - }
24343 - /*
24344 * A failed mmap() very likely causes application failure,
24345 * so fall back to the bottom-up function here. This scenario
24346 * can happen with large stack limits and large mmap()
24347 * allocations.
24348 */
24349 - mm->free_area_cache = TASK_UNMAPPED_BASE;
24350 +
24351 +#ifdef CONFIG_PAX_SEGMEXEC
24352 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24353 + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24354 + else
24355 +#endif
24356 +
24357 + mm->mmap_base = TASK_UNMAPPED_BASE;
24358 +
24359 +#ifdef CONFIG_PAX_RANDMMAP
24360 + if (mm->pax_flags & MF_PAX_RANDMMAP)
24361 + mm->mmap_base += mm->delta_mmap;
24362 +#endif
24363 +
24364 + mm->free_area_cache = mm->mmap_base;
24365 mm->cached_hole_size = ~0UL;
24366 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24367 len, pgoff, flags);
24368 @@ -382,6 +393,7 @@ fail:
24369 /*
24370 * Restore the topdown base:
24371 */
24372 + mm->mmap_base = base;
24373 mm->free_area_cache = base;
24374 mm->cached_hole_size = ~0UL;
24375
24376 @@ -395,10 +407,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24377 struct hstate *h = hstate_file(file);
24378 struct mm_struct *mm = current->mm;
24379 struct vm_area_struct *vma;
24380 + unsigned long pax_task_size = TASK_SIZE;
24381
24382 if (len & ~huge_page_mask(h))
24383 return -EINVAL;
24384 - if (len > TASK_SIZE)
24385 +
24386 +#ifdef CONFIG_PAX_SEGMEXEC
24387 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24388 + pax_task_size = SEGMEXEC_TASK_SIZE;
24389 +#endif
24390 +
24391 + pax_task_size -= PAGE_SIZE;
24392 +
24393 + if (len > pax_task_size)
24394 return -ENOMEM;
24395
24396 if (flags & MAP_FIXED) {
24397 @@ -410,8 +431,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24398 if (addr) {
24399 addr = ALIGN(addr, huge_page_size(h));
24400 vma = find_vma(mm, addr);
24401 - if (TASK_SIZE - len >= addr &&
24402 - (!vma || addr + len <= vma->vm_start))
24403 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24404 return addr;
24405 }
24406 if (mm->get_unmapped_area == arch_get_unmapped_area)
24407 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24408 index bc4e9d8..ca4c14b 100644
24409 --- a/arch/x86/mm/init.c
24410 +++ b/arch/x86/mm/init.c
24411 @@ -16,6 +16,8 @@
24412 #include <asm/tlb.h>
24413 #include <asm/proto.h>
24414 #include <asm/dma.h> /* for MAX_DMA_PFN */
24415 +#include <asm/desc.h>
24416 +#include <asm/bios_ebda.h>
24417
24418 unsigned long __initdata pgt_buf_start;
24419 unsigned long __meminitdata pgt_buf_end;
24420 @@ -38,7 +40,7 @@ struct map_range {
24421 static void __init find_early_table_space(struct map_range *mr, unsigned long end,
24422 int use_pse, int use_gbpages)
24423 {
24424 - unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
24425 + unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
24426 phys_addr_t base;
24427
24428 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
24429 @@ -317,10 +319,37 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24430 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
24431 * mmio resources as well as potential bios/acpi data regions.
24432 */
24433 +
24434 +#ifdef CONFIG_GRKERNSEC_KMEM
24435 +static unsigned int ebda_start __read_only;
24436 +static unsigned int ebda_end __read_only;
24437 +#endif
24438 +
24439 int devmem_is_allowed(unsigned long pagenr)
24440 {
24441 +#ifdef CONFIG_GRKERNSEC_KMEM
24442 + /* allow BDA */
24443 + if (!pagenr)
24444 + return 1;
24445 + /* allow EBDA */
24446 + if (pagenr >= ebda_start && pagenr < ebda_end)
24447 + return 1;
24448 +#else
24449 + if (!pagenr)
24450 + return 1;
24451 +#ifdef CONFIG_VM86
24452 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24453 + return 1;
24454 +#endif
24455 +#endif
24456 +
24457 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24458 + return 1;
24459 +#ifdef CONFIG_GRKERNSEC_KMEM
24460 + /* throw out everything else below 1MB */
24461 if (pagenr <= 256)
24462 - return 1;
24463 + return 0;
24464 +#endif
24465 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24466 return 0;
24467 if (!page_is_ram(pagenr))
24468 @@ -377,8 +406,116 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24469 #endif
24470 }
24471
24472 +#ifdef CONFIG_GRKERNSEC_KMEM
24473 +static inline void gr_init_ebda(void)
24474 +{
24475 + unsigned int ebda_addr;
24476 + unsigned int ebda_size = 0;
24477 +
24478 + ebda_addr = get_bios_ebda();
24479 + if (ebda_addr) {
24480 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
24481 + ebda_size <<= 10;
24482 + }
24483 + if (ebda_addr && ebda_size) {
24484 + ebda_start = ebda_addr >> PAGE_SHIFT;
24485 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
24486 + } else {
24487 + ebda_start = 0x9f000 >> PAGE_SHIFT;
24488 + ebda_end = 0xa0000 >> PAGE_SHIFT;
24489 + }
24490 +}
24491 +#else
24492 +static inline void gr_init_ebda(void) { }
24493 +#endif
24494 +
24495 void free_initmem(void)
24496 {
24497 +#ifdef CONFIG_PAX_KERNEXEC
24498 +#ifdef CONFIG_X86_32
24499 + /* PaX: limit KERNEL_CS to actual size */
24500 + unsigned long addr, limit;
24501 + struct desc_struct d;
24502 + int cpu;
24503 +#else
24504 + pgd_t *pgd;
24505 + pud_t *pud;
24506 + pmd_t *pmd;
24507 + unsigned long addr, end;
24508 +#endif
24509 +#endif
24510 +
24511 + gr_init_ebda();
24512 +
24513 +#ifdef CONFIG_PAX_KERNEXEC
24514 +#ifdef CONFIG_X86_32
24515 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24516 + limit = (limit - 1UL) >> PAGE_SHIFT;
24517 +
24518 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24519 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24520 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24521 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24522 + }
24523 +
24524 + /* PaX: make KERNEL_CS read-only */
24525 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24526 + if (!paravirt_enabled())
24527 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24528 +/*
24529 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24530 + pgd = pgd_offset_k(addr);
24531 + pud = pud_offset(pgd, addr);
24532 + pmd = pmd_offset(pud, addr);
24533 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24534 + }
24535 +*/
24536 +#ifdef CONFIG_X86_PAE
24537 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24538 +/*
24539 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24540 + pgd = pgd_offset_k(addr);
24541 + pud = pud_offset(pgd, addr);
24542 + pmd = pmd_offset(pud, addr);
24543 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24544 + }
24545 +*/
24546 +#endif
24547 +
24548 +#ifdef CONFIG_MODULES
24549 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24550 +#endif
24551 +
24552 +#else
24553 + /* PaX: make kernel code/rodata read-only, rest non-executable */
24554 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24555 + pgd = pgd_offset_k(addr);
24556 + pud = pud_offset(pgd, addr);
24557 + pmd = pmd_offset(pud, addr);
24558 + if (!pmd_present(*pmd))
24559 + continue;
24560 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24561 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24562 + else
24563 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24564 + }
24565 +
24566 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24567 + end = addr + KERNEL_IMAGE_SIZE;
24568 + for (; addr < end; addr += PMD_SIZE) {
24569 + pgd = pgd_offset_k(addr);
24570 + pud = pud_offset(pgd, addr);
24571 + pmd = pmd_offset(pud, addr);
24572 + if (!pmd_present(*pmd))
24573 + continue;
24574 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24575 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24576 + }
24577 +#endif
24578 +
24579 + flush_tlb_all();
24580 +#endif
24581 +
24582 free_init_pages("unused kernel memory",
24583 (unsigned long)(&__init_begin),
24584 (unsigned long)(&__init_end));
24585 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24586 index 575d86f..4987469 100644
24587 --- a/arch/x86/mm/init_32.c
24588 +++ b/arch/x86/mm/init_32.c
24589 @@ -73,36 +73,6 @@ static __init void *alloc_low_page(void)
24590 }
24591
24592 /*
24593 - * Creates a middle page table and puts a pointer to it in the
24594 - * given global directory entry. This only returns the gd entry
24595 - * in non-PAE compilation mode, since the middle layer is folded.
24596 - */
24597 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
24598 -{
24599 - pud_t *pud;
24600 - pmd_t *pmd_table;
24601 -
24602 -#ifdef CONFIG_X86_PAE
24603 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24604 - if (after_bootmem)
24605 - pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24606 - else
24607 - pmd_table = (pmd_t *)alloc_low_page();
24608 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24609 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24610 - pud = pud_offset(pgd, 0);
24611 - BUG_ON(pmd_table != pmd_offset(pud, 0));
24612 -
24613 - return pmd_table;
24614 - }
24615 -#endif
24616 - pud = pud_offset(pgd, 0);
24617 - pmd_table = pmd_offset(pud, 0);
24618 -
24619 - return pmd_table;
24620 -}
24621 -
24622 -/*
24623 * Create a page table and place a pointer to it in a middle page
24624 * directory entry:
24625 */
24626 @@ -122,13 +92,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24627 page_table = (pte_t *)alloc_low_page();
24628
24629 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24630 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24631 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24632 +#else
24633 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24634 +#endif
24635 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24636 }
24637
24638 return pte_offset_kernel(pmd, 0);
24639 }
24640
24641 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
24642 +{
24643 + pud_t *pud;
24644 + pmd_t *pmd_table;
24645 +
24646 + pud = pud_offset(pgd, 0);
24647 + pmd_table = pmd_offset(pud, 0);
24648 +
24649 + return pmd_table;
24650 +}
24651 +
24652 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24653 {
24654 int pgd_idx = pgd_index(vaddr);
24655 @@ -202,6 +187,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24656 int pgd_idx, pmd_idx;
24657 unsigned long vaddr;
24658 pgd_t *pgd;
24659 + pud_t *pud;
24660 pmd_t *pmd;
24661 pte_t *pte = NULL;
24662
24663 @@ -211,8 +197,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24664 pgd = pgd_base + pgd_idx;
24665
24666 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24667 - pmd = one_md_table_init(pgd);
24668 - pmd = pmd + pmd_index(vaddr);
24669 + pud = pud_offset(pgd, vaddr);
24670 + pmd = pmd_offset(pud, vaddr);
24671 +
24672 +#ifdef CONFIG_X86_PAE
24673 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24674 +#endif
24675 +
24676 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24677 pmd++, pmd_idx++) {
24678 pte = page_table_kmap_check(one_page_table_init(pmd),
24679 @@ -224,11 +215,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24680 }
24681 }
24682
24683 -static inline int is_kernel_text(unsigned long addr)
24684 +static inline int is_kernel_text(unsigned long start, unsigned long end)
24685 {
24686 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24687 - return 1;
24688 - return 0;
24689 + if ((start > ktla_ktva((unsigned long)_etext) ||
24690 + end <= ktla_ktva((unsigned long)_stext)) &&
24691 + (start > ktla_ktva((unsigned long)_einittext) ||
24692 + end <= ktla_ktva((unsigned long)_sinittext)) &&
24693 +
24694 +#ifdef CONFIG_ACPI_SLEEP
24695 + (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24696 +#endif
24697 +
24698 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24699 + return 0;
24700 + return 1;
24701 }
24702
24703 /*
24704 @@ -245,9 +245,10 @@ kernel_physical_mapping_init(unsigned long start,
24705 unsigned long last_map_addr = end;
24706 unsigned long start_pfn, end_pfn;
24707 pgd_t *pgd_base = swapper_pg_dir;
24708 - int pgd_idx, pmd_idx, pte_ofs;
24709 + unsigned int pgd_idx, pmd_idx, pte_ofs;
24710 unsigned long pfn;
24711 pgd_t *pgd;
24712 + pud_t *pud;
24713 pmd_t *pmd;
24714 pte_t *pte;
24715 unsigned pages_2m, pages_4k;
24716 @@ -280,8 +281,13 @@ repeat:
24717 pfn = start_pfn;
24718 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24719 pgd = pgd_base + pgd_idx;
24720 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24721 - pmd = one_md_table_init(pgd);
24722 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24723 + pud = pud_offset(pgd, 0);
24724 + pmd = pmd_offset(pud, 0);
24725 +
24726 +#ifdef CONFIG_X86_PAE
24727 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24728 +#endif
24729
24730 if (pfn >= end_pfn)
24731 continue;
24732 @@ -293,14 +299,13 @@ repeat:
24733 #endif
24734 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24735 pmd++, pmd_idx++) {
24736 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24737 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
24738
24739 /*
24740 * Map with big pages if possible, otherwise
24741 * create normal page tables:
24742 */
24743 if (use_pse) {
24744 - unsigned int addr2;
24745 pgprot_t prot = PAGE_KERNEL_LARGE;
24746 /*
24747 * first pass will use the same initial
24748 @@ -310,11 +315,7 @@ repeat:
24749 __pgprot(PTE_IDENT_ATTR |
24750 _PAGE_PSE);
24751
24752 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
24753 - PAGE_OFFSET + PAGE_SIZE-1;
24754 -
24755 - if (is_kernel_text(addr) ||
24756 - is_kernel_text(addr2))
24757 + if (is_kernel_text(address, address + PMD_SIZE))
24758 prot = PAGE_KERNEL_LARGE_EXEC;
24759
24760 pages_2m++;
24761 @@ -331,7 +332,7 @@ repeat:
24762 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24763 pte += pte_ofs;
24764 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
24765 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
24766 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
24767 pgprot_t prot = PAGE_KERNEL;
24768 /*
24769 * first pass will use the same initial
24770 @@ -339,7 +340,7 @@ repeat:
24771 */
24772 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
24773
24774 - if (is_kernel_text(addr))
24775 + if (is_kernel_text(address, address + PAGE_SIZE))
24776 prot = PAGE_KERNEL_EXEC;
24777
24778 pages_4k++;
24779 @@ -465,7 +466,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
24780
24781 pud = pud_offset(pgd, va);
24782 pmd = pmd_offset(pud, va);
24783 - if (!pmd_present(*pmd))
24784 + if (!pmd_present(*pmd) || pmd_huge(*pmd))
24785 break;
24786
24787 pte = pte_offset_kernel(pmd, va);
24788 @@ -517,12 +518,10 @@ void __init early_ioremap_page_table_range_init(void)
24789
24790 static void __init pagetable_init(void)
24791 {
24792 - pgd_t *pgd_base = swapper_pg_dir;
24793 -
24794 - permanent_kmaps_init(pgd_base);
24795 + permanent_kmaps_init(swapper_pg_dir);
24796 }
24797
24798 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24799 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24800 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24801
24802 /* user-defined highmem size */
24803 @@ -734,6 +733,12 @@ void __init mem_init(void)
24804
24805 pci_iommu_alloc();
24806
24807 +#ifdef CONFIG_PAX_PER_CPU_PGD
24808 + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24809 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24810 + KERNEL_PGD_PTRS);
24811 +#endif
24812 +
24813 #ifdef CONFIG_FLATMEM
24814 BUG_ON(!mem_map);
24815 #endif
24816 @@ -760,7 +765,7 @@ void __init mem_init(void)
24817 reservedpages++;
24818
24819 codesize = (unsigned long) &_etext - (unsigned long) &_text;
24820 - datasize = (unsigned long) &_edata - (unsigned long) &_etext;
24821 + datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
24822 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
24823
24824 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
24825 @@ -801,10 +806,10 @@ void __init mem_init(void)
24826 ((unsigned long)&__init_end -
24827 (unsigned long)&__init_begin) >> 10,
24828
24829 - (unsigned long)&_etext, (unsigned long)&_edata,
24830 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
24831 + (unsigned long)&_sdata, (unsigned long)&_edata,
24832 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
24833
24834 - (unsigned long)&_text, (unsigned long)&_etext,
24835 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
24836 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
24837
24838 /*
24839 @@ -882,6 +887,7 @@ void set_kernel_text_rw(void)
24840 if (!kernel_set_to_readonly)
24841 return;
24842
24843 + start = ktla_ktva(start);
24844 pr_debug("Set kernel text: %lx - %lx for read write\n",
24845 start, start+size);
24846
24847 @@ -896,6 +902,7 @@ void set_kernel_text_ro(void)
24848 if (!kernel_set_to_readonly)
24849 return;
24850
24851 + start = ktla_ktva(start);
24852 pr_debug("Set kernel text: %lx - %lx for read only\n",
24853 start, start+size);
24854
24855 @@ -924,6 +931,7 @@ void mark_rodata_ro(void)
24856 unsigned long start = PFN_ALIGN(_text);
24857 unsigned long size = PFN_ALIGN(_etext) - start;
24858
24859 + start = ktla_ktva(start);
24860 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
24861 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
24862 size >> 10);
24863 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
24864 index 2b6b4a3..c17210d 100644
24865 --- a/arch/x86/mm/init_64.c
24866 +++ b/arch/x86/mm/init_64.c
24867 @@ -74,7 +74,7 @@ early_param("gbpages", parse_direct_gbpages_on);
24868 * around without checking the pgd every time.
24869 */
24870
24871 -pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
24872 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
24873 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24874
24875 int force_personality32;
24876 @@ -107,12 +107,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24877
24878 for (address = start; address <= end; address += PGDIR_SIZE) {
24879 const pgd_t *pgd_ref = pgd_offset_k(address);
24880 +
24881 +#ifdef CONFIG_PAX_PER_CPU_PGD
24882 + unsigned long cpu;
24883 +#else
24884 struct page *page;
24885 +#endif
24886
24887 if (pgd_none(*pgd_ref))
24888 continue;
24889
24890 spin_lock(&pgd_lock);
24891 +
24892 +#ifdef CONFIG_PAX_PER_CPU_PGD
24893 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
24894 + pgd_t *pgd = pgd_offset_cpu(cpu, address);
24895 +#else
24896 list_for_each_entry(page, &pgd_list, lru) {
24897 pgd_t *pgd;
24898 spinlock_t *pgt_lock;
24899 @@ -121,6 +131,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24900 /* the pgt_lock only for Xen */
24901 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
24902 spin_lock(pgt_lock);
24903 +#endif
24904
24905 if (pgd_none(*pgd))
24906 set_pgd(pgd, *pgd_ref);
24907 @@ -128,7 +139,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24908 BUG_ON(pgd_page_vaddr(*pgd)
24909 != pgd_page_vaddr(*pgd_ref));
24910
24911 +#ifndef CONFIG_PAX_PER_CPU_PGD
24912 spin_unlock(pgt_lock);
24913 +#endif
24914 +
24915 }
24916 spin_unlock(&pgd_lock);
24917 }
24918 @@ -161,7 +175,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
24919 {
24920 if (pgd_none(*pgd)) {
24921 pud_t *pud = (pud_t *)spp_getpage();
24922 - pgd_populate(&init_mm, pgd, pud);
24923 + pgd_populate_kernel(&init_mm, pgd, pud);
24924 if (pud != pud_offset(pgd, 0))
24925 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
24926 pud, pud_offset(pgd, 0));
24927 @@ -173,7 +187,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
24928 {
24929 if (pud_none(*pud)) {
24930 pmd_t *pmd = (pmd_t *) spp_getpage();
24931 - pud_populate(&init_mm, pud, pmd);
24932 + pud_populate_kernel(&init_mm, pud, pmd);
24933 if (pmd != pmd_offset(pud, 0))
24934 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
24935 pmd, pmd_offset(pud, 0));
24936 @@ -202,7 +216,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
24937 pmd = fill_pmd(pud, vaddr);
24938 pte = fill_pte(pmd, vaddr);
24939
24940 + pax_open_kernel();
24941 set_pte(pte, new_pte);
24942 + pax_close_kernel();
24943
24944 /*
24945 * It's enough to flush this one mapping.
24946 @@ -261,14 +277,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
24947 pgd = pgd_offset_k((unsigned long)__va(phys));
24948 if (pgd_none(*pgd)) {
24949 pud = (pud_t *) spp_getpage();
24950 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
24951 - _PAGE_USER));
24952 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
24953 }
24954 pud = pud_offset(pgd, (unsigned long)__va(phys));
24955 if (pud_none(*pud)) {
24956 pmd = (pmd_t *) spp_getpage();
24957 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
24958 - _PAGE_USER));
24959 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
24960 }
24961 pmd = pmd_offset(pud, phys);
24962 BUG_ON(!pmd_none(*pmd));
24963 @@ -329,7 +343,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
24964 if (pfn >= pgt_buf_top)
24965 panic("alloc_low_page: ran out of memory");
24966
24967 - adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24968 + adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24969 clear_page(adr);
24970 *phys = pfn * PAGE_SIZE;
24971 return adr;
24972 @@ -345,7 +359,7 @@ static __ref void *map_low_page(void *virt)
24973
24974 phys = __pa(virt);
24975 left = phys & (PAGE_SIZE - 1);
24976 - adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24977 + adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24978 adr = (void *)(((unsigned long)adr) | left);
24979
24980 return adr;
24981 @@ -548,7 +562,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
24982 unmap_low_page(pmd);
24983
24984 spin_lock(&init_mm.page_table_lock);
24985 - pud_populate(&init_mm, pud, __va(pmd_phys));
24986 + pud_populate_kernel(&init_mm, pud, __va(pmd_phys));
24987 spin_unlock(&init_mm.page_table_lock);
24988 }
24989 __flush_tlb_all();
24990 @@ -594,7 +608,7 @@ kernel_physical_mapping_init(unsigned long start,
24991 unmap_low_page(pud);
24992
24993 spin_lock(&init_mm.page_table_lock);
24994 - pgd_populate(&init_mm, pgd, __va(pud_phys));
24995 + pgd_populate_kernel(&init_mm, pgd, __va(pud_phys));
24996 spin_unlock(&init_mm.page_table_lock);
24997 pgd_changed = true;
24998 }
24999 @@ -686,6 +700,12 @@ void __init mem_init(void)
25000
25001 pci_iommu_alloc();
25002
25003 +#ifdef CONFIG_PAX_PER_CPU_PGD
25004 + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25005 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25006 + KERNEL_PGD_PTRS);
25007 +#endif
25008 +
25009 /* clear_bss() already clear the empty_zero_page */
25010
25011 reservedpages = 0;
25012 @@ -846,8 +866,8 @@ int kern_addr_valid(unsigned long addr)
25013 static struct vm_area_struct gate_vma = {
25014 .vm_start = VSYSCALL_START,
25015 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
25016 - .vm_page_prot = PAGE_READONLY_EXEC,
25017 - .vm_flags = VM_READ | VM_EXEC
25018 + .vm_page_prot = PAGE_READONLY,
25019 + .vm_flags = VM_READ
25020 };
25021
25022 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
25023 @@ -881,7 +901,7 @@ int in_gate_area_no_mm(unsigned long addr)
25024
25025 const char *arch_vma_name(struct vm_area_struct *vma)
25026 {
25027 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
25028 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
25029 return "[vdso]";
25030 if (vma == &gate_vma)
25031 return "[vsyscall]";
25032 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
25033 index 7b179b4..6bd1777 100644
25034 --- a/arch/x86/mm/iomap_32.c
25035 +++ b/arch/x86/mm/iomap_32.c
25036 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
25037 type = kmap_atomic_idx_push();
25038 idx = type + KM_TYPE_NR * smp_processor_id();
25039 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
25040 +
25041 + pax_open_kernel();
25042 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
25043 + pax_close_kernel();
25044 +
25045 arch_flush_lazy_mmu_mode();
25046
25047 return (void *)vaddr;
25048 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
25049 index 78fe3f1..8293b6f 100644
25050 --- a/arch/x86/mm/ioremap.c
25051 +++ b/arch/x86/mm/ioremap.c
25052 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
25053 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
25054 int is_ram = page_is_ram(pfn);
25055
25056 - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
25057 + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
25058 return NULL;
25059 WARN_ON_ONCE(is_ram);
25060 }
25061 @@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
25062
25063 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
25064 if (page_is_ram(start >> PAGE_SHIFT))
25065 +#ifdef CONFIG_HIGHMEM
25066 + if ((start >> PAGE_SHIFT) < max_low_pfn)
25067 +#endif
25068 return __va(phys);
25069
25070 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
25071 @@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
25072 early_param("early_ioremap_debug", early_ioremap_debug_setup);
25073
25074 static __initdata int after_paging_init;
25075 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
25076 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
25077
25078 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
25079 {
25080 @@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
25081 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
25082
25083 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
25084 - memset(bm_pte, 0, sizeof(bm_pte));
25085 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
25086 + pmd_populate_user(&init_mm, pmd, bm_pte);
25087
25088 /*
25089 * The boot-ioremap range spans multiple pmds, for which
25090 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25091 index d87dd6d..bf3fa66 100644
25092 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
25093 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25094 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25095 * memory (e.g. tracked pages)? For now, we need this to avoid
25096 * invoking kmemcheck for PnP BIOS calls.
25097 */
25098 - if (regs->flags & X86_VM_MASK)
25099 + if (v8086_mode(regs))
25100 return false;
25101 - if (regs->cs != __KERNEL_CS)
25102 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25103 return false;
25104
25105 pte = kmemcheck_pte_lookup(address);
25106 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25107 index 845df68..1d8d29f 100644
25108 --- a/arch/x86/mm/mmap.c
25109 +++ b/arch/x86/mm/mmap.c
25110 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
25111 * Leave an at least ~128 MB hole with possible stack randomization.
25112 */
25113 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25114 -#define MAX_GAP (TASK_SIZE/6*5)
25115 +#define MAX_GAP (pax_task_size/6*5)
25116
25117 static int mmap_is_legacy(void)
25118 {
25119 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
25120 return rnd << PAGE_SHIFT;
25121 }
25122
25123 -static unsigned long mmap_base(void)
25124 +static unsigned long mmap_base(struct mm_struct *mm)
25125 {
25126 unsigned long gap = rlimit(RLIMIT_STACK);
25127 + unsigned long pax_task_size = TASK_SIZE;
25128 +
25129 +#ifdef CONFIG_PAX_SEGMEXEC
25130 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
25131 + pax_task_size = SEGMEXEC_TASK_SIZE;
25132 +#endif
25133
25134 if (gap < MIN_GAP)
25135 gap = MIN_GAP;
25136 else if (gap > MAX_GAP)
25137 gap = MAX_GAP;
25138
25139 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25140 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25141 }
25142
25143 /*
25144 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25145 * does, but not when emulating X86_32
25146 */
25147 -static unsigned long mmap_legacy_base(void)
25148 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
25149 {
25150 - if (mmap_is_ia32())
25151 + if (mmap_is_ia32()) {
25152 +
25153 +#ifdef CONFIG_PAX_SEGMEXEC
25154 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
25155 + return SEGMEXEC_TASK_UNMAPPED_BASE;
25156 + else
25157 +#endif
25158 +
25159 return TASK_UNMAPPED_BASE;
25160 - else
25161 + } else
25162 return TASK_UNMAPPED_BASE + mmap_rnd();
25163 }
25164
25165 @@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
25166 void arch_pick_mmap_layout(struct mm_struct *mm)
25167 {
25168 if (mmap_is_legacy()) {
25169 - mm->mmap_base = mmap_legacy_base();
25170 + mm->mmap_base = mmap_legacy_base(mm);
25171 +
25172 +#ifdef CONFIG_PAX_RANDMMAP
25173 + if (mm->pax_flags & MF_PAX_RANDMMAP)
25174 + mm->mmap_base += mm->delta_mmap;
25175 +#endif
25176 +
25177 mm->get_unmapped_area = arch_get_unmapped_area;
25178 mm->unmap_area = arch_unmap_area;
25179 } else {
25180 - mm->mmap_base = mmap_base();
25181 + mm->mmap_base = mmap_base(mm);
25182 +
25183 +#ifdef CONFIG_PAX_RANDMMAP
25184 + if (mm->pax_flags & MF_PAX_RANDMMAP)
25185 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25186 +#endif
25187 +
25188 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25189 mm->unmap_area = arch_unmap_area_topdown;
25190 }
25191 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25192 index dc0b727..dc9d71a 100644
25193 --- a/arch/x86/mm/mmio-mod.c
25194 +++ b/arch/x86/mm/mmio-mod.c
25195 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25196 break;
25197 default:
25198 {
25199 - unsigned char *ip = (unsigned char *)instptr;
25200 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25201 my_trace->opcode = MMIO_UNKNOWN_OP;
25202 my_trace->width = 0;
25203 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25204 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25205 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25206 void __iomem *addr)
25207 {
25208 - static atomic_t next_id;
25209 + static atomic_unchecked_t next_id;
25210 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25211 /* These are page-unaligned. */
25212 struct mmiotrace_map map = {
25213 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25214 .private = trace
25215 },
25216 .phys = offset,
25217 - .id = atomic_inc_return(&next_id)
25218 + .id = atomic_inc_return_unchecked(&next_id)
25219 };
25220 map.map_id = trace->id;
25221
25222 diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25223 index b008656..773eac2 100644
25224 --- a/arch/x86/mm/pageattr-test.c
25225 +++ b/arch/x86/mm/pageattr-test.c
25226 @@ -36,7 +36,7 @@ enum {
25227
25228 static int pte_testbit(pte_t pte)
25229 {
25230 - return pte_flags(pte) & _PAGE_UNUSED1;
25231 + return pte_flags(pte) & _PAGE_CPA_TEST;
25232 }
25233
25234 struct split_state {
25235 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25236 index a718e0d..45efc32 100644
25237 --- a/arch/x86/mm/pageattr.c
25238 +++ b/arch/x86/mm/pageattr.c
25239 @@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25240 */
25241 #ifdef CONFIG_PCI_BIOS
25242 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25243 - pgprot_val(forbidden) |= _PAGE_NX;
25244 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25245 #endif
25246
25247 /*
25248 @@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25249 * Does not cover __inittext since that is gone later on. On
25250 * 64bit we do not enforce !NX on the low mapping
25251 */
25252 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
25253 - pgprot_val(forbidden) |= _PAGE_NX;
25254 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25255 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25256
25257 +#ifdef CONFIG_DEBUG_RODATA
25258 /*
25259 * The .rodata section needs to be read-only. Using the pfn
25260 * catches all aliases.
25261 @@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25262 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25263 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25264 pgprot_val(forbidden) |= _PAGE_RW;
25265 +#endif
25266
25267 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25268 /*
25269 @@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25270 }
25271 #endif
25272
25273 +#ifdef CONFIG_PAX_KERNEXEC
25274 + if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25275 + pgprot_val(forbidden) |= _PAGE_RW;
25276 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25277 + }
25278 +#endif
25279 +
25280 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25281
25282 return prot;
25283 @@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25284 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25285 {
25286 /* change init_mm */
25287 + pax_open_kernel();
25288 set_pte_atomic(kpte, pte);
25289 +
25290 #ifdef CONFIG_X86_32
25291 if (!SHARED_KERNEL_PMD) {
25292 +
25293 +#ifdef CONFIG_PAX_PER_CPU_PGD
25294 + unsigned long cpu;
25295 +#else
25296 struct page *page;
25297 +#endif
25298
25299 +#ifdef CONFIG_PAX_PER_CPU_PGD
25300 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25301 + pgd_t *pgd = get_cpu_pgd(cpu);
25302 +#else
25303 list_for_each_entry(page, &pgd_list, lru) {
25304 - pgd_t *pgd;
25305 + pgd_t *pgd = (pgd_t *)page_address(page);
25306 +#endif
25307 +
25308 pud_t *pud;
25309 pmd_t *pmd;
25310
25311 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
25312 + pgd += pgd_index(address);
25313 pud = pud_offset(pgd, address);
25314 pmd = pmd_offset(pud, address);
25315 set_pte_atomic((pte_t *)pmd, pte);
25316 }
25317 }
25318 #endif
25319 + pax_close_kernel();
25320 }
25321
25322 static int
25323 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25324 index 3d68ef6..7f69136 100644
25325 --- a/arch/x86/mm/pat.c
25326 +++ b/arch/x86/mm/pat.c
25327 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
25328
25329 if (!entry) {
25330 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
25331 - current->comm, current->pid, start, end - 1);
25332 + current->comm, task_pid_nr(current), start, end - 1);
25333 return -EINVAL;
25334 }
25335
25336 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25337
25338 while (cursor < to) {
25339 if (!devmem_is_allowed(pfn)) {
25340 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
25341 - current->comm, from, to - 1);
25342 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
25343 + current->comm, from, to - 1, cursor);
25344 return 0;
25345 }
25346 cursor += PAGE_SIZE;
25347 @@ -570,7 +570,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25348 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
25349 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
25350 "for [mem %#010Lx-%#010Lx]\n",
25351 - current->comm, current->pid,
25352 + current->comm, task_pid_nr(current),
25353 cattr_name(flags),
25354 base, (unsigned long long)(base + size-1));
25355 return -EINVAL;
25356 @@ -605,7 +605,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25357 flags = lookup_memtype(paddr);
25358 if (want_flags != flags) {
25359 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
25360 - current->comm, current->pid,
25361 + current->comm, task_pid_nr(current),
25362 cattr_name(want_flags),
25363 (unsigned long long)paddr,
25364 (unsigned long long)(paddr + size - 1),
25365 @@ -627,7 +627,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25366 free_memtype(paddr, paddr + size);
25367 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25368 " for [mem %#010Lx-%#010Lx], got %s\n",
25369 - current->comm, current->pid,
25370 + current->comm, task_pid_nr(current),
25371 cattr_name(want_flags),
25372 (unsigned long long)paddr,
25373 (unsigned long long)(paddr + size - 1),
25374 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25375 index 9f0614d..92ae64a 100644
25376 --- a/arch/x86/mm/pf_in.c
25377 +++ b/arch/x86/mm/pf_in.c
25378 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25379 int i;
25380 enum reason_type rv = OTHERS;
25381
25382 - p = (unsigned char *)ins_addr;
25383 + p = (unsigned char *)ktla_ktva(ins_addr);
25384 p += skip_prefix(p, &prf);
25385 p += get_opcode(p, &opcode);
25386
25387 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25388 struct prefix_bits prf;
25389 int i;
25390
25391 - p = (unsigned char *)ins_addr;
25392 + p = (unsigned char *)ktla_ktva(ins_addr);
25393 p += skip_prefix(p, &prf);
25394 p += get_opcode(p, &opcode);
25395
25396 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25397 struct prefix_bits prf;
25398 int i;
25399
25400 - p = (unsigned char *)ins_addr;
25401 + p = (unsigned char *)ktla_ktva(ins_addr);
25402 p += skip_prefix(p, &prf);
25403 p += get_opcode(p, &opcode);
25404
25405 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25406 struct prefix_bits prf;
25407 int i;
25408
25409 - p = (unsigned char *)ins_addr;
25410 + p = (unsigned char *)ktla_ktva(ins_addr);
25411 p += skip_prefix(p, &prf);
25412 p += get_opcode(p, &opcode);
25413 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25414 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25415 struct prefix_bits prf;
25416 int i;
25417
25418 - p = (unsigned char *)ins_addr;
25419 + p = (unsigned char *)ktla_ktva(ins_addr);
25420 p += skip_prefix(p, &prf);
25421 p += get_opcode(p, &opcode);
25422 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25423 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25424 index 8573b83..4f3ed7e 100644
25425 --- a/arch/x86/mm/pgtable.c
25426 +++ b/arch/x86/mm/pgtable.c
25427 @@ -84,10 +84,64 @@ static inline void pgd_list_del(pgd_t *pgd)
25428 list_del(&page->lru);
25429 }
25430
25431 -#define UNSHARED_PTRS_PER_PGD \
25432 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25433 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25434 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25435
25436 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
25437 +{
25438 + unsigned int count = USER_PGD_PTRS;
25439
25440 + while (count--)
25441 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25442 +}
25443 +#endif
25444 +
25445 +#ifdef CONFIG_PAX_PER_CPU_PGD
25446 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
25447 +{
25448 + unsigned int count = USER_PGD_PTRS;
25449 +
25450 + while (count--) {
25451 + pgd_t pgd;
25452 +
25453 +#ifdef CONFIG_X86_64
25454 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
25455 +#else
25456 + pgd = *src++;
25457 +#endif
25458 +
25459 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25460 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
25461 +#endif
25462 +
25463 + *dst++ = pgd;
25464 + }
25465 +
25466 +}
25467 +#endif
25468 +
25469 +#ifdef CONFIG_X86_64
25470 +#define pxd_t pud_t
25471 +#define pyd_t pgd_t
25472 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25473 +#define pxd_free(mm, pud) pud_free((mm), (pud))
25474 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25475 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
25476 +#define PYD_SIZE PGDIR_SIZE
25477 +#else
25478 +#define pxd_t pmd_t
25479 +#define pyd_t pud_t
25480 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25481 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
25482 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25483 +#define pyd_offset(mm, address) pud_offset((mm), (address))
25484 +#define PYD_SIZE PUD_SIZE
25485 +#endif
25486 +
25487 +#ifdef CONFIG_PAX_PER_CPU_PGD
25488 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25489 +static inline void pgd_dtor(pgd_t *pgd) {}
25490 +#else
25491 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25492 {
25493 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25494 @@ -128,6 +182,7 @@ static void pgd_dtor(pgd_t *pgd)
25495 pgd_list_del(pgd);
25496 spin_unlock(&pgd_lock);
25497 }
25498 +#endif
25499
25500 /*
25501 * List of all pgd's needed for non-PAE so it can invalidate entries
25502 @@ -140,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
25503 * -- wli
25504 */
25505
25506 -#ifdef CONFIG_X86_PAE
25507 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25508 /*
25509 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25510 * updating the top-level pagetable entries to guarantee the
25511 @@ -152,7 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
25512 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25513 * and initialize the kernel pmds here.
25514 */
25515 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25516 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25517
25518 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25519 {
25520 @@ -170,36 +225,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25521 */
25522 flush_tlb_mm(mm);
25523 }
25524 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25525 +#define PREALLOCATED_PXDS USER_PGD_PTRS
25526 #else /* !CONFIG_X86_PAE */
25527
25528 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25529 -#define PREALLOCATED_PMDS 0
25530 +#define PREALLOCATED_PXDS 0
25531
25532 #endif /* CONFIG_X86_PAE */
25533
25534 -static void free_pmds(pmd_t *pmds[])
25535 +static void free_pxds(pxd_t *pxds[])
25536 {
25537 int i;
25538
25539 - for(i = 0; i < PREALLOCATED_PMDS; i++)
25540 - if (pmds[i])
25541 - free_page((unsigned long)pmds[i]);
25542 + for(i = 0; i < PREALLOCATED_PXDS; i++)
25543 + if (pxds[i])
25544 + free_page((unsigned long)pxds[i]);
25545 }
25546
25547 -static int preallocate_pmds(pmd_t *pmds[])
25548 +static int preallocate_pxds(pxd_t *pxds[])
25549 {
25550 int i;
25551 bool failed = false;
25552
25553 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
25554 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25555 - if (pmd == NULL)
25556 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
25557 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25558 + if (pxd == NULL)
25559 failed = true;
25560 - pmds[i] = pmd;
25561 + pxds[i] = pxd;
25562 }
25563
25564 if (failed) {
25565 - free_pmds(pmds);
25566 + free_pxds(pxds);
25567 return -ENOMEM;
25568 }
25569
25570 @@ -212,51 +269,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25571 * preallocate which never got a corresponding vma will need to be
25572 * freed manually.
25573 */
25574 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25575 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25576 {
25577 int i;
25578
25579 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
25580 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
25581 pgd_t pgd = pgdp[i];
25582
25583 if (pgd_val(pgd) != 0) {
25584 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25585 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25586
25587 - pgdp[i] = native_make_pgd(0);
25588 + set_pgd(pgdp + i, native_make_pgd(0));
25589
25590 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25591 - pmd_free(mm, pmd);
25592 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25593 + pxd_free(mm, pxd);
25594 }
25595 }
25596 }
25597
25598 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25599 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25600 {
25601 - pud_t *pud;
25602 + pyd_t *pyd;
25603 unsigned long addr;
25604 int i;
25605
25606 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25607 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25608 return;
25609
25610 - pud = pud_offset(pgd, 0);
25611 +#ifdef CONFIG_X86_64
25612 + pyd = pyd_offset(mm, 0L);
25613 +#else
25614 + pyd = pyd_offset(pgd, 0L);
25615 +#endif
25616
25617 - for (addr = i = 0; i < PREALLOCATED_PMDS;
25618 - i++, pud++, addr += PUD_SIZE) {
25619 - pmd_t *pmd = pmds[i];
25620 + for (addr = i = 0; i < PREALLOCATED_PXDS;
25621 + i++, pyd++, addr += PYD_SIZE) {
25622 + pxd_t *pxd = pxds[i];
25623
25624 if (i >= KERNEL_PGD_BOUNDARY)
25625 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25626 - sizeof(pmd_t) * PTRS_PER_PMD);
25627 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25628 + sizeof(pxd_t) * PTRS_PER_PMD);
25629
25630 - pud_populate(mm, pud, pmd);
25631 + pyd_populate(mm, pyd, pxd);
25632 }
25633 }
25634
25635 pgd_t *pgd_alloc(struct mm_struct *mm)
25636 {
25637 pgd_t *pgd;
25638 - pmd_t *pmds[PREALLOCATED_PMDS];
25639 + pxd_t *pxds[PREALLOCATED_PXDS];
25640
25641 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25642
25643 @@ -265,11 +326,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25644
25645 mm->pgd = pgd;
25646
25647 - if (preallocate_pmds(pmds) != 0)
25648 + if (preallocate_pxds(pxds) != 0)
25649 goto out_free_pgd;
25650
25651 if (paravirt_pgd_alloc(mm) != 0)
25652 - goto out_free_pmds;
25653 + goto out_free_pxds;
25654
25655 /*
25656 * Make sure that pre-populating the pmds is atomic with
25657 @@ -279,14 +340,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25658 spin_lock(&pgd_lock);
25659
25660 pgd_ctor(mm, pgd);
25661 - pgd_prepopulate_pmd(mm, pgd, pmds);
25662 + pgd_prepopulate_pxd(mm, pgd, pxds);
25663
25664 spin_unlock(&pgd_lock);
25665
25666 return pgd;
25667
25668 -out_free_pmds:
25669 - free_pmds(pmds);
25670 +out_free_pxds:
25671 + free_pxds(pxds);
25672 out_free_pgd:
25673 free_page((unsigned long)pgd);
25674 out:
25675 @@ -295,7 +356,7 @@ out:
25676
25677 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25678 {
25679 - pgd_mop_up_pmds(mm, pgd);
25680 + pgd_mop_up_pxds(mm, pgd);
25681 pgd_dtor(pgd);
25682 paravirt_pgd_free(mm, pgd);
25683 free_page((unsigned long)pgd);
25684 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25685 index a69bcb8..19068ab 100644
25686 --- a/arch/x86/mm/pgtable_32.c
25687 +++ b/arch/x86/mm/pgtable_32.c
25688 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25689 return;
25690 }
25691 pte = pte_offset_kernel(pmd, vaddr);
25692 +
25693 + pax_open_kernel();
25694 if (pte_val(pteval))
25695 set_pte_at(&init_mm, vaddr, pte, pteval);
25696 else
25697 pte_clear(&init_mm, vaddr, pte);
25698 + pax_close_kernel();
25699
25700 /*
25701 * It's enough to flush this one mapping.
25702 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25703 index 410531d..0f16030 100644
25704 --- a/arch/x86/mm/setup_nx.c
25705 +++ b/arch/x86/mm/setup_nx.c
25706 @@ -5,8 +5,10 @@
25707 #include <asm/pgtable.h>
25708 #include <asm/proto.h>
25709
25710 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25711 static int disable_nx __cpuinitdata;
25712
25713 +#ifndef CONFIG_PAX_PAGEEXEC
25714 /*
25715 * noexec = on|off
25716 *
25717 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25718 return 0;
25719 }
25720 early_param("noexec", noexec_setup);
25721 +#endif
25722 +
25723 +#endif
25724
25725 void __cpuinit x86_configure_nx(void)
25726 {
25727 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25728 if (cpu_has_nx && !disable_nx)
25729 __supported_pte_mask |= _PAGE_NX;
25730 else
25731 +#endif
25732 __supported_pte_mask &= ~_PAGE_NX;
25733 }
25734
25735 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25736 index 5e57e11..64874249 100644
25737 --- a/arch/x86/mm/tlb.c
25738 +++ b/arch/x86/mm/tlb.c
25739 @@ -66,7 +66,11 @@ void leave_mm(int cpu)
25740 BUG();
25741 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
25742 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
25743 +
25744 +#ifndef CONFIG_PAX_PER_CPU_PGD
25745 load_cr3(swapper_pg_dir);
25746 +#endif
25747 +
25748 }
25749 }
25750 EXPORT_SYMBOL_GPL(leave_mm);
25751 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
25752 index 877b9a1..a8ecf42 100644
25753 --- a/arch/x86/net/bpf_jit.S
25754 +++ b/arch/x86/net/bpf_jit.S
25755 @@ -9,6 +9,7 @@
25756 */
25757 #include <linux/linkage.h>
25758 #include <asm/dwarf2.h>
25759 +#include <asm/alternative-asm.h>
25760
25761 /*
25762 * Calling convention :
25763 @@ -35,6 +36,7 @@ sk_load_word_positive_offset:
25764 jle bpf_slow_path_word
25765 mov (SKBDATA,%rsi),%eax
25766 bswap %eax /* ntohl() */
25767 + pax_force_retaddr
25768 ret
25769
25770 sk_load_half:
25771 @@ -52,6 +54,7 @@ sk_load_half_positive_offset:
25772 jle bpf_slow_path_half
25773 movzwl (SKBDATA,%rsi),%eax
25774 rol $8,%ax # ntohs()
25775 + pax_force_retaddr
25776 ret
25777
25778 sk_load_byte:
25779 @@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
25780 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
25781 jle bpf_slow_path_byte
25782 movzbl (SKBDATA,%rsi),%eax
25783 + pax_force_retaddr
25784 ret
25785
25786 /**
25787 @@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
25788 movzbl (SKBDATA,%rsi),%ebx
25789 and $15,%bl
25790 shl $2,%bl
25791 + pax_force_retaddr
25792 ret
25793
25794 /* rsi contains offset and can be scratched */
25795 @@ -109,6 +114,7 @@ bpf_slow_path_word:
25796 js bpf_error
25797 mov -12(%rbp),%eax
25798 bswap %eax
25799 + pax_force_retaddr
25800 ret
25801
25802 bpf_slow_path_half:
25803 @@ -117,12 +123,14 @@ bpf_slow_path_half:
25804 mov -12(%rbp),%ax
25805 rol $8,%ax
25806 movzwl %ax,%eax
25807 + pax_force_retaddr
25808 ret
25809
25810 bpf_slow_path_byte:
25811 bpf_slow_path_common(1)
25812 js bpf_error
25813 movzbl -12(%rbp),%eax
25814 + pax_force_retaddr
25815 ret
25816
25817 bpf_slow_path_byte_msh:
25818 @@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
25819 and $15,%al
25820 shl $2,%al
25821 xchg %eax,%ebx
25822 + pax_force_retaddr
25823 ret
25824
25825 #define sk_negative_common(SIZE) \
25826 @@ -157,6 +166,7 @@ sk_load_word_negative_offset:
25827 sk_negative_common(4)
25828 mov (%rax), %eax
25829 bswap %eax
25830 + pax_force_retaddr
25831 ret
25832
25833 bpf_slow_path_half_neg:
25834 @@ -168,6 +178,7 @@ sk_load_half_negative_offset:
25835 mov (%rax),%ax
25836 rol $8,%ax
25837 movzwl %ax,%eax
25838 + pax_force_retaddr
25839 ret
25840
25841 bpf_slow_path_byte_neg:
25842 @@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
25843 .globl sk_load_byte_negative_offset
25844 sk_negative_common(1)
25845 movzbl (%rax), %eax
25846 + pax_force_retaddr
25847 ret
25848
25849 bpf_slow_path_byte_msh_neg:
25850 @@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
25851 and $15,%al
25852 shl $2,%al
25853 xchg %eax,%ebx
25854 + pax_force_retaddr
25855 ret
25856
25857 bpf_error:
25858 @@ -197,4 +210,5 @@ bpf_error:
25859 xor %eax,%eax
25860 mov -8(%rbp),%rbx
25861 leaveq
25862 + pax_force_retaddr
25863 ret
25864 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
25865 index 0597f95..a12c36e 100644
25866 --- a/arch/x86/net/bpf_jit_comp.c
25867 +++ b/arch/x86/net/bpf_jit_comp.c
25868 @@ -120,6 +120,11 @@ static inline void bpf_flush_icache(void *start, void *end)
25869 set_fs(old_fs);
25870 }
25871
25872 +struct bpf_jit_work {
25873 + struct work_struct work;
25874 + void *image;
25875 +};
25876 +
25877 #define CHOOSE_LOAD_FUNC(K, func) \
25878 ((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset)
25879
25880 @@ -146,6 +151,10 @@ void bpf_jit_compile(struct sk_filter *fp)
25881 if (addrs == NULL)
25882 return;
25883
25884 + fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
25885 + if (!fp->work)
25886 + goto out;
25887 +
25888 /* Before first pass, make a rough estimation of addrs[]
25889 * each bpf instruction is translated to less than 64 bytes
25890 */
25891 @@ -589,17 +598,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25892 break;
25893 default:
25894 /* hmm, too complex filter, give up with jit compiler */
25895 - goto out;
25896 + goto error;
25897 }
25898 ilen = prog - temp;
25899 if (image) {
25900 if (unlikely(proglen + ilen > oldproglen)) {
25901 pr_err("bpb_jit_compile fatal error\n");
25902 - kfree(addrs);
25903 - module_free(NULL, image);
25904 - return;
25905 + module_free_exec(NULL, image);
25906 + goto error;
25907 }
25908 + pax_open_kernel();
25909 memcpy(image + proglen, temp, ilen);
25910 + pax_close_kernel();
25911 }
25912 proglen += ilen;
25913 addrs[i] = proglen;
25914 @@ -620,11 +630,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25915 break;
25916 }
25917 if (proglen == oldproglen) {
25918 - image = module_alloc(max_t(unsigned int,
25919 - proglen,
25920 - sizeof(struct work_struct)));
25921 + image = module_alloc_exec(proglen);
25922 if (!image)
25923 - goto out;
25924 + goto error;
25925 }
25926 oldproglen = proglen;
25927 }
25928 @@ -640,7 +648,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25929 bpf_flush_icache(image, image + proglen);
25930
25931 fp->bpf_func = (void *)image;
25932 - }
25933 + } else
25934 +error:
25935 + kfree(fp->work);
25936 +
25937 out:
25938 kfree(addrs);
25939 return;
25940 @@ -648,18 +659,20 @@ out:
25941
25942 static void jit_free_defer(struct work_struct *arg)
25943 {
25944 - module_free(NULL, arg);
25945 + module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
25946 + kfree(arg);
25947 }
25948
25949 /* run from softirq, we must use a work_struct to call
25950 - * module_free() from process context
25951 + * module_free_exec() from process context
25952 */
25953 void bpf_jit_free(struct sk_filter *fp)
25954 {
25955 if (fp->bpf_func != sk_run_filter) {
25956 - struct work_struct *work = (struct work_struct *)fp->bpf_func;
25957 + struct work_struct *work = &fp->work->work;
25958
25959 INIT_WORK(work, jit_free_defer);
25960 + fp->work->image = fp->bpf_func;
25961 schedule_work(work);
25962 }
25963 }
25964 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
25965 index d6aa6e8..266395a 100644
25966 --- a/arch/x86/oprofile/backtrace.c
25967 +++ b/arch/x86/oprofile/backtrace.c
25968 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
25969 struct stack_frame_ia32 *fp;
25970 unsigned long bytes;
25971
25972 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25973 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25974 if (bytes != sizeof(bufhead))
25975 return NULL;
25976
25977 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
25978 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
25979
25980 oprofile_add_trace(bufhead[0].return_address);
25981
25982 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
25983 struct stack_frame bufhead[2];
25984 unsigned long bytes;
25985
25986 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25987 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25988 if (bytes != sizeof(bufhead))
25989 return NULL;
25990
25991 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
25992 {
25993 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
25994
25995 - if (!user_mode_vm(regs)) {
25996 + if (!user_mode(regs)) {
25997 unsigned long stack = kernel_stack_pointer(regs);
25998 if (depth)
25999 dump_trace(NULL, regs, (unsigned long *)stack, 0,
26000 diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
26001 index 140942f..8a5cc55 100644
26002 --- a/arch/x86/pci/mrst.c
26003 +++ b/arch/x86/pci/mrst.c
26004 @@ -238,7 +238,9 @@ int __init pci_mrst_init(void)
26005 printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n");
26006 pci_mmcfg_late_init();
26007 pcibios_enable_irq = mrst_pci_irq_enable;
26008 - pci_root_ops = pci_mrst_ops;
26009 + pax_open_kernel();
26010 + memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
26011 + pax_close_kernel();
26012 pci_soc_mode = 1;
26013 /* Continue with standard init */
26014 return 1;
26015 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
26016 index da8fe05..7ee6704 100644
26017 --- a/arch/x86/pci/pcbios.c
26018 +++ b/arch/x86/pci/pcbios.c
26019 @@ -79,50 +79,93 @@ union bios32 {
26020 static struct {
26021 unsigned long address;
26022 unsigned short segment;
26023 -} bios32_indirect = { 0, __KERNEL_CS };
26024 +} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
26025
26026 /*
26027 * Returns the entry point for the given service, NULL on error
26028 */
26029
26030 -static unsigned long bios32_service(unsigned long service)
26031 +static unsigned long __devinit bios32_service(unsigned long service)
26032 {
26033 unsigned char return_code; /* %al */
26034 unsigned long address; /* %ebx */
26035 unsigned long length; /* %ecx */
26036 unsigned long entry; /* %edx */
26037 unsigned long flags;
26038 + struct desc_struct d, *gdt;
26039
26040 local_irq_save(flags);
26041 - __asm__("lcall *(%%edi); cld"
26042 +
26043 + gdt = get_cpu_gdt_table(smp_processor_id());
26044 +
26045 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
26046 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26047 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
26048 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26049 +
26050 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
26051 : "=a" (return_code),
26052 "=b" (address),
26053 "=c" (length),
26054 "=d" (entry)
26055 : "0" (service),
26056 "1" (0),
26057 - "D" (&bios32_indirect));
26058 + "D" (&bios32_indirect),
26059 + "r"(__PCIBIOS_DS)
26060 + : "memory");
26061 +
26062 + pax_open_kernel();
26063 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
26064 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
26065 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
26066 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
26067 + pax_close_kernel();
26068 +
26069 local_irq_restore(flags);
26070
26071 switch (return_code) {
26072 - case 0:
26073 - return address + entry;
26074 - case 0x80: /* Not present */
26075 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26076 - return 0;
26077 - default: /* Shouldn't happen */
26078 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26079 - service, return_code);
26080 + case 0: {
26081 + int cpu;
26082 + unsigned char flags;
26083 +
26084 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
26085 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
26086 + printk(KERN_WARNING "bios32_service: not valid\n");
26087 return 0;
26088 + }
26089 + address = address + PAGE_OFFSET;
26090 + length += 16UL; /* some BIOSs underreport this... */
26091 + flags = 4;
26092 + if (length >= 64*1024*1024) {
26093 + length >>= PAGE_SHIFT;
26094 + flags |= 8;
26095 + }
26096 +
26097 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
26098 + gdt = get_cpu_gdt_table(cpu);
26099 + pack_descriptor(&d, address, length, 0x9b, flags);
26100 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26101 + pack_descriptor(&d, address, length, 0x93, flags);
26102 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26103 + }
26104 + return entry;
26105 + }
26106 + case 0x80: /* Not present */
26107 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26108 + return 0;
26109 + default: /* Shouldn't happen */
26110 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26111 + service, return_code);
26112 + return 0;
26113 }
26114 }
26115
26116 static struct {
26117 unsigned long address;
26118 unsigned short segment;
26119 -} pci_indirect = { 0, __KERNEL_CS };
26120 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
26121
26122 -static int pci_bios_present;
26123 +static int pci_bios_present __read_only;
26124
26125 static int __devinit check_pcibios(void)
26126 {
26127 @@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
26128 unsigned long flags, pcibios_entry;
26129
26130 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26131 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26132 + pci_indirect.address = pcibios_entry;
26133
26134 local_irq_save(flags);
26135 - __asm__(
26136 - "lcall *(%%edi); cld\n\t"
26137 + __asm__("movw %w6, %%ds\n\t"
26138 + "lcall *%%ss:(%%edi); cld\n\t"
26139 + "push %%ss\n\t"
26140 + "pop %%ds\n\t"
26141 "jc 1f\n\t"
26142 "xor %%ah, %%ah\n"
26143 "1:"
26144 @@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
26145 "=b" (ebx),
26146 "=c" (ecx)
26147 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26148 - "D" (&pci_indirect)
26149 + "D" (&pci_indirect),
26150 + "r" (__PCIBIOS_DS)
26151 : "memory");
26152 local_irq_restore(flags);
26153
26154 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26155
26156 switch (len) {
26157 case 1:
26158 - __asm__("lcall *(%%esi); cld\n\t"
26159 + __asm__("movw %w6, %%ds\n\t"
26160 + "lcall *%%ss:(%%esi); cld\n\t"
26161 + "push %%ss\n\t"
26162 + "pop %%ds\n\t"
26163 "jc 1f\n\t"
26164 "xor %%ah, %%ah\n"
26165 "1:"
26166 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26167 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26168 "b" (bx),
26169 "D" ((long)reg),
26170 - "S" (&pci_indirect));
26171 + "S" (&pci_indirect),
26172 + "r" (__PCIBIOS_DS));
26173 /*
26174 * Zero-extend the result beyond 8 bits, do not trust the
26175 * BIOS having done it:
26176 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26177 *value &= 0xff;
26178 break;
26179 case 2:
26180 - __asm__("lcall *(%%esi); cld\n\t"
26181 + __asm__("movw %w6, %%ds\n\t"
26182 + "lcall *%%ss:(%%esi); cld\n\t"
26183 + "push %%ss\n\t"
26184 + "pop %%ds\n\t"
26185 "jc 1f\n\t"
26186 "xor %%ah, %%ah\n"
26187 "1:"
26188 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26189 : "1" (PCIBIOS_READ_CONFIG_WORD),
26190 "b" (bx),
26191 "D" ((long)reg),
26192 - "S" (&pci_indirect));
26193 + "S" (&pci_indirect),
26194 + "r" (__PCIBIOS_DS));
26195 /*
26196 * Zero-extend the result beyond 16 bits, do not trust the
26197 * BIOS having done it:
26198 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26199 *value &= 0xffff;
26200 break;
26201 case 4:
26202 - __asm__("lcall *(%%esi); cld\n\t"
26203 + __asm__("movw %w6, %%ds\n\t"
26204 + "lcall *%%ss:(%%esi); cld\n\t"
26205 + "push %%ss\n\t"
26206 + "pop %%ds\n\t"
26207 "jc 1f\n\t"
26208 "xor %%ah, %%ah\n"
26209 "1:"
26210 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26211 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26212 "b" (bx),
26213 "D" ((long)reg),
26214 - "S" (&pci_indirect));
26215 + "S" (&pci_indirect),
26216 + "r" (__PCIBIOS_DS));
26217 break;
26218 }
26219
26220 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26221
26222 switch (len) {
26223 case 1:
26224 - __asm__("lcall *(%%esi); cld\n\t"
26225 + __asm__("movw %w6, %%ds\n\t"
26226 + "lcall *%%ss:(%%esi); cld\n\t"
26227 + "push %%ss\n\t"
26228 + "pop %%ds\n\t"
26229 "jc 1f\n\t"
26230 "xor %%ah, %%ah\n"
26231 "1:"
26232 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26233 "c" (value),
26234 "b" (bx),
26235 "D" ((long)reg),
26236 - "S" (&pci_indirect));
26237 + "S" (&pci_indirect),
26238 + "r" (__PCIBIOS_DS));
26239 break;
26240 case 2:
26241 - __asm__("lcall *(%%esi); cld\n\t"
26242 + __asm__("movw %w6, %%ds\n\t"
26243 + "lcall *%%ss:(%%esi); cld\n\t"
26244 + "push %%ss\n\t"
26245 + "pop %%ds\n\t"
26246 "jc 1f\n\t"
26247 "xor %%ah, %%ah\n"
26248 "1:"
26249 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26250 "c" (value),
26251 "b" (bx),
26252 "D" ((long)reg),
26253 - "S" (&pci_indirect));
26254 + "S" (&pci_indirect),
26255 + "r" (__PCIBIOS_DS));
26256 break;
26257 case 4:
26258 - __asm__("lcall *(%%esi); cld\n\t"
26259 + __asm__("movw %w6, %%ds\n\t"
26260 + "lcall *%%ss:(%%esi); cld\n\t"
26261 + "push %%ss\n\t"
26262 + "pop %%ds\n\t"
26263 "jc 1f\n\t"
26264 "xor %%ah, %%ah\n"
26265 "1:"
26266 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26267 "c" (value),
26268 "b" (bx),
26269 "D" ((long)reg),
26270 - "S" (&pci_indirect));
26271 + "S" (&pci_indirect),
26272 + "r" (__PCIBIOS_DS));
26273 break;
26274 }
26275
26276 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26277
26278 DBG("PCI: Fetching IRQ routing table... ");
26279 __asm__("push %%es\n\t"
26280 + "movw %w8, %%ds\n\t"
26281 "push %%ds\n\t"
26282 "pop %%es\n\t"
26283 - "lcall *(%%esi); cld\n\t"
26284 + "lcall *%%ss:(%%esi); cld\n\t"
26285 "pop %%es\n\t"
26286 + "push %%ss\n\t"
26287 + "pop %%ds\n"
26288 "jc 1f\n\t"
26289 "xor %%ah, %%ah\n"
26290 "1:"
26291 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26292 "1" (0),
26293 "D" ((long) &opt),
26294 "S" (&pci_indirect),
26295 - "m" (opt)
26296 + "m" (opt),
26297 + "r" (__PCIBIOS_DS)
26298 : "memory");
26299 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26300 if (ret & 0xff00)
26301 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26302 {
26303 int ret;
26304
26305 - __asm__("lcall *(%%esi); cld\n\t"
26306 + __asm__("movw %w5, %%ds\n\t"
26307 + "lcall *%%ss:(%%esi); cld\n\t"
26308 + "push %%ss\n\t"
26309 + "pop %%ds\n"
26310 "jc 1f\n\t"
26311 "xor %%ah, %%ah\n"
26312 "1:"
26313 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26314 : "0" (PCIBIOS_SET_PCI_HW_INT),
26315 "b" ((dev->bus->number << 8) | dev->devfn),
26316 "c" ((irq << 8) | (pin + 10)),
26317 - "S" (&pci_indirect));
26318 + "S" (&pci_indirect),
26319 + "r" (__PCIBIOS_DS));
26320 return !(ret & 0xff00);
26321 }
26322 EXPORT_SYMBOL(pcibios_set_irq_routing);
26323 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26324 index 40e4469..1ab536e 100644
26325 --- a/arch/x86/platform/efi/efi_32.c
26326 +++ b/arch/x86/platform/efi/efi_32.c
26327 @@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26328 {
26329 struct desc_ptr gdt_descr;
26330
26331 +#ifdef CONFIG_PAX_KERNEXEC
26332 + struct desc_struct d;
26333 +#endif
26334 +
26335 local_irq_save(efi_rt_eflags);
26336
26337 load_cr3(initial_page_table);
26338 __flush_tlb_all();
26339
26340 +#ifdef CONFIG_PAX_KERNEXEC
26341 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26342 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26343 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26344 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26345 +#endif
26346 +
26347 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26348 gdt_descr.size = GDT_SIZE - 1;
26349 load_gdt(&gdt_descr);
26350 @@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26351 {
26352 struct desc_ptr gdt_descr;
26353
26354 +#ifdef CONFIG_PAX_KERNEXEC
26355 + struct desc_struct d;
26356 +
26357 + memset(&d, 0, sizeof d);
26358 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26359 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26360 +#endif
26361 +
26362 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26363 gdt_descr.size = GDT_SIZE - 1;
26364 load_gdt(&gdt_descr);
26365 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26366 index fbe66e6..eae5e38 100644
26367 --- a/arch/x86/platform/efi/efi_stub_32.S
26368 +++ b/arch/x86/platform/efi/efi_stub_32.S
26369 @@ -6,7 +6,9 @@
26370 */
26371
26372 #include <linux/linkage.h>
26373 +#include <linux/init.h>
26374 #include <asm/page_types.h>
26375 +#include <asm/segment.h>
26376
26377 /*
26378 * efi_call_phys(void *, ...) is a function with variable parameters.
26379 @@ -20,7 +22,7 @@
26380 * service functions will comply with gcc calling convention, too.
26381 */
26382
26383 -.text
26384 +__INIT
26385 ENTRY(efi_call_phys)
26386 /*
26387 * 0. The function can only be called in Linux kernel. So CS has been
26388 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
26389 * The mapping of lower virtual memory has been created in prelog and
26390 * epilog.
26391 */
26392 - movl $1f, %edx
26393 - subl $__PAGE_OFFSET, %edx
26394 - jmp *%edx
26395 +#ifdef CONFIG_PAX_KERNEXEC
26396 + movl $(__KERNEXEC_EFI_DS), %edx
26397 + mov %edx, %ds
26398 + mov %edx, %es
26399 + mov %edx, %ss
26400 + addl $2f,(1f)
26401 + ljmp *(1f)
26402 +
26403 +__INITDATA
26404 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
26405 +.previous
26406 +
26407 +2:
26408 + subl $2b,(1b)
26409 +#else
26410 + jmp 1f-__PAGE_OFFSET
26411 1:
26412 +#endif
26413
26414 /*
26415 * 2. Now on the top of stack is the return
26416 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
26417 * parameter 2, ..., param n. To make things easy, we save the return
26418 * address of efi_call_phys in a global variable.
26419 */
26420 - popl %edx
26421 - movl %edx, saved_return_addr
26422 - /* get the function pointer into ECX*/
26423 - popl %ecx
26424 - movl %ecx, efi_rt_function_ptr
26425 - movl $2f, %edx
26426 - subl $__PAGE_OFFSET, %edx
26427 - pushl %edx
26428 + popl (saved_return_addr)
26429 + popl (efi_rt_function_ptr)
26430
26431 /*
26432 * 3. Clear PG bit in %CR0.
26433 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
26434 /*
26435 * 5. Call the physical function.
26436 */
26437 - jmp *%ecx
26438 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
26439
26440 -2:
26441 /*
26442 * 6. After EFI runtime service returns, control will return to
26443 * following instruction. We'd better readjust stack pointer first.
26444 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
26445 movl %cr0, %edx
26446 orl $0x80000000, %edx
26447 movl %edx, %cr0
26448 - jmp 1f
26449 -1:
26450 +
26451 /*
26452 * 8. Now restore the virtual mode from flat mode by
26453 * adding EIP with PAGE_OFFSET.
26454 */
26455 - movl $1f, %edx
26456 - jmp *%edx
26457 +#ifdef CONFIG_PAX_KERNEXEC
26458 + movl $(__KERNEL_DS), %edx
26459 + mov %edx, %ds
26460 + mov %edx, %es
26461 + mov %edx, %ss
26462 + ljmp $(__KERNEL_CS),$1f
26463 +#else
26464 + jmp 1f+__PAGE_OFFSET
26465 +#endif
26466 1:
26467
26468 /*
26469 * 9. Balance the stack. And because EAX contain the return value,
26470 * we'd better not clobber it.
26471 */
26472 - leal efi_rt_function_ptr, %edx
26473 - movl (%edx), %ecx
26474 - pushl %ecx
26475 + pushl (efi_rt_function_ptr)
26476
26477 /*
26478 - * 10. Push the saved return address onto the stack and return.
26479 + * 10. Return to the saved return address.
26480 */
26481 - leal saved_return_addr, %edx
26482 - movl (%edx), %ecx
26483 - pushl %ecx
26484 - ret
26485 + jmpl *(saved_return_addr)
26486 ENDPROC(efi_call_phys)
26487 .previous
26488
26489 -.data
26490 +__INITDATA
26491 saved_return_addr:
26492 .long 0
26493 efi_rt_function_ptr:
26494 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26495 index 4c07cca..2c8427d 100644
26496 --- a/arch/x86/platform/efi/efi_stub_64.S
26497 +++ b/arch/x86/platform/efi/efi_stub_64.S
26498 @@ -7,6 +7,7 @@
26499 */
26500
26501 #include <linux/linkage.h>
26502 +#include <asm/alternative-asm.h>
26503
26504 #define SAVE_XMM \
26505 mov %rsp, %rax; \
26506 @@ -40,6 +41,7 @@ ENTRY(efi_call0)
26507 call *%rdi
26508 addq $32, %rsp
26509 RESTORE_XMM
26510 + pax_force_retaddr 0, 1
26511 ret
26512 ENDPROC(efi_call0)
26513
26514 @@ -50,6 +52,7 @@ ENTRY(efi_call1)
26515 call *%rdi
26516 addq $32, %rsp
26517 RESTORE_XMM
26518 + pax_force_retaddr 0, 1
26519 ret
26520 ENDPROC(efi_call1)
26521
26522 @@ -60,6 +63,7 @@ ENTRY(efi_call2)
26523 call *%rdi
26524 addq $32, %rsp
26525 RESTORE_XMM
26526 + pax_force_retaddr 0, 1
26527 ret
26528 ENDPROC(efi_call2)
26529
26530 @@ -71,6 +75,7 @@ ENTRY(efi_call3)
26531 call *%rdi
26532 addq $32, %rsp
26533 RESTORE_XMM
26534 + pax_force_retaddr 0, 1
26535 ret
26536 ENDPROC(efi_call3)
26537
26538 @@ -83,6 +88,7 @@ ENTRY(efi_call4)
26539 call *%rdi
26540 addq $32, %rsp
26541 RESTORE_XMM
26542 + pax_force_retaddr 0, 1
26543 ret
26544 ENDPROC(efi_call4)
26545
26546 @@ -96,6 +102,7 @@ ENTRY(efi_call5)
26547 call *%rdi
26548 addq $48, %rsp
26549 RESTORE_XMM
26550 + pax_force_retaddr 0, 1
26551 ret
26552 ENDPROC(efi_call5)
26553
26554 @@ -112,5 +119,6 @@ ENTRY(efi_call6)
26555 call *%rdi
26556 addq $48, %rsp
26557 RESTORE_XMM
26558 + pax_force_retaddr 0, 1
26559 ret
26560 ENDPROC(efi_call6)
26561 diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
26562 index fd41a92..9c33628 100644
26563 --- a/arch/x86/platform/mrst/mrst.c
26564 +++ b/arch/x86/platform/mrst/mrst.c
26565 @@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
26566 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
26567 int sfi_mrtc_num;
26568
26569 -static void mrst_power_off(void)
26570 +static __noreturn void mrst_power_off(void)
26571 {
26572 + BUG();
26573 }
26574
26575 -static void mrst_reboot(void)
26576 +static __noreturn void mrst_reboot(void)
26577 {
26578 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
26579 + BUG();
26580 }
26581
26582 /* parse all the mtimer info to a static mtimer array */
26583 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26584 index 218cdb1..fd55c08 100644
26585 --- a/arch/x86/power/cpu.c
26586 +++ b/arch/x86/power/cpu.c
26587 @@ -132,7 +132,7 @@ static void do_fpu_end(void)
26588 static void fix_processor_context(void)
26589 {
26590 int cpu = smp_processor_id();
26591 - struct tss_struct *t = &per_cpu(init_tss, cpu);
26592 + struct tss_struct *t = init_tss + cpu;
26593
26594 set_tss_desc(cpu, t); /*
26595 * This just modifies memory; should not be
26596 @@ -142,7 +142,9 @@ static void fix_processor_context(void)
26597 */
26598
26599 #ifdef CONFIG_X86_64
26600 + pax_open_kernel();
26601 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26602 + pax_close_kernel();
26603
26604 syscall_init(); /* This sets MSR_*STAR and related */
26605 #endif
26606 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
26607 index cbca565..35ce1d7 100644
26608 --- a/arch/x86/realmode/init.c
26609 +++ b/arch/x86/realmode/init.c
26610 @@ -62,7 +62,13 @@ void __init setup_real_mode(void)
26611 __va(real_mode_header->trampoline_header);
26612
26613 #ifdef CONFIG_X86_32
26614 - trampoline_header->start = __pa(startup_32_smp);
26615 + trampoline_header->start = __pa(ktla_ktva(startup_32_smp));
26616 +
26617 +#ifdef CONFIG_PAX_KERNEXEC
26618 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
26619 +#endif
26620 +
26621 + trampoline_header->boot_cs = __BOOT_CS;
26622 trampoline_header->gdt_limit = __BOOT_DS + 7;
26623 trampoline_header->gdt_base = __pa(boot_gdt);
26624 #else
26625 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
26626 index 5b84a2d..a004393 100644
26627 --- a/arch/x86/realmode/rm/Makefile
26628 +++ b/arch/x86/realmode/rm/Makefile
26629 @@ -78,5 +78,8 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
26630 $(call cc-option, -fno-unit-at-a-time)) \
26631 $(call cc-option, -fno-stack-protector) \
26632 $(call cc-option, -mpreferred-stack-boundary=2)
26633 +ifdef CONSTIFY_PLUGIN
26634 +KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
26635 +endif
26636 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
26637 GCOV_PROFILE := n
26638 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
26639 index c1b2791..f9e31c7 100644
26640 --- a/arch/x86/realmode/rm/trampoline_32.S
26641 +++ b/arch/x86/realmode/rm/trampoline_32.S
26642 @@ -25,6 +25,12 @@
26643 #include <asm/page_types.h>
26644 #include "realmode.h"
26645
26646 +#ifdef CONFIG_PAX_KERNEXEC
26647 +#define ta(X) (X)
26648 +#else
26649 +#define ta(X) (pa_ ## X)
26650 +#endif
26651 +
26652 .text
26653 .code16
26654
26655 @@ -39,8 +45,6 @@ ENTRY(trampoline_start)
26656
26657 cli # We should be safe anyway
26658
26659 - movl tr_start, %eax # where we need to go
26660 -
26661 movl $0xA5A5A5A5, trampoline_status
26662 # write marker for master knows we're running
26663
26664 @@ -56,7 +60,7 @@ ENTRY(trampoline_start)
26665 movw $1, %dx # protected mode (PE) bit
26666 lmsw %dx # into protected mode
26667
26668 - ljmpl $__BOOT_CS, $pa_startup_32
26669 + ljmpl *(trampoline_header)
26670
26671 .section ".text32","ax"
26672 .code32
26673 @@ -67,7 +71,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
26674 .balign 8
26675 GLOBAL(trampoline_header)
26676 tr_start: .space 4
26677 - tr_gdt_pad: .space 2
26678 + tr_boot_cs: .space 2
26679 tr_gdt: .space 6
26680 END(trampoline_header)
26681
26682 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
26683 index bb360dc..3e5945f 100644
26684 --- a/arch/x86/realmode/rm/trampoline_64.S
26685 +++ b/arch/x86/realmode/rm/trampoline_64.S
26686 @@ -107,7 +107,7 @@ ENTRY(startup_32)
26687 wrmsr
26688
26689 # Enable paging and in turn activate Long Mode
26690 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
26691 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
26692 movl %eax, %cr0
26693
26694 /*
26695 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
26696 index 5a1847d..deccb30 100644
26697 --- a/arch/x86/tools/relocs.c
26698 +++ b/arch/x86/tools/relocs.c
26699 @@ -12,10 +12,13 @@
26700 #include <regex.h>
26701 #include <tools/le_byteshift.h>
26702
26703 +#include "../../../include/generated/autoconf.h"
26704 +
26705 static void die(char *fmt, ...);
26706
26707 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
26708 static Elf32_Ehdr ehdr;
26709 +static Elf32_Phdr *phdr;
26710 static unsigned long reloc_count, reloc_idx;
26711 static unsigned long *relocs;
26712 static unsigned long reloc16_count, reloc16_idx;
26713 @@ -330,9 +333,39 @@ static void read_ehdr(FILE *fp)
26714 }
26715 }
26716
26717 +static void read_phdrs(FILE *fp)
26718 +{
26719 + unsigned int i;
26720 +
26721 + phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
26722 + if (!phdr) {
26723 + die("Unable to allocate %d program headers\n",
26724 + ehdr.e_phnum);
26725 + }
26726 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
26727 + die("Seek to %d failed: %s\n",
26728 + ehdr.e_phoff, strerror(errno));
26729 + }
26730 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
26731 + die("Cannot read ELF program headers: %s\n",
26732 + strerror(errno));
26733 + }
26734 + for(i = 0; i < ehdr.e_phnum; i++) {
26735 + phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
26736 + phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
26737 + phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
26738 + phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
26739 + phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
26740 + phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
26741 + phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
26742 + phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
26743 + }
26744 +
26745 +}
26746 +
26747 static void read_shdrs(FILE *fp)
26748 {
26749 - int i;
26750 + unsigned int i;
26751 Elf32_Shdr shdr;
26752
26753 secs = calloc(ehdr.e_shnum, sizeof(struct section));
26754 @@ -367,7 +400,7 @@ static void read_shdrs(FILE *fp)
26755
26756 static void read_strtabs(FILE *fp)
26757 {
26758 - int i;
26759 + unsigned int i;
26760 for (i = 0; i < ehdr.e_shnum; i++) {
26761 struct section *sec = &secs[i];
26762 if (sec->shdr.sh_type != SHT_STRTAB) {
26763 @@ -392,7 +425,7 @@ static void read_strtabs(FILE *fp)
26764
26765 static void read_symtabs(FILE *fp)
26766 {
26767 - int i,j;
26768 + unsigned int i,j;
26769 for (i = 0; i < ehdr.e_shnum; i++) {
26770 struct section *sec = &secs[i];
26771 if (sec->shdr.sh_type != SHT_SYMTAB) {
26772 @@ -423,9 +456,11 @@ static void read_symtabs(FILE *fp)
26773 }
26774
26775
26776 -static void read_relocs(FILE *fp)
26777 +static void read_relocs(FILE *fp, int use_real_mode)
26778 {
26779 - int i,j;
26780 + unsigned int i,j;
26781 + uint32_t base;
26782 +
26783 for (i = 0; i < ehdr.e_shnum; i++) {
26784 struct section *sec = &secs[i];
26785 if (sec->shdr.sh_type != SHT_REL) {
26786 @@ -445,9 +480,22 @@ static void read_relocs(FILE *fp)
26787 die("Cannot read symbol table: %s\n",
26788 strerror(errno));
26789 }
26790 + base = 0;
26791 +
26792 +#ifdef CONFIG_X86_32
26793 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
26794 + if (phdr[j].p_type != PT_LOAD )
26795 + continue;
26796 + 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)
26797 + continue;
26798 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
26799 + break;
26800 + }
26801 +#endif
26802 +
26803 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
26804 Elf32_Rel *rel = &sec->reltab[j];
26805 - rel->r_offset = elf32_to_cpu(rel->r_offset);
26806 + rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
26807 rel->r_info = elf32_to_cpu(rel->r_info);
26808 }
26809 }
26810 @@ -456,13 +504,13 @@ static void read_relocs(FILE *fp)
26811
26812 static void print_absolute_symbols(void)
26813 {
26814 - int i;
26815 + unsigned int i;
26816 printf("Absolute symbols\n");
26817 printf(" Num: Value Size Type Bind Visibility Name\n");
26818 for (i = 0; i < ehdr.e_shnum; i++) {
26819 struct section *sec = &secs[i];
26820 char *sym_strtab;
26821 - int j;
26822 + unsigned int j;
26823
26824 if (sec->shdr.sh_type != SHT_SYMTAB) {
26825 continue;
26826 @@ -489,14 +537,14 @@ static void print_absolute_symbols(void)
26827
26828 static void print_absolute_relocs(void)
26829 {
26830 - int i, printed = 0;
26831 + unsigned int i, printed = 0;
26832
26833 for (i = 0; i < ehdr.e_shnum; i++) {
26834 struct section *sec = &secs[i];
26835 struct section *sec_applies, *sec_symtab;
26836 char *sym_strtab;
26837 Elf32_Sym *sh_symtab;
26838 - int j;
26839 + unsigned int j;
26840 if (sec->shdr.sh_type != SHT_REL) {
26841 continue;
26842 }
26843 @@ -558,13 +606,13 @@ static void print_absolute_relocs(void)
26844 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
26845 int use_real_mode)
26846 {
26847 - int i;
26848 + unsigned int i;
26849 /* Walk through the relocations */
26850 for (i = 0; i < ehdr.e_shnum; i++) {
26851 char *sym_strtab;
26852 Elf32_Sym *sh_symtab;
26853 struct section *sec_applies, *sec_symtab;
26854 - int j;
26855 + unsigned int j;
26856 struct section *sec = &secs[i];
26857
26858 if (sec->shdr.sh_type != SHT_REL) {
26859 @@ -588,6 +636,24 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
26860 sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
26861 r_type = ELF32_R_TYPE(rel->r_info);
26862
26863 + if (!use_real_mode) {
26864 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
26865 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
26866 + continue;
26867 +
26868 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
26869 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
26870 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
26871 + continue;
26872 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
26873 + continue;
26874 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
26875 + continue;
26876 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
26877 + continue;
26878 +#endif
26879 + }
26880 +
26881 shn_abs = sym->st_shndx == SHN_ABS;
26882
26883 switch (r_type) {
26884 @@ -681,7 +747,7 @@ static int write32(unsigned int v, FILE *f)
26885
26886 static void emit_relocs(int as_text, int use_real_mode)
26887 {
26888 - int i;
26889 + unsigned int i;
26890 /* Count how many relocations I have and allocate space for them. */
26891 reloc_count = 0;
26892 walk_relocs(count_reloc, use_real_mode);
26893 @@ -808,10 +874,11 @@ int main(int argc, char **argv)
26894 fname, strerror(errno));
26895 }
26896 read_ehdr(fp);
26897 + read_phdrs(fp);
26898 read_shdrs(fp);
26899 read_strtabs(fp);
26900 read_symtabs(fp);
26901 - read_relocs(fp);
26902 + read_relocs(fp, use_real_mode);
26903 if (show_absolute_syms) {
26904 print_absolute_symbols();
26905 return 0;
26906 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26907 index fd14be1..e3c79c0 100644
26908 --- a/arch/x86/vdso/Makefile
26909 +++ b/arch/x86/vdso/Makefile
26910 @@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
26911 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
26912 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
26913
26914 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26915 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26916 GCOV_PROFILE := n
26917
26918 #
26919 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26920 index 66e6d93..587f435 100644
26921 --- a/arch/x86/vdso/vdso32-setup.c
26922 +++ b/arch/x86/vdso/vdso32-setup.c
26923 @@ -25,6 +25,7 @@
26924 #include <asm/tlbflush.h>
26925 #include <asm/vdso.h>
26926 #include <asm/proto.h>
26927 +#include <asm/mman.h>
26928
26929 enum {
26930 VDSO_DISABLED = 0,
26931 @@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26932 void enable_sep_cpu(void)
26933 {
26934 int cpu = get_cpu();
26935 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26936 + struct tss_struct *tss = init_tss + cpu;
26937
26938 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26939 put_cpu();
26940 @@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26941 gate_vma.vm_start = FIXADDR_USER_START;
26942 gate_vma.vm_end = FIXADDR_USER_END;
26943 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26944 - gate_vma.vm_page_prot = __P101;
26945 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26946
26947 return 0;
26948 }
26949 @@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26950 if (compat)
26951 addr = VDSO_HIGH_BASE;
26952 else {
26953 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26954 + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26955 if (IS_ERR_VALUE(addr)) {
26956 ret = addr;
26957 goto up_fail;
26958 }
26959 }
26960
26961 - current->mm->context.vdso = (void *)addr;
26962 + current->mm->context.vdso = addr;
26963
26964 if (compat_uses_vma || !compat) {
26965 /*
26966 @@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26967 }
26968
26969 current_thread_info()->sysenter_return =
26970 - VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26971 + (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26972
26973 up_fail:
26974 if (ret)
26975 - current->mm->context.vdso = NULL;
26976 + current->mm->context.vdso = 0;
26977
26978 up_write(&mm->mmap_sem);
26979
26980 @@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
26981
26982 const char *arch_vma_name(struct vm_area_struct *vma)
26983 {
26984 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26985 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26986 return "[vdso]";
26987 +
26988 +#ifdef CONFIG_PAX_SEGMEXEC
26989 + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26990 + return "[vdso]";
26991 +#endif
26992 +
26993 return NULL;
26994 }
26995
26996 @@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
26997 * Check to see if the corresponding task was created in compat vdso
26998 * mode.
26999 */
27000 - if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
27001 + if (mm && mm->context.vdso == VDSO_HIGH_BASE)
27002 return &gate_vma;
27003 return NULL;
27004 }
27005 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
27006 index 00aaf04..4a26505 100644
27007 --- a/arch/x86/vdso/vma.c
27008 +++ b/arch/x86/vdso/vma.c
27009 @@ -16,8 +16,6 @@
27010 #include <asm/vdso.h>
27011 #include <asm/page.h>
27012
27013 -unsigned int __read_mostly vdso_enabled = 1;
27014 -
27015 extern char vdso_start[], vdso_end[];
27016 extern unsigned short vdso_sync_cpuid;
27017
27018 @@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
27019 * unaligned here as a result of stack start randomization.
27020 */
27021 addr = PAGE_ALIGN(addr);
27022 - addr = align_addr(addr, NULL, ALIGN_VDSO);
27023
27024 return addr;
27025 }
27026 @@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
27027 unsigned size)
27028 {
27029 struct mm_struct *mm = current->mm;
27030 - unsigned long addr;
27031 + unsigned long addr = 0;
27032 int ret;
27033
27034 - if (!vdso_enabled)
27035 - return 0;
27036 -
27037 down_write(&mm->mmap_sem);
27038 +
27039 +#ifdef CONFIG_PAX_RANDMMAP
27040 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27041 +#endif
27042 +
27043 addr = vdso_addr(mm->start_stack, size);
27044 + addr = align_addr(addr, NULL, ALIGN_VDSO);
27045 addr = get_unmapped_area(NULL, addr, size, 0, 0);
27046 if (IS_ERR_VALUE(addr)) {
27047 ret = addr;
27048 goto up_fail;
27049 }
27050
27051 - current->mm->context.vdso = (void *)addr;
27052 + mm->context.vdso = addr;
27053
27054 ret = install_special_mapping(mm, addr, size,
27055 VM_READ|VM_EXEC|
27056 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
27057 pages);
27058 - if (ret) {
27059 - current->mm->context.vdso = NULL;
27060 - goto up_fail;
27061 - }
27062 + if (ret)
27063 + mm->context.vdso = 0;
27064
27065 up_fail:
27066 up_write(&mm->mmap_sem);
27067 @@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
27068 vdsox32_size);
27069 }
27070 #endif
27071 -
27072 -static __init int vdso_setup(char *s)
27073 -{
27074 - vdso_enabled = simple_strtoul(s, NULL, 0);
27075 - return 0;
27076 -}
27077 -__setup("vdso=", vdso_setup);
27078 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
27079 index ff962d4..2bb5e83 100644
27080 --- a/arch/x86/xen/enlighten.c
27081 +++ b/arch/x86/xen/enlighten.c
27082 @@ -97,8 +97,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
27083
27084 struct shared_info xen_dummy_shared_info;
27085
27086 -void *xen_initial_gdt;
27087 -
27088 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
27089 __read_mostly int xen_have_vector_callback;
27090 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
27091 @@ -1175,30 +1173,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
27092 #endif
27093 };
27094
27095 -static void xen_reboot(int reason)
27096 +static __noreturn void xen_reboot(int reason)
27097 {
27098 struct sched_shutdown r = { .reason = reason };
27099
27100 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
27101 - BUG();
27102 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
27103 + BUG();
27104 }
27105
27106 -static void xen_restart(char *msg)
27107 +static __noreturn void xen_restart(char *msg)
27108 {
27109 xen_reboot(SHUTDOWN_reboot);
27110 }
27111
27112 -static void xen_emergency_restart(void)
27113 +static __noreturn void xen_emergency_restart(void)
27114 {
27115 xen_reboot(SHUTDOWN_reboot);
27116 }
27117
27118 -static void xen_machine_halt(void)
27119 +static __noreturn void xen_machine_halt(void)
27120 {
27121 xen_reboot(SHUTDOWN_poweroff);
27122 }
27123
27124 -static void xen_machine_power_off(void)
27125 +static __noreturn void xen_machine_power_off(void)
27126 {
27127 if (pm_power_off)
27128 pm_power_off();
27129 @@ -1301,7 +1299,17 @@ asmlinkage void __init xen_start_kernel(void)
27130 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
27131
27132 /* Work out if we support NX */
27133 - x86_configure_nx();
27134 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
27135 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
27136 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
27137 + unsigned l, h;
27138 +
27139 + __supported_pte_mask |= _PAGE_NX;
27140 + rdmsr(MSR_EFER, l, h);
27141 + l |= EFER_NX;
27142 + wrmsr(MSR_EFER, l, h);
27143 + }
27144 +#endif
27145
27146 xen_setup_features();
27147
27148 @@ -1332,13 +1340,6 @@ asmlinkage void __init xen_start_kernel(void)
27149
27150 machine_ops = xen_machine_ops;
27151
27152 - /*
27153 - * The only reliable way to retain the initial address of the
27154 - * percpu gdt_page is to remember it here, so we can go and
27155 - * mark it RW later, when the initial percpu area is freed.
27156 - */
27157 - xen_initial_gdt = &per_cpu(gdt_page, 0);
27158 -
27159 xen_smp_init();
27160
27161 #ifdef CONFIG_ACPI_NUMA
27162 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
27163 index 3a73785..0d30df2 100644
27164 --- a/arch/x86/xen/mmu.c
27165 +++ b/arch/x86/xen/mmu.c
27166 @@ -1738,6 +1738,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
27167 convert_pfn_mfn(init_level4_pgt);
27168 convert_pfn_mfn(level3_ident_pgt);
27169 convert_pfn_mfn(level3_kernel_pgt);
27170 + convert_pfn_mfn(level3_vmalloc_start_pgt);
27171 + convert_pfn_mfn(level3_vmalloc_end_pgt);
27172 + convert_pfn_mfn(level3_vmemmap_pgt);
27173
27174 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
27175 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
27176 @@ -1756,7 +1759,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
27177 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
27178 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
27179 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
27180 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
27181 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
27182 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
27183 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
27184 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
27185 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
27186 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
27187
27188 @@ -1940,6 +1947,7 @@ static void __init xen_post_allocator_init(void)
27189 pv_mmu_ops.set_pud = xen_set_pud;
27190 #if PAGETABLE_LEVELS == 4
27191 pv_mmu_ops.set_pgd = xen_set_pgd;
27192 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
27193 #endif
27194
27195 /* This will work as long as patching hasn't happened yet
27196 @@ -2021,6 +2029,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
27197 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
27198 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
27199 .set_pgd = xen_set_pgd_hyper,
27200 + .set_pgd_batched = xen_set_pgd_hyper,
27201
27202 .alloc_pud = xen_alloc_pmd_init,
27203 .release_pud = xen_release_pmd_init,
27204 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
27205 index afb250d..627075f 100644
27206 --- a/arch/x86/xen/smp.c
27207 +++ b/arch/x86/xen/smp.c
27208 @@ -231,11 +231,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
27209 {
27210 BUG_ON(smp_processor_id() != 0);
27211 native_smp_prepare_boot_cpu();
27212 -
27213 - /* We've switched to the "real" per-cpu gdt, so make sure the
27214 - old memory can be recycled */
27215 - make_lowmem_page_readwrite(xen_initial_gdt);
27216 -
27217 xen_filter_cpu_maps();
27218 xen_setup_vcpu_info_placement();
27219 }
27220 @@ -302,12 +297,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
27221 gdt = get_cpu_gdt_table(cpu);
27222
27223 ctxt->flags = VGCF_IN_KERNEL;
27224 - ctxt->user_regs.ds = __USER_DS;
27225 - ctxt->user_regs.es = __USER_DS;
27226 + ctxt->user_regs.ds = __KERNEL_DS;
27227 + ctxt->user_regs.es = __KERNEL_DS;
27228 ctxt->user_regs.ss = __KERNEL_DS;
27229 #ifdef CONFIG_X86_32
27230 ctxt->user_regs.fs = __KERNEL_PERCPU;
27231 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
27232 + savesegment(gs, ctxt->user_regs.gs);
27233 #else
27234 ctxt->gs_base_kernel = per_cpu_offset(cpu);
27235 #endif
27236 @@ -357,13 +352,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu, struct task_struct *idle)
27237 int rc;
27238
27239 per_cpu(current_task, cpu) = idle;
27240 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27241 #ifdef CONFIG_X86_32
27242 irq_ctx_init(cpu);
27243 #else
27244 clear_tsk_thread_flag(idle, TIF_FORK);
27245 - per_cpu(kernel_stack, cpu) =
27246 - (unsigned long)task_stack_page(idle) -
27247 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27248 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27249 #endif
27250 xen_setup_runstate_info(cpu);
27251 xen_setup_timer(cpu);
27252 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
27253 index f9643fc..602e8af 100644
27254 --- a/arch/x86/xen/xen-asm_32.S
27255 +++ b/arch/x86/xen/xen-asm_32.S
27256 @@ -84,14 +84,14 @@ ENTRY(xen_iret)
27257 ESP_OFFSET=4 # bytes pushed onto stack
27258
27259 /*
27260 - * Store vcpu_info pointer for easy access. Do it this way to
27261 - * avoid having to reload %fs
27262 + * Store vcpu_info pointer for easy access.
27263 */
27264 #ifdef CONFIG_SMP
27265 - GET_THREAD_INFO(%eax)
27266 - movl TI_cpu(%eax), %eax
27267 - movl __per_cpu_offset(,%eax,4), %eax
27268 - mov xen_vcpu(%eax), %eax
27269 + push %fs
27270 + mov $(__KERNEL_PERCPU), %eax
27271 + mov %eax, %fs
27272 + mov PER_CPU_VAR(xen_vcpu), %eax
27273 + pop %fs
27274 #else
27275 movl xen_vcpu, %eax
27276 #endif
27277 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
27278 index aaa7291..3f77960 100644
27279 --- a/arch/x86/xen/xen-head.S
27280 +++ b/arch/x86/xen/xen-head.S
27281 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
27282 #ifdef CONFIG_X86_32
27283 mov %esi,xen_start_info
27284 mov $init_thread_union+THREAD_SIZE,%esp
27285 +#ifdef CONFIG_SMP
27286 + movl $cpu_gdt_table,%edi
27287 + movl $__per_cpu_load,%eax
27288 + movw %ax,__KERNEL_PERCPU + 2(%edi)
27289 + rorl $16,%eax
27290 + movb %al,__KERNEL_PERCPU + 4(%edi)
27291 + movb %ah,__KERNEL_PERCPU + 7(%edi)
27292 + movl $__per_cpu_end - 1,%eax
27293 + subl $__per_cpu_start,%eax
27294 + movw %ax,__KERNEL_PERCPU + 0(%edi)
27295 +#endif
27296 #else
27297 mov %rsi,xen_start_info
27298 mov $init_thread_union+THREAD_SIZE,%rsp
27299 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
27300 index 202d4c1..99b072a 100644
27301 --- a/arch/x86/xen/xen-ops.h
27302 +++ b/arch/x86/xen/xen-ops.h
27303 @@ -10,8 +10,6 @@
27304 extern const char xen_hypervisor_callback[];
27305 extern const char xen_failsafe_callback[];
27306
27307 -extern void *xen_initial_gdt;
27308 -
27309 struct trap_info;
27310 void xen_copy_trap_info(struct trap_info *traps);
27311
27312 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
27313 index 525bd3d..ef888b1 100644
27314 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
27315 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
27316 @@ -119,9 +119,9 @@
27317 ----------------------------------------------------------------------*/
27318
27319 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
27320 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
27321 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
27322 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
27323 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27324
27325 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
27326 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
27327 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
27328 index 2f33760..835e50a 100644
27329 --- a/arch/xtensa/variants/fsf/include/variant/core.h
27330 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
27331 @@ -11,6 +11,7 @@
27332 #ifndef _XTENSA_CORE_H
27333 #define _XTENSA_CORE_H
27334
27335 +#include <linux/const.h>
27336
27337 /****************************************************************************
27338 Parameters Useful for Any Code, USER or PRIVILEGED
27339 @@ -112,9 +113,9 @@
27340 ----------------------------------------------------------------------*/
27341
27342 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
27343 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
27344 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
27345 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
27346 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27347
27348 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
27349 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
27350 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
27351 index af00795..2bb8105 100644
27352 --- a/arch/xtensa/variants/s6000/include/variant/core.h
27353 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
27354 @@ -11,6 +11,7 @@
27355 #ifndef _XTENSA_CORE_CONFIGURATION_H
27356 #define _XTENSA_CORE_CONFIGURATION_H
27357
27358 +#include <linux/const.h>
27359
27360 /****************************************************************************
27361 Parameters Useful for Any Code, USER or PRIVILEGED
27362 @@ -118,9 +119,9 @@
27363 ----------------------------------------------------------------------*/
27364
27365 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
27366 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
27367 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
27368 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
27369 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27370
27371 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
27372 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
27373 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
27374 index 58916af..9cb880b 100644
27375 --- a/block/blk-iopoll.c
27376 +++ b/block/blk-iopoll.c
27377 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
27378 }
27379 EXPORT_SYMBOL(blk_iopoll_complete);
27380
27381 -static void blk_iopoll_softirq(struct softirq_action *h)
27382 +static void blk_iopoll_softirq(void)
27383 {
27384 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
27385 int rearm = 0, budget = blk_iopoll_budget;
27386 diff --git a/block/blk-map.c b/block/blk-map.c
27387 index 623e1cd..ca1e109 100644
27388 --- a/block/blk-map.c
27389 +++ b/block/blk-map.c
27390 @@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
27391 if (!len || !kbuf)
27392 return -EINVAL;
27393
27394 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
27395 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
27396 if (do_copy)
27397 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
27398 else
27399 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
27400 index 467c8de..4bddc6d 100644
27401 --- a/block/blk-softirq.c
27402 +++ b/block/blk-softirq.c
27403 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
27404 * Softirq action handler - move entries to local list and loop over them
27405 * while passing them to the queue registered handler.
27406 */
27407 -static void blk_done_softirq(struct softirq_action *h)
27408 +static void blk_done_softirq(void)
27409 {
27410 struct list_head *cpu_list, local_list;
27411
27412 diff --git a/block/bsg.c b/block/bsg.c
27413 index ff64ae3..593560c 100644
27414 --- a/block/bsg.c
27415 +++ b/block/bsg.c
27416 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
27417 struct sg_io_v4 *hdr, struct bsg_device *bd,
27418 fmode_t has_write_perm)
27419 {
27420 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27421 + unsigned char *cmdptr;
27422 +
27423 if (hdr->request_len > BLK_MAX_CDB) {
27424 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27425 if (!rq->cmd)
27426 return -ENOMEM;
27427 - }
27428 + cmdptr = rq->cmd;
27429 + } else
27430 + cmdptr = tmpcmd;
27431
27432 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
27433 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27434 hdr->request_len))
27435 return -EFAULT;
27436
27437 + if (cmdptr != rq->cmd)
27438 + memcpy(rq->cmd, cmdptr, hdr->request_len);
27439 +
27440 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27441 if (blk_verify_command(rq->cmd, has_write_perm))
27442 return -EPERM;
27443 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27444 index 7c668c8..db3521c 100644
27445 --- a/block/compat_ioctl.c
27446 +++ b/block/compat_ioctl.c
27447 @@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27448 err |= __get_user(f->spec1, &uf->spec1);
27449 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27450 err |= __get_user(name, &uf->name);
27451 - f->name = compat_ptr(name);
27452 + f->name = (void __force_kernel *)compat_ptr(name);
27453 if (err) {
27454 err = -EFAULT;
27455 goto out;
27456 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
27457 index 6296b40..417c00f 100644
27458 --- a/block/partitions/efi.c
27459 +++ b/block/partitions/efi.c
27460 @@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
27461 if (!gpt)
27462 return NULL;
27463
27464 + if (!le32_to_cpu(gpt->num_partition_entries))
27465 + return NULL;
27466 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
27467 + if (!pte)
27468 + return NULL;
27469 +
27470 count = le32_to_cpu(gpt->num_partition_entries) *
27471 le32_to_cpu(gpt->sizeof_partition_entry);
27472 - if (!count)
27473 - return NULL;
27474 - pte = kzalloc(count, GFP_KERNEL);
27475 - if (!pte)
27476 - return NULL;
27477 -
27478 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
27479 (u8 *) pte,
27480 count) < count) {
27481 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27482 index 9a87daa..fb17486 100644
27483 --- a/block/scsi_ioctl.c
27484 +++ b/block/scsi_ioctl.c
27485 @@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
27486 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27487 struct sg_io_hdr *hdr, fmode_t mode)
27488 {
27489 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27490 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27491 + unsigned char *cmdptr;
27492 +
27493 + if (rq->cmd != rq->__cmd)
27494 + cmdptr = rq->cmd;
27495 + else
27496 + cmdptr = tmpcmd;
27497 +
27498 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27499 return -EFAULT;
27500 +
27501 + if (cmdptr != rq->cmd)
27502 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27503 +
27504 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27505 return -EPERM;
27506
27507 @@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27508 int err;
27509 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27510 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27511 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27512 + unsigned char *cmdptr;
27513
27514 if (!sic)
27515 return -EINVAL;
27516 @@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27517 */
27518 err = -EFAULT;
27519 rq->cmd_len = cmdlen;
27520 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
27521 +
27522 + if (rq->cmd != rq->__cmd)
27523 + cmdptr = rq->cmd;
27524 + else
27525 + cmdptr = tmpcmd;
27526 +
27527 + if (copy_from_user(cmdptr, sic->data, cmdlen))
27528 goto error;
27529
27530 + if (rq->cmd != cmdptr)
27531 + memcpy(rq->cmd, cmdptr, cmdlen);
27532 +
27533 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27534 goto error;
27535
27536 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27537 index 671d4d6..5f24030 100644
27538 --- a/crypto/cryptd.c
27539 +++ b/crypto/cryptd.c
27540 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
27541
27542 struct cryptd_blkcipher_request_ctx {
27543 crypto_completion_t complete;
27544 -};
27545 +} __no_const;
27546
27547 struct cryptd_hash_ctx {
27548 struct crypto_shash *child;
27549 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
27550
27551 struct cryptd_aead_request_ctx {
27552 crypto_completion_t complete;
27553 -};
27554 +} __no_const;
27555
27556 static void cryptd_queue_worker(struct work_struct *work);
27557
27558 diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
27559 index e6defd8..c26a225 100644
27560 --- a/drivers/acpi/apei/cper.c
27561 +++ b/drivers/acpi/apei/cper.c
27562 @@ -38,12 +38,12 @@
27563 */
27564 u64 cper_next_record_id(void)
27565 {
27566 - static atomic64_t seq;
27567 + static atomic64_unchecked_t seq;
27568
27569 - if (!atomic64_read(&seq))
27570 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
27571 + if (!atomic64_read_unchecked(&seq))
27572 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
27573
27574 - return atomic64_inc_return(&seq);
27575 + return atomic64_inc_return_unchecked(&seq);
27576 }
27577 EXPORT_SYMBOL_GPL(cper_next_record_id);
27578
27579 diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
27580 index 7586544..636a2f0 100644
27581 --- a/drivers/acpi/ec_sys.c
27582 +++ b/drivers/acpi/ec_sys.c
27583 @@ -12,6 +12,7 @@
27584 #include <linux/acpi.h>
27585 #include <linux/debugfs.h>
27586 #include <linux/module.h>
27587 +#include <linux/uaccess.h>
27588 #include "internal.h"
27589
27590 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
27591 @@ -34,7 +35,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27592 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
27593 */
27594 unsigned int size = EC_SPACE_SIZE;
27595 - u8 *data = (u8 *) buf;
27596 + u8 data;
27597 loff_t init_off = *off;
27598 int err = 0;
27599
27600 @@ -47,9 +48,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27601 size = count;
27602
27603 while (size) {
27604 - err = ec_read(*off, &data[*off - init_off]);
27605 + err = ec_read(*off, &data);
27606 if (err)
27607 return err;
27608 + if (put_user(data, &buf[*off - init_off]))
27609 + return -EFAULT;
27610 *off += 1;
27611 size--;
27612 }
27613 @@ -65,7 +68,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27614
27615 unsigned int size = count;
27616 loff_t init_off = *off;
27617 - u8 *data = (u8 *) buf;
27618 int err = 0;
27619
27620 if (*off >= EC_SPACE_SIZE)
27621 @@ -76,7 +78,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27622 }
27623
27624 while (size) {
27625 - u8 byte_write = data[*off - init_off];
27626 + u8 byte_write;
27627 + if (get_user(byte_write, &buf[*off - init_off]))
27628 + return -EFAULT;
27629 err = ec_write(*off, byte_write);
27630 if (err)
27631 return err;
27632 diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27633 index 251c7b62..000462d 100644
27634 --- a/drivers/acpi/proc.c
27635 +++ b/drivers/acpi/proc.c
27636 @@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
27637 size_t count, loff_t * ppos)
27638 {
27639 struct list_head *node, *next;
27640 - char strbuf[5];
27641 - char str[5] = "";
27642 - unsigned int len = count;
27643 + char strbuf[5] = {0};
27644
27645 - if (len > 4)
27646 - len = 4;
27647 - if (len < 0)
27648 + if (count > 4)
27649 + count = 4;
27650 + if (copy_from_user(strbuf, buffer, count))
27651 return -EFAULT;
27652 -
27653 - if (copy_from_user(strbuf, buffer, len))
27654 - return -EFAULT;
27655 - strbuf[len] = '\0';
27656 - sscanf(strbuf, "%s", str);
27657 + strbuf[count] = '\0';
27658
27659 mutex_lock(&acpi_device_lock);
27660 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27661 @@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
27662 if (!dev->wakeup.flags.valid)
27663 continue;
27664
27665 - if (!strncmp(dev->pnp.bus_id, str, 4)) {
27666 + if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27667 if (device_can_wakeup(&dev->dev)) {
27668 bool enable = !device_may_wakeup(&dev->dev);
27669 device_set_wakeup_enable(&dev->dev, enable);
27670 diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
27671 index bbac51e..4c094f9 100644
27672 --- a/drivers/acpi/processor_driver.c
27673 +++ b/drivers/acpi/processor_driver.c
27674 @@ -556,7 +556,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27675 return 0;
27676 #endif
27677
27678 - BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27679 + BUG_ON(pr->id >= nr_cpu_ids);
27680
27681 /*
27682 * Buggy BIOS check
27683 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27684 index cece3a4..0845256 100644
27685 --- a/drivers/ata/libata-core.c
27686 +++ b/drivers/ata/libata-core.c
27687 @@ -4743,7 +4743,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27688 struct ata_port *ap;
27689 unsigned int tag;
27690
27691 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27692 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27693 ap = qc->ap;
27694
27695 qc->flags = 0;
27696 @@ -4759,7 +4759,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27697 struct ata_port *ap;
27698 struct ata_link *link;
27699
27700 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27701 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27702 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27703 ap = qc->ap;
27704 link = qc->dev->link;
27705 @@ -5823,6 +5823,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27706 return;
27707
27708 spin_lock(&lock);
27709 + pax_open_kernel();
27710
27711 for (cur = ops->inherits; cur; cur = cur->inherits) {
27712 void **inherit = (void **)cur;
27713 @@ -5836,8 +5837,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27714 if (IS_ERR(*pp))
27715 *pp = NULL;
27716
27717 - ops->inherits = NULL;
27718 + *(struct ata_port_operations **)&ops->inherits = NULL;
27719
27720 + pax_close_kernel();
27721 spin_unlock(&lock);
27722 }
27723
27724 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
27725 index ac6a5be..c7176b1 100644
27726 --- a/drivers/ata/pata_arasan_cf.c
27727 +++ b/drivers/ata/pata_arasan_cf.c
27728 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
27729 /* Handle platform specific quirks */
27730 if (pdata->quirk) {
27731 if (pdata->quirk & CF_BROKEN_PIO) {
27732 - ap->ops->set_piomode = NULL;
27733 + pax_open_kernel();
27734 + *(void **)&ap->ops->set_piomode = NULL;
27735 + pax_close_kernel();
27736 ap->pio_mask = 0;
27737 }
27738 if (pdata->quirk & CF_BROKEN_MWDMA)
27739 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
27740 index f9b983a..887b9d8 100644
27741 --- a/drivers/atm/adummy.c
27742 +++ b/drivers/atm/adummy.c
27743 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
27744 vcc->pop(vcc, skb);
27745 else
27746 dev_kfree_skb_any(skb);
27747 - atomic_inc(&vcc->stats->tx);
27748 + atomic_inc_unchecked(&vcc->stats->tx);
27749
27750 return 0;
27751 }
27752 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
27753 index 89b30f3..7964211 100644
27754 --- a/drivers/atm/ambassador.c
27755 +++ b/drivers/atm/ambassador.c
27756 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
27757 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27758
27759 // VC layer stats
27760 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27761 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27762
27763 // free the descriptor
27764 kfree (tx_descr);
27765 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27766 dump_skb ("<<<", vc, skb);
27767
27768 // VC layer stats
27769 - atomic_inc(&atm_vcc->stats->rx);
27770 + atomic_inc_unchecked(&atm_vcc->stats->rx);
27771 __net_timestamp(skb);
27772 // end of our responsibility
27773 atm_vcc->push (atm_vcc, skb);
27774 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27775 } else {
27776 PRINTK (KERN_INFO, "dropped over-size frame");
27777 // should we count this?
27778 - atomic_inc(&atm_vcc->stats->rx_drop);
27779 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27780 }
27781
27782 } else {
27783 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
27784 }
27785
27786 if (check_area (skb->data, skb->len)) {
27787 - atomic_inc(&atm_vcc->stats->tx_err);
27788 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27789 return -ENOMEM; // ?
27790 }
27791
27792 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
27793 index b22d71c..d6e1049 100644
27794 --- a/drivers/atm/atmtcp.c
27795 +++ b/drivers/atm/atmtcp.c
27796 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27797 if (vcc->pop) vcc->pop(vcc,skb);
27798 else dev_kfree_skb(skb);
27799 if (dev_data) return 0;
27800 - atomic_inc(&vcc->stats->tx_err);
27801 + atomic_inc_unchecked(&vcc->stats->tx_err);
27802 return -ENOLINK;
27803 }
27804 size = skb->len+sizeof(struct atmtcp_hdr);
27805 @@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27806 if (!new_skb) {
27807 if (vcc->pop) vcc->pop(vcc,skb);
27808 else dev_kfree_skb(skb);
27809 - atomic_inc(&vcc->stats->tx_err);
27810 + atomic_inc_unchecked(&vcc->stats->tx_err);
27811 return -ENOBUFS;
27812 }
27813 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27814 @@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27815 if (vcc->pop) vcc->pop(vcc,skb);
27816 else dev_kfree_skb(skb);
27817 out_vcc->push(out_vcc,new_skb);
27818 - atomic_inc(&vcc->stats->tx);
27819 - atomic_inc(&out_vcc->stats->rx);
27820 + atomic_inc_unchecked(&vcc->stats->tx);
27821 + atomic_inc_unchecked(&out_vcc->stats->rx);
27822 return 0;
27823 }
27824
27825 @@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27826 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27827 read_unlock(&vcc_sklist_lock);
27828 if (!out_vcc) {
27829 - atomic_inc(&vcc->stats->tx_err);
27830 + atomic_inc_unchecked(&vcc->stats->tx_err);
27831 goto done;
27832 }
27833 skb_pull(skb,sizeof(struct atmtcp_hdr));
27834 @@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27835 __net_timestamp(new_skb);
27836 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27837 out_vcc->push(out_vcc,new_skb);
27838 - atomic_inc(&vcc->stats->tx);
27839 - atomic_inc(&out_vcc->stats->rx);
27840 + atomic_inc_unchecked(&vcc->stats->tx);
27841 + atomic_inc_unchecked(&out_vcc->stats->rx);
27842 done:
27843 if (vcc->pop) vcc->pop(vcc,skb);
27844 else dev_kfree_skb(skb);
27845 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
27846 index 2059ee4..faf51c7 100644
27847 --- a/drivers/atm/eni.c
27848 +++ b/drivers/atm/eni.c
27849 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27850 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27851 vcc->dev->number);
27852 length = 0;
27853 - atomic_inc(&vcc->stats->rx_err);
27854 + atomic_inc_unchecked(&vcc->stats->rx_err);
27855 }
27856 else {
27857 length = ATM_CELL_SIZE-1; /* no HEC */
27858 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27859 size);
27860 }
27861 eff = length = 0;
27862 - atomic_inc(&vcc->stats->rx_err);
27863 + atomic_inc_unchecked(&vcc->stats->rx_err);
27864 }
27865 else {
27866 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27867 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27868 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27869 vcc->dev->number,vcc->vci,length,size << 2,descr);
27870 length = eff = 0;
27871 - atomic_inc(&vcc->stats->rx_err);
27872 + atomic_inc_unchecked(&vcc->stats->rx_err);
27873 }
27874 }
27875 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27876 @@ -767,7 +767,7 @@ rx_dequeued++;
27877 vcc->push(vcc,skb);
27878 pushed++;
27879 }
27880 - atomic_inc(&vcc->stats->rx);
27881 + atomic_inc_unchecked(&vcc->stats->rx);
27882 }
27883 wake_up(&eni_dev->rx_wait);
27884 }
27885 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
27886 PCI_DMA_TODEVICE);
27887 if (vcc->pop) vcc->pop(vcc,skb);
27888 else dev_kfree_skb_irq(skb);
27889 - atomic_inc(&vcc->stats->tx);
27890 + atomic_inc_unchecked(&vcc->stats->tx);
27891 wake_up(&eni_dev->tx_wait);
27892 dma_complete++;
27893 }
27894 @@ -1567,7 +1567,7 @@ tx_complete++;
27895 /*--------------------------------- entries ---------------------------------*/
27896
27897
27898 -static const char *media_name[] __devinitdata = {
27899 +static const char *media_name[] __devinitconst = {
27900 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
27901 "UTP", "05?", "06?", "07?", /* 4- 7 */
27902 "TAXI","09?", "10?", "11?", /* 8-11 */
27903 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
27904 index 86fed1b..6dc4721 100644
27905 --- a/drivers/atm/firestream.c
27906 +++ b/drivers/atm/firestream.c
27907 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
27908 }
27909 }
27910
27911 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27912 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27913
27914 fs_dprintk (FS_DEBUG_TXMEM, "i");
27915 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27916 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27917 #endif
27918 skb_put (skb, qe->p1 & 0xffff);
27919 ATM_SKB(skb)->vcc = atm_vcc;
27920 - atomic_inc(&atm_vcc->stats->rx);
27921 + atomic_inc_unchecked(&atm_vcc->stats->rx);
27922 __net_timestamp(skb);
27923 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27924 atm_vcc->push (atm_vcc, skb);
27925 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27926 kfree (pe);
27927 }
27928 if (atm_vcc)
27929 - atomic_inc(&atm_vcc->stats->rx_drop);
27930 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27931 break;
27932 case 0x1f: /* Reassembly abort: no buffers. */
27933 /* Silently increment error counter. */
27934 if (atm_vcc)
27935 - atomic_inc(&atm_vcc->stats->rx_drop);
27936 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27937 break;
27938 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27939 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27940 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
27941 index 361f5ae..7fc552d 100644
27942 --- a/drivers/atm/fore200e.c
27943 +++ b/drivers/atm/fore200e.c
27944 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
27945 #endif
27946 /* check error condition */
27947 if (*entry->status & STATUS_ERROR)
27948 - atomic_inc(&vcc->stats->tx_err);
27949 + atomic_inc_unchecked(&vcc->stats->tx_err);
27950 else
27951 - atomic_inc(&vcc->stats->tx);
27952 + atomic_inc_unchecked(&vcc->stats->tx);
27953 }
27954 }
27955
27956 @@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27957 if (skb == NULL) {
27958 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27959
27960 - atomic_inc(&vcc->stats->rx_drop);
27961 + atomic_inc_unchecked(&vcc->stats->rx_drop);
27962 return -ENOMEM;
27963 }
27964
27965 @@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27966
27967 dev_kfree_skb_any(skb);
27968
27969 - atomic_inc(&vcc->stats->rx_drop);
27970 + atomic_inc_unchecked(&vcc->stats->rx_drop);
27971 return -ENOMEM;
27972 }
27973
27974 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27975
27976 vcc->push(vcc, skb);
27977 - atomic_inc(&vcc->stats->rx);
27978 + atomic_inc_unchecked(&vcc->stats->rx);
27979
27980 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27981
27982 @@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
27983 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27984 fore200e->atm_dev->number,
27985 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27986 - atomic_inc(&vcc->stats->rx_err);
27987 + atomic_inc_unchecked(&vcc->stats->rx_err);
27988 }
27989 }
27990
27991 @@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
27992 goto retry_here;
27993 }
27994
27995 - atomic_inc(&vcc->stats->tx_err);
27996 + atomic_inc_unchecked(&vcc->stats->tx_err);
27997
27998 fore200e->tx_sat++;
27999 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
28000 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
28001 index b182c2f..1c6fa8a 100644
28002 --- a/drivers/atm/he.c
28003 +++ b/drivers/atm/he.c
28004 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
28005
28006 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
28007 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
28008 - atomic_inc(&vcc->stats->rx_drop);
28009 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28010 goto return_host_buffers;
28011 }
28012
28013 @@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
28014 RBRQ_LEN_ERR(he_dev->rbrq_head)
28015 ? "LEN_ERR" : "",
28016 vcc->vpi, vcc->vci);
28017 - atomic_inc(&vcc->stats->rx_err);
28018 + atomic_inc_unchecked(&vcc->stats->rx_err);
28019 goto return_host_buffers;
28020 }
28021
28022 @@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
28023 vcc->push(vcc, skb);
28024 spin_lock(&he_dev->global_lock);
28025
28026 - atomic_inc(&vcc->stats->rx);
28027 + atomic_inc_unchecked(&vcc->stats->rx);
28028
28029 return_host_buffers:
28030 ++pdus_assembled;
28031 @@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
28032 tpd->vcc->pop(tpd->vcc, tpd->skb);
28033 else
28034 dev_kfree_skb_any(tpd->skb);
28035 - atomic_inc(&tpd->vcc->stats->tx_err);
28036 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
28037 }
28038 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
28039 return;
28040 @@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28041 vcc->pop(vcc, skb);
28042 else
28043 dev_kfree_skb_any(skb);
28044 - atomic_inc(&vcc->stats->tx_err);
28045 + atomic_inc_unchecked(&vcc->stats->tx_err);
28046 return -EINVAL;
28047 }
28048
28049 @@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28050 vcc->pop(vcc, skb);
28051 else
28052 dev_kfree_skb_any(skb);
28053 - atomic_inc(&vcc->stats->tx_err);
28054 + atomic_inc_unchecked(&vcc->stats->tx_err);
28055 return -EINVAL;
28056 }
28057 #endif
28058 @@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28059 vcc->pop(vcc, skb);
28060 else
28061 dev_kfree_skb_any(skb);
28062 - atomic_inc(&vcc->stats->tx_err);
28063 + atomic_inc_unchecked(&vcc->stats->tx_err);
28064 spin_unlock_irqrestore(&he_dev->global_lock, flags);
28065 return -ENOMEM;
28066 }
28067 @@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28068 vcc->pop(vcc, skb);
28069 else
28070 dev_kfree_skb_any(skb);
28071 - atomic_inc(&vcc->stats->tx_err);
28072 + atomic_inc_unchecked(&vcc->stats->tx_err);
28073 spin_unlock_irqrestore(&he_dev->global_lock, flags);
28074 return -ENOMEM;
28075 }
28076 @@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28077 __enqueue_tpd(he_dev, tpd, cid);
28078 spin_unlock_irqrestore(&he_dev->global_lock, flags);
28079
28080 - atomic_inc(&vcc->stats->tx);
28081 + atomic_inc_unchecked(&vcc->stats->tx);
28082
28083 return 0;
28084 }
28085 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
28086 index 7d01c2a..4e3ac01 100644
28087 --- a/drivers/atm/horizon.c
28088 +++ b/drivers/atm/horizon.c
28089 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
28090 {
28091 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
28092 // VC layer stats
28093 - atomic_inc(&vcc->stats->rx);
28094 + atomic_inc_unchecked(&vcc->stats->rx);
28095 __net_timestamp(skb);
28096 // end of our responsibility
28097 vcc->push (vcc, skb);
28098 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
28099 dev->tx_iovec = NULL;
28100
28101 // VC layer stats
28102 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
28103 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
28104
28105 // free the skb
28106 hrz_kfree_skb (skb);
28107 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
28108 index 8974bd2..b856f85 100644
28109 --- a/drivers/atm/idt77252.c
28110 +++ b/drivers/atm/idt77252.c
28111 @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
28112 else
28113 dev_kfree_skb(skb);
28114
28115 - atomic_inc(&vcc->stats->tx);
28116 + atomic_inc_unchecked(&vcc->stats->tx);
28117 }
28118
28119 atomic_dec(&scq->used);
28120 @@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28121 if ((sb = dev_alloc_skb(64)) == NULL) {
28122 printk("%s: Can't allocate buffers for aal0.\n",
28123 card->name);
28124 - atomic_add(i, &vcc->stats->rx_drop);
28125 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
28126 break;
28127 }
28128 if (!atm_charge(vcc, sb->truesize)) {
28129 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
28130 card->name);
28131 - atomic_add(i - 1, &vcc->stats->rx_drop);
28132 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
28133 dev_kfree_skb(sb);
28134 break;
28135 }
28136 @@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28137 ATM_SKB(sb)->vcc = vcc;
28138 __net_timestamp(sb);
28139 vcc->push(vcc, sb);
28140 - atomic_inc(&vcc->stats->rx);
28141 + atomic_inc_unchecked(&vcc->stats->rx);
28142
28143 cell += ATM_CELL_PAYLOAD;
28144 }
28145 @@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28146 "(CDC: %08x)\n",
28147 card->name, len, rpp->len, readl(SAR_REG_CDC));
28148 recycle_rx_pool_skb(card, rpp);
28149 - atomic_inc(&vcc->stats->rx_err);
28150 + atomic_inc_unchecked(&vcc->stats->rx_err);
28151 return;
28152 }
28153 if (stat & SAR_RSQE_CRC) {
28154 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
28155 recycle_rx_pool_skb(card, rpp);
28156 - atomic_inc(&vcc->stats->rx_err);
28157 + atomic_inc_unchecked(&vcc->stats->rx_err);
28158 return;
28159 }
28160 if (skb_queue_len(&rpp->queue) > 1) {
28161 @@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28162 RXPRINTK("%s: Can't alloc RX skb.\n",
28163 card->name);
28164 recycle_rx_pool_skb(card, rpp);
28165 - atomic_inc(&vcc->stats->rx_err);
28166 + atomic_inc_unchecked(&vcc->stats->rx_err);
28167 return;
28168 }
28169 if (!atm_charge(vcc, skb->truesize)) {
28170 @@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28171 __net_timestamp(skb);
28172
28173 vcc->push(vcc, skb);
28174 - atomic_inc(&vcc->stats->rx);
28175 + atomic_inc_unchecked(&vcc->stats->rx);
28176
28177 return;
28178 }
28179 @@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28180 __net_timestamp(skb);
28181
28182 vcc->push(vcc, skb);
28183 - atomic_inc(&vcc->stats->rx);
28184 + atomic_inc_unchecked(&vcc->stats->rx);
28185
28186 if (skb->truesize > SAR_FB_SIZE_3)
28187 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
28188 @@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
28189 if (vcc->qos.aal != ATM_AAL0) {
28190 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
28191 card->name, vpi, vci);
28192 - atomic_inc(&vcc->stats->rx_drop);
28193 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28194 goto drop;
28195 }
28196
28197 if ((sb = dev_alloc_skb(64)) == NULL) {
28198 printk("%s: Can't allocate buffers for AAL0.\n",
28199 card->name);
28200 - atomic_inc(&vcc->stats->rx_err);
28201 + atomic_inc_unchecked(&vcc->stats->rx_err);
28202 goto drop;
28203 }
28204
28205 @@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
28206 ATM_SKB(sb)->vcc = vcc;
28207 __net_timestamp(sb);
28208 vcc->push(vcc, sb);
28209 - atomic_inc(&vcc->stats->rx);
28210 + atomic_inc_unchecked(&vcc->stats->rx);
28211
28212 drop:
28213 skb_pull(queue, 64);
28214 @@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28215
28216 if (vc == NULL) {
28217 printk("%s: NULL connection in send().\n", card->name);
28218 - atomic_inc(&vcc->stats->tx_err);
28219 + atomic_inc_unchecked(&vcc->stats->tx_err);
28220 dev_kfree_skb(skb);
28221 return -EINVAL;
28222 }
28223 if (!test_bit(VCF_TX, &vc->flags)) {
28224 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
28225 - atomic_inc(&vcc->stats->tx_err);
28226 + atomic_inc_unchecked(&vcc->stats->tx_err);
28227 dev_kfree_skb(skb);
28228 return -EINVAL;
28229 }
28230 @@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28231 break;
28232 default:
28233 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
28234 - atomic_inc(&vcc->stats->tx_err);
28235 + atomic_inc_unchecked(&vcc->stats->tx_err);
28236 dev_kfree_skb(skb);
28237 return -EINVAL;
28238 }
28239
28240 if (skb_shinfo(skb)->nr_frags != 0) {
28241 printk("%s: No scatter-gather yet.\n", card->name);
28242 - atomic_inc(&vcc->stats->tx_err);
28243 + atomic_inc_unchecked(&vcc->stats->tx_err);
28244 dev_kfree_skb(skb);
28245 return -EINVAL;
28246 }
28247 @@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28248
28249 err = queue_skb(card, vc, skb, oam);
28250 if (err) {
28251 - atomic_inc(&vcc->stats->tx_err);
28252 + atomic_inc_unchecked(&vcc->stats->tx_err);
28253 dev_kfree_skb(skb);
28254 return err;
28255 }
28256 @@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
28257 skb = dev_alloc_skb(64);
28258 if (!skb) {
28259 printk("%s: Out of memory in send_oam().\n", card->name);
28260 - atomic_inc(&vcc->stats->tx_err);
28261 + atomic_inc_unchecked(&vcc->stats->tx_err);
28262 return -ENOMEM;
28263 }
28264 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
28265 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
28266 index d438601..8b98495 100644
28267 --- a/drivers/atm/iphase.c
28268 +++ b/drivers/atm/iphase.c
28269 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
28270 status = (u_short) (buf_desc_ptr->desc_mode);
28271 if (status & (RX_CER | RX_PTE | RX_OFL))
28272 {
28273 - atomic_inc(&vcc->stats->rx_err);
28274 + atomic_inc_unchecked(&vcc->stats->rx_err);
28275 IF_ERR(printk("IA: bad packet, dropping it");)
28276 if (status & RX_CER) {
28277 IF_ERR(printk(" cause: packet CRC error\n");)
28278 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
28279 len = dma_addr - buf_addr;
28280 if (len > iadev->rx_buf_sz) {
28281 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
28282 - atomic_inc(&vcc->stats->rx_err);
28283 + atomic_inc_unchecked(&vcc->stats->rx_err);
28284 goto out_free_desc;
28285 }
28286
28287 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28288 ia_vcc = INPH_IA_VCC(vcc);
28289 if (ia_vcc == NULL)
28290 {
28291 - atomic_inc(&vcc->stats->rx_err);
28292 + atomic_inc_unchecked(&vcc->stats->rx_err);
28293 atm_return(vcc, skb->truesize);
28294 dev_kfree_skb_any(skb);
28295 goto INCR_DLE;
28296 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28297 if ((length > iadev->rx_buf_sz) || (length >
28298 (skb->len - sizeof(struct cpcs_trailer))))
28299 {
28300 - atomic_inc(&vcc->stats->rx_err);
28301 + atomic_inc_unchecked(&vcc->stats->rx_err);
28302 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
28303 length, skb->len);)
28304 atm_return(vcc, skb->truesize);
28305 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28306
28307 IF_RX(printk("rx_dle_intr: skb push");)
28308 vcc->push(vcc,skb);
28309 - atomic_inc(&vcc->stats->rx);
28310 + atomic_inc_unchecked(&vcc->stats->rx);
28311 iadev->rx_pkt_cnt++;
28312 }
28313 INCR_DLE:
28314 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
28315 {
28316 struct k_sonet_stats *stats;
28317 stats = &PRIV(_ia_dev[board])->sonet_stats;
28318 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
28319 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
28320 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
28321 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
28322 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
28323 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
28324 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
28325 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
28326 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
28327 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
28328 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
28329 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
28330 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
28331 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
28332 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
28333 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
28334 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
28335 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
28336 }
28337 ia_cmds.status = 0;
28338 break;
28339 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28340 if ((desc == 0) || (desc > iadev->num_tx_desc))
28341 {
28342 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
28343 - atomic_inc(&vcc->stats->tx);
28344 + atomic_inc_unchecked(&vcc->stats->tx);
28345 if (vcc->pop)
28346 vcc->pop(vcc, skb);
28347 else
28348 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28349 ATM_DESC(skb) = vcc->vci;
28350 skb_queue_tail(&iadev->tx_dma_q, skb);
28351
28352 - atomic_inc(&vcc->stats->tx);
28353 + atomic_inc_unchecked(&vcc->stats->tx);
28354 iadev->tx_pkt_cnt++;
28355 /* Increment transaction counter */
28356 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
28357
28358 #if 0
28359 /* add flow control logic */
28360 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
28361 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
28362 if (iavcc->vc_desc_cnt > 10) {
28363 vcc->tx_quota = vcc->tx_quota * 3 / 4;
28364 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
28365 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
28366 index 68c7588..7036683 100644
28367 --- a/drivers/atm/lanai.c
28368 +++ b/drivers/atm/lanai.c
28369 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
28370 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
28371 lanai_endtx(lanai, lvcc);
28372 lanai_free_skb(lvcc->tx.atmvcc, skb);
28373 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
28374 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
28375 }
28376
28377 /* Try to fill the buffer - don't call unless there is backlog */
28378 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
28379 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
28380 __net_timestamp(skb);
28381 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
28382 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
28383 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
28384 out:
28385 lvcc->rx.buf.ptr = end;
28386 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
28387 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28388 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
28389 "vcc %d\n", lanai->number, (unsigned int) s, vci);
28390 lanai->stats.service_rxnotaal5++;
28391 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28392 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28393 return 0;
28394 }
28395 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
28396 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28397 int bytes;
28398 read_unlock(&vcc_sklist_lock);
28399 DPRINTK("got trashed rx pdu on vci %d\n", vci);
28400 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28401 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28402 lvcc->stats.x.aal5.service_trash++;
28403 bytes = (SERVICE_GET_END(s) * 16) -
28404 (((unsigned long) lvcc->rx.buf.ptr) -
28405 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28406 }
28407 if (s & SERVICE_STREAM) {
28408 read_unlock(&vcc_sklist_lock);
28409 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28410 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28411 lvcc->stats.x.aal5.service_stream++;
28412 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28413 "PDU on VCI %d!\n", lanai->number, vci);
28414 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28415 return 0;
28416 }
28417 DPRINTK("got rx crc error on vci %d\n", vci);
28418 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28419 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28420 lvcc->stats.x.aal5.service_rxcrc++;
28421 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28422 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28423 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28424 index 1c70c45..300718d 100644
28425 --- a/drivers/atm/nicstar.c
28426 +++ b/drivers/atm/nicstar.c
28427 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28428 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28429 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28430 card->index);
28431 - atomic_inc(&vcc->stats->tx_err);
28432 + atomic_inc_unchecked(&vcc->stats->tx_err);
28433 dev_kfree_skb_any(skb);
28434 return -EINVAL;
28435 }
28436 @@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28437 if (!vc->tx) {
28438 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28439 card->index);
28440 - atomic_inc(&vcc->stats->tx_err);
28441 + atomic_inc_unchecked(&vcc->stats->tx_err);
28442 dev_kfree_skb_any(skb);
28443 return -EINVAL;
28444 }
28445 @@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28446 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28447 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28448 card->index);
28449 - atomic_inc(&vcc->stats->tx_err);
28450 + atomic_inc_unchecked(&vcc->stats->tx_err);
28451 dev_kfree_skb_any(skb);
28452 return -EINVAL;
28453 }
28454
28455 if (skb_shinfo(skb)->nr_frags != 0) {
28456 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28457 - atomic_inc(&vcc->stats->tx_err);
28458 + atomic_inc_unchecked(&vcc->stats->tx_err);
28459 dev_kfree_skb_any(skb);
28460 return -EINVAL;
28461 }
28462 @@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28463 }
28464
28465 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28466 - atomic_inc(&vcc->stats->tx_err);
28467 + atomic_inc_unchecked(&vcc->stats->tx_err);
28468 dev_kfree_skb_any(skb);
28469 return -EIO;
28470 }
28471 - atomic_inc(&vcc->stats->tx);
28472 + atomic_inc_unchecked(&vcc->stats->tx);
28473
28474 return 0;
28475 }
28476 @@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28477 printk
28478 ("nicstar%d: Can't allocate buffers for aal0.\n",
28479 card->index);
28480 - atomic_add(i, &vcc->stats->rx_drop);
28481 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
28482 break;
28483 }
28484 if (!atm_charge(vcc, sb->truesize)) {
28485 RXPRINTK
28486 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28487 card->index);
28488 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28489 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28490 dev_kfree_skb_any(sb);
28491 break;
28492 }
28493 @@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28494 ATM_SKB(sb)->vcc = vcc;
28495 __net_timestamp(sb);
28496 vcc->push(vcc, sb);
28497 - atomic_inc(&vcc->stats->rx);
28498 + atomic_inc_unchecked(&vcc->stats->rx);
28499 cell += ATM_CELL_PAYLOAD;
28500 }
28501
28502 @@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28503 if (iovb == NULL) {
28504 printk("nicstar%d: Out of iovec buffers.\n",
28505 card->index);
28506 - atomic_inc(&vcc->stats->rx_drop);
28507 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28508 recycle_rx_buf(card, skb);
28509 return;
28510 }
28511 @@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28512 small or large buffer itself. */
28513 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
28514 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
28515 - atomic_inc(&vcc->stats->rx_err);
28516 + atomic_inc_unchecked(&vcc->stats->rx_err);
28517 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28518 NS_MAX_IOVECS);
28519 NS_PRV_IOVCNT(iovb) = 0;
28520 @@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28521 ("nicstar%d: Expected a small buffer, and this is not one.\n",
28522 card->index);
28523 which_list(card, skb);
28524 - atomic_inc(&vcc->stats->rx_err);
28525 + atomic_inc_unchecked(&vcc->stats->rx_err);
28526 recycle_rx_buf(card, skb);
28527 vc->rx_iov = NULL;
28528 recycle_iov_buf(card, iovb);
28529 @@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28530 ("nicstar%d: Expected a large buffer, and this is not one.\n",
28531 card->index);
28532 which_list(card, skb);
28533 - atomic_inc(&vcc->stats->rx_err);
28534 + atomic_inc_unchecked(&vcc->stats->rx_err);
28535 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28536 NS_PRV_IOVCNT(iovb));
28537 vc->rx_iov = NULL;
28538 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28539 printk(" - PDU size mismatch.\n");
28540 else
28541 printk(".\n");
28542 - atomic_inc(&vcc->stats->rx_err);
28543 + atomic_inc_unchecked(&vcc->stats->rx_err);
28544 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28545 NS_PRV_IOVCNT(iovb));
28546 vc->rx_iov = NULL;
28547 @@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28548 /* skb points to a small buffer */
28549 if (!atm_charge(vcc, skb->truesize)) {
28550 push_rxbufs(card, skb);
28551 - atomic_inc(&vcc->stats->rx_drop);
28552 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28553 } else {
28554 skb_put(skb, len);
28555 dequeue_sm_buf(card, skb);
28556 @@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28557 ATM_SKB(skb)->vcc = vcc;
28558 __net_timestamp(skb);
28559 vcc->push(vcc, skb);
28560 - atomic_inc(&vcc->stats->rx);
28561 + atomic_inc_unchecked(&vcc->stats->rx);
28562 }
28563 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
28564 struct sk_buff *sb;
28565 @@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28566 if (len <= NS_SMBUFSIZE) {
28567 if (!atm_charge(vcc, sb->truesize)) {
28568 push_rxbufs(card, sb);
28569 - atomic_inc(&vcc->stats->rx_drop);
28570 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28571 } else {
28572 skb_put(sb, len);
28573 dequeue_sm_buf(card, sb);
28574 @@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28575 ATM_SKB(sb)->vcc = vcc;
28576 __net_timestamp(sb);
28577 vcc->push(vcc, sb);
28578 - atomic_inc(&vcc->stats->rx);
28579 + atomic_inc_unchecked(&vcc->stats->rx);
28580 }
28581
28582 push_rxbufs(card, skb);
28583 @@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28584
28585 if (!atm_charge(vcc, skb->truesize)) {
28586 push_rxbufs(card, skb);
28587 - atomic_inc(&vcc->stats->rx_drop);
28588 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28589 } else {
28590 dequeue_lg_buf(card, skb);
28591 #ifdef NS_USE_DESTRUCTORS
28592 @@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28593 ATM_SKB(skb)->vcc = vcc;
28594 __net_timestamp(skb);
28595 vcc->push(vcc, skb);
28596 - atomic_inc(&vcc->stats->rx);
28597 + atomic_inc_unchecked(&vcc->stats->rx);
28598 }
28599
28600 push_rxbufs(card, sb);
28601 @@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28602 printk
28603 ("nicstar%d: Out of huge buffers.\n",
28604 card->index);
28605 - atomic_inc(&vcc->stats->rx_drop);
28606 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28607 recycle_iovec_rx_bufs(card,
28608 (struct iovec *)
28609 iovb->data,
28610 @@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28611 card->hbpool.count++;
28612 } else
28613 dev_kfree_skb_any(hb);
28614 - atomic_inc(&vcc->stats->rx_drop);
28615 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28616 } else {
28617 /* Copy the small buffer to the huge buffer */
28618 sb = (struct sk_buff *)iov->iov_base;
28619 @@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28620 #endif /* NS_USE_DESTRUCTORS */
28621 __net_timestamp(hb);
28622 vcc->push(vcc, hb);
28623 - atomic_inc(&vcc->stats->rx);
28624 + atomic_inc_unchecked(&vcc->stats->rx);
28625 }
28626 }
28627
28628 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
28629 index 9851093..adb2b1e 100644
28630 --- a/drivers/atm/solos-pci.c
28631 +++ b/drivers/atm/solos-pci.c
28632 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
28633 }
28634 atm_charge(vcc, skb->truesize);
28635 vcc->push(vcc, skb);
28636 - atomic_inc(&vcc->stats->rx);
28637 + atomic_inc_unchecked(&vcc->stats->rx);
28638 break;
28639
28640 case PKT_STATUS:
28641 @@ -1009,7 +1009,7 @@ static uint32_t fpga_tx(struct solos_card *card)
28642 vcc = SKB_CB(oldskb)->vcc;
28643
28644 if (vcc) {
28645 - atomic_inc(&vcc->stats->tx);
28646 + atomic_inc_unchecked(&vcc->stats->tx);
28647 solos_pop(vcc, oldskb);
28648 } else
28649 dev_kfree_skb_irq(oldskb);
28650 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
28651 index 0215934..ce9f5b1 100644
28652 --- a/drivers/atm/suni.c
28653 +++ b/drivers/atm/suni.c
28654 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
28655
28656
28657 #define ADD_LIMITED(s,v) \
28658 - atomic_add((v),&stats->s); \
28659 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
28660 + atomic_add_unchecked((v),&stats->s); \
28661 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
28662
28663
28664 static void suni_hz(unsigned long from_timer)
28665 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
28666 index 5120a96..e2572bd 100644
28667 --- a/drivers/atm/uPD98402.c
28668 +++ b/drivers/atm/uPD98402.c
28669 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
28670 struct sonet_stats tmp;
28671 int error = 0;
28672
28673 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28674 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28675 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
28676 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
28677 if (zero && !error) {
28678 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
28679
28680
28681 #define ADD_LIMITED(s,v) \
28682 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
28683 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
28684 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28685 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
28686 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
28687 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28688
28689
28690 static void stat_event(struct atm_dev *dev)
28691 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
28692 if (reason & uPD98402_INT_PFM) stat_event(dev);
28693 if (reason & uPD98402_INT_PCO) {
28694 (void) GET(PCOCR); /* clear interrupt cause */
28695 - atomic_add(GET(HECCT),
28696 + atomic_add_unchecked(GET(HECCT),
28697 &PRIV(dev)->sonet_stats.uncorr_hcs);
28698 }
28699 if ((reason & uPD98402_INT_RFO) &&
28700 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
28701 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28702 uPD98402_INT_LOS),PIMR); /* enable them */
28703 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28704 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28705 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28706 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28707 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28708 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28709 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28710 return 0;
28711 }
28712
28713 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
28714 index abe4e20..83c4727 100644
28715 --- a/drivers/atm/zatm.c
28716 +++ b/drivers/atm/zatm.c
28717 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28718 }
28719 if (!size) {
28720 dev_kfree_skb_irq(skb);
28721 - if (vcc) atomic_inc(&vcc->stats->rx_err);
28722 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28723 continue;
28724 }
28725 if (!atm_charge(vcc,skb->truesize)) {
28726 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28727 skb->len = size;
28728 ATM_SKB(skb)->vcc = vcc;
28729 vcc->push(vcc,skb);
28730 - atomic_inc(&vcc->stats->rx);
28731 + atomic_inc_unchecked(&vcc->stats->rx);
28732 }
28733 zout(pos & 0xffff,MTA(mbx));
28734 #if 0 /* probably a stupid idea */
28735 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
28736 skb_queue_head(&zatm_vcc->backlog,skb);
28737 break;
28738 }
28739 - atomic_inc(&vcc->stats->tx);
28740 + atomic_inc_unchecked(&vcc->stats->tx);
28741 wake_up(&zatm_vcc->tx_wait);
28742 }
28743
28744 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
28745 index 765c3a2..771ace6 100644
28746 --- a/drivers/base/devtmpfs.c
28747 +++ b/drivers/base/devtmpfs.c
28748 @@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
28749 if (!thread)
28750 return 0;
28751
28752 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
28753 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
28754 if (err)
28755 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
28756 else
28757 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
28758 index cbb463b..babe2cf 100644
28759 --- a/drivers/base/power/wakeup.c
28760 +++ b/drivers/base/power/wakeup.c
28761 @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
28762 * They need to be modified together atomically, so it's better to use one
28763 * atomic variable to hold them both.
28764 */
28765 -static atomic_t combined_event_count = ATOMIC_INIT(0);
28766 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
28767
28768 #define IN_PROGRESS_BITS (sizeof(int) * 4)
28769 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
28770
28771 static void split_counters(unsigned int *cnt, unsigned int *inpr)
28772 {
28773 - unsigned int comb = atomic_read(&combined_event_count);
28774 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
28775
28776 *cnt = (comb >> IN_PROGRESS_BITS);
28777 *inpr = comb & MAX_IN_PROGRESS;
28778 @@ -385,7 +385,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
28779 ws->start_prevent_time = ws->last_time;
28780
28781 /* Increment the counter of events in progress. */
28782 - cec = atomic_inc_return(&combined_event_count);
28783 + cec = atomic_inc_return_unchecked(&combined_event_count);
28784
28785 trace_wakeup_source_activate(ws->name, cec);
28786 }
28787 @@ -511,7 +511,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
28788 * Increment the counter of registered wakeup events and decrement the
28789 * couter of wakeup events in progress simultaneously.
28790 */
28791 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
28792 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
28793 trace_wakeup_source_deactivate(ws->name, cec);
28794
28795 split_counters(&cnt, &inpr);
28796 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
28797 index b0f553b..77b928b 100644
28798 --- a/drivers/block/cciss.c
28799 +++ b/drivers/block/cciss.c
28800 @@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
28801 int err;
28802 u32 cp;
28803
28804 + memset(&arg64, 0, sizeof(arg64));
28805 +
28806 err = 0;
28807 err |=
28808 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28809 @@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
28810 while (!list_empty(&h->reqQ)) {
28811 c = list_entry(h->reqQ.next, CommandList_struct, list);
28812 /* can't do anything if fifo is full */
28813 - if ((h->access.fifo_full(h))) {
28814 + if ((h->access->fifo_full(h))) {
28815 dev_warn(&h->pdev->dev, "fifo full\n");
28816 break;
28817 }
28818 @@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
28819 h->Qdepth--;
28820
28821 /* Tell the controller execute command */
28822 - h->access.submit_command(h, c);
28823 + h->access->submit_command(h, c);
28824
28825 /* Put job onto the completed Q */
28826 addQ(&h->cmpQ, c);
28827 @@ -3443,17 +3445,17 @@ startio:
28828
28829 static inline unsigned long get_next_completion(ctlr_info_t *h)
28830 {
28831 - return h->access.command_completed(h);
28832 + return h->access->command_completed(h);
28833 }
28834
28835 static inline int interrupt_pending(ctlr_info_t *h)
28836 {
28837 - return h->access.intr_pending(h);
28838 + return h->access->intr_pending(h);
28839 }
28840
28841 static inline long interrupt_not_for_us(ctlr_info_t *h)
28842 {
28843 - return ((h->access.intr_pending(h) == 0) ||
28844 + return ((h->access->intr_pending(h) == 0) ||
28845 (h->interrupts_enabled == 0));
28846 }
28847
28848 @@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
28849 u32 a;
28850
28851 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
28852 - return h->access.command_completed(h);
28853 + return h->access->command_completed(h);
28854
28855 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
28856 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
28857 @@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
28858 trans_support & CFGTBL_Trans_use_short_tags);
28859
28860 /* Change the access methods to the performant access methods */
28861 - h->access = SA5_performant_access;
28862 + h->access = &SA5_performant_access;
28863 h->transMethod = CFGTBL_Trans_Performant;
28864
28865 return;
28866 @@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
28867 if (prod_index < 0)
28868 return -ENODEV;
28869 h->product_name = products[prod_index].product_name;
28870 - h->access = *(products[prod_index].access);
28871 + h->access = products[prod_index].access;
28872
28873 if (cciss_board_disabled(h)) {
28874 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
28875 @@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
28876 }
28877
28878 /* make sure the board interrupts are off */
28879 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
28880 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
28881 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
28882 if (rc)
28883 goto clean2;
28884 @@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
28885 * fake ones to scoop up any residual completions.
28886 */
28887 spin_lock_irqsave(&h->lock, flags);
28888 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
28889 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
28890 spin_unlock_irqrestore(&h->lock, flags);
28891 free_irq(h->intr[h->intr_mode], h);
28892 rc = cciss_request_irq(h, cciss_msix_discard_completions,
28893 @@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
28894 dev_info(&h->pdev->dev, "Board READY.\n");
28895 dev_info(&h->pdev->dev,
28896 "Waiting for stale completions to drain.\n");
28897 - h->access.set_intr_mask(h, CCISS_INTR_ON);
28898 + h->access->set_intr_mask(h, CCISS_INTR_ON);
28899 msleep(10000);
28900 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
28901 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
28902
28903 rc = controller_reset_failed(h->cfgtable);
28904 if (rc)
28905 @@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
28906 cciss_scsi_setup(h);
28907
28908 /* Turn the interrupts on so we can service requests */
28909 - h->access.set_intr_mask(h, CCISS_INTR_ON);
28910 + h->access->set_intr_mask(h, CCISS_INTR_ON);
28911
28912 /* Get the firmware version */
28913 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28914 @@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
28915 kfree(flush_buf);
28916 if (return_code != IO_OK)
28917 dev_warn(&h->pdev->dev, "Error flushing cache\n");
28918 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
28919 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
28920 free_irq(h->intr[h->intr_mode], h);
28921 }
28922
28923 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
28924 index 7fda30e..eb5dfe0 100644
28925 --- a/drivers/block/cciss.h
28926 +++ b/drivers/block/cciss.h
28927 @@ -101,7 +101,7 @@ struct ctlr_info
28928 /* information about each logical volume */
28929 drive_info_struct *drv[CISS_MAX_LUN];
28930
28931 - struct access_method access;
28932 + struct access_method *access;
28933
28934 /* queue and queue Info */
28935 struct list_head reqQ;
28936 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
28937 index 9125bbe..eede5c8 100644
28938 --- a/drivers/block/cpqarray.c
28939 +++ b/drivers/block/cpqarray.c
28940 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28941 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28942 goto Enomem4;
28943 }
28944 - hba[i]->access.set_intr_mask(hba[i], 0);
28945 + hba[i]->access->set_intr_mask(hba[i], 0);
28946 if (request_irq(hba[i]->intr, do_ida_intr,
28947 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28948 {
28949 @@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28950 add_timer(&hba[i]->timer);
28951
28952 /* Enable IRQ now that spinlock and rate limit timer are set up */
28953 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28954 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28955
28956 for(j=0; j<NWD; j++) {
28957 struct gendisk *disk = ida_gendisk[i][j];
28958 @@ -694,7 +694,7 @@ DBGINFO(
28959 for(i=0; i<NR_PRODUCTS; i++) {
28960 if (board_id == products[i].board_id) {
28961 c->product_name = products[i].product_name;
28962 - c->access = *(products[i].access);
28963 + c->access = products[i].access;
28964 break;
28965 }
28966 }
28967 @@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
28968 hba[ctlr]->intr = intr;
28969 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28970 hba[ctlr]->product_name = products[j].product_name;
28971 - hba[ctlr]->access = *(products[j].access);
28972 + hba[ctlr]->access = products[j].access;
28973 hba[ctlr]->ctlr = ctlr;
28974 hba[ctlr]->board_id = board_id;
28975 hba[ctlr]->pci_dev = NULL; /* not PCI */
28976 @@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
28977
28978 while((c = h->reqQ) != NULL) {
28979 /* Can't do anything if we're busy */
28980 - if (h->access.fifo_full(h) == 0)
28981 + if (h->access->fifo_full(h) == 0)
28982 return;
28983
28984 /* Get the first entry from the request Q */
28985 @@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
28986 h->Qdepth--;
28987
28988 /* Tell the controller to do our bidding */
28989 - h->access.submit_command(h, c);
28990 + h->access->submit_command(h, c);
28991
28992 /* Get onto the completion Q */
28993 addQ(&h->cmpQ, c);
28994 @@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28995 unsigned long flags;
28996 __u32 a,a1;
28997
28998 - istat = h->access.intr_pending(h);
28999 + istat = h->access->intr_pending(h);
29000 /* Is this interrupt for us? */
29001 if (istat == 0)
29002 return IRQ_NONE;
29003 @@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
29004 */
29005 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
29006 if (istat & FIFO_NOT_EMPTY) {
29007 - while((a = h->access.command_completed(h))) {
29008 + while((a = h->access->command_completed(h))) {
29009 a1 = a; a &= ~3;
29010 if ((c = h->cmpQ) == NULL)
29011 {
29012 @@ -1449,11 +1449,11 @@ static int sendcmd(
29013 /*
29014 * Disable interrupt
29015 */
29016 - info_p->access.set_intr_mask(info_p, 0);
29017 + info_p->access->set_intr_mask(info_p, 0);
29018 /* Make sure there is room in the command FIFO */
29019 /* Actually it should be completely empty at this time. */
29020 for (i = 200000; i > 0; i--) {
29021 - temp = info_p->access.fifo_full(info_p);
29022 + temp = info_p->access->fifo_full(info_p);
29023 if (temp != 0) {
29024 break;
29025 }
29026 @@ -1466,7 +1466,7 @@ DBG(
29027 /*
29028 * Send the cmd
29029 */
29030 - info_p->access.submit_command(info_p, c);
29031 + info_p->access->submit_command(info_p, c);
29032 complete = pollcomplete(ctlr);
29033
29034 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
29035 @@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
29036 * we check the new geometry. Then turn interrupts back on when
29037 * we're done.
29038 */
29039 - host->access.set_intr_mask(host, 0);
29040 + host->access->set_intr_mask(host, 0);
29041 getgeometry(ctlr);
29042 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
29043 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
29044
29045 for(i=0; i<NWD; i++) {
29046 struct gendisk *disk = ida_gendisk[ctlr][i];
29047 @@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
29048 /* Wait (up to 2 seconds) for a command to complete */
29049
29050 for (i = 200000; i > 0; i--) {
29051 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
29052 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
29053 if (done == 0) {
29054 udelay(10); /* a short fixed delay */
29055 } else
29056 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
29057 index be73e9d..7fbf140 100644
29058 --- a/drivers/block/cpqarray.h
29059 +++ b/drivers/block/cpqarray.h
29060 @@ -99,7 +99,7 @@ struct ctlr_info {
29061 drv_info_t drv[NWD];
29062 struct proc_dir_entry *proc;
29063
29064 - struct access_method access;
29065 + struct access_method *access;
29066
29067 cmdlist_t *reqQ;
29068 cmdlist_t *cmpQ;
29069 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
29070 index 02f013a..afeba24 100644
29071 --- a/drivers/block/drbd/drbd_int.h
29072 +++ b/drivers/block/drbd/drbd_int.h
29073 @@ -735,7 +735,7 @@ struct drbd_request;
29074 struct drbd_epoch {
29075 struct list_head list;
29076 unsigned int barrier_nr;
29077 - atomic_t epoch_size; /* increased on every request added. */
29078 + atomic_unchecked_t epoch_size; /* increased on every request added. */
29079 atomic_t active; /* increased on every req. added, and dec on every finished. */
29080 unsigned long flags;
29081 };
29082 @@ -1110,7 +1110,7 @@ struct drbd_conf {
29083 void *int_dig_in;
29084 void *int_dig_vv;
29085 wait_queue_head_t seq_wait;
29086 - atomic_t packet_seq;
29087 + atomic_unchecked_t packet_seq;
29088 unsigned int peer_seq;
29089 spinlock_t peer_seq_lock;
29090 unsigned int minor;
29091 @@ -1651,30 +1651,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
29092
29093 static inline void drbd_tcp_cork(struct socket *sock)
29094 {
29095 - int __user val = 1;
29096 + int val = 1;
29097 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
29098 - (char __user *)&val, sizeof(val));
29099 + (char __force_user *)&val, sizeof(val));
29100 }
29101
29102 static inline void drbd_tcp_uncork(struct socket *sock)
29103 {
29104 - int __user val = 0;
29105 + int val = 0;
29106 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
29107 - (char __user *)&val, sizeof(val));
29108 + (char __force_user *)&val, sizeof(val));
29109 }
29110
29111 static inline void drbd_tcp_nodelay(struct socket *sock)
29112 {
29113 - int __user val = 1;
29114 + int val = 1;
29115 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
29116 - (char __user *)&val, sizeof(val));
29117 + (char __force_user *)&val, sizeof(val));
29118 }
29119
29120 static inline void drbd_tcp_quickack(struct socket *sock)
29121 {
29122 - int __user val = 2;
29123 + int val = 2;
29124 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
29125 - (char __user *)&val, sizeof(val));
29126 + (char __force_user *)&val, sizeof(val));
29127 }
29128
29129 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
29130 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
29131 index 920ede2..cb827ba 100644
29132 --- a/drivers/block/drbd/drbd_main.c
29133 +++ b/drivers/block/drbd/drbd_main.c
29134 @@ -2555,7 +2555,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
29135 p.sector = sector;
29136 p.block_id = block_id;
29137 p.blksize = blksize;
29138 - p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
29139 + p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
29140
29141 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
29142 return false;
29143 @@ -2853,7 +2853,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
29144
29145 p.sector = cpu_to_be64(req->sector);
29146 p.block_id = (unsigned long)req;
29147 - p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
29148 + p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
29149
29150 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
29151
29152 @@ -3138,7 +3138,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
29153 atomic_set(&mdev->unacked_cnt, 0);
29154 atomic_set(&mdev->local_cnt, 0);
29155 atomic_set(&mdev->net_cnt, 0);
29156 - atomic_set(&mdev->packet_seq, 0);
29157 + atomic_set_unchecked(&mdev->packet_seq, 0);
29158 atomic_set(&mdev->pp_in_use, 0);
29159 atomic_set(&mdev->pp_in_use_by_net, 0);
29160 atomic_set(&mdev->rs_sect_in, 0);
29161 @@ -3220,8 +3220,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
29162 mdev->receiver.t_state);
29163
29164 /* no need to lock it, I'm the only thread alive */
29165 - if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
29166 - dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
29167 + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
29168 + dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
29169 mdev->al_writ_cnt =
29170 mdev->bm_writ_cnt =
29171 mdev->read_cnt =
29172 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
29173 index 6d4de6a..7b7ad4b 100644
29174 --- a/drivers/block/drbd/drbd_nl.c
29175 +++ b/drivers/block/drbd/drbd_nl.c
29176 @@ -2387,7 +2387,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
29177 module_put(THIS_MODULE);
29178 }
29179
29180 -static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
29181 +static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
29182
29183 static unsigned short *
29184 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
29185 @@ -2458,7 +2458,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
29186 cn_reply->id.idx = CN_IDX_DRBD;
29187 cn_reply->id.val = CN_VAL_DRBD;
29188
29189 - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29190 + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29191 cn_reply->ack = 0; /* not used here. */
29192 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29193 (int)((char *)tl - (char *)reply->tag_list);
29194 @@ -2490,7 +2490,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
29195 cn_reply->id.idx = CN_IDX_DRBD;
29196 cn_reply->id.val = CN_VAL_DRBD;
29197
29198 - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29199 + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29200 cn_reply->ack = 0; /* not used here. */
29201 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29202 (int)((char *)tl - (char *)reply->tag_list);
29203 @@ -2568,7 +2568,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
29204 cn_reply->id.idx = CN_IDX_DRBD;
29205 cn_reply->id.val = CN_VAL_DRBD;
29206
29207 - cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
29208 + cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
29209 cn_reply->ack = 0; // not used here.
29210 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29211 (int)((char*)tl - (char*)reply->tag_list);
29212 @@ -2607,7 +2607,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
29213 cn_reply->id.idx = CN_IDX_DRBD;
29214 cn_reply->id.val = CN_VAL_DRBD;
29215
29216 - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29217 + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29218 cn_reply->ack = 0; /* not used here. */
29219 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29220 (int)((char *)tl - (char *)reply->tag_list);
29221 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
29222 index ea4836e..272d72a 100644
29223 --- a/drivers/block/drbd/drbd_receiver.c
29224 +++ b/drivers/block/drbd/drbd_receiver.c
29225 @@ -893,7 +893,7 @@ retry:
29226 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
29227 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
29228
29229 - atomic_set(&mdev->packet_seq, 0);
29230 + atomic_set_unchecked(&mdev->packet_seq, 0);
29231 mdev->peer_seq = 0;
29232
29233 if (drbd_send_protocol(mdev) == -1)
29234 @@ -994,7 +994,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
29235 do {
29236 next_epoch = NULL;
29237
29238 - epoch_size = atomic_read(&epoch->epoch_size);
29239 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
29240
29241 switch (ev & ~EV_CLEANUP) {
29242 case EV_PUT:
29243 @@ -1030,7 +1030,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
29244 rv = FE_DESTROYED;
29245 } else {
29246 epoch->flags = 0;
29247 - atomic_set(&epoch->epoch_size, 0);
29248 + atomic_set_unchecked(&epoch->epoch_size, 0);
29249 /* atomic_set(&epoch->active, 0); is already zero */
29250 if (rv == FE_STILL_LIVE)
29251 rv = FE_RECYCLED;
29252 @@ -1205,14 +1205,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
29253 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
29254 drbd_flush(mdev);
29255
29256 - if (atomic_read(&mdev->current_epoch->epoch_size)) {
29257 + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
29258 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
29259 if (epoch)
29260 break;
29261 }
29262
29263 epoch = mdev->current_epoch;
29264 - wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
29265 + wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
29266
29267 D_ASSERT(atomic_read(&epoch->active) == 0);
29268 D_ASSERT(epoch->flags == 0);
29269 @@ -1224,11 +1224,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
29270 }
29271
29272 epoch->flags = 0;
29273 - atomic_set(&epoch->epoch_size, 0);
29274 + atomic_set_unchecked(&epoch->epoch_size, 0);
29275 atomic_set(&epoch->active, 0);
29276
29277 spin_lock(&mdev->epoch_lock);
29278 - if (atomic_read(&mdev->current_epoch->epoch_size)) {
29279 + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
29280 list_add(&epoch->list, &mdev->current_epoch->list);
29281 mdev->current_epoch = epoch;
29282 mdev->epochs++;
29283 @@ -1695,7 +1695,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
29284 spin_unlock(&mdev->peer_seq_lock);
29285
29286 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
29287 - atomic_inc(&mdev->current_epoch->epoch_size);
29288 + atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
29289 return drbd_drain_block(mdev, data_size);
29290 }
29291
29292 @@ -1721,7 +1721,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
29293
29294 spin_lock(&mdev->epoch_lock);
29295 e->epoch = mdev->current_epoch;
29296 - atomic_inc(&e->epoch->epoch_size);
29297 + atomic_inc_unchecked(&e->epoch->epoch_size);
29298 atomic_inc(&e->epoch->active);
29299 spin_unlock(&mdev->epoch_lock);
29300
29301 @@ -3936,7 +3936,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
29302 D_ASSERT(list_empty(&mdev->done_ee));
29303
29304 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
29305 - atomic_set(&mdev->current_epoch->epoch_size, 0);
29306 + atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
29307 D_ASSERT(list_empty(&mdev->current_epoch->list));
29308 }
29309
29310 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
29311 index 3bba655..6151b66 100644
29312 --- a/drivers/block/loop.c
29313 +++ b/drivers/block/loop.c
29314 @@ -226,7 +226,7 @@ static int __do_lo_send_write(struct file *file,
29315 mm_segment_t old_fs = get_fs();
29316
29317 set_fs(get_ds());
29318 - bw = file->f_op->write(file, buf, len, &pos);
29319 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
29320 set_fs(old_fs);
29321 if (likely(bw == len))
29322 return 0;
29323 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
29324 index ea6f632..eafb192 100644
29325 --- a/drivers/char/Kconfig
29326 +++ b/drivers/char/Kconfig
29327 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
29328
29329 config DEVKMEM
29330 bool "/dev/kmem virtual device support"
29331 - default y
29332 + default n
29333 + depends on !GRKERNSEC_KMEM
29334 help
29335 Say Y here if you want to support the /dev/kmem device. The
29336 /dev/kmem device is rarely used, but can be used for certain
29337 @@ -581,6 +582,7 @@ config DEVPORT
29338 bool
29339 depends on !M68K
29340 depends on ISA || PCI
29341 + depends on !GRKERNSEC_KMEM
29342 default y
29343
29344 source "drivers/s390/char/Kconfig"
29345 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
29346 index 2e04433..22afc64 100644
29347 --- a/drivers/char/agp/frontend.c
29348 +++ b/drivers/char/agp/frontend.c
29349 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
29350 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
29351 return -EFAULT;
29352
29353 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
29354 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
29355 return -EFAULT;
29356
29357 client = agp_find_client_by_pid(reserve.pid);
29358 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
29359 index 21cb980..f15107c 100644
29360 --- a/drivers/char/genrtc.c
29361 +++ b/drivers/char/genrtc.c
29362 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct file *file,
29363 switch (cmd) {
29364
29365 case RTC_PLL_GET:
29366 + memset(&pll, 0, sizeof(pll));
29367 if (get_rtc_pll(&pll))
29368 return -EINVAL;
29369 else
29370 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29371 index dfd7876..c0b0885 100644
29372 --- a/drivers/char/hpet.c
29373 +++ b/drivers/char/hpet.c
29374 @@ -571,7 +571,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29375 }
29376
29377 static int
29378 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29379 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29380 struct hpet_info *info)
29381 {
29382 struct hpet_timer __iomem *timer;
29383 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29384 index 2c29942..604c5ba 100644
29385 --- a/drivers/char/ipmi/ipmi_msghandler.c
29386 +++ b/drivers/char/ipmi/ipmi_msghandler.c
29387 @@ -420,7 +420,7 @@ struct ipmi_smi {
29388 struct proc_dir_entry *proc_dir;
29389 char proc_dir_name[10];
29390
29391 - atomic_t stats[IPMI_NUM_STATS];
29392 + atomic_unchecked_t stats[IPMI_NUM_STATS];
29393
29394 /*
29395 * run_to_completion duplicate of smb_info, smi_info
29396 @@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29397
29398
29399 #define ipmi_inc_stat(intf, stat) \
29400 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29401 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29402 #define ipmi_get_stat(intf, stat) \
29403 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29404 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29405
29406 static int is_lan_addr(struct ipmi_addr *addr)
29407 {
29408 @@ -2884,7 +2884,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29409 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29410 init_waitqueue_head(&intf->waitq);
29411 for (i = 0; i < IPMI_NUM_STATS; i++)
29412 - atomic_set(&intf->stats[i], 0);
29413 + atomic_set_unchecked(&intf->stats[i], 0);
29414
29415 intf->proc_dir = NULL;
29416
29417 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29418 index 1e638ff..a869ef5 100644
29419 --- a/drivers/char/ipmi/ipmi_si_intf.c
29420 +++ b/drivers/char/ipmi/ipmi_si_intf.c
29421 @@ -275,7 +275,7 @@ struct smi_info {
29422 unsigned char slave_addr;
29423
29424 /* Counters and things for the proc filesystem. */
29425 - atomic_t stats[SI_NUM_STATS];
29426 + atomic_unchecked_t stats[SI_NUM_STATS];
29427
29428 struct task_struct *thread;
29429
29430 @@ -284,9 +284,9 @@ struct smi_info {
29431 };
29432
29433 #define smi_inc_stat(smi, stat) \
29434 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29435 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29436 #define smi_get_stat(smi, stat) \
29437 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29438 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29439
29440 #define SI_MAX_PARMS 4
29441
29442 @@ -3209,7 +3209,7 @@ static int try_smi_init(struct smi_info *new_smi)
29443 atomic_set(&new_smi->req_events, 0);
29444 new_smi->run_to_completion = 0;
29445 for (i = 0; i < SI_NUM_STATS; i++)
29446 - atomic_set(&new_smi->stats[i], 0);
29447 + atomic_set_unchecked(&new_smi->stats[i], 0);
29448
29449 new_smi->interrupt_disabled = 1;
29450 atomic_set(&new_smi->stop_operation, 0);
29451 diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29452 index 47ff7e4..0c7d340 100644
29453 --- a/drivers/char/mbcs.c
29454 +++ b/drivers/char/mbcs.c
29455 @@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
29456 return 0;
29457 }
29458
29459 -static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29460 +static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29461 {
29462 .part_num = MBCS_PART_NUM,
29463 .mfg_num = MBCS_MFG_NUM,
29464 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29465 index 67c3371..ba8429d 100644
29466 --- a/drivers/char/mem.c
29467 +++ b/drivers/char/mem.c
29468 @@ -18,6 +18,7 @@
29469 #include <linux/raw.h>
29470 #include <linux/tty.h>
29471 #include <linux/capability.h>
29472 +#include <linux/security.h>
29473 #include <linux/ptrace.h>
29474 #include <linux/device.h>
29475 #include <linux/highmem.h>
29476 @@ -35,6 +36,10 @@
29477 # include <linux/efi.h>
29478 #endif
29479
29480 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29481 +extern const struct file_operations grsec_fops;
29482 +#endif
29483 +
29484 static inline unsigned long size_inside_page(unsigned long start,
29485 unsigned long size)
29486 {
29487 @@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29488
29489 while (cursor < to) {
29490 if (!devmem_is_allowed(pfn)) {
29491 +#ifdef CONFIG_GRKERNSEC_KMEM
29492 + gr_handle_mem_readwrite(from, to);
29493 +#else
29494 printk(KERN_INFO
29495 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29496 current->comm, from, to);
29497 +#endif
29498 return 0;
29499 }
29500 cursor += PAGE_SIZE;
29501 @@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29502 }
29503 return 1;
29504 }
29505 +#elif defined(CONFIG_GRKERNSEC_KMEM)
29506 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29507 +{
29508 + return 0;
29509 +}
29510 #else
29511 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29512 {
29513 @@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29514
29515 while (count > 0) {
29516 unsigned long remaining;
29517 + char *temp;
29518
29519 sz = size_inside_page(p, count);
29520
29521 @@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29522 if (!ptr)
29523 return -EFAULT;
29524
29525 - remaining = copy_to_user(buf, ptr, sz);
29526 +#ifdef CONFIG_PAX_USERCOPY
29527 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
29528 + if (!temp) {
29529 + unxlate_dev_mem_ptr(p, ptr);
29530 + return -ENOMEM;
29531 + }
29532 + memcpy(temp, ptr, sz);
29533 +#else
29534 + temp = ptr;
29535 +#endif
29536 +
29537 + remaining = copy_to_user(buf, temp, sz);
29538 +
29539 +#ifdef CONFIG_PAX_USERCOPY
29540 + kfree(temp);
29541 +#endif
29542 +
29543 unxlate_dev_mem_ptr(p, ptr);
29544 if (remaining)
29545 return -EFAULT;
29546 @@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29547 size_t count, loff_t *ppos)
29548 {
29549 unsigned long p = *ppos;
29550 - ssize_t low_count, read, sz;
29551 + ssize_t low_count, read, sz, err = 0;
29552 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29553 - int err = 0;
29554
29555 read = 0;
29556 if (p < (unsigned long) high_memory) {
29557 @@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29558 }
29559 #endif
29560 while (low_count > 0) {
29561 + char *temp;
29562 +
29563 sz = size_inside_page(p, low_count);
29564
29565 /*
29566 @@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29567 */
29568 kbuf = xlate_dev_kmem_ptr((char *)p);
29569
29570 - if (copy_to_user(buf, kbuf, sz))
29571 +#ifdef CONFIG_PAX_USERCOPY
29572 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
29573 + if (!temp)
29574 + return -ENOMEM;
29575 + memcpy(temp, kbuf, sz);
29576 +#else
29577 + temp = kbuf;
29578 +#endif
29579 +
29580 + err = copy_to_user(buf, temp, sz);
29581 +
29582 +#ifdef CONFIG_PAX_USERCOPY
29583 + kfree(temp);
29584 +#endif
29585 +
29586 + if (err)
29587 return -EFAULT;
29588 buf += sz;
29589 p += sz;
29590 @@ -831,6 +878,9 @@ static const struct memdev {
29591 #ifdef CONFIG_CRASH_DUMP
29592 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29593 #endif
29594 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29595 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29596 +#endif
29597 };
29598
29599 static int memory_open(struct inode *inode, struct file *filp)
29600 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
29601 index 9df78e2..01ba9ae 100644
29602 --- a/drivers/char/nvram.c
29603 +++ b/drivers/char/nvram.c
29604 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
29605
29606 spin_unlock_irq(&rtc_lock);
29607
29608 - if (copy_to_user(buf, contents, tmp - contents))
29609 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
29610 return -EFAULT;
29611
29612 *ppos = i;
29613 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
29614 index 0a484b4..f48ccd1 100644
29615 --- a/drivers/char/pcmcia/synclink_cs.c
29616 +++ b/drivers/char/pcmcia/synclink_cs.c
29617 @@ -2340,9 +2340,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
29618
29619 if (debug_level >= DEBUG_LEVEL_INFO)
29620 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
29621 - __FILE__,__LINE__, info->device_name, port->count);
29622 + __FILE__,__LINE__, info->device_name, atomic_read(&port->count));
29623
29624 - WARN_ON(!port->count);
29625 + WARN_ON(!atomic_read(&port->count));
29626
29627 if (tty_port_close_start(port, tty, filp) == 0)
29628 goto cleanup;
29629 @@ -2360,7 +2360,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
29630 cleanup:
29631 if (debug_level >= DEBUG_LEVEL_INFO)
29632 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__,__LINE__,
29633 - tty->driver->name, port->count);
29634 + tty->driver->name, atomic_read(&port->count));
29635 }
29636
29637 /* Wait until the transmitter is empty.
29638 @@ -2502,7 +2502,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
29639
29640 if (debug_level >= DEBUG_LEVEL_INFO)
29641 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
29642 - __FILE__,__LINE__,tty->driver->name, port->count);
29643 + __FILE__,__LINE__,tty->driver->name, atomic_read(&port->count));
29644
29645 /* If port is closing, signal caller to try again */
29646 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
29647 @@ -2522,11 +2522,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
29648 goto cleanup;
29649 }
29650 spin_lock(&port->lock);
29651 - port->count++;
29652 + atomic_inc(&port->count);
29653 spin_unlock(&port->lock);
29654 spin_unlock_irqrestore(&info->netlock, flags);
29655
29656 - if (port->count == 1) {
29657 + if (atomic_read(&port->count) == 1) {
29658 /* 1st open on this device, init hardware */
29659 retval = startup(info, tty);
29660 if (retval < 0)
29661 @@ -3891,7 +3891,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
29662 unsigned short new_crctype;
29663
29664 /* return error if TTY interface open */
29665 - if (info->port.count)
29666 + if (atomic_read(&info->port.count))
29667 return -EBUSY;
29668
29669 switch (encoding)
29670 @@ -3994,7 +3994,7 @@ static int hdlcdev_open(struct net_device *dev)
29671
29672 /* arbitrate between network and tty opens */
29673 spin_lock_irqsave(&info->netlock, flags);
29674 - if (info->port.count != 0 || info->netcount != 0) {
29675 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
29676 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
29677 spin_unlock_irqrestore(&info->netlock, flags);
29678 return -EBUSY;
29679 @@ -4083,7 +4083,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
29680 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
29681
29682 /* return error if TTY interface open */
29683 - if (info->port.count)
29684 + if (atomic_read(&info->port.count))
29685 return -EBUSY;
29686
29687 if (cmd != SIOCWANDEV)
29688 diff --git a/drivers/char/random.c b/drivers/char/random.c
29689 index d98b2a6..f0ceb97 100644
29690 --- a/drivers/char/random.c
29691 +++ b/drivers/char/random.c
29692 @@ -272,8 +272,13 @@
29693 /*
29694 * Configuration information
29695 */
29696 +#ifdef CONFIG_GRKERNSEC_RANDNET
29697 +#define INPUT_POOL_WORDS 512
29698 +#define OUTPUT_POOL_WORDS 128
29699 +#else
29700 #define INPUT_POOL_WORDS 128
29701 #define OUTPUT_POOL_WORDS 32
29702 +#endif
29703 #define SEC_XFER_SIZE 512
29704 #define EXTRACT_SIZE 10
29705
29706 @@ -313,10 +318,17 @@ static struct poolinfo {
29707 int poolwords;
29708 int tap1, tap2, tap3, tap4, tap5;
29709 } poolinfo_table[] = {
29710 +#ifdef CONFIG_GRKERNSEC_RANDNET
29711 + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29712 + { 512, 411, 308, 208, 104, 1 },
29713 + /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29714 + { 128, 103, 76, 51, 25, 1 },
29715 +#else
29716 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29717 { 128, 103, 76, 51, 25, 1 },
29718 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29719 { 32, 26, 20, 14, 7, 1 },
29720 +#endif
29721 #if 0
29722 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29723 { 2048, 1638, 1231, 819, 411, 1 },
29724 @@ -527,8 +539,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
29725 input_rotate += i ? 7 : 14;
29726 }
29727
29728 - ACCESS_ONCE(r->input_rotate) = input_rotate;
29729 - ACCESS_ONCE(r->add_ptr) = i;
29730 + ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
29731 + ACCESS_ONCE_RW(r->add_ptr) = i;
29732 smp_wmb();
29733
29734 if (out)
29735 @@ -799,6 +811,17 @@ void add_disk_randomness(struct gendisk *disk)
29736 }
29737 #endif
29738
29739 +#ifdef CONFIG_PAX_LATENT_ENTROPY
29740 +u64 latent_entropy;
29741 +
29742 +__init void transfer_latent_entropy(void)
29743 +{
29744 + mix_pool_bytes(&input_pool, &latent_entropy, sizeof(latent_entropy), NULL);
29745 + mix_pool_bytes(&nonblocking_pool, &latent_entropy, sizeof(latent_entropy), NULL);
29746 +// printk(KERN_INFO "PAX: transferring latent entropy: %16llx\n", latent_entropy);
29747 +}
29748 +#endif
29749 +
29750 /*********************************************************************
29751 *
29752 * Entropy extraction routines
29753 @@ -1008,7 +1031,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
29754
29755 extract_buf(r, tmp);
29756 i = min_t(int, nbytes, EXTRACT_SIZE);
29757 - if (copy_to_user(buf, tmp, i)) {
29758 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
29759 ret = -EFAULT;
29760 break;
29761 }
29762 @@ -1342,7 +1365,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29763 #include <linux/sysctl.h>
29764
29765 static int min_read_thresh = 8, min_write_thresh;
29766 -static int max_read_thresh = INPUT_POOL_WORDS * 32;
29767 +static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29768 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29769 static char sysctl_bootid[16];
29770
29771 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
29772 index 45713f0..8286d21 100644
29773 --- a/drivers/char/sonypi.c
29774 +++ b/drivers/char/sonypi.c
29775 @@ -54,6 +54,7 @@
29776
29777 #include <asm/uaccess.h>
29778 #include <asm/io.h>
29779 +#include <asm/local.h>
29780
29781 #include <linux/sonypi.h>
29782
29783 @@ -490,7 +491,7 @@ static struct sonypi_device {
29784 spinlock_t fifo_lock;
29785 wait_queue_head_t fifo_proc_list;
29786 struct fasync_struct *fifo_async;
29787 - int open_count;
29788 + local_t open_count;
29789 int model;
29790 struct input_dev *input_jog_dev;
29791 struct input_dev *input_key_dev;
29792 @@ -897,7 +898,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
29793 static int sonypi_misc_release(struct inode *inode, struct file *file)
29794 {
29795 mutex_lock(&sonypi_device.lock);
29796 - sonypi_device.open_count--;
29797 + local_dec(&sonypi_device.open_count);
29798 mutex_unlock(&sonypi_device.lock);
29799 return 0;
29800 }
29801 @@ -906,9 +907,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
29802 {
29803 mutex_lock(&sonypi_device.lock);
29804 /* Flush input queue on first open */
29805 - if (!sonypi_device.open_count)
29806 + if (!local_read(&sonypi_device.open_count))
29807 kfifo_reset(&sonypi_device.fifo);
29808 - sonypi_device.open_count++;
29809 + local_inc(&sonypi_device.open_count);
29810 mutex_unlock(&sonypi_device.lock);
29811
29812 return 0;
29813 diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
29814 index 08427ab..1ab10b7 100644
29815 --- a/drivers/char/tpm/tpm.c
29816 +++ b/drivers/char/tpm/tpm.c
29817 @@ -415,7 +415,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
29818 chip->vendor.req_complete_val)
29819 goto out_recv;
29820
29821 - if ((status == chip->vendor.req_canceled)) {
29822 + if (status == chip->vendor.req_canceled) {
29823 dev_err(chip->dev, "Operation Canceled\n");
29824 rc = -ECANCELED;
29825 goto out;
29826 diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
29827 index 0636520..169c1d0 100644
29828 --- a/drivers/char/tpm/tpm_bios.c
29829 +++ b/drivers/char/tpm/tpm_bios.c
29830 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
29831 event = addr;
29832
29833 if ((event->event_type == 0 && event->event_size == 0) ||
29834 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29835 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29836 return NULL;
29837
29838 return addr;
29839 @@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
29840 return NULL;
29841
29842 if ((event->event_type == 0 && event->event_size == 0) ||
29843 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29844 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29845 return NULL;
29846
29847 (*pos)++;
29848 @@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
29849 int i;
29850
29851 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29852 - seq_putc(m, data[i]);
29853 + if (!seq_putc(m, data[i]))
29854 + return -EFAULT;
29855
29856 return 0;
29857 }
29858 @@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
29859 log->bios_event_log_end = log->bios_event_log + len;
29860
29861 virt = acpi_os_map_memory(start, len);
29862 + if (!virt) {
29863 + kfree(log->bios_event_log);
29864 + log->bios_event_log = NULL;
29865 + return -EFAULT;
29866 + }
29867
29868 - memcpy(log->bios_event_log, virt, len);
29869 + memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29870
29871 acpi_os_unmap_memory(virt, len);
29872 return 0;
29873 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
29874 index cdf2f54..e55c197 100644
29875 --- a/drivers/char/virtio_console.c
29876 +++ b/drivers/char/virtio_console.c
29877 @@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
29878 if (to_user) {
29879 ssize_t ret;
29880
29881 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
29882 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
29883 if (ret)
29884 return -EFAULT;
29885 } else {
29886 @@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
29887 if (!port_has_data(port) && !port->host_connected)
29888 return 0;
29889
29890 - return fill_readbuf(port, ubuf, count, true);
29891 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
29892 }
29893
29894 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
29895 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
29896 index 97f5064..202b6e6 100644
29897 --- a/drivers/edac/edac_pci_sysfs.c
29898 +++ b/drivers/edac/edac_pci_sysfs.c
29899 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
29900 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29901 static int edac_pci_poll_msec = 1000; /* one second workq period */
29902
29903 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
29904 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29905 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29906 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29907
29908 static struct kobject *edac_pci_top_main_kobj;
29909 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29910 @@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29911 edac_printk(KERN_CRIT, EDAC_PCI,
29912 "Signaled System Error on %s\n",
29913 pci_name(dev));
29914 - atomic_inc(&pci_nonparity_count);
29915 + atomic_inc_unchecked(&pci_nonparity_count);
29916 }
29917
29918 if (status & (PCI_STATUS_PARITY)) {
29919 @@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29920 "Master Data Parity Error on %s\n",
29921 pci_name(dev));
29922
29923 - atomic_inc(&pci_parity_count);
29924 + atomic_inc_unchecked(&pci_parity_count);
29925 }
29926
29927 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29928 @@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29929 "Detected Parity Error on %s\n",
29930 pci_name(dev));
29931
29932 - atomic_inc(&pci_parity_count);
29933 + atomic_inc_unchecked(&pci_parity_count);
29934 }
29935 }
29936
29937 @@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29938 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29939 "Signaled System Error on %s\n",
29940 pci_name(dev));
29941 - atomic_inc(&pci_nonparity_count);
29942 + atomic_inc_unchecked(&pci_nonparity_count);
29943 }
29944
29945 if (status & (PCI_STATUS_PARITY)) {
29946 @@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29947 "Master Data Parity Error on "
29948 "%s\n", pci_name(dev));
29949
29950 - atomic_inc(&pci_parity_count);
29951 + atomic_inc_unchecked(&pci_parity_count);
29952 }
29953
29954 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29955 @@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29956 "Detected Parity Error on %s\n",
29957 pci_name(dev));
29958
29959 - atomic_inc(&pci_parity_count);
29960 + atomic_inc_unchecked(&pci_parity_count);
29961 }
29962 }
29963 }
29964 @@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
29965 if (!check_pci_errors)
29966 return;
29967
29968 - before_count = atomic_read(&pci_parity_count);
29969 + before_count = atomic_read_unchecked(&pci_parity_count);
29970
29971 /* scan all PCI devices looking for a Parity Error on devices and
29972 * bridges.
29973 @@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
29974 /* Only if operator has selected panic on PCI Error */
29975 if (edac_pci_get_panic_on_pe()) {
29976 /* If the count is different 'after' from 'before' */
29977 - if (before_count != atomic_read(&pci_parity_count))
29978 + if (before_count != atomic_read_unchecked(&pci_parity_count))
29979 panic("EDAC: PCI Parity Error");
29980 }
29981 }
29982 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
29983 index 8c87a5e..a19cbd7 100644
29984 --- a/drivers/edac/mce_amd.h
29985 +++ b/drivers/edac/mce_amd.h
29986 @@ -80,7 +80,7 @@ extern const char * const ii_msgs[];
29987 struct amd_decoder_ops {
29988 bool (*dc_mce)(u16, u8);
29989 bool (*ic_mce)(u16, u8);
29990 -};
29991 +} __no_const;
29992
29993 void amd_report_gart_errors(bool);
29994 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
29995 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
29996 index 57ea7f4..789e3c3 100644
29997 --- a/drivers/firewire/core-card.c
29998 +++ b/drivers/firewire/core-card.c
29999 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
30000
30001 void fw_core_remove_card(struct fw_card *card)
30002 {
30003 - struct fw_card_driver dummy_driver = dummy_driver_template;
30004 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
30005
30006 card->driver->update_phy_reg(card, 4,
30007 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
30008 diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
30009 index 2783f69..9f4b0cc 100644
30010 --- a/drivers/firewire/core-cdev.c
30011 +++ b/drivers/firewire/core-cdev.c
30012 @@ -1365,8 +1365,7 @@ static int init_iso_resource(struct client *client,
30013 int ret;
30014
30015 if ((request->channels == 0 && request->bandwidth == 0) ||
30016 - request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
30017 - request->bandwidth < 0)
30018 + request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
30019 return -EINVAL;
30020
30021 r = kmalloc(sizeof(*r), GFP_KERNEL);
30022 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
30023 index 780708d..ad60a66 100644
30024 --- a/drivers/firewire/core-transaction.c
30025 +++ b/drivers/firewire/core-transaction.c
30026 @@ -37,6 +37,7 @@
30027 #include <linux/timer.h>
30028 #include <linux/types.h>
30029 #include <linux/workqueue.h>
30030 +#include <linux/sched.h>
30031
30032 #include <asm/byteorder.h>
30033
30034 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
30035 index 515a42c..5ecf3ba 100644
30036 --- a/drivers/firewire/core.h
30037 +++ b/drivers/firewire/core.h
30038 @@ -111,6 +111,7 @@ struct fw_card_driver {
30039
30040 int (*stop_iso)(struct fw_iso_context *ctx);
30041 };
30042 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
30043
30044 void fw_card_initialize(struct fw_card *card,
30045 const struct fw_card_driver *driver, struct device *device);
30046 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
30047 index b298158..7ed8432 100644
30048 --- a/drivers/firmware/dmi_scan.c
30049 +++ b/drivers/firmware/dmi_scan.c
30050 @@ -452,11 +452,6 @@ void __init dmi_scan_machine(void)
30051 }
30052 }
30053 else {
30054 - /*
30055 - * no iounmap() for that ioremap(); it would be a no-op, but
30056 - * it's so early in setup that sucker gets confused into doing
30057 - * what it shouldn't if we actually call it.
30058 - */
30059 p = dmi_ioremap(0xF0000, 0x10000);
30060 if (p == NULL)
30061 goto error;
30062 @@ -726,7 +721,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
30063 if (buf == NULL)
30064 return -1;
30065
30066 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
30067 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
30068
30069 iounmap(buf);
30070 return 0;
30071 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
30072 index 82d5c20..44a7177 100644
30073 --- a/drivers/gpio/gpio-vr41xx.c
30074 +++ b/drivers/gpio/gpio-vr41xx.c
30075 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
30076 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
30077 maskl, pendl, maskh, pendh);
30078
30079 - atomic_inc(&irq_err_count);
30080 + atomic_inc_unchecked(&irq_err_count);
30081
30082 return -EINVAL;
30083 }
30084 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
30085 index 3252e70..b5314ace 100644
30086 --- a/drivers/gpu/drm/drm_crtc_helper.c
30087 +++ b/drivers/gpu/drm/drm_crtc_helper.c
30088 @@ -286,7 +286,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
30089 struct drm_crtc *tmp;
30090 int crtc_mask = 1;
30091
30092 - WARN(!crtc, "checking null crtc?\n");
30093 + BUG_ON(!crtc);
30094
30095 dev = crtc->dev;
30096
30097 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
30098 index 8a9d079..606cdd5 100644
30099 --- a/drivers/gpu/drm/drm_drv.c
30100 +++ b/drivers/gpu/drm/drm_drv.c
30101 @@ -318,7 +318,7 @@ module_exit(drm_core_exit);
30102 /**
30103 * Copy and IOCTL return string to user space
30104 */
30105 -static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
30106 +static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
30107 {
30108 int len;
30109
30110 @@ -401,7 +401,7 @@ long drm_ioctl(struct file *filp,
30111 return -ENODEV;
30112
30113 atomic_inc(&dev->ioctl_count);
30114 - atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
30115 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
30116 ++file_priv->ioctl_count;
30117
30118 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
30119 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
30120 index 123de28..43a0897 100644
30121 --- a/drivers/gpu/drm/drm_fops.c
30122 +++ b/drivers/gpu/drm/drm_fops.c
30123 @@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
30124 }
30125
30126 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30127 - atomic_set(&dev->counts[i], 0);
30128 + atomic_set_unchecked(&dev->counts[i], 0);
30129
30130 dev->sigdata.lock = NULL;
30131
30132 @@ -138,8 +138,8 @@ int drm_open(struct inode *inode, struct file *filp)
30133
30134 retcode = drm_open_helper(inode, filp, dev);
30135 if (!retcode) {
30136 - atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30137 - if (!dev->open_count++)
30138 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30139 + if (local_inc_return(&dev->open_count) == 1)
30140 retcode = drm_setup(dev);
30141 }
30142 if (!retcode) {
30143 @@ -482,7 +482,7 @@ int drm_release(struct inode *inode, struct file *filp)
30144
30145 mutex_lock(&drm_global_mutex);
30146
30147 - DRM_DEBUG("open_count = %d\n", dev->open_count);
30148 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
30149
30150 if (dev->driver->preclose)
30151 dev->driver->preclose(dev, file_priv);
30152 @@ -491,10 +491,10 @@ int drm_release(struct inode *inode, struct file *filp)
30153 * Begin inline drm_release
30154 */
30155
30156 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30157 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
30158 task_pid_nr(current),
30159 (long)old_encode_dev(file_priv->minor->device),
30160 - dev->open_count);
30161 + local_read(&dev->open_count));
30162
30163 /* Release any auth tokens that might point to this file_priv,
30164 (do that under the drm_global_mutex) */
30165 @@ -584,8 +584,8 @@ int drm_release(struct inode *inode, struct file *filp)
30166 * End inline drm_release
30167 */
30168
30169 - atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30170 - if (!--dev->open_count) {
30171 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30172 + if (local_dec_and_test(&dev->open_count)) {
30173 if (atomic_read(&dev->ioctl_count)) {
30174 DRM_ERROR("Device busy: %d\n",
30175 atomic_read(&dev->ioctl_count));
30176 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30177 index c87dc96..326055d 100644
30178 --- a/drivers/gpu/drm/drm_global.c
30179 +++ b/drivers/gpu/drm/drm_global.c
30180 @@ -36,7 +36,7 @@
30181 struct drm_global_item {
30182 struct mutex mutex;
30183 void *object;
30184 - int refcount;
30185 + atomic_t refcount;
30186 };
30187
30188 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30189 @@ -49,7 +49,7 @@ void drm_global_init(void)
30190 struct drm_global_item *item = &glob[i];
30191 mutex_init(&item->mutex);
30192 item->object = NULL;
30193 - item->refcount = 0;
30194 + atomic_set(&item->refcount, 0);
30195 }
30196 }
30197
30198 @@ -59,7 +59,7 @@ void drm_global_release(void)
30199 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30200 struct drm_global_item *item = &glob[i];
30201 BUG_ON(item->object != NULL);
30202 - BUG_ON(item->refcount != 0);
30203 + BUG_ON(atomic_read(&item->refcount) != 0);
30204 }
30205 }
30206
30207 @@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30208 void *object;
30209
30210 mutex_lock(&item->mutex);
30211 - if (item->refcount == 0) {
30212 + if (atomic_read(&item->refcount) == 0) {
30213 item->object = kzalloc(ref->size, GFP_KERNEL);
30214 if (unlikely(item->object == NULL)) {
30215 ret = -ENOMEM;
30216 @@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30217 goto out_err;
30218
30219 }
30220 - ++item->refcount;
30221 + atomic_inc(&item->refcount);
30222 ref->object = item->object;
30223 object = item->object;
30224 mutex_unlock(&item->mutex);
30225 @@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30226 struct drm_global_item *item = &glob[ref->global_type];
30227
30228 mutex_lock(&item->mutex);
30229 - BUG_ON(item->refcount == 0);
30230 + BUG_ON(atomic_read(&item->refcount) == 0);
30231 BUG_ON(ref->object != item->object);
30232 - if (--item->refcount == 0) {
30233 + if (atomic_dec_and_test(&item->refcount)) {
30234 ref->release(ref);
30235 item->object = NULL;
30236 }
30237 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30238 index ab1162d..42587b2 100644
30239 --- a/drivers/gpu/drm/drm_info.c
30240 +++ b/drivers/gpu/drm/drm_info.c
30241 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30242 struct drm_local_map *map;
30243 struct drm_map_list *r_list;
30244
30245 - /* Hardcoded from _DRM_FRAME_BUFFER,
30246 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30247 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30248 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30249 + static const char * const types[] = {
30250 + [_DRM_FRAME_BUFFER] = "FB",
30251 + [_DRM_REGISTERS] = "REG",
30252 + [_DRM_SHM] = "SHM",
30253 + [_DRM_AGP] = "AGP",
30254 + [_DRM_SCATTER_GATHER] = "SG",
30255 + [_DRM_CONSISTENT] = "PCI",
30256 + [_DRM_GEM] = "GEM" };
30257 const char *type;
30258 int i;
30259
30260 @@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30261 map = r_list->map;
30262 if (!map)
30263 continue;
30264 - if (map->type < 0 || map->type > 5)
30265 + if (map->type >= ARRAY_SIZE(types))
30266 type = "??";
30267 else
30268 type = types[map->type];
30269 @@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30270 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30271 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30272 vma->vm_flags & VM_IO ? 'i' : '-',
30273 +#ifdef CONFIG_GRKERNSEC_HIDESYM
30274 + 0);
30275 +#else
30276 vma->vm_pgoff);
30277 +#endif
30278
30279 #if defined(__i386__)
30280 pgprot = pgprot_val(vma->vm_page_prot);
30281 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30282 index 637fcc3..e890b33 100644
30283 --- a/drivers/gpu/drm/drm_ioc32.c
30284 +++ b/drivers/gpu/drm/drm_ioc32.c
30285 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30286 request = compat_alloc_user_space(nbytes);
30287 if (!access_ok(VERIFY_WRITE, request, nbytes))
30288 return -EFAULT;
30289 - list = (struct drm_buf_desc *) (request + 1);
30290 + list = (struct drm_buf_desc __user *) (request + 1);
30291
30292 if (__put_user(count, &request->count)
30293 || __put_user(list, &request->list))
30294 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30295 request = compat_alloc_user_space(nbytes);
30296 if (!access_ok(VERIFY_WRITE, request, nbytes))
30297 return -EFAULT;
30298 - list = (struct drm_buf_pub *) (request + 1);
30299 + list = (struct drm_buf_pub __user *) (request + 1);
30300
30301 if (__put_user(count, &request->count)
30302 || __put_user(list, &request->list))
30303 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30304 index 64a62c6..ceab35e 100644
30305 --- a/drivers/gpu/drm/drm_ioctl.c
30306 +++ b/drivers/gpu/drm/drm_ioctl.c
30307 @@ -252,7 +252,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30308 stats->data[i].value =
30309 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30310 else
30311 - stats->data[i].value = atomic_read(&dev->counts[i]);
30312 + stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30313 stats->data[i].type = dev->types[i];
30314 }
30315
30316 diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30317 index 5211520..c744d85 100644
30318 --- a/drivers/gpu/drm/drm_lock.c
30319 +++ b/drivers/gpu/drm/drm_lock.c
30320 @@ -90,7 +90,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30321 if (drm_lock_take(&master->lock, lock->context)) {
30322 master->lock.file_priv = file_priv;
30323 master->lock.lock_time = jiffies;
30324 - atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30325 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30326 break; /* Got lock */
30327 }
30328
30329 @@ -161,7 +161,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30330 return -EINVAL;
30331 }
30332
30333 - atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30334 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30335
30336 if (drm_lock_free(&master->lock, lock->context)) {
30337 /* FIXME: Should really bail out here. */
30338 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
30339 index 21bcd4a..8e074e0 100644
30340 --- a/drivers/gpu/drm/drm_stub.c
30341 +++ b/drivers/gpu/drm/drm_stub.c
30342 @@ -511,7 +511,7 @@ void drm_unplug_dev(struct drm_device *dev)
30343
30344 drm_device_set_unplugged(dev);
30345
30346 - if (dev->open_count == 0) {
30347 + if (local_read(&dev->open_count) == 0) {
30348 drm_put_dev(dev);
30349 }
30350 mutex_unlock(&drm_global_mutex);
30351 diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30352 index fa94391..ed26ec8 100644
30353 --- a/drivers/gpu/drm/i810/i810_dma.c
30354 +++ b/drivers/gpu/drm/i810/i810_dma.c
30355 @@ -943,8 +943,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30356 dma->buflist[vertex->idx],
30357 vertex->discard, vertex->used);
30358
30359 - atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30360 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30361 + atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30362 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30363 sarea_priv->last_enqueue = dev_priv->counter - 1;
30364 sarea_priv->last_dispatch = (int)hw_status[5];
30365
30366 @@ -1104,8 +1104,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30367 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30368 mc->last_render);
30369
30370 - atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30371 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30372 + atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30373 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30374 sarea_priv->last_enqueue = dev_priv->counter - 1;
30375 sarea_priv->last_dispatch = (int)hw_status[5];
30376
30377 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30378 index c9339f4..f5e1b9d 100644
30379 --- a/drivers/gpu/drm/i810/i810_drv.h
30380 +++ b/drivers/gpu/drm/i810/i810_drv.h
30381 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30382 int page_flipping;
30383
30384 wait_queue_head_t irq_queue;
30385 - atomic_t irq_received;
30386 - atomic_t irq_emitted;
30387 + atomic_unchecked_t irq_received;
30388 + atomic_unchecked_t irq_emitted;
30389
30390 int front_offset;
30391 } drm_i810_private_t;
30392 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30393 index 5363e9c..59360d1 100644
30394 --- a/drivers/gpu/drm/i915/i915_debugfs.c
30395 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
30396 @@ -518,7 +518,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30397 I915_READ(GTIMR));
30398 }
30399 seq_printf(m, "Interrupts received: %d\n",
30400 - atomic_read(&dev_priv->irq_received));
30401 + atomic_read_unchecked(&dev_priv->irq_received));
30402 for (i = 0; i < I915_NUM_RINGS; i++) {
30403 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30404 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30405 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30406 index 36822b9..b725e1b 100644
30407 --- a/drivers/gpu/drm/i915/i915_dma.c
30408 +++ b/drivers/gpu/drm/i915/i915_dma.c
30409 @@ -1266,7 +1266,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30410 bool can_switch;
30411
30412 spin_lock(&dev->count_lock);
30413 - can_switch = (dev->open_count == 0);
30414 + can_switch = (local_read(&dev->open_count) == 0);
30415 spin_unlock(&dev->count_lock);
30416 return can_switch;
30417 }
30418 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30419 index b0b676a..d107105 100644
30420 --- a/drivers/gpu/drm/i915/i915_drv.h
30421 +++ b/drivers/gpu/drm/i915/i915_drv.h
30422 @@ -268,7 +268,7 @@ struct drm_i915_display_funcs {
30423 /* render clock increase/decrease */
30424 /* display clock increase/decrease */
30425 /* pll clock increase/decrease */
30426 -};
30427 +} __no_const;
30428
30429 struct intel_device_info {
30430 u8 gen;
30431 @@ -386,7 +386,7 @@ typedef struct drm_i915_private {
30432 int current_page;
30433 int page_flipping;
30434
30435 - atomic_t irq_received;
30436 + atomic_unchecked_t irq_received;
30437
30438 /* protects the irq masks */
30439 spinlock_t irq_lock;
30440 @@ -985,7 +985,7 @@ struct drm_i915_gem_object {
30441 * will be page flipped away on the next vblank. When it
30442 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30443 */
30444 - atomic_t pending_flip;
30445 + atomic_unchecked_t pending_flip;
30446 };
30447
30448 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30449 @@ -1434,7 +1434,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter(
30450 struct drm_i915_private *dev_priv, unsigned port);
30451 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30452 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30453 -extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30454 +static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30455 {
30456 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30457 }
30458 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30459 index 974a9f1..b3ebd45 100644
30460 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30461 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30462 @@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30463 i915_gem_clflush_object(obj);
30464
30465 if (obj->base.pending_write_domain)
30466 - cd->flips |= atomic_read(&obj->pending_flip);
30467 + cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30468
30469 /* The actual obj->write_domain will be updated with
30470 * pending_write_domain after we emit the accumulated flush for all
30471 @@ -916,9 +916,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
30472
30473 static int
30474 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
30475 - int count)
30476 + unsigned int count)
30477 {
30478 - int i;
30479 + unsigned int i;
30480
30481 for (i = 0; i < count; i++) {
30482 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
30483 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
30484 index ed3224c..6618589 100644
30485 --- a/drivers/gpu/drm/i915/i915_irq.c
30486 +++ b/drivers/gpu/drm/i915/i915_irq.c
30487 @@ -433,7 +433,7 @@ static irqreturn_t valleyview_irq_handler(DRM_IRQ_ARGS)
30488 int vblank = 0;
30489 bool blc_event;
30490
30491 - atomic_inc(&dev_priv->irq_received);
30492 + atomic_inc_unchecked(&dev_priv->irq_received);
30493
30494 vblank_status = PIPE_START_VBLANK_INTERRUPT_STATUS |
30495 PIPE_VBLANK_INTERRUPT_STATUS;
30496 @@ -586,7 +586,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
30497 irqreturn_t ret = IRQ_NONE;
30498 int i;
30499
30500 - atomic_inc(&dev_priv->irq_received);
30501 + atomic_inc_unchecked(&dev_priv->irq_received);
30502
30503 /* disable master interrupt before clearing iir */
30504 de_ier = I915_READ(DEIER);
30505 @@ -661,7 +661,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
30506 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
30507 u32 hotplug_mask;
30508
30509 - atomic_inc(&dev_priv->irq_received);
30510 + atomic_inc_unchecked(&dev_priv->irq_received);
30511
30512 /* disable master interrupt before clearing iir */
30513 de_ier = I915_READ(DEIER);
30514 @@ -1646,7 +1646,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
30515 {
30516 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30517
30518 - atomic_set(&dev_priv->irq_received, 0);
30519 + atomic_set_unchecked(&dev_priv->irq_received, 0);
30520
30521
30522 I915_WRITE(HWSTAM, 0xeffe);
30523 @@ -1673,7 +1673,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
30524 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30525 int pipe;
30526
30527 - atomic_set(&dev_priv->irq_received, 0);
30528 + atomic_set_unchecked(&dev_priv->irq_received, 0);
30529
30530 /* VLV magic */
30531 I915_WRITE(VLV_IMR, 0);
30532 @@ -1969,7 +1969,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
30533 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30534 int pipe;
30535
30536 - atomic_set(&dev_priv->irq_received, 0);
30537 + atomic_set_unchecked(&dev_priv->irq_received, 0);
30538
30539 for_each_pipe(pipe)
30540 I915_WRITE(PIPESTAT(pipe), 0);
30541 @@ -2020,7 +2020,7 @@ static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS)
30542 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
30543 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
30544
30545 - atomic_inc(&dev_priv->irq_received);
30546 + atomic_inc_unchecked(&dev_priv->irq_received);
30547
30548 iir = I915_READ16(IIR);
30549 if (iir == 0)
30550 @@ -2105,7 +2105,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
30551 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30552 int pipe;
30553
30554 - atomic_set(&dev_priv->irq_received, 0);
30555 + atomic_set_unchecked(&dev_priv->irq_received, 0);
30556
30557 if (I915_HAS_HOTPLUG(dev)) {
30558 I915_WRITE(PORT_HOTPLUG_EN, 0);
30559 @@ -2200,7 +2200,7 @@ static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS)
30560 };
30561 int pipe, ret = IRQ_NONE;
30562
30563 - atomic_inc(&dev_priv->irq_received);
30564 + atomic_inc_unchecked(&dev_priv->irq_received);
30565
30566 iir = I915_READ(IIR);
30567 do {
30568 @@ -2326,7 +2326,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
30569 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30570 int pipe;
30571
30572 - atomic_set(&dev_priv->irq_received, 0);
30573 + atomic_set_unchecked(&dev_priv->irq_received, 0);
30574
30575 if (I915_HAS_HOTPLUG(dev)) {
30576 I915_WRITE(PORT_HOTPLUG_EN, 0);
30577 @@ -2436,7 +2436,7 @@ static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS)
30578 int irq_received;
30579 int ret = IRQ_NONE, pipe;
30580
30581 - atomic_inc(&dev_priv->irq_received);
30582 + atomic_inc_unchecked(&dev_priv->irq_received);
30583
30584 iir = I915_READ(IIR);
30585
30586 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
30587 index 8a11131..46eeeaa 100644
30588 --- a/drivers/gpu/drm/i915/intel_display.c
30589 +++ b/drivers/gpu/drm/i915/intel_display.c
30590 @@ -2000,7 +2000,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
30591
30592 wait_event(dev_priv->pending_flip_queue,
30593 atomic_read(&dev_priv->mm.wedged) ||
30594 - atomic_read(&obj->pending_flip) == 0);
30595 + atomic_read_unchecked(&obj->pending_flip) == 0);
30596
30597 /* Big Hammer, we also need to ensure that any pending
30598 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
30599 @@ -5914,9 +5914,8 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
30600
30601 obj = work->old_fb_obj;
30602
30603 - atomic_clear_mask(1 << intel_crtc->plane,
30604 - &obj->pending_flip.counter);
30605 - if (atomic_read(&obj->pending_flip) == 0)
30606 + atomic_clear_mask_unchecked(1 << intel_crtc->plane, &obj->pending_flip);
30607 + if (atomic_read_unchecked(&obj->pending_flip) == 0)
30608 wake_up(&dev_priv->pending_flip_queue);
30609
30610 schedule_work(&work->work);
30611 @@ -6253,7 +6252,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30612 /* Block clients from rendering to the new back buffer until
30613 * the flip occurs and the object is no longer visible.
30614 */
30615 - atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30616 + atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30617
30618 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
30619 if (ret)
30620 @@ -6268,7 +6267,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30621 return 0;
30622
30623 cleanup_pending:
30624 - atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30625 + atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30626 drm_gem_object_unreference(&work->old_fb_obj->base);
30627 drm_gem_object_unreference(&obj->base);
30628 mutex_unlock(&dev->struct_mutex);
30629 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
30630 index 54558a0..2d97005 100644
30631 --- a/drivers/gpu/drm/mga/mga_drv.h
30632 +++ b/drivers/gpu/drm/mga/mga_drv.h
30633 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30634 u32 clear_cmd;
30635 u32 maccess;
30636
30637 - atomic_t vbl_received; /**< Number of vblanks received. */
30638 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30639 wait_queue_head_t fence_queue;
30640 - atomic_t last_fence_retired;
30641 + atomic_unchecked_t last_fence_retired;
30642 u32 next_fence_to_post;
30643
30644 unsigned int fb_cpp;
30645 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
30646 index 2581202..f230a8d9 100644
30647 --- a/drivers/gpu/drm/mga/mga_irq.c
30648 +++ b/drivers/gpu/drm/mga/mga_irq.c
30649 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
30650 if (crtc != 0)
30651 return 0;
30652
30653 - return atomic_read(&dev_priv->vbl_received);
30654 + return atomic_read_unchecked(&dev_priv->vbl_received);
30655 }
30656
30657
30658 @@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30659 /* VBLANK interrupt */
30660 if (status & MGA_VLINEPEN) {
30661 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30662 - atomic_inc(&dev_priv->vbl_received);
30663 + atomic_inc_unchecked(&dev_priv->vbl_received);
30664 drm_handle_vblank(dev, 0);
30665 handled = 1;
30666 }
30667 @@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30668 if ((prim_start & ~0x03) != (prim_end & ~0x03))
30669 MGA_WRITE(MGA_PRIMEND, prim_end);
30670
30671 - atomic_inc(&dev_priv->last_fence_retired);
30672 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
30673 DRM_WAKEUP(&dev_priv->fence_queue);
30674 handled = 1;
30675 }
30676 @@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
30677 * using fences.
30678 */
30679 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30680 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30681 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30682 - *sequence) <= (1 << 23)));
30683
30684 *sequence = cur_fence;
30685 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
30686 index 2f11e16..191267e 100644
30687 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
30688 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
30689 @@ -5340,7 +5340,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
30690 struct bit_table {
30691 const char id;
30692 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
30693 -};
30694 +} __no_const;
30695
30696 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
30697
30698 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
30699 index b863a3a..c55e0dc 100644
30700 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h
30701 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
30702 @@ -302,7 +302,7 @@ struct nouveau_exec_engine {
30703 u32 handle, u16 class);
30704 void (*set_tile_region)(struct drm_device *dev, int i);
30705 void (*tlb_flush)(struct drm_device *, int engine);
30706 -};
30707 +} __no_const;
30708
30709 struct nouveau_instmem_engine {
30710 void *priv;
30711 @@ -324,13 +324,13 @@ struct nouveau_instmem_engine {
30712 struct nouveau_mc_engine {
30713 int (*init)(struct drm_device *dev);
30714 void (*takedown)(struct drm_device *dev);
30715 -};
30716 +} __no_const;
30717
30718 struct nouveau_timer_engine {
30719 int (*init)(struct drm_device *dev);
30720 void (*takedown)(struct drm_device *dev);
30721 uint64_t (*read)(struct drm_device *dev);
30722 -};
30723 +} __no_const;
30724
30725 struct nouveau_fb_engine {
30726 int num_tiles;
30727 @@ -547,7 +547,7 @@ struct nouveau_vram_engine {
30728 void (*put)(struct drm_device *, struct nouveau_mem **);
30729
30730 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
30731 -};
30732 +} __no_const;
30733
30734 struct nouveau_engine {
30735 struct nouveau_instmem_engine instmem;
30736 @@ -693,7 +693,7 @@ struct drm_nouveau_private {
30737 struct drm_global_reference mem_global_ref;
30738 struct ttm_bo_global_ref bo_global_ref;
30739 struct ttm_bo_device bdev;
30740 - atomic_t validate_sequence;
30741 + atomic_unchecked_t validate_sequence;
30742 int (*move)(struct nouveau_channel *,
30743 struct ttm_buffer_object *,
30744 struct ttm_mem_reg *, struct ttm_mem_reg *);
30745 diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
30746 index 30f5423..abca136 100644
30747 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c
30748 +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
30749 @@ -319,7 +319,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
30750 int trycnt = 0;
30751 int ret, i;
30752
30753 - sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
30754 + sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
30755 retry:
30756 if (++trycnt > 100000) {
30757 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
30758 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
30759 index 19706f0..f257368 100644
30760 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
30761 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
30762 @@ -490,7 +490,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
30763 bool can_switch;
30764
30765 spin_lock(&dev->count_lock);
30766 - can_switch = (dev->open_count == 0);
30767 + can_switch = (local_read(&dev->open_count) == 0);
30768 spin_unlock(&dev->count_lock);
30769 return can_switch;
30770 }
30771 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
30772 index a9514ea..369d511 100644
30773 --- a/drivers/gpu/drm/nouveau/nv50_sor.c
30774 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
30775 @@ -304,7 +304,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
30776 }
30777
30778 if (nv_encoder->dcb->type == OUTPUT_DP) {
30779 - struct dp_train_func func = {
30780 + static struct dp_train_func func = {
30781 .link_set = nv50_sor_dp_link_set,
30782 .train_set = nv50_sor_dp_train_set,
30783 .train_adj = nv50_sor_dp_train_adj
30784 diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
30785 index c50b075..6b07dfc 100644
30786 --- a/drivers/gpu/drm/nouveau/nvd0_display.c
30787 +++ b/drivers/gpu/drm/nouveau/nvd0_display.c
30788 @@ -1366,7 +1366,7 @@ nvd0_sor_dpms(struct drm_encoder *encoder, int mode)
30789 nv_wait(dev, 0x61c030 + (or * 0x0800), 0x10000000, 0x00000000);
30790
30791 if (nv_encoder->dcb->type == OUTPUT_DP) {
30792 - struct dp_train_func func = {
30793 + static struct dp_train_func func = {
30794 .link_set = nvd0_sor_dp_link_set,
30795 .train_set = nvd0_sor_dp_train_set,
30796 .train_adj = nvd0_sor_dp_train_adj
30797 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
30798 index bcac90b..53bfc76 100644
30799 --- a/drivers/gpu/drm/r128/r128_cce.c
30800 +++ b/drivers/gpu/drm/r128/r128_cce.c
30801 @@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
30802
30803 /* GH: Simple idle check.
30804 */
30805 - atomic_set(&dev_priv->idle_count, 0);
30806 + atomic_set_unchecked(&dev_priv->idle_count, 0);
30807
30808 /* We don't support anything other than bus-mastering ring mode,
30809 * but the ring can be in either AGP or PCI space for the ring
30810 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
30811 index 930c71b..499aded 100644
30812 --- a/drivers/gpu/drm/r128/r128_drv.h
30813 +++ b/drivers/gpu/drm/r128/r128_drv.h
30814 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30815 int is_pci;
30816 unsigned long cce_buffers_offset;
30817
30818 - atomic_t idle_count;
30819 + atomic_unchecked_t idle_count;
30820
30821 int page_flipping;
30822 int current_page;
30823 u32 crtc_offset;
30824 u32 crtc_offset_cntl;
30825
30826 - atomic_t vbl_received;
30827 + atomic_unchecked_t vbl_received;
30828
30829 u32 color_fmt;
30830 unsigned int front_offset;
30831 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
30832 index 429d5a0..7e899ed 100644
30833 --- a/drivers/gpu/drm/r128/r128_irq.c
30834 +++ b/drivers/gpu/drm/r128/r128_irq.c
30835 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
30836 if (crtc != 0)
30837 return 0;
30838
30839 - return atomic_read(&dev_priv->vbl_received);
30840 + return atomic_read_unchecked(&dev_priv->vbl_received);
30841 }
30842
30843 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30844 @@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30845 /* VBLANK interrupt */
30846 if (status & R128_CRTC_VBLANK_INT) {
30847 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30848 - atomic_inc(&dev_priv->vbl_received);
30849 + atomic_inc_unchecked(&dev_priv->vbl_received);
30850 drm_handle_vblank(dev, 0);
30851 return IRQ_HANDLED;
30852 }
30853 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
30854 index a9e33ce..09edd4b 100644
30855 --- a/drivers/gpu/drm/r128/r128_state.c
30856 +++ b/drivers/gpu/drm/r128/r128_state.c
30857 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
30858
30859 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
30860 {
30861 - if (atomic_read(&dev_priv->idle_count) == 0)
30862 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
30863 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30864 else
30865 - atomic_set(&dev_priv->idle_count, 0);
30866 + atomic_set_unchecked(&dev_priv->idle_count, 0);
30867 }
30868
30869 #endif
30870 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
30871 index 5a82b6b..9e69c73 100644
30872 --- a/drivers/gpu/drm/radeon/mkregtable.c
30873 +++ b/drivers/gpu/drm/radeon/mkregtable.c
30874 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
30875 regex_t mask_rex;
30876 regmatch_t match[4];
30877 char buf[1024];
30878 - size_t end;
30879 + long end;
30880 int len;
30881 int done = 0;
30882 int r;
30883 unsigned o;
30884 struct offset *offset;
30885 char last_reg_s[10];
30886 - int last_reg;
30887 + unsigned long last_reg;
30888
30889 if (regcomp
30890 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30891 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
30892 index fefcca5..20a5b90 100644
30893 --- a/drivers/gpu/drm/radeon/radeon.h
30894 +++ b/drivers/gpu/drm/radeon/radeon.h
30895 @@ -743,7 +743,7 @@ struct r600_blit_cp_primitives {
30896 int x2, int y2);
30897 void (*draw_auto)(struct radeon_device *rdev);
30898 void (*set_default_state)(struct radeon_device *rdev);
30899 -};
30900 +} __no_const;
30901
30902 struct r600_blit {
30903 struct radeon_bo *shader_obj;
30904 @@ -1244,7 +1244,7 @@ struct radeon_asic {
30905 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
30906 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
30907 } pflip;
30908 -};
30909 +} __no_const;
30910
30911 /*
30912 * Asic structures
30913 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
30914 index 066c98b..96ab858 100644
30915 --- a/drivers/gpu/drm/radeon/radeon_device.c
30916 +++ b/drivers/gpu/drm/radeon/radeon_device.c
30917 @@ -692,7 +692,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
30918 bool can_switch;
30919
30920 spin_lock(&dev->count_lock);
30921 - can_switch = (dev->open_count == 0);
30922 + can_switch = (local_read(&dev->open_count) == 0);
30923 spin_unlock(&dev->count_lock);
30924 return can_switch;
30925 }
30926 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
30927 index a1b59ca..86f2d44 100644
30928 --- a/drivers/gpu/drm/radeon/radeon_drv.h
30929 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
30930 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
30931
30932 /* SW interrupt */
30933 wait_queue_head_t swi_queue;
30934 - atomic_t swi_emitted;
30935 + atomic_unchecked_t swi_emitted;
30936 int vblank_crtc;
30937 uint32_t irq_enable_reg;
30938 uint32_t r500_disp_irq_reg;
30939 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
30940 index 48b7cea..342236f 100644
30941 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
30942 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
30943 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
30944 request = compat_alloc_user_space(sizeof(*request));
30945 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
30946 || __put_user(req32.param, &request->param)
30947 - || __put_user((void __user *)(unsigned long)req32.value,
30948 + || __put_user((unsigned long)req32.value,
30949 &request->value))
30950 return -EFAULT;
30951
30952 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
30953 index 00da384..32f972d 100644
30954 --- a/drivers/gpu/drm/radeon/radeon_irq.c
30955 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
30956 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
30957 unsigned int ret;
30958 RING_LOCALS;
30959
30960 - atomic_inc(&dev_priv->swi_emitted);
30961 - ret = atomic_read(&dev_priv->swi_emitted);
30962 + atomic_inc_unchecked(&dev_priv->swi_emitted);
30963 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
30964
30965 BEGIN_RING(4);
30966 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
30967 @@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
30968 drm_radeon_private_t *dev_priv =
30969 (drm_radeon_private_t *) dev->dev_private;
30970
30971 - atomic_set(&dev_priv->swi_emitted, 0);
30972 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
30973 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
30974
30975 dev->max_vblank_count = 0x001fffff;
30976 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
30977 index e8422ae..d22d4a8 100644
30978 --- a/drivers/gpu/drm/radeon/radeon_state.c
30979 +++ b/drivers/gpu/drm/radeon/radeon_state.c
30980 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
30981 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
30982 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
30983
30984 - if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30985 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30986 sarea_priv->nbox * sizeof(depth_boxes[0])))
30987 return -EFAULT;
30988
30989 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
30990 {
30991 drm_radeon_private_t *dev_priv = dev->dev_private;
30992 drm_radeon_getparam_t *param = data;
30993 - int value;
30994 + int value = 0;
30995
30996 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
30997
30998 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
30999 index c94a225..5795d34 100644
31000 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
31001 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
31002 @@ -852,8 +852,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
31003 }
31004 if (unlikely(ttm_vm_ops == NULL)) {
31005 ttm_vm_ops = vma->vm_ops;
31006 - radeon_ttm_vm_ops = *ttm_vm_ops;
31007 - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31008 + pax_open_kernel();
31009 + memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
31010 + *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31011 + pax_close_kernel();
31012 }
31013 vma->vm_ops = &radeon_ttm_vm_ops;
31014 return 0;
31015 diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
31016 index 159b6a4..fa82487 100644
31017 --- a/drivers/gpu/drm/radeon/rs690.c
31018 +++ b/drivers/gpu/drm/radeon/rs690.c
31019 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
31020 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
31021 rdev->pm.sideport_bandwidth.full)
31022 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
31023 - read_delay_latency.full = dfixed_const(370 * 800 * 1000);
31024 + read_delay_latency.full = dfixed_const(800 * 1000);
31025 read_delay_latency.full = dfixed_div(read_delay_latency,
31026 rdev->pm.igp_sideport_mclk);
31027 + a.full = dfixed_const(370);
31028 + read_delay_latency.full = dfixed_mul(read_delay_latency, a);
31029 } else {
31030 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
31031 rdev->pm.k8_bandwidth.full)
31032 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31033 index ebc6fac..a8313ed 100644
31034 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
31035 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31036 @@ -394,9 +394,9 @@ static int ttm_pool_get_num_unused_pages(void)
31037 static int ttm_pool_mm_shrink(struct shrinker *shrink,
31038 struct shrink_control *sc)
31039 {
31040 - static atomic_t start_pool = ATOMIC_INIT(0);
31041 + static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
31042 unsigned i;
31043 - unsigned pool_offset = atomic_add_return(1, &start_pool);
31044 + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
31045 struct ttm_page_pool *pool;
31046 int shrink_pages = sc->nr_to_scan;
31047
31048 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
31049 index 88edacc..1e5412b 100644
31050 --- a/drivers/gpu/drm/via/via_drv.h
31051 +++ b/drivers/gpu/drm/via/via_drv.h
31052 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
31053 typedef uint32_t maskarray_t[5];
31054
31055 typedef struct drm_via_irq {
31056 - atomic_t irq_received;
31057 + atomic_unchecked_t irq_received;
31058 uint32_t pending_mask;
31059 uint32_t enable_mask;
31060 wait_queue_head_t irq_queue;
31061 @@ -75,7 +75,7 @@ typedef struct drm_via_private {
31062 struct timeval last_vblank;
31063 int last_vblank_valid;
31064 unsigned usec_per_vblank;
31065 - atomic_t vbl_received;
31066 + atomic_unchecked_t vbl_received;
31067 drm_via_state_t hc_state;
31068 char pci_buf[VIA_PCI_BUF_SIZE];
31069 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
31070 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
31071 index d391f48..10c8ca3 100644
31072 --- a/drivers/gpu/drm/via/via_irq.c
31073 +++ b/drivers/gpu/drm/via/via_irq.c
31074 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
31075 if (crtc != 0)
31076 return 0;
31077
31078 - return atomic_read(&dev_priv->vbl_received);
31079 + return atomic_read_unchecked(&dev_priv->vbl_received);
31080 }
31081
31082 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31083 @@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31084
31085 status = VIA_READ(VIA_REG_INTERRUPT);
31086 if (status & VIA_IRQ_VBLANK_PENDING) {
31087 - atomic_inc(&dev_priv->vbl_received);
31088 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
31089 + atomic_inc_unchecked(&dev_priv->vbl_received);
31090 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
31091 do_gettimeofday(&cur_vblank);
31092 if (dev_priv->last_vblank_valid) {
31093 dev_priv->usec_per_vblank =
31094 @@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31095 dev_priv->last_vblank = cur_vblank;
31096 dev_priv->last_vblank_valid = 1;
31097 }
31098 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
31099 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
31100 DRM_DEBUG("US per vblank is: %u\n",
31101 dev_priv->usec_per_vblank);
31102 }
31103 @@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31104
31105 for (i = 0; i < dev_priv->num_irqs; ++i) {
31106 if (status & cur_irq->pending_mask) {
31107 - atomic_inc(&cur_irq->irq_received);
31108 + atomic_inc_unchecked(&cur_irq->irq_received);
31109 DRM_WAKEUP(&cur_irq->irq_queue);
31110 handled = 1;
31111 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
31112 @@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
31113 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31114 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31115 masks[irq][4]));
31116 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31117 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31118 } else {
31119 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31120 (((cur_irq_sequence =
31121 - atomic_read(&cur_irq->irq_received)) -
31122 + atomic_read_unchecked(&cur_irq->irq_received)) -
31123 *sequence) <= (1 << 23)));
31124 }
31125 *sequence = cur_irq_sequence;
31126 @@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
31127 }
31128
31129 for (i = 0; i < dev_priv->num_irqs; ++i) {
31130 - atomic_set(&cur_irq->irq_received, 0);
31131 + atomic_set_unchecked(&cur_irq->irq_received, 0);
31132 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31133 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31134 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31135 @@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
31136 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31137 case VIA_IRQ_RELATIVE:
31138 irqwait->request.sequence +=
31139 - atomic_read(&cur_irq->irq_received);
31140 + atomic_read_unchecked(&cur_irq->irq_received);
31141 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31142 case VIA_IRQ_ABSOLUTE:
31143 break;
31144 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31145 index d0f2c07..9ebd9c3 100644
31146 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31147 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31148 @@ -263,7 +263,7 @@ struct vmw_private {
31149 * Fencing and IRQs.
31150 */
31151
31152 - atomic_t marker_seq;
31153 + atomic_unchecked_t marker_seq;
31154 wait_queue_head_t fence_queue;
31155 wait_queue_head_t fifo_queue;
31156 int fence_queue_waiters; /* Protected by hw_mutex */
31157 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31158 index a0c2f12..68ae6cb 100644
31159 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31160 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31161 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31162 (unsigned int) min,
31163 (unsigned int) fifo->capabilities);
31164
31165 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31166 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31167 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31168 vmw_marker_queue_init(&fifo->marker_queue);
31169 return vmw_fifo_send_fence(dev_priv, &dummy);
31170 @@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31171 if (reserveable)
31172 iowrite32(bytes, fifo_mem +
31173 SVGA_FIFO_RESERVED);
31174 - return fifo_mem + (next_cmd >> 2);
31175 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31176 } else {
31177 need_bounce = true;
31178 }
31179 @@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31180
31181 fm = vmw_fifo_reserve(dev_priv, bytes);
31182 if (unlikely(fm == NULL)) {
31183 - *seqno = atomic_read(&dev_priv->marker_seq);
31184 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31185 ret = -ENOMEM;
31186 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31187 false, 3*HZ);
31188 @@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31189 }
31190
31191 do {
31192 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31193 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31194 } while (*seqno == 0);
31195
31196 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31197 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31198 index cabc95f..14b3d77 100644
31199 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31200 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31201 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31202 * emitted. Then the fence is stale and signaled.
31203 */
31204
31205 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31206 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31207 > VMW_FENCE_WRAP);
31208
31209 return ret;
31210 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31211
31212 if (fifo_idle)
31213 down_read(&fifo_state->rwsem);
31214 - signal_seq = atomic_read(&dev_priv->marker_seq);
31215 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31216 ret = 0;
31217
31218 for (;;) {
31219 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31220 index 8a8725c..afed796 100644
31221 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31222 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31223 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31224 while (!vmw_lag_lt(queue, us)) {
31225 spin_lock(&queue->lock);
31226 if (list_empty(&queue->head))
31227 - seqno = atomic_read(&dev_priv->marker_seq);
31228 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31229 else {
31230 marker = list_first_entry(&queue->head,
31231 struct vmw_marker, head);
31232 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31233 index 1f6957c..b579481 100644
31234 --- a/drivers/hid/hid-core.c
31235 +++ b/drivers/hid/hid-core.c
31236 @@ -2153,7 +2153,7 @@ static bool hid_ignore(struct hid_device *hdev)
31237
31238 int hid_add_device(struct hid_device *hdev)
31239 {
31240 - static atomic_t id = ATOMIC_INIT(0);
31241 + static atomic_unchecked_t id = ATOMIC_INIT(0);
31242 int ret;
31243
31244 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31245 @@ -2188,7 +2188,7 @@ int hid_add_device(struct hid_device *hdev)
31246 /* XXX hack, any other cleaner solution after the driver core
31247 * is converted to allow more than 20 bytes as the device name? */
31248 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31249 - hdev->vendor, hdev->product, atomic_inc_return(&id));
31250 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31251
31252 hid_debug_register(hdev, dev_name(&hdev->dev));
31253 ret = device_add(&hdev->dev);
31254 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
31255 index eec3291..8ed706b 100644
31256 --- a/drivers/hid/hid-wiimote-debug.c
31257 +++ b/drivers/hid/hid-wiimote-debug.c
31258 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
31259 else if (size == 0)
31260 return -EIO;
31261
31262 - if (copy_to_user(u, buf, size))
31263 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
31264 return -EFAULT;
31265
31266 *off += size;
31267 diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31268 index 14599e2..711c965 100644
31269 --- a/drivers/hid/usbhid/hiddev.c
31270 +++ b/drivers/hid/usbhid/hiddev.c
31271 @@ -625,7 +625,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31272 break;
31273
31274 case HIDIOCAPPLICATION:
31275 - if (arg < 0 || arg >= hid->maxapplication)
31276 + if (arg >= hid->maxapplication)
31277 break;
31278
31279 for (i = 0; i < hid->maxcollection; i++)
31280 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31281 index 4065374..10ed7dc 100644
31282 --- a/drivers/hv/channel.c
31283 +++ b/drivers/hv/channel.c
31284 @@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31285 int ret = 0;
31286 int t;
31287
31288 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31289 - atomic_inc(&vmbus_connection.next_gpadl_handle);
31290 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31291 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31292
31293 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31294 if (ret)
31295 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31296 index 86f8885..ab9cb2b 100644
31297 --- a/drivers/hv/hv.c
31298 +++ b/drivers/hv/hv.c
31299 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31300 u64 output_address = (output) ? virt_to_phys(output) : 0;
31301 u32 output_address_hi = output_address >> 32;
31302 u32 output_address_lo = output_address & 0xFFFFFFFF;
31303 - void *hypercall_page = hv_context.hypercall_page;
31304 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31305
31306 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31307 "=a"(hv_status_lo) : "d" (control_hi),
31308 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31309 index b9426a6..677ce34 100644
31310 --- a/drivers/hv/hyperv_vmbus.h
31311 +++ b/drivers/hv/hyperv_vmbus.h
31312 @@ -555,7 +555,7 @@ enum vmbus_connect_state {
31313 struct vmbus_connection {
31314 enum vmbus_connect_state conn_state;
31315
31316 - atomic_t next_gpadl_handle;
31317 + atomic_unchecked_t next_gpadl_handle;
31318
31319 /*
31320 * Represents channel interrupts. Each bit position represents a
31321 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31322 index a220e57..428f54d 100644
31323 --- a/drivers/hv/vmbus_drv.c
31324 +++ b/drivers/hv/vmbus_drv.c
31325 @@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31326 {
31327 int ret = 0;
31328
31329 - static atomic_t device_num = ATOMIC_INIT(0);
31330 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31331
31332 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31333 - atomic_inc_return(&device_num));
31334 + atomic_inc_return_unchecked(&device_num));
31335
31336 child_device_obj->device.bus = &hv_bus;
31337 child_device_obj->device.parent = &hv_acpi_dev->dev;
31338 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
31339 index 34ad5a2..e2b0ae8 100644
31340 --- a/drivers/hwmon/acpi_power_meter.c
31341 +++ b/drivers/hwmon/acpi_power_meter.c
31342 @@ -308,8 +308,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
31343 return res;
31344
31345 temp /= 1000;
31346 - if (temp < 0)
31347 - return -EINVAL;
31348
31349 mutex_lock(&resource->lock);
31350 resource->trip[attr->index - 7] = temp;
31351 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31352 index 8b011d0..3de24a1 100644
31353 --- a/drivers/hwmon/sht15.c
31354 +++ b/drivers/hwmon/sht15.c
31355 @@ -166,7 +166,7 @@ struct sht15_data {
31356 int supply_uV;
31357 bool supply_uV_valid;
31358 struct work_struct update_supply_work;
31359 - atomic_t interrupt_handled;
31360 + atomic_unchecked_t interrupt_handled;
31361 };
31362
31363 /**
31364 @@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31365 return ret;
31366
31367 gpio_direction_input(data->pdata->gpio_data);
31368 - atomic_set(&data->interrupt_handled, 0);
31369 + atomic_set_unchecked(&data->interrupt_handled, 0);
31370
31371 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31372 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31373 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31374 /* Only relevant if the interrupt hasn't occurred. */
31375 - if (!atomic_read(&data->interrupt_handled))
31376 + if (!atomic_read_unchecked(&data->interrupt_handled))
31377 schedule_work(&data->read_work);
31378 }
31379 ret = wait_event_timeout(data->wait_queue,
31380 @@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31381
31382 /* First disable the interrupt */
31383 disable_irq_nosync(irq);
31384 - atomic_inc(&data->interrupt_handled);
31385 + atomic_inc_unchecked(&data->interrupt_handled);
31386 /* Then schedule a reading work struct */
31387 if (data->state != SHT15_READING_NOTHING)
31388 schedule_work(&data->read_work);
31389 @@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31390 * If not, then start the interrupt again - care here as could
31391 * have gone low in meantime so verify it hasn't!
31392 */
31393 - atomic_set(&data->interrupt_handled, 0);
31394 + atomic_set_unchecked(&data->interrupt_handled, 0);
31395 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31396 /* If still not occurred or another handler was scheduled */
31397 if (gpio_get_value(data->pdata->gpio_data)
31398 - || atomic_read(&data->interrupt_handled))
31399 + || atomic_read_unchecked(&data->interrupt_handled))
31400 return;
31401 }
31402
31403 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31404 index 378fcb5..5e91fa8 100644
31405 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
31406 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31407 @@ -43,7 +43,7 @@
31408 extern struct i2c_adapter amd756_smbus;
31409
31410 static struct i2c_adapter *s4882_adapter;
31411 -static struct i2c_algorithm *s4882_algo;
31412 +static i2c_algorithm_no_const *s4882_algo;
31413
31414 /* Wrapper access functions for multiplexed SMBus */
31415 static DEFINE_MUTEX(amd756_lock);
31416 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31417 index 29015eb..af2d8e9 100644
31418 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31419 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31420 @@ -41,7 +41,7 @@
31421 extern struct i2c_adapter *nforce2_smbus;
31422
31423 static struct i2c_adapter *s4985_adapter;
31424 -static struct i2c_algorithm *s4985_algo;
31425 +static i2c_algorithm_no_const *s4985_algo;
31426
31427 /* Wrapper access functions for multiplexed SMBus */
31428 static DEFINE_MUTEX(nforce2_lock);
31429 diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31430 index 1038c38..eb92f51 100644
31431 --- a/drivers/i2c/i2c-mux.c
31432 +++ b/drivers/i2c/i2c-mux.c
31433 @@ -30,7 +30,7 @@
31434 /* multiplexer per channel data */
31435 struct i2c_mux_priv {
31436 struct i2c_adapter adap;
31437 - struct i2c_algorithm algo;
31438 + i2c_algorithm_no_const algo;
31439
31440 struct i2c_adapter *parent;
31441 void *mux_priv; /* the mux chip/device */
31442 diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31443 index 57d00ca..0145194 100644
31444 --- a/drivers/ide/aec62xx.c
31445 +++ b/drivers/ide/aec62xx.c
31446 @@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31447 .cable_detect = atp86x_cable_detect,
31448 };
31449
31450 -static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31451 +static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31452 { /* 0: AEC6210 */
31453 .name = DRV_NAME,
31454 .init_chipset = init_chipset_aec62xx,
31455 diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31456 index 2c8016a..911a27c 100644
31457 --- a/drivers/ide/alim15x3.c
31458 +++ b/drivers/ide/alim15x3.c
31459 @@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31460 .dma_sff_read_status = ide_dma_sff_read_status,
31461 };
31462
31463 -static const struct ide_port_info ali15x3_chipset __devinitdata = {
31464 +static const struct ide_port_info ali15x3_chipset __devinitconst = {
31465 .name = DRV_NAME,
31466 .init_chipset = init_chipset_ali15x3,
31467 .init_hwif = init_hwif_ali15x3,
31468 diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31469 index 3747b25..56fc995 100644
31470 --- a/drivers/ide/amd74xx.c
31471 +++ b/drivers/ide/amd74xx.c
31472 @@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31473 .udma_mask = udma, \
31474 }
31475
31476 -static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31477 +static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31478 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31479 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31480 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31481 diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31482 index 15f0ead..cb43480 100644
31483 --- a/drivers/ide/atiixp.c
31484 +++ b/drivers/ide/atiixp.c
31485 @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
31486 .cable_detect = atiixp_cable_detect,
31487 };
31488
31489 -static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
31490 +static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
31491 { /* 0: IXP200/300/400/700 */
31492 .name = DRV_NAME,
31493 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
31494 diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
31495 index 5f80312..d1fc438 100644
31496 --- a/drivers/ide/cmd64x.c
31497 +++ b/drivers/ide/cmd64x.c
31498 @@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
31499 .dma_sff_read_status = ide_dma_sff_read_status,
31500 };
31501
31502 -static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
31503 +static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
31504 { /* 0: CMD643 */
31505 .name = DRV_NAME,
31506 .init_chipset = init_chipset_cmd64x,
31507 diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
31508 index 2c1e5f7..1444762 100644
31509 --- a/drivers/ide/cs5520.c
31510 +++ b/drivers/ide/cs5520.c
31511 @@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
31512 .set_dma_mode = cs5520_set_dma_mode,
31513 };
31514
31515 -static const struct ide_port_info cyrix_chipset __devinitdata = {
31516 +static const struct ide_port_info cyrix_chipset __devinitconst = {
31517 .name = DRV_NAME,
31518 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
31519 .port_ops = &cs5520_port_ops,
31520 diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
31521 index 4dc4eb9..49b40ad 100644
31522 --- a/drivers/ide/cs5530.c
31523 +++ b/drivers/ide/cs5530.c
31524 @@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
31525 .udma_filter = cs5530_udma_filter,
31526 };
31527
31528 -static const struct ide_port_info cs5530_chipset __devinitdata = {
31529 +static const struct ide_port_info cs5530_chipset __devinitconst = {
31530 .name = DRV_NAME,
31531 .init_chipset = init_chipset_cs5530,
31532 .init_hwif = init_hwif_cs5530,
31533 diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
31534 index 5059faf..18d4c85 100644
31535 --- a/drivers/ide/cs5535.c
31536 +++ b/drivers/ide/cs5535.c
31537 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
31538 .cable_detect = cs5535_cable_detect,
31539 };
31540
31541 -static const struct ide_port_info cs5535_chipset __devinitdata = {
31542 +static const struct ide_port_info cs5535_chipset __devinitconst = {
31543 .name = DRV_NAME,
31544 .port_ops = &cs5535_port_ops,
31545 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
31546 diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
31547 index 847553f..3ffb49d 100644
31548 --- a/drivers/ide/cy82c693.c
31549 +++ b/drivers/ide/cy82c693.c
31550 @@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
31551 .set_dma_mode = cy82c693_set_dma_mode,
31552 };
31553
31554 -static const struct ide_port_info cy82c693_chipset __devinitdata = {
31555 +static const struct ide_port_info cy82c693_chipset __devinitconst = {
31556 .name = DRV_NAME,
31557 .init_iops = init_iops_cy82c693,
31558 .port_ops = &cy82c693_port_ops,
31559 diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
31560 index 58c51cd..4aec3b8 100644
31561 --- a/drivers/ide/hpt366.c
31562 +++ b/drivers/ide/hpt366.c
31563 @@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
31564 }
31565 };
31566
31567 -static const struct hpt_info hpt36x __devinitdata = {
31568 +static const struct hpt_info hpt36x __devinitconst = {
31569 .chip_name = "HPT36x",
31570 .chip_type = HPT36x,
31571 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
31572 @@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
31573 .timings = &hpt36x_timings
31574 };
31575
31576 -static const struct hpt_info hpt370 __devinitdata = {
31577 +static const struct hpt_info hpt370 __devinitconst = {
31578 .chip_name = "HPT370",
31579 .chip_type = HPT370,
31580 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31581 @@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
31582 .timings = &hpt37x_timings
31583 };
31584
31585 -static const struct hpt_info hpt370a __devinitdata = {
31586 +static const struct hpt_info hpt370a __devinitconst = {
31587 .chip_name = "HPT370A",
31588 .chip_type = HPT370A,
31589 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31590 @@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
31591 .timings = &hpt37x_timings
31592 };
31593
31594 -static const struct hpt_info hpt374 __devinitdata = {
31595 +static const struct hpt_info hpt374 __devinitconst = {
31596 .chip_name = "HPT374",
31597 .chip_type = HPT374,
31598 .udma_mask = ATA_UDMA5,
31599 @@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
31600 .timings = &hpt37x_timings
31601 };
31602
31603 -static const struct hpt_info hpt372 __devinitdata = {
31604 +static const struct hpt_info hpt372 __devinitconst = {
31605 .chip_name = "HPT372",
31606 .chip_type = HPT372,
31607 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31608 @@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
31609 .timings = &hpt37x_timings
31610 };
31611
31612 -static const struct hpt_info hpt372a __devinitdata = {
31613 +static const struct hpt_info hpt372a __devinitconst = {
31614 .chip_name = "HPT372A",
31615 .chip_type = HPT372A,
31616 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31617 @@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
31618 .timings = &hpt37x_timings
31619 };
31620
31621 -static const struct hpt_info hpt302 __devinitdata = {
31622 +static const struct hpt_info hpt302 __devinitconst = {
31623 .chip_name = "HPT302",
31624 .chip_type = HPT302,
31625 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31626 @@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
31627 .timings = &hpt37x_timings
31628 };
31629
31630 -static const struct hpt_info hpt371 __devinitdata = {
31631 +static const struct hpt_info hpt371 __devinitconst = {
31632 .chip_name = "HPT371",
31633 .chip_type = HPT371,
31634 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31635 @@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
31636 .timings = &hpt37x_timings
31637 };
31638
31639 -static const struct hpt_info hpt372n __devinitdata = {
31640 +static const struct hpt_info hpt372n __devinitconst = {
31641 .chip_name = "HPT372N",
31642 .chip_type = HPT372N,
31643 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31644 @@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
31645 .timings = &hpt37x_timings
31646 };
31647
31648 -static const struct hpt_info hpt302n __devinitdata = {
31649 +static const struct hpt_info hpt302n __devinitconst = {
31650 .chip_name = "HPT302N",
31651 .chip_type = HPT302N,
31652 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31653 @@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
31654 .timings = &hpt37x_timings
31655 };
31656
31657 -static const struct hpt_info hpt371n __devinitdata = {
31658 +static const struct hpt_info hpt371n __devinitconst = {
31659 .chip_name = "HPT371N",
31660 .chip_type = HPT371N,
31661 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31662 @@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
31663 .dma_sff_read_status = ide_dma_sff_read_status,
31664 };
31665
31666 -static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
31667 +static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
31668 { /* 0: HPT36x */
31669 .name = DRV_NAME,
31670 .init_chipset = init_chipset_hpt366,
31671 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
31672 index 8126824..55a2798 100644
31673 --- a/drivers/ide/ide-cd.c
31674 +++ b/drivers/ide/ide-cd.c
31675 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
31676 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31677 if ((unsigned long)buf & alignment
31678 || blk_rq_bytes(rq) & q->dma_pad_mask
31679 - || object_is_on_stack(buf))
31680 + || object_starts_on_stack(buf))
31681 drive->dma = 0;
31682 }
31683 }
31684 diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
31685 index 7f56b73..dab5b67 100644
31686 --- a/drivers/ide/ide-pci-generic.c
31687 +++ b/drivers/ide/ide-pci-generic.c
31688 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
31689 .udma_mask = ATA_UDMA6, \
31690 }
31691
31692 -static const struct ide_port_info generic_chipsets[] __devinitdata = {
31693 +static const struct ide_port_info generic_chipsets[] __devinitconst = {
31694 /* 0: Unknown */
31695 DECLARE_GENERIC_PCI_DEV(0),
31696
31697 diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
31698 index 560e66d..d5dd180 100644
31699 --- a/drivers/ide/it8172.c
31700 +++ b/drivers/ide/it8172.c
31701 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
31702 .set_dma_mode = it8172_set_dma_mode,
31703 };
31704
31705 -static const struct ide_port_info it8172_port_info __devinitdata = {
31706 +static const struct ide_port_info it8172_port_info __devinitconst = {
31707 .name = DRV_NAME,
31708 .port_ops = &it8172_port_ops,
31709 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
31710 diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
31711 index 46816ba..1847aeb 100644
31712 --- a/drivers/ide/it8213.c
31713 +++ b/drivers/ide/it8213.c
31714 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
31715 .cable_detect = it8213_cable_detect,
31716 };
31717
31718 -static const struct ide_port_info it8213_chipset __devinitdata = {
31719 +static const struct ide_port_info it8213_chipset __devinitconst = {
31720 .name = DRV_NAME,
31721 .enablebits = { {0x41, 0x80, 0x80} },
31722 .port_ops = &it8213_port_ops,
31723 diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
31724 index 2e3169f..c5611db 100644
31725 --- a/drivers/ide/it821x.c
31726 +++ b/drivers/ide/it821x.c
31727 @@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
31728 .cable_detect = it821x_cable_detect,
31729 };
31730
31731 -static const struct ide_port_info it821x_chipset __devinitdata = {
31732 +static const struct ide_port_info it821x_chipset __devinitconst = {
31733 .name = DRV_NAME,
31734 .init_chipset = init_chipset_it821x,
31735 .init_hwif = init_hwif_it821x,
31736 diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
31737 index 74c2c4a..efddd7d 100644
31738 --- a/drivers/ide/jmicron.c
31739 +++ b/drivers/ide/jmicron.c
31740 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
31741 .cable_detect = jmicron_cable_detect,
31742 };
31743
31744 -static const struct ide_port_info jmicron_chipset __devinitdata = {
31745 +static const struct ide_port_info jmicron_chipset __devinitconst = {
31746 .name = DRV_NAME,
31747 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
31748 .port_ops = &jmicron_port_ops,
31749 diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
31750 index 95327a2..73f78d8 100644
31751 --- a/drivers/ide/ns87415.c
31752 +++ b/drivers/ide/ns87415.c
31753 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
31754 .dma_sff_read_status = superio_dma_sff_read_status,
31755 };
31756
31757 -static const struct ide_port_info ns87415_chipset __devinitdata = {
31758 +static const struct ide_port_info ns87415_chipset __devinitconst = {
31759 .name = DRV_NAME,
31760 .init_hwif = init_hwif_ns87415,
31761 .tp_ops = &ns87415_tp_ops,
31762 diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
31763 index 1a53a4c..39edc66 100644
31764 --- a/drivers/ide/opti621.c
31765 +++ b/drivers/ide/opti621.c
31766 @@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
31767 .set_pio_mode = opti621_set_pio_mode,
31768 };
31769
31770 -static const struct ide_port_info opti621_chipset __devinitdata = {
31771 +static const struct ide_port_info opti621_chipset __devinitconst = {
31772 .name = DRV_NAME,
31773 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
31774 .port_ops = &opti621_port_ops,
31775 diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
31776 index 9546fe2..2e5ceb6 100644
31777 --- a/drivers/ide/pdc202xx_new.c
31778 +++ b/drivers/ide/pdc202xx_new.c
31779 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
31780 .udma_mask = udma, \
31781 }
31782
31783 -static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
31784 +static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
31785 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
31786 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
31787 };
31788 diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
31789 index 3a35ec6..5634510 100644
31790 --- a/drivers/ide/pdc202xx_old.c
31791 +++ b/drivers/ide/pdc202xx_old.c
31792 @@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
31793 .max_sectors = sectors, \
31794 }
31795
31796 -static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
31797 +static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
31798 { /* 0: PDC20246 */
31799 .name = DRV_NAME,
31800 .init_chipset = init_chipset_pdc202xx,
31801 diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
31802 index 1892e81..fe0fd60 100644
31803 --- a/drivers/ide/piix.c
31804 +++ b/drivers/ide/piix.c
31805 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
31806 .udma_mask = udma, \
31807 }
31808
31809 -static const struct ide_port_info piix_pci_info[] __devinitdata = {
31810 +static const struct ide_port_info piix_pci_info[] __devinitconst = {
31811 /* 0: MPIIX */
31812 { /*
31813 * MPIIX actually has only a single IDE channel mapped to
31814 diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
31815 index a6414a8..c04173e 100644
31816 --- a/drivers/ide/rz1000.c
31817 +++ b/drivers/ide/rz1000.c
31818 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
31819 }
31820 }
31821
31822 -static const struct ide_port_info rz1000_chipset __devinitdata = {
31823 +static const struct ide_port_info rz1000_chipset __devinitconst = {
31824 .name = DRV_NAME,
31825 .host_flags = IDE_HFLAG_NO_DMA,
31826 };
31827 diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
31828 index 356b9b5..d4758eb 100644
31829 --- a/drivers/ide/sc1200.c
31830 +++ b/drivers/ide/sc1200.c
31831 @@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
31832 .dma_sff_read_status = ide_dma_sff_read_status,
31833 };
31834
31835 -static const struct ide_port_info sc1200_chipset __devinitdata = {
31836 +static const struct ide_port_info sc1200_chipset __devinitconst = {
31837 .name = DRV_NAME,
31838 .port_ops = &sc1200_port_ops,
31839 .dma_ops = &sc1200_dma_ops,
31840 diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
31841 index b7f5b0c..9701038 100644
31842 --- a/drivers/ide/scc_pata.c
31843 +++ b/drivers/ide/scc_pata.c
31844 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
31845 .dma_sff_read_status = scc_dma_sff_read_status,
31846 };
31847
31848 -static const struct ide_port_info scc_chipset __devinitdata = {
31849 +static const struct ide_port_info scc_chipset __devinitconst = {
31850 .name = "sccIDE",
31851 .init_iops = init_iops_scc,
31852 .init_dma = scc_init_dma,
31853 diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
31854 index 35fb8da..24d72ef 100644
31855 --- a/drivers/ide/serverworks.c
31856 +++ b/drivers/ide/serverworks.c
31857 @@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
31858 .cable_detect = svwks_cable_detect,
31859 };
31860
31861 -static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
31862 +static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
31863 { /* 0: OSB4 */
31864 .name = DRV_NAME,
31865 .init_chipset = init_chipset_svwks,
31866 diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
31867 index ddeda44..46f7e30 100644
31868 --- a/drivers/ide/siimage.c
31869 +++ b/drivers/ide/siimage.c
31870 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
31871 .udma_mask = ATA_UDMA6, \
31872 }
31873
31874 -static const struct ide_port_info siimage_chipsets[] __devinitdata = {
31875 +static const struct ide_port_info siimage_chipsets[] __devinitconst = {
31876 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
31877 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
31878 };
31879 diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
31880 index 4a00225..09e61b4 100644
31881 --- a/drivers/ide/sis5513.c
31882 +++ b/drivers/ide/sis5513.c
31883 @@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
31884 .cable_detect = sis_cable_detect,
31885 };
31886
31887 -static const struct ide_port_info sis5513_chipset __devinitdata = {
31888 +static const struct ide_port_info sis5513_chipset __devinitconst = {
31889 .name = DRV_NAME,
31890 .init_chipset = init_chipset_sis5513,
31891 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
31892 diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
31893 index f21dc2a..d051cd2 100644
31894 --- a/drivers/ide/sl82c105.c
31895 +++ b/drivers/ide/sl82c105.c
31896 @@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
31897 .dma_sff_read_status = ide_dma_sff_read_status,
31898 };
31899
31900 -static const struct ide_port_info sl82c105_chipset __devinitdata = {
31901 +static const struct ide_port_info sl82c105_chipset __devinitconst = {
31902 .name = DRV_NAME,
31903 .init_chipset = init_chipset_sl82c105,
31904 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
31905 diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
31906 index 864ffe0..863a5e9 100644
31907 --- a/drivers/ide/slc90e66.c
31908 +++ b/drivers/ide/slc90e66.c
31909 @@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
31910 .cable_detect = slc90e66_cable_detect,
31911 };
31912
31913 -static const struct ide_port_info slc90e66_chipset __devinitdata = {
31914 +static const struct ide_port_info slc90e66_chipset __devinitconst = {
31915 .name = DRV_NAME,
31916 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
31917 .port_ops = &slc90e66_port_ops,
31918 diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
31919 index 4799d5c..1794678 100644
31920 --- a/drivers/ide/tc86c001.c
31921 +++ b/drivers/ide/tc86c001.c
31922 @@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
31923 .dma_sff_read_status = ide_dma_sff_read_status,
31924 };
31925
31926 -static const struct ide_port_info tc86c001_chipset __devinitdata = {
31927 +static const struct ide_port_info tc86c001_chipset __devinitconst = {
31928 .name = DRV_NAME,
31929 .init_hwif = init_hwif_tc86c001,
31930 .port_ops = &tc86c001_port_ops,
31931 diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
31932 index 281c914..55ce1b8 100644
31933 --- a/drivers/ide/triflex.c
31934 +++ b/drivers/ide/triflex.c
31935 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
31936 .set_dma_mode = triflex_set_mode,
31937 };
31938
31939 -static const struct ide_port_info triflex_device __devinitdata = {
31940 +static const struct ide_port_info triflex_device __devinitconst = {
31941 .name = DRV_NAME,
31942 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
31943 .port_ops = &triflex_port_ops,
31944 diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
31945 index 4b42ca0..e494a98 100644
31946 --- a/drivers/ide/trm290.c
31947 +++ b/drivers/ide/trm290.c
31948 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
31949 .dma_check = trm290_dma_check,
31950 };
31951
31952 -static const struct ide_port_info trm290_chipset __devinitdata = {
31953 +static const struct ide_port_info trm290_chipset __devinitconst = {
31954 .name = DRV_NAME,
31955 .init_hwif = init_hwif_trm290,
31956 .tp_ops = &trm290_tp_ops,
31957 diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
31958 index f46f49c..eb77678 100644
31959 --- a/drivers/ide/via82cxxx.c
31960 +++ b/drivers/ide/via82cxxx.c
31961 @@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
31962 .cable_detect = via82cxxx_cable_detect,
31963 };
31964
31965 -static const struct ide_port_info via82cxxx_chipset __devinitdata = {
31966 +static const struct ide_port_info via82cxxx_chipset __devinitconst = {
31967 .name = DRV_NAME,
31968 .init_chipset = init_chipset_via82cxxx,
31969 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
31970 diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
31971 index 73d4531..c90cd2d 100644
31972 --- a/drivers/ieee802154/fakehard.c
31973 +++ b/drivers/ieee802154/fakehard.c
31974 @@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
31975 phy->transmit_power = 0xbf;
31976
31977 dev->netdev_ops = &fake_ops;
31978 - dev->ml_priv = &fake_mlme;
31979 + dev->ml_priv = (void *)&fake_mlme;
31980
31981 priv = netdev_priv(dev);
31982 priv->phy = phy;
31983 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
31984 index c889aae..6cf5aa7 100644
31985 --- a/drivers/infiniband/core/cm.c
31986 +++ b/drivers/infiniband/core/cm.c
31987 @@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
31988
31989 struct cm_counter_group {
31990 struct kobject obj;
31991 - atomic_long_t counter[CM_ATTR_COUNT];
31992 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
31993 };
31994
31995 struct cm_counter_attribute {
31996 @@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
31997 struct ib_mad_send_buf *msg = NULL;
31998 int ret;
31999
32000 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32001 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32002 counter[CM_REQ_COUNTER]);
32003
32004 /* Quick state check to discard duplicate REQs. */
32005 @@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
32006 if (!cm_id_priv)
32007 return;
32008
32009 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32010 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32011 counter[CM_REP_COUNTER]);
32012 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
32013 if (ret)
32014 @@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
32015 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
32016 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
32017 spin_unlock_irq(&cm_id_priv->lock);
32018 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32019 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32020 counter[CM_RTU_COUNTER]);
32021 goto out;
32022 }
32023 @@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
32024 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
32025 dreq_msg->local_comm_id);
32026 if (!cm_id_priv) {
32027 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32028 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32029 counter[CM_DREQ_COUNTER]);
32030 cm_issue_drep(work->port, work->mad_recv_wc);
32031 return -EINVAL;
32032 @@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
32033 case IB_CM_MRA_REP_RCVD:
32034 break;
32035 case IB_CM_TIMEWAIT:
32036 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32037 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32038 counter[CM_DREQ_COUNTER]);
32039 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32040 goto unlock;
32041 @@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
32042 cm_free_msg(msg);
32043 goto deref;
32044 case IB_CM_DREQ_RCVD:
32045 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32046 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32047 counter[CM_DREQ_COUNTER]);
32048 goto unlock;
32049 default:
32050 @@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
32051 ib_modify_mad(cm_id_priv->av.port->mad_agent,
32052 cm_id_priv->msg, timeout)) {
32053 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
32054 - atomic_long_inc(&work->port->
32055 + atomic_long_inc_unchecked(&work->port->
32056 counter_group[CM_RECV_DUPLICATES].
32057 counter[CM_MRA_COUNTER]);
32058 goto out;
32059 @@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
32060 break;
32061 case IB_CM_MRA_REQ_RCVD:
32062 case IB_CM_MRA_REP_RCVD:
32063 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32064 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32065 counter[CM_MRA_COUNTER]);
32066 /* fall through */
32067 default:
32068 @@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
32069 case IB_CM_LAP_IDLE:
32070 break;
32071 case IB_CM_MRA_LAP_SENT:
32072 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32073 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32074 counter[CM_LAP_COUNTER]);
32075 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32076 goto unlock;
32077 @@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
32078 cm_free_msg(msg);
32079 goto deref;
32080 case IB_CM_LAP_RCVD:
32081 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32082 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32083 counter[CM_LAP_COUNTER]);
32084 goto unlock;
32085 default:
32086 @@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
32087 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
32088 if (cur_cm_id_priv) {
32089 spin_unlock_irq(&cm.lock);
32090 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32091 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32092 counter[CM_SIDR_REQ_COUNTER]);
32093 goto out; /* Duplicate message. */
32094 }
32095 @@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
32096 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
32097 msg->retries = 1;
32098
32099 - atomic_long_add(1 + msg->retries,
32100 + atomic_long_add_unchecked(1 + msg->retries,
32101 &port->counter_group[CM_XMIT].counter[attr_index]);
32102 if (msg->retries)
32103 - atomic_long_add(msg->retries,
32104 + atomic_long_add_unchecked(msg->retries,
32105 &port->counter_group[CM_XMIT_RETRIES].
32106 counter[attr_index]);
32107
32108 @@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
32109 }
32110
32111 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
32112 - atomic_long_inc(&port->counter_group[CM_RECV].
32113 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
32114 counter[attr_id - CM_ATTR_ID_OFFSET]);
32115
32116 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
32117 @@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
32118 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
32119
32120 return sprintf(buf, "%ld\n",
32121 - atomic_long_read(&group->counter[cm_attr->index]));
32122 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
32123 }
32124
32125 static const struct sysfs_ops cm_counter_ops = {
32126 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
32127 index 176c8f9..2627b62 100644
32128 --- a/drivers/infiniband/core/fmr_pool.c
32129 +++ b/drivers/infiniband/core/fmr_pool.c
32130 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
32131
32132 struct task_struct *thread;
32133
32134 - atomic_t req_ser;
32135 - atomic_t flush_ser;
32136 + atomic_unchecked_t req_ser;
32137 + atomic_unchecked_t flush_ser;
32138
32139 wait_queue_head_t force_wait;
32140 };
32141 @@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32142 struct ib_fmr_pool *pool = pool_ptr;
32143
32144 do {
32145 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
32146 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
32147 ib_fmr_batch_release(pool);
32148
32149 - atomic_inc(&pool->flush_ser);
32150 + atomic_inc_unchecked(&pool->flush_ser);
32151 wake_up_interruptible(&pool->force_wait);
32152
32153 if (pool->flush_function)
32154 @@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32155 }
32156
32157 set_current_state(TASK_INTERRUPTIBLE);
32158 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32159 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32160 !kthread_should_stop())
32161 schedule();
32162 __set_current_state(TASK_RUNNING);
32163 @@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32164 pool->dirty_watermark = params->dirty_watermark;
32165 pool->dirty_len = 0;
32166 spin_lock_init(&pool->pool_lock);
32167 - atomic_set(&pool->req_ser, 0);
32168 - atomic_set(&pool->flush_ser, 0);
32169 + atomic_set_unchecked(&pool->req_ser, 0);
32170 + atomic_set_unchecked(&pool->flush_ser, 0);
32171 init_waitqueue_head(&pool->force_wait);
32172
32173 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32174 @@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32175 }
32176 spin_unlock_irq(&pool->pool_lock);
32177
32178 - serial = atomic_inc_return(&pool->req_ser);
32179 + serial = atomic_inc_return_unchecked(&pool->req_ser);
32180 wake_up_process(pool->thread);
32181
32182 if (wait_event_interruptible(pool->force_wait,
32183 - atomic_read(&pool->flush_ser) - serial >= 0))
32184 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32185 return -EINTR;
32186
32187 return 0;
32188 @@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32189 } else {
32190 list_add_tail(&fmr->list, &pool->dirty_list);
32191 if (++pool->dirty_len >= pool->dirty_watermark) {
32192 - atomic_inc(&pool->req_ser);
32193 + atomic_inc_unchecked(&pool->req_ser);
32194 wake_up_process(pool->thread);
32195 }
32196 }
32197 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32198 index 57e07c6..56d09d4 100644
32199 --- a/drivers/infiniband/hw/cxgb4/mem.c
32200 +++ b/drivers/infiniband/hw/cxgb4/mem.c
32201 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32202 int err;
32203 struct fw_ri_tpte tpt;
32204 u32 stag_idx;
32205 - static atomic_t key;
32206 + static atomic_unchecked_t key;
32207
32208 if (c4iw_fatal_error(rdev))
32209 return -EIO;
32210 @@ -139,7 +139,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32211 if (rdev->stats.stag.cur > rdev->stats.stag.max)
32212 rdev->stats.stag.max = rdev->stats.stag.cur;
32213 mutex_unlock(&rdev->stats.lock);
32214 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32215 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32216 }
32217 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32218 __func__, stag_state, type, pdid, stag_idx);
32219 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32220 index 79b3dbc..96e5fcc 100644
32221 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
32222 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32223 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32224 struct ib_atomic_eth *ateth;
32225 struct ipath_ack_entry *e;
32226 u64 vaddr;
32227 - atomic64_t *maddr;
32228 + atomic64_unchecked_t *maddr;
32229 u64 sdata;
32230 u32 rkey;
32231 u8 next;
32232 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32233 IB_ACCESS_REMOTE_ATOMIC)))
32234 goto nack_acc_unlck;
32235 /* Perform atomic OP and save result. */
32236 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32237 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32238 sdata = be64_to_cpu(ateth->swap_data);
32239 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32240 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32241 - (u64) atomic64_add_return(sdata, maddr) - sdata :
32242 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32243 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32244 be64_to_cpu(ateth->compare_data),
32245 sdata);
32246 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32247 index 1f95bba..9530f87 100644
32248 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32249 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32250 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32251 unsigned long flags;
32252 struct ib_wc wc;
32253 u64 sdata;
32254 - atomic64_t *maddr;
32255 + atomic64_unchecked_t *maddr;
32256 enum ib_wc_status send_status;
32257
32258 /*
32259 @@ -382,11 +382,11 @@ again:
32260 IB_ACCESS_REMOTE_ATOMIC)))
32261 goto acc_err;
32262 /* Perform atomic OP and save result. */
32263 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32264 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32265 sdata = wqe->wr.wr.atomic.compare_add;
32266 *(u64 *) sqp->s_sge.sge.vaddr =
32267 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32268 - (u64) atomic64_add_return(sdata, maddr) - sdata :
32269 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32270 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32271 sdata, wqe->wr.wr.atomic.swap);
32272 goto send_comp;
32273 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32274 index 7140199..da60063 100644
32275 --- a/drivers/infiniband/hw/nes/nes.c
32276 +++ b/drivers/infiniband/hw/nes/nes.c
32277 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32278 LIST_HEAD(nes_adapter_list);
32279 static LIST_HEAD(nes_dev_list);
32280
32281 -atomic_t qps_destroyed;
32282 +atomic_unchecked_t qps_destroyed;
32283
32284 static unsigned int ee_flsh_adapter;
32285 static unsigned int sysfs_nonidx_addr;
32286 @@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32287 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32288 struct nes_adapter *nesadapter = nesdev->nesadapter;
32289
32290 - atomic_inc(&qps_destroyed);
32291 + atomic_inc_unchecked(&qps_destroyed);
32292
32293 /* Free the control structures */
32294
32295 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32296 index c438e46..ca30356 100644
32297 --- a/drivers/infiniband/hw/nes/nes.h
32298 +++ b/drivers/infiniband/hw/nes/nes.h
32299 @@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32300 extern unsigned int wqm_quanta;
32301 extern struct list_head nes_adapter_list;
32302
32303 -extern atomic_t cm_connects;
32304 -extern atomic_t cm_accepts;
32305 -extern atomic_t cm_disconnects;
32306 -extern atomic_t cm_closes;
32307 -extern atomic_t cm_connecteds;
32308 -extern atomic_t cm_connect_reqs;
32309 -extern atomic_t cm_rejects;
32310 -extern atomic_t mod_qp_timouts;
32311 -extern atomic_t qps_created;
32312 -extern atomic_t qps_destroyed;
32313 -extern atomic_t sw_qps_destroyed;
32314 +extern atomic_unchecked_t cm_connects;
32315 +extern atomic_unchecked_t cm_accepts;
32316 +extern atomic_unchecked_t cm_disconnects;
32317 +extern atomic_unchecked_t cm_closes;
32318 +extern atomic_unchecked_t cm_connecteds;
32319 +extern atomic_unchecked_t cm_connect_reqs;
32320 +extern atomic_unchecked_t cm_rejects;
32321 +extern atomic_unchecked_t mod_qp_timouts;
32322 +extern atomic_unchecked_t qps_created;
32323 +extern atomic_unchecked_t qps_destroyed;
32324 +extern atomic_unchecked_t sw_qps_destroyed;
32325 extern u32 mh_detected;
32326 extern u32 mh_pauses_sent;
32327 extern u32 cm_packets_sent;
32328 @@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32329 extern u32 cm_packets_received;
32330 extern u32 cm_packets_dropped;
32331 extern u32 cm_packets_retrans;
32332 -extern atomic_t cm_listens_created;
32333 -extern atomic_t cm_listens_destroyed;
32334 +extern atomic_unchecked_t cm_listens_created;
32335 +extern atomic_unchecked_t cm_listens_destroyed;
32336 extern u32 cm_backlog_drops;
32337 -extern atomic_t cm_loopbacks;
32338 -extern atomic_t cm_nodes_created;
32339 -extern atomic_t cm_nodes_destroyed;
32340 -extern atomic_t cm_accel_dropped_pkts;
32341 -extern atomic_t cm_resets_recvd;
32342 -extern atomic_t pau_qps_created;
32343 -extern atomic_t pau_qps_destroyed;
32344 +extern atomic_unchecked_t cm_loopbacks;
32345 +extern atomic_unchecked_t cm_nodes_created;
32346 +extern atomic_unchecked_t cm_nodes_destroyed;
32347 +extern atomic_unchecked_t cm_accel_dropped_pkts;
32348 +extern atomic_unchecked_t cm_resets_recvd;
32349 +extern atomic_unchecked_t pau_qps_created;
32350 +extern atomic_unchecked_t pau_qps_destroyed;
32351
32352 extern u32 int_mod_timer_init;
32353 extern u32 int_mod_cq_depth_256;
32354 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32355 index 020e95c..fbb3450 100644
32356 --- a/drivers/infiniband/hw/nes/nes_cm.c
32357 +++ b/drivers/infiniband/hw/nes/nes_cm.c
32358 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32359 u32 cm_packets_retrans;
32360 u32 cm_packets_created;
32361 u32 cm_packets_received;
32362 -atomic_t cm_listens_created;
32363 -atomic_t cm_listens_destroyed;
32364 +atomic_unchecked_t cm_listens_created;
32365 +atomic_unchecked_t cm_listens_destroyed;
32366 u32 cm_backlog_drops;
32367 -atomic_t cm_loopbacks;
32368 -atomic_t cm_nodes_created;
32369 -atomic_t cm_nodes_destroyed;
32370 -atomic_t cm_accel_dropped_pkts;
32371 -atomic_t cm_resets_recvd;
32372 +atomic_unchecked_t cm_loopbacks;
32373 +atomic_unchecked_t cm_nodes_created;
32374 +atomic_unchecked_t cm_nodes_destroyed;
32375 +atomic_unchecked_t cm_accel_dropped_pkts;
32376 +atomic_unchecked_t cm_resets_recvd;
32377
32378 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32379 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32380 @@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32381
32382 static struct nes_cm_core *g_cm_core;
32383
32384 -atomic_t cm_connects;
32385 -atomic_t cm_accepts;
32386 -atomic_t cm_disconnects;
32387 -atomic_t cm_closes;
32388 -atomic_t cm_connecteds;
32389 -atomic_t cm_connect_reqs;
32390 -atomic_t cm_rejects;
32391 +atomic_unchecked_t cm_connects;
32392 +atomic_unchecked_t cm_accepts;
32393 +atomic_unchecked_t cm_disconnects;
32394 +atomic_unchecked_t cm_closes;
32395 +atomic_unchecked_t cm_connecteds;
32396 +atomic_unchecked_t cm_connect_reqs;
32397 +atomic_unchecked_t cm_rejects;
32398
32399 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32400 {
32401 @@ -1279,7 +1279,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32402 kfree(listener);
32403 listener = NULL;
32404 ret = 0;
32405 - atomic_inc(&cm_listens_destroyed);
32406 + atomic_inc_unchecked(&cm_listens_destroyed);
32407 } else {
32408 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32409 }
32410 @@ -1482,7 +1482,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32411 cm_node->rem_mac);
32412
32413 add_hte_node(cm_core, cm_node);
32414 - atomic_inc(&cm_nodes_created);
32415 + atomic_inc_unchecked(&cm_nodes_created);
32416
32417 return cm_node;
32418 }
32419 @@ -1540,7 +1540,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32420 }
32421
32422 atomic_dec(&cm_core->node_cnt);
32423 - atomic_inc(&cm_nodes_destroyed);
32424 + atomic_inc_unchecked(&cm_nodes_destroyed);
32425 nesqp = cm_node->nesqp;
32426 if (nesqp) {
32427 nesqp->cm_node = NULL;
32428 @@ -1604,7 +1604,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32429
32430 static void drop_packet(struct sk_buff *skb)
32431 {
32432 - atomic_inc(&cm_accel_dropped_pkts);
32433 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
32434 dev_kfree_skb_any(skb);
32435 }
32436
32437 @@ -1667,7 +1667,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32438 {
32439
32440 int reset = 0; /* whether to send reset in case of err.. */
32441 - atomic_inc(&cm_resets_recvd);
32442 + atomic_inc_unchecked(&cm_resets_recvd);
32443 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32444 " refcnt=%d\n", cm_node, cm_node->state,
32445 atomic_read(&cm_node->ref_count));
32446 @@ -2308,7 +2308,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32447 rem_ref_cm_node(cm_node->cm_core, cm_node);
32448 return NULL;
32449 }
32450 - atomic_inc(&cm_loopbacks);
32451 + atomic_inc_unchecked(&cm_loopbacks);
32452 loopbackremotenode->loopbackpartner = cm_node;
32453 loopbackremotenode->tcp_cntxt.rcv_wscale =
32454 NES_CM_DEFAULT_RCV_WND_SCALE;
32455 @@ -2583,7 +2583,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32456 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32457 else {
32458 rem_ref_cm_node(cm_core, cm_node);
32459 - atomic_inc(&cm_accel_dropped_pkts);
32460 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
32461 dev_kfree_skb_any(skb);
32462 }
32463 break;
32464 @@ -2891,7 +2891,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32465
32466 if ((cm_id) && (cm_id->event_handler)) {
32467 if (issue_disconn) {
32468 - atomic_inc(&cm_disconnects);
32469 + atomic_inc_unchecked(&cm_disconnects);
32470 cm_event.event = IW_CM_EVENT_DISCONNECT;
32471 cm_event.status = disconn_status;
32472 cm_event.local_addr = cm_id->local_addr;
32473 @@ -2913,7 +2913,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32474 }
32475
32476 if (issue_close) {
32477 - atomic_inc(&cm_closes);
32478 + atomic_inc_unchecked(&cm_closes);
32479 nes_disconnect(nesqp, 1);
32480
32481 cm_id->provider_data = nesqp;
32482 @@ -3049,7 +3049,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32483
32484 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32485 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
32486 - atomic_inc(&cm_accepts);
32487 + atomic_inc_unchecked(&cm_accepts);
32488
32489 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
32490 netdev_refcnt_read(nesvnic->netdev));
32491 @@ -3251,7 +3251,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
32492 struct nes_cm_core *cm_core;
32493 u8 *start_buff;
32494
32495 - atomic_inc(&cm_rejects);
32496 + atomic_inc_unchecked(&cm_rejects);
32497 cm_node = (struct nes_cm_node *)cm_id->provider_data;
32498 loopback = cm_node->loopbackpartner;
32499 cm_core = cm_node->cm_core;
32500 @@ -3311,7 +3311,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32501 ntohl(cm_id->local_addr.sin_addr.s_addr),
32502 ntohs(cm_id->local_addr.sin_port));
32503
32504 - atomic_inc(&cm_connects);
32505 + atomic_inc_unchecked(&cm_connects);
32506 nesqp->active_conn = 1;
32507
32508 /* cache the cm_id in the qp */
32509 @@ -3421,7 +3421,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
32510 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
32511 return err;
32512 }
32513 - atomic_inc(&cm_listens_created);
32514 + atomic_inc_unchecked(&cm_listens_created);
32515 }
32516
32517 cm_id->add_ref(cm_id);
32518 @@ -3522,7 +3522,7 @@ static void cm_event_connected(struct nes_cm_event *event)
32519
32520 if (nesqp->destroyed)
32521 return;
32522 - atomic_inc(&cm_connecteds);
32523 + atomic_inc_unchecked(&cm_connecteds);
32524 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
32525 " local port 0x%04X. jiffies = %lu.\n",
32526 nesqp->hwqp.qp_id,
32527 @@ -3709,7 +3709,7 @@ static void cm_event_reset(struct nes_cm_event *event)
32528
32529 cm_id->add_ref(cm_id);
32530 ret = cm_id->event_handler(cm_id, &cm_event);
32531 - atomic_inc(&cm_closes);
32532 + atomic_inc_unchecked(&cm_closes);
32533 cm_event.event = IW_CM_EVENT_CLOSE;
32534 cm_event.status = 0;
32535 cm_event.provider_data = cm_id->provider_data;
32536 @@ -3745,7 +3745,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
32537 return;
32538 cm_id = cm_node->cm_id;
32539
32540 - atomic_inc(&cm_connect_reqs);
32541 + atomic_inc_unchecked(&cm_connect_reqs);
32542 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32543 cm_node, cm_id, jiffies);
32544
32545 @@ -3785,7 +3785,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
32546 return;
32547 cm_id = cm_node->cm_id;
32548
32549 - atomic_inc(&cm_connect_reqs);
32550 + atomic_inc_unchecked(&cm_connect_reqs);
32551 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32552 cm_node, cm_id, jiffies);
32553
32554 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
32555 index 3ba7be3..c81f6ff 100644
32556 --- a/drivers/infiniband/hw/nes/nes_mgt.c
32557 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
32558 @@ -40,8 +40,8 @@
32559 #include "nes.h"
32560 #include "nes_mgt.h"
32561
32562 -atomic_t pau_qps_created;
32563 -atomic_t pau_qps_destroyed;
32564 +atomic_unchecked_t pau_qps_created;
32565 +atomic_unchecked_t pau_qps_destroyed;
32566
32567 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
32568 {
32569 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
32570 {
32571 struct sk_buff *skb;
32572 unsigned long flags;
32573 - atomic_inc(&pau_qps_destroyed);
32574 + atomic_inc_unchecked(&pau_qps_destroyed);
32575
32576 /* Free packets that have not yet been forwarded */
32577 /* Lock is acquired by skb_dequeue when removing the skb */
32578 @@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
32579 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
32580 skb_queue_head_init(&nesqp->pau_list);
32581 spin_lock_init(&nesqp->pau_lock);
32582 - atomic_inc(&pau_qps_created);
32583 + atomic_inc_unchecked(&pau_qps_created);
32584 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
32585 }
32586
32587 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
32588 index f3a3ecf..57d311d 100644
32589 --- a/drivers/infiniband/hw/nes/nes_nic.c
32590 +++ b/drivers/infiniband/hw/nes/nes_nic.c
32591 @@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
32592 target_stat_values[++index] = mh_detected;
32593 target_stat_values[++index] = mh_pauses_sent;
32594 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32595 - target_stat_values[++index] = atomic_read(&cm_connects);
32596 - target_stat_values[++index] = atomic_read(&cm_accepts);
32597 - target_stat_values[++index] = atomic_read(&cm_disconnects);
32598 - target_stat_values[++index] = atomic_read(&cm_connecteds);
32599 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32600 - target_stat_values[++index] = atomic_read(&cm_rejects);
32601 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32602 - target_stat_values[++index] = atomic_read(&qps_created);
32603 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32604 - target_stat_values[++index] = atomic_read(&qps_destroyed);
32605 - target_stat_values[++index] = atomic_read(&cm_closes);
32606 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32607 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32608 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32609 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32610 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32611 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32612 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32613 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32614 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32615 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32616 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32617 target_stat_values[++index] = cm_packets_sent;
32618 target_stat_values[++index] = cm_packets_bounced;
32619 target_stat_values[++index] = cm_packets_created;
32620 target_stat_values[++index] = cm_packets_received;
32621 target_stat_values[++index] = cm_packets_dropped;
32622 target_stat_values[++index] = cm_packets_retrans;
32623 - target_stat_values[++index] = atomic_read(&cm_listens_created);
32624 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
32625 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
32626 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
32627 target_stat_values[++index] = cm_backlog_drops;
32628 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
32629 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
32630 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32631 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32632 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32633 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32634 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32635 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32636 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32637 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32638 target_stat_values[++index] = nesadapter->free_4kpbl;
32639 target_stat_values[++index] = nesadapter->free_256pbl;
32640 target_stat_values[++index] = int_mod_timer_init;
32641 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
32642 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
32643 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
32644 - target_stat_values[++index] = atomic_read(&pau_qps_created);
32645 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
32646 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
32647 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
32648 }
32649
32650 /**
32651 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
32652 index 8b8812d..a5e1133 100644
32653 --- a/drivers/infiniband/hw/nes/nes_verbs.c
32654 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
32655 @@ -46,9 +46,9 @@
32656
32657 #include <rdma/ib_umem.h>
32658
32659 -atomic_t mod_qp_timouts;
32660 -atomic_t qps_created;
32661 -atomic_t sw_qps_destroyed;
32662 +atomic_unchecked_t mod_qp_timouts;
32663 +atomic_unchecked_t qps_created;
32664 +atomic_unchecked_t sw_qps_destroyed;
32665
32666 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32667
32668 @@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
32669 if (init_attr->create_flags)
32670 return ERR_PTR(-EINVAL);
32671
32672 - atomic_inc(&qps_created);
32673 + atomic_inc_unchecked(&qps_created);
32674 switch (init_attr->qp_type) {
32675 case IB_QPT_RC:
32676 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32677 @@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
32678 struct iw_cm_event cm_event;
32679 int ret = 0;
32680
32681 - atomic_inc(&sw_qps_destroyed);
32682 + atomic_inc_unchecked(&sw_qps_destroyed);
32683 nesqp->destroyed = 1;
32684
32685 /* Blow away the connection if it exists. */
32686 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
32687 index 7e62f41..4c2b8e2 100644
32688 --- a/drivers/infiniband/hw/qib/qib.h
32689 +++ b/drivers/infiniband/hw/qib/qib.h
32690 @@ -51,6 +51,7 @@
32691 #include <linux/completion.h>
32692 #include <linux/kref.h>
32693 #include <linux/sched.h>
32694 +#include <linux/slab.h>
32695
32696 #include "qib_common.h"
32697 #include "qib_verbs.h"
32698 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
32699 index da739d9..da1c7f4 100644
32700 --- a/drivers/input/gameport/gameport.c
32701 +++ b/drivers/input/gameport/gameport.c
32702 @@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
32703 */
32704 static void gameport_init_port(struct gameport *gameport)
32705 {
32706 - static atomic_t gameport_no = ATOMIC_INIT(0);
32707 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32708
32709 __module_get(THIS_MODULE);
32710
32711 mutex_init(&gameport->drv_mutex);
32712 device_initialize(&gameport->dev);
32713 dev_set_name(&gameport->dev, "gameport%lu",
32714 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
32715 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32716 gameport->dev.bus = &gameport_bus;
32717 gameport->dev.release = gameport_release_port;
32718 if (gameport->parent)
32719 diff --git a/drivers/input/input.c b/drivers/input/input.c
32720 index 8921c61..f5cd63d 100644
32721 --- a/drivers/input/input.c
32722 +++ b/drivers/input/input.c
32723 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
32724 */
32725 int input_register_device(struct input_dev *dev)
32726 {
32727 - static atomic_t input_no = ATOMIC_INIT(0);
32728 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32729 struct input_handler *handler;
32730 const char *path;
32731 int error;
32732 @@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
32733 dev->setkeycode = input_default_setkeycode;
32734
32735 dev_set_name(&dev->dev, "input%ld",
32736 - (unsigned long) atomic_inc_return(&input_no) - 1);
32737 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32738
32739 error = device_add(&dev->dev);
32740 if (error)
32741 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
32742 index 04c69af..5f92d00 100644
32743 --- a/drivers/input/joystick/sidewinder.c
32744 +++ b/drivers/input/joystick/sidewinder.c
32745 @@ -30,6 +30,7 @@
32746 #include <linux/kernel.h>
32747 #include <linux/module.h>
32748 #include <linux/slab.h>
32749 +#include <linux/sched.h>
32750 #include <linux/init.h>
32751 #include <linux/input.h>
32752 #include <linux/gameport.h>
32753 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
32754 index 83811e4..0822b90 100644
32755 --- a/drivers/input/joystick/xpad.c
32756 +++ b/drivers/input/joystick/xpad.c
32757 @@ -726,7 +726,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
32758
32759 static int xpad_led_probe(struct usb_xpad *xpad)
32760 {
32761 - static atomic_t led_seq = ATOMIC_INIT(0);
32762 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32763 long led_no;
32764 struct xpad_led *led;
32765 struct led_classdev *led_cdev;
32766 @@ -739,7 +739,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
32767 if (!led)
32768 return -ENOMEM;
32769
32770 - led_no = (long)atomic_inc_return(&led_seq) - 1;
32771 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32772
32773 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32774 led->xpad = xpad;
32775 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
32776 index 0110b5a..d3ad144 100644
32777 --- a/drivers/input/mousedev.c
32778 +++ b/drivers/input/mousedev.c
32779 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
32780
32781 spin_unlock_irq(&client->packet_lock);
32782
32783 - if (copy_to_user(buffer, data, count))
32784 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
32785 return -EFAULT;
32786
32787 return count;
32788 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
32789 index d0f7533..fb8215b 100644
32790 --- a/drivers/input/serio/serio.c
32791 +++ b/drivers/input/serio/serio.c
32792 @@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
32793 */
32794 static void serio_init_port(struct serio *serio)
32795 {
32796 - static atomic_t serio_no = ATOMIC_INIT(0);
32797 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32798
32799 __module_get(THIS_MODULE);
32800
32801 @@ -507,7 +507,7 @@ static void serio_init_port(struct serio *serio)
32802 mutex_init(&serio->drv_mutex);
32803 device_initialize(&serio->dev);
32804 dev_set_name(&serio->dev, "serio%ld",
32805 - (long)atomic_inc_return(&serio_no) - 1);
32806 + (long)atomic_inc_return_unchecked(&serio_no) - 1);
32807 serio->dev.bus = &serio_bus;
32808 serio->dev.release = serio_release_port;
32809 serio->dev.groups = serio_device_attr_groups;
32810 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
32811 index 38c4bd8..58965d9 100644
32812 --- a/drivers/isdn/capi/capi.c
32813 +++ b/drivers/isdn/capi/capi.c
32814 @@ -83,8 +83,8 @@ struct capiminor {
32815
32816 struct capi20_appl *ap;
32817 u32 ncci;
32818 - atomic_t datahandle;
32819 - atomic_t msgid;
32820 + atomic_unchecked_t datahandle;
32821 + atomic_unchecked_t msgid;
32822
32823 struct tty_port port;
32824 int ttyinstop;
32825 @@ -392,7 +392,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
32826 capimsg_setu16(s, 2, mp->ap->applid);
32827 capimsg_setu8 (s, 4, CAPI_DATA_B3);
32828 capimsg_setu8 (s, 5, CAPI_RESP);
32829 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
32830 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
32831 capimsg_setu32(s, 8, mp->ncci);
32832 capimsg_setu16(s, 12, datahandle);
32833 }
32834 @@ -513,14 +513,14 @@ static void handle_minor_send(struct capiminor *mp)
32835 mp->outbytes -= len;
32836 spin_unlock_bh(&mp->outlock);
32837
32838 - datahandle = atomic_inc_return(&mp->datahandle);
32839 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
32840 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
32841 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32842 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32843 capimsg_setu16(skb->data, 2, mp->ap->applid);
32844 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
32845 capimsg_setu8 (skb->data, 5, CAPI_REQ);
32846 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
32847 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
32848 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
32849 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
32850 capimsg_setu16(skb->data, 16, len); /* Data length */
32851 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
32852 index a6d9fd2..afdb8a3 100644
32853 --- a/drivers/isdn/gigaset/interface.c
32854 +++ b/drivers/isdn/gigaset/interface.c
32855 @@ -160,9 +160,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
32856 }
32857 tty->driver_data = cs;
32858
32859 - ++cs->port.count;
32860 + atomic_inc(&cs->port.count);
32861
32862 - if (cs->port.count == 1) {
32863 + if (atomic_read(&cs->port.count) == 1) {
32864 tty_port_tty_set(&cs->port, tty);
32865 tty->low_latency = 1;
32866 }
32867 @@ -186,9 +186,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
32868
32869 if (!cs->connected)
32870 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32871 - else if (!cs->port.count)
32872 + else if (!atomic_read(&cs->port.count))
32873 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32874 - else if (!--cs->port.count)
32875 + else if (!atomic_dec_return(&cs->port.count))
32876 tty_port_tty_set(&cs->port, NULL);
32877
32878 mutex_unlock(&cs->mutex);
32879 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
32880 index 821f7ac..28d4030 100644
32881 --- a/drivers/isdn/hardware/avm/b1.c
32882 +++ b/drivers/isdn/hardware/avm/b1.c
32883 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
32884 }
32885 if (left) {
32886 if (t4file->user) {
32887 - if (copy_from_user(buf, dp, left))
32888 + if (left > sizeof buf || copy_from_user(buf, dp, left))
32889 return -EFAULT;
32890 } else {
32891 memcpy(buf, dp, left);
32892 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
32893 }
32894 if (left) {
32895 if (config->user) {
32896 - if (copy_from_user(buf, dp, left))
32897 + if (left > sizeof buf || copy_from_user(buf, dp, left))
32898 return -EFAULT;
32899 } else {
32900 memcpy(buf, dp, left);
32901 diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
32902 index dd6b53a..19d9ee6 100644
32903 --- a/drivers/isdn/hardware/eicon/divasync.h
32904 +++ b/drivers/isdn/hardware/eicon/divasync.h
32905 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
32906 } diva_didd_add_adapter_t;
32907 typedef struct _diva_didd_remove_adapter {
32908 IDI_CALL p_request;
32909 -} diva_didd_remove_adapter_t;
32910 +} __no_const diva_didd_remove_adapter_t;
32911 typedef struct _diva_didd_read_adapter_array {
32912 void *buffer;
32913 dword length;
32914 diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
32915 index d303e65..28bcb7b 100644
32916 --- a/drivers/isdn/hardware/eicon/xdi_adapter.h
32917 +++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
32918 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
32919 typedef struct _diva_os_idi_adapter_interface {
32920 diva_init_card_proc_t cleanup_adapter_proc;
32921 diva_cmd_card_proc_t cmd_proc;
32922 -} diva_os_idi_adapter_interface_t;
32923 +} __no_const diva_os_idi_adapter_interface_t;
32924
32925 typedef struct _diva_os_xdi_adapter {
32926 struct list_head link;
32927 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
32928 index 7bc5067..fd36232 100644
32929 --- a/drivers/isdn/i4l/isdn_tty.c
32930 +++ b/drivers/isdn/i4l/isdn_tty.c
32931 @@ -1505,9 +1505,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
32932 port = &info->port;
32933 #ifdef ISDN_DEBUG_MODEM_OPEN
32934 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
32935 - port->count);
32936 + atomic_read(&port->count))
32937 #endif
32938 - port->count++;
32939 + atomic_inc(&port->count);
32940 tty->driver_data = info;
32941 port->tty = tty;
32942 tty->port = port;
32943 @@ -1553,7 +1553,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
32944 #endif
32945 return;
32946 }
32947 - if ((tty->count == 1) && (port->count != 1)) {
32948 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
32949 /*
32950 * Uh, oh. tty->count is 1, which means that the tty
32951 * structure will be freed. Info->count should always
32952 @@ -1562,15 +1562,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
32953 * serial port won't be shutdown.
32954 */
32955 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
32956 - "info->count is %d\n", port->count);
32957 - port->count = 1;
32958 + "info->count is %d\n", atomic_read(&port->count));
32959 + atomic_set(&port->count, 1);
32960 }
32961 - if (--port->count < 0) {
32962 + if (atomic_dec_return(&port->count) < 0) {
32963 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
32964 - info->line, port->count);
32965 - port->count = 0;
32966 + info->line, atomic_read(&port->count));
32967 + atomic_set(&port->count, 0);
32968 }
32969 - if (port->count) {
32970 + if (atomic_read(&port->count)) {
32971 #ifdef ISDN_DEBUG_MODEM_OPEN
32972 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
32973 #endif
32974 @@ -1624,7 +1624,7 @@ isdn_tty_hangup(struct tty_struct *tty)
32975 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
32976 return;
32977 isdn_tty_shutdown(info);
32978 - port->count = 0;
32979 + atomic_set(&port->count, 0);
32980 port->flags &= ~ASYNC_NORMAL_ACTIVE;
32981 port->tty = NULL;
32982 wake_up_interruptible(&port->open_wait);
32983 @@ -1964,7 +1964,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
32984 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
32985 modem_info *info = &dev->mdm.info[i];
32986
32987 - if (info->port.count == 0)
32988 + if (atomic_read(&info->port.count) == 0)
32989 continue;
32990 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
32991 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
32992 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
32993 index e74df7c..03a03ba 100644
32994 --- a/drivers/isdn/icn/icn.c
32995 +++ b/drivers/isdn/icn/icn.c
32996 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
32997 if (count > len)
32998 count = len;
32999 if (user) {
33000 - if (copy_from_user(msg, buf, count))
33001 + if (count > sizeof msg || copy_from_user(msg, buf, count))
33002 return -EFAULT;
33003 } else
33004 memcpy(msg, buf, count);
33005 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
33006 index b5fdcb7..5b6c59f 100644
33007 --- a/drivers/lguest/core.c
33008 +++ b/drivers/lguest/core.c
33009 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
33010 * it's worked so far. The end address needs +1 because __get_vm_area
33011 * allocates an extra guard page, so we need space for that.
33012 */
33013 +
33014 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
33015 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33016 + VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
33017 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33018 +#else
33019 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33020 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
33021 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33022 +#endif
33023 +
33024 if (!switcher_vma) {
33025 err = -ENOMEM;
33026 printk("lguest: could not map switcher pages high\n");
33027 @@ -119,7 +127,7 @@ static __init int map_switcher(void)
33028 * Now the Switcher is mapped at the right address, we can't fail!
33029 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
33030 */
33031 - memcpy(switcher_vma->addr, start_switcher_text,
33032 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
33033 end_switcher_text - start_switcher_text);
33034
33035 printk(KERN_INFO "lguest: mapped switcher at %p\n",
33036 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
33037 index 39809035..ce25c5e 100644
33038 --- a/drivers/lguest/x86/core.c
33039 +++ b/drivers/lguest/x86/core.c
33040 @@ -59,7 +59,7 @@ static struct {
33041 /* Offset from where switcher.S was compiled to where we've copied it */
33042 static unsigned long switcher_offset(void)
33043 {
33044 - return SWITCHER_ADDR - (unsigned long)start_switcher_text;
33045 + return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
33046 }
33047
33048 /* This cpu's struct lguest_pages. */
33049 @@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
33050 * These copies are pretty cheap, so we do them unconditionally: */
33051 /* Save the current Host top-level page directory.
33052 */
33053 +
33054 +#ifdef CONFIG_PAX_PER_CPU_PGD
33055 + pages->state.host_cr3 = read_cr3();
33056 +#else
33057 pages->state.host_cr3 = __pa(current->mm->pgd);
33058 +#endif
33059 +
33060 /*
33061 * Set up the Guest's page tables to see this CPU's pages (and no
33062 * other CPU's pages).
33063 @@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
33064 * compiled-in switcher code and the high-mapped copy we just made.
33065 */
33066 for (i = 0; i < IDT_ENTRIES; i++)
33067 - default_idt_entries[i] += switcher_offset();
33068 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
33069
33070 /*
33071 * Set up the Switcher's per-cpu areas.
33072 @@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33073 * it will be undisturbed when we switch. To change %cs and jump we
33074 * need this structure to feed to Intel's "lcall" instruction.
33075 */
33076 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33077 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33078 lguest_entry.segment = LGUEST_CS;
33079
33080 /*
33081 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33082 index 40634b0..4f5855e 100644
33083 --- a/drivers/lguest/x86/switcher_32.S
33084 +++ b/drivers/lguest/x86/switcher_32.S
33085 @@ -87,6 +87,7 @@
33086 #include <asm/page.h>
33087 #include <asm/segment.h>
33088 #include <asm/lguest.h>
33089 +#include <asm/processor-flags.h>
33090
33091 // We mark the start of the code to copy
33092 // It's placed in .text tho it's never run here
33093 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33094 // Changes type when we load it: damn Intel!
33095 // For after we switch over our page tables
33096 // That entry will be read-only: we'd crash.
33097 +
33098 +#ifdef CONFIG_PAX_KERNEXEC
33099 + mov %cr0, %edx
33100 + xor $X86_CR0_WP, %edx
33101 + mov %edx, %cr0
33102 +#endif
33103 +
33104 movl $(GDT_ENTRY_TSS*8), %edx
33105 ltr %dx
33106
33107 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33108 // Let's clear it again for our return.
33109 // The GDT descriptor of the Host
33110 // Points to the table after two "size" bytes
33111 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33112 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33113 // Clear "used" from type field (byte 5, bit 2)
33114 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33115 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33116 +
33117 +#ifdef CONFIG_PAX_KERNEXEC
33118 + mov %cr0, %eax
33119 + xor $X86_CR0_WP, %eax
33120 + mov %eax, %cr0
33121 +#endif
33122
33123 // Once our page table's switched, the Guest is live!
33124 // The Host fades as we run this final step.
33125 @@ -295,13 +309,12 @@ deliver_to_host:
33126 // I consulted gcc, and it gave
33127 // These instructions, which I gladly credit:
33128 leal (%edx,%ebx,8), %eax
33129 - movzwl (%eax),%edx
33130 - movl 4(%eax), %eax
33131 - xorw %ax, %ax
33132 - orl %eax, %edx
33133 + movl 4(%eax), %edx
33134 + movw (%eax), %dx
33135 // Now the address of the handler's in %edx
33136 // We call it now: its "iret" drops us home.
33137 - jmp *%edx
33138 + ljmp $__KERNEL_CS, $1f
33139 +1: jmp *%edx
33140
33141 // Every interrupt can come to us here
33142 // But we must truly tell each apart.
33143 diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33144 index 20e5c2c..9e849a9 100644
33145 --- a/drivers/macintosh/macio_asic.c
33146 +++ b/drivers/macintosh/macio_asic.c
33147 @@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33148 * MacIO is matched against any Apple ID, it's probe() function
33149 * will then decide wether it applies or not
33150 */
33151 -static const struct pci_device_id __devinitdata pci_ids [] = { {
33152 +static const struct pci_device_id __devinitconst pci_ids [] = { {
33153 .vendor = PCI_VENDOR_ID_APPLE,
33154 .device = PCI_ANY_ID,
33155 .subvendor = PCI_ANY_ID,
33156 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
33157 index 15dbe03..743fc65 100644
33158 --- a/drivers/md/bitmap.c
33159 +++ b/drivers/md/bitmap.c
33160 @@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
33161 chunk_kb ? "KB" : "B");
33162 if (bitmap->storage.file) {
33163 seq_printf(seq, ", file: ");
33164 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
33165 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
33166 }
33167
33168 seq_printf(seq, "\n");
33169 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33170 index a1a3e6d..1918bfc 100644
33171 --- a/drivers/md/dm-ioctl.c
33172 +++ b/drivers/md/dm-ioctl.c
33173 @@ -1590,7 +1590,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33174 cmd == DM_LIST_VERSIONS_CMD)
33175 return 0;
33176
33177 - if ((cmd == DM_DEV_CREATE_CMD)) {
33178 + if (cmd == DM_DEV_CREATE_CMD) {
33179 if (!*param->name) {
33180 DMWARN("name not supplied when creating device");
33181 return -EINVAL;
33182 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33183 index b58b7a3..8018b19 100644
33184 --- a/drivers/md/dm-raid1.c
33185 +++ b/drivers/md/dm-raid1.c
33186 @@ -40,7 +40,7 @@ enum dm_raid1_error {
33187
33188 struct mirror {
33189 struct mirror_set *ms;
33190 - atomic_t error_count;
33191 + atomic_unchecked_t error_count;
33192 unsigned long error_type;
33193 struct dm_dev *dev;
33194 sector_t offset;
33195 @@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33196 struct mirror *m;
33197
33198 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33199 - if (!atomic_read(&m->error_count))
33200 + if (!atomic_read_unchecked(&m->error_count))
33201 return m;
33202
33203 return NULL;
33204 @@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33205 * simple way to tell if a device has encountered
33206 * errors.
33207 */
33208 - atomic_inc(&m->error_count);
33209 + atomic_inc_unchecked(&m->error_count);
33210
33211 if (test_and_set_bit(error_type, &m->error_type))
33212 return;
33213 @@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33214 struct mirror *m = get_default_mirror(ms);
33215
33216 do {
33217 - if (likely(!atomic_read(&m->error_count)))
33218 + if (likely(!atomic_read_unchecked(&m->error_count)))
33219 return m;
33220
33221 if (m-- == ms->mirror)
33222 @@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33223 {
33224 struct mirror *default_mirror = get_default_mirror(m->ms);
33225
33226 - return !atomic_read(&default_mirror->error_count);
33227 + return !atomic_read_unchecked(&default_mirror->error_count);
33228 }
33229
33230 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33231 @@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33232 */
33233 if (likely(region_in_sync(ms, region, 1)))
33234 m = choose_mirror(ms, bio->bi_sector);
33235 - else if (m && atomic_read(&m->error_count))
33236 + else if (m && atomic_read_unchecked(&m->error_count))
33237 m = NULL;
33238
33239 if (likely(m))
33240 @@ -938,7 +938,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33241 }
33242
33243 ms->mirror[mirror].ms = ms;
33244 - atomic_set(&(ms->mirror[mirror].error_count), 0);
33245 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33246 ms->mirror[mirror].error_type = 0;
33247 ms->mirror[mirror].offset = offset;
33248
33249 @@ -1352,7 +1352,7 @@ static void mirror_resume(struct dm_target *ti)
33250 */
33251 static char device_status_char(struct mirror *m)
33252 {
33253 - if (!atomic_read(&(m->error_count)))
33254 + if (!atomic_read_unchecked(&(m->error_count)))
33255 return 'A';
33256
33257 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33258 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33259 index 35c94ff..20d4c17 100644
33260 --- a/drivers/md/dm-stripe.c
33261 +++ b/drivers/md/dm-stripe.c
33262 @@ -20,7 +20,7 @@ struct stripe {
33263 struct dm_dev *dev;
33264 sector_t physical_start;
33265
33266 - atomic_t error_count;
33267 + atomic_unchecked_t error_count;
33268 };
33269
33270 struct stripe_c {
33271 @@ -193,7 +193,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33272 kfree(sc);
33273 return r;
33274 }
33275 - atomic_set(&(sc->stripe[i].error_count), 0);
33276 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33277 }
33278
33279 ti->private = sc;
33280 @@ -315,7 +315,7 @@ static int stripe_status(struct dm_target *ti,
33281 DMEMIT("%d ", sc->stripes);
33282 for (i = 0; i < sc->stripes; i++) {
33283 DMEMIT("%s ", sc->stripe[i].dev->name);
33284 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33285 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33286 'D' : 'A';
33287 }
33288 buffer[i] = '\0';
33289 @@ -362,8 +362,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33290 */
33291 for (i = 0; i < sc->stripes; i++)
33292 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33293 - atomic_inc(&(sc->stripe[i].error_count));
33294 - if (atomic_read(&(sc->stripe[i].error_count)) <
33295 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
33296 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33297 DM_IO_ERROR_THRESHOLD)
33298 schedule_work(&sc->trigger_event);
33299 }
33300 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33301 index 2e227fb..44ead1f 100644
33302 --- a/drivers/md/dm-table.c
33303 +++ b/drivers/md/dm-table.c
33304 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33305 if (!dev_size)
33306 return 0;
33307
33308 - if ((start >= dev_size) || (start + len > dev_size)) {
33309 + if ((start >= dev_size) || (len > dev_size - start)) {
33310 DMWARN("%s: %s too small for target: "
33311 "start=%llu, len=%llu, dev_size=%llu",
33312 dm_device_name(ti->table->md), bdevname(bdev, b),
33313 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33314 index 3e2907f..c28851a 100644
33315 --- a/drivers/md/dm-thin-metadata.c
33316 +++ b/drivers/md/dm-thin-metadata.c
33317 @@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33318
33319 pmd->info.tm = tm;
33320 pmd->info.levels = 2;
33321 - pmd->info.value_type.context = pmd->data_sm;
33322 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33323 pmd->info.value_type.size = sizeof(__le64);
33324 pmd->info.value_type.inc = data_block_inc;
33325 pmd->info.value_type.dec = data_block_dec;
33326 @@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33327
33328 pmd->bl_info.tm = tm;
33329 pmd->bl_info.levels = 1;
33330 - pmd->bl_info.value_type.context = pmd->data_sm;
33331 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33332 pmd->bl_info.value_type.size = sizeof(__le64);
33333 pmd->bl_info.value_type.inc = data_block_inc;
33334 pmd->bl_info.value_type.dec = data_block_dec;
33335 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33336 index e24143c..ce2f21a1 100644
33337 --- a/drivers/md/dm.c
33338 +++ b/drivers/md/dm.c
33339 @@ -176,9 +176,9 @@ struct mapped_device {
33340 /*
33341 * Event handling.
33342 */
33343 - atomic_t event_nr;
33344 + atomic_unchecked_t event_nr;
33345 wait_queue_head_t eventq;
33346 - atomic_t uevent_seq;
33347 + atomic_unchecked_t uevent_seq;
33348 struct list_head uevent_list;
33349 spinlock_t uevent_lock; /* Protect access to uevent_list */
33350
33351 @@ -1845,8 +1845,8 @@ static struct mapped_device *alloc_dev(int minor)
33352 rwlock_init(&md->map_lock);
33353 atomic_set(&md->holders, 1);
33354 atomic_set(&md->open_count, 0);
33355 - atomic_set(&md->event_nr, 0);
33356 - atomic_set(&md->uevent_seq, 0);
33357 + atomic_set_unchecked(&md->event_nr, 0);
33358 + atomic_set_unchecked(&md->uevent_seq, 0);
33359 INIT_LIST_HEAD(&md->uevent_list);
33360 spin_lock_init(&md->uevent_lock);
33361
33362 @@ -1980,7 +1980,7 @@ static void event_callback(void *context)
33363
33364 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33365
33366 - atomic_inc(&md->event_nr);
33367 + atomic_inc_unchecked(&md->event_nr);
33368 wake_up(&md->eventq);
33369 }
33370
33371 @@ -2622,18 +2622,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33372
33373 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33374 {
33375 - return atomic_add_return(1, &md->uevent_seq);
33376 + return atomic_add_return_unchecked(1, &md->uevent_seq);
33377 }
33378
33379 uint32_t dm_get_event_nr(struct mapped_device *md)
33380 {
33381 - return atomic_read(&md->event_nr);
33382 + return atomic_read_unchecked(&md->event_nr);
33383 }
33384
33385 int dm_wait_event(struct mapped_device *md, int event_nr)
33386 {
33387 return wait_event_interruptible(md->eventq,
33388 - (event_nr != atomic_read(&md->event_nr)));
33389 + (event_nr != atomic_read_unchecked(&md->event_nr)));
33390 }
33391
33392 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33393 diff --git a/drivers/md/md.c b/drivers/md/md.c
33394 index d5ab449..7e9ed7b 100644
33395 --- a/drivers/md/md.c
33396 +++ b/drivers/md/md.c
33397 @@ -277,10 +277,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33398 * start build, activate spare
33399 */
33400 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33401 -static atomic_t md_event_count;
33402 +static atomic_unchecked_t md_event_count;
33403 void md_new_event(struct mddev *mddev)
33404 {
33405 - atomic_inc(&md_event_count);
33406 + atomic_inc_unchecked(&md_event_count);
33407 wake_up(&md_event_waiters);
33408 }
33409 EXPORT_SYMBOL_GPL(md_new_event);
33410 @@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33411 */
33412 static void md_new_event_inintr(struct mddev *mddev)
33413 {
33414 - atomic_inc(&md_event_count);
33415 + atomic_inc_unchecked(&md_event_count);
33416 wake_up(&md_event_waiters);
33417 }
33418
33419 @@ -1565,7 +1565,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33420 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
33421 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
33422 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
33423 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33424 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33425
33426 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33427 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33428 @@ -1809,7 +1809,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33429 else
33430 sb->resync_offset = cpu_to_le64(0);
33431
33432 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33433 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33434
33435 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33436 sb->size = cpu_to_le64(mddev->dev_sectors);
33437 @@ -2803,7 +2803,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33438 static ssize_t
33439 errors_show(struct md_rdev *rdev, char *page)
33440 {
33441 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33442 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33443 }
33444
33445 static ssize_t
33446 @@ -2812,7 +2812,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33447 char *e;
33448 unsigned long n = simple_strtoul(buf, &e, 10);
33449 if (*buf && (*e == 0 || *e == '\n')) {
33450 - atomic_set(&rdev->corrected_errors, n);
33451 + atomic_set_unchecked(&rdev->corrected_errors, n);
33452 return len;
33453 }
33454 return -EINVAL;
33455 @@ -3259,8 +3259,8 @@ int md_rdev_init(struct md_rdev *rdev)
33456 rdev->sb_loaded = 0;
33457 rdev->bb_page = NULL;
33458 atomic_set(&rdev->nr_pending, 0);
33459 - atomic_set(&rdev->read_errors, 0);
33460 - atomic_set(&rdev->corrected_errors, 0);
33461 + atomic_set_unchecked(&rdev->read_errors, 0);
33462 + atomic_set_unchecked(&rdev->corrected_errors, 0);
33463
33464 INIT_LIST_HEAD(&rdev->same_set);
33465 init_waitqueue_head(&rdev->blocked_wait);
33466 @@ -6997,7 +6997,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33467
33468 spin_unlock(&pers_lock);
33469 seq_printf(seq, "\n");
33470 - seq->poll_event = atomic_read(&md_event_count);
33471 + seq->poll_event = atomic_read_unchecked(&md_event_count);
33472 return 0;
33473 }
33474 if (v == (void*)2) {
33475 @@ -7100,7 +7100,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33476 return error;
33477
33478 seq = file->private_data;
33479 - seq->poll_event = atomic_read(&md_event_count);
33480 + seq->poll_event = atomic_read_unchecked(&md_event_count);
33481 return error;
33482 }
33483
33484 @@ -7114,7 +7114,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33485 /* always allow read */
33486 mask = POLLIN | POLLRDNORM;
33487
33488 - if (seq->poll_event != atomic_read(&md_event_count))
33489 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
33490 mask |= POLLERR | POLLPRI;
33491 return mask;
33492 }
33493 @@ -7158,7 +7158,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
33494 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33495 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33496 (int)part_stat_read(&disk->part0, sectors[1]) -
33497 - atomic_read(&disk->sync_io);
33498 + atomic_read_unchecked(&disk->sync_io);
33499 /* sync IO will cause sync_io to increase before the disk_stats
33500 * as sync_io is counted when a request starts, and
33501 * disk_stats is counted when it completes.
33502 diff --git a/drivers/md/md.h b/drivers/md/md.h
33503 index 7b4a3c3..994ad4f 100644
33504 --- a/drivers/md/md.h
33505 +++ b/drivers/md/md.h
33506 @@ -94,13 +94,13 @@ struct md_rdev {
33507 * only maintained for arrays that
33508 * support hot removal
33509 */
33510 - atomic_t read_errors; /* number of consecutive read errors that
33511 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
33512 * we have tried to ignore.
33513 */
33514 struct timespec last_read_error; /* monotonic time since our
33515 * last read error
33516 */
33517 - atomic_t corrected_errors; /* number of corrected read errors,
33518 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33519 * for reporting to userspace and storing
33520 * in superblock.
33521 */
33522 @@ -435,7 +435,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
33523
33524 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33525 {
33526 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33527 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33528 }
33529
33530 struct md_personality
33531 diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
33532 index fc90c11..c8cd9a9 100644
33533 --- a/drivers/md/persistent-data/dm-space-map-checker.c
33534 +++ b/drivers/md/persistent-data/dm-space-map-checker.c
33535 @@ -167,7 +167,7 @@ static int ca_commit(struct count_array *old, struct count_array *new)
33536 /*----------------------------------------------------------------*/
33537
33538 struct sm_checker {
33539 - struct dm_space_map sm;
33540 + dm_space_map_no_const sm;
33541
33542 struct count_array old_counts;
33543 struct count_array counts;
33544 diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
33545 index 3d0ed53..35dc592 100644
33546 --- a/drivers/md/persistent-data/dm-space-map-disk.c
33547 +++ b/drivers/md/persistent-data/dm-space-map-disk.c
33548 @@ -23,7 +23,7 @@
33549 * Space map interface.
33550 */
33551 struct sm_disk {
33552 - struct dm_space_map sm;
33553 + dm_space_map_no_const sm;
33554
33555 struct ll_disk ll;
33556 struct ll_disk old_ll;
33557 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
33558 index e89ae5e..062e4c2 100644
33559 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
33560 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
33561 @@ -43,7 +43,7 @@ struct block_op {
33562 };
33563
33564 struct sm_metadata {
33565 - struct dm_space_map sm;
33566 + dm_space_map_no_const sm;
33567
33568 struct ll_disk ll;
33569 struct ll_disk old_ll;
33570 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
33571 index 1cbfc6b..56e1dbb 100644
33572 --- a/drivers/md/persistent-data/dm-space-map.h
33573 +++ b/drivers/md/persistent-data/dm-space-map.h
33574 @@ -60,6 +60,7 @@ struct dm_space_map {
33575 int (*root_size)(struct dm_space_map *sm, size_t *result);
33576 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
33577 };
33578 +typedef struct dm_space_map __no_const dm_space_map_no_const;
33579
33580 /*----------------------------------------------------------------*/
33581
33582 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
33583 index 53aec45..250851c 100644
33584 --- a/drivers/md/raid1.c
33585 +++ b/drivers/md/raid1.c
33586 @@ -1685,7 +1685,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
33587 if (r1_sync_page_io(rdev, sect, s,
33588 bio->bi_io_vec[idx].bv_page,
33589 READ) != 0)
33590 - atomic_add(s, &rdev->corrected_errors);
33591 + atomic_add_unchecked(s, &rdev->corrected_errors);
33592 }
33593 sectors -= s;
33594 sect += s;
33595 @@ -1907,7 +1907,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
33596 test_bit(In_sync, &rdev->flags)) {
33597 if (r1_sync_page_io(rdev, sect, s,
33598 conf->tmppage, READ)) {
33599 - atomic_add(s, &rdev->corrected_errors);
33600 + atomic_add_unchecked(s, &rdev->corrected_errors);
33601 printk(KERN_INFO
33602 "md/raid1:%s: read error corrected "
33603 "(%d sectors at %llu on %s)\n",
33604 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
33605 index 8da6282..8ec7103 100644
33606 --- a/drivers/md/raid10.c
33607 +++ b/drivers/md/raid10.c
33608 @@ -1784,7 +1784,7 @@ static void end_sync_read(struct bio *bio, int error)
33609 /* The write handler will notice the lack of
33610 * R10BIO_Uptodate and record any errors etc
33611 */
33612 - atomic_add(r10_bio->sectors,
33613 + atomic_add_unchecked(r10_bio->sectors,
33614 &conf->mirrors[d].rdev->corrected_errors);
33615
33616 /* for reconstruct, we always reschedule after a read.
33617 @@ -2133,7 +2133,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33618 {
33619 struct timespec cur_time_mon;
33620 unsigned long hours_since_last;
33621 - unsigned int read_errors = atomic_read(&rdev->read_errors);
33622 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
33623
33624 ktime_get_ts(&cur_time_mon);
33625
33626 @@ -2155,9 +2155,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33627 * overflowing the shift of read_errors by hours_since_last.
33628 */
33629 if (hours_since_last >= 8 * sizeof(read_errors))
33630 - atomic_set(&rdev->read_errors, 0);
33631 + atomic_set_unchecked(&rdev->read_errors, 0);
33632 else
33633 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
33634 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
33635 }
33636
33637 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
33638 @@ -2211,8 +2211,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33639 return;
33640
33641 check_decay_read_errors(mddev, rdev);
33642 - atomic_inc(&rdev->read_errors);
33643 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
33644 + atomic_inc_unchecked(&rdev->read_errors);
33645 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
33646 char b[BDEVNAME_SIZE];
33647 bdevname(rdev->bdev, b);
33648
33649 @@ -2220,7 +2220,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33650 "md/raid10:%s: %s: Raid device exceeded "
33651 "read_error threshold [cur %d:max %d]\n",
33652 mdname(mddev), b,
33653 - atomic_read(&rdev->read_errors), max_read_errors);
33654 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
33655 printk(KERN_NOTICE
33656 "md/raid10:%s: %s: Failing raid device\n",
33657 mdname(mddev), b);
33658 @@ -2375,7 +2375,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33659 sect +
33660 choose_data_offset(r10_bio, rdev)),
33661 bdevname(rdev->bdev, b));
33662 - atomic_add(s, &rdev->corrected_errors);
33663 + atomic_add_unchecked(s, &rdev->corrected_errors);
33664 }
33665
33666 rdev_dec_pending(rdev, mddev);
33667 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
33668 index 04348d7..62a4b9b 100644
33669 --- a/drivers/md/raid5.c
33670 +++ b/drivers/md/raid5.c
33671 @@ -1736,19 +1736,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
33672 mdname(conf->mddev), STRIPE_SECTORS,
33673 (unsigned long long)s,
33674 bdevname(rdev->bdev, b));
33675 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
33676 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
33677 clear_bit(R5_ReadError, &sh->dev[i].flags);
33678 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33679 }
33680 - if (atomic_read(&rdev->read_errors))
33681 - atomic_set(&rdev->read_errors, 0);
33682 + if (atomic_read_unchecked(&rdev->read_errors))
33683 + atomic_set_unchecked(&rdev->read_errors, 0);
33684 } else {
33685 const char *bdn = bdevname(rdev->bdev, b);
33686 int retry = 0;
33687 int set_bad = 0;
33688
33689 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33690 - atomic_inc(&rdev->read_errors);
33691 + atomic_inc_unchecked(&rdev->read_errors);
33692 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
33693 printk_ratelimited(
33694 KERN_WARNING
33695 @@ -1776,7 +1776,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
33696 mdname(conf->mddev),
33697 (unsigned long long)s,
33698 bdn);
33699 - } else if (atomic_read(&rdev->read_errors)
33700 + } else if (atomic_read_unchecked(&rdev->read_errors)
33701 > conf->max_nr_stripes)
33702 printk(KERN_WARNING
33703 "md/raid:%s: Too many read errors, failing device %s.\n",
33704 diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
33705 index 131b938..8572ed1 100644
33706 --- a/drivers/media/dvb/ddbridge/ddbridge-core.c
33707 +++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
33708 @@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
33709 .subvendor = _subvend, .subdevice = _subdev, \
33710 .driver_data = (unsigned long)&_driverdata }
33711
33712 -static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
33713 +static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
33714 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
33715 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
33716 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
33717 diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
33718 index fa7188a..04a045e 100644
33719 --- a/drivers/media/dvb/dvb-core/dvb_demux.h
33720 +++ b/drivers/media/dvb/dvb-core/dvb_demux.h
33721 @@ -73,7 +73,7 @@ struct dvb_demux_feed {
33722 union {
33723 dmx_ts_cb ts;
33724 dmx_section_cb sec;
33725 - } cb;
33726 + } __no_const cb;
33727
33728 struct dvb_demux *demux;
33729 void *priv;
33730 diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
33731 index 39eab73..60033e7 100644
33732 --- a/drivers/media/dvb/dvb-core/dvbdev.c
33733 +++ b/drivers/media/dvb/dvb-core/dvbdev.c
33734 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
33735 const struct dvb_device *template, void *priv, int type)
33736 {
33737 struct dvb_device *dvbdev;
33738 - struct file_operations *dvbdevfops;
33739 + file_operations_no_const *dvbdevfops;
33740 struct device *clsdev;
33741 int minor;
33742 int id;
33743 diff --git a/drivers/media/dvb/dvb-usb/az6007.c b/drivers/media/dvb/dvb-usb/az6007.c
33744 index 4008b9c..ce714f5 100644
33745 --- a/drivers/media/dvb/dvb-usb/az6007.c
33746 +++ b/drivers/media/dvb/dvb-usb/az6007.c
33747 @@ -590,7 +590,7 @@ static int az6007_read_mac_addr(struct dvb_usb_device *d, u8 mac[6])
33748 int ret;
33749
33750 ret = az6007_read(d, AZ6007_READ_DATA, 6, 0, st->data, 6);
33751 - memcpy(mac, st->data, sizeof(mac));
33752 + memcpy(mac, st->data, 6);
33753
33754 if (ret > 0)
33755 deb_info("%s: mac is %02x:%02x:%02x:%02x:%02x:%02x\n",
33756 diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
33757 index 3940bb0..fb3952a 100644
33758 --- a/drivers/media/dvb/dvb-usb/cxusb.c
33759 +++ b/drivers/media/dvb/dvb-usb/cxusb.c
33760 @@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
33761
33762 struct dib0700_adapter_state {
33763 int (*set_param_save) (struct dvb_frontend *);
33764 -};
33765 +} __no_const;
33766
33767 static int dib7070_set_param_override(struct dvb_frontend *fe)
33768 {
33769 diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
33770 index 9382895..ac8093c 100644
33771 --- a/drivers/media/dvb/dvb-usb/dw2102.c
33772 +++ b/drivers/media/dvb/dvb-usb/dw2102.c
33773 @@ -95,7 +95,7 @@ struct su3000_state {
33774
33775 struct s6x0_state {
33776 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
33777 -};
33778 +} __no_const;
33779
33780 /* debug */
33781 static int dvb_usb_dw2102_debug;
33782 diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
33783 index 404f63a..4796533 100644
33784 --- a/drivers/media/dvb/frontends/dib3000.h
33785 +++ b/drivers/media/dvb/frontends/dib3000.h
33786 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33787 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33788 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33789 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33790 -};
33791 +} __no_const;
33792
33793 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33794 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33795 diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
33796 index 7539a5d..06531a6 100644
33797 --- a/drivers/media/dvb/ngene/ngene-cards.c
33798 +++ b/drivers/media/dvb/ngene/ngene-cards.c
33799 @@ -478,7 +478,7 @@ static struct ngene_info ngene_info_m780 = {
33800
33801 /****************************************************************************/
33802
33803 -static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
33804 +static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
33805 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
33806 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
33807 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
33808 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
33809 index 16a089f..1661b11 100644
33810 --- a/drivers/media/radio/radio-cadet.c
33811 +++ b/drivers/media/radio/radio-cadet.c
33812 @@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33813 unsigned char readbuf[RDS_BUFFER];
33814 int i = 0;
33815
33816 + if (count > RDS_BUFFER)
33817 + return -EFAULT;
33818 mutex_lock(&dev->lock);
33819 if (dev->rdsstat == 0) {
33820 dev->rdsstat = 1;
33821 @@ -347,7 +349,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33822 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
33823 mutex_unlock(&dev->lock);
33824
33825 - if (copy_to_user(data, readbuf, i))
33826 + if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
33827 return -EFAULT;
33828 return i;
33829 }
33830 diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
33831 index 9cde353..8c6a1c3 100644
33832 --- a/drivers/media/video/au0828/au0828.h
33833 +++ b/drivers/media/video/au0828/au0828.h
33834 @@ -191,7 +191,7 @@ struct au0828_dev {
33835
33836 /* I2C */
33837 struct i2c_adapter i2c_adap;
33838 - struct i2c_algorithm i2c_algo;
33839 + i2c_algorithm_no_const i2c_algo;
33840 struct i2c_client i2c_client;
33841 u32 i2c_rc;
33842
33843 diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
33844 index 04bf662..e0ac026 100644
33845 --- a/drivers/media/video/cx88/cx88-alsa.c
33846 +++ b/drivers/media/video/cx88/cx88-alsa.c
33847 @@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
33848 * Only boards with eeprom and byte 1 at eeprom=1 have it
33849 */
33850
33851 -static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
33852 +static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
33853 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33854 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33855 {0, }
33856 diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
33857 index 88cf9d9..bbc4b2c 100644
33858 --- a/drivers/media/video/omap/omap_vout.c
33859 +++ b/drivers/media/video/omap/omap_vout.c
33860 @@ -64,7 +64,6 @@ enum omap_vout_channels {
33861 OMAP_VIDEO2,
33862 };
33863
33864 -static struct videobuf_queue_ops video_vbq_ops;
33865 /* Variables configurable through module params*/
33866 static u32 video1_numbuffers = 3;
33867 static u32 video2_numbuffers = 3;
33868 @@ -1000,6 +999,12 @@ static int omap_vout_open(struct file *file)
33869 {
33870 struct videobuf_queue *q;
33871 struct omap_vout_device *vout = NULL;
33872 + static struct videobuf_queue_ops video_vbq_ops = {
33873 + .buf_setup = omap_vout_buffer_setup,
33874 + .buf_prepare = omap_vout_buffer_prepare,
33875 + .buf_release = omap_vout_buffer_release,
33876 + .buf_queue = omap_vout_buffer_queue,
33877 + };
33878
33879 vout = video_drvdata(file);
33880 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
33881 @@ -1017,10 +1022,6 @@ static int omap_vout_open(struct file *file)
33882 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
33883
33884 q = &vout->vbq;
33885 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
33886 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
33887 - video_vbq_ops.buf_release = omap_vout_buffer_release;
33888 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
33889 spin_lock_init(&vout->vbq_lock);
33890
33891 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
33892 diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33893 index 036952f..80d356d 100644
33894 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33895 +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33896 @@ -196,7 +196,7 @@ struct pvr2_hdw {
33897
33898 /* I2C stuff */
33899 struct i2c_adapter i2c_adap;
33900 - struct i2c_algorithm i2c_algo;
33901 + i2c_algorithm_no_const i2c_algo;
33902 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
33903 int i2c_cx25840_hack_state;
33904 int i2c_linked;
33905 diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
33906 index 02194c0..091733b 100644
33907 --- a/drivers/media/video/timblogiw.c
33908 +++ b/drivers/media/video/timblogiw.c
33909 @@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
33910
33911 /* Platform device functions */
33912
33913 -static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33914 +static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
33915 .vidioc_querycap = timblogiw_querycap,
33916 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
33917 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
33918 @@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33919 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
33920 };
33921
33922 -static __devinitconst struct v4l2_file_operations timblogiw_fops = {
33923 +static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
33924 .owner = THIS_MODULE,
33925 .open = timblogiw_open,
33926 .release = timblogiw_close,
33927 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
33928 index d99db56..a16b959 100644
33929 --- a/drivers/message/fusion/mptbase.c
33930 +++ b/drivers/message/fusion/mptbase.c
33931 @@ -6751,8 +6751,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
33932 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
33933 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
33934
33935 +#ifdef CONFIG_GRKERNSEC_HIDESYM
33936 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
33937 +#else
33938 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
33939 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
33940 +#endif
33941 +
33942 /*
33943 * Rounding UP to nearest 4-kB boundary here...
33944 */
33945 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
33946 index 551262e..7551198 100644
33947 --- a/drivers/message/fusion/mptsas.c
33948 +++ b/drivers/message/fusion/mptsas.c
33949 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
33950 return 0;
33951 }
33952
33953 +static inline void
33954 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
33955 +{
33956 + if (phy_info->port_details) {
33957 + phy_info->port_details->rphy = rphy;
33958 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
33959 + ioc->name, rphy));
33960 + }
33961 +
33962 + if (rphy) {
33963 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
33964 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
33965 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
33966 + ioc->name, rphy, rphy->dev.release));
33967 + }
33968 +}
33969 +
33970 /* no mutex */
33971 static void
33972 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
33973 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
33974 return NULL;
33975 }
33976
33977 -static inline void
33978 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
33979 -{
33980 - if (phy_info->port_details) {
33981 - phy_info->port_details->rphy = rphy;
33982 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
33983 - ioc->name, rphy));
33984 - }
33985 -
33986 - if (rphy) {
33987 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
33988 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
33989 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
33990 - ioc->name, rphy, rphy->dev.release));
33991 - }
33992 -}
33993 -
33994 static inline struct sas_port *
33995 mptsas_get_port(struct mptsas_phyinfo *phy_info)
33996 {
33997 diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
33998 index 0c3ced7..1fe34ec 100644
33999 --- a/drivers/message/fusion/mptscsih.c
34000 +++ b/drivers/message/fusion/mptscsih.c
34001 @@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
34002
34003 h = shost_priv(SChost);
34004
34005 - if (h) {
34006 - if (h->info_kbuf == NULL)
34007 - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34008 - return h->info_kbuf;
34009 - h->info_kbuf[0] = '\0';
34010 + if (!h)
34011 + return NULL;
34012
34013 - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34014 - h->info_kbuf[size-1] = '\0';
34015 - }
34016 + if (h->info_kbuf == NULL)
34017 + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34018 + return h->info_kbuf;
34019 + h->info_kbuf[0] = '\0';
34020 +
34021 + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34022 + h->info_kbuf[size-1] = '\0';
34023
34024 return h->info_kbuf;
34025 }
34026 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34027 index 506c36f..b137580 100644
34028 --- a/drivers/message/i2o/i2o_proc.c
34029 +++ b/drivers/message/i2o/i2o_proc.c
34030 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
34031 "Array Controller Device"
34032 };
34033
34034 -static char *chtostr(u8 * chars, int n)
34035 -{
34036 - char tmp[256];
34037 - tmp[0] = 0;
34038 - return strncat(tmp, (char *)chars, n);
34039 -}
34040 -
34041 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34042 char *group)
34043 {
34044 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34045
34046 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34047 seq_printf(seq, "%-#8x", ddm_table.module_id);
34048 - seq_printf(seq, "%-29s",
34049 - chtostr(ddm_table.module_name_version, 28));
34050 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34051 seq_printf(seq, "%9d ", ddm_table.data_size);
34052 seq_printf(seq, "%8d", ddm_table.code_size);
34053
34054 @@ -927,8 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34055
34056 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34057 seq_printf(seq, "%-#8x", dst->module_id);
34058 - seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
34059 - seq_printf(seq, "%-9s", chtostr(dst->date, 8));
34060 + seq_printf(seq, "%-.28s", dst->module_name_version);
34061 + seq_printf(seq, "%-.8s", dst->date);
34062 seq_printf(seq, "%8d ", dst->module_size);
34063 seq_printf(seq, "%8d ", dst->mpb_size);
34064 seq_printf(seq, "0x%04x", dst->module_flags);
34065 @@ -1259,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34066 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34067 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34068 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34069 - seq_printf(seq, "Vendor info : %s\n",
34070 - chtostr((u8 *) (work32 + 2), 16));
34071 - seq_printf(seq, "Product info : %s\n",
34072 - chtostr((u8 *) (work32 + 6), 16));
34073 - seq_printf(seq, "Description : %s\n",
34074 - chtostr((u8 *) (work32 + 10), 16));
34075 - seq_printf(seq, "Product rev. : %s\n",
34076 - chtostr((u8 *) (work32 + 14), 8));
34077 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34078 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34079 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34080 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34081
34082 seq_printf(seq, "Serial number : ");
34083 print_serial_number(seq, (u8 *) (work32 + 16),
34084 @@ -1311,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34085 }
34086
34087 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34088 - seq_printf(seq, "Module name : %s\n",
34089 - chtostr(result.module_name, 24));
34090 - seq_printf(seq, "Module revision : %s\n",
34091 - chtostr(result.module_rev, 8));
34092 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
34093 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34094
34095 seq_printf(seq, "Serial number : ");
34096 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34097 @@ -1345,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34098 return 0;
34099 }
34100
34101 - seq_printf(seq, "Device name : %s\n",
34102 - chtostr(result.device_name, 64));
34103 - seq_printf(seq, "Service name : %s\n",
34104 - chtostr(result.service_name, 64));
34105 - seq_printf(seq, "Physical name : %s\n",
34106 - chtostr(result.physical_location, 64));
34107 - seq_printf(seq, "Instance number : %s\n",
34108 - chtostr(result.instance_number, 4));
34109 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
34110 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
34111 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34112 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34113
34114 return 0;
34115 }
34116 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34117 index a8c08f3..155fe3d 100644
34118 --- a/drivers/message/i2o/iop.c
34119 +++ b/drivers/message/i2o/iop.c
34120 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34121
34122 spin_lock_irqsave(&c->context_list_lock, flags);
34123
34124 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34125 - atomic_inc(&c->context_list_counter);
34126 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34127 + atomic_inc_unchecked(&c->context_list_counter);
34128
34129 - entry->context = atomic_read(&c->context_list_counter);
34130 + entry->context = atomic_read_unchecked(&c->context_list_counter);
34131
34132 list_add(&entry->list, &c->context_list);
34133
34134 @@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34135
34136 #if BITS_PER_LONG == 64
34137 spin_lock_init(&c->context_list_lock);
34138 - atomic_set(&c->context_list_counter, 0);
34139 + atomic_set_unchecked(&c->context_list_counter, 0);
34140 INIT_LIST_HEAD(&c->context_list);
34141 #endif
34142
34143 diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34144 index 7ce65f4..e66e9bc 100644
34145 --- a/drivers/mfd/abx500-core.c
34146 +++ b/drivers/mfd/abx500-core.c
34147 @@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34148
34149 struct abx500_device_entry {
34150 struct list_head list;
34151 - struct abx500_ops ops;
34152 + abx500_ops_no_const ops;
34153 struct device *dev;
34154 };
34155
34156 diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34157 index 2ea9998..51dabee 100644
34158 --- a/drivers/mfd/janz-cmodio.c
34159 +++ b/drivers/mfd/janz-cmodio.c
34160 @@ -13,6 +13,7 @@
34161
34162 #include <linux/kernel.h>
34163 #include <linux/module.h>
34164 +#include <linux/slab.h>
34165 #include <linux/init.h>
34166 #include <linux/pci.h>
34167 #include <linux/interrupt.h>
34168 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34169 index a981e2a..5ca0c8b 100644
34170 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
34171 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34172 @@ -466,7 +466,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34173 * the lid is closed. This leads to interrupts as soon as a little move
34174 * is done.
34175 */
34176 - atomic_inc(&lis3->count);
34177 + atomic_inc_unchecked(&lis3->count);
34178
34179 wake_up_interruptible(&lis3->misc_wait);
34180 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34181 @@ -552,7 +552,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34182 if (lis3->pm_dev)
34183 pm_runtime_get_sync(lis3->pm_dev);
34184
34185 - atomic_set(&lis3->count, 0);
34186 + atomic_set_unchecked(&lis3->count, 0);
34187 return 0;
34188 }
34189
34190 @@ -585,7 +585,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34191 add_wait_queue(&lis3->misc_wait, &wait);
34192 while (true) {
34193 set_current_state(TASK_INTERRUPTIBLE);
34194 - data = atomic_xchg(&lis3->count, 0);
34195 + data = atomic_xchg_unchecked(&lis3->count, 0);
34196 if (data)
34197 break;
34198
34199 @@ -626,7 +626,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34200 struct lis3lv02d, miscdev);
34201
34202 poll_wait(file, &lis3->misc_wait, wait);
34203 - if (atomic_read(&lis3->count))
34204 + if (atomic_read_unchecked(&lis3->count))
34205 return POLLIN | POLLRDNORM;
34206 return 0;
34207 }
34208 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34209 index 2b1482a..5d33616 100644
34210 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
34211 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34212 @@ -266,7 +266,7 @@ struct lis3lv02d {
34213 struct input_polled_dev *idev; /* input device */
34214 struct platform_device *pdev; /* platform device */
34215 struct regulator_bulk_data regulators[2];
34216 - atomic_t count; /* interrupt count after last read */
34217 + atomic_unchecked_t count; /* interrupt count after last read */
34218 union axis_conversion ac; /* hw -> logical axis */
34219 int mapped_btns[3];
34220
34221 diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
34222 index 28adefe..08aad69 100644
34223 --- a/drivers/misc/lkdtm.c
34224 +++ b/drivers/misc/lkdtm.c
34225 @@ -477,6 +477,8 @@ static ssize_t lkdtm_debugfs_read(struct file *f, char __user *user_buf,
34226 int i, n, out;
34227
34228 buf = (char *)__get_free_page(GFP_KERNEL);
34229 + if (buf == NULL)
34230 + return -ENOMEM;
34231
34232 n = snprintf(buf, PAGE_SIZE, "Available crash types:\n");
34233 for (i = 0; i < ARRAY_SIZE(cp_type); i++)
34234 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34235 index 2f30bad..c4c13d0 100644
34236 --- a/drivers/misc/sgi-gru/gruhandles.c
34237 +++ b/drivers/misc/sgi-gru/gruhandles.c
34238 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34239 unsigned long nsec;
34240
34241 nsec = CLKS2NSEC(clks);
34242 - atomic_long_inc(&mcs_op_statistics[op].count);
34243 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
34244 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34245 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34246 if (mcs_op_statistics[op].max < nsec)
34247 mcs_op_statistics[op].max = nsec;
34248 }
34249 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34250 index 950dbe9..eeef0f8 100644
34251 --- a/drivers/misc/sgi-gru/gruprocfs.c
34252 +++ b/drivers/misc/sgi-gru/gruprocfs.c
34253 @@ -32,9 +32,9 @@
34254
34255 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34256
34257 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34258 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34259 {
34260 - unsigned long val = atomic_long_read(v);
34261 + unsigned long val = atomic_long_read_unchecked(v);
34262
34263 seq_printf(s, "%16lu %s\n", val, id);
34264 }
34265 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34266
34267 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34268 for (op = 0; op < mcsop_last; op++) {
34269 - count = atomic_long_read(&mcs_op_statistics[op].count);
34270 - total = atomic_long_read(&mcs_op_statistics[op].total);
34271 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34272 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34273 max = mcs_op_statistics[op].max;
34274 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34275 count ? total / count : 0, max);
34276 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34277 index 5c3ce24..4915ccb 100644
34278 --- a/drivers/misc/sgi-gru/grutables.h
34279 +++ b/drivers/misc/sgi-gru/grutables.h
34280 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34281 * GRU statistics.
34282 */
34283 struct gru_stats_s {
34284 - atomic_long_t vdata_alloc;
34285 - atomic_long_t vdata_free;
34286 - atomic_long_t gts_alloc;
34287 - atomic_long_t gts_free;
34288 - atomic_long_t gms_alloc;
34289 - atomic_long_t gms_free;
34290 - atomic_long_t gts_double_allocate;
34291 - atomic_long_t assign_context;
34292 - atomic_long_t assign_context_failed;
34293 - atomic_long_t free_context;
34294 - atomic_long_t load_user_context;
34295 - atomic_long_t load_kernel_context;
34296 - atomic_long_t lock_kernel_context;
34297 - atomic_long_t unlock_kernel_context;
34298 - atomic_long_t steal_user_context;
34299 - atomic_long_t steal_kernel_context;
34300 - atomic_long_t steal_context_failed;
34301 - atomic_long_t nopfn;
34302 - atomic_long_t asid_new;
34303 - atomic_long_t asid_next;
34304 - atomic_long_t asid_wrap;
34305 - atomic_long_t asid_reuse;
34306 - atomic_long_t intr;
34307 - atomic_long_t intr_cbr;
34308 - atomic_long_t intr_tfh;
34309 - atomic_long_t intr_spurious;
34310 - atomic_long_t intr_mm_lock_failed;
34311 - atomic_long_t call_os;
34312 - atomic_long_t call_os_wait_queue;
34313 - atomic_long_t user_flush_tlb;
34314 - atomic_long_t user_unload_context;
34315 - atomic_long_t user_exception;
34316 - atomic_long_t set_context_option;
34317 - atomic_long_t check_context_retarget_intr;
34318 - atomic_long_t check_context_unload;
34319 - atomic_long_t tlb_dropin;
34320 - atomic_long_t tlb_preload_page;
34321 - atomic_long_t tlb_dropin_fail_no_asid;
34322 - atomic_long_t tlb_dropin_fail_upm;
34323 - atomic_long_t tlb_dropin_fail_invalid;
34324 - atomic_long_t tlb_dropin_fail_range_active;
34325 - atomic_long_t tlb_dropin_fail_idle;
34326 - atomic_long_t tlb_dropin_fail_fmm;
34327 - atomic_long_t tlb_dropin_fail_no_exception;
34328 - atomic_long_t tfh_stale_on_fault;
34329 - atomic_long_t mmu_invalidate_range;
34330 - atomic_long_t mmu_invalidate_page;
34331 - atomic_long_t flush_tlb;
34332 - atomic_long_t flush_tlb_gru;
34333 - atomic_long_t flush_tlb_gru_tgh;
34334 - atomic_long_t flush_tlb_gru_zero_asid;
34335 + atomic_long_unchecked_t vdata_alloc;
34336 + atomic_long_unchecked_t vdata_free;
34337 + atomic_long_unchecked_t gts_alloc;
34338 + atomic_long_unchecked_t gts_free;
34339 + atomic_long_unchecked_t gms_alloc;
34340 + atomic_long_unchecked_t gms_free;
34341 + atomic_long_unchecked_t gts_double_allocate;
34342 + atomic_long_unchecked_t assign_context;
34343 + atomic_long_unchecked_t assign_context_failed;
34344 + atomic_long_unchecked_t free_context;
34345 + atomic_long_unchecked_t load_user_context;
34346 + atomic_long_unchecked_t load_kernel_context;
34347 + atomic_long_unchecked_t lock_kernel_context;
34348 + atomic_long_unchecked_t unlock_kernel_context;
34349 + atomic_long_unchecked_t steal_user_context;
34350 + atomic_long_unchecked_t steal_kernel_context;
34351 + atomic_long_unchecked_t steal_context_failed;
34352 + atomic_long_unchecked_t nopfn;
34353 + atomic_long_unchecked_t asid_new;
34354 + atomic_long_unchecked_t asid_next;
34355 + atomic_long_unchecked_t asid_wrap;
34356 + atomic_long_unchecked_t asid_reuse;
34357 + atomic_long_unchecked_t intr;
34358 + atomic_long_unchecked_t intr_cbr;
34359 + atomic_long_unchecked_t intr_tfh;
34360 + atomic_long_unchecked_t intr_spurious;
34361 + atomic_long_unchecked_t intr_mm_lock_failed;
34362 + atomic_long_unchecked_t call_os;
34363 + atomic_long_unchecked_t call_os_wait_queue;
34364 + atomic_long_unchecked_t user_flush_tlb;
34365 + atomic_long_unchecked_t user_unload_context;
34366 + atomic_long_unchecked_t user_exception;
34367 + atomic_long_unchecked_t set_context_option;
34368 + atomic_long_unchecked_t check_context_retarget_intr;
34369 + atomic_long_unchecked_t check_context_unload;
34370 + atomic_long_unchecked_t tlb_dropin;
34371 + atomic_long_unchecked_t tlb_preload_page;
34372 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34373 + atomic_long_unchecked_t tlb_dropin_fail_upm;
34374 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
34375 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
34376 + atomic_long_unchecked_t tlb_dropin_fail_idle;
34377 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
34378 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34379 + atomic_long_unchecked_t tfh_stale_on_fault;
34380 + atomic_long_unchecked_t mmu_invalidate_range;
34381 + atomic_long_unchecked_t mmu_invalidate_page;
34382 + atomic_long_unchecked_t flush_tlb;
34383 + atomic_long_unchecked_t flush_tlb_gru;
34384 + atomic_long_unchecked_t flush_tlb_gru_tgh;
34385 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34386
34387 - atomic_long_t copy_gpa;
34388 - atomic_long_t read_gpa;
34389 + atomic_long_unchecked_t copy_gpa;
34390 + atomic_long_unchecked_t read_gpa;
34391
34392 - atomic_long_t mesq_receive;
34393 - atomic_long_t mesq_receive_none;
34394 - atomic_long_t mesq_send;
34395 - atomic_long_t mesq_send_failed;
34396 - atomic_long_t mesq_noop;
34397 - atomic_long_t mesq_send_unexpected_error;
34398 - atomic_long_t mesq_send_lb_overflow;
34399 - atomic_long_t mesq_send_qlimit_reached;
34400 - atomic_long_t mesq_send_amo_nacked;
34401 - atomic_long_t mesq_send_put_nacked;
34402 - atomic_long_t mesq_page_overflow;
34403 - atomic_long_t mesq_qf_locked;
34404 - atomic_long_t mesq_qf_noop_not_full;
34405 - atomic_long_t mesq_qf_switch_head_failed;
34406 - atomic_long_t mesq_qf_unexpected_error;
34407 - atomic_long_t mesq_noop_unexpected_error;
34408 - atomic_long_t mesq_noop_lb_overflow;
34409 - atomic_long_t mesq_noop_qlimit_reached;
34410 - atomic_long_t mesq_noop_amo_nacked;
34411 - atomic_long_t mesq_noop_put_nacked;
34412 - atomic_long_t mesq_noop_page_overflow;
34413 + atomic_long_unchecked_t mesq_receive;
34414 + atomic_long_unchecked_t mesq_receive_none;
34415 + atomic_long_unchecked_t mesq_send;
34416 + atomic_long_unchecked_t mesq_send_failed;
34417 + atomic_long_unchecked_t mesq_noop;
34418 + atomic_long_unchecked_t mesq_send_unexpected_error;
34419 + atomic_long_unchecked_t mesq_send_lb_overflow;
34420 + atomic_long_unchecked_t mesq_send_qlimit_reached;
34421 + atomic_long_unchecked_t mesq_send_amo_nacked;
34422 + atomic_long_unchecked_t mesq_send_put_nacked;
34423 + atomic_long_unchecked_t mesq_page_overflow;
34424 + atomic_long_unchecked_t mesq_qf_locked;
34425 + atomic_long_unchecked_t mesq_qf_noop_not_full;
34426 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
34427 + atomic_long_unchecked_t mesq_qf_unexpected_error;
34428 + atomic_long_unchecked_t mesq_noop_unexpected_error;
34429 + atomic_long_unchecked_t mesq_noop_lb_overflow;
34430 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
34431 + atomic_long_unchecked_t mesq_noop_amo_nacked;
34432 + atomic_long_unchecked_t mesq_noop_put_nacked;
34433 + atomic_long_unchecked_t mesq_noop_page_overflow;
34434
34435 };
34436
34437 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34438 tghop_invalidate, mcsop_last};
34439
34440 struct mcs_op_statistic {
34441 - atomic_long_t count;
34442 - atomic_long_t total;
34443 + atomic_long_unchecked_t count;
34444 + atomic_long_unchecked_t total;
34445 unsigned long max;
34446 };
34447
34448 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34449
34450 #define STAT(id) do { \
34451 if (gru_options & OPT_STATS) \
34452 - atomic_long_inc(&gru_stats.id); \
34453 + atomic_long_inc_unchecked(&gru_stats.id); \
34454 } while (0)
34455
34456 #ifdef CONFIG_SGI_GRU_DEBUG
34457 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34458 index c862cd4..0d176fe 100644
34459 --- a/drivers/misc/sgi-xp/xp.h
34460 +++ b/drivers/misc/sgi-xp/xp.h
34461 @@ -288,7 +288,7 @@ struct xpc_interface {
34462 xpc_notify_func, void *);
34463 void (*received) (short, int, void *);
34464 enum xp_retval (*partid_to_nasids) (short, void *);
34465 -};
34466 +} __no_const;
34467
34468 extern struct xpc_interface xpc_interface;
34469
34470 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
34471 index b94d5f7..7f494c5 100644
34472 --- a/drivers/misc/sgi-xp/xpc.h
34473 +++ b/drivers/misc/sgi-xp/xpc.h
34474 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
34475 void (*received_payload) (struct xpc_channel *, void *);
34476 void (*notify_senders_of_disconnect) (struct xpc_channel *);
34477 };
34478 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
34479
34480 /* struct xpc_partition act_state values (for XPC HB) */
34481
34482 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
34483 /* found in xpc_main.c */
34484 extern struct device *xpc_part;
34485 extern struct device *xpc_chan;
34486 -extern struct xpc_arch_operations xpc_arch_ops;
34487 +extern xpc_arch_operations_no_const xpc_arch_ops;
34488 extern int xpc_disengage_timelimit;
34489 extern int xpc_disengage_timedout;
34490 extern int xpc_activate_IRQ_rcvd;
34491 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
34492 index 8d082b4..aa749ae 100644
34493 --- a/drivers/misc/sgi-xp/xpc_main.c
34494 +++ b/drivers/misc/sgi-xp/xpc_main.c
34495 @@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
34496 .notifier_call = xpc_system_die,
34497 };
34498
34499 -struct xpc_arch_operations xpc_arch_ops;
34500 +xpc_arch_operations_no_const xpc_arch_ops;
34501
34502 /*
34503 * Timer function to enforce the timelimit on the partition disengage.
34504 diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
34505 index 2b62232..acfaeeb 100644
34506 --- a/drivers/misc/ti-st/st_core.c
34507 +++ b/drivers/misc/ti-st/st_core.c
34508 @@ -349,6 +349,11 @@ void st_int_recv(void *disc_data,
34509 st_gdata->rx_skb = alloc_skb(
34510 st_gdata->list[type]->max_frame_size,
34511 GFP_ATOMIC);
34512 + if (st_gdata->rx_skb == NULL) {
34513 + pr_err("out of memory: dropping\n");
34514 + goto done;
34515 + }
34516 +
34517 skb_reserve(st_gdata->rx_skb,
34518 st_gdata->list[type]->reserve);
34519 /* next 2 required for BT only */
34520 diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
34521 index 504da71..9722d43 100644
34522 --- a/drivers/mmc/host/sdhci-pci.c
34523 +++ b/drivers/mmc/host/sdhci-pci.c
34524 @@ -653,7 +653,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
34525 .probe = via_probe,
34526 };
34527
34528 -static const struct pci_device_id pci_ids[] __devinitdata = {
34529 +static const struct pci_device_id pci_ids[] __devinitconst = {
34530 {
34531 .vendor = PCI_VENDOR_ID_RICOH,
34532 .device = PCI_DEVICE_ID_RICOH_R5C822,
34533 diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
34534 index a4eb8b5..8c0628f 100644
34535 --- a/drivers/mtd/devices/doc2000.c
34536 +++ b/drivers/mtd/devices/doc2000.c
34537 @@ -753,7 +753,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
34538
34539 /* The ECC will not be calculated correctly if less than 512 is written */
34540 /* DBB-
34541 - if (len != 0x200 && eccbuf)
34542 + if (len != 0x200)
34543 printk(KERN_WARNING
34544 "ECC needs a full sector write (adr: %lx size %lx)\n",
34545 (long) to, (long) len);
34546 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
34547 index 0650aaf..7718762 100644
34548 --- a/drivers/mtd/nand/denali.c
34549 +++ b/drivers/mtd/nand/denali.c
34550 @@ -26,6 +26,7 @@
34551 #include <linux/pci.h>
34552 #include <linux/mtd/mtd.h>
34553 #include <linux/module.h>
34554 +#include <linux/slab.h>
34555
34556 #include "denali.h"
34557
34558 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
34559 index 51b9d6a..52af9a7 100644
34560 --- a/drivers/mtd/nftlmount.c
34561 +++ b/drivers/mtd/nftlmount.c
34562 @@ -24,6 +24,7 @@
34563 #include <asm/errno.h>
34564 #include <linux/delay.h>
34565 #include <linux/slab.h>
34566 +#include <linux/sched.h>
34567 #include <linux/mtd/mtd.h>
34568 #include <linux/mtd/nand.h>
34569 #include <linux/mtd/nftl.h>
34570 diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
34571 index 6762dc4..9956862 100644
34572 --- a/drivers/net/ethernet/atheros/atlx/atl2.c
34573 +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
34574 @@ -2859,7 +2859,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
34575 */
34576
34577 #define ATL2_PARAM(X, desc) \
34578 - static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34579 + static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34580 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
34581 MODULE_PARM_DESC(X, desc);
34582 #else
34583 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34584 index efd80bd..21fcff0 100644
34585 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34586 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34587 @@ -487,7 +487,7 @@ struct bnx2x_rx_mode_obj {
34588
34589 int (*wait_comp)(struct bnx2x *bp,
34590 struct bnx2x_rx_mode_ramrod_params *p);
34591 -};
34592 +} __no_const;
34593
34594 /********************** Set multicast group ***********************************/
34595
34596 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
34597 index 93865f8..5448741 100644
34598 --- a/drivers/net/ethernet/broadcom/tg3.h
34599 +++ b/drivers/net/ethernet/broadcom/tg3.h
34600 @@ -140,6 +140,7 @@
34601 #define CHIPREV_ID_5750_A0 0x4000
34602 #define CHIPREV_ID_5750_A1 0x4001
34603 #define CHIPREV_ID_5750_A3 0x4003
34604 +#define CHIPREV_ID_5750_C1 0x4201
34605 #define CHIPREV_ID_5750_C2 0x4202
34606 #define CHIPREV_ID_5752_A0_HW 0x5000
34607 #define CHIPREV_ID_5752_A0 0x6000
34608 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34609 index c4e8643..0979484 100644
34610 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34611 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34612 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
34613 */
34614 struct l2t_skb_cb {
34615 arp_failure_handler_func arp_failure_handler;
34616 -};
34617 +} __no_const;
34618
34619 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34620
34621 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
34622 index d3cd489..0fd52dd 100644
34623 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
34624 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
34625 @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34626 for (i=0; i<ETH_ALEN; i++) {
34627 tmp.addr[i] = dev->dev_addr[i];
34628 }
34629 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34630 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34631 break;
34632
34633 case DE4X5_SET_HWADDR: /* Set the hardware address */
34634 @@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34635 spin_lock_irqsave(&lp->lock, flags);
34636 memcpy(&statbuf, &lp->pktStats, ioc->len);
34637 spin_unlock_irqrestore(&lp->lock, flags);
34638 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
34639 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
34640 return -EFAULT;
34641 break;
34642 }
34643 diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
34644 index ed7d1dc..d426748 100644
34645 --- a/drivers/net/ethernet/dec/tulip/eeprom.c
34646 +++ b/drivers/net/ethernet/dec/tulip/eeprom.c
34647 @@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
34648 {NULL}};
34649
34650
34651 -static const char *block_name[] __devinitdata = {
34652 +static const char *block_name[] __devinitconst = {
34653 "21140 non-MII",
34654 "21140 MII PHY",
34655 "21142 Serial PHY",
34656 diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
34657 index 75d45f8..3d9c55b 100644
34658 --- a/drivers/net/ethernet/dec/tulip/uli526x.c
34659 +++ b/drivers/net/ethernet/dec/tulip/uli526x.c
34660 @@ -129,7 +129,7 @@ struct uli526x_board_info {
34661 struct uli_phy_ops {
34662 void (*write)(struct uli526x_board_info *, u8, u8, u16);
34663 u16 (*read)(struct uli526x_board_info *, u8, u8);
34664 - } phy;
34665 + } __no_const phy;
34666 struct net_device *next_dev; /* next device */
34667 struct pci_dev *pdev; /* PCI device */
34668 spinlock_t lock;
34669 diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
34670 index 4d1ffca..7c1ec4d 100644
34671 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c
34672 +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
34673 @@ -236,7 +236,7 @@ struct pci_id_info {
34674 int drv_flags; /* Driver use, intended as capability flags. */
34675 };
34676
34677 -static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34678 +static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34679 { /* Sometime a Level-One switch card. */
34680 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
34681 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
34682 diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
34683 index d7bb52a..3b83588 100644
34684 --- a/drivers/net/ethernet/dlink/sundance.c
34685 +++ b/drivers/net/ethernet/dlink/sundance.c
34686 @@ -218,7 +218,7 @@ enum {
34687 struct pci_id_info {
34688 const char *name;
34689 };
34690 -static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34691 +static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34692 {"D-Link DFE-550TX FAST Ethernet Adapter"},
34693 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
34694 {"D-Link DFE-580TX 4 port Server Adapter"},
34695 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
34696 index bd5cf7e..c165651 100644
34697 --- a/drivers/net/ethernet/emulex/benet/be_main.c
34698 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
34699 @@ -403,7 +403,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
34700
34701 if (wrapped)
34702 newacc += 65536;
34703 - ACCESS_ONCE(*acc) = newacc;
34704 + ACCESS_ONCE_RW(*acc) = newacc;
34705 }
34706
34707 void be_parse_stats(struct be_adapter *adapter)
34708 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
34709 index 16b0704..d2c07d7 100644
34710 --- a/drivers/net/ethernet/faraday/ftgmac100.c
34711 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
34712 @@ -31,6 +31,8 @@
34713 #include <linux/netdevice.h>
34714 #include <linux/phy.h>
34715 #include <linux/platform_device.h>
34716 +#include <linux/interrupt.h>
34717 +#include <linux/irqreturn.h>
34718 #include <net/ip.h>
34719
34720 #include "ftgmac100.h"
34721 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
34722 index 829b109..4ae5f6a 100644
34723 --- a/drivers/net/ethernet/faraday/ftmac100.c
34724 +++ b/drivers/net/ethernet/faraday/ftmac100.c
34725 @@ -31,6 +31,8 @@
34726 #include <linux/module.h>
34727 #include <linux/netdevice.h>
34728 #include <linux/platform_device.h>
34729 +#include <linux/interrupt.h>
34730 +#include <linux/irqreturn.h>
34731
34732 #include "ftmac100.h"
34733
34734 diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
34735 index 9d71c9c..0e4a0ac 100644
34736 --- a/drivers/net/ethernet/fealnx.c
34737 +++ b/drivers/net/ethernet/fealnx.c
34738 @@ -150,7 +150,7 @@ struct chip_info {
34739 int flags;
34740 };
34741
34742 -static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
34743 +static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
34744 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34745 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
34746 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34747 diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
34748 index 6e6fffb..588f361 100644
34749 --- a/drivers/net/ethernet/intel/e1000e/e1000.h
34750 +++ b/drivers/net/ethernet/intel/e1000e/e1000.h
34751 @@ -181,7 +181,7 @@ struct e1000_info;
34752 #define E1000_TXDCTL_DMA_BURST_ENABLE \
34753 (E1000_TXDCTL_GRAN | /* set descriptor granularity */ \
34754 E1000_TXDCTL_COUNT_DESC | \
34755 - (5 << 16) | /* wthresh must be +1 more than desired */\
34756 + (1 << 16) | /* wthresh must be +1 more than desired */\
34757 (1 << 8) | /* hthresh */ \
34758 0x1f) /* pthresh */
34759
34760 diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
34761 index ed5b409..ec37828 100644
34762 --- a/drivers/net/ethernet/intel/e1000e/hw.h
34763 +++ b/drivers/net/ethernet/intel/e1000e/hw.h
34764 @@ -797,6 +797,7 @@ struct e1000_mac_operations {
34765 void (*rar_set)(struct e1000_hw *, u8 *, u32);
34766 s32 (*read_mac_addr)(struct e1000_hw *);
34767 };
34768 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34769
34770 /*
34771 * When to use various PHY register access functions:
34772 @@ -837,6 +838,7 @@ struct e1000_phy_operations {
34773 void (*power_up)(struct e1000_hw *);
34774 void (*power_down)(struct e1000_hw *);
34775 };
34776 +typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34777
34778 /* Function pointers for the NVM. */
34779 struct e1000_nvm_operations {
34780 @@ -849,9 +851,10 @@ struct e1000_nvm_operations {
34781 s32 (*validate)(struct e1000_hw *);
34782 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
34783 };
34784 +typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34785
34786 struct e1000_mac_info {
34787 - struct e1000_mac_operations ops;
34788 + e1000_mac_operations_no_const ops;
34789 u8 addr[ETH_ALEN];
34790 u8 perm_addr[ETH_ALEN];
34791
34792 @@ -892,7 +895,7 @@ struct e1000_mac_info {
34793 };
34794
34795 struct e1000_phy_info {
34796 - struct e1000_phy_operations ops;
34797 + e1000_phy_operations_no_const ops;
34798
34799 enum e1000_phy_type type;
34800
34801 @@ -926,7 +929,7 @@ struct e1000_phy_info {
34802 };
34803
34804 struct e1000_nvm_info {
34805 - struct e1000_nvm_operations ops;
34806 + e1000_nvm_operations_no_const ops;
34807
34808 enum e1000_nvm_type type;
34809 enum e1000_nvm_override override;
34810 diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
34811 index c2a51dc..c2bd262 100644
34812 --- a/drivers/net/ethernet/intel/igb/e1000_hw.h
34813 +++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
34814 @@ -327,6 +327,7 @@ struct e1000_mac_operations {
34815 void (*release_swfw_sync)(struct e1000_hw *, u16);
34816
34817 };
34818 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34819
34820 struct e1000_phy_operations {
34821 s32 (*acquire)(struct e1000_hw *);
34822 @@ -343,6 +344,7 @@ struct e1000_phy_operations {
34823 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
34824 s32 (*write_reg)(struct e1000_hw *, u32, u16);
34825 };
34826 +typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34827
34828 struct e1000_nvm_operations {
34829 s32 (*acquire)(struct e1000_hw *);
34830 @@ -353,6 +355,7 @@ struct e1000_nvm_operations {
34831 s32 (*validate)(struct e1000_hw *);
34832 s32 (*valid_led_default)(struct e1000_hw *, u16 *);
34833 };
34834 +typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34835
34836 struct e1000_info {
34837 s32 (*get_invariants)(struct e1000_hw *);
34838 @@ -364,7 +367,7 @@ struct e1000_info {
34839 extern const struct e1000_info e1000_82575_info;
34840
34841 struct e1000_mac_info {
34842 - struct e1000_mac_operations ops;
34843 + e1000_mac_operations_no_const ops;
34844
34845 u8 addr[6];
34846 u8 perm_addr[6];
34847 @@ -402,7 +405,7 @@ struct e1000_mac_info {
34848 };
34849
34850 struct e1000_phy_info {
34851 - struct e1000_phy_operations ops;
34852 + e1000_phy_operations_no_const ops;
34853
34854 enum e1000_phy_type type;
34855
34856 @@ -437,7 +440,7 @@ struct e1000_phy_info {
34857 };
34858
34859 struct e1000_nvm_info {
34860 - struct e1000_nvm_operations ops;
34861 + e1000_nvm_operations_no_const ops;
34862 enum e1000_nvm_type type;
34863 enum e1000_nvm_override override;
34864
34865 @@ -482,6 +485,7 @@ struct e1000_mbx_operations {
34866 s32 (*check_for_ack)(struct e1000_hw *, u16);
34867 s32 (*check_for_rst)(struct e1000_hw *, u16);
34868 };
34869 +typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34870
34871 struct e1000_mbx_stats {
34872 u32 msgs_tx;
34873 @@ -493,7 +497,7 @@ struct e1000_mbx_stats {
34874 };
34875
34876 struct e1000_mbx_info {
34877 - struct e1000_mbx_operations ops;
34878 + e1000_mbx_operations_no_const ops;
34879 struct e1000_mbx_stats stats;
34880 u32 timeout;
34881 u32 usec_delay;
34882 diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
34883 index 57db3c6..aa825fc 100644
34884 --- a/drivers/net/ethernet/intel/igbvf/vf.h
34885 +++ b/drivers/net/ethernet/intel/igbvf/vf.h
34886 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
34887 s32 (*read_mac_addr)(struct e1000_hw *);
34888 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
34889 };
34890 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34891
34892 struct e1000_mac_info {
34893 - struct e1000_mac_operations ops;
34894 + e1000_mac_operations_no_const ops;
34895 u8 addr[6];
34896 u8 perm_addr[6];
34897
34898 @@ -213,6 +214,7 @@ struct e1000_mbx_operations {
34899 s32 (*check_for_ack)(struct e1000_hw *);
34900 s32 (*check_for_rst)(struct e1000_hw *);
34901 };
34902 +typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34903
34904 struct e1000_mbx_stats {
34905 u32 msgs_tx;
34906 @@ -224,7 +226,7 @@ struct e1000_mbx_stats {
34907 };
34908
34909 struct e1000_mbx_info {
34910 - struct e1000_mbx_operations ops;
34911 + e1000_mbx_operations_no_const ops;
34912 struct e1000_mbx_stats stats;
34913 u32 timeout;
34914 u32 usec_delay;
34915 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
34916 index dcebd12..c1fe8be 100644
34917 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
34918 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
34919 @@ -805,7 +805,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
34920 /* store the new cycle speed */
34921 adapter->cycle_speed = cycle_speed;
34922
34923 - ACCESS_ONCE(adapter->base_incval) = incval;
34924 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
34925 smp_mb();
34926
34927 /* grab the ptp lock */
34928 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
34929 index 204848d..d8aeaec 100644
34930 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
34931 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
34932 @@ -2791,6 +2791,7 @@ struct ixgbe_eeprom_operations {
34933 s32 (*update_checksum)(struct ixgbe_hw *);
34934 u16 (*calc_checksum)(struct ixgbe_hw *);
34935 };
34936 +typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
34937
34938 struct ixgbe_mac_operations {
34939 s32 (*init_hw)(struct ixgbe_hw *);
34940 @@ -2856,6 +2857,7 @@ struct ixgbe_mac_operations {
34941 s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
34942 s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *hw);
34943 };
34944 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
34945
34946 struct ixgbe_phy_operations {
34947 s32 (*identify)(struct ixgbe_hw *);
34948 @@ -2875,9 +2877,10 @@ struct ixgbe_phy_operations {
34949 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
34950 s32 (*check_overtemp)(struct ixgbe_hw *);
34951 };
34952 +typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
34953
34954 struct ixgbe_eeprom_info {
34955 - struct ixgbe_eeprom_operations ops;
34956 + ixgbe_eeprom_operations_no_const ops;
34957 enum ixgbe_eeprom_type type;
34958 u32 semaphore_delay;
34959 u16 word_size;
34960 @@ -2887,7 +2890,7 @@ struct ixgbe_eeprom_info {
34961
34962 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
34963 struct ixgbe_mac_info {
34964 - struct ixgbe_mac_operations ops;
34965 + ixgbe_mac_operations_no_const ops;
34966 enum ixgbe_mac_type type;
34967 u8 addr[ETH_ALEN];
34968 u8 perm_addr[ETH_ALEN];
34969 @@ -2916,7 +2919,7 @@ struct ixgbe_mac_info {
34970 };
34971
34972 struct ixgbe_phy_info {
34973 - struct ixgbe_phy_operations ops;
34974 + ixgbe_phy_operations_no_const ops;
34975 struct mdio_if_info mdio;
34976 enum ixgbe_phy_type type;
34977 u32 id;
34978 @@ -2944,6 +2947,7 @@ struct ixgbe_mbx_operations {
34979 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
34980 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
34981 };
34982 +typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
34983
34984 struct ixgbe_mbx_stats {
34985 u32 msgs_tx;
34986 @@ -2955,7 +2959,7 @@ struct ixgbe_mbx_stats {
34987 };
34988
34989 struct ixgbe_mbx_info {
34990 - struct ixgbe_mbx_operations ops;
34991 + ixgbe_mbx_operations_no_const ops;
34992 struct ixgbe_mbx_stats stats;
34993 u32 timeout;
34994 u32 usec_delay;
34995 diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
34996 index 25c951d..cc7cf33 100644
34997 --- a/drivers/net/ethernet/intel/ixgbevf/vf.h
34998 +++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
34999 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35000 s32 (*clear_vfta)(struct ixgbe_hw *);
35001 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35002 };
35003 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35004
35005 enum ixgbe_mac_type {
35006 ixgbe_mac_unknown = 0,
35007 @@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35008 };
35009
35010 struct ixgbe_mac_info {
35011 - struct ixgbe_mac_operations ops;
35012 + ixgbe_mac_operations_no_const ops;
35013 u8 addr[6];
35014 u8 perm_addr[6];
35015
35016 @@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35017 s32 (*check_for_ack)(struct ixgbe_hw *);
35018 s32 (*check_for_rst)(struct ixgbe_hw *);
35019 };
35020 +typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35021
35022 struct ixgbe_mbx_stats {
35023 u32 msgs_tx;
35024 @@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35025 };
35026
35027 struct ixgbe_mbx_info {
35028 - struct ixgbe_mbx_operations ops;
35029 + ixgbe_mbx_operations_no_const ops;
35030 struct ixgbe_mbx_stats stats;
35031 u32 timeout;
35032 u32 udelay;
35033 diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
35034 index a0313de..e83a572 100644
35035 --- a/drivers/net/ethernet/mellanox/mlx4/main.c
35036 +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
35037 @@ -41,6 +41,7 @@
35038 #include <linux/slab.h>
35039 #include <linux/io-mapping.h>
35040 #include <linux/delay.h>
35041 +#include <linux/sched.h>
35042
35043 #include <linux/mlx4/device.h>
35044 #include <linux/mlx4/doorbell.h>
35045 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35046 index 5046a64..71ca936 100644
35047 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35048 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35049 @@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35050 void (*link_down)(struct __vxge_hw_device *devh);
35051 void (*crit_err)(struct __vxge_hw_device *devh,
35052 enum vxge_hw_event type, u64 ext_data);
35053 -};
35054 +} __no_const;
35055
35056 /*
35057 * struct __vxge_hw_blockpool_entry - Block private data structure
35058 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35059 index 4a518a3..936b334 100644
35060 --- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35061 +++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35062 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35063 struct vxge_hw_mempool_dma *dma_object,
35064 u32 index,
35065 u32 is_last);
35066 -};
35067 +} __no_const;
35068
35069 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35070 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35071 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35072 index eb81da4..1592b62 100644
35073 --- a/drivers/net/ethernet/realtek/r8169.c
35074 +++ b/drivers/net/ethernet/realtek/r8169.c
35075 @@ -723,22 +723,22 @@ struct rtl8169_private {
35076 struct mdio_ops {
35077 void (*write)(void __iomem *, int, int);
35078 int (*read)(void __iomem *, int);
35079 - } mdio_ops;
35080 + } __no_const mdio_ops;
35081
35082 struct pll_power_ops {
35083 void (*down)(struct rtl8169_private *);
35084 void (*up)(struct rtl8169_private *);
35085 - } pll_power_ops;
35086 + } __no_const pll_power_ops;
35087
35088 struct jumbo_ops {
35089 void (*enable)(struct rtl8169_private *);
35090 void (*disable)(struct rtl8169_private *);
35091 - } jumbo_ops;
35092 + } __no_const jumbo_ops;
35093
35094 struct csi_ops {
35095 void (*write)(void __iomem *, int, int);
35096 u32 (*read)(void __iomem *, int);
35097 - } csi_ops;
35098 + } __no_const csi_ops;
35099
35100 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35101 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35102 diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35103 index 4613591..d816601 100644
35104 --- a/drivers/net/ethernet/sis/sis190.c
35105 +++ b/drivers/net/ethernet/sis/sis190.c
35106 @@ -1618,7 +1618,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35107 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35108 struct net_device *dev)
35109 {
35110 - static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35111 + static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35112 struct sis190_private *tp = netdev_priv(dev);
35113 struct pci_dev *isa_bridge;
35114 u8 reg, tmp8;
35115 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35116 index c07cfe9..81cbf7e 100644
35117 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35118 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35119 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35120
35121 writel(value, ioaddr + MMC_CNTRL);
35122
35123 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35124 - MMC_CNTRL, value);
35125 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35126 +// MMC_CNTRL, value);
35127 }
35128
35129 /* To mask all all interrupts.*/
35130 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
35131 index 2857ab0..9a1f9b0 100644
35132 --- a/drivers/net/hyperv/hyperv_net.h
35133 +++ b/drivers/net/hyperv/hyperv_net.h
35134 @@ -99,7 +99,7 @@ struct rndis_device {
35135
35136 enum rndis_device_state state;
35137 bool link_state;
35138 - atomic_t new_req_id;
35139 + atomic_unchecked_t new_req_id;
35140
35141 spinlock_t request_lock;
35142 struct list_head req_list;
35143 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
35144 index 981ebb1..b34959b 100644
35145 --- a/drivers/net/hyperv/rndis_filter.c
35146 +++ b/drivers/net/hyperv/rndis_filter.c
35147 @@ -97,7 +97,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
35148 * template
35149 */
35150 set = &rndis_msg->msg.set_req;
35151 - set->req_id = atomic_inc_return(&dev->new_req_id);
35152 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35153
35154 /* Add to the request list */
35155 spin_lock_irqsave(&dev->request_lock, flags);
35156 @@ -648,7 +648,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
35157
35158 /* Setup the rndis set */
35159 halt = &request->request_msg.msg.halt_req;
35160 - halt->req_id = atomic_inc_return(&dev->new_req_id);
35161 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35162
35163 /* Ignore return since this msg is optional. */
35164 rndis_filter_send_request(dev, request);
35165 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35166 index 5c05572..389610b 100644
35167 --- a/drivers/net/ppp/ppp_generic.c
35168 +++ b/drivers/net/ppp/ppp_generic.c
35169 @@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35170 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35171 struct ppp_stats stats;
35172 struct ppp_comp_stats cstats;
35173 - char *vers;
35174
35175 switch (cmd) {
35176 case SIOCGPPPSTATS:
35177 @@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35178 break;
35179
35180 case SIOCGPPPVER:
35181 - vers = PPP_VERSION;
35182 - if (copy_to_user(addr, vers, strlen(vers) + 1))
35183 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35184 break;
35185 err = 0;
35186 break;
35187 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35188 index 62f30b4..ff99dfd 100644
35189 --- a/drivers/net/usb/hso.c
35190 +++ b/drivers/net/usb/hso.c
35191 @@ -71,7 +71,7 @@
35192 #include <asm/byteorder.h>
35193 #include <linux/serial_core.h>
35194 #include <linux/serial.h>
35195 -
35196 +#include <asm/local.h>
35197
35198 #define MOD_AUTHOR "Option Wireless"
35199 #define MOD_DESCRIPTION "USB High Speed Option driver"
35200 @@ -1182,7 +1182,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35201 struct urb *urb;
35202
35203 urb = serial->rx_urb[0];
35204 - if (serial->port.count > 0) {
35205 + if (atomic_read(&serial->port.count) > 0) {
35206 count = put_rxbuf_data(urb, serial);
35207 if (count == -1)
35208 return;
35209 @@ -1218,7 +1218,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35210 DUMP1(urb->transfer_buffer, urb->actual_length);
35211
35212 /* Anyone listening? */
35213 - if (serial->port.count == 0)
35214 + if (atomic_read(&serial->port.count) == 0)
35215 return;
35216
35217 if (status == 0) {
35218 @@ -1300,8 +1300,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35219 tty_port_tty_set(&serial->port, tty);
35220
35221 /* check for port already opened, if not set the termios */
35222 - serial->port.count++;
35223 - if (serial->port.count == 1) {
35224 + if (atomic_inc_return(&serial->port.count) == 1) {
35225 serial->rx_state = RX_IDLE;
35226 /* Force default termio settings */
35227 _hso_serial_set_termios(tty, NULL);
35228 @@ -1313,7 +1312,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35229 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35230 if (result) {
35231 hso_stop_serial_device(serial->parent);
35232 - serial->port.count--;
35233 + atomic_dec(&serial->port.count);
35234 kref_put(&serial->parent->ref, hso_serial_ref_free);
35235 }
35236 } else {
35237 @@ -1350,10 +1349,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35238
35239 /* reset the rts and dtr */
35240 /* do the actual close */
35241 - serial->port.count--;
35242 + atomic_dec(&serial->port.count);
35243
35244 - if (serial->port.count <= 0) {
35245 - serial->port.count = 0;
35246 + if (atomic_read(&serial->port.count) <= 0) {
35247 + atomic_set(&serial->port.count, 0);
35248 tty_port_tty_set(&serial->port, NULL);
35249 if (!usb_gone)
35250 hso_stop_serial_device(serial->parent);
35251 @@ -1429,7 +1428,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35252
35253 /* the actual setup */
35254 spin_lock_irqsave(&serial->serial_lock, flags);
35255 - if (serial->port.count)
35256 + if (atomic_read(&serial->port.count))
35257 _hso_serial_set_termios(tty, old);
35258 else
35259 tty->termios = old;
35260 @@ -1888,7 +1887,7 @@ static void intr_callback(struct urb *urb)
35261 D1("Pending read interrupt on port %d\n", i);
35262 spin_lock(&serial->serial_lock);
35263 if (serial->rx_state == RX_IDLE &&
35264 - serial->port.count > 0) {
35265 + atomic_read(&serial->port.count) > 0) {
35266 /* Setup and send a ctrl req read on
35267 * port i */
35268 if (!serial->rx_urb_filled[0]) {
35269 @@ -3079,7 +3078,7 @@ static int hso_resume(struct usb_interface *iface)
35270 /* Start all serial ports */
35271 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35272 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35273 - if (dev2ser(serial_table[i])->port.count) {
35274 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
35275 result =
35276 hso_start_serial_device(serial_table[i], GFP_NOIO);
35277 hso_kick_transmit(dev2ser(serial_table[i]));
35278 diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35279 index 420d69b..74f90a2 100644
35280 --- a/drivers/net/wireless/ath/ath.h
35281 +++ b/drivers/net/wireless/ath/ath.h
35282 @@ -119,6 +119,7 @@ struct ath_ops {
35283 void (*write_flush) (void *);
35284 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35285 };
35286 +typedef struct ath_ops __no_const ath_ops_no_const;
35287
35288 struct ath_common;
35289 struct ath_bus_ops;
35290 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35291 index 8d78253..bebbb68 100644
35292 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35293 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35294 @@ -184,8 +184,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35295 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35296 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35297
35298 - ACCESS_ONCE(ads->ds_link) = i->link;
35299 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35300 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
35301 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35302
35303 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35304 ctl6 = SM(i->keytype, AR_EncrType);
35305 @@ -199,26 +199,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35306
35307 if ((i->is_first || i->is_last) &&
35308 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35309 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35310 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35311 | set11nTries(i->rates, 1)
35312 | set11nTries(i->rates, 2)
35313 | set11nTries(i->rates, 3)
35314 | (i->dur_update ? AR_DurUpdateEna : 0)
35315 | SM(0, AR_BurstDur);
35316
35317 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35318 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35319 | set11nRate(i->rates, 1)
35320 | set11nRate(i->rates, 2)
35321 | set11nRate(i->rates, 3);
35322 } else {
35323 - ACCESS_ONCE(ads->ds_ctl2) = 0;
35324 - ACCESS_ONCE(ads->ds_ctl3) = 0;
35325 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35326 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35327 }
35328
35329 if (!i->is_first) {
35330 - ACCESS_ONCE(ads->ds_ctl0) = 0;
35331 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35332 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35333 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35334 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35335 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35336 return;
35337 }
35338
35339 @@ -243,7 +243,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35340 break;
35341 }
35342
35343 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35344 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35345 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35346 | SM(i->txpower, AR_XmitPower)
35347 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35348 @@ -253,19 +253,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35349 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35350 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35351
35352 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35353 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35354 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35355 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35356
35357 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35358 return;
35359
35360 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35361 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35362 | set11nPktDurRTSCTS(i->rates, 1);
35363
35364 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35365 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35366 | set11nPktDurRTSCTS(i->rates, 3);
35367
35368 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35369 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35370 | set11nRateFlags(i->rates, 1)
35371 | set11nRateFlags(i->rates, 2)
35372 | set11nRateFlags(i->rates, 3)
35373 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35374 index d9e0824..1a874e7 100644
35375 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35376 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35377 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35378 (i->qcu << AR_TxQcuNum_S) | desc_len;
35379
35380 checksum += val;
35381 - ACCESS_ONCE(ads->info) = val;
35382 + ACCESS_ONCE_RW(ads->info) = val;
35383
35384 checksum += i->link;
35385 - ACCESS_ONCE(ads->link) = i->link;
35386 + ACCESS_ONCE_RW(ads->link) = i->link;
35387
35388 checksum += i->buf_addr[0];
35389 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35390 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35391 checksum += i->buf_addr[1];
35392 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35393 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35394 checksum += i->buf_addr[2];
35395 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35396 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35397 checksum += i->buf_addr[3];
35398 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35399 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35400
35401 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35402 - ACCESS_ONCE(ads->ctl3) = val;
35403 + ACCESS_ONCE_RW(ads->ctl3) = val;
35404 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35405 - ACCESS_ONCE(ads->ctl5) = val;
35406 + ACCESS_ONCE_RW(ads->ctl5) = val;
35407 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35408 - ACCESS_ONCE(ads->ctl7) = val;
35409 + ACCESS_ONCE_RW(ads->ctl7) = val;
35410 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35411 - ACCESS_ONCE(ads->ctl9) = val;
35412 + ACCESS_ONCE_RW(ads->ctl9) = val;
35413
35414 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
35415 - ACCESS_ONCE(ads->ctl10) = checksum;
35416 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
35417
35418 if (i->is_first || i->is_last) {
35419 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
35420 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
35421 | set11nTries(i->rates, 1)
35422 | set11nTries(i->rates, 2)
35423 | set11nTries(i->rates, 3)
35424 | (i->dur_update ? AR_DurUpdateEna : 0)
35425 | SM(0, AR_BurstDur);
35426
35427 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
35428 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
35429 | set11nRate(i->rates, 1)
35430 | set11nRate(i->rates, 2)
35431 | set11nRate(i->rates, 3);
35432 } else {
35433 - ACCESS_ONCE(ads->ctl13) = 0;
35434 - ACCESS_ONCE(ads->ctl14) = 0;
35435 + ACCESS_ONCE_RW(ads->ctl13) = 0;
35436 + ACCESS_ONCE_RW(ads->ctl14) = 0;
35437 }
35438
35439 ads->ctl20 = 0;
35440 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35441
35442 ctl17 = SM(i->keytype, AR_EncrType);
35443 if (!i->is_first) {
35444 - ACCESS_ONCE(ads->ctl11) = 0;
35445 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35446 - ACCESS_ONCE(ads->ctl15) = 0;
35447 - ACCESS_ONCE(ads->ctl16) = 0;
35448 - ACCESS_ONCE(ads->ctl17) = ctl17;
35449 - ACCESS_ONCE(ads->ctl18) = 0;
35450 - ACCESS_ONCE(ads->ctl19) = 0;
35451 + ACCESS_ONCE_RW(ads->ctl11) = 0;
35452 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35453 + ACCESS_ONCE_RW(ads->ctl15) = 0;
35454 + ACCESS_ONCE_RW(ads->ctl16) = 0;
35455 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35456 + ACCESS_ONCE_RW(ads->ctl18) = 0;
35457 + ACCESS_ONCE_RW(ads->ctl19) = 0;
35458 return;
35459 }
35460
35461 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35462 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35463 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35464 | SM(i->txpower, AR_XmitPower)
35465 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35466 @@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35467 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
35468 ctl12 |= SM(val, AR_PAPRDChainMask);
35469
35470 - ACCESS_ONCE(ads->ctl12) = ctl12;
35471 - ACCESS_ONCE(ads->ctl17) = ctl17;
35472 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
35473 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35474
35475 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35476 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35477 | set11nPktDurRTSCTS(i->rates, 1);
35478
35479 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35480 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35481 | set11nPktDurRTSCTS(i->rates, 3);
35482
35483 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
35484 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
35485 | set11nRateFlags(i->rates, 1)
35486 | set11nRateFlags(i->rates, 2)
35487 | set11nRateFlags(i->rates, 3)
35488 | SM(i->rtscts_rate, AR_RTSCTSRate);
35489
35490 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
35491 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
35492 }
35493
35494 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
35495 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
35496 index 02f5007..bd0bd8f 100644
35497 --- a/drivers/net/wireless/ath/ath9k/hw.h
35498 +++ b/drivers/net/wireless/ath/ath9k/hw.h
35499 @@ -610,7 +610,7 @@ struct ath_hw_private_ops {
35500
35501 /* ANI */
35502 void (*ani_cache_ini_regs)(struct ath_hw *ah);
35503 -};
35504 +} __no_const;
35505
35506 /**
35507 * struct ath_hw_ops - callbacks used by hardware code and driver code
35508 @@ -640,7 +640,7 @@ struct ath_hw_ops {
35509 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
35510 struct ath_hw_antcomb_conf *antconf);
35511
35512 -};
35513 +} __no_const;
35514
35515 struct ath_nf_limits {
35516 s16 max;
35517 @@ -660,7 +660,7 @@ enum ath_cal_list {
35518 #define AH_FASTCC 0x4
35519
35520 struct ath_hw {
35521 - struct ath_ops reg_ops;
35522 + ath_ops_no_const reg_ops;
35523
35524 struct ieee80211_hw *hw;
35525 struct ath_common common;
35526 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35527 index af00e2c..ab04d34 100644
35528 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35529 +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35530 @@ -545,7 +545,7 @@ struct phy_func_ptr {
35531 void (*carrsuppr)(struct brcms_phy *);
35532 s32 (*rxsigpwr)(struct brcms_phy *, s32);
35533 void (*detach)(struct brcms_phy *);
35534 -};
35535 +} __no_const;
35536
35537 struct brcms_phy {
35538 struct brcms_phy_pub pubpi_ro;
35539 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
35540 index faec404..a5277f1 100644
35541 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
35542 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
35543 @@ -3611,7 +3611,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
35544 */
35545 if (il3945_mod_params.disable_hw_scan) {
35546 D_INFO("Disabling hw_scan\n");
35547 - il3945_mac_ops.hw_scan = NULL;
35548 + pax_open_kernel();
35549 + *(void **)&il3945_mac_ops.hw_scan = NULL;
35550 + pax_close_kernel();
35551 }
35552
35553 D_INFO("*** LOAD DRIVER ***\n");
35554 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
35555 index a0b7cfd..20b49f7 100644
35556 --- a/drivers/net/wireless/mac80211_hwsim.c
35557 +++ b/drivers/net/wireless/mac80211_hwsim.c
35558 @@ -1752,9 +1752,11 @@ static int __init init_mac80211_hwsim(void)
35559 return -EINVAL;
35560
35561 if (fake_hw_scan) {
35562 - mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35563 - mac80211_hwsim_ops.sw_scan_start = NULL;
35564 - mac80211_hwsim_ops.sw_scan_complete = NULL;
35565 + pax_open_kernel();
35566 + *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35567 + *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
35568 + *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
35569 + pax_close_kernel();
35570 }
35571
35572 spin_lock_init(&hwsim_radio_lock);
35573 diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
35574 index bd3b0bf..f9db92a 100644
35575 --- a/drivers/net/wireless/mwifiex/main.h
35576 +++ b/drivers/net/wireless/mwifiex/main.h
35577 @@ -567,7 +567,7 @@ struct mwifiex_if_ops {
35578 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
35579 int (*data_complete) (struct mwifiex_adapter *, struct sk_buff *);
35580 int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
35581 -};
35582 +} __no_const;
35583
35584 struct mwifiex_adapter {
35585 u8 iface_type;
35586 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
35587 index dfcd02a..a42a59d 100644
35588 --- a/drivers/net/wireless/rndis_wlan.c
35589 +++ b/drivers/net/wireless/rndis_wlan.c
35590 @@ -1235,7 +1235,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
35591
35592 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
35593
35594 - if (rts_threshold < 0 || rts_threshold > 2347)
35595 + if (rts_threshold > 2347)
35596 rts_threshold = 2347;
35597
35598 tmp = cpu_to_le32(rts_threshold);
35599 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
35600 index 8f75402..eed109d 100644
35601 --- a/drivers/net/wireless/rt2x00/rt2x00.h
35602 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
35603 @@ -396,7 +396,7 @@ struct rt2x00_intf {
35604 * for hardware which doesn't support hardware
35605 * sequence counting.
35606 */
35607 - atomic_t seqno;
35608 + atomic_unchecked_t seqno;
35609 };
35610
35611 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
35612 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
35613 index 2fd8301..9767e8c 100644
35614 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
35615 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
35616 @@ -240,9 +240,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
35617 * sequence counter given by mac80211.
35618 */
35619 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
35620 - seqno = atomic_add_return(0x10, &intf->seqno);
35621 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
35622 else
35623 - seqno = atomic_read(&intf->seqno);
35624 + seqno = atomic_read_unchecked(&intf->seqno);
35625
35626 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
35627 hdr->seq_ctrl |= cpu_to_le16(seqno);
35628 diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
35629 index 9d8f581..0f6589e 100644
35630 --- a/drivers/net/wireless/ti/wl1251/wl1251.h
35631 +++ b/drivers/net/wireless/ti/wl1251/wl1251.h
35632 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
35633 void (*reset)(struct wl1251 *wl);
35634 void (*enable_irq)(struct wl1251 *wl);
35635 void (*disable_irq)(struct wl1251 *wl);
35636 -};
35637 +} __no_const;
35638
35639 struct wl1251 {
35640 struct ieee80211_hw *hw;
35641 diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
35642 index 0b3f0b5..62f68bd 100644
35643 --- a/drivers/net/wireless/ti/wlcore/wlcore.h
35644 +++ b/drivers/net/wireless/ti/wlcore/wlcore.h
35645 @@ -61,7 +61,7 @@ struct wlcore_ops {
35646 struct wl12xx_vif *wlvif);
35647 s8 (*get_pg_ver)(struct wl1271 *wl);
35648 void (*get_mac)(struct wl1271 *wl);
35649 -};
35650 +} __no_const;
35651
35652 enum wlcore_partitions {
35653 PART_DOWN,
35654 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
35655 index f34b5b2..b5abb9f 100644
35656 --- a/drivers/oprofile/buffer_sync.c
35657 +++ b/drivers/oprofile/buffer_sync.c
35658 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
35659 if (cookie == NO_COOKIE)
35660 offset = pc;
35661 if (cookie == INVALID_COOKIE) {
35662 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35663 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35664 offset = pc;
35665 }
35666 if (cookie != last_cookie) {
35667 @@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
35668 /* add userspace sample */
35669
35670 if (!mm) {
35671 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
35672 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
35673 return 0;
35674 }
35675
35676 cookie = lookup_dcookie(mm, s->eip, &offset);
35677
35678 if (cookie == INVALID_COOKIE) {
35679 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35680 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35681 return 0;
35682 }
35683
35684 @@ -563,7 +563,7 @@ void sync_buffer(int cpu)
35685 /* ignore backtraces if failed to add a sample */
35686 if (state == sb_bt_start) {
35687 state = sb_bt_ignore;
35688 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
35689 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
35690 }
35691 }
35692 release_mm(mm);
35693 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
35694 index c0cc4e7..44d4e54 100644
35695 --- a/drivers/oprofile/event_buffer.c
35696 +++ b/drivers/oprofile/event_buffer.c
35697 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
35698 }
35699
35700 if (buffer_pos == buffer_size) {
35701 - atomic_inc(&oprofile_stats.event_lost_overflow);
35702 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
35703 return;
35704 }
35705
35706 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
35707 index ed2c3ec..deda85a 100644
35708 --- a/drivers/oprofile/oprof.c
35709 +++ b/drivers/oprofile/oprof.c
35710 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
35711 if (oprofile_ops.switch_events())
35712 return;
35713
35714 - atomic_inc(&oprofile_stats.multiplex_counter);
35715 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
35716 start_switch_worker();
35717 }
35718
35719 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
35720 index 917d28e..d62d981 100644
35721 --- a/drivers/oprofile/oprofile_stats.c
35722 +++ b/drivers/oprofile/oprofile_stats.c
35723 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
35724 cpu_buf->sample_invalid_eip = 0;
35725 }
35726
35727 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
35728 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
35729 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
35730 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
35731 - atomic_set(&oprofile_stats.multiplex_counter, 0);
35732 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
35733 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
35734 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
35735 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
35736 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
35737 }
35738
35739
35740 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
35741 index 38b6fc0..b5cbfce 100644
35742 --- a/drivers/oprofile/oprofile_stats.h
35743 +++ b/drivers/oprofile/oprofile_stats.h
35744 @@ -13,11 +13,11 @@
35745 #include <linux/atomic.h>
35746
35747 struct oprofile_stat_struct {
35748 - atomic_t sample_lost_no_mm;
35749 - atomic_t sample_lost_no_mapping;
35750 - atomic_t bt_lost_no_mapping;
35751 - atomic_t event_lost_overflow;
35752 - atomic_t multiplex_counter;
35753 + atomic_unchecked_t sample_lost_no_mm;
35754 + atomic_unchecked_t sample_lost_no_mapping;
35755 + atomic_unchecked_t bt_lost_no_mapping;
35756 + atomic_unchecked_t event_lost_overflow;
35757 + atomic_unchecked_t multiplex_counter;
35758 };
35759
35760 extern struct oprofile_stat_struct oprofile_stats;
35761 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
35762 index 849357c..b83c1e0 100644
35763 --- a/drivers/oprofile/oprofilefs.c
35764 +++ b/drivers/oprofile/oprofilefs.c
35765 @@ -185,7 +185,7 @@ static const struct file_operations atomic_ro_fops = {
35766
35767
35768 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
35769 - char const *name, atomic_t *val)
35770 + char const *name, atomic_unchecked_t *val)
35771 {
35772 return __oprofilefs_create_file(sb, root, name,
35773 &atomic_ro_fops, 0444, val);
35774 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
35775 index 3f56bc0..707d642 100644
35776 --- a/drivers/parport/procfs.c
35777 +++ b/drivers/parport/procfs.c
35778 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
35779
35780 *ppos += len;
35781
35782 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
35783 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
35784 }
35785
35786 #ifdef CONFIG_PARPORT_1284
35787 @@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
35788
35789 *ppos += len;
35790
35791 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
35792 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
35793 }
35794 #endif /* IEEE1284.3 support. */
35795
35796 diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
35797 index 9fff878..ad0ad53 100644
35798 --- a/drivers/pci/hotplug/cpci_hotplug.h
35799 +++ b/drivers/pci/hotplug/cpci_hotplug.h
35800 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
35801 int (*hardware_test) (struct slot* slot, u32 value);
35802 u8 (*get_power) (struct slot* slot);
35803 int (*set_power) (struct slot* slot, int value);
35804 -};
35805 +} __no_const;
35806
35807 struct cpci_hp_controller {
35808 unsigned int irq;
35809 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
35810 index 76ba8a1..20ca857 100644
35811 --- a/drivers/pci/hotplug/cpqphp_nvram.c
35812 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
35813 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
35814
35815 void compaq_nvram_init (void __iomem *rom_start)
35816 {
35817 +
35818 +#ifndef CONFIG_PAX_KERNEXEC
35819 if (rom_start) {
35820 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
35821 }
35822 +#endif
35823 +
35824 dbg("int15 entry = %p\n", compaq_int15_entry_point);
35825
35826 /* initialize our int15 lock */
35827 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
35828 index b500840..d7159d3 100644
35829 --- a/drivers/pci/pcie/aspm.c
35830 +++ b/drivers/pci/pcie/aspm.c
35831 @@ -27,9 +27,9 @@
35832 #define MODULE_PARAM_PREFIX "pcie_aspm."
35833
35834 /* Note: those are not register definitions */
35835 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
35836 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
35837 -#define ASPM_STATE_L1 (4) /* L1 state */
35838 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
35839 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
35840 +#define ASPM_STATE_L1 (4U) /* L1 state */
35841 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
35842 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
35843
35844 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
35845 index 658ac97..05e1b90 100644
35846 --- a/drivers/pci/probe.c
35847 +++ b/drivers/pci/probe.c
35848 @@ -137,7 +137,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
35849 u16 orig_cmd;
35850 struct pci_bus_region region;
35851
35852 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
35853 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
35854
35855 if (!dev->mmio_always_on) {
35856 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
35857 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
35858 index 27911b5..5b6db88 100644
35859 --- a/drivers/pci/proc.c
35860 +++ b/drivers/pci/proc.c
35861 @@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
35862 static int __init pci_proc_init(void)
35863 {
35864 struct pci_dev *dev = NULL;
35865 +
35866 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
35867 +#ifdef CONFIG_GRKERNSEC_PROC_USER
35868 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
35869 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
35870 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
35871 +#endif
35872 +#else
35873 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
35874 +#endif
35875 proc_create("devices", 0, proc_bus_pci_dir,
35876 &proc_bus_pci_dev_operations);
35877 proc_initialized = 1;
35878 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
35879 index 8b5610d..a4c22bb 100644
35880 --- a/drivers/platform/x86/thinkpad_acpi.c
35881 +++ b/drivers/platform/x86/thinkpad_acpi.c
35882 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
35883 return 0;
35884 }
35885
35886 -void static hotkey_mask_warn_incomplete_mask(void)
35887 +static void hotkey_mask_warn_incomplete_mask(void)
35888 {
35889 /* log only what the user can fix... */
35890 const u32 wantedmask = hotkey_driver_mask &
35891 @@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
35892 }
35893 }
35894
35895 -static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35896 - struct tp_nvram_state *newn,
35897 - const u32 event_mask)
35898 -{
35899 -
35900 #define TPACPI_COMPARE_KEY(__scancode, __member) \
35901 do { \
35902 if ((event_mask & (1 << __scancode)) && \
35903 @@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35904 tpacpi_hotkey_send_key(__scancode); \
35905 } while (0)
35906
35907 - void issue_volchange(const unsigned int oldvol,
35908 - const unsigned int newvol)
35909 - {
35910 - unsigned int i = oldvol;
35911 +static void issue_volchange(const unsigned int oldvol,
35912 + const unsigned int newvol,
35913 + const u32 event_mask)
35914 +{
35915 + unsigned int i = oldvol;
35916
35917 - while (i > newvol) {
35918 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
35919 - i--;
35920 - }
35921 - while (i < newvol) {
35922 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
35923 - i++;
35924 - }
35925 + while (i > newvol) {
35926 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
35927 + i--;
35928 }
35929 + while (i < newvol) {
35930 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
35931 + i++;
35932 + }
35933 +}
35934
35935 - void issue_brightnesschange(const unsigned int oldbrt,
35936 - const unsigned int newbrt)
35937 - {
35938 - unsigned int i = oldbrt;
35939 +static void issue_brightnesschange(const unsigned int oldbrt,
35940 + const unsigned int newbrt,
35941 + const u32 event_mask)
35942 +{
35943 + unsigned int i = oldbrt;
35944
35945 - while (i > newbrt) {
35946 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
35947 - i--;
35948 - }
35949 - while (i < newbrt) {
35950 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
35951 - i++;
35952 - }
35953 + while (i > newbrt) {
35954 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
35955 + i--;
35956 + }
35957 + while (i < newbrt) {
35958 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
35959 + i++;
35960 }
35961 +}
35962
35963 +static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35964 + struct tp_nvram_state *newn,
35965 + const u32 event_mask)
35966 +{
35967 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
35968 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
35969 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
35970 @@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35971 oldn->volume_level != newn->volume_level) {
35972 /* recently muted, or repeated mute keypress, or
35973 * multiple presses ending in mute */
35974 - issue_volchange(oldn->volume_level, newn->volume_level);
35975 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
35976 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
35977 }
35978 } else {
35979 @@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35980 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
35981 }
35982 if (oldn->volume_level != newn->volume_level) {
35983 - issue_volchange(oldn->volume_level, newn->volume_level);
35984 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
35985 } else if (oldn->volume_toggle != newn->volume_toggle) {
35986 /* repeated vol up/down keypress at end of scale ? */
35987 if (newn->volume_level == 0)
35988 @@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35989 /* handle brightness */
35990 if (oldn->brightness_level != newn->brightness_level) {
35991 issue_brightnesschange(oldn->brightness_level,
35992 - newn->brightness_level);
35993 + newn->brightness_level,
35994 + event_mask);
35995 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
35996 /* repeated key presses that didn't change state */
35997 if (newn->brightness_level == 0)
35998 @@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
35999 && !tp_features.bright_unkfw)
36000 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36001 }
36002 +}
36003
36004 #undef TPACPI_COMPARE_KEY
36005 #undef TPACPI_MAY_SEND_KEY
36006 -}
36007
36008 /*
36009 * Polling driver
36010 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36011 index 769d265..a3a05ca 100644
36012 --- a/drivers/pnp/pnpbios/bioscalls.c
36013 +++ b/drivers/pnp/pnpbios/bioscalls.c
36014 @@ -58,7 +58,7 @@ do { \
36015 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36016 } while(0)
36017
36018 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36019 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36020 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36021
36022 /*
36023 @@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36024
36025 cpu = get_cpu();
36026 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36027 +
36028 + pax_open_kernel();
36029 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36030 + pax_close_kernel();
36031
36032 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36033 spin_lock_irqsave(&pnp_bios_lock, flags);
36034 @@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36035 :"memory");
36036 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36037
36038 + pax_open_kernel();
36039 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36040 + pax_close_kernel();
36041 +
36042 put_cpu();
36043
36044 /* If we get here and this is set then the PnP BIOS faulted on us. */
36045 @@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36046 return status;
36047 }
36048
36049 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
36050 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36051 {
36052 int i;
36053
36054 @@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36055 pnp_bios_callpoint.offset = header->fields.pm16offset;
36056 pnp_bios_callpoint.segment = PNP_CS16;
36057
36058 + pax_open_kernel();
36059 +
36060 for_each_possible_cpu(i) {
36061 struct desc_struct *gdt = get_cpu_gdt_table(i);
36062 if (!gdt)
36063 @@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36064 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36065 (unsigned long)__va(header->fields.pm16dseg));
36066 }
36067 +
36068 + pax_close_kernel();
36069 }
36070 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36071 index b0ecacb..7c9da2e 100644
36072 --- a/drivers/pnp/resource.c
36073 +++ b/drivers/pnp/resource.c
36074 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36075 return 1;
36076
36077 /* check if the resource is valid */
36078 - if (*irq < 0 || *irq > 15)
36079 + if (*irq > 15)
36080 return 0;
36081
36082 /* check if the resource is reserved */
36083 @@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36084 return 1;
36085
36086 /* check if the resource is valid */
36087 - if (*dma < 0 || *dma == 4 || *dma > 7)
36088 + if (*dma == 4 || *dma > 7)
36089 return 0;
36090
36091 /* check if the resource is reserved */
36092 diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36093 index f5d6d37..739f6a9 100644
36094 --- a/drivers/power/bq27x00_battery.c
36095 +++ b/drivers/power/bq27x00_battery.c
36096 @@ -72,7 +72,7 @@
36097 struct bq27x00_device_info;
36098 struct bq27x00_access_methods {
36099 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36100 -};
36101 +} __no_const;
36102
36103 enum bq27x00_chip { BQ27000, BQ27500 };
36104
36105 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36106 index 8d53174..04c65de 100644
36107 --- a/drivers/regulator/max8660.c
36108 +++ b/drivers/regulator/max8660.c
36109 @@ -333,8 +333,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36110 max8660->shadow_regs[MAX8660_OVER1] = 5;
36111 } else {
36112 /* Otherwise devices can be toggled via software */
36113 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
36114 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
36115 + pax_open_kernel();
36116 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36117 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36118 + pax_close_kernel();
36119 }
36120
36121 /*
36122 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36123 index 970a233..ee1f241 100644
36124 --- a/drivers/regulator/mc13892-regulator.c
36125 +++ b/drivers/regulator/mc13892-regulator.c
36126 @@ -566,10 +566,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36127 }
36128 mc13xxx_unlock(mc13892);
36129
36130 - mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36131 + pax_open_kernel();
36132 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36133 = mc13892_vcam_set_mode;
36134 - mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36135 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36136 = mc13892_vcam_get_mode;
36137 + pax_close_kernel();
36138
36139 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
36140 ARRAY_SIZE(mc13892_regulators));
36141 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36142 index cace6d3..f623fda 100644
36143 --- a/drivers/rtc/rtc-dev.c
36144 +++ b/drivers/rtc/rtc-dev.c
36145 @@ -14,6 +14,7 @@
36146 #include <linux/module.h>
36147 #include <linux/rtc.h>
36148 #include <linux/sched.h>
36149 +#include <linux/grsecurity.h>
36150 #include "rtc-core.h"
36151
36152 static dev_t rtc_devt;
36153 @@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36154 if (copy_from_user(&tm, uarg, sizeof(tm)))
36155 return -EFAULT;
36156
36157 + gr_log_timechange();
36158 +
36159 return rtc_set_time(rtc, &tm);
36160
36161 case RTC_PIE_ON:
36162 diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36163 index 3fcf627..f334910 100644
36164 --- a/drivers/scsi/aacraid/aacraid.h
36165 +++ b/drivers/scsi/aacraid/aacraid.h
36166 @@ -492,7 +492,7 @@ struct adapter_ops
36167 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36168 /* Administrative operations */
36169 int (*adapter_comm)(struct aac_dev * dev, int comm);
36170 -};
36171 +} __no_const;
36172
36173 /*
36174 * Define which interrupt handler needs to be installed
36175 diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36176 index 0d279c44..3d25a97 100644
36177 --- a/drivers/scsi/aacraid/linit.c
36178 +++ b/drivers/scsi/aacraid/linit.c
36179 @@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36180 #elif defined(__devinitconst)
36181 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36182 #else
36183 -static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36184 +static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36185 #endif
36186 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36187 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36188 diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36189 index ff80552..1c4120c 100644
36190 --- a/drivers/scsi/aic94xx/aic94xx_init.c
36191 +++ b/drivers/scsi/aic94xx/aic94xx_init.c
36192 @@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36193 .lldd_ata_set_dmamode = asd_set_dmamode,
36194 };
36195
36196 -static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36197 +static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36198 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36199 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36200 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36201 diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36202 index 4ad7e36..d004679 100644
36203 --- a/drivers/scsi/bfa/bfa.h
36204 +++ b/drivers/scsi/bfa/bfa.h
36205 @@ -196,7 +196,7 @@ struct bfa_hwif_s {
36206 u32 *end);
36207 int cpe_vec_q0;
36208 int rme_vec_q0;
36209 -};
36210 +} __no_const;
36211 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36212
36213 struct bfa_faa_cbfn_s {
36214 diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36215 index f0f80e2..8ec946b 100644
36216 --- a/drivers/scsi/bfa/bfa_fcpim.c
36217 +++ b/drivers/scsi/bfa/bfa_fcpim.c
36218 @@ -3715,7 +3715,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36219
36220 bfa_iotag_attach(fcp);
36221
36222 - fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36223 + fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36224 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36225 (fcp->num_itns * sizeof(struct bfa_itn_s));
36226 memset(fcp->itn_arr, 0,
36227 @@ -3773,7 +3773,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36228 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36229 {
36230 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36231 - struct bfa_itn_s *itn;
36232 + bfa_itn_s_no_const *itn;
36233
36234 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36235 itn->isr = isr;
36236 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36237 index 36f26da..38a34a8 100644
36238 --- a/drivers/scsi/bfa/bfa_fcpim.h
36239 +++ b/drivers/scsi/bfa/bfa_fcpim.h
36240 @@ -37,6 +37,7 @@ struct bfa_iotag_s {
36241 struct bfa_itn_s {
36242 bfa_isr_func_t isr;
36243 };
36244 +typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36245
36246 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36247 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36248 @@ -147,7 +148,7 @@ struct bfa_fcp_mod_s {
36249 struct list_head iotag_tio_free_q; /* free IO resources */
36250 struct list_head iotag_unused_q; /* unused IO resources*/
36251 struct bfa_iotag_s *iotag_arr;
36252 - struct bfa_itn_s *itn_arr;
36253 + bfa_itn_s_no_const *itn_arr;
36254 int num_ioim_reqs;
36255 int num_fwtio_reqs;
36256 int num_itns;
36257 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36258 index 1a99d4b..e85d64b 100644
36259 --- a/drivers/scsi/bfa/bfa_ioc.h
36260 +++ b/drivers/scsi/bfa/bfa_ioc.h
36261 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36262 bfa_ioc_disable_cbfn_t disable_cbfn;
36263 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36264 bfa_ioc_reset_cbfn_t reset_cbfn;
36265 -};
36266 +} __no_const;
36267
36268 /*
36269 * IOC event notification mechanism.
36270 @@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36271 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
36272 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
36273 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
36274 -};
36275 +} __no_const;
36276
36277 /*
36278 * Queue element to wait for room in request queue. FIFO order is
36279 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
36280 index b48c24f..dac0fbc 100644
36281 --- a/drivers/scsi/hosts.c
36282 +++ b/drivers/scsi/hosts.c
36283 @@ -42,7 +42,7 @@
36284 #include "scsi_logging.h"
36285
36286
36287 -static atomic_t scsi_host_next_hn; /* host_no for next new host */
36288 +static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
36289
36290
36291 static void scsi_host_cls_release(struct device *dev)
36292 @@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
36293 * subtract one because we increment first then return, but we need to
36294 * know what the next host number was before increment
36295 */
36296 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
36297 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
36298 shost->dma_channel = 0xff;
36299
36300 /* These three are default values which can be overridden */
36301 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
36302 index 796482b..d08435c 100644
36303 --- a/drivers/scsi/hpsa.c
36304 +++ b/drivers/scsi/hpsa.c
36305 @@ -536,7 +536,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
36306 unsigned long flags;
36307
36308 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36309 - return h->access.command_completed(h, q);
36310 + return h->access->command_completed(h, q);
36311
36312 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
36313 a = rq->head[rq->current_entry];
36314 @@ -3354,7 +3354,7 @@ static void start_io(struct ctlr_info *h)
36315 while (!list_empty(&h->reqQ)) {
36316 c = list_entry(h->reqQ.next, struct CommandList, list);
36317 /* can't do anything if fifo is full */
36318 - if ((h->access.fifo_full(h))) {
36319 + if ((h->access->fifo_full(h))) {
36320 dev_warn(&h->pdev->dev, "fifo full\n");
36321 break;
36322 }
36323 @@ -3376,7 +3376,7 @@ static void start_io(struct ctlr_info *h)
36324
36325 /* Tell the controller execute command */
36326 spin_unlock_irqrestore(&h->lock, flags);
36327 - h->access.submit_command(h, c);
36328 + h->access->submit_command(h, c);
36329 spin_lock_irqsave(&h->lock, flags);
36330 }
36331 spin_unlock_irqrestore(&h->lock, flags);
36332 @@ -3384,17 +3384,17 @@ static void start_io(struct ctlr_info *h)
36333
36334 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
36335 {
36336 - return h->access.command_completed(h, q);
36337 + return h->access->command_completed(h, q);
36338 }
36339
36340 static inline bool interrupt_pending(struct ctlr_info *h)
36341 {
36342 - return h->access.intr_pending(h);
36343 + return h->access->intr_pending(h);
36344 }
36345
36346 static inline long interrupt_not_for_us(struct ctlr_info *h)
36347 {
36348 - return (h->access.intr_pending(h) == 0) ||
36349 + return (h->access->intr_pending(h) == 0) ||
36350 (h->interrupts_enabled == 0);
36351 }
36352
36353 @@ -4298,7 +4298,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
36354 if (prod_index < 0)
36355 return -ENODEV;
36356 h->product_name = products[prod_index].product_name;
36357 - h->access = *(products[prod_index].access);
36358 + h->access = products[prod_index].access;
36359
36360 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
36361 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
36362 @@ -4580,7 +4580,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
36363
36364 assert_spin_locked(&lockup_detector_lock);
36365 remove_ctlr_from_lockup_detector_list(h);
36366 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
36367 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
36368 spin_lock_irqsave(&h->lock, flags);
36369 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
36370 spin_unlock_irqrestore(&h->lock, flags);
36371 @@ -4758,7 +4758,7 @@ reinit_after_soft_reset:
36372 }
36373
36374 /* make sure the board interrupts are off */
36375 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
36376 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
36377
36378 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
36379 goto clean2;
36380 @@ -4792,7 +4792,7 @@ reinit_after_soft_reset:
36381 * fake ones to scoop up any residual completions.
36382 */
36383 spin_lock_irqsave(&h->lock, flags);
36384 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
36385 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
36386 spin_unlock_irqrestore(&h->lock, flags);
36387 free_irqs(h);
36388 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
36389 @@ -4811,9 +4811,9 @@ reinit_after_soft_reset:
36390 dev_info(&h->pdev->dev, "Board READY.\n");
36391 dev_info(&h->pdev->dev,
36392 "Waiting for stale completions to drain.\n");
36393 - h->access.set_intr_mask(h, HPSA_INTR_ON);
36394 + h->access->set_intr_mask(h, HPSA_INTR_ON);
36395 msleep(10000);
36396 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
36397 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
36398
36399 rc = controller_reset_failed(h->cfgtable);
36400 if (rc)
36401 @@ -4834,7 +4834,7 @@ reinit_after_soft_reset:
36402 }
36403
36404 /* Turn the interrupts on so we can service requests */
36405 - h->access.set_intr_mask(h, HPSA_INTR_ON);
36406 + h->access->set_intr_mask(h, HPSA_INTR_ON);
36407
36408 hpsa_hba_inquiry(h);
36409 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
36410 @@ -4886,7 +4886,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
36411 * To write all data in the battery backed cache to disks
36412 */
36413 hpsa_flush_cache(h);
36414 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
36415 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
36416 hpsa_free_irqs_and_disable_msix(h);
36417 }
36418
36419 @@ -5055,7 +5055,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
36420 return;
36421 }
36422 /* Change the access methods to the performant access methods */
36423 - h->access = SA5_performant_access;
36424 + h->access = &SA5_performant_access;
36425 h->transMethod = CFGTBL_Trans_Performant;
36426 }
36427
36428 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
36429 index 9816479..c5d4e97 100644
36430 --- a/drivers/scsi/hpsa.h
36431 +++ b/drivers/scsi/hpsa.h
36432 @@ -79,7 +79,7 @@ struct ctlr_info {
36433 unsigned int msix_vector;
36434 unsigned int msi_vector;
36435 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
36436 - struct access_method access;
36437 + struct access_method *access;
36438
36439 /* queue and queue Info */
36440 struct list_head reqQ;
36441 diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
36442 index f2df059..a3a9930 100644
36443 --- a/drivers/scsi/ips.h
36444 +++ b/drivers/scsi/ips.h
36445 @@ -1027,7 +1027,7 @@ typedef struct {
36446 int (*intr)(struct ips_ha *);
36447 void (*enableint)(struct ips_ha *);
36448 uint32_t (*statupd)(struct ips_ha *);
36449 -} ips_hw_func_t;
36450 +} __no_const ips_hw_func_t;
36451
36452 typedef struct ips_ha {
36453 uint8_t ha_id[IPS_MAX_CHANNELS+1];
36454 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
36455 index aceffad..c35c08d 100644
36456 --- a/drivers/scsi/libfc/fc_exch.c
36457 +++ b/drivers/scsi/libfc/fc_exch.c
36458 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
36459 * all together if not used XXX
36460 */
36461 struct {
36462 - atomic_t no_free_exch;
36463 - atomic_t no_free_exch_xid;
36464 - atomic_t xid_not_found;
36465 - atomic_t xid_busy;
36466 - atomic_t seq_not_found;
36467 - atomic_t non_bls_resp;
36468 + atomic_unchecked_t no_free_exch;
36469 + atomic_unchecked_t no_free_exch_xid;
36470 + atomic_unchecked_t xid_not_found;
36471 + atomic_unchecked_t xid_busy;
36472 + atomic_unchecked_t seq_not_found;
36473 + atomic_unchecked_t non_bls_resp;
36474 } stats;
36475 };
36476
36477 @@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
36478 /* allocate memory for exchange */
36479 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
36480 if (!ep) {
36481 - atomic_inc(&mp->stats.no_free_exch);
36482 + atomic_inc_unchecked(&mp->stats.no_free_exch);
36483 goto out;
36484 }
36485 memset(ep, 0, sizeof(*ep));
36486 @@ -780,7 +780,7 @@ out:
36487 return ep;
36488 err:
36489 spin_unlock_bh(&pool->lock);
36490 - atomic_inc(&mp->stats.no_free_exch_xid);
36491 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
36492 mempool_free(ep, mp->ep_pool);
36493 return NULL;
36494 }
36495 @@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36496 xid = ntohs(fh->fh_ox_id); /* we originated exch */
36497 ep = fc_exch_find(mp, xid);
36498 if (!ep) {
36499 - atomic_inc(&mp->stats.xid_not_found);
36500 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36501 reject = FC_RJT_OX_ID;
36502 goto out;
36503 }
36504 @@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36505 ep = fc_exch_find(mp, xid);
36506 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
36507 if (ep) {
36508 - atomic_inc(&mp->stats.xid_busy);
36509 + atomic_inc_unchecked(&mp->stats.xid_busy);
36510 reject = FC_RJT_RX_ID;
36511 goto rel;
36512 }
36513 @@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36514 }
36515 xid = ep->xid; /* get our XID */
36516 } else if (!ep) {
36517 - atomic_inc(&mp->stats.xid_not_found);
36518 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36519 reject = FC_RJT_RX_ID; /* XID not found */
36520 goto out;
36521 }
36522 @@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36523 } else {
36524 sp = &ep->seq;
36525 if (sp->id != fh->fh_seq_id) {
36526 - atomic_inc(&mp->stats.seq_not_found);
36527 + atomic_inc_unchecked(&mp->stats.seq_not_found);
36528 if (f_ctl & FC_FC_END_SEQ) {
36529 /*
36530 * Update sequence_id based on incoming last
36531 @@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36532
36533 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
36534 if (!ep) {
36535 - atomic_inc(&mp->stats.xid_not_found);
36536 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36537 goto out;
36538 }
36539 if (ep->esb_stat & ESB_ST_COMPLETE) {
36540 - atomic_inc(&mp->stats.xid_not_found);
36541 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36542 goto rel;
36543 }
36544 if (ep->rxid == FC_XID_UNKNOWN)
36545 ep->rxid = ntohs(fh->fh_rx_id);
36546 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
36547 - atomic_inc(&mp->stats.xid_not_found);
36548 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36549 goto rel;
36550 }
36551 if (ep->did != ntoh24(fh->fh_s_id) &&
36552 ep->did != FC_FID_FLOGI) {
36553 - atomic_inc(&mp->stats.xid_not_found);
36554 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36555 goto rel;
36556 }
36557 sof = fr_sof(fp);
36558 @@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36559 sp->ssb_stat |= SSB_ST_RESP;
36560 sp->id = fh->fh_seq_id;
36561 } else if (sp->id != fh->fh_seq_id) {
36562 - atomic_inc(&mp->stats.seq_not_found);
36563 + atomic_inc_unchecked(&mp->stats.seq_not_found);
36564 goto rel;
36565 }
36566
36567 @@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36568 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
36569
36570 if (!sp)
36571 - atomic_inc(&mp->stats.xid_not_found);
36572 + atomic_inc_unchecked(&mp->stats.xid_not_found);
36573 else
36574 - atomic_inc(&mp->stats.non_bls_resp);
36575 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
36576
36577 fc_frame_free(fp);
36578 }
36579 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
36580 index d109cc3..09f4e7d 100644
36581 --- a/drivers/scsi/libsas/sas_ata.c
36582 +++ b/drivers/scsi/libsas/sas_ata.c
36583 @@ -529,7 +529,7 @@ static struct ata_port_operations sas_sata_ops = {
36584 .postreset = ata_std_postreset,
36585 .error_handler = ata_std_error_handler,
36586 .post_internal_cmd = sas_ata_post_internal,
36587 - .qc_defer = ata_std_qc_defer,
36588 + .qc_defer = ata_std_qc_defer,
36589 .qc_prep = ata_noop_qc_prep,
36590 .qc_issue = sas_ata_qc_issue,
36591 .qc_fill_rtf = sas_ata_qc_fill_rtf,
36592 diff --git a/drivers/scsi/lpfc/Makefile b/drivers/scsi/lpfc/Makefile
36593 index fe5d396..e93d526 100644
36594 --- a/drivers/scsi/lpfc/Makefile
36595 +++ b/drivers/scsi/lpfc/Makefile
36596 @@ -22,7 +22,7 @@
36597 ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
36598 ccflags-$(GCOV) += -O0
36599
36600 -ccflags-y += -Werror
36601 +#ccflags-y += -Werror
36602
36603 obj-$(CONFIG_SCSI_LPFC) := lpfc.o
36604
36605 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
36606 index e5da6da..c888d48 100644
36607 --- a/drivers/scsi/lpfc/lpfc.h
36608 +++ b/drivers/scsi/lpfc/lpfc.h
36609 @@ -416,7 +416,7 @@ struct lpfc_vport {
36610 struct dentry *debug_nodelist;
36611 struct dentry *vport_debugfs_root;
36612 struct lpfc_debugfs_trc *disc_trc;
36613 - atomic_t disc_trc_cnt;
36614 + atomic_unchecked_t disc_trc_cnt;
36615 #endif
36616 uint8_t stat_data_enabled;
36617 uint8_t stat_data_blocked;
36618 @@ -830,8 +830,8 @@ struct lpfc_hba {
36619 struct timer_list fabric_block_timer;
36620 unsigned long bit_flags;
36621 #define FABRIC_COMANDS_BLOCKED 0
36622 - atomic_t num_rsrc_err;
36623 - atomic_t num_cmd_success;
36624 + atomic_unchecked_t num_rsrc_err;
36625 + atomic_unchecked_t num_cmd_success;
36626 unsigned long last_rsrc_error_time;
36627 unsigned long last_ramp_down_time;
36628 unsigned long last_ramp_up_time;
36629 @@ -867,7 +867,7 @@ struct lpfc_hba {
36630
36631 struct dentry *debug_slow_ring_trc;
36632 struct lpfc_debugfs_trc *slow_ring_trc;
36633 - atomic_t slow_ring_trc_cnt;
36634 + atomic_unchecked_t slow_ring_trc_cnt;
36635 /* iDiag debugfs sub-directory */
36636 struct dentry *idiag_root;
36637 struct dentry *idiag_pci_cfg;
36638 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
36639 index 3217d63..c417981 100644
36640 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
36641 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
36642 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
36643
36644 #include <linux/debugfs.h>
36645
36646 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36647 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36648 static unsigned long lpfc_debugfs_start_time = 0L;
36649
36650 /* iDiag */
36651 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
36652 lpfc_debugfs_enable = 0;
36653
36654 len = 0;
36655 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
36656 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
36657 (lpfc_debugfs_max_disc_trc - 1);
36658 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
36659 dtp = vport->disc_trc + i;
36660 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
36661 lpfc_debugfs_enable = 0;
36662
36663 len = 0;
36664 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
36665 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
36666 (lpfc_debugfs_max_slow_ring_trc - 1);
36667 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
36668 dtp = phba->slow_ring_trc + i;
36669 @@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
36670 !vport || !vport->disc_trc)
36671 return;
36672
36673 - index = atomic_inc_return(&vport->disc_trc_cnt) &
36674 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
36675 (lpfc_debugfs_max_disc_trc - 1);
36676 dtp = vport->disc_trc + index;
36677 dtp->fmt = fmt;
36678 dtp->data1 = data1;
36679 dtp->data2 = data2;
36680 dtp->data3 = data3;
36681 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36682 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36683 dtp->jif = jiffies;
36684 #endif
36685 return;
36686 @@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
36687 !phba || !phba->slow_ring_trc)
36688 return;
36689
36690 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
36691 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
36692 (lpfc_debugfs_max_slow_ring_trc - 1);
36693 dtp = phba->slow_ring_trc + index;
36694 dtp->fmt = fmt;
36695 dtp->data1 = data1;
36696 dtp->data2 = data2;
36697 dtp->data3 = data3;
36698 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36699 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36700 dtp->jif = jiffies;
36701 #endif
36702 return;
36703 @@ -4090,7 +4090,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36704 "slow_ring buffer\n");
36705 goto debug_failed;
36706 }
36707 - atomic_set(&phba->slow_ring_trc_cnt, 0);
36708 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
36709 memset(phba->slow_ring_trc, 0,
36710 (sizeof(struct lpfc_debugfs_trc) *
36711 lpfc_debugfs_max_slow_ring_trc));
36712 @@ -4136,7 +4136,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36713 "buffer\n");
36714 goto debug_failed;
36715 }
36716 - atomic_set(&vport->disc_trc_cnt, 0);
36717 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
36718
36719 snprintf(name, sizeof(name), "discovery_trace");
36720 vport->debug_disc_trc =
36721 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
36722 index 411ed48..967f553 100644
36723 --- a/drivers/scsi/lpfc/lpfc_init.c
36724 +++ b/drivers/scsi/lpfc/lpfc_init.c
36725 @@ -10341,8 +10341,10 @@ lpfc_init(void)
36726 "misc_register returned with status %d", error);
36727
36728 if (lpfc_enable_npiv) {
36729 - lpfc_transport_functions.vport_create = lpfc_vport_create;
36730 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36731 + pax_open_kernel();
36732 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
36733 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36734 + pax_close_kernel();
36735 }
36736 lpfc_transport_template =
36737 fc_attach_transport(&lpfc_transport_functions);
36738 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
36739 index 66e0906..1620281 100644
36740 --- a/drivers/scsi/lpfc/lpfc_scsi.c
36741 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
36742 @@ -311,7 +311,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
36743 uint32_t evt_posted;
36744
36745 spin_lock_irqsave(&phba->hbalock, flags);
36746 - atomic_inc(&phba->num_rsrc_err);
36747 + atomic_inc_unchecked(&phba->num_rsrc_err);
36748 phba->last_rsrc_error_time = jiffies;
36749
36750 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
36751 @@ -352,7 +352,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
36752 unsigned long flags;
36753 struct lpfc_hba *phba = vport->phba;
36754 uint32_t evt_posted;
36755 - atomic_inc(&phba->num_cmd_success);
36756 + atomic_inc_unchecked(&phba->num_cmd_success);
36757
36758 if (vport->cfg_lun_queue_depth <= queue_depth)
36759 return;
36760 @@ -396,8 +396,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
36761 unsigned long num_rsrc_err, num_cmd_success;
36762 int i;
36763
36764 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
36765 - num_cmd_success = atomic_read(&phba->num_cmd_success);
36766 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
36767 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
36768
36769 /*
36770 * The error and success command counters are global per
36771 @@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
36772 }
36773 }
36774 lpfc_destroy_vport_work_array(phba, vports);
36775 - atomic_set(&phba->num_rsrc_err, 0);
36776 - atomic_set(&phba->num_cmd_success, 0);
36777 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
36778 + atomic_set_unchecked(&phba->num_cmd_success, 0);
36779 }
36780
36781 /**
36782 @@ -460,8 +460,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
36783 }
36784 }
36785 lpfc_destroy_vport_work_array(phba, vports);
36786 - atomic_set(&phba->num_rsrc_err, 0);
36787 - atomic_set(&phba->num_cmd_success, 0);
36788 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
36789 + atomic_set_unchecked(&phba->num_cmd_success, 0);
36790 }
36791
36792 /**
36793 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
36794 index ea8a0b4..812a124 100644
36795 --- a/drivers/scsi/pmcraid.c
36796 +++ b/drivers/scsi/pmcraid.c
36797 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
36798 res->scsi_dev = scsi_dev;
36799 scsi_dev->hostdata = res;
36800 res->change_detected = 0;
36801 - atomic_set(&res->read_failures, 0);
36802 - atomic_set(&res->write_failures, 0);
36803 + atomic_set_unchecked(&res->read_failures, 0);
36804 + atomic_set_unchecked(&res->write_failures, 0);
36805 rc = 0;
36806 }
36807 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
36808 @@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
36809
36810 /* If this was a SCSI read/write command keep count of errors */
36811 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
36812 - atomic_inc(&res->read_failures);
36813 + atomic_inc_unchecked(&res->read_failures);
36814 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
36815 - atomic_inc(&res->write_failures);
36816 + atomic_inc_unchecked(&res->write_failures);
36817
36818 if (!RES_IS_GSCSI(res->cfg_entry) &&
36819 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
36820 @@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
36821 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
36822 * hrrq_id assigned here in queuecommand
36823 */
36824 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
36825 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
36826 pinstance->num_hrrq;
36827 cmd->cmd_done = pmcraid_io_done;
36828
36829 @@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
36830 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
36831 * hrrq_id assigned here in queuecommand
36832 */
36833 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
36834 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
36835 pinstance->num_hrrq;
36836
36837 if (request_size) {
36838 @@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
36839
36840 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
36841 /* add resources only after host is added into system */
36842 - if (!atomic_read(&pinstance->expose_resources))
36843 + if (!atomic_read_unchecked(&pinstance->expose_resources))
36844 return;
36845
36846 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
36847 @@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
36848 init_waitqueue_head(&pinstance->reset_wait_q);
36849
36850 atomic_set(&pinstance->outstanding_cmds, 0);
36851 - atomic_set(&pinstance->last_message_id, 0);
36852 - atomic_set(&pinstance->expose_resources, 0);
36853 + atomic_set_unchecked(&pinstance->last_message_id, 0);
36854 + atomic_set_unchecked(&pinstance->expose_resources, 0);
36855
36856 INIT_LIST_HEAD(&pinstance->free_res_q);
36857 INIT_LIST_HEAD(&pinstance->used_res_q);
36858 @@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
36859 /* Schedule worker thread to handle CCN and take care of adding and
36860 * removing devices to OS
36861 */
36862 - atomic_set(&pinstance->expose_resources, 1);
36863 + atomic_set_unchecked(&pinstance->expose_resources, 1);
36864 schedule_work(&pinstance->worker_q);
36865 return rc;
36866
36867 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
36868 index e1d150f..6c6df44 100644
36869 --- a/drivers/scsi/pmcraid.h
36870 +++ b/drivers/scsi/pmcraid.h
36871 @@ -748,7 +748,7 @@ struct pmcraid_instance {
36872 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
36873
36874 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
36875 - atomic_t last_message_id;
36876 + atomic_unchecked_t last_message_id;
36877
36878 /* configuration table */
36879 struct pmcraid_config_table *cfg_table;
36880 @@ -777,7 +777,7 @@ struct pmcraid_instance {
36881 atomic_t outstanding_cmds;
36882
36883 /* should add/delete resources to mid-layer now ?*/
36884 - atomic_t expose_resources;
36885 + atomic_unchecked_t expose_resources;
36886
36887
36888
36889 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
36890 struct pmcraid_config_table_entry_ext cfg_entry_ext;
36891 };
36892 struct scsi_device *scsi_dev; /* Link scsi_device structure */
36893 - atomic_t read_failures; /* count of failed READ commands */
36894 - atomic_t write_failures; /* count of failed WRITE commands */
36895 + atomic_unchecked_t read_failures; /* count of failed READ commands */
36896 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
36897
36898 /* To indicate add/delete/modify during CCN */
36899 u8 change_detected;
36900 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
36901 index 5ab9530..2dd80f7 100644
36902 --- a/drivers/scsi/qla2xxx/qla_attr.c
36903 +++ b/drivers/scsi/qla2xxx/qla_attr.c
36904 @@ -1855,7 +1855,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
36905 return 0;
36906 }
36907
36908 -struct fc_function_template qla2xxx_transport_functions = {
36909 +fc_function_template_no_const qla2xxx_transport_functions = {
36910
36911 .show_host_node_name = 1,
36912 .show_host_port_name = 1,
36913 @@ -1902,7 +1902,7 @@ struct fc_function_template qla2xxx_transport_functions = {
36914 .bsg_timeout = qla24xx_bsg_timeout,
36915 };
36916
36917 -struct fc_function_template qla2xxx_transport_vport_functions = {
36918 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
36919
36920 .show_host_node_name = 1,
36921 .show_host_port_name = 1,
36922 diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
36923 index 39007f5..7fafc64 100644
36924 --- a/drivers/scsi/qla2xxx/qla_def.h
36925 +++ b/drivers/scsi/qla2xxx/qla_def.h
36926 @@ -2284,7 +2284,7 @@ struct isp_operations {
36927 int (*start_scsi) (srb_t *);
36928 int (*abort_isp) (struct scsi_qla_host *);
36929 int (*iospace_config)(struct qla_hw_data*);
36930 -};
36931 +} __no_const;
36932
36933 /* MSI-X Support *************************************************************/
36934
36935 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
36936 index 9eacd2d..d79629c 100644
36937 --- a/drivers/scsi/qla2xxx/qla_gbl.h
36938 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
36939 @@ -484,8 +484,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
36940 struct device_attribute;
36941 extern struct device_attribute *qla2x00_host_attrs[];
36942 struct fc_function_template;
36943 -extern struct fc_function_template qla2xxx_transport_functions;
36944 -extern struct fc_function_template qla2xxx_transport_vport_functions;
36945 +extern fc_function_template_no_const qla2xxx_transport_functions;
36946 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
36947 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
36948 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
36949 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
36950 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
36951 index 96a5616..eeb185a 100644
36952 --- a/drivers/scsi/qla4xxx/ql4_def.h
36953 +++ b/drivers/scsi/qla4xxx/ql4_def.h
36954 @@ -268,7 +268,7 @@ struct ddb_entry {
36955 * (4000 only) */
36956 atomic_t relogin_timer; /* Max Time to wait for
36957 * relogin to complete */
36958 - atomic_t relogin_retry_count; /* Num of times relogin has been
36959 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
36960 * retried */
36961 uint32_t default_time2wait; /* Default Min time between
36962 * relogins (+aens) */
36963 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
36964 index cd15678..f7e6846 100644
36965 --- a/drivers/scsi/qla4xxx/ql4_os.c
36966 +++ b/drivers/scsi/qla4xxx/ql4_os.c
36967 @@ -2615,12 +2615,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
36968 */
36969 if (!iscsi_is_session_online(cls_sess)) {
36970 /* Reset retry relogin timer */
36971 - atomic_inc(&ddb_entry->relogin_retry_count);
36972 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
36973 DEBUG2(ql4_printk(KERN_INFO, ha,
36974 "%s: index[%d] relogin timed out-retrying"
36975 " relogin (%d), retry (%d)\n", __func__,
36976 ddb_entry->fw_ddb_index,
36977 - atomic_read(&ddb_entry->relogin_retry_count),
36978 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
36979 ddb_entry->default_time2wait + 4));
36980 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
36981 atomic_set(&ddb_entry->retry_relogin_timer,
36982 @@ -4517,7 +4517,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
36983
36984 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
36985 atomic_set(&ddb_entry->relogin_timer, 0);
36986 - atomic_set(&ddb_entry->relogin_retry_count, 0);
36987 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
36988 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
36989 ddb_entry->default_relogin_timeout =
36990 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
36991 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
36992 index bbbc9c9..ce22f77 100644
36993 --- a/drivers/scsi/scsi.c
36994 +++ b/drivers/scsi/scsi.c
36995 @@ -659,7 +659,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
36996 unsigned long timeout;
36997 int rtn = 0;
36998
36999 - atomic_inc(&cmd->device->iorequest_cnt);
37000 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37001
37002 /* check if the device is still usable */
37003 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37004 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37005 index 495db80..fb37d59 100644
37006 --- a/drivers/scsi/scsi_lib.c
37007 +++ b/drivers/scsi/scsi_lib.c
37008 @@ -1422,7 +1422,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37009 shost = sdev->host;
37010 scsi_init_cmd_errh(cmd);
37011 cmd->result = DID_NO_CONNECT << 16;
37012 - atomic_inc(&cmd->device->iorequest_cnt);
37013 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37014
37015 /*
37016 * SCSI request completion path will do scsi_device_unbusy(),
37017 @@ -1448,9 +1448,9 @@ static void scsi_softirq_done(struct request *rq)
37018
37019 INIT_LIST_HEAD(&cmd->eh_entry);
37020
37021 - atomic_inc(&cmd->device->iodone_cnt);
37022 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
37023 if (cmd->result)
37024 - atomic_inc(&cmd->device->ioerr_cnt);
37025 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37026
37027 disposition = scsi_decide_disposition(cmd);
37028 if (disposition != SUCCESS &&
37029 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37030 index bb7c482..7551a95 100644
37031 --- a/drivers/scsi/scsi_sysfs.c
37032 +++ b/drivers/scsi/scsi_sysfs.c
37033 @@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37034 char *buf) \
37035 { \
37036 struct scsi_device *sdev = to_scsi_device(dev); \
37037 - unsigned long long count = atomic_read(&sdev->field); \
37038 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
37039 return snprintf(buf, 20, "0x%llx\n", count); \
37040 } \
37041 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37042 diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37043 index 84a1fdf..693b0d6 100644
37044 --- a/drivers/scsi/scsi_tgt_lib.c
37045 +++ b/drivers/scsi/scsi_tgt_lib.c
37046 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37047 int err;
37048
37049 dprintk("%lx %u\n", uaddr, len);
37050 - err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37051 + err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37052 if (err) {
37053 /*
37054 * TODO: need to fixup sg_tablesize, max_segment_size,
37055 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37056 index 5797604..289a5b5 100644
37057 --- a/drivers/scsi/scsi_transport_fc.c
37058 +++ b/drivers/scsi/scsi_transport_fc.c
37059 @@ -498,7 +498,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37060 * Netlink Infrastructure
37061 */
37062
37063 -static atomic_t fc_event_seq;
37064 +static atomic_unchecked_t fc_event_seq;
37065
37066 /**
37067 * fc_get_event_number - Obtain the next sequential FC event number
37068 @@ -511,7 +511,7 @@ static atomic_t fc_event_seq;
37069 u32
37070 fc_get_event_number(void)
37071 {
37072 - return atomic_add_return(1, &fc_event_seq);
37073 + return atomic_add_return_unchecked(1, &fc_event_seq);
37074 }
37075 EXPORT_SYMBOL(fc_get_event_number);
37076
37077 @@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
37078 {
37079 int error;
37080
37081 - atomic_set(&fc_event_seq, 0);
37082 + atomic_set_unchecked(&fc_event_seq, 0);
37083
37084 error = transport_class_register(&fc_host_class);
37085 if (error)
37086 @@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37087 char *cp;
37088
37089 *val = simple_strtoul(buf, &cp, 0);
37090 - if ((*cp && (*cp != '\n')) || (*val < 0))
37091 + if (*cp && (*cp != '\n'))
37092 return -EINVAL;
37093 /*
37094 * Check for overflow; dev_loss_tmo is u32
37095 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37096 index 1cf640e..78e9014 100644
37097 --- a/drivers/scsi/scsi_transport_iscsi.c
37098 +++ b/drivers/scsi/scsi_transport_iscsi.c
37099 @@ -79,7 +79,7 @@ struct iscsi_internal {
37100 struct transport_container session_cont;
37101 };
37102
37103 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37104 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37105 static struct workqueue_struct *iscsi_eh_timer_workq;
37106
37107 static DEFINE_IDA(iscsi_sess_ida);
37108 @@ -1064,7 +1064,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37109 int err;
37110
37111 ihost = shost->shost_data;
37112 - session->sid = atomic_add_return(1, &iscsi_session_nr);
37113 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37114
37115 if (target_id == ISCSI_MAX_TARGET) {
37116 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37117 @@ -2940,7 +2940,7 @@ static __init int iscsi_transport_init(void)
37118 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37119 ISCSI_TRANSPORT_VERSION);
37120
37121 - atomic_set(&iscsi_session_nr, 0);
37122 + atomic_set_unchecked(&iscsi_session_nr, 0);
37123
37124 err = class_register(&iscsi_transport_class);
37125 if (err)
37126 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37127 index 21a045e..ec89e03 100644
37128 --- a/drivers/scsi/scsi_transport_srp.c
37129 +++ b/drivers/scsi/scsi_transport_srp.c
37130 @@ -33,7 +33,7 @@
37131 #include "scsi_transport_srp_internal.h"
37132
37133 struct srp_host_attrs {
37134 - atomic_t next_port_id;
37135 + atomic_unchecked_t next_port_id;
37136 };
37137 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37138
37139 @@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37140 struct Scsi_Host *shost = dev_to_shost(dev);
37141 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37142
37143 - atomic_set(&srp_host->next_port_id, 0);
37144 + atomic_set_unchecked(&srp_host->next_port_id, 0);
37145 return 0;
37146 }
37147
37148 @@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37149 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37150 rport->roles = ids->roles;
37151
37152 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37153 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37154 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37155
37156 transport_setup_device(&rport->dev);
37157 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37158 index 9c5c5f2..8414557 100644
37159 --- a/drivers/scsi/sg.c
37160 +++ b/drivers/scsi/sg.c
37161 @@ -1101,7 +1101,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37162 sdp->disk->disk_name,
37163 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37164 NULL,
37165 - (char *)arg);
37166 + (char __user *)arg);
37167 case BLKTRACESTART:
37168 return blk_trace_startstop(sdp->device->request_queue, 1);
37169 case BLKTRACESTOP:
37170 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37171 index 1041cb8..4a946fa 100644
37172 --- a/drivers/spi/spi.c
37173 +++ b/drivers/spi/spi.c
37174 @@ -1453,7 +1453,7 @@ int spi_bus_unlock(struct spi_master *master)
37175 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37176
37177 /* portable code must never pass more than 32 bytes */
37178 -#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37179 +#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37180
37181 static u8 *buf;
37182
37183 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37184 index 34afc16..ffe44dd 100644
37185 --- a/drivers/staging/octeon/ethernet-rx.c
37186 +++ b/drivers/staging/octeon/ethernet-rx.c
37187 @@ -421,11 +421,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37188 /* Increment RX stats for virtual ports */
37189 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37190 #ifdef CONFIG_64BIT
37191 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37192 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37193 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37194 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37195 #else
37196 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37197 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37198 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37199 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37200 #endif
37201 }
37202 netif_receive_skb(skb);
37203 @@ -437,9 +437,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37204 dev->name);
37205 */
37206 #ifdef CONFIG_64BIT
37207 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37208 + atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37209 #else
37210 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37211 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37212 #endif
37213 dev_kfree_skb_irq(skb);
37214 }
37215 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37216 index 18f7a79..cc3bc24 100644
37217 --- a/drivers/staging/octeon/ethernet.c
37218 +++ b/drivers/staging/octeon/ethernet.c
37219 @@ -259,11 +259,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37220 * since the RX tasklet also increments it.
37221 */
37222 #ifdef CONFIG_64BIT
37223 - atomic64_add(rx_status.dropped_packets,
37224 - (atomic64_t *)&priv->stats.rx_dropped);
37225 + atomic64_add_unchecked(rx_status.dropped_packets,
37226 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37227 #else
37228 - atomic_add(rx_status.dropped_packets,
37229 - (atomic_t *)&priv->stats.rx_dropped);
37230 + atomic_add_unchecked(rx_status.dropped_packets,
37231 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
37232 #endif
37233 }
37234
37235 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37236 index dc23395..cf7e9b1 100644
37237 --- a/drivers/staging/rtl8712/rtl871x_io.h
37238 +++ b/drivers/staging/rtl8712/rtl871x_io.h
37239 @@ -108,7 +108,7 @@ struct _io_ops {
37240 u8 *pmem);
37241 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
37242 u8 *pmem);
37243 -};
37244 +} __no_const;
37245
37246 struct io_req {
37247 struct list_head list;
37248 diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
37249 index c7b5e8b..783d6cb 100644
37250 --- a/drivers/staging/sbe-2t3e3/netdev.c
37251 +++ b/drivers/staging/sbe-2t3e3/netdev.c
37252 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37253 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
37254
37255 if (rlen)
37256 - if (copy_to_user(data, &resp, rlen))
37257 + if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
37258 return -EFAULT;
37259
37260 return 0;
37261 diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
37262 index 42cdafe..2769103 100644
37263 --- a/drivers/staging/speakup/speakup_soft.c
37264 +++ b/drivers/staging/speakup/speakup_soft.c
37265 @@ -241,11 +241,11 @@ static ssize_t softsynth_read(struct file *fp, char *buf, size_t count,
37266 break;
37267 } else if (!initialized) {
37268 if (*init) {
37269 - ch = *init;
37270 init++;
37271 } else {
37272 initialized = 1;
37273 }
37274 + ch = *init;
37275 } else {
37276 ch = synth_buffer_getc();
37277 }
37278 diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
37279 index 5d89c0f..9261317 100644
37280 --- a/drivers/staging/usbip/usbip_common.h
37281 +++ b/drivers/staging/usbip/usbip_common.h
37282 @@ -289,7 +289,7 @@ struct usbip_device {
37283 void (*shutdown)(struct usbip_device *);
37284 void (*reset)(struct usbip_device *);
37285 void (*unusable)(struct usbip_device *);
37286 - } eh_ops;
37287 + } __no_const eh_ops;
37288 };
37289
37290 #define kthread_get_run(threadfn, data, namefmt, ...) \
37291 diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
37292 index 88b3298..3783eee 100644
37293 --- a/drivers/staging/usbip/vhci.h
37294 +++ b/drivers/staging/usbip/vhci.h
37295 @@ -88,7 +88,7 @@ struct vhci_hcd {
37296 unsigned resuming:1;
37297 unsigned long re_timeout;
37298
37299 - atomic_t seqnum;
37300 + atomic_unchecked_t seqnum;
37301
37302 /*
37303 * NOTE:
37304 diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
37305 index f708cba..2de6d72 100644
37306 --- a/drivers/staging/usbip/vhci_hcd.c
37307 +++ b/drivers/staging/usbip/vhci_hcd.c
37308 @@ -488,7 +488,7 @@ static void vhci_tx_urb(struct urb *urb)
37309 return;
37310 }
37311
37312 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
37313 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37314 if (priv->seqnum == 0xffff)
37315 dev_info(&urb->dev->dev, "seqnum max\n");
37316
37317 @@ -740,7 +740,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
37318 return -ENOMEM;
37319 }
37320
37321 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
37322 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37323 if (unlink->seqnum == 0xffff)
37324 pr_info("seqnum max\n");
37325
37326 @@ -928,7 +928,7 @@ static int vhci_start(struct usb_hcd *hcd)
37327 vdev->rhport = rhport;
37328 }
37329
37330 - atomic_set(&vhci->seqnum, 0);
37331 + atomic_set_unchecked(&vhci->seqnum, 0);
37332 spin_lock_init(&vhci->lock);
37333
37334 hcd->power_budget = 0; /* no limit */
37335 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
37336 index f0eaf04..5a82e06 100644
37337 --- a/drivers/staging/usbip/vhci_rx.c
37338 +++ b/drivers/staging/usbip/vhci_rx.c
37339 @@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
37340 if (!urb) {
37341 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
37342 pr_info("max seqnum %d\n",
37343 - atomic_read(&the_controller->seqnum));
37344 + atomic_read_unchecked(&the_controller->seqnum));
37345 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
37346 return;
37347 }
37348 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
37349 index 7735027..30eed13 100644
37350 --- a/drivers/staging/vt6655/hostap.c
37351 +++ b/drivers/staging/vt6655/hostap.c
37352 @@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
37353 *
37354 */
37355
37356 +static net_device_ops_no_const apdev_netdev_ops;
37357 +
37358 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37359 {
37360 PSDevice apdev_priv;
37361 struct net_device *dev = pDevice->dev;
37362 int ret;
37363 - const struct net_device_ops apdev_netdev_ops = {
37364 - .ndo_start_xmit = pDevice->tx_80211,
37365 - };
37366
37367 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37368
37369 @@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37370 *apdev_priv = *pDevice;
37371 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37372
37373 + /* only half broken now */
37374 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37375 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37376
37377 pDevice->apdev->type = ARPHRD_IEEE80211;
37378 diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
37379 index 51b5adf..098e320 100644
37380 --- a/drivers/staging/vt6656/hostap.c
37381 +++ b/drivers/staging/vt6656/hostap.c
37382 @@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
37383 *
37384 */
37385
37386 +static net_device_ops_no_const apdev_netdev_ops;
37387 +
37388 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37389 {
37390 PSDevice apdev_priv;
37391 struct net_device *dev = pDevice->dev;
37392 int ret;
37393 - const struct net_device_ops apdev_netdev_ops = {
37394 - .ndo_start_xmit = pDevice->tx_80211,
37395 - };
37396
37397 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37398
37399 @@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37400 *apdev_priv = *pDevice;
37401 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37402
37403 + /* only half broken now */
37404 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37405 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37406
37407 pDevice->apdev->type = ARPHRD_IEEE80211;
37408 diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
37409 index 7843dfd..3db105f 100644
37410 --- a/drivers/staging/wlan-ng/hfa384x_usb.c
37411 +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
37412 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
37413
37414 struct usbctlx_completor {
37415 int (*complete) (struct usbctlx_completor *);
37416 -};
37417 +} __no_const;
37418
37419 static int
37420 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
37421 diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
37422 index 1ca66ea..76f1343 100644
37423 --- a/drivers/staging/zcache/tmem.c
37424 +++ b/drivers/staging/zcache/tmem.c
37425 @@ -39,7 +39,7 @@
37426 * A tmem host implementation must use this function to register callbacks
37427 * for memory allocation.
37428 */
37429 -static struct tmem_hostops tmem_hostops;
37430 +static tmem_hostops_no_const tmem_hostops;
37431
37432 static void tmem_objnode_tree_init(void);
37433
37434 @@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
37435 * A tmem host implementation must use this function to register
37436 * callbacks for a page-accessible memory (PAM) implementation
37437 */
37438 -static struct tmem_pamops tmem_pamops;
37439 +static tmem_pamops_no_const tmem_pamops;
37440
37441 void tmem_register_pamops(struct tmem_pamops *m)
37442 {
37443 diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
37444 index 0d4aa82..f7832d4 100644
37445 --- a/drivers/staging/zcache/tmem.h
37446 +++ b/drivers/staging/zcache/tmem.h
37447 @@ -180,6 +180,7 @@ struct tmem_pamops {
37448 void (*new_obj)(struct tmem_obj *);
37449 int (*replace_in_obj)(void *, struct tmem_obj *);
37450 };
37451 +typedef struct tmem_pamops __no_const tmem_pamops_no_const;
37452 extern void tmem_register_pamops(struct tmem_pamops *m);
37453
37454 /* memory allocation methods provided by the host implementation */
37455 @@ -189,6 +190,7 @@ struct tmem_hostops {
37456 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
37457 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
37458 };
37459 +typedef struct tmem_hostops __no_const tmem_hostops_no_const;
37460 extern void tmem_register_hostops(struct tmem_hostops *m);
37461
37462 /* core tmem accessor functions */
37463 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
37464 index c6c385f..b23c65d 100644
37465 --- a/drivers/target/target_core_transport.c
37466 +++ b/drivers/target/target_core_transport.c
37467 @@ -1233,7 +1233,7 @@ struct se_device *transport_add_device_to_core_hba(
37468 spin_lock_init(&dev->se_port_lock);
37469 spin_lock_init(&dev->se_tmr_lock);
37470 spin_lock_init(&dev->qf_cmd_lock);
37471 - atomic_set(&dev->dev_ordered_id, 0);
37472 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
37473
37474 se_dev_set_default_attribs(dev, dev_limits);
37475
37476 @@ -1402,7 +1402,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
37477 * Used to determine when ORDERED commands should go from
37478 * Dormant to Active status.
37479 */
37480 - cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
37481 + cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
37482 smp_mb__after_atomic_inc();
37483 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
37484 cmd->se_ordered_id, cmd->sam_task_attr,
37485 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
37486 index e61cabd..7617d26 100644
37487 --- a/drivers/tty/cyclades.c
37488 +++ b/drivers/tty/cyclades.c
37489 @@ -1589,10 +1589,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
37490 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
37491 info->port.count);
37492 #endif
37493 - info->port.count++;
37494 + atomic_inc(&info->port.count);
37495 #ifdef CY_DEBUG_COUNT
37496 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
37497 - current->pid, info->port.count);
37498 + current->pid, atomic_read(&info->port.count));
37499 #endif
37500
37501 /*
37502 @@ -3987,7 +3987,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
37503 for (j = 0; j < cy_card[i].nports; j++) {
37504 info = &cy_card[i].ports[j];
37505
37506 - if (info->port.count) {
37507 + if (atomic_read(&info->port.count)) {
37508 /* XXX is the ldisc num worth this? */
37509 struct tty_struct *tty;
37510 struct tty_ldisc *ld;
37511 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
37512 index 2d691eb..be02ebd 100644
37513 --- a/drivers/tty/hvc/hvc_console.c
37514 +++ b/drivers/tty/hvc/hvc_console.c
37515 @@ -315,7 +315,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
37516
37517 spin_lock_irqsave(&hp->port.lock, flags);
37518 /* Check and then increment for fast path open. */
37519 - if (hp->port.count++ > 0) {
37520 + if (atomic_inc_return(&hp->port.count) > 1) {
37521 spin_unlock_irqrestore(&hp->port.lock, flags);
37522 hvc_kick();
37523 return 0;
37524 @@ -366,7 +366,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
37525
37526 spin_lock_irqsave(&hp->port.lock, flags);
37527
37528 - if (--hp->port.count == 0) {
37529 + if (atomic_dec_return(&hp->port.count) == 0) {
37530 spin_unlock_irqrestore(&hp->port.lock, flags);
37531 /* We are done with the tty pointer now. */
37532 tty_port_tty_set(&hp->port, NULL);
37533 @@ -384,9 +384,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
37534 */
37535 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
37536 } else {
37537 - if (hp->port.count < 0)
37538 + if (atomic_read(&hp->port.count) < 0)
37539 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
37540 - hp->vtermno, hp->port.count);
37541 + hp->vtermno, atomic_read(&hp->port.count));
37542 spin_unlock_irqrestore(&hp->port.lock, flags);
37543 }
37544
37545 @@ -412,13 +412,13 @@ static void hvc_hangup(struct tty_struct *tty)
37546 * open->hangup case this can be called after the final close so prevent
37547 * that from happening for now.
37548 */
37549 - if (hp->port.count <= 0) {
37550 + if (atomic_read(&hp->port.count) <= 0) {
37551 spin_unlock_irqrestore(&hp->port.lock, flags);
37552 return;
37553 }
37554
37555 - temp_open_count = hp->port.count;
37556 - hp->port.count = 0;
37557 + temp_open_count = atomic_read(&hp->port.count);
37558 + atomic_set(&hp->port.count, 0);
37559 spin_unlock_irqrestore(&hp->port.lock, flags);
37560 tty_port_tty_set(&hp->port, NULL);
37561
37562 @@ -471,7 +471,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
37563 return -EPIPE;
37564
37565 /* FIXME what's this (unprotected) check for? */
37566 - if (hp->port.count <= 0)
37567 + if (atomic_read(&hp->port.count) <= 0)
37568 return -EIO;
37569
37570 spin_lock_irqsave(&hp->lock, flags);
37571 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
37572 index d56788c..12d8f85 100644
37573 --- a/drivers/tty/hvc/hvcs.c
37574 +++ b/drivers/tty/hvc/hvcs.c
37575 @@ -83,6 +83,7 @@
37576 #include <asm/hvcserver.h>
37577 #include <asm/uaccess.h>
37578 #include <asm/vio.h>
37579 +#include <asm/local.h>
37580
37581 /*
37582 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
37583 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
37584
37585 spin_lock_irqsave(&hvcsd->lock, flags);
37586
37587 - if (hvcsd->port.count > 0) {
37588 + if (atomic_read(&hvcsd->port.count) > 0) {
37589 spin_unlock_irqrestore(&hvcsd->lock, flags);
37590 printk(KERN_INFO "HVCS: vterm state unchanged. "
37591 "The hvcs device node is still in use.\n");
37592 @@ -1134,7 +1135,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
37593 if ((retval = hvcs_partner_connect(hvcsd)))
37594 goto error_release;
37595
37596 - hvcsd->port.count = 1;
37597 + atomic_set(&hvcsd->port.count, 1);
37598 hvcsd->port.tty = tty;
37599 tty->driver_data = hvcsd;
37600
37601 @@ -1168,7 +1169,7 @@ fast_open:
37602
37603 spin_lock_irqsave(&hvcsd->lock, flags);
37604 tty_port_get(&hvcsd->port);
37605 - hvcsd->port.count++;
37606 + atomic_inc(&hvcsd->port.count);
37607 hvcsd->todo_mask |= HVCS_SCHED_READ;
37608 spin_unlock_irqrestore(&hvcsd->lock, flags);
37609
37610 @@ -1212,7 +1213,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
37611 hvcsd = tty->driver_data;
37612
37613 spin_lock_irqsave(&hvcsd->lock, flags);
37614 - if (--hvcsd->port.count == 0) {
37615 + if (atomic_dec_and_test(&hvcsd->port.count)) {
37616
37617 vio_disable_interrupts(hvcsd->vdev);
37618
37619 @@ -1238,10 +1239,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
37620 free_irq(irq, hvcsd);
37621 tty_port_put(&hvcsd->port);
37622 return;
37623 - } else if (hvcsd->port.count < 0) {
37624 + } else if (atomic_read(&hvcsd->port.count) < 0) {
37625 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
37626 " is missmanaged.\n",
37627 - hvcsd->vdev->unit_address, hvcsd->port.count);
37628 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
37629 }
37630
37631 spin_unlock_irqrestore(&hvcsd->lock, flags);
37632 @@ -1257,7 +1258,7 @@ static void hvcs_hangup(struct tty_struct * tty)
37633
37634 spin_lock_irqsave(&hvcsd->lock, flags);
37635 /* Preserve this so that we know how many kref refs to put */
37636 - temp_open_count = hvcsd->port.count;
37637 + temp_open_count = atomic_read(&hvcsd->port.count);
37638
37639 /*
37640 * Don't kref put inside the spinlock because the destruction
37641 @@ -1272,7 +1273,7 @@ static void hvcs_hangup(struct tty_struct * tty)
37642 tty->driver_data = NULL;
37643 hvcsd->port.tty = NULL;
37644
37645 - hvcsd->port.count = 0;
37646 + atomic_set(&hvcsd->port.count, 0);
37647
37648 /* This will drop any buffered data on the floor which is OK in a hangup
37649 * scenario. */
37650 @@ -1343,7 +1344,7 @@ static int hvcs_write(struct tty_struct *tty,
37651 * the middle of a write operation? This is a crummy place to do this
37652 * but we want to keep it all in the spinlock.
37653 */
37654 - if (hvcsd->port.count <= 0) {
37655 + if (atomic_read(&hvcsd->port.count) <= 0) {
37656 spin_unlock_irqrestore(&hvcsd->lock, flags);
37657 return -ENODEV;
37658 }
37659 @@ -1417,7 +1418,7 @@ static int hvcs_write_room(struct tty_struct *tty)
37660 {
37661 struct hvcs_struct *hvcsd = tty->driver_data;
37662
37663 - if (!hvcsd || hvcsd->port.count <= 0)
37664 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
37665 return 0;
37666
37667 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
37668 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
37669 index f8b5fa0..4ba9f89 100644
37670 --- a/drivers/tty/ipwireless/tty.c
37671 +++ b/drivers/tty/ipwireless/tty.c
37672 @@ -29,6 +29,7 @@
37673 #include <linux/tty_driver.h>
37674 #include <linux/tty_flip.h>
37675 #include <linux/uaccess.h>
37676 +#include <asm/local.h>
37677
37678 #include "tty.h"
37679 #include "network.h"
37680 @@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
37681 mutex_unlock(&tty->ipw_tty_mutex);
37682 return -ENODEV;
37683 }
37684 - if (tty->port.count == 0)
37685 + if (atomic_read(&tty->port.count) == 0)
37686 tty->tx_bytes_queued = 0;
37687
37688 - tty->port.count++;
37689 + atomic_inc(&tty->port.count);
37690
37691 tty->port.tty = linux_tty;
37692 linux_tty->driver_data = tty;
37693 @@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
37694
37695 static void do_ipw_close(struct ipw_tty *tty)
37696 {
37697 - tty->port.count--;
37698 -
37699 - if (tty->port.count == 0) {
37700 + if (atomic_dec_return(&tty->port.count) == 0) {
37701 struct tty_struct *linux_tty = tty->port.tty;
37702
37703 if (linux_tty != NULL) {
37704 @@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
37705 return;
37706
37707 mutex_lock(&tty->ipw_tty_mutex);
37708 - if (tty->port.count == 0) {
37709 + if (atomic_read(&tty->port.count) == 0) {
37710 mutex_unlock(&tty->ipw_tty_mutex);
37711 return;
37712 }
37713 @@ -170,7 +169,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
37714 return;
37715 }
37716
37717 - if (!tty->port.count) {
37718 + if (!atomic_read(&tty->port.count)) {
37719 mutex_unlock(&tty->ipw_tty_mutex);
37720 return;
37721 }
37722 @@ -212,7 +211,7 @@ static int ipw_write(struct tty_struct *linux_tty,
37723 return -ENODEV;
37724
37725 mutex_lock(&tty->ipw_tty_mutex);
37726 - if (!tty->port.count) {
37727 + if (!atomic_read(&tty->port.count)) {
37728 mutex_unlock(&tty->ipw_tty_mutex);
37729 return -EINVAL;
37730 }
37731 @@ -252,7 +251,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
37732 if (!tty)
37733 return -ENODEV;
37734
37735 - if (!tty->port.count)
37736 + if (!atomic_read(&tty->port.count))
37737 return -EINVAL;
37738
37739 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
37740 @@ -294,7 +293,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
37741 if (!tty)
37742 return 0;
37743
37744 - if (!tty->port.count)
37745 + if (!atomic_read(&tty->port.count))
37746 return 0;
37747
37748 return tty->tx_bytes_queued;
37749 @@ -375,7 +374,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
37750 if (!tty)
37751 return -ENODEV;
37752
37753 - if (!tty->port.count)
37754 + if (!atomic_read(&tty->port.count))
37755 return -EINVAL;
37756
37757 return get_control_lines(tty);
37758 @@ -391,7 +390,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
37759 if (!tty)
37760 return -ENODEV;
37761
37762 - if (!tty->port.count)
37763 + if (!atomic_read(&tty->port.count))
37764 return -EINVAL;
37765
37766 return set_control_lines(tty, set, clear);
37767 @@ -405,7 +404,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
37768 if (!tty)
37769 return -ENODEV;
37770
37771 - if (!tty->port.count)
37772 + if (!atomic_read(&tty->port.count))
37773 return -EINVAL;
37774
37775 /* FIXME: Exactly how is the tty object locked here .. */
37776 @@ -561,7 +560,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
37777 * are gone */
37778 mutex_lock(&ttyj->ipw_tty_mutex);
37779 }
37780 - while (ttyj->port.count)
37781 + while (atomic_read(&ttyj->port.count))
37782 do_ipw_close(ttyj);
37783 ipwireless_disassociate_network_ttys(network,
37784 ttyj->channel_idx);
37785 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
37786 index 324467d..504cc25 100644
37787 --- a/drivers/tty/moxa.c
37788 +++ b/drivers/tty/moxa.c
37789 @@ -1172,7 +1172,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
37790 }
37791
37792 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
37793 - ch->port.count++;
37794 + atomic_inc(&ch->port.count);
37795 tty->driver_data = ch;
37796 tty_port_tty_set(&ch->port, tty);
37797 mutex_lock(&ch->port.mutex);
37798 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
37799 index c43b683..4dab83e 100644
37800 --- a/drivers/tty/n_gsm.c
37801 +++ b/drivers/tty/n_gsm.c
37802 @@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
37803 kref_init(&dlci->ref);
37804 mutex_init(&dlci->mutex);
37805 dlci->fifo = &dlci->_fifo;
37806 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
37807 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
37808 kfree(dlci);
37809 return NULL;
37810 }
37811 @@ -2895,7 +2895,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
37812 if (dlci == NULL)
37813 return -ENOMEM;
37814 port = &dlci->port;
37815 - port->count++;
37816 + atomic_inc(&port->count);
37817 tty->driver_data = dlci;
37818 dlci_get(dlci);
37819 dlci_get(dlci->gsm->dlci[0]);
37820 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
37821 index ee1c268..0e97caf 100644
37822 --- a/drivers/tty/n_tty.c
37823 +++ b/drivers/tty/n_tty.c
37824 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
37825 {
37826 *ops = tty_ldisc_N_TTY;
37827 ops->owner = NULL;
37828 - ops->refcount = ops->flags = 0;
37829 + atomic_set(&ops->refcount, 0);
37830 + ops->flags = 0;
37831 }
37832 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
37833 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
37834 index 5505ffc..7affff9 100644
37835 --- a/drivers/tty/pty.c
37836 +++ b/drivers/tty/pty.c
37837 @@ -718,8 +718,10 @@ static void __init unix98_pty_init(void)
37838 panic("Couldn't register Unix98 pts driver");
37839
37840 /* Now create the /dev/ptmx special device */
37841 + pax_open_kernel();
37842 tty_default_fops(&ptmx_fops);
37843 - ptmx_fops.open = ptmx_open;
37844 + *(void **)&ptmx_fops.open = ptmx_open;
37845 + pax_close_kernel();
37846
37847 cdev_init(&ptmx_cdev, &ptmx_fops);
37848 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
37849 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
37850 index 777d5f9..56d67ca 100644
37851 --- a/drivers/tty/rocket.c
37852 +++ b/drivers/tty/rocket.c
37853 @@ -924,7 +924,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
37854 tty->driver_data = info;
37855 tty_port_tty_set(port, tty);
37856
37857 - if (port->count++ == 0) {
37858 + if (atomic_inc_return(&port->count) == 1) {
37859 atomic_inc(&rp_num_ports_open);
37860
37861 #ifdef ROCKET_DEBUG_OPEN
37862 @@ -933,7 +933,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
37863 #endif
37864 }
37865 #ifdef ROCKET_DEBUG_OPEN
37866 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
37867 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
37868 #endif
37869
37870 /*
37871 @@ -1528,7 +1528,7 @@ static void rp_hangup(struct tty_struct *tty)
37872 spin_unlock_irqrestore(&info->port.lock, flags);
37873 return;
37874 }
37875 - if (info->port.count)
37876 + if (atomic_read(&info->port.count))
37877 atomic_dec(&rp_num_ports_open);
37878 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
37879 spin_unlock_irqrestore(&info->port.lock, flags);
37880 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
37881 index 2b42a01..32a2ed3 100644
37882 --- a/drivers/tty/serial/kgdboc.c
37883 +++ b/drivers/tty/serial/kgdboc.c
37884 @@ -24,8 +24,9 @@
37885 #define MAX_CONFIG_LEN 40
37886
37887 static struct kgdb_io kgdboc_io_ops;
37888 +static struct kgdb_io kgdboc_io_ops_console;
37889
37890 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
37891 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
37892 static int configured = -1;
37893
37894 static char config[MAX_CONFIG_LEN];
37895 @@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
37896 kgdboc_unregister_kbd();
37897 if (configured == 1)
37898 kgdb_unregister_io_module(&kgdboc_io_ops);
37899 + else if (configured == 2)
37900 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
37901 }
37902
37903 static int configure_kgdboc(void)
37904 @@ -157,13 +160,13 @@ static int configure_kgdboc(void)
37905 int err;
37906 char *cptr = config;
37907 struct console *cons;
37908 + int is_console = 0;
37909
37910 err = kgdboc_option_setup(config);
37911 if (err || !strlen(config) || isspace(config[0]))
37912 goto noconfig;
37913
37914 err = -ENODEV;
37915 - kgdboc_io_ops.is_console = 0;
37916 kgdb_tty_driver = NULL;
37917
37918 kgdboc_use_kms = 0;
37919 @@ -184,7 +187,7 @@ static int configure_kgdboc(void)
37920 int idx;
37921 if (cons->device && cons->device(cons, &idx) == p &&
37922 idx == tty_line) {
37923 - kgdboc_io_ops.is_console = 1;
37924 + is_console = 1;
37925 break;
37926 }
37927 cons = cons->next;
37928 @@ -194,12 +197,16 @@ static int configure_kgdboc(void)
37929 kgdb_tty_line = tty_line;
37930
37931 do_register:
37932 - err = kgdb_register_io_module(&kgdboc_io_ops);
37933 + if (is_console) {
37934 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
37935 + configured = 2;
37936 + } else {
37937 + err = kgdb_register_io_module(&kgdboc_io_ops);
37938 + configured = 1;
37939 + }
37940 if (err)
37941 goto noconfig;
37942
37943 - configured = 1;
37944 -
37945 return 0;
37946
37947 noconfig:
37948 @@ -213,7 +220,7 @@ noconfig:
37949 static int __init init_kgdboc(void)
37950 {
37951 /* Already configured? */
37952 - if (configured == 1)
37953 + if (configured >= 1)
37954 return 0;
37955
37956 return configure_kgdboc();
37957 @@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
37958 if (config[len - 1] == '\n')
37959 config[len - 1] = '\0';
37960
37961 - if (configured == 1)
37962 + if (configured >= 1)
37963 cleanup_kgdboc();
37964
37965 /* Go and configure with the new params. */
37966 @@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
37967 .post_exception = kgdboc_post_exp_handler,
37968 };
37969
37970 +static struct kgdb_io kgdboc_io_ops_console = {
37971 + .name = "kgdboc",
37972 + .read_char = kgdboc_get_char,
37973 + .write_char = kgdboc_put_char,
37974 + .pre_exception = kgdboc_pre_exp_handler,
37975 + .post_exception = kgdboc_post_exp_handler,
37976 + .is_console = 1
37977 +};
37978 +
37979 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
37980 /* This is only available if kgdboc is a built in for early debugging */
37981 static int __init kgdboc_early_init(char *opt)
37982 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
37983 index 246b823..9e0db76 100644
37984 --- a/drivers/tty/serial/serial_core.c
37985 +++ b/drivers/tty/serial/serial_core.c
37986 @@ -1392,7 +1392,7 @@ static void uart_hangup(struct tty_struct *tty)
37987 uart_flush_buffer(tty);
37988 uart_shutdown(tty, state);
37989 spin_lock_irqsave(&port->lock, flags);
37990 - port->count = 0;
37991 + atomic_set(&port->count, 0);
37992 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
37993 spin_unlock_irqrestore(&port->lock, flags);
37994 tty_port_tty_set(port, NULL);
37995 @@ -1488,7 +1488,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
37996 goto end;
37997 }
37998
37999 - port->count++;
38000 + atomic_inc(&port->count);
38001 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
38002 retval = -ENXIO;
38003 goto err_dec_count;
38004 @@ -1515,7 +1515,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
38005 /*
38006 * Make sure the device is in D0 state.
38007 */
38008 - if (port->count == 1)
38009 + if (atomic_read(&port->count) == 1)
38010 uart_change_pm(state, 0);
38011
38012 /*
38013 @@ -1533,7 +1533,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
38014 end:
38015 return retval;
38016 err_dec_count:
38017 - port->count--;
38018 + atomic_inc(&port->count);
38019 mutex_unlock(&port->mutex);
38020 goto end;
38021 }
38022 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
38023 index 593d40a..bdc61f3 100644
38024 --- a/drivers/tty/synclink.c
38025 +++ b/drivers/tty/synclink.c
38026 @@ -3095,7 +3095,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
38027
38028 if (debug_level >= DEBUG_LEVEL_INFO)
38029 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
38030 - __FILE__,__LINE__, info->device_name, info->port.count);
38031 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
38032
38033 if (tty_port_close_start(&info->port, tty, filp) == 0)
38034 goto cleanup;
38035 @@ -3113,7 +3113,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
38036 cleanup:
38037 if (debug_level >= DEBUG_LEVEL_INFO)
38038 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
38039 - tty->driver->name, info->port.count);
38040 + tty->driver->name, atomic_read(&info->port.count));
38041
38042 } /* end of mgsl_close() */
38043
38044 @@ -3212,8 +3212,8 @@ static void mgsl_hangup(struct tty_struct *tty)
38045
38046 mgsl_flush_buffer(tty);
38047 shutdown(info);
38048 -
38049 - info->port.count = 0;
38050 +
38051 + atomic_set(&info->port.count, 0);
38052 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
38053 info->port.tty = NULL;
38054
38055 @@ -3302,12 +3302,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
38056
38057 if (debug_level >= DEBUG_LEVEL_INFO)
38058 printk("%s(%d):block_til_ready before block on %s count=%d\n",
38059 - __FILE__,__LINE__, tty->driver->name, port->count );
38060 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38061
38062 spin_lock_irqsave(&info->irq_spinlock, flags);
38063 if (!tty_hung_up_p(filp)) {
38064 extra_count = true;
38065 - port->count--;
38066 + atomic_dec(&port->count);
38067 }
38068 spin_unlock_irqrestore(&info->irq_spinlock, flags);
38069 port->blocked_open++;
38070 @@ -3336,7 +3336,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
38071
38072 if (debug_level >= DEBUG_LEVEL_INFO)
38073 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
38074 - __FILE__,__LINE__, tty->driver->name, port->count );
38075 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38076
38077 tty_unlock();
38078 schedule();
38079 @@ -3348,12 +3348,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
38080
38081 /* FIXME: Racy on hangup during close wait */
38082 if (extra_count)
38083 - port->count++;
38084 + atomic_inc(&port->count);
38085 port->blocked_open--;
38086
38087 if (debug_level >= DEBUG_LEVEL_INFO)
38088 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
38089 - __FILE__,__LINE__, tty->driver->name, port->count );
38090 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38091
38092 if (!retval)
38093 port->flags |= ASYNC_NORMAL_ACTIVE;
38094 @@ -3398,7 +3398,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
38095
38096 if (debug_level >= DEBUG_LEVEL_INFO)
38097 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
38098 - __FILE__,__LINE__,tty->driver->name, info->port.count);
38099 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
38100
38101 /* If port is closing, signal caller to try again */
38102 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
38103 @@ -3417,10 +3417,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
38104 spin_unlock_irqrestore(&info->netlock, flags);
38105 goto cleanup;
38106 }
38107 - info->port.count++;
38108 + atomic_inc(&info->port.count);
38109 spin_unlock_irqrestore(&info->netlock, flags);
38110
38111 - if (info->port.count == 1) {
38112 + if (atomic_read(&info->port.count) == 1) {
38113 /* 1st open on this device, init hardware */
38114 retval = startup(info);
38115 if (retval < 0)
38116 @@ -3444,8 +3444,8 @@ cleanup:
38117 if (retval) {
38118 if (tty->count == 1)
38119 info->port.tty = NULL; /* tty layer will release tty struct */
38120 - if(info->port.count)
38121 - info->port.count--;
38122 + if (atomic_read(&info->port.count))
38123 + atomic_dec(&info->port.count);
38124 }
38125
38126 return retval;
38127 @@ -7653,7 +7653,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38128 unsigned short new_crctype;
38129
38130 /* return error if TTY interface open */
38131 - if (info->port.count)
38132 + if (atomic_read(&info->port.count))
38133 return -EBUSY;
38134
38135 switch (encoding)
38136 @@ -7748,7 +7748,7 @@ static int hdlcdev_open(struct net_device *dev)
38137
38138 /* arbitrate between network and tty opens */
38139 spin_lock_irqsave(&info->netlock, flags);
38140 - if (info->port.count != 0 || info->netcount != 0) {
38141 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38142 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38143 spin_unlock_irqrestore(&info->netlock, flags);
38144 return -EBUSY;
38145 @@ -7834,7 +7834,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38146 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
38147
38148 /* return error if TTY interface open */
38149 - if (info->port.count)
38150 + if (atomic_read(&info->port.count))
38151 return -EBUSY;
38152
38153 if (cmd != SIOCWANDEV)
38154 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
38155 index aa1debf..9297a16 100644
38156 --- a/drivers/tty/synclink_gt.c
38157 +++ b/drivers/tty/synclink_gt.c
38158 @@ -671,7 +671,7 @@ static int open(struct tty_struct *tty, struct file *filp)
38159 tty->driver_data = info;
38160 info->port.tty = tty;
38161
38162 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
38163 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
38164
38165 /* If port is closing, signal caller to try again */
38166 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
38167 @@ -692,10 +692,10 @@ static int open(struct tty_struct *tty, struct file *filp)
38168 mutex_unlock(&info->port.mutex);
38169 goto cleanup;
38170 }
38171 - info->port.count++;
38172 + atomic_inc(&info->port.count);
38173 spin_unlock_irqrestore(&info->netlock, flags);
38174
38175 - if (info->port.count == 1) {
38176 + if (atomic_read(&info->port.count) == 1) {
38177 /* 1st open on this device, init hardware */
38178 retval = startup(info);
38179 if (retval < 0) {
38180 @@ -716,8 +716,8 @@ cleanup:
38181 if (retval) {
38182 if (tty->count == 1)
38183 info->port.tty = NULL; /* tty layer will release tty struct */
38184 - if(info->port.count)
38185 - info->port.count--;
38186 + if(atomic_read(&info->port.count))
38187 + atomic_dec(&info->port.count);
38188 }
38189
38190 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
38191 @@ -730,7 +730,7 @@ static void close(struct tty_struct *tty, struct file *filp)
38192
38193 if (sanity_check(info, tty->name, "close"))
38194 return;
38195 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
38196 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
38197
38198 if (tty_port_close_start(&info->port, tty, filp) == 0)
38199 goto cleanup;
38200 @@ -747,7 +747,7 @@ static void close(struct tty_struct *tty, struct file *filp)
38201 tty_port_close_end(&info->port, tty);
38202 info->port.tty = NULL;
38203 cleanup:
38204 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
38205 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
38206 }
38207
38208 static void hangup(struct tty_struct *tty)
38209 @@ -765,7 +765,7 @@ static void hangup(struct tty_struct *tty)
38210 shutdown(info);
38211
38212 spin_lock_irqsave(&info->port.lock, flags);
38213 - info->port.count = 0;
38214 + atomic_set(&info->port.count, 0);
38215 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
38216 info->port.tty = NULL;
38217 spin_unlock_irqrestore(&info->port.lock, flags);
38218 @@ -1450,7 +1450,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38219 unsigned short new_crctype;
38220
38221 /* return error if TTY interface open */
38222 - if (info->port.count)
38223 + if (atomic_read(&info->port.count))
38224 return -EBUSY;
38225
38226 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
38227 @@ -1545,7 +1545,7 @@ static int hdlcdev_open(struct net_device *dev)
38228
38229 /* arbitrate between network and tty opens */
38230 spin_lock_irqsave(&info->netlock, flags);
38231 - if (info->port.count != 0 || info->netcount != 0) {
38232 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38233 DBGINFO(("%s hdlc_open busy\n", dev->name));
38234 spin_unlock_irqrestore(&info->netlock, flags);
38235 return -EBUSY;
38236 @@ -1630,7 +1630,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38237 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
38238
38239 /* return error if TTY interface open */
38240 - if (info->port.count)
38241 + if (atomic_read(&info->port.count))
38242 return -EBUSY;
38243
38244 if (cmd != SIOCWANDEV)
38245 @@ -2419,7 +2419,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
38246 if (port == NULL)
38247 continue;
38248 spin_lock(&port->lock);
38249 - if ((port->port.count || port->netcount) &&
38250 + if ((atomic_read(&port->port.count) || port->netcount) &&
38251 port->pending_bh && !port->bh_running &&
38252 !port->bh_requested) {
38253 DBGISR(("%s bh queued\n", port->device_name));
38254 @@ -3308,7 +3308,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
38255 spin_lock_irqsave(&info->lock, flags);
38256 if (!tty_hung_up_p(filp)) {
38257 extra_count = true;
38258 - port->count--;
38259 + atomic_dec(&port->count);
38260 }
38261 spin_unlock_irqrestore(&info->lock, flags);
38262 port->blocked_open++;
38263 @@ -3345,7 +3345,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
38264 remove_wait_queue(&port->open_wait, &wait);
38265
38266 if (extra_count)
38267 - port->count++;
38268 + atomic_inc(&port->count);
38269 port->blocked_open--;
38270
38271 if (!retval)
38272 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
38273 index a3dddc1..8905ab2 100644
38274 --- a/drivers/tty/synclinkmp.c
38275 +++ b/drivers/tty/synclinkmp.c
38276 @@ -742,7 +742,7 @@ static int open(struct tty_struct *tty, struct file *filp)
38277
38278 if (debug_level >= DEBUG_LEVEL_INFO)
38279 printk("%s(%d):%s open(), old ref count = %d\n",
38280 - __FILE__,__LINE__,tty->driver->name, info->port.count);
38281 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
38282
38283 /* If port is closing, signal caller to try again */
38284 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
38285 @@ -761,10 +761,10 @@ static int open(struct tty_struct *tty, struct file *filp)
38286 spin_unlock_irqrestore(&info->netlock, flags);
38287 goto cleanup;
38288 }
38289 - info->port.count++;
38290 + atomic_inc(&info->port.count);
38291 spin_unlock_irqrestore(&info->netlock, flags);
38292
38293 - if (info->port.count == 1) {
38294 + if (atomic_read(&info->port.count) == 1) {
38295 /* 1st open on this device, init hardware */
38296 retval = startup(info);
38297 if (retval < 0)
38298 @@ -788,8 +788,8 @@ cleanup:
38299 if (retval) {
38300 if (tty->count == 1)
38301 info->port.tty = NULL; /* tty layer will release tty struct */
38302 - if(info->port.count)
38303 - info->port.count--;
38304 + if(atomic_read(&info->port.count))
38305 + atomic_dec(&info->port.count);
38306 }
38307
38308 return retval;
38309 @@ -807,7 +807,7 @@ static void close(struct tty_struct *tty, struct file *filp)
38310
38311 if (debug_level >= DEBUG_LEVEL_INFO)
38312 printk("%s(%d):%s close() entry, count=%d\n",
38313 - __FILE__,__LINE__, info->device_name, info->port.count);
38314 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
38315
38316 if (tty_port_close_start(&info->port, tty, filp) == 0)
38317 goto cleanup;
38318 @@ -826,7 +826,7 @@ static void close(struct tty_struct *tty, struct file *filp)
38319 cleanup:
38320 if (debug_level >= DEBUG_LEVEL_INFO)
38321 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
38322 - tty->driver->name, info->port.count);
38323 + tty->driver->name, atomic_read(&info->port.count));
38324 }
38325
38326 /* Called by tty_hangup() when a hangup is signaled.
38327 @@ -849,7 +849,7 @@ static void hangup(struct tty_struct *tty)
38328 shutdown(info);
38329
38330 spin_lock_irqsave(&info->port.lock, flags);
38331 - info->port.count = 0;
38332 + atomic_set(&info->port.count, 0);
38333 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
38334 info->port.tty = NULL;
38335 spin_unlock_irqrestore(&info->port.lock, flags);
38336 @@ -1557,7 +1557,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38337 unsigned short new_crctype;
38338
38339 /* return error if TTY interface open */
38340 - if (info->port.count)
38341 + if (atomic_read(&info->port.count))
38342 return -EBUSY;
38343
38344 switch (encoding)
38345 @@ -1652,7 +1652,7 @@ static int hdlcdev_open(struct net_device *dev)
38346
38347 /* arbitrate between network and tty opens */
38348 spin_lock_irqsave(&info->netlock, flags);
38349 - if (info->port.count != 0 || info->netcount != 0) {
38350 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38351 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38352 spin_unlock_irqrestore(&info->netlock, flags);
38353 return -EBUSY;
38354 @@ -1738,7 +1738,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38355 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
38356
38357 /* return error if TTY interface open */
38358 - if (info->port.count)
38359 + if (atomic_read(&info->port.count))
38360 return -EBUSY;
38361
38362 if (cmd != SIOCWANDEV)
38363 @@ -2623,7 +2623,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
38364 * do not request bottom half processing if the
38365 * device is not open in a normal mode.
38366 */
38367 - if ( port && (port->port.count || port->netcount) &&
38368 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
38369 port->pending_bh && !port->bh_running &&
38370 !port->bh_requested ) {
38371 if ( debug_level >= DEBUG_LEVEL_ISR )
38372 @@ -3321,12 +3321,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
38373
38374 if (debug_level >= DEBUG_LEVEL_INFO)
38375 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
38376 - __FILE__,__LINE__, tty->driver->name, port->count );
38377 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38378
38379 spin_lock_irqsave(&info->lock, flags);
38380 if (!tty_hung_up_p(filp)) {
38381 extra_count = true;
38382 - port->count--;
38383 + atomic_dec(&port->count);
38384 }
38385 spin_unlock_irqrestore(&info->lock, flags);
38386 port->blocked_open++;
38387 @@ -3355,7 +3355,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
38388
38389 if (debug_level >= DEBUG_LEVEL_INFO)
38390 printk("%s(%d):%s block_til_ready() count=%d\n",
38391 - __FILE__,__LINE__, tty->driver->name, port->count );
38392 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38393
38394 tty_unlock();
38395 schedule();
38396 @@ -3366,12 +3366,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
38397 remove_wait_queue(&port->open_wait, &wait);
38398
38399 if (extra_count)
38400 - port->count++;
38401 + atomic_inc(&port->count);
38402 port->blocked_open--;
38403
38404 if (debug_level >= DEBUG_LEVEL_INFO)
38405 printk("%s(%d):%s block_til_ready() after, count=%d\n",
38406 - __FILE__,__LINE__, tty->driver->name, port->count );
38407 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38408
38409 if (!retval)
38410 port->flags |= ASYNC_NORMAL_ACTIVE;
38411 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
38412 index 05728894..b9d44c6 100644
38413 --- a/drivers/tty/sysrq.c
38414 +++ b/drivers/tty/sysrq.c
38415 @@ -865,7 +865,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
38416 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
38417 size_t count, loff_t *ppos)
38418 {
38419 - if (count) {
38420 + if (count && capable(CAP_SYS_ADMIN)) {
38421 char c;
38422
38423 if (get_user(c, buf))
38424 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
38425 index b425c79..08a3f06 100644
38426 --- a/drivers/tty/tty_io.c
38427 +++ b/drivers/tty/tty_io.c
38428 @@ -3283,7 +3283,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
38429
38430 void tty_default_fops(struct file_operations *fops)
38431 {
38432 - *fops = tty_fops;
38433 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
38434 }
38435
38436 /*
38437 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
38438 index 9911eb6..5abe0e1 100644
38439 --- a/drivers/tty/tty_ldisc.c
38440 +++ b/drivers/tty/tty_ldisc.c
38441 @@ -56,7 +56,7 @@ static void put_ldisc(struct tty_ldisc *ld)
38442 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
38443 struct tty_ldisc_ops *ldo = ld->ops;
38444
38445 - ldo->refcount--;
38446 + atomic_dec(&ldo->refcount);
38447 module_put(ldo->owner);
38448 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38449
38450 @@ -91,7 +91,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
38451 spin_lock_irqsave(&tty_ldisc_lock, flags);
38452 tty_ldiscs[disc] = new_ldisc;
38453 new_ldisc->num = disc;
38454 - new_ldisc->refcount = 0;
38455 + atomic_set(&new_ldisc->refcount, 0);
38456 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38457
38458 return ret;
38459 @@ -119,7 +119,7 @@ int tty_unregister_ldisc(int disc)
38460 return -EINVAL;
38461
38462 spin_lock_irqsave(&tty_ldisc_lock, flags);
38463 - if (tty_ldiscs[disc]->refcount)
38464 + if (atomic_read(&tty_ldiscs[disc]->refcount))
38465 ret = -EBUSY;
38466 else
38467 tty_ldiscs[disc] = NULL;
38468 @@ -140,7 +140,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
38469 if (ldops) {
38470 ret = ERR_PTR(-EAGAIN);
38471 if (try_module_get(ldops->owner)) {
38472 - ldops->refcount++;
38473 + atomic_inc(&ldops->refcount);
38474 ret = ldops;
38475 }
38476 }
38477 @@ -153,7 +153,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
38478 unsigned long flags;
38479
38480 spin_lock_irqsave(&tty_ldisc_lock, flags);
38481 - ldops->refcount--;
38482 + atomic_dec(&ldops->refcount);
38483 module_put(ldops->owner);
38484 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38485 }
38486 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
38487 index bf6e238..d401c04 100644
38488 --- a/drivers/tty/tty_port.c
38489 +++ b/drivers/tty/tty_port.c
38490 @@ -138,7 +138,7 @@ void tty_port_hangup(struct tty_port *port)
38491 unsigned long flags;
38492
38493 spin_lock_irqsave(&port->lock, flags);
38494 - port->count = 0;
38495 + atomic_set(&port->count, 0);
38496 port->flags &= ~ASYNC_NORMAL_ACTIVE;
38497 if (port->tty) {
38498 set_bit(TTY_IO_ERROR, &port->tty->flags);
38499 @@ -264,7 +264,7 @@ int tty_port_block_til_ready(struct tty_port *port,
38500 /* The port lock protects the port counts */
38501 spin_lock_irqsave(&port->lock, flags);
38502 if (!tty_hung_up_p(filp))
38503 - port->count--;
38504 + atomic_dec(&port->count);
38505 port->blocked_open++;
38506 spin_unlock_irqrestore(&port->lock, flags);
38507
38508 @@ -306,7 +306,7 @@ int tty_port_block_til_ready(struct tty_port *port,
38509 we must not mess that up further */
38510 spin_lock_irqsave(&port->lock, flags);
38511 if (!tty_hung_up_p(filp))
38512 - port->count++;
38513 + atomic_inc(&port->count);
38514 port->blocked_open--;
38515 if (retval == 0)
38516 port->flags |= ASYNC_NORMAL_ACTIVE;
38517 @@ -326,19 +326,19 @@ int tty_port_close_start(struct tty_port *port,
38518 return 0;
38519 }
38520
38521 - if (tty->count == 1 && port->count != 1) {
38522 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
38523 printk(KERN_WARNING
38524 "tty_port_close_start: tty->count = 1 port count = %d.\n",
38525 - port->count);
38526 - port->count = 1;
38527 + atomic_read(&port->count));
38528 + atomic_set(&port->count, 1);
38529 }
38530 - if (--port->count < 0) {
38531 + if (atomic_dec_return(&port->count) < 0) {
38532 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
38533 - port->count);
38534 - port->count = 0;
38535 + atomic_read(&port->count));
38536 + atomic_set(&port->count, 0);
38537 }
38538
38539 - if (port->count) {
38540 + if (atomic_read(&port->count)) {
38541 spin_unlock_irqrestore(&port->lock, flags);
38542 if (port->ops->drop)
38543 port->ops->drop(port);
38544 @@ -418,7 +418,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
38545 {
38546 spin_lock_irq(&port->lock);
38547 if (!tty_hung_up_p(filp))
38548 - ++port->count;
38549 + atomic_inc(&port->count);
38550 spin_unlock_irq(&port->lock);
38551 tty_port_tty_set(port, tty);
38552
38553 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
38554 index 48cc6f2..85584dd 100644
38555 --- a/drivers/tty/vt/keyboard.c
38556 +++ b/drivers/tty/vt/keyboard.c
38557 @@ -659,6 +659,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
38558 kbd->kbdmode == VC_OFF) &&
38559 value != KVAL(K_SAK))
38560 return; /* SAK is allowed even in raw mode */
38561 +
38562 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
38563 + {
38564 + void *func = fn_handler[value];
38565 + if (func == fn_show_state || func == fn_show_ptregs ||
38566 + func == fn_show_mem)
38567 + return;
38568 + }
38569 +#endif
38570 +
38571 fn_handler[value](vc);
38572 }
38573
38574 @@ -1808,9 +1818,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
38575 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
38576 return -EFAULT;
38577
38578 - if (!capable(CAP_SYS_TTY_CONFIG))
38579 - perm = 0;
38580 -
38581 switch (cmd) {
38582 case KDGKBENT:
38583 /* Ensure another thread doesn't free it under us */
38584 @@ -1825,6 +1832,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
38585 spin_unlock_irqrestore(&kbd_event_lock, flags);
38586 return put_user(val, &user_kbe->kb_value);
38587 case KDSKBENT:
38588 + if (!capable(CAP_SYS_TTY_CONFIG))
38589 + perm = 0;
38590 +
38591 if (!perm)
38592 return -EPERM;
38593 if (!i && v == K_NOSUCHMAP) {
38594 @@ -1915,9 +1925,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38595 int i, j, k;
38596 int ret;
38597
38598 - if (!capable(CAP_SYS_TTY_CONFIG))
38599 - perm = 0;
38600 -
38601 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
38602 if (!kbs) {
38603 ret = -ENOMEM;
38604 @@ -1951,6 +1958,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38605 kfree(kbs);
38606 return ((p && *p) ? -EOVERFLOW : 0);
38607 case KDSKBSENT:
38608 + if (!capable(CAP_SYS_TTY_CONFIG))
38609 + perm = 0;
38610 +
38611 if (!perm) {
38612 ret = -EPERM;
38613 goto reterr;
38614 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
38615 index a783d53..cb30d94 100644
38616 --- a/drivers/uio/uio.c
38617 +++ b/drivers/uio/uio.c
38618 @@ -25,6 +25,7 @@
38619 #include <linux/kobject.h>
38620 #include <linux/cdev.h>
38621 #include <linux/uio_driver.h>
38622 +#include <asm/local.h>
38623
38624 #define UIO_MAX_DEVICES (1U << MINORBITS)
38625
38626 @@ -32,10 +33,10 @@ struct uio_device {
38627 struct module *owner;
38628 struct device *dev;
38629 int minor;
38630 - atomic_t event;
38631 + atomic_unchecked_t event;
38632 struct fasync_struct *async_queue;
38633 wait_queue_head_t wait;
38634 - int vma_count;
38635 + local_t vma_count;
38636 struct uio_info *info;
38637 struct kobject *map_dir;
38638 struct kobject *portio_dir;
38639 @@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
38640 struct device_attribute *attr, char *buf)
38641 {
38642 struct uio_device *idev = dev_get_drvdata(dev);
38643 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
38644 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
38645 }
38646
38647 static struct device_attribute uio_class_attributes[] = {
38648 @@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
38649 {
38650 struct uio_device *idev = info->uio_dev;
38651
38652 - atomic_inc(&idev->event);
38653 + atomic_inc_unchecked(&idev->event);
38654 wake_up_interruptible(&idev->wait);
38655 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38656 }
38657 @@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
38658 }
38659
38660 listener->dev = idev;
38661 - listener->event_count = atomic_read(&idev->event);
38662 + listener->event_count = atomic_read_unchecked(&idev->event);
38663 filep->private_data = listener;
38664
38665 if (idev->info->open) {
38666 @@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
38667 return -EIO;
38668
38669 poll_wait(filep, &idev->wait, wait);
38670 - if (listener->event_count != atomic_read(&idev->event))
38671 + if (listener->event_count != atomic_read_unchecked(&idev->event))
38672 return POLLIN | POLLRDNORM;
38673 return 0;
38674 }
38675 @@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
38676 do {
38677 set_current_state(TASK_INTERRUPTIBLE);
38678
38679 - event_count = atomic_read(&idev->event);
38680 + event_count = atomic_read_unchecked(&idev->event);
38681 if (event_count != listener->event_count) {
38682 if (copy_to_user(buf, &event_count, count))
38683 retval = -EFAULT;
38684 @@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
38685 static void uio_vma_open(struct vm_area_struct *vma)
38686 {
38687 struct uio_device *idev = vma->vm_private_data;
38688 - idev->vma_count++;
38689 + local_inc(&idev->vma_count);
38690 }
38691
38692 static void uio_vma_close(struct vm_area_struct *vma)
38693 {
38694 struct uio_device *idev = vma->vm_private_data;
38695 - idev->vma_count--;
38696 + local_dec(&idev->vma_count);
38697 }
38698
38699 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38700 @@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
38701 idev->owner = owner;
38702 idev->info = info;
38703 init_waitqueue_head(&idev->wait);
38704 - atomic_set(&idev->event, 0);
38705 + atomic_set_unchecked(&idev->event, 0);
38706
38707 ret = uio_get_minor(idev);
38708 if (ret)
38709 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
38710 index b7eb86a..36d28af 100644
38711 --- a/drivers/usb/atm/cxacru.c
38712 +++ b/drivers/usb/atm/cxacru.c
38713 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
38714 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
38715 if (ret < 2)
38716 return -EINVAL;
38717 - if (index < 0 || index > 0x7f)
38718 + if (index > 0x7f)
38719 return -EINVAL;
38720 pos += tmp;
38721
38722 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
38723 index ee62b35..b663594 100644
38724 --- a/drivers/usb/atm/usbatm.c
38725 +++ b/drivers/usb/atm/usbatm.c
38726 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38727 if (printk_ratelimit())
38728 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38729 __func__, vpi, vci);
38730 - atomic_inc(&vcc->stats->rx_err);
38731 + atomic_inc_unchecked(&vcc->stats->rx_err);
38732 return;
38733 }
38734
38735 @@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38736 if (length > ATM_MAX_AAL5_PDU) {
38737 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38738 __func__, length, vcc);
38739 - atomic_inc(&vcc->stats->rx_err);
38740 + atomic_inc_unchecked(&vcc->stats->rx_err);
38741 goto out;
38742 }
38743
38744 @@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38745 if (sarb->len < pdu_length) {
38746 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38747 __func__, pdu_length, sarb->len, vcc);
38748 - atomic_inc(&vcc->stats->rx_err);
38749 + atomic_inc_unchecked(&vcc->stats->rx_err);
38750 goto out;
38751 }
38752
38753 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38754 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38755 __func__, vcc);
38756 - atomic_inc(&vcc->stats->rx_err);
38757 + atomic_inc_unchecked(&vcc->stats->rx_err);
38758 goto out;
38759 }
38760
38761 @@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38762 if (printk_ratelimit())
38763 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38764 __func__, length);
38765 - atomic_inc(&vcc->stats->rx_drop);
38766 + atomic_inc_unchecked(&vcc->stats->rx_drop);
38767 goto out;
38768 }
38769
38770 @@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38771
38772 vcc->push(vcc, skb);
38773
38774 - atomic_inc(&vcc->stats->rx);
38775 + atomic_inc_unchecked(&vcc->stats->rx);
38776 out:
38777 skb_trim(sarb, 0);
38778 }
38779 @@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
38780 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38781
38782 usbatm_pop(vcc, skb);
38783 - atomic_inc(&vcc->stats->tx);
38784 + atomic_inc_unchecked(&vcc->stats->tx);
38785
38786 skb = skb_dequeue(&instance->sndqueue);
38787 }
38788 @@ -770,11 +770,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
38789 if (!left--)
38790 return sprintf(page,
38791 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38792 - atomic_read(&atm_dev->stats.aal5.tx),
38793 - atomic_read(&atm_dev->stats.aal5.tx_err),
38794 - atomic_read(&atm_dev->stats.aal5.rx),
38795 - atomic_read(&atm_dev->stats.aal5.rx_err),
38796 - atomic_read(&atm_dev->stats.aal5.rx_drop));
38797 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38798 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38799 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38800 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38801 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38802
38803 if (!left--) {
38804 if (instance->disconnected)
38805 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
38806 index d956965..4179a77 100644
38807 --- a/drivers/usb/core/devices.c
38808 +++ b/drivers/usb/core/devices.c
38809 @@ -126,7 +126,7 @@ static const char format_endpt[] =
38810 * time it gets called.
38811 */
38812 static struct device_connect_event {
38813 - atomic_t count;
38814 + atomic_unchecked_t count;
38815 wait_queue_head_t wait;
38816 } device_event = {
38817 .count = ATOMIC_INIT(1),
38818 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
38819
38820 void usbfs_conn_disc_event(void)
38821 {
38822 - atomic_add(2, &device_event.count);
38823 + atomic_add_unchecked(2, &device_event.count);
38824 wake_up(&device_event.wait);
38825 }
38826
38827 @@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
38828
38829 poll_wait(file, &device_event.wait, wait);
38830
38831 - event_count = atomic_read(&device_event.count);
38832 + event_count = atomic_read_unchecked(&device_event.count);
38833 if (file->f_version != event_count) {
38834 file->f_version = event_count;
38835 return POLLIN | POLLRDNORM;
38836 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
38837 index 347bb05..63e1b73 100644
38838 --- a/drivers/usb/early/ehci-dbgp.c
38839 +++ b/drivers/usb/early/ehci-dbgp.c
38840 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
38841
38842 #ifdef CONFIG_KGDB
38843 static struct kgdb_io kgdbdbgp_io_ops;
38844 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
38845 +static struct kgdb_io kgdbdbgp_io_ops_console;
38846 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
38847 #else
38848 #define dbgp_kgdb_mode (0)
38849 #endif
38850 @@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
38851 .write_char = kgdbdbgp_write_char,
38852 };
38853
38854 +static struct kgdb_io kgdbdbgp_io_ops_console = {
38855 + .name = "kgdbdbgp",
38856 + .read_char = kgdbdbgp_read_char,
38857 + .write_char = kgdbdbgp_write_char,
38858 + .is_console = 1
38859 +};
38860 +
38861 static int kgdbdbgp_wait_time;
38862
38863 static int __init kgdbdbgp_parse_config(char *str)
38864 @@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
38865 ptr++;
38866 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
38867 }
38868 - kgdb_register_io_module(&kgdbdbgp_io_ops);
38869 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
38870 + if (early_dbgp_console.index != -1)
38871 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
38872 + else
38873 + kgdb_register_io_module(&kgdbdbgp_io_ops);
38874
38875 return 0;
38876 }
38877 diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
38878 index 5b3f5ff..6e00893 100644
38879 --- a/drivers/usb/gadget/u_serial.c
38880 +++ b/drivers/usb/gadget/u_serial.c
38881 @@ -731,9 +731,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
38882 spin_lock_irq(&port->port_lock);
38883
38884 /* already open? Great. */
38885 - if (port->port.count) {
38886 + if (atomic_read(&port->port.count)) {
38887 status = 0;
38888 - port->port.count++;
38889 + atomic_inc(&port->port.count);
38890
38891 /* currently opening/closing? wait ... */
38892 } else if (port->openclose) {
38893 @@ -792,7 +792,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
38894 tty->driver_data = port;
38895 port->port.tty = tty;
38896
38897 - port->port.count = 1;
38898 + atomic_set(&port->port.count, 1);
38899 port->openclose = false;
38900
38901 /* if connected, start the I/O stream */
38902 @@ -834,11 +834,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
38903
38904 spin_lock_irq(&port->port_lock);
38905
38906 - if (port->port.count != 1) {
38907 - if (port->port.count == 0)
38908 + if (atomic_read(&port->port.count) != 1) {
38909 + if (atomic_read(&port->port.count) == 0)
38910 WARN_ON(1);
38911 else
38912 - --port->port.count;
38913 + atomic_dec(&port->port.count);
38914 goto exit;
38915 }
38916
38917 @@ -848,7 +848,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
38918 * and sleep if necessary
38919 */
38920 port->openclose = true;
38921 - port->port.count = 0;
38922 + atomic_set(&port->port.count, 0);
38923
38924 gser = port->port_usb;
38925 if (gser && gser->disconnect)
38926 @@ -1152,7 +1152,7 @@ static int gs_closed(struct gs_port *port)
38927 int cond;
38928
38929 spin_lock_irq(&port->port_lock);
38930 - cond = (port->port.count == 0) && !port->openclose;
38931 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
38932 spin_unlock_irq(&port->port_lock);
38933 return cond;
38934 }
38935 @@ -1265,7 +1265,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
38936 /* if it's already open, start I/O ... and notify the serial
38937 * protocol about open/close status (connect/disconnect).
38938 */
38939 - if (port->port.count) {
38940 + if (atomic_read(&port->port.count)) {
38941 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
38942 gs_start_io(port);
38943 if (gser->connect)
38944 @@ -1312,7 +1312,7 @@ void gserial_disconnect(struct gserial *gser)
38945
38946 port->port_usb = NULL;
38947 gser->ioport = NULL;
38948 - if (port->port.count > 0 || port->openclose) {
38949 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
38950 wake_up_interruptible(&port->drain_wait);
38951 if (port->port.tty)
38952 tty_hangup(port->port.tty);
38953 @@ -1328,7 +1328,7 @@ void gserial_disconnect(struct gserial *gser)
38954
38955 /* finally, free any unused/unusable I/O buffers */
38956 spin_lock_irqsave(&port->port_lock, flags);
38957 - if (port->port.count == 0 && !port->openclose)
38958 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
38959 gs_buf_free(&port->port_write_buf);
38960 gs_free_requests(gser->out, &port->read_pool, NULL);
38961 gs_free_requests(gser->out, &port->read_queue, NULL);
38962 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
38963 index b9cca6d..75c75df 100644
38964 --- a/drivers/usb/serial/console.c
38965 +++ b/drivers/usb/serial/console.c
38966 @@ -127,7 +127,7 @@ static int usb_console_setup(struct console *co, char *options)
38967
38968 info->port = port;
38969
38970 - ++port->port.count;
38971 + atomic_inc(&port->port.count);
38972 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
38973 if (serial->type->set_termios) {
38974 /*
38975 @@ -177,7 +177,7 @@ static int usb_console_setup(struct console *co, char *options)
38976 }
38977 /* Now that any required fake tty operations are completed restore
38978 * the tty port count */
38979 - --port->port.count;
38980 + atomic_dec(&port->port.count);
38981 /* The console is special in terms of closing the device so
38982 * indicate this port is now acting as a system console. */
38983 port->port.console = 1;
38984 @@ -190,7 +190,7 @@ static int usb_console_setup(struct console *co, char *options)
38985 free_tty:
38986 kfree(tty);
38987 reset_open_count:
38988 - port->port.count = 0;
38989 + atomic_set(&port->port.count, 0);
38990 usb_autopm_put_interface(serial->interface);
38991 error_get_interface:
38992 usb_serial_put(serial);
38993 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
38994 index d6bea3e..60b250e 100644
38995 --- a/drivers/usb/wusbcore/wa-hc.h
38996 +++ b/drivers/usb/wusbcore/wa-hc.h
38997 @@ -192,7 +192,7 @@ struct wahc {
38998 struct list_head xfer_delayed_list;
38999 spinlock_t xfer_list_lock;
39000 struct work_struct xfer_work;
39001 - atomic_t xfer_id_count;
39002 + atomic_unchecked_t xfer_id_count;
39003 };
39004
39005
39006 @@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
39007 INIT_LIST_HEAD(&wa->xfer_delayed_list);
39008 spin_lock_init(&wa->xfer_list_lock);
39009 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
39010 - atomic_set(&wa->xfer_id_count, 1);
39011 + atomic_set_unchecked(&wa->xfer_id_count, 1);
39012 }
39013
39014 /**
39015 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
39016 index 57c01ab..8a05959 100644
39017 --- a/drivers/usb/wusbcore/wa-xfer.c
39018 +++ b/drivers/usb/wusbcore/wa-xfer.c
39019 @@ -296,7 +296,7 @@ out:
39020 */
39021 static void wa_xfer_id_init(struct wa_xfer *xfer)
39022 {
39023 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
39024 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
39025 }
39026
39027 /*
39028 diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
39029 index 112156f..eb81154 100644
39030 --- a/drivers/vhost/vhost.c
39031 +++ b/drivers/vhost/vhost.c
39032 @@ -635,7 +635,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
39033 return 0;
39034 }
39035
39036 -static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
39037 +static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
39038 {
39039 struct file *eventfp, *filep = NULL,
39040 *pollstart = NULL, *pollstop = NULL;
39041 diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
39042 index b0b2ac3..89a4399 100644
39043 --- a/drivers/video/aty/aty128fb.c
39044 +++ b/drivers/video/aty/aty128fb.c
39045 @@ -148,7 +148,7 @@ enum {
39046 };
39047
39048 /* Must match above enum */
39049 -static const char *r128_family[] __devinitdata = {
39050 +static const char *r128_family[] __devinitconst = {
39051 "AGP",
39052 "PCI",
39053 "PRO AGP",
39054 diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
39055 index 5c3960d..15cf8fc 100644
39056 --- a/drivers/video/fbcmap.c
39057 +++ b/drivers/video/fbcmap.c
39058 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
39059 rc = -ENODEV;
39060 goto out;
39061 }
39062 - if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
39063 - !info->fbops->fb_setcmap)) {
39064 + if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
39065 rc = -EINVAL;
39066 goto out1;
39067 }
39068 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
39069 index 0dff12a..2ef47b3 100644
39070 --- a/drivers/video/fbmem.c
39071 +++ b/drivers/video/fbmem.c
39072 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
39073 image->dx += image->width + 8;
39074 }
39075 } else if (rotate == FB_ROTATE_UD) {
39076 - for (x = 0; x < num && image->dx >= 0; x++) {
39077 + for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
39078 info->fbops->fb_imageblit(info, image);
39079 image->dx -= image->width + 8;
39080 }
39081 @@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
39082 image->dy += image->height + 8;
39083 }
39084 } else if (rotate == FB_ROTATE_CCW) {
39085 - for (x = 0; x < num && image->dy >= 0; x++) {
39086 + for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
39087 info->fbops->fb_imageblit(info, image);
39088 image->dy -= image->height + 8;
39089 }
39090 @@ -1166,7 +1166,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
39091 return -EFAULT;
39092 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
39093 return -EINVAL;
39094 - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
39095 + if (con2fb.framebuffer >= FB_MAX)
39096 return -EINVAL;
39097 if (!registered_fb[con2fb.framebuffer])
39098 request_module("fb%d", con2fb.framebuffer);
39099 diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
39100 index 5a5d092..265c5ed 100644
39101 --- a/drivers/video/geode/gx1fb_core.c
39102 +++ b/drivers/video/geode/gx1fb_core.c
39103 @@ -29,7 +29,7 @@ static int crt_option = 1;
39104 static char panel_option[32] = "";
39105
39106 /* Modes relevant to the GX1 (taken from modedb.c) */
39107 -static const struct fb_videomode __devinitdata gx1_modedb[] = {
39108 +static const struct fb_videomode __devinitconst gx1_modedb[] = {
39109 /* 640x480-60 VESA */
39110 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
39111 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
39112 diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
39113 index 0fad23f..0e9afa4 100644
39114 --- a/drivers/video/gxt4500.c
39115 +++ b/drivers/video/gxt4500.c
39116 @@ -156,7 +156,7 @@ struct gxt4500_par {
39117 static char *mode_option;
39118
39119 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
39120 -static const struct fb_videomode defaultmode __devinitdata = {
39121 +static const struct fb_videomode defaultmode __devinitconst = {
39122 .refresh = 60,
39123 .xres = 1280,
39124 .yres = 1024,
39125 @@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
39126 return 0;
39127 }
39128
39129 -static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
39130 +static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
39131 .id = "IBM GXT4500P",
39132 .type = FB_TYPE_PACKED_PIXELS,
39133 .visual = FB_VISUAL_PSEUDOCOLOR,
39134 diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
39135 index 7672d2e..b56437f 100644
39136 --- a/drivers/video/i810/i810_accel.c
39137 +++ b/drivers/video/i810/i810_accel.c
39138 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
39139 }
39140 }
39141 printk("ringbuffer lockup!!!\n");
39142 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
39143 i810_report_error(mmio);
39144 par->dev_flags |= LOCKUP;
39145 info->pixmap.scan_align = 1;
39146 diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
39147 index b83f361..2b05a91 100644
39148 --- a/drivers/video/i810/i810_main.c
39149 +++ b/drivers/video/i810/i810_main.c
39150 @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
39151 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
39152
39153 /* PCI */
39154 -static const char *i810_pci_list[] __devinitdata = {
39155 +static const char *i810_pci_list[] __devinitconst = {
39156 "Intel(R) 810 Framebuffer Device" ,
39157 "Intel(R) 810-DC100 Framebuffer Device" ,
39158 "Intel(R) 810E Framebuffer Device" ,
39159 diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
39160 index de36693..3c63fc2 100644
39161 --- a/drivers/video/jz4740_fb.c
39162 +++ b/drivers/video/jz4740_fb.c
39163 @@ -136,7 +136,7 @@ struct jzfb {
39164 uint32_t pseudo_palette[16];
39165 };
39166
39167 -static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
39168 +static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
39169 .id = "JZ4740 FB",
39170 .type = FB_TYPE_PACKED_PIXELS,
39171 .visual = FB_VISUAL_TRUECOLOR,
39172 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
39173 index 3c14e43..eafa544 100644
39174 --- a/drivers/video/logo/logo_linux_clut224.ppm
39175 +++ b/drivers/video/logo/logo_linux_clut224.ppm
39176 @@ -1,1604 +1,1123 @@
39177 P3
39178 -# Standard 224-color Linux logo
39179 80 80
39180 255
39181 - 0 0 0 0 0 0 0 0 0 0 0 0
39182 - 0 0 0 0 0 0 0 0 0 0 0 0
39183 - 0 0 0 0 0 0 0 0 0 0 0 0
39184 - 0 0 0 0 0 0 0 0 0 0 0 0
39185 - 0 0 0 0 0 0 0 0 0 0 0 0
39186 - 0 0 0 0 0 0 0 0 0 0 0 0
39187 - 0 0 0 0 0 0 0 0 0 0 0 0
39188 - 0 0 0 0 0 0 0 0 0 0 0 0
39189 - 0 0 0 0 0 0 0 0 0 0 0 0
39190 - 6 6 6 6 6 6 10 10 10 10 10 10
39191 - 10 10 10 6 6 6 6 6 6 6 6 6
39192 - 0 0 0 0 0 0 0 0 0 0 0 0
39193 - 0 0 0 0 0 0 0 0 0 0 0 0
39194 - 0 0 0 0 0 0 0 0 0 0 0 0
39195 - 0 0 0 0 0 0 0 0 0 0 0 0
39196 - 0 0 0 0 0 0 0 0 0 0 0 0
39197 - 0 0 0 0 0 0 0 0 0 0 0 0
39198 - 0 0 0 0 0 0 0 0 0 0 0 0
39199 - 0 0 0 0 0 0 0 0 0 0 0 0
39200 - 0 0 0 0 0 0 0 0 0 0 0 0
39201 - 0 0 0 0 0 0 0 0 0 0 0 0
39202 - 0 0 0 0 0 0 0 0 0 0 0 0
39203 - 0 0 0 0 0 0 0 0 0 0 0 0
39204 - 0 0 0 0 0 0 0 0 0 0 0 0
39205 - 0 0 0 0 0 0 0 0 0 0 0 0
39206 - 0 0 0 0 0 0 0 0 0 0 0 0
39207 - 0 0 0 0 0 0 0 0 0 0 0 0
39208 - 0 0 0 0 0 0 0 0 0 0 0 0
39209 - 0 0 0 6 6 6 10 10 10 14 14 14
39210 - 22 22 22 26 26 26 30 30 30 34 34 34
39211 - 30 30 30 30 30 30 26 26 26 18 18 18
39212 - 14 14 14 10 10 10 6 6 6 0 0 0
39213 - 0 0 0 0 0 0 0 0 0 0 0 0
39214 - 0 0 0 0 0 0 0 0 0 0 0 0
39215 - 0 0 0 0 0 0 0 0 0 0 0 0
39216 - 0 0 0 0 0 0 0 0 0 0 0 0
39217 - 0 0 0 0 0 0 0 0 0 0 0 0
39218 - 0 0 0 0 0 0 0 0 0 0 0 0
39219 - 0 0 0 0 0 0 0 0 0 0 0 0
39220 - 0 0 0 0 0 0 0 0 0 0 0 0
39221 - 0 0 0 0 0 0 0 0 0 0 0 0
39222 - 0 0 0 0 0 1 0 0 1 0 0 0
39223 - 0 0 0 0 0 0 0 0 0 0 0 0
39224 - 0 0 0 0 0 0 0 0 0 0 0 0
39225 - 0 0 0 0 0 0 0 0 0 0 0 0
39226 - 0 0 0 0 0 0 0 0 0 0 0 0
39227 - 0 0 0 0 0 0 0 0 0 0 0 0
39228 - 0 0 0 0 0 0 0 0 0 0 0 0
39229 - 6 6 6 14 14 14 26 26 26 42 42 42
39230 - 54 54 54 66 66 66 78 78 78 78 78 78
39231 - 78 78 78 74 74 74 66 66 66 54 54 54
39232 - 42 42 42 26 26 26 18 18 18 10 10 10
39233 - 6 6 6 0 0 0 0 0 0 0 0 0
39234 - 0 0 0 0 0 0 0 0 0 0 0 0
39235 - 0 0 0 0 0 0 0 0 0 0 0 0
39236 - 0 0 0 0 0 0 0 0 0 0 0 0
39237 - 0 0 0 0 0 0 0 0 0 0 0 0
39238 - 0 0 0 0 0 0 0 0 0 0 0 0
39239 - 0 0 0 0 0 0 0 0 0 0 0 0
39240 - 0 0 0 0 0 0 0 0 0 0 0 0
39241 - 0 0 0 0 0 0 0 0 0 0 0 0
39242 - 0 0 1 0 0 0 0 0 0 0 0 0
39243 - 0 0 0 0 0 0 0 0 0 0 0 0
39244 - 0 0 0 0 0 0 0 0 0 0 0 0
39245 - 0 0 0 0 0 0 0 0 0 0 0 0
39246 - 0 0 0 0 0 0 0 0 0 0 0 0
39247 - 0 0 0 0 0 0 0 0 0 0 0 0
39248 - 0 0 0 0 0 0 0 0 0 10 10 10
39249 - 22 22 22 42 42 42 66 66 66 86 86 86
39250 - 66 66 66 38 38 38 38 38 38 22 22 22
39251 - 26 26 26 34 34 34 54 54 54 66 66 66
39252 - 86 86 86 70 70 70 46 46 46 26 26 26
39253 - 14 14 14 6 6 6 0 0 0 0 0 0
39254 - 0 0 0 0 0 0 0 0 0 0 0 0
39255 - 0 0 0 0 0 0 0 0 0 0 0 0
39256 - 0 0 0 0 0 0 0 0 0 0 0 0
39257 - 0 0 0 0 0 0 0 0 0 0 0 0
39258 - 0 0 0 0 0 0 0 0 0 0 0 0
39259 - 0 0 0 0 0 0 0 0 0 0 0 0
39260 - 0 0 0 0 0 0 0 0 0 0 0 0
39261 - 0 0 0 0 0 0 0 0 0 0 0 0
39262 - 0 0 1 0 0 1 0 0 1 0 0 0
39263 - 0 0 0 0 0 0 0 0 0 0 0 0
39264 - 0 0 0 0 0 0 0 0 0 0 0 0
39265 - 0 0 0 0 0 0 0 0 0 0 0 0
39266 - 0 0 0 0 0 0 0 0 0 0 0 0
39267 - 0 0 0 0 0 0 0 0 0 0 0 0
39268 - 0 0 0 0 0 0 10 10 10 26 26 26
39269 - 50 50 50 82 82 82 58 58 58 6 6 6
39270 - 2 2 6 2 2 6 2 2 6 2 2 6
39271 - 2 2 6 2 2 6 2 2 6 2 2 6
39272 - 6 6 6 54 54 54 86 86 86 66 66 66
39273 - 38 38 38 18 18 18 6 6 6 0 0 0
39274 - 0 0 0 0 0 0 0 0 0 0 0 0
39275 - 0 0 0 0 0 0 0 0 0 0 0 0
39276 - 0 0 0 0 0 0 0 0 0 0 0 0
39277 - 0 0 0 0 0 0 0 0 0 0 0 0
39278 - 0 0 0 0 0 0 0 0 0 0 0 0
39279 - 0 0 0 0 0 0 0 0 0 0 0 0
39280 - 0 0 0 0 0 0 0 0 0 0 0 0
39281 - 0 0 0 0 0 0 0 0 0 0 0 0
39282 - 0 0 0 0 0 0 0 0 0 0 0 0
39283 - 0 0 0 0 0 0 0 0 0 0 0 0
39284 - 0 0 0 0 0 0 0 0 0 0 0 0
39285 - 0 0 0 0 0 0 0 0 0 0 0 0
39286 - 0 0 0 0 0 0 0 0 0 0 0 0
39287 - 0 0 0 0 0 0 0 0 0 0 0 0
39288 - 0 0 0 6 6 6 22 22 22 50 50 50
39289 - 78 78 78 34 34 34 2 2 6 2 2 6
39290 - 2 2 6 2 2 6 2 2 6 2 2 6
39291 - 2 2 6 2 2 6 2 2 6 2 2 6
39292 - 2 2 6 2 2 6 6 6 6 70 70 70
39293 - 78 78 78 46 46 46 22 22 22 6 6 6
39294 - 0 0 0 0 0 0 0 0 0 0 0 0
39295 - 0 0 0 0 0 0 0 0 0 0 0 0
39296 - 0 0 0 0 0 0 0 0 0 0 0 0
39297 - 0 0 0 0 0 0 0 0 0 0 0 0
39298 - 0 0 0 0 0 0 0 0 0 0 0 0
39299 - 0 0 0 0 0 0 0 0 0 0 0 0
39300 - 0 0 0 0 0 0 0 0 0 0 0 0
39301 - 0 0 0 0 0 0 0 0 0 0 0 0
39302 - 0 0 1 0 0 1 0 0 1 0 0 0
39303 - 0 0 0 0 0 0 0 0 0 0 0 0
39304 - 0 0 0 0 0 0 0 0 0 0 0 0
39305 - 0 0 0 0 0 0 0 0 0 0 0 0
39306 - 0 0 0 0 0 0 0 0 0 0 0 0
39307 - 0 0 0 0 0 0 0 0 0 0 0 0
39308 - 6 6 6 18 18 18 42 42 42 82 82 82
39309 - 26 26 26 2 2 6 2 2 6 2 2 6
39310 - 2 2 6 2 2 6 2 2 6 2 2 6
39311 - 2 2 6 2 2 6 2 2 6 14 14 14
39312 - 46 46 46 34 34 34 6 6 6 2 2 6
39313 - 42 42 42 78 78 78 42 42 42 18 18 18
39314 - 6 6 6 0 0 0 0 0 0 0 0 0
39315 - 0 0 0 0 0 0 0 0 0 0 0 0
39316 - 0 0 0 0 0 0 0 0 0 0 0 0
39317 - 0 0 0 0 0 0 0 0 0 0 0 0
39318 - 0 0 0 0 0 0 0 0 0 0 0 0
39319 - 0 0 0 0 0 0 0 0 0 0 0 0
39320 - 0 0 0 0 0 0 0 0 0 0 0 0
39321 - 0 0 0 0 0 0 0 0 0 0 0 0
39322 - 0 0 1 0 0 0 0 0 1 0 0 0
39323 - 0 0 0 0 0 0 0 0 0 0 0 0
39324 - 0 0 0 0 0 0 0 0 0 0 0 0
39325 - 0 0 0 0 0 0 0 0 0 0 0 0
39326 - 0 0 0 0 0 0 0 0 0 0 0 0
39327 - 0 0 0 0 0 0 0 0 0 0 0 0
39328 - 10 10 10 30 30 30 66 66 66 58 58 58
39329 - 2 2 6 2 2 6 2 2 6 2 2 6
39330 - 2 2 6 2 2 6 2 2 6 2 2 6
39331 - 2 2 6 2 2 6 2 2 6 26 26 26
39332 - 86 86 86 101 101 101 46 46 46 10 10 10
39333 - 2 2 6 58 58 58 70 70 70 34 34 34
39334 - 10 10 10 0 0 0 0 0 0 0 0 0
39335 - 0 0 0 0 0 0 0 0 0 0 0 0
39336 - 0 0 0 0 0 0 0 0 0 0 0 0
39337 - 0 0 0 0 0 0 0 0 0 0 0 0
39338 - 0 0 0 0 0 0 0 0 0 0 0 0
39339 - 0 0 0 0 0 0 0 0 0 0 0 0
39340 - 0 0 0 0 0 0 0 0 0 0 0 0
39341 - 0 0 0 0 0 0 0 0 0 0 0 0
39342 - 0 0 1 0 0 1 0 0 1 0 0 0
39343 - 0 0 0 0 0 0 0 0 0 0 0 0
39344 - 0 0 0 0 0 0 0 0 0 0 0 0
39345 - 0 0 0 0 0 0 0 0 0 0 0 0
39346 - 0 0 0 0 0 0 0 0 0 0 0 0
39347 - 0 0 0 0 0 0 0 0 0 0 0 0
39348 - 14 14 14 42 42 42 86 86 86 10 10 10
39349 - 2 2 6 2 2 6 2 2 6 2 2 6
39350 - 2 2 6 2 2 6 2 2 6 2 2 6
39351 - 2 2 6 2 2 6 2 2 6 30 30 30
39352 - 94 94 94 94 94 94 58 58 58 26 26 26
39353 - 2 2 6 6 6 6 78 78 78 54 54 54
39354 - 22 22 22 6 6 6 0 0 0 0 0 0
39355 - 0 0 0 0 0 0 0 0 0 0 0 0
39356 - 0 0 0 0 0 0 0 0 0 0 0 0
39357 - 0 0 0 0 0 0 0 0 0 0 0 0
39358 - 0 0 0 0 0 0 0 0 0 0 0 0
39359 - 0 0 0 0 0 0 0 0 0 0 0 0
39360 - 0 0 0 0 0 0 0 0 0 0 0 0
39361 - 0 0 0 0 0 0 0 0 0 0 0 0
39362 - 0 0 0 0 0 0 0 0 0 0 0 0
39363 - 0 0 0 0 0 0 0 0 0 0 0 0
39364 - 0 0 0 0 0 0 0 0 0 0 0 0
39365 - 0 0 0 0 0 0 0 0 0 0 0 0
39366 - 0 0 0 0 0 0 0 0 0 0 0 0
39367 - 0 0 0 0 0 0 0 0 0 6 6 6
39368 - 22 22 22 62 62 62 62 62 62 2 2 6
39369 - 2 2 6 2 2 6 2 2 6 2 2 6
39370 - 2 2 6 2 2 6 2 2 6 2 2 6
39371 - 2 2 6 2 2 6 2 2 6 26 26 26
39372 - 54 54 54 38 38 38 18 18 18 10 10 10
39373 - 2 2 6 2 2 6 34 34 34 82 82 82
39374 - 38 38 38 14 14 14 0 0 0 0 0 0
39375 - 0 0 0 0 0 0 0 0 0 0 0 0
39376 - 0 0 0 0 0 0 0 0 0 0 0 0
39377 - 0 0 0 0 0 0 0 0 0 0 0 0
39378 - 0 0 0 0 0 0 0 0 0 0 0 0
39379 - 0 0 0 0 0 0 0 0 0 0 0 0
39380 - 0 0 0 0 0 0 0 0 0 0 0 0
39381 - 0 0 0 0 0 0 0 0 0 0 0 0
39382 - 0 0 0 0 0 1 0 0 1 0 0 0
39383 - 0 0 0 0 0 0 0 0 0 0 0 0
39384 - 0 0 0 0 0 0 0 0 0 0 0 0
39385 - 0 0 0 0 0 0 0 0 0 0 0 0
39386 - 0 0 0 0 0 0 0 0 0 0 0 0
39387 - 0 0 0 0 0 0 0 0 0 6 6 6
39388 - 30 30 30 78 78 78 30 30 30 2 2 6
39389 - 2 2 6 2 2 6 2 2 6 2 2 6
39390 - 2 2 6 2 2 6 2 2 6 2 2 6
39391 - 2 2 6 2 2 6 2 2 6 10 10 10
39392 - 10 10 10 2 2 6 2 2 6 2 2 6
39393 - 2 2 6 2 2 6 2 2 6 78 78 78
39394 - 50 50 50 18 18 18 6 6 6 0 0 0
39395 - 0 0 0 0 0 0 0 0 0 0 0 0
39396 - 0 0 0 0 0 0 0 0 0 0 0 0
39397 - 0 0 0 0 0 0 0 0 0 0 0 0
39398 - 0 0 0 0 0 0 0 0 0 0 0 0
39399 - 0 0 0 0 0 0 0 0 0 0 0 0
39400 - 0 0 0 0 0 0 0 0 0 0 0 0
39401 - 0 0 0 0 0 0 0 0 0 0 0 0
39402 - 0 0 1 0 0 0 0 0 0 0 0 0
39403 - 0 0 0 0 0 0 0 0 0 0 0 0
39404 - 0 0 0 0 0 0 0 0 0 0 0 0
39405 - 0 0 0 0 0 0 0 0 0 0 0 0
39406 - 0 0 0 0 0 0 0 0 0 0 0 0
39407 - 0 0 0 0 0 0 0 0 0 10 10 10
39408 - 38 38 38 86 86 86 14 14 14 2 2 6
39409 - 2 2 6 2 2 6 2 2 6 2 2 6
39410 - 2 2 6 2 2 6 2 2 6 2 2 6
39411 - 2 2 6 2 2 6 2 2 6 2 2 6
39412 - 2 2 6 2 2 6 2 2 6 2 2 6
39413 - 2 2 6 2 2 6 2 2 6 54 54 54
39414 - 66 66 66 26 26 26 6 6 6 0 0 0
39415 - 0 0 0 0 0 0 0 0 0 0 0 0
39416 - 0 0 0 0 0 0 0 0 0 0 0 0
39417 - 0 0 0 0 0 0 0 0 0 0 0 0
39418 - 0 0 0 0 0 0 0 0 0 0 0 0
39419 - 0 0 0 0 0 0 0 0 0 0 0 0
39420 - 0 0 0 0 0 0 0 0 0 0 0 0
39421 - 0 0 0 0 0 0 0 0 0 0 0 0
39422 - 0 0 0 0 0 1 0 0 1 0 0 0
39423 - 0 0 0 0 0 0 0 0 0 0 0 0
39424 - 0 0 0 0 0 0 0 0 0 0 0 0
39425 - 0 0 0 0 0 0 0 0 0 0 0 0
39426 - 0 0 0 0 0 0 0 0 0 0 0 0
39427 - 0 0 0 0 0 0 0 0 0 14 14 14
39428 - 42 42 42 82 82 82 2 2 6 2 2 6
39429 - 2 2 6 6 6 6 10 10 10 2 2 6
39430 - 2 2 6 2 2 6 2 2 6 2 2 6
39431 - 2 2 6 2 2 6 2 2 6 6 6 6
39432 - 14 14 14 10 10 10 2 2 6 2 2 6
39433 - 2 2 6 2 2 6 2 2 6 18 18 18
39434 - 82 82 82 34 34 34 10 10 10 0 0 0
39435 - 0 0 0 0 0 0 0 0 0 0 0 0
39436 - 0 0 0 0 0 0 0 0 0 0 0 0
39437 - 0 0 0 0 0 0 0 0 0 0 0 0
39438 - 0 0 0 0 0 0 0 0 0 0 0 0
39439 - 0 0 0 0 0 0 0 0 0 0 0 0
39440 - 0 0 0 0 0 0 0 0 0 0 0 0
39441 - 0 0 0 0 0 0 0 0 0 0 0 0
39442 - 0 0 1 0 0 0 0 0 0 0 0 0
39443 - 0 0 0 0 0 0 0 0 0 0 0 0
39444 - 0 0 0 0 0 0 0 0 0 0 0 0
39445 - 0 0 0 0 0 0 0 0 0 0 0 0
39446 - 0 0 0 0 0 0 0 0 0 0 0 0
39447 - 0 0 0 0 0 0 0 0 0 14 14 14
39448 - 46 46 46 86 86 86 2 2 6 2 2 6
39449 - 6 6 6 6 6 6 22 22 22 34 34 34
39450 - 6 6 6 2 2 6 2 2 6 2 2 6
39451 - 2 2 6 2 2 6 18 18 18 34 34 34
39452 - 10 10 10 50 50 50 22 22 22 2 2 6
39453 - 2 2 6 2 2 6 2 2 6 10 10 10
39454 - 86 86 86 42 42 42 14 14 14 0 0 0
39455 - 0 0 0 0 0 0 0 0 0 0 0 0
39456 - 0 0 0 0 0 0 0 0 0 0 0 0
39457 - 0 0 0 0 0 0 0 0 0 0 0 0
39458 - 0 0 0 0 0 0 0 0 0 0 0 0
39459 - 0 0 0 0 0 0 0 0 0 0 0 0
39460 - 0 0 0 0 0 0 0 0 0 0 0 0
39461 - 0 0 0 0 0 0 0 0 0 0 0 0
39462 - 0 0 1 0 0 1 0 0 1 0 0 0
39463 - 0 0 0 0 0 0 0 0 0 0 0 0
39464 - 0 0 0 0 0 0 0 0 0 0 0 0
39465 - 0 0 0 0 0 0 0 0 0 0 0 0
39466 - 0 0 0 0 0 0 0 0 0 0 0 0
39467 - 0 0 0 0 0 0 0 0 0 14 14 14
39468 - 46 46 46 86 86 86 2 2 6 2 2 6
39469 - 38 38 38 116 116 116 94 94 94 22 22 22
39470 - 22 22 22 2 2 6 2 2 6 2 2 6
39471 - 14 14 14 86 86 86 138 138 138 162 162 162
39472 -154 154 154 38 38 38 26 26 26 6 6 6
39473 - 2 2 6 2 2 6 2 2 6 2 2 6
39474 - 86 86 86 46 46 46 14 14 14 0 0 0
39475 - 0 0 0 0 0 0 0 0 0 0 0 0
39476 - 0 0 0 0 0 0 0 0 0 0 0 0
39477 - 0 0 0 0 0 0 0 0 0 0 0 0
39478 - 0 0 0 0 0 0 0 0 0 0 0 0
39479 - 0 0 0 0 0 0 0 0 0 0 0 0
39480 - 0 0 0 0 0 0 0 0 0 0 0 0
39481 - 0 0 0 0 0 0 0 0 0 0 0 0
39482 - 0 0 0 0 0 0 0 0 0 0 0 0
39483 - 0 0 0 0 0 0 0 0 0 0 0 0
39484 - 0 0 0 0 0 0 0 0 0 0 0 0
39485 - 0 0 0 0 0 0 0 0 0 0 0 0
39486 - 0 0 0 0 0 0 0 0 0 0 0 0
39487 - 0 0 0 0 0 0 0 0 0 14 14 14
39488 - 46 46 46 86 86 86 2 2 6 14 14 14
39489 -134 134 134 198 198 198 195 195 195 116 116 116
39490 - 10 10 10 2 2 6 2 2 6 6 6 6
39491 -101 98 89 187 187 187 210 210 210 218 218 218
39492 -214 214 214 134 134 134 14 14 14 6 6 6
39493 - 2 2 6 2 2 6 2 2 6 2 2 6
39494 - 86 86 86 50 50 50 18 18 18 6 6 6
39495 - 0 0 0 0 0 0 0 0 0 0 0 0
39496 - 0 0 0 0 0 0 0 0 0 0 0 0
39497 - 0 0 0 0 0 0 0 0 0 0 0 0
39498 - 0 0 0 0 0 0 0 0 0 0 0 0
39499 - 0 0 0 0 0 0 0 0 0 0 0 0
39500 - 0 0 0 0 0 0 0 0 0 0 0 0
39501 - 0 0 0 0 0 0 0 0 1 0 0 0
39502 - 0 0 1 0 0 1 0 0 1 0 0 0
39503 - 0 0 0 0 0 0 0 0 0 0 0 0
39504 - 0 0 0 0 0 0 0 0 0 0 0 0
39505 - 0 0 0 0 0 0 0 0 0 0 0 0
39506 - 0 0 0 0 0 0 0 0 0 0 0 0
39507 - 0 0 0 0 0 0 0 0 0 14 14 14
39508 - 46 46 46 86 86 86 2 2 6 54 54 54
39509 -218 218 218 195 195 195 226 226 226 246 246 246
39510 - 58 58 58 2 2 6 2 2 6 30 30 30
39511 -210 210 210 253 253 253 174 174 174 123 123 123
39512 -221 221 221 234 234 234 74 74 74 2 2 6
39513 - 2 2 6 2 2 6 2 2 6 2 2 6
39514 - 70 70 70 58 58 58 22 22 22 6 6 6
39515 - 0 0 0 0 0 0 0 0 0 0 0 0
39516 - 0 0 0 0 0 0 0 0 0 0 0 0
39517 - 0 0 0 0 0 0 0 0 0 0 0 0
39518 - 0 0 0 0 0 0 0 0 0 0 0 0
39519 - 0 0 0 0 0 0 0 0 0 0 0 0
39520 - 0 0 0 0 0 0 0 0 0 0 0 0
39521 - 0 0 0 0 0 0 0 0 0 0 0 0
39522 - 0 0 0 0 0 0 0 0 0 0 0 0
39523 - 0 0 0 0 0 0 0 0 0 0 0 0
39524 - 0 0 0 0 0 0 0 0 0 0 0 0
39525 - 0 0 0 0 0 0 0 0 0 0 0 0
39526 - 0 0 0 0 0 0 0 0 0 0 0 0
39527 - 0 0 0 0 0 0 0 0 0 14 14 14
39528 - 46 46 46 82 82 82 2 2 6 106 106 106
39529 -170 170 170 26 26 26 86 86 86 226 226 226
39530 -123 123 123 10 10 10 14 14 14 46 46 46
39531 -231 231 231 190 190 190 6 6 6 70 70 70
39532 - 90 90 90 238 238 238 158 158 158 2 2 6
39533 - 2 2 6 2 2 6 2 2 6 2 2 6
39534 - 70 70 70 58 58 58 22 22 22 6 6 6
39535 - 0 0 0 0 0 0 0 0 0 0 0 0
39536 - 0 0 0 0 0 0 0 0 0 0 0 0
39537 - 0 0 0 0 0 0 0 0 0 0 0 0
39538 - 0 0 0 0 0 0 0 0 0 0 0 0
39539 - 0 0 0 0 0 0 0 0 0 0 0 0
39540 - 0 0 0 0 0 0 0 0 0 0 0 0
39541 - 0 0 0 0 0 0 0 0 1 0 0 0
39542 - 0 0 1 0 0 1 0 0 1 0 0 0
39543 - 0 0 0 0 0 0 0 0 0 0 0 0
39544 - 0 0 0 0 0 0 0 0 0 0 0 0
39545 - 0 0 0 0 0 0 0 0 0 0 0 0
39546 - 0 0 0 0 0 0 0 0 0 0 0 0
39547 - 0 0 0 0 0 0 0 0 0 14 14 14
39548 - 42 42 42 86 86 86 6 6 6 116 116 116
39549 -106 106 106 6 6 6 70 70 70 149 149 149
39550 -128 128 128 18 18 18 38 38 38 54 54 54
39551 -221 221 221 106 106 106 2 2 6 14 14 14
39552 - 46 46 46 190 190 190 198 198 198 2 2 6
39553 - 2 2 6 2 2 6 2 2 6 2 2 6
39554 - 74 74 74 62 62 62 22 22 22 6 6 6
39555 - 0 0 0 0 0 0 0 0 0 0 0 0
39556 - 0 0 0 0 0 0 0 0 0 0 0 0
39557 - 0 0 0 0 0 0 0 0 0 0 0 0
39558 - 0 0 0 0 0 0 0 0 0 0 0 0
39559 - 0 0 0 0 0 0 0 0 0 0 0 0
39560 - 0 0 0 0 0 0 0 0 0 0 0 0
39561 - 0 0 0 0 0 0 0 0 1 0 0 0
39562 - 0 0 1 0 0 0 0 0 1 0 0 0
39563 - 0 0 0 0 0 0 0 0 0 0 0 0
39564 - 0 0 0 0 0 0 0 0 0 0 0 0
39565 - 0 0 0 0 0 0 0 0 0 0 0 0
39566 - 0 0 0 0 0 0 0 0 0 0 0 0
39567 - 0 0 0 0 0 0 0 0 0 14 14 14
39568 - 42 42 42 94 94 94 14 14 14 101 101 101
39569 -128 128 128 2 2 6 18 18 18 116 116 116
39570 -118 98 46 121 92 8 121 92 8 98 78 10
39571 -162 162 162 106 106 106 2 2 6 2 2 6
39572 - 2 2 6 195 195 195 195 195 195 6 6 6
39573 - 2 2 6 2 2 6 2 2 6 2 2 6
39574 - 74 74 74 62 62 62 22 22 22 6 6 6
39575 - 0 0 0 0 0 0 0 0 0 0 0 0
39576 - 0 0 0 0 0 0 0 0 0 0 0 0
39577 - 0 0 0 0 0 0 0 0 0 0 0 0
39578 - 0 0 0 0 0 0 0 0 0 0 0 0
39579 - 0 0 0 0 0 0 0 0 0 0 0 0
39580 - 0 0 0 0 0 0 0 0 0 0 0 0
39581 - 0 0 0 0 0 0 0 0 1 0 0 1
39582 - 0 0 1 0 0 0 0 0 1 0 0 0
39583 - 0 0 0 0 0 0 0 0 0 0 0 0
39584 - 0 0 0 0 0 0 0 0 0 0 0 0
39585 - 0 0 0 0 0 0 0 0 0 0 0 0
39586 - 0 0 0 0 0 0 0 0 0 0 0 0
39587 - 0 0 0 0 0 0 0 0 0 10 10 10
39588 - 38 38 38 90 90 90 14 14 14 58 58 58
39589 -210 210 210 26 26 26 54 38 6 154 114 10
39590 -226 170 11 236 186 11 225 175 15 184 144 12
39591 -215 174 15 175 146 61 37 26 9 2 2 6
39592 - 70 70 70 246 246 246 138 138 138 2 2 6
39593 - 2 2 6 2 2 6 2 2 6 2 2 6
39594 - 70 70 70 66 66 66 26 26 26 6 6 6
39595 - 0 0 0 0 0 0 0 0 0 0 0 0
39596 - 0 0 0 0 0 0 0 0 0 0 0 0
39597 - 0 0 0 0 0 0 0 0 0 0 0 0
39598 - 0 0 0 0 0 0 0 0 0 0 0 0
39599 - 0 0 0 0 0 0 0 0 0 0 0 0
39600 - 0 0 0 0 0 0 0 0 0 0 0 0
39601 - 0 0 0 0 0 0 0 0 0 0 0 0
39602 - 0 0 0 0 0 0 0 0 0 0 0 0
39603 - 0 0 0 0 0 0 0 0 0 0 0 0
39604 - 0 0 0 0 0 0 0 0 0 0 0 0
39605 - 0 0 0 0 0 0 0 0 0 0 0 0
39606 - 0 0 0 0 0 0 0 0 0 0 0 0
39607 - 0 0 0 0 0 0 0 0 0 10 10 10
39608 - 38 38 38 86 86 86 14 14 14 10 10 10
39609 -195 195 195 188 164 115 192 133 9 225 175 15
39610 -239 182 13 234 190 10 232 195 16 232 200 30
39611 -245 207 45 241 208 19 232 195 16 184 144 12
39612 -218 194 134 211 206 186 42 42 42 2 2 6
39613 - 2 2 6 2 2 6 2 2 6 2 2 6
39614 - 50 50 50 74 74 74 30 30 30 6 6 6
39615 - 0 0 0 0 0 0 0 0 0 0 0 0
39616 - 0 0 0 0 0 0 0 0 0 0 0 0
39617 - 0 0 0 0 0 0 0 0 0 0 0 0
39618 - 0 0 0 0 0 0 0 0 0 0 0 0
39619 - 0 0 0 0 0 0 0 0 0 0 0 0
39620 - 0 0 0 0 0 0 0 0 0 0 0 0
39621 - 0 0 0 0 0 0 0 0 0 0 0 0
39622 - 0 0 0 0 0 0 0 0 0 0 0 0
39623 - 0 0 0 0 0 0 0 0 0 0 0 0
39624 - 0 0 0 0 0 0 0 0 0 0 0 0
39625 - 0 0 0 0 0 0 0 0 0 0 0 0
39626 - 0 0 0 0 0 0 0 0 0 0 0 0
39627 - 0 0 0 0 0 0 0 0 0 10 10 10
39628 - 34 34 34 86 86 86 14 14 14 2 2 6
39629 -121 87 25 192 133 9 219 162 10 239 182 13
39630 -236 186 11 232 195 16 241 208 19 244 214 54
39631 -246 218 60 246 218 38 246 215 20 241 208 19
39632 -241 208 19 226 184 13 121 87 25 2 2 6
39633 - 2 2 6 2 2 6 2 2 6 2 2 6
39634 - 50 50 50 82 82 82 34 34 34 10 10 10
39635 - 0 0 0 0 0 0 0 0 0 0 0 0
39636 - 0 0 0 0 0 0 0 0 0 0 0 0
39637 - 0 0 0 0 0 0 0 0 0 0 0 0
39638 - 0 0 0 0 0 0 0 0 0 0 0 0
39639 - 0 0 0 0 0 0 0 0 0 0 0 0
39640 - 0 0 0 0 0 0 0 0 0 0 0 0
39641 - 0 0 0 0 0 0 0 0 0 0 0 0
39642 - 0 0 0 0 0 0 0 0 0 0 0 0
39643 - 0 0 0 0 0 0 0 0 0 0 0 0
39644 - 0 0 0 0 0 0 0 0 0 0 0 0
39645 - 0 0 0 0 0 0 0 0 0 0 0 0
39646 - 0 0 0 0 0 0 0 0 0 0 0 0
39647 - 0 0 0 0 0 0 0 0 0 10 10 10
39648 - 34 34 34 82 82 82 30 30 30 61 42 6
39649 -180 123 7 206 145 10 230 174 11 239 182 13
39650 -234 190 10 238 202 15 241 208 19 246 218 74
39651 -246 218 38 246 215 20 246 215 20 246 215 20
39652 -226 184 13 215 174 15 184 144 12 6 6 6
39653 - 2 2 6 2 2 6 2 2 6 2 2 6
39654 - 26 26 26 94 94 94 42 42 42 14 14 14
39655 - 0 0 0 0 0 0 0 0 0 0 0 0
39656 - 0 0 0 0 0 0 0 0 0 0 0 0
39657 - 0 0 0 0 0 0 0 0 0 0 0 0
39658 - 0 0 0 0 0 0 0 0 0 0 0 0
39659 - 0 0 0 0 0 0 0 0 0 0 0 0
39660 - 0 0 0 0 0 0 0 0 0 0 0 0
39661 - 0 0 0 0 0 0 0 0 0 0 0 0
39662 - 0 0 0 0 0 0 0 0 0 0 0 0
39663 - 0 0 0 0 0 0 0 0 0 0 0 0
39664 - 0 0 0 0 0 0 0 0 0 0 0 0
39665 - 0 0 0 0 0 0 0 0 0 0 0 0
39666 - 0 0 0 0 0 0 0 0 0 0 0 0
39667 - 0 0 0 0 0 0 0 0 0 10 10 10
39668 - 30 30 30 78 78 78 50 50 50 104 69 6
39669 -192 133 9 216 158 10 236 178 12 236 186 11
39670 -232 195 16 241 208 19 244 214 54 245 215 43
39671 -246 215 20 246 215 20 241 208 19 198 155 10
39672 -200 144 11 216 158 10 156 118 10 2 2 6
39673 - 2 2 6 2 2 6 2 2 6 2 2 6
39674 - 6 6 6 90 90 90 54 54 54 18 18 18
39675 - 6 6 6 0 0 0 0 0 0 0 0 0
39676 - 0 0 0 0 0 0 0 0 0 0 0 0
39677 - 0 0 0 0 0 0 0 0 0 0 0 0
39678 - 0 0 0 0 0 0 0 0 0 0 0 0
39679 - 0 0 0 0 0 0 0 0 0 0 0 0
39680 - 0 0 0 0 0 0 0 0 0 0 0 0
39681 - 0 0 0 0 0 0 0 0 0 0 0 0
39682 - 0 0 0 0 0 0 0 0 0 0 0 0
39683 - 0 0 0 0 0 0 0 0 0 0 0 0
39684 - 0 0 0 0 0 0 0 0 0 0 0 0
39685 - 0 0 0 0 0 0 0 0 0 0 0 0
39686 - 0 0 0 0 0 0 0 0 0 0 0 0
39687 - 0 0 0 0 0 0 0 0 0 10 10 10
39688 - 30 30 30 78 78 78 46 46 46 22 22 22
39689 -137 92 6 210 162 10 239 182 13 238 190 10
39690 -238 202 15 241 208 19 246 215 20 246 215 20
39691 -241 208 19 203 166 17 185 133 11 210 150 10
39692 -216 158 10 210 150 10 102 78 10 2 2 6
39693 - 6 6 6 54 54 54 14 14 14 2 2 6
39694 - 2 2 6 62 62 62 74 74 74 30 30 30
39695 - 10 10 10 0 0 0 0 0 0 0 0 0
39696 - 0 0 0 0 0 0 0 0 0 0 0 0
39697 - 0 0 0 0 0 0 0 0 0 0 0 0
39698 - 0 0 0 0 0 0 0 0 0 0 0 0
39699 - 0 0 0 0 0 0 0 0 0 0 0 0
39700 - 0 0 0 0 0 0 0 0 0 0 0 0
39701 - 0 0 0 0 0 0 0 0 0 0 0 0
39702 - 0 0 0 0 0 0 0 0 0 0 0 0
39703 - 0 0 0 0 0 0 0 0 0 0 0 0
39704 - 0 0 0 0 0 0 0 0 0 0 0 0
39705 - 0 0 0 0 0 0 0 0 0 0 0 0
39706 - 0 0 0 0 0 0 0 0 0 0 0 0
39707 - 0 0 0 0 0 0 0 0 0 10 10 10
39708 - 34 34 34 78 78 78 50 50 50 6 6 6
39709 - 94 70 30 139 102 15 190 146 13 226 184 13
39710 -232 200 30 232 195 16 215 174 15 190 146 13
39711 -168 122 10 192 133 9 210 150 10 213 154 11
39712 -202 150 34 182 157 106 101 98 89 2 2 6
39713 - 2 2 6 78 78 78 116 116 116 58 58 58
39714 - 2 2 6 22 22 22 90 90 90 46 46 46
39715 - 18 18 18 6 6 6 0 0 0 0 0 0
39716 - 0 0 0 0 0 0 0 0 0 0 0 0
39717 - 0 0 0 0 0 0 0 0 0 0 0 0
39718 - 0 0 0 0 0 0 0 0 0 0 0 0
39719 - 0 0 0 0 0 0 0 0 0 0 0 0
39720 - 0 0 0 0 0 0 0 0 0 0 0 0
39721 - 0 0 0 0 0 0 0 0 0 0 0 0
39722 - 0 0 0 0 0 0 0 0 0 0 0 0
39723 - 0 0 0 0 0 0 0 0 0 0 0 0
39724 - 0 0 0 0 0 0 0 0 0 0 0 0
39725 - 0 0 0 0 0 0 0 0 0 0 0 0
39726 - 0 0 0 0 0 0 0 0 0 0 0 0
39727 - 0 0 0 0 0 0 0 0 0 10 10 10
39728 - 38 38 38 86 86 86 50 50 50 6 6 6
39729 -128 128 128 174 154 114 156 107 11 168 122 10
39730 -198 155 10 184 144 12 197 138 11 200 144 11
39731 -206 145 10 206 145 10 197 138 11 188 164 115
39732 -195 195 195 198 198 198 174 174 174 14 14 14
39733 - 2 2 6 22 22 22 116 116 116 116 116 116
39734 - 22 22 22 2 2 6 74 74 74 70 70 70
39735 - 30 30 30 10 10 10 0 0 0 0 0 0
39736 - 0 0 0 0 0 0 0 0 0 0 0 0
39737 - 0 0 0 0 0 0 0 0 0 0 0 0
39738 - 0 0 0 0 0 0 0 0 0 0 0 0
39739 - 0 0 0 0 0 0 0 0 0 0 0 0
39740 - 0 0 0 0 0 0 0 0 0 0 0 0
39741 - 0 0 0 0 0 0 0 0 0 0 0 0
39742 - 0 0 0 0 0 0 0 0 0 0 0 0
39743 - 0 0 0 0 0 0 0 0 0 0 0 0
39744 - 0 0 0 0 0 0 0 0 0 0 0 0
39745 - 0 0 0 0 0 0 0 0 0 0 0 0
39746 - 0 0 0 0 0 0 0 0 0 0 0 0
39747 - 0 0 0 0 0 0 6 6 6 18 18 18
39748 - 50 50 50 101 101 101 26 26 26 10 10 10
39749 -138 138 138 190 190 190 174 154 114 156 107 11
39750 -197 138 11 200 144 11 197 138 11 192 133 9
39751 -180 123 7 190 142 34 190 178 144 187 187 187
39752 -202 202 202 221 221 221 214 214 214 66 66 66
39753 - 2 2 6 2 2 6 50 50 50 62 62 62
39754 - 6 6 6 2 2 6 10 10 10 90 90 90
39755 - 50 50 50 18 18 18 6 6 6 0 0 0
39756 - 0 0 0 0 0 0 0 0 0 0 0 0
39757 - 0 0 0 0 0 0 0 0 0 0 0 0
39758 - 0 0 0 0 0 0 0 0 0 0 0 0
39759 - 0 0 0 0 0 0 0 0 0 0 0 0
39760 - 0 0 0 0 0 0 0 0 0 0 0 0
39761 - 0 0 0 0 0 0 0 0 0 0 0 0
39762 - 0 0 0 0 0 0 0 0 0 0 0 0
39763 - 0 0 0 0 0 0 0 0 0 0 0 0
39764 - 0 0 0 0 0 0 0 0 0 0 0 0
39765 - 0 0 0 0 0 0 0 0 0 0 0 0
39766 - 0 0 0 0 0 0 0 0 0 0 0 0
39767 - 0 0 0 0 0 0 10 10 10 34 34 34
39768 - 74 74 74 74 74 74 2 2 6 6 6 6
39769 -144 144 144 198 198 198 190 190 190 178 166 146
39770 -154 121 60 156 107 11 156 107 11 168 124 44
39771 -174 154 114 187 187 187 190 190 190 210 210 210
39772 -246 246 246 253 253 253 253 253 253 182 182 182
39773 - 6 6 6 2 2 6 2 2 6 2 2 6
39774 - 2 2 6 2 2 6 2 2 6 62 62 62
39775 - 74 74 74 34 34 34 14 14 14 0 0 0
39776 - 0 0 0 0 0 0 0 0 0 0 0 0
39777 - 0 0 0 0 0 0 0 0 0 0 0 0
39778 - 0 0 0 0 0 0 0 0 0 0 0 0
39779 - 0 0 0 0 0 0 0 0 0 0 0 0
39780 - 0 0 0 0 0 0 0 0 0 0 0 0
39781 - 0 0 0 0 0 0 0 0 0 0 0 0
39782 - 0 0 0 0 0 0 0 0 0 0 0 0
39783 - 0 0 0 0 0 0 0 0 0 0 0 0
39784 - 0 0 0 0 0 0 0 0 0 0 0 0
39785 - 0 0 0 0 0 0 0 0 0 0 0 0
39786 - 0 0 0 0 0 0 0 0 0 0 0 0
39787 - 0 0 0 10 10 10 22 22 22 54 54 54
39788 - 94 94 94 18 18 18 2 2 6 46 46 46
39789 -234 234 234 221 221 221 190 190 190 190 190 190
39790 -190 190 190 187 187 187 187 187 187 190 190 190
39791 -190 190 190 195 195 195 214 214 214 242 242 242
39792 -253 253 253 253 253 253 253 253 253 253 253 253
39793 - 82 82 82 2 2 6 2 2 6 2 2 6
39794 - 2 2 6 2 2 6 2 2 6 14 14 14
39795 - 86 86 86 54 54 54 22 22 22 6 6 6
39796 - 0 0 0 0 0 0 0 0 0 0 0 0
39797 - 0 0 0 0 0 0 0 0 0 0 0 0
39798 - 0 0 0 0 0 0 0 0 0 0 0 0
39799 - 0 0 0 0 0 0 0 0 0 0 0 0
39800 - 0 0 0 0 0 0 0 0 0 0 0 0
39801 - 0 0 0 0 0 0 0 0 0 0 0 0
39802 - 0 0 0 0 0 0 0 0 0 0 0 0
39803 - 0 0 0 0 0 0 0 0 0 0 0 0
39804 - 0 0 0 0 0 0 0 0 0 0 0 0
39805 - 0 0 0 0 0 0 0 0 0 0 0 0
39806 - 0 0 0 0 0 0 0 0 0 0 0 0
39807 - 6 6 6 18 18 18 46 46 46 90 90 90
39808 - 46 46 46 18 18 18 6 6 6 182 182 182
39809 -253 253 253 246 246 246 206 206 206 190 190 190
39810 -190 190 190 190 190 190 190 190 190 190 190 190
39811 -206 206 206 231 231 231 250 250 250 253 253 253
39812 -253 253 253 253 253 253 253 253 253 253 253 253
39813 -202 202 202 14 14 14 2 2 6 2 2 6
39814 - 2 2 6 2 2 6 2 2 6 2 2 6
39815 - 42 42 42 86 86 86 42 42 42 18 18 18
39816 - 6 6 6 0 0 0 0 0 0 0 0 0
39817 - 0 0 0 0 0 0 0 0 0 0 0 0
39818 - 0 0 0 0 0 0 0 0 0 0 0 0
39819 - 0 0 0 0 0 0 0 0 0 0 0 0
39820 - 0 0 0 0 0 0 0 0 0 0 0 0
39821 - 0 0 0 0 0 0 0 0 0 0 0 0
39822 - 0 0 0 0 0 0 0 0 0 0 0 0
39823 - 0 0 0 0 0 0 0 0 0 0 0 0
39824 - 0 0 0 0 0 0 0 0 0 0 0 0
39825 - 0 0 0 0 0 0 0 0 0 0 0 0
39826 - 0 0 0 0 0 0 0 0 0 6 6 6
39827 - 14 14 14 38 38 38 74 74 74 66 66 66
39828 - 2 2 6 6 6 6 90 90 90 250 250 250
39829 -253 253 253 253 253 253 238 238 238 198 198 198
39830 -190 190 190 190 190 190 195 195 195 221 221 221
39831 -246 246 246 253 253 253 253 253 253 253 253 253
39832 -253 253 253 253 253 253 253 253 253 253 253 253
39833 -253 253 253 82 82 82 2 2 6 2 2 6
39834 - 2 2 6 2 2 6 2 2 6 2 2 6
39835 - 2 2 6 78 78 78 70 70 70 34 34 34
39836 - 14 14 14 6 6 6 0 0 0 0 0 0
39837 - 0 0 0 0 0 0 0 0 0 0 0 0
39838 - 0 0 0 0 0 0 0 0 0 0 0 0
39839 - 0 0 0 0 0 0 0 0 0 0 0 0
39840 - 0 0 0 0 0 0 0 0 0 0 0 0
39841 - 0 0 0 0 0 0 0 0 0 0 0 0
39842 - 0 0 0 0 0 0 0 0 0 0 0 0
39843 - 0 0 0 0 0 0 0 0 0 0 0 0
39844 - 0 0 0 0 0 0 0 0 0 0 0 0
39845 - 0 0 0 0 0 0 0 0 0 0 0 0
39846 - 0 0 0 0 0 0 0 0 0 14 14 14
39847 - 34 34 34 66 66 66 78 78 78 6 6 6
39848 - 2 2 6 18 18 18 218 218 218 253 253 253
39849 -253 253 253 253 253 253 253 253 253 246 246 246
39850 -226 226 226 231 231 231 246 246 246 253 253 253
39851 -253 253 253 253 253 253 253 253 253 253 253 253
39852 -253 253 253 253 253 253 253 253 253 253 253 253
39853 -253 253 253 178 178 178 2 2 6 2 2 6
39854 - 2 2 6 2 2 6 2 2 6 2 2 6
39855 - 2 2 6 18 18 18 90 90 90 62 62 62
39856 - 30 30 30 10 10 10 0 0 0 0 0 0
39857 - 0 0 0 0 0 0 0 0 0 0 0 0
39858 - 0 0 0 0 0 0 0 0 0 0 0 0
39859 - 0 0 0 0 0 0 0 0 0 0 0 0
39860 - 0 0 0 0 0 0 0 0 0 0 0 0
39861 - 0 0 0 0 0 0 0 0 0 0 0 0
39862 - 0 0 0 0 0 0 0 0 0 0 0 0
39863 - 0 0 0 0 0 0 0 0 0 0 0 0
39864 - 0 0 0 0 0 0 0 0 0 0 0 0
39865 - 0 0 0 0 0 0 0 0 0 0 0 0
39866 - 0 0 0 0 0 0 10 10 10 26 26 26
39867 - 58 58 58 90 90 90 18 18 18 2 2 6
39868 - 2 2 6 110 110 110 253 253 253 253 253 253
39869 -253 253 253 253 253 253 253 253 253 253 253 253
39870 -250 250 250 253 253 253 253 253 253 253 253 253
39871 -253 253 253 253 253 253 253 253 253 253 253 253
39872 -253 253 253 253 253 253 253 253 253 253 253 253
39873 -253 253 253 231 231 231 18 18 18 2 2 6
39874 - 2 2 6 2 2 6 2 2 6 2 2 6
39875 - 2 2 6 2 2 6 18 18 18 94 94 94
39876 - 54 54 54 26 26 26 10 10 10 0 0 0
39877 - 0 0 0 0 0 0 0 0 0 0 0 0
39878 - 0 0 0 0 0 0 0 0 0 0 0 0
39879 - 0 0 0 0 0 0 0 0 0 0 0 0
39880 - 0 0 0 0 0 0 0 0 0 0 0 0
39881 - 0 0 0 0 0 0 0 0 0 0 0 0
39882 - 0 0 0 0 0 0 0 0 0 0 0 0
39883 - 0 0 0 0 0 0 0 0 0 0 0 0
39884 - 0 0 0 0 0 0 0 0 0 0 0 0
39885 - 0 0 0 0 0 0 0 0 0 0 0 0
39886 - 0 0 0 6 6 6 22 22 22 50 50 50
39887 - 90 90 90 26 26 26 2 2 6 2 2 6
39888 - 14 14 14 195 195 195 250 250 250 253 253 253
39889 -253 253 253 253 253 253 253 253 253 253 253 253
39890 -253 253 253 253 253 253 253 253 253 253 253 253
39891 -253 253 253 253 253 253 253 253 253 253 253 253
39892 -253 253 253 253 253 253 253 253 253 253 253 253
39893 -250 250 250 242 242 242 54 54 54 2 2 6
39894 - 2 2 6 2 2 6 2 2 6 2 2 6
39895 - 2 2 6 2 2 6 2 2 6 38 38 38
39896 - 86 86 86 50 50 50 22 22 22 6 6 6
39897 - 0 0 0 0 0 0 0 0 0 0 0 0
39898 - 0 0 0 0 0 0 0 0 0 0 0 0
39899 - 0 0 0 0 0 0 0 0 0 0 0 0
39900 - 0 0 0 0 0 0 0 0 0 0 0 0
39901 - 0 0 0 0 0 0 0 0 0 0 0 0
39902 - 0 0 0 0 0 0 0 0 0 0 0 0
39903 - 0 0 0 0 0 0 0 0 0 0 0 0
39904 - 0 0 0 0 0 0 0 0 0 0 0 0
39905 - 0 0 0 0 0 0 0 0 0 0 0 0
39906 - 6 6 6 14 14 14 38 38 38 82 82 82
39907 - 34 34 34 2 2 6 2 2 6 2 2 6
39908 - 42 42 42 195 195 195 246 246 246 253 253 253
39909 -253 253 253 253 253 253 253 253 253 250 250 250
39910 -242 242 242 242 242 242 250 250 250 253 253 253
39911 -253 253 253 253 253 253 253 253 253 253 253 253
39912 -253 253 253 250 250 250 246 246 246 238 238 238
39913 -226 226 226 231 231 231 101 101 101 6 6 6
39914 - 2 2 6 2 2 6 2 2 6 2 2 6
39915 - 2 2 6 2 2 6 2 2 6 2 2 6
39916 - 38 38 38 82 82 82 42 42 42 14 14 14
39917 - 6 6 6 0 0 0 0 0 0 0 0 0
39918 - 0 0 0 0 0 0 0 0 0 0 0 0
39919 - 0 0 0 0 0 0 0 0 0 0 0 0
39920 - 0 0 0 0 0 0 0 0 0 0 0 0
39921 - 0 0 0 0 0 0 0 0 0 0 0 0
39922 - 0 0 0 0 0 0 0 0 0 0 0 0
39923 - 0 0 0 0 0 0 0 0 0 0 0 0
39924 - 0 0 0 0 0 0 0 0 0 0 0 0
39925 - 0 0 0 0 0 0 0 0 0 0 0 0
39926 - 10 10 10 26 26 26 62 62 62 66 66 66
39927 - 2 2 6 2 2 6 2 2 6 6 6 6
39928 - 70 70 70 170 170 170 206 206 206 234 234 234
39929 -246 246 246 250 250 250 250 250 250 238 238 238
39930 -226 226 226 231 231 231 238 238 238 250 250 250
39931 -250 250 250 250 250 250 246 246 246 231 231 231
39932 -214 214 214 206 206 206 202 202 202 202 202 202
39933 -198 198 198 202 202 202 182 182 182 18 18 18
39934 - 2 2 6 2 2 6 2 2 6 2 2 6
39935 - 2 2 6 2 2 6 2 2 6 2 2 6
39936 - 2 2 6 62 62 62 66 66 66 30 30 30
39937 - 10 10 10 0 0 0 0 0 0 0 0 0
39938 - 0 0 0 0 0 0 0 0 0 0 0 0
39939 - 0 0 0 0 0 0 0 0 0 0 0 0
39940 - 0 0 0 0 0 0 0 0 0 0 0 0
39941 - 0 0 0 0 0 0 0 0 0 0 0 0
39942 - 0 0 0 0 0 0 0 0 0 0 0 0
39943 - 0 0 0 0 0 0 0 0 0 0 0 0
39944 - 0 0 0 0 0 0 0 0 0 0 0 0
39945 - 0 0 0 0 0 0 0 0 0 0 0 0
39946 - 14 14 14 42 42 42 82 82 82 18 18 18
39947 - 2 2 6 2 2 6 2 2 6 10 10 10
39948 - 94 94 94 182 182 182 218 218 218 242 242 242
39949 -250 250 250 253 253 253 253 253 253 250 250 250
39950 -234 234 234 253 253 253 253 253 253 253 253 253
39951 -253 253 253 253 253 253 253 253 253 246 246 246
39952 -238 238 238 226 226 226 210 210 210 202 202 202
39953 -195 195 195 195 195 195 210 210 210 158 158 158
39954 - 6 6 6 14 14 14 50 50 50 14 14 14
39955 - 2 2 6 2 2 6 2 2 6 2 2 6
39956 - 2 2 6 6 6 6 86 86 86 46 46 46
39957 - 18 18 18 6 6 6 0 0 0 0 0 0
39958 - 0 0 0 0 0 0 0 0 0 0 0 0
39959 - 0 0 0 0 0 0 0 0 0 0 0 0
39960 - 0 0 0 0 0 0 0 0 0 0 0 0
39961 - 0 0 0 0 0 0 0 0 0 0 0 0
39962 - 0 0 0 0 0 0 0 0 0 0 0 0
39963 - 0 0 0 0 0 0 0 0 0 0 0 0
39964 - 0 0 0 0 0 0 0 0 0 0 0 0
39965 - 0 0 0 0 0 0 0 0 0 6 6 6
39966 - 22 22 22 54 54 54 70 70 70 2 2 6
39967 - 2 2 6 10 10 10 2 2 6 22 22 22
39968 -166 166 166 231 231 231 250 250 250 253 253 253
39969 -253 253 253 253 253 253 253 253 253 250 250 250
39970 -242 242 242 253 253 253 253 253 253 253 253 253
39971 -253 253 253 253 253 253 253 253 253 253 253 253
39972 -253 253 253 253 253 253 253 253 253 246 246 246
39973 -231 231 231 206 206 206 198 198 198 226 226 226
39974 - 94 94 94 2 2 6 6 6 6 38 38 38
39975 - 30 30 30 2 2 6 2 2 6 2 2 6
39976 - 2 2 6 2 2 6 62 62 62 66 66 66
39977 - 26 26 26 10 10 10 0 0 0 0 0 0
39978 - 0 0 0 0 0 0 0 0 0 0 0 0
39979 - 0 0 0 0 0 0 0 0 0 0 0 0
39980 - 0 0 0 0 0 0 0 0 0 0 0 0
39981 - 0 0 0 0 0 0 0 0 0 0 0 0
39982 - 0 0 0 0 0 0 0 0 0 0 0 0
39983 - 0 0 0 0 0 0 0 0 0 0 0 0
39984 - 0 0 0 0 0 0 0 0 0 0 0 0
39985 - 0 0 0 0 0 0 0 0 0 10 10 10
39986 - 30 30 30 74 74 74 50 50 50 2 2 6
39987 - 26 26 26 26 26 26 2 2 6 106 106 106
39988 -238 238 238 253 253 253 253 253 253 253 253 253
39989 -253 253 253 253 253 253 253 253 253 253 253 253
39990 -253 253 253 253 253 253 253 253 253 253 253 253
39991 -253 253 253 253 253 253 253 253 253 253 253 253
39992 -253 253 253 253 253 253 253 253 253 253 253 253
39993 -253 253 253 246 246 246 218 218 218 202 202 202
39994 -210 210 210 14 14 14 2 2 6 2 2 6
39995 - 30 30 30 22 22 22 2 2 6 2 2 6
39996 - 2 2 6 2 2 6 18 18 18 86 86 86
39997 - 42 42 42 14 14 14 0 0 0 0 0 0
39998 - 0 0 0 0 0 0 0 0 0 0 0 0
39999 - 0 0 0 0 0 0 0 0 0 0 0 0
40000 - 0 0 0 0 0 0 0 0 0 0 0 0
40001 - 0 0 0 0 0 0 0 0 0 0 0 0
40002 - 0 0 0 0 0 0 0 0 0 0 0 0
40003 - 0 0 0 0 0 0 0 0 0 0 0 0
40004 - 0 0 0 0 0 0 0 0 0 0 0 0
40005 - 0 0 0 0 0 0 0 0 0 14 14 14
40006 - 42 42 42 90 90 90 22 22 22 2 2 6
40007 - 42 42 42 2 2 6 18 18 18 218 218 218
40008 -253 253 253 253 253 253 253 253 253 253 253 253
40009 -253 253 253 253 253 253 253 253 253 253 253 253
40010 -253 253 253 253 253 253 253 253 253 253 253 253
40011 -253 253 253 253 253 253 253 253 253 253 253 253
40012 -253 253 253 253 253 253 253 253 253 253 253 253
40013 -253 253 253 253 253 253 250 250 250 221 221 221
40014 -218 218 218 101 101 101 2 2 6 14 14 14
40015 - 18 18 18 38 38 38 10 10 10 2 2 6
40016 - 2 2 6 2 2 6 2 2 6 78 78 78
40017 - 58 58 58 22 22 22 6 6 6 0 0 0
40018 - 0 0 0 0 0 0 0 0 0 0 0 0
40019 - 0 0 0 0 0 0 0 0 0 0 0 0
40020 - 0 0 0 0 0 0 0 0 0 0 0 0
40021 - 0 0 0 0 0 0 0 0 0 0 0 0
40022 - 0 0 0 0 0 0 0 0 0 0 0 0
40023 - 0 0 0 0 0 0 0 0 0 0 0 0
40024 - 0 0 0 0 0 0 0 0 0 0 0 0
40025 - 0 0 0 0 0 0 6 6 6 18 18 18
40026 - 54 54 54 82 82 82 2 2 6 26 26 26
40027 - 22 22 22 2 2 6 123 123 123 253 253 253
40028 -253 253 253 253 253 253 253 253 253 253 253 253
40029 -253 253 253 253 253 253 253 253 253 253 253 253
40030 -253 253 253 253 253 253 253 253 253 253 253 253
40031 -253 253 253 253 253 253 253 253 253 253 253 253
40032 -253 253 253 253 253 253 253 253 253 253 253 253
40033 -253 253 253 253 253 253 253 253 253 250 250 250
40034 -238 238 238 198 198 198 6 6 6 38 38 38
40035 - 58 58 58 26 26 26 38 38 38 2 2 6
40036 - 2 2 6 2 2 6 2 2 6 46 46 46
40037 - 78 78 78 30 30 30 10 10 10 0 0 0
40038 - 0 0 0 0 0 0 0 0 0 0 0 0
40039 - 0 0 0 0 0 0 0 0 0 0 0 0
40040 - 0 0 0 0 0 0 0 0 0 0 0 0
40041 - 0 0 0 0 0 0 0 0 0 0 0 0
40042 - 0 0 0 0 0 0 0 0 0 0 0 0
40043 - 0 0 0 0 0 0 0 0 0 0 0 0
40044 - 0 0 0 0 0 0 0 0 0 0 0 0
40045 - 0 0 0 0 0 0 10 10 10 30 30 30
40046 - 74 74 74 58 58 58 2 2 6 42 42 42
40047 - 2 2 6 22 22 22 231 231 231 253 253 253
40048 -253 253 253 253 253 253 253 253 253 253 253 253
40049 -253 253 253 253 253 253 253 253 253 250 250 250
40050 -253 253 253 253 253 253 253 253 253 253 253 253
40051 -253 253 253 253 253 253 253 253 253 253 253 253
40052 -253 253 253 253 253 253 253 253 253 253 253 253
40053 -253 253 253 253 253 253 253 253 253 253 253 253
40054 -253 253 253 246 246 246 46 46 46 38 38 38
40055 - 42 42 42 14 14 14 38 38 38 14 14 14
40056 - 2 2 6 2 2 6 2 2 6 6 6 6
40057 - 86 86 86 46 46 46 14 14 14 0 0 0
40058 - 0 0 0 0 0 0 0 0 0 0 0 0
40059 - 0 0 0 0 0 0 0 0 0 0 0 0
40060 - 0 0 0 0 0 0 0 0 0 0 0 0
40061 - 0 0 0 0 0 0 0 0 0 0 0 0
40062 - 0 0 0 0 0 0 0 0 0 0 0 0
40063 - 0 0 0 0 0 0 0 0 0 0 0 0
40064 - 0 0 0 0 0 0 0 0 0 0 0 0
40065 - 0 0 0 6 6 6 14 14 14 42 42 42
40066 - 90 90 90 18 18 18 18 18 18 26 26 26
40067 - 2 2 6 116 116 116 253 253 253 253 253 253
40068 -253 253 253 253 253 253 253 253 253 253 253 253
40069 -253 253 253 253 253 253 250 250 250 238 238 238
40070 -253 253 253 253 253 253 253 253 253 253 253 253
40071 -253 253 253 253 253 253 253 253 253 253 253 253
40072 -253 253 253 253 253 253 253 253 253 253 253 253
40073 -253 253 253 253 253 253 253 253 253 253 253 253
40074 -253 253 253 253 253 253 94 94 94 6 6 6
40075 - 2 2 6 2 2 6 10 10 10 34 34 34
40076 - 2 2 6 2 2 6 2 2 6 2 2 6
40077 - 74 74 74 58 58 58 22 22 22 6 6 6
40078 - 0 0 0 0 0 0 0 0 0 0 0 0
40079 - 0 0 0 0 0 0 0 0 0 0 0 0
40080 - 0 0 0 0 0 0 0 0 0 0 0 0
40081 - 0 0 0 0 0 0 0 0 0 0 0 0
40082 - 0 0 0 0 0 0 0 0 0 0 0 0
40083 - 0 0 0 0 0 0 0 0 0 0 0 0
40084 - 0 0 0 0 0 0 0 0 0 0 0 0
40085 - 0 0 0 10 10 10 26 26 26 66 66 66
40086 - 82 82 82 2 2 6 38 38 38 6 6 6
40087 - 14 14 14 210 210 210 253 253 253 253 253 253
40088 -253 253 253 253 253 253 253 253 253 253 253 253
40089 -253 253 253 253 253 253 246 246 246 242 242 242
40090 -253 253 253 253 253 253 253 253 253 253 253 253
40091 -253 253 253 253 253 253 253 253 253 253 253 253
40092 -253 253 253 253 253 253 253 253 253 253 253 253
40093 -253 253 253 253 253 253 253 253 253 253 253 253
40094 -253 253 253 253 253 253 144 144 144 2 2 6
40095 - 2 2 6 2 2 6 2 2 6 46 46 46
40096 - 2 2 6 2 2 6 2 2 6 2 2 6
40097 - 42 42 42 74 74 74 30 30 30 10 10 10
40098 - 0 0 0 0 0 0 0 0 0 0 0 0
40099 - 0 0 0 0 0 0 0 0 0 0 0 0
40100 - 0 0 0 0 0 0 0 0 0 0 0 0
40101 - 0 0 0 0 0 0 0 0 0 0 0 0
40102 - 0 0 0 0 0 0 0 0 0 0 0 0
40103 - 0 0 0 0 0 0 0 0 0 0 0 0
40104 - 0 0 0 0 0 0 0 0 0 0 0 0
40105 - 6 6 6 14 14 14 42 42 42 90 90 90
40106 - 26 26 26 6 6 6 42 42 42 2 2 6
40107 - 74 74 74 250 250 250 253 253 253 253 253 253
40108 -253 253 253 253 253 253 253 253 253 253 253 253
40109 -253 253 253 253 253 253 242 242 242 242 242 242
40110 -253 253 253 253 253 253 253 253 253 253 253 253
40111 -253 253 253 253 253 253 253 253 253 253 253 253
40112 -253 253 253 253 253 253 253 253 253 253 253 253
40113 -253 253 253 253 253 253 253 253 253 253 253 253
40114 -253 253 253 253 253 253 182 182 182 2 2 6
40115 - 2 2 6 2 2 6 2 2 6 46 46 46
40116 - 2 2 6 2 2 6 2 2 6 2 2 6
40117 - 10 10 10 86 86 86 38 38 38 10 10 10
40118 - 0 0 0 0 0 0 0 0 0 0 0 0
40119 - 0 0 0 0 0 0 0 0 0 0 0 0
40120 - 0 0 0 0 0 0 0 0 0 0 0 0
40121 - 0 0 0 0 0 0 0 0 0 0 0 0
40122 - 0 0 0 0 0 0 0 0 0 0 0 0
40123 - 0 0 0 0 0 0 0 0 0 0 0 0
40124 - 0 0 0 0 0 0 0 0 0 0 0 0
40125 - 10 10 10 26 26 26 66 66 66 82 82 82
40126 - 2 2 6 22 22 22 18 18 18 2 2 6
40127 -149 149 149 253 253 253 253 253 253 253 253 253
40128 -253 253 253 253 253 253 253 253 253 253 253 253
40129 -253 253 253 253 253 253 234 234 234 242 242 242
40130 -253 253 253 253 253 253 253 253 253 253 253 253
40131 -253 253 253 253 253 253 253 253 253 253 253 253
40132 -253 253 253 253 253 253 253 253 253 253 253 253
40133 -253 253 253 253 253 253 253 253 253 253 253 253
40134 -253 253 253 253 253 253 206 206 206 2 2 6
40135 - 2 2 6 2 2 6 2 2 6 38 38 38
40136 - 2 2 6 2 2 6 2 2 6 2 2 6
40137 - 6 6 6 86 86 86 46 46 46 14 14 14
40138 - 0 0 0 0 0 0 0 0 0 0 0 0
40139 - 0 0 0 0 0 0 0 0 0 0 0 0
40140 - 0 0 0 0 0 0 0 0 0 0 0 0
40141 - 0 0 0 0 0 0 0 0 0 0 0 0
40142 - 0 0 0 0 0 0 0 0 0 0 0 0
40143 - 0 0 0 0 0 0 0 0 0 0 0 0
40144 - 0 0 0 0 0 0 0 0 0 6 6 6
40145 - 18 18 18 46 46 46 86 86 86 18 18 18
40146 - 2 2 6 34 34 34 10 10 10 6 6 6
40147 -210 210 210 253 253 253 253 253 253 253 253 253
40148 -253 253 253 253 253 253 253 253 253 253 253 253
40149 -253 253 253 253 253 253 234 234 234 242 242 242
40150 -253 253 253 253 253 253 253 253 253 253 253 253
40151 -253 253 253 253 253 253 253 253 253 253 253 253
40152 -253 253 253 253 253 253 253 253 253 253 253 253
40153 -253 253 253 253 253 253 253 253 253 253 253 253
40154 -253 253 253 253 253 253 221 221 221 6 6 6
40155 - 2 2 6 2 2 6 6 6 6 30 30 30
40156 - 2 2 6 2 2 6 2 2 6 2 2 6
40157 - 2 2 6 82 82 82 54 54 54 18 18 18
40158 - 6 6 6 0 0 0 0 0 0 0 0 0
40159 - 0 0 0 0 0 0 0 0 0 0 0 0
40160 - 0 0 0 0 0 0 0 0 0 0 0 0
40161 - 0 0 0 0 0 0 0 0 0 0 0 0
40162 - 0 0 0 0 0 0 0 0 0 0 0 0
40163 - 0 0 0 0 0 0 0 0 0 0 0 0
40164 - 0 0 0 0 0 0 0 0 0 10 10 10
40165 - 26 26 26 66 66 66 62 62 62 2 2 6
40166 - 2 2 6 38 38 38 10 10 10 26 26 26
40167 -238 238 238 253 253 253 253 253 253 253 253 253
40168 -253 253 253 253 253 253 253 253 253 253 253 253
40169 -253 253 253 253 253 253 231 231 231 238 238 238
40170 -253 253 253 253 253 253 253 253 253 253 253 253
40171 -253 253 253 253 253 253 253 253 253 253 253 253
40172 -253 253 253 253 253 253 253 253 253 253 253 253
40173 -253 253 253 253 253 253 253 253 253 253 253 253
40174 -253 253 253 253 253 253 231 231 231 6 6 6
40175 - 2 2 6 2 2 6 10 10 10 30 30 30
40176 - 2 2 6 2 2 6 2 2 6 2 2 6
40177 - 2 2 6 66 66 66 58 58 58 22 22 22
40178 - 6 6 6 0 0 0 0 0 0 0 0 0
40179 - 0 0 0 0 0 0 0 0 0 0 0 0
40180 - 0 0 0 0 0 0 0 0 0 0 0 0
40181 - 0 0 0 0 0 0 0 0 0 0 0 0
40182 - 0 0 0 0 0 0 0 0 0 0 0 0
40183 - 0 0 0 0 0 0 0 0 0 0 0 0
40184 - 0 0 0 0 0 0 0 0 0 10 10 10
40185 - 38 38 38 78 78 78 6 6 6 2 2 6
40186 - 2 2 6 46 46 46 14 14 14 42 42 42
40187 -246 246 246 253 253 253 253 253 253 253 253 253
40188 -253 253 253 253 253 253 253 253 253 253 253 253
40189 -253 253 253 253 253 253 231 231 231 242 242 242
40190 -253 253 253 253 253 253 253 253 253 253 253 253
40191 -253 253 253 253 253 253 253 253 253 253 253 253
40192 -253 253 253 253 253 253 253 253 253 253 253 253
40193 -253 253 253 253 253 253 253 253 253 253 253 253
40194 -253 253 253 253 253 253 234 234 234 10 10 10
40195 - 2 2 6 2 2 6 22 22 22 14 14 14
40196 - 2 2 6 2 2 6 2 2 6 2 2 6
40197 - 2 2 6 66 66 66 62 62 62 22 22 22
40198 - 6 6 6 0 0 0 0 0 0 0 0 0
40199 - 0 0 0 0 0 0 0 0 0 0 0 0
40200 - 0 0 0 0 0 0 0 0 0 0 0 0
40201 - 0 0 0 0 0 0 0 0 0 0 0 0
40202 - 0 0 0 0 0 0 0 0 0 0 0 0
40203 - 0 0 0 0 0 0 0 0 0 0 0 0
40204 - 0 0 0 0 0 0 6 6 6 18 18 18
40205 - 50 50 50 74 74 74 2 2 6 2 2 6
40206 - 14 14 14 70 70 70 34 34 34 62 62 62
40207 -250 250 250 253 253 253 253 253 253 253 253 253
40208 -253 253 253 253 253 253 253 253 253 253 253 253
40209 -253 253 253 253 253 253 231 231 231 246 246 246
40210 -253 253 253 253 253 253 253 253 253 253 253 253
40211 -253 253 253 253 253 253 253 253 253 253 253 253
40212 -253 253 253 253 253 253 253 253 253 253 253 253
40213 -253 253 253 253 253 253 253 253 253 253 253 253
40214 -253 253 253 253 253 253 234 234 234 14 14 14
40215 - 2 2 6 2 2 6 30 30 30 2 2 6
40216 - 2 2 6 2 2 6 2 2 6 2 2 6
40217 - 2 2 6 66 66 66 62 62 62 22 22 22
40218 - 6 6 6 0 0 0 0 0 0 0 0 0
40219 - 0 0 0 0 0 0 0 0 0 0 0 0
40220 - 0 0 0 0 0 0 0 0 0 0 0 0
40221 - 0 0 0 0 0 0 0 0 0 0 0 0
40222 - 0 0 0 0 0 0 0 0 0 0 0 0
40223 - 0 0 0 0 0 0 0 0 0 0 0 0
40224 - 0 0 0 0 0 0 6 6 6 18 18 18
40225 - 54 54 54 62 62 62 2 2 6 2 2 6
40226 - 2 2 6 30 30 30 46 46 46 70 70 70
40227 -250 250 250 253 253 253 253 253 253 253 253 253
40228 -253 253 253 253 253 253 253 253 253 253 253 253
40229 -253 253 253 253 253 253 231 231 231 246 246 246
40230 -253 253 253 253 253 253 253 253 253 253 253 253
40231 -253 253 253 253 253 253 253 253 253 253 253 253
40232 -253 253 253 253 253 253 253 253 253 253 253 253
40233 -253 253 253 253 253 253 253 253 253 253 253 253
40234 -253 253 253 253 253 253 226 226 226 10 10 10
40235 - 2 2 6 6 6 6 30 30 30 2 2 6
40236 - 2 2 6 2 2 6 2 2 6 2 2 6
40237 - 2 2 6 66 66 66 58 58 58 22 22 22
40238 - 6 6 6 0 0 0 0 0 0 0 0 0
40239 - 0 0 0 0 0 0 0 0 0 0 0 0
40240 - 0 0 0 0 0 0 0 0 0 0 0 0
40241 - 0 0 0 0 0 0 0 0 0 0 0 0
40242 - 0 0 0 0 0 0 0 0 0 0 0 0
40243 - 0 0 0 0 0 0 0 0 0 0 0 0
40244 - 0 0 0 0 0 0 6 6 6 22 22 22
40245 - 58 58 58 62 62 62 2 2 6 2 2 6
40246 - 2 2 6 2 2 6 30 30 30 78 78 78
40247 -250 250 250 253 253 253 253 253 253 253 253 253
40248 -253 253 253 253 253 253 253 253 253 253 253 253
40249 -253 253 253 253 253 253 231 231 231 246 246 246
40250 -253 253 253 253 253 253 253 253 253 253 253 253
40251 -253 253 253 253 253 253 253 253 253 253 253 253
40252 -253 253 253 253 253 253 253 253 253 253 253 253
40253 -253 253 253 253 253 253 253 253 253 253 253 253
40254 -253 253 253 253 253 253 206 206 206 2 2 6
40255 - 22 22 22 34 34 34 18 14 6 22 22 22
40256 - 26 26 26 18 18 18 6 6 6 2 2 6
40257 - 2 2 6 82 82 82 54 54 54 18 18 18
40258 - 6 6 6 0 0 0 0 0 0 0 0 0
40259 - 0 0 0 0 0 0 0 0 0 0 0 0
40260 - 0 0 0 0 0 0 0 0 0 0 0 0
40261 - 0 0 0 0 0 0 0 0 0 0 0 0
40262 - 0 0 0 0 0 0 0 0 0 0 0 0
40263 - 0 0 0 0 0 0 0 0 0 0 0 0
40264 - 0 0 0 0 0 0 6 6 6 26 26 26
40265 - 62 62 62 106 106 106 74 54 14 185 133 11
40266 -210 162 10 121 92 8 6 6 6 62 62 62
40267 -238 238 238 253 253 253 253 253 253 253 253 253
40268 -253 253 253 253 253 253 253 253 253 253 253 253
40269 -253 253 253 253 253 253 231 231 231 246 246 246
40270 -253 253 253 253 253 253 253 253 253 253 253 253
40271 -253 253 253 253 253 253 253 253 253 253 253 253
40272 -253 253 253 253 253 253 253 253 253 253 253 253
40273 -253 253 253 253 253 253 253 253 253 253 253 253
40274 -253 253 253 253 253 253 158 158 158 18 18 18
40275 - 14 14 14 2 2 6 2 2 6 2 2 6
40276 - 6 6 6 18 18 18 66 66 66 38 38 38
40277 - 6 6 6 94 94 94 50 50 50 18 18 18
40278 - 6 6 6 0 0 0 0 0 0 0 0 0
40279 - 0 0 0 0 0 0 0 0 0 0 0 0
40280 - 0 0 0 0 0 0 0 0 0 0 0 0
40281 - 0 0 0 0 0 0 0 0 0 0 0 0
40282 - 0 0 0 0 0 0 0 0 0 0 0 0
40283 - 0 0 0 0 0 0 0 0 0 6 6 6
40284 - 10 10 10 10 10 10 18 18 18 38 38 38
40285 - 78 78 78 142 134 106 216 158 10 242 186 14
40286 -246 190 14 246 190 14 156 118 10 10 10 10
40287 - 90 90 90 238 238 238 253 253 253 253 253 253
40288 -253 253 253 253 253 253 253 253 253 253 253 253
40289 -253 253 253 253 253 253 231 231 231 250 250 250
40290 -253 253 253 253 253 253 253 253 253 253 253 253
40291 -253 253 253 253 253 253 253 253 253 253 253 253
40292 -253 253 253 253 253 253 253 253 253 253 253 253
40293 -253 253 253 253 253 253 253 253 253 246 230 190
40294 -238 204 91 238 204 91 181 142 44 37 26 9
40295 - 2 2 6 2 2 6 2 2 6 2 2 6
40296 - 2 2 6 2 2 6 38 38 38 46 46 46
40297 - 26 26 26 106 106 106 54 54 54 18 18 18
40298 - 6 6 6 0 0 0 0 0 0 0 0 0
40299 - 0 0 0 0 0 0 0 0 0 0 0 0
40300 - 0 0 0 0 0 0 0 0 0 0 0 0
40301 - 0 0 0 0 0 0 0 0 0 0 0 0
40302 - 0 0 0 0 0 0 0 0 0 0 0 0
40303 - 0 0 0 6 6 6 14 14 14 22 22 22
40304 - 30 30 30 38 38 38 50 50 50 70 70 70
40305 -106 106 106 190 142 34 226 170 11 242 186 14
40306 -246 190 14 246 190 14 246 190 14 154 114 10
40307 - 6 6 6 74 74 74 226 226 226 253 253 253
40308 -253 253 253 253 253 253 253 253 253 253 253 253
40309 -253 253 253 253 253 253 231 231 231 250 250 250
40310 -253 253 253 253 253 253 253 253 253 253 253 253
40311 -253 253 253 253 253 253 253 253 253 253 253 253
40312 -253 253 253 253 253 253 253 253 253 253 253 253
40313 -253 253 253 253 253 253 253 253 253 228 184 62
40314 -241 196 14 241 208 19 232 195 16 38 30 10
40315 - 2 2 6 2 2 6 2 2 6 2 2 6
40316 - 2 2 6 6 6 6 30 30 30 26 26 26
40317 -203 166 17 154 142 90 66 66 66 26 26 26
40318 - 6 6 6 0 0 0 0 0 0 0 0 0
40319 - 0 0 0 0 0 0 0 0 0 0 0 0
40320 - 0 0 0 0 0 0 0 0 0 0 0 0
40321 - 0 0 0 0 0 0 0 0 0 0 0 0
40322 - 0 0 0 0 0 0 0 0 0 0 0 0
40323 - 6 6 6 18 18 18 38 38 38 58 58 58
40324 - 78 78 78 86 86 86 101 101 101 123 123 123
40325 -175 146 61 210 150 10 234 174 13 246 186 14
40326 -246 190 14 246 190 14 246 190 14 238 190 10
40327 -102 78 10 2 2 6 46 46 46 198 198 198
40328 -253 253 253 253 253 253 253 253 253 253 253 253
40329 -253 253 253 253 253 253 234 234 234 242 242 242
40330 -253 253 253 253 253 253 253 253 253 253 253 253
40331 -253 253 253 253 253 253 253 253 253 253 253 253
40332 -253 253 253 253 253 253 253 253 253 253 253 253
40333 -253 253 253 253 253 253 253 253 253 224 178 62
40334 -242 186 14 241 196 14 210 166 10 22 18 6
40335 - 2 2 6 2 2 6 2 2 6 2 2 6
40336 - 2 2 6 2 2 6 6 6 6 121 92 8
40337 -238 202 15 232 195 16 82 82 82 34 34 34
40338 - 10 10 10 0 0 0 0 0 0 0 0 0
40339 - 0 0 0 0 0 0 0 0 0 0 0 0
40340 - 0 0 0 0 0 0 0 0 0 0 0 0
40341 - 0 0 0 0 0 0 0 0 0 0 0 0
40342 - 0 0 0 0 0 0 0 0 0 0 0 0
40343 - 14 14 14 38 38 38 70 70 70 154 122 46
40344 -190 142 34 200 144 11 197 138 11 197 138 11
40345 -213 154 11 226 170 11 242 186 14 246 190 14
40346 -246 190 14 246 190 14 246 190 14 246 190 14
40347 -225 175 15 46 32 6 2 2 6 22 22 22
40348 -158 158 158 250 250 250 253 253 253 253 253 253
40349 -253 253 253 253 253 253 253 253 253 253 253 253
40350 -253 253 253 253 253 253 253 253 253 253 253 253
40351 -253 253 253 253 253 253 253 253 253 253 253 253
40352 -253 253 253 253 253 253 253 253 253 253 253 253
40353 -253 253 253 250 250 250 242 242 242 224 178 62
40354 -239 182 13 236 186 11 213 154 11 46 32 6
40355 - 2 2 6 2 2 6 2 2 6 2 2 6
40356 - 2 2 6 2 2 6 61 42 6 225 175 15
40357 -238 190 10 236 186 11 112 100 78 42 42 42
40358 - 14 14 14 0 0 0 0 0 0 0 0 0
40359 - 0 0 0 0 0 0 0 0 0 0 0 0
40360 - 0 0 0 0 0 0 0 0 0 0 0 0
40361 - 0 0 0 0 0 0 0 0 0 0 0 0
40362 - 0 0 0 0 0 0 0 0 0 6 6 6
40363 - 22 22 22 54 54 54 154 122 46 213 154 11
40364 -226 170 11 230 174 11 226 170 11 226 170 11
40365 -236 178 12 242 186 14 246 190 14 246 190 14
40366 -246 190 14 246 190 14 246 190 14 246 190 14
40367 -241 196 14 184 144 12 10 10 10 2 2 6
40368 - 6 6 6 116 116 116 242 242 242 253 253 253
40369 -253 253 253 253 253 253 253 253 253 253 253 253
40370 -253 253 253 253 253 253 253 253 253 253 253 253
40371 -253 253 253 253 253 253 253 253 253 253 253 253
40372 -253 253 253 253 253 253 253 253 253 253 253 253
40373 -253 253 253 231 231 231 198 198 198 214 170 54
40374 -236 178 12 236 178 12 210 150 10 137 92 6
40375 - 18 14 6 2 2 6 2 2 6 2 2 6
40376 - 6 6 6 70 47 6 200 144 11 236 178 12
40377 -239 182 13 239 182 13 124 112 88 58 58 58
40378 - 22 22 22 6 6 6 0 0 0 0 0 0
40379 - 0 0 0 0 0 0 0 0 0 0 0 0
40380 - 0 0 0 0 0 0 0 0 0 0 0 0
40381 - 0 0 0 0 0 0 0 0 0 0 0 0
40382 - 0 0 0 0 0 0 0 0 0 10 10 10
40383 - 30 30 30 70 70 70 180 133 36 226 170 11
40384 -239 182 13 242 186 14 242 186 14 246 186 14
40385 -246 190 14 246 190 14 246 190 14 246 190 14
40386 -246 190 14 246 190 14 246 190 14 246 190 14
40387 -246 190 14 232 195 16 98 70 6 2 2 6
40388 - 2 2 6 2 2 6 66 66 66 221 221 221
40389 -253 253 253 253 253 253 253 253 253 253 253 253
40390 -253 253 253 253 253 253 253 253 253 253 253 253
40391 -253 253 253 253 253 253 253 253 253 253 253 253
40392 -253 253 253 253 253 253 253 253 253 253 253 253
40393 -253 253 253 206 206 206 198 198 198 214 166 58
40394 -230 174 11 230 174 11 216 158 10 192 133 9
40395 -163 110 8 116 81 8 102 78 10 116 81 8
40396 -167 114 7 197 138 11 226 170 11 239 182 13
40397 -242 186 14 242 186 14 162 146 94 78 78 78
40398 - 34 34 34 14 14 14 6 6 6 0 0 0
40399 - 0 0 0 0 0 0 0 0 0 0 0 0
40400 - 0 0 0 0 0 0 0 0 0 0 0 0
40401 - 0 0 0 0 0 0 0 0 0 0 0 0
40402 - 0 0 0 0 0 0 0 0 0 6 6 6
40403 - 30 30 30 78 78 78 190 142 34 226 170 11
40404 -239 182 13 246 190 14 246 190 14 246 190 14
40405 -246 190 14 246 190 14 246 190 14 246 190 14
40406 -246 190 14 246 190 14 246 190 14 246 190 14
40407 -246 190 14 241 196 14 203 166 17 22 18 6
40408 - 2 2 6 2 2 6 2 2 6 38 38 38
40409 -218 218 218 253 253 253 253 253 253 253 253 253
40410 -253 253 253 253 253 253 253 253 253 253 253 253
40411 -253 253 253 253 253 253 253 253 253 253 253 253
40412 -253 253 253 253 253 253 253 253 253 253 253 253
40413 -250 250 250 206 206 206 198 198 198 202 162 69
40414 -226 170 11 236 178 12 224 166 10 210 150 10
40415 -200 144 11 197 138 11 192 133 9 197 138 11
40416 -210 150 10 226 170 11 242 186 14 246 190 14
40417 -246 190 14 246 186 14 225 175 15 124 112 88
40418 - 62 62 62 30 30 30 14 14 14 6 6 6
40419 - 0 0 0 0 0 0 0 0 0 0 0 0
40420 - 0 0 0 0 0 0 0 0 0 0 0 0
40421 - 0 0 0 0 0 0 0 0 0 0 0 0
40422 - 0 0 0 0 0 0 0 0 0 10 10 10
40423 - 30 30 30 78 78 78 174 135 50 224 166 10
40424 -239 182 13 246 190 14 246 190 14 246 190 14
40425 -246 190 14 246 190 14 246 190 14 246 190 14
40426 -246 190 14 246 190 14 246 190 14 246 190 14
40427 -246 190 14 246 190 14 241 196 14 139 102 15
40428 - 2 2 6 2 2 6 2 2 6 2 2 6
40429 - 78 78 78 250 250 250 253 253 253 253 253 253
40430 -253 253 253 253 253 253 253 253 253 253 253 253
40431 -253 253 253 253 253 253 253 253 253 253 253 253
40432 -253 253 253 253 253 253 253 253 253 253 253 253
40433 -250 250 250 214 214 214 198 198 198 190 150 46
40434 -219 162 10 236 178 12 234 174 13 224 166 10
40435 -216 158 10 213 154 11 213 154 11 216 158 10
40436 -226 170 11 239 182 13 246 190 14 246 190 14
40437 -246 190 14 246 190 14 242 186 14 206 162 42
40438 -101 101 101 58 58 58 30 30 30 14 14 14
40439 - 6 6 6 0 0 0 0 0 0 0 0 0
40440 - 0 0 0 0 0 0 0 0 0 0 0 0
40441 - 0 0 0 0 0 0 0 0 0 0 0 0
40442 - 0 0 0 0 0 0 0 0 0 10 10 10
40443 - 30 30 30 74 74 74 174 135 50 216 158 10
40444 -236 178 12 246 190 14 246 190 14 246 190 14
40445 -246 190 14 246 190 14 246 190 14 246 190 14
40446 -246 190 14 246 190 14 246 190 14 246 190 14
40447 -246 190 14 246 190 14 241 196 14 226 184 13
40448 - 61 42 6 2 2 6 2 2 6 2 2 6
40449 - 22 22 22 238 238 238 253 253 253 253 253 253
40450 -253 253 253 253 253 253 253 253 253 253 253 253
40451 -253 253 253 253 253 253 253 253 253 253 253 253
40452 -253 253 253 253 253 253 253 253 253 253 253 253
40453 -253 253 253 226 226 226 187 187 187 180 133 36
40454 -216 158 10 236 178 12 239 182 13 236 178 12
40455 -230 174 11 226 170 11 226 170 11 230 174 11
40456 -236 178 12 242 186 14 246 190 14 246 190 14
40457 -246 190 14 246 190 14 246 186 14 239 182 13
40458 -206 162 42 106 106 106 66 66 66 34 34 34
40459 - 14 14 14 6 6 6 0 0 0 0 0 0
40460 - 0 0 0 0 0 0 0 0 0 0 0 0
40461 - 0 0 0 0 0 0 0 0 0 0 0 0
40462 - 0 0 0 0 0 0 0 0 0 6 6 6
40463 - 26 26 26 70 70 70 163 133 67 213 154 11
40464 -236 178 12 246 190 14 246 190 14 246 190 14
40465 -246 190 14 246 190 14 246 190 14 246 190 14
40466 -246 190 14 246 190 14 246 190 14 246 190 14
40467 -246 190 14 246 190 14 246 190 14 241 196 14
40468 -190 146 13 18 14 6 2 2 6 2 2 6
40469 - 46 46 46 246 246 246 253 253 253 253 253 253
40470 -253 253 253 253 253 253 253 253 253 253 253 253
40471 -253 253 253 253 253 253 253 253 253 253 253 253
40472 -253 253 253 253 253 253 253 253 253 253 253 253
40473 -253 253 253 221 221 221 86 86 86 156 107 11
40474 -216 158 10 236 178 12 242 186 14 246 186 14
40475 -242 186 14 239 182 13 239 182 13 242 186 14
40476 -242 186 14 246 186 14 246 190 14 246 190 14
40477 -246 190 14 246 190 14 246 190 14 246 190 14
40478 -242 186 14 225 175 15 142 122 72 66 66 66
40479 - 30 30 30 10 10 10 0 0 0 0 0 0
40480 - 0 0 0 0 0 0 0 0 0 0 0 0
40481 - 0 0 0 0 0 0 0 0 0 0 0 0
40482 - 0 0 0 0 0 0 0 0 0 6 6 6
40483 - 26 26 26 70 70 70 163 133 67 210 150 10
40484 -236 178 12 246 190 14 246 190 14 246 190 14
40485 -246 190 14 246 190 14 246 190 14 246 190 14
40486 -246 190 14 246 190 14 246 190 14 246 190 14
40487 -246 190 14 246 190 14 246 190 14 246 190 14
40488 -232 195 16 121 92 8 34 34 34 106 106 106
40489 -221 221 221 253 253 253 253 253 253 253 253 253
40490 -253 253 253 253 253 253 253 253 253 253 253 253
40491 -253 253 253 253 253 253 253 253 253 253 253 253
40492 -253 253 253 253 253 253 253 253 253 253 253 253
40493 -242 242 242 82 82 82 18 14 6 163 110 8
40494 -216 158 10 236 178 12 242 186 14 246 190 14
40495 -246 190 14 246 190 14 246 190 14 246 190 14
40496 -246 190 14 246 190 14 246 190 14 246 190 14
40497 -246 190 14 246 190 14 246 190 14 246 190 14
40498 -246 190 14 246 190 14 242 186 14 163 133 67
40499 - 46 46 46 18 18 18 6 6 6 0 0 0
40500 - 0 0 0 0 0 0 0 0 0 0 0 0
40501 - 0 0 0 0 0 0 0 0 0 0 0 0
40502 - 0 0 0 0 0 0 0 0 0 10 10 10
40503 - 30 30 30 78 78 78 163 133 67 210 150 10
40504 -236 178 12 246 186 14 246 190 14 246 190 14
40505 -246 190 14 246 190 14 246 190 14 246 190 14
40506 -246 190 14 246 190 14 246 190 14 246 190 14
40507 -246 190 14 246 190 14 246 190 14 246 190 14
40508 -241 196 14 215 174 15 190 178 144 253 253 253
40509 -253 253 253 253 253 253 253 253 253 253 253 253
40510 -253 253 253 253 253 253 253 253 253 253 253 253
40511 -253 253 253 253 253 253 253 253 253 253 253 253
40512 -253 253 253 253 253 253 253 253 253 218 218 218
40513 - 58 58 58 2 2 6 22 18 6 167 114 7
40514 -216 158 10 236 178 12 246 186 14 246 190 14
40515 -246 190 14 246 190 14 246 190 14 246 190 14
40516 -246 190 14 246 190 14 246 190 14 246 190 14
40517 -246 190 14 246 190 14 246 190 14 246 190 14
40518 -246 190 14 246 186 14 242 186 14 190 150 46
40519 - 54 54 54 22 22 22 6 6 6 0 0 0
40520 - 0 0 0 0 0 0 0 0 0 0 0 0
40521 - 0 0 0 0 0 0 0 0 0 0 0 0
40522 - 0 0 0 0 0 0 0 0 0 14 14 14
40523 - 38 38 38 86 86 86 180 133 36 213 154 11
40524 -236 178 12 246 186 14 246 190 14 246 190 14
40525 -246 190 14 246 190 14 246 190 14 246 190 14
40526 -246 190 14 246 190 14 246 190 14 246 190 14
40527 -246 190 14 246 190 14 246 190 14 246 190 14
40528 -246 190 14 232 195 16 190 146 13 214 214 214
40529 -253 253 253 253 253 253 253 253 253 253 253 253
40530 -253 253 253 253 253 253 253 253 253 253 253 253
40531 -253 253 253 253 253 253 253 253 253 253 253 253
40532 -253 253 253 250 250 250 170 170 170 26 26 26
40533 - 2 2 6 2 2 6 37 26 9 163 110 8
40534 -219 162 10 239 182 13 246 186 14 246 190 14
40535 -246 190 14 246 190 14 246 190 14 246 190 14
40536 -246 190 14 246 190 14 246 190 14 246 190 14
40537 -246 190 14 246 190 14 246 190 14 246 190 14
40538 -246 186 14 236 178 12 224 166 10 142 122 72
40539 - 46 46 46 18 18 18 6 6 6 0 0 0
40540 - 0 0 0 0 0 0 0 0 0 0 0 0
40541 - 0 0 0 0 0 0 0 0 0 0 0 0
40542 - 0 0 0 0 0 0 6 6 6 18 18 18
40543 - 50 50 50 109 106 95 192 133 9 224 166 10
40544 -242 186 14 246 190 14 246 190 14 246 190 14
40545 -246 190 14 246 190 14 246 190 14 246 190 14
40546 -246 190 14 246 190 14 246 190 14 246 190 14
40547 -246 190 14 246 190 14 246 190 14 246 190 14
40548 -242 186 14 226 184 13 210 162 10 142 110 46
40549 -226 226 226 253 253 253 253 253 253 253 253 253
40550 -253 253 253 253 253 253 253 253 253 253 253 253
40551 -253 253 253 253 253 253 253 253 253 253 253 253
40552 -198 198 198 66 66 66 2 2 6 2 2 6
40553 - 2 2 6 2 2 6 50 34 6 156 107 11
40554 -219 162 10 239 182 13 246 186 14 246 190 14
40555 -246 190 14 246 190 14 246 190 14 246 190 14
40556 -246 190 14 246 190 14 246 190 14 246 190 14
40557 -246 190 14 246 190 14 246 190 14 242 186 14
40558 -234 174 13 213 154 11 154 122 46 66 66 66
40559 - 30 30 30 10 10 10 0 0 0 0 0 0
40560 - 0 0 0 0 0 0 0 0 0 0 0 0
40561 - 0 0 0 0 0 0 0 0 0 0 0 0
40562 - 0 0 0 0 0 0 6 6 6 22 22 22
40563 - 58 58 58 154 121 60 206 145 10 234 174 13
40564 -242 186 14 246 186 14 246 190 14 246 190 14
40565 -246 190 14 246 190 14 246 190 14 246 190 14
40566 -246 190 14 246 190 14 246 190 14 246 190 14
40567 -246 190 14 246 190 14 246 190 14 246 190 14
40568 -246 186 14 236 178 12 210 162 10 163 110 8
40569 - 61 42 6 138 138 138 218 218 218 250 250 250
40570 -253 253 253 253 253 253 253 253 253 250 250 250
40571 -242 242 242 210 210 210 144 144 144 66 66 66
40572 - 6 6 6 2 2 6 2 2 6 2 2 6
40573 - 2 2 6 2 2 6 61 42 6 163 110 8
40574 -216 158 10 236 178 12 246 190 14 246 190 14
40575 -246 190 14 246 190 14 246 190 14 246 190 14
40576 -246 190 14 246 190 14 246 190 14 246 190 14
40577 -246 190 14 239 182 13 230 174 11 216 158 10
40578 -190 142 34 124 112 88 70 70 70 38 38 38
40579 - 18 18 18 6 6 6 0 0 0 0 0 0
40580 - 0 0 0 0 0 0 0 0 0 0 0 0
40581 - 0 0 0 0 0 0 0 0 0 0 0 0
40582 - 0 0 0 0 0 0 6 6 6 22 22 22
40583 - 62 62 62 168 124 44 206 145 10 224 166 10
40584 -236 178 12 239 182 13 242 186 14 242 186 14
40585 -246 186 14 246 190 14 246 190 14 246 190 14
40586 -246 190 14 246 190 14 246 190 14 246 190 14
40587 -246 190 14 246 190 14 246 190 14 246 190 14
40588 -246 190 14 236 178 12 216 158 10 175 118 6
40589 - 80 54 7 2 2 6 6 6 6 30 30 30
40590 - 54 54 54 62 62 62 50 50 50 38 38 38
40591 - 14 14 14 2 2 6 2 2 6 2 2 6
40592 - 2 2 6 2 2 6 2 2 6 2 2 6
40593 - 2 2 6 6 6 6 80 54 7 167 114 7
40594 -213 154 11 236 178 12 246 190 14 246 190 14
40595 -246 190 14 246 190 14 246 190 14 246 190 14
40596 -246 190 14 242 186 14 239 182 13 239 182 13
40597 -230 174 11 210 150 10 174 135 50 124 112 88
40598 - 82 82 82 54 54 54 34 34 34 18 18 18
40599 - 6 6 6 0 0 0 0 0 0 0 0 0
40600 - 0 0 0 0 0 0 0 0 0 0 0 0
40601 - 0 0 0 0 0 0 0 0 0 0 0 0
40602 - 0 0 0 0 0 0 6 6 6 18 18 18
40603 - 50 50 50 158 118 36 192 133 9 200 144 11
40604 -216 158 10 219 162 10 224 166 10 226 170 11
40605 -230 174 11 236 178 12 239 182 13 239 182 13
40606 -242 186 14 246 186 14 246 190 14 246 190 14
40607 -246 190 14 246 190 14 246 190 14 246 190 14
40608 -246 186 14 230 174 11 210 150 10 163 110 8
40609 -104 69 6 10 10 10 2 2 6 2 2 6
40610 - 2 2 6 2 2 6 2 2 6 2 2 6
40611 - 2 2 6 2 2 6 2 2 6 2 2 6
40612 - 2 2 6 2 2 6 2 2 6 2 2 6
40613 - 2 2 6 6 6 6 91 60 6 167 114 7
40614 -206 145 10 230 174 11 242 186 14 246 190 14
40615 -246 190 14 246 190 14 246 186 14 242 186 14
40616 -239 182 13 230 174 11 224 166 10 213 154 11
40617 -180 133 36 124 112 88 86 86 86 58 58 58
40618 - 38 38 38 22 22 22 10 10 10 6 6 6
40619 - 0 0 0 0 0 0 0 0 0 0 0 0
40620 - 0 0 0 0 0 0 0 0 0 0 0 0
40621 - 0 0 0 0 0 0 0 0 0 0 0 0
40622 - 0 0 0 0 0 0 0 0 0 14 14 14
40623 - 34 34 34 70 70 70 138 110 50 158 118 36
40624 -167 114 7 180 123 7 192 133 9 197 138 11
40625 -200 144 11 206 145 10 213 154 11 219 162 10
40626 -224 166 10 230 174 11 239 182 13 242 186 14
40627 -246 186 14 246 186 14 246 186 14 246 186 14
40628 -239 182 13 216 158 10 185 133 11 152 99 6
40629 -104 69 6 18 14 6 2 2 6 2 2 6
40630 - 2 2 6 2 2 6 2 2 6 2 2 6
40631 - 2 2 6 2 2 6 2 2 6 2 2 6
40632 - 2 2 6 2 2 6 2 2 6 2 2 6
40633 - 2 2 6 6 6 6 80 54 7 152 99 6
40634 -192 133 9 219 162 10 236 178 12 239 182 13
40635 -246 186 14 242 186 14 239 182 13 236 178 12
40636 -224 166 10 206 145 10 192 133 9 154 121 60
40637 - 94 94 94 62 62 62 42 42 42 22 22 22
40638 - 14 14 14 6 6 6 0 0 0 0 0 0
40639 - 0 0 0 0 0 0 0 0 0 0 0 0
40640 - 0 0 0 0 0 0 0 0 0 0 0 0
40641 - 0 0 0 0 0 0 0 0 0 0 0 0
40642 - 0 0 0 0 0 0 0 0 0 6 6 6
40643 - 18 18 18 34 34 34 58 58 58 78 78 78
40644 -101 98 89 124 112 88 142 110 46 156 107 11
40645 -163 110 8 167 114 7 175 118 6 180 123 7
40646 -185 133 11 197 138 11 210 150 10 219 162 10
40647 -226 170 11 236 178 12 236 178 12 234 174 13
40648 -219 162 10 197 138 11 163 110 8 130 83 6
40649 - 91 60 6 10 10 10 2 2 6 2 2 6
40650 - 18 18 18 38 38 38 38 38 38 38 38 38
40651 - 38 38 38 38 38 38 38 38 38 38 38 38
40652 - 38 38 38 38 38 38 26 26 26 2 2 6
40653 - 2 2 6 6 6 6 70 47 6 137 92 6
40654 -175 118 6 200 144 11 219 162 10 230 174 11
40655 -234 174 13 230 174 11 219 162 10 210 150 10
40656 -192 133 9 163 110 8 124 112 88 82 82 82
40657 - 50 50 50 30 30 30 14 14 14 6 6 6
40658 - 0 0 0 0 0 0 0 0 0 0 0 0
40659 - 0 0 0 0 0 0 0 0 0 0 0 0
40660 - 0 0 0 0 0 0 0 0 0 0 0 0
40661 - 0 0 0 0 0 0 0 0 0 0 0 0
40662 - 0 0 0 0 0 0 0 0 0 0 0 0
40663 - 6 6 6 14 14 14 22 22 22 34 34 34
40664 - 42 42 42 58 58 58 74 74 74 86 86 86
40665 -101 98 89 122 102 70 130 98 46 121 87 25
40666 -137 92 6 152 99 6 163 110 8 180 123 7
40667 -185 133 11 197 138 11 206 145 10 200 144 11
40668 -180 123 7 156 107 11 130 83 6 104 69 6
40669 - 50 34 6 54 54 54 110 110 110 101 98 89
40670 - 86 86 86 82 82 82 78 78 78 78 78 78
40671 - 78 78 78 78 78 78 78 78 78 78 78 78
40672 - 78 78 78 82 82 82 86 86 86 94 94 94
40673 -106 106 106 101 101 101 86 66 34 124 80 6
40674 -156 107 11 180 123 7 192 133 9 200 144 11
40675 -206 145 10 200 144 11 192 133 9 175 118 6
40676 -139 102 15 109 106 95 70 70 70 42 42 42
40677 - 22 22 22 10 10 10 0 0 0 0 0 0
40678 - 0 0 0 0 0 0 0 0 0 0 0 0
40679 - 0 0 0 0 0 0 0 0 0 0 0 0
40680 - 0 0 0 0 0 0 0 0 0 0 0 0
40681 - 0 0 0 0 0 0 0 0 0 0 0 0
40682 - 0 0 0 0 0 0 0 0 0 0 0 0
40683 - 0 0 0 0 0 0 6 6 6 10 10 10
40684 - 14 14 14 22 22 22 30 30 30 38 38 38
40685 - 50 50 50 62 62 62 74 74 74 90 90 90
40686 -101 98 89 112 100 78 121 87 25 124 80 6
40687 -137 92 6 152 99 6 152 99 6 152 99 6
40688 -138 86 6 124 80 6 98 70 6 86 66 30
40689 -101 98 89 82 82 82 58 58 58 46 46 46
40690 - 38 38 38 34 34 34 34 34 34 34 34 34
40691 - 34 34 34 34 34 34 34 34 34 34 34 34
40692 - 34 34 34 34 34 34 38 38 38 42 42 42
40693 - 54 54 54 82 82 82 94 86 76 91 60 6
40694 -134 86 6 156 107 11 167 114 7 175 118 6
40695 -175 118 6 167 114 7 152 99 6 121 87 25
40696 -101 98 89 62 62 62 34 34 34 18 18 18
40697 - 6 6 6 0 0 0 0 0 0 0 0 0
40698 - 0 0 0 0 0 0 0 0 0 0 0 0
40699 - 0 0 0 0 0 0 0 0 0 0 0 0
40700 - 0 0 0 0 0 0 0 0 0 0 0 0
40701 - 0 0 0 0 0 0 0 0 0 0 0 0
40702 - 0 0 0 0 0 0 0 0 0 0 0 0
40703 - 0 0 0 0 0 0 0 0 0 0 0 0
40704 - 0 0 0 6 6 6 6 6 6 10 10 10
40705 - 18 18 18 22 22 22 30 30 30 42 42 42
40706 - 50 50 50 66 66 66 86 86 86 101 98 89
40707 -106 86 58 98 70 6 104 69 6 104 69 6
40708 -104 69 6 91 60 6 82 62 34 90 90 90
40709 - 62 62 62 38 38 38 22 22 22 14 14 14
40710 - 10 10 10 10 10 10 10 10 10 10 10 10
40711 - 10 10 10 10 10 10 6 6 6 10 10 10
40712 - 10 10 10 10 10 10 10 10 10 14 14 14
40713 - 22 22 22 42 42 42 70 70 70 89 81 66
40714 - 80 54 7 104 69 6 124 80 6 137 92 6
40715 -134 86 6 116 81 8 100 82 52 86 86 86
40716 - 58 58 58 30 30 30 14 14 14 6 6 6
40717 - 0 0 0 0 0 0 0 0 0 0 0 0
40718 - 0 0 0 0 0 0 0 0 0 0 0 0
40719 - 0 0 0 0 0 0 0 0 0 0 0 0
40720 - 0 0 0 0 0 0 0 0 0 0 0 0
40721 - 0 0 0 0 0 0 0 0 0 0 0 0
40722 - 0 0 0 0 0 0 0 0 0 0 0 0
40723 - 0 0 0 0 0 0 0 0 0 0 0 0
40724 - 0 0 0 0 0 0 0 0 0 0 0 0
40725 - 0 0 0 6 6 6 10 10 10 14 14 14
40726 - 18 18 18 26 26 26 38 38 38 54 54 54
40727 - 70 70 70 86 86 86 94 86 76 89 81 66
40728 - 89 81 66 86 86 86 74 74 74 50 50 50
40729 - 30 30 30 14 14 14 6 6 6 0 0 0
40730 - 0 0 0 0 0 0 0 0 0 0 0 0
40731 - 0 0 0 0 0 0 0 0 0 0 0 0
40732 - 0 0 0 0 0 0 0 0 0 0 0 0
40733 - 6 6 6 18 18 18 34 34 34 58 58 58
40734 - 82 82 82 89 81 66 89 81 66 89 81 66
40735 - 94 86 66 94 86 76 74 74 74 50 50 50
40736 - 26 26 26 14 14 14 6 6 6 0 0 0
40737 - 0 0 0 0 0 0 0 0 0 0 0 0
40738 - 0 0 0 0 0 0 0 0 0 0 0 0
40739 - 0 0 0 0 0 0 0 0 0 0 0 0
40740 - 0 0 0 0 0 0 0 0 0 0 0 0
40741 - 0 0 0 0 0 0 0 0 0 0 0 0
40742 - 0 0 0 0 0 0 0 0 0 0 0 0
40743 - 0 0 0 0 0 0 0 0 0 0 0 0
40744 - 0 0 0 0 0 0 0 0 0 0 0 0
40745 - 0 0 0 0 0 0 0 0 0 0 0 0
40746 - 6 6 6 6 6 6 14 14 14 18 18 18
40747 - 30 30 30 38 38 38 46 46 46 54 54 54
40748 - 50 50 50 42 42 42 30 30 30 18 18 18
40749 - 10 10 10 0 0 0 0 0 0 0 0 0
40750 - 0 0 0 0 0 0 0 0 0 0 0 0
40751 - 0 0 0 0 0 0 0 0 0 0 0 0
40752 - 0 0 0 0 0 0 0 0 0 0 0 0
40753 - 0 0 0 6 6 6 14 14 14 26 26 26
40754 - 38 38 38 50 50 50 58 58 58 58 58 58
40755 - 54 54 54 42 42 42 30 30 30 18 18 18
40756 - 10 10 10 0 0 0 0 0 0 0 0 0
40757 - 0 0 0 0 0 0 0 0 0 0 0 0
40758 - 0 0 0 0 0 0 0 0 0 0 0 0
40759 - 0 0 0 0 0 0 0 0 0 0 0 0
40760 - 0 0 0 0 0 0 0 0 0 0 0 0
40761 - 0 0 0 0 0 0 0 0 0 0 0 0
40762 - 0 0 0 0 0 0 0 0 0 0 0 0
40763 - 0 0 0 0 0 0 0 0 0 0 0 0
40764 - 0 0 0 0 0 0 0 0 0 0 0 0
40765 - 0 0 0 0 0 0 0 0 0 0 0 0
40766 - 0 0 0 0 0 0 0 0 0 6 6 6
40767 - 6 6 6 10 10 10 14 14 14 18 18 18
40768 - 18 18 18 14 14 14 10 10 10 6 6 6
40769 - 0 0 0 0 0 0 0 0 0 0 0 0
40770 - 0 0 0 0 0 0 0 0 0 0 0 0
40771 - 0 0 0 0 0 0 0 0 0 0 0 0
40772 - 0 0 0 0 0 0 0 0 0 0 0 0
40773 - 0 0 0 0 0 0 0 0 0 6 6 6
40774 - 14 14 14 18 18 18 22 22 22 22 22 22
40775 - 18 18 18 14 14 14 10 10 10 6 6 6
40776 - 0 0 0 0 0 0 0 0 0 0 0 0
40777 - 0 0 0 0 0 0 0 0 0 0 0 0
40778 - 0 0 0 0 0 0 0 0 0 0 0 0
40779 - 0 0 0 0 0 0 0 0 0 0 0 0
40780 - 0 0 0 0 0 0 0 0 0 0 0 0
40781 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40782 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40783 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40784 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40785 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40786 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40787 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40788 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40789 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40790 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40791 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40792 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40793 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40794 +4 4 4 4 4 4
40795 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40796 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40797 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40798 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40799 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40800 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40801 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40802 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40803 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40804 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40805 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40806 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40807 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40808 +4 4 4 4 4 4
40809 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40810 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40811 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40812 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40813 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40814 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40815 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40816 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40817 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40818 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40819 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40820 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40821 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40822 +4 4 4 4 4 4
40823 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40824 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40825 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40826 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40827 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40828 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40829 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40830 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40831 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40832 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40833 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40834 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40835 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40836 +4 4 4 4 4 4
40837 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40838 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40839 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40840 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40841 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40842 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40843 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40844 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40845 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40846 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40847 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40848 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40849 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40850 +4 4 4 4 4 4
40851 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40852 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40853 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40854 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40855 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40856 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40857 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40858 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40859 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40860 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40861 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40862 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40863 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40864 +4 4 4 4 4 4
40865 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40866 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40867 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40868 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40869 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
40870 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
40871 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40872 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40873 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40874 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
40875 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40876 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
40877 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40878 +4 4 4 4 4 4
40879 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40880 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40881 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40882 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40883 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
40884 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
40885 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40886 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40887 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40888 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
40889 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
40890 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
40891 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40892 +4 4 4 4 4 4
40893 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40894 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40895 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40896 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40897 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
40898 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
40899 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40900 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40901 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40902 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
40903 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
40904 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
40905 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
40906 +4 4 4 4 4 4
40907 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40908 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40909 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40910 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
40911 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
40912 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
40913 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
40914 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40915 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40916 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
40917 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
40918 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
40919 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
40920 +4 4 4 4 4 4
40921 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40922 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40923 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40924 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
40925 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
40926 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
40927 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
40928 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
40929 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
40930 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
40931 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
40932 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
40933 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
40934 +4 4 4 4 4 4
40935 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40936 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40937 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
40938 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
40939 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
40940 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
40941 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
40942 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
40943 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
40944 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
40945 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
40946 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
40947 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
40948 +4 4 4 4 4 4
40949 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40950 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40951 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
40952 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
40953 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
40954 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
40955 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
40956 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
40957 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
40958 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
40959 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
40960 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
40961 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
40962 +4 4 4 4 4 4
40963 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40964 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40965 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
40966 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
40967 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
40968 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
40969 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
40970 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
40971 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
40972 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
40973 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
40974 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
40975 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
40976 +4 4 4 4 4 4
40977 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40978 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40979 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
40980 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
40981 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
40982 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
40983 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
40984 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
40985 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
40986 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
40987 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
40988 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
40989 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40990 +4 4 4 4 4 4
40991 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40992 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40993 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
40994 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
40995 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
40996 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
40997 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
40998 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
40999 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
41000 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
41001 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
41002 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
41003 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
41004 +4 4 4 4 4 4
41005 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41006 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
41007 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
41008 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
41009 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
41010 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
41011 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
41012 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
41013 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
41014 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
41015 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
41016 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
41017 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
41018 +4 4 4 4 4 4
41019 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41020 +4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
41021 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
41022 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
41023 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41024 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
41025 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
41026 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
41027 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
41028 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
41029 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
41030 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
41031 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
41032 +0 0 0 4 4 4
41033 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
41034 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
41035 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
41036 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
41037 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
41038 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
41039 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
41040 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
41041 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
41042 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
41043 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
41044 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
41045 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
41046 +2 0 0 0 0 0
41047 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
41048 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
41049 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
41050 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
41051 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
41052 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
41053 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
41054 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
41055 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
41056 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
41057 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
41058 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
41059 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
41060 +37 38 37 0 0 0
41061 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41062 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
41063 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
41064 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
41065 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
41066 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
41067 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
41068 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
41069 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
41070 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
41071 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
41072 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
41073 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
41074 +85 115 134 4 0 0
41075 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
41076 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
41077 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
41078 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
41079 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
41080 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
41081 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
41082 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
41083 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
41084 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
41085 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
41086 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
41087 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
41088 +60 73 81 4 0 0
41089 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
41090 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
41091 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
41092 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
41093 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
41094 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
41095 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
41096 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
41097 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
41098 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
41099 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
41100 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
41101 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
41102 +16 19 21 4 0 0
41103 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
41104 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
41105 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
41106 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
41107 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
41108 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
41109 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
41110 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
41111 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
41112 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
41113 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
41114 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
41115 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
41116 +4 0 0 4 3 3
41117 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
41118 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
41119 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
41120 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
41121 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
41122 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
41123 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
41124 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
41125 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
41126 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
41127 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
41128 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
41129 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
41130 +3 2 2 4 4 4
41131 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
41132 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
41133 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
41134 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41135 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
41136 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
41137 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
41138 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
41139 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
41140 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
41141 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
41142 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
41143 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
41144 +4 4 4 4 4 4
41145 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
41146 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
41147 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
41148 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
41149 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
41150 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
41151 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
41152 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
41153 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
41154 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
41155 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
41156 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
41157 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
41158 +4 4 4 4 4 4
41159 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
41160 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
41161 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
41162 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
41163 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
41164 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41165 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
41166 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
41167 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
41168 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
41169 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
41170 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
41171 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
41172 +5 5 5 5 5 5
41173 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
41174 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
41175 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
41176 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
41177 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
41178 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41179 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
41180 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
41181 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
41182 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
41183 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
41184 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
41185 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41186 +5 5 5 4 4 4
41187 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
41188 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
41189 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
41190 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
41191 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41192 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
41193 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
41194 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
41195 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
41196 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
41197 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
41198 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41199 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41200 +4 4 4 4 4 4
41201 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
41202 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
41203 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
41204 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
41205 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
41206 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41207 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41208 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
41209 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
41210 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
41211 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
41212 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
41213 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41214 +4 4 4 4 4 4
41215 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
41216 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
41217 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
41218 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
41219 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41220 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
41221 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
41222 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
41223 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
41224 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
41225 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
41226 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41227 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41228 +4 4 4 4 4 4
41229 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
41230 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
41231 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
41232 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
41233 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41234 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41235 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41236 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
41237 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
41238 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
41239 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
41240 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41241 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41242 +4 4 4 4 4 4
41243 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
41244 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
41245 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
41246 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
41247 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41248 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
41249 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41250 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
41251 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
41252 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
41253 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41254 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41255 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41256 +4 4 4 4 4 4
41257 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
41258 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
41259 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
41260 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
41261 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41262 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
41263 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
41264 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
41265 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
41266 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
41267 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
41268 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41269 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41270 +4 4 4 4 4 4
41271 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
41272 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
41273 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
41274 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
41275 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41276 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
41277 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
41278 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
41279 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
41280 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
41281 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
41282 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41283 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41284 +4 4 4 4 4 4
41285 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
41286 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
41287 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
41288 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41289 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
41290 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
41291 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
41292 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
41293 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
41294 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
41295 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41296 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41297 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41298 +4 4 4 4 4 4
41299 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
41300 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
41301 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
41302 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41303 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41304 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
41305 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
41306 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
41307 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
41308 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
41309 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41310 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41311 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41312 +4 4 4 4 4 4
41313 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
41314 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
41315 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41316 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41317 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41318 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
41319 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
41320 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
41321 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
41322 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
41323 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41324 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41325 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41326 +4 4 4 4 4 4
41327 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
41328 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
41329 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41330 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41331 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41332 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
41333 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
41334 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
41335 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41336 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41337 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41338 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41339 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41340 +4 4 4 4 4 4
41341 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41342 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
41343 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41344 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
41345 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
41346 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
41347 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
41348 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
41349 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41350 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41351 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41352 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41353 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41354 +4 4 4 4 4 4
41355 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41356 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
41357 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41358 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
41359 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41360 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41361 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41362 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41363 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41364 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41365 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41366 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41367 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41368 +4 4 4 4 4 4
41369 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41370 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41371 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41372 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41373 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41374 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41375 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41376 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41377 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41378 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41379 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41380 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41381 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41382 +4 4 4 4 4 4
41383 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41384 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41385 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41386 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41387 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41388 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41389 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41390 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41391 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41392 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41393 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41394 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41395 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41396 +4 4 4 4 4 4
41397 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41398 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41399 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41400 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41401 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41402 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41403 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41404 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41405 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41406 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41407 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41408 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41409 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41410 +4 4 4 4 4 4
41411 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41412 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41413 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41414 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41415 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41416 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41417 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41418 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41419 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41420 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41421 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41422 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41423 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41424 +4 4 4 4 4 4
41425 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41426 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41427 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41428 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41429 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41430 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41431 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41432 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41433 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41434 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41435 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41436 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41437 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41438 +4 4 4 4 4 4
41439 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41440 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41441 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41442 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41443 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41444 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41445 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41446 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41447 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41448 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41449 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41450 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41451 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41452 +4 4 4 4 4 4
41453 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41454 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41455 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41456 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41457 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41458 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41459 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41460 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41461 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41462 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41463 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41464 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41465 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41466 +4 4 4 4 4 4
41467 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41468 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41469 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41470 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41471 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41472 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41473 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41474 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41475 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41476 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41477 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41478 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41479 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41480 +4 4 4 4 4 4
41481 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41482 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41483 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41484 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41485 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41486 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41487 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41488 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41489 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41490 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41491 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41492 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41493 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41494 +4 4 4 4 4 4
41495 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41496 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41497 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41498 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41499 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41500 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41501 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41502 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41503 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41504 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41505 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41506 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41507 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41508 +4 4 4 4 4 4
41509 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41510 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41511 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41512 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41513 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41514 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41515 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41516 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41517 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41518 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41519 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41520 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41521 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41522 +4 4 4 4 4 4
41523 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41524 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41525 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41526 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41527 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41528 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41529 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41530 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41531 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41532 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41533 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41534 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41535 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41536 +4 4 4 4 4 4
41537 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41538 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41539 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41540 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41541 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41542 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41543 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41544 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41545 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41546 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41547 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41548 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41549 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41550 +4 4 4 4 4 4
41551 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41552 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41553 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41554 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41555 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41556 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41557 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41558 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41559 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41560 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41561 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41562 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41563 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41564 +4 4 4 4 4 4
41565 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41566 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41567 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41568 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41569 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41570 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41571 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41572 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41573 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41574 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41575 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41576 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41577 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41578 +4 4 4 4 4 4
41579 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41580 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41581 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41582 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41583 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41584 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41585 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41586 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41587 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41588 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41589 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41590 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41591 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41592 +4 4 4 4 4 4
41593 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41594 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41595 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41596 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41597 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41598 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41599 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41600 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41601 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41602 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41603 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41604 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41605 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41606 +4 4 4 4 4 4
41607 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41608 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41609 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41610 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41611 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41612 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41613 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41614 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41615 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41616 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41617 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41618 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41619 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41620 +4 4 4 4 4 4
41621 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41622 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41623 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41624 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41625 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41626 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41627 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41628 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41629 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41630 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41631 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41632 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41633 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41634 +4 4 4 4 4 4
41635 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41636 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41637 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41638 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41639 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41640 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41641 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41642 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41643 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41644 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41645 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41646 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41647 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41648 +4 4 4 4 4 4
41649 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41650 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41651 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41652 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41653 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41654 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41655 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41656 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41657 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41658 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41659 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41660 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41661 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41662 +4 4 4 4 4 4
41663 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41664 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41665 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41666 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41667 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41668 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41669 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41670 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41671 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41672 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41673 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41674 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41675 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41676 +4 4 4 4 4 4
41677 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41678 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41679 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41680 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41681 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41682 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41683 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41684 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41685 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41686 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41687 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41688 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41689 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41690 +4 4 4 4 4 4
41691 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41692 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41693 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41694 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41695 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41696 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41697 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41698 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41699 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41700 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41701 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41702 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41703 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41704 +4 4 4 4 4 4
41705 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41706 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41707 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41708 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41709 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41710 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41711 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41712 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41713 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41714 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41715 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41716 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41717 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41718 +4 4 4 4 4 4
41719 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41720 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41721 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41722 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41723 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41724 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41725 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41726 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41727 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41728 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41729 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41730 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41731 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41732 +4 4 4 4 4 4
41733 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41734 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41735 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41736 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41737 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41738 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41739 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41740 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41741 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41742 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41743 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41744 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41745 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41746 +4 4 4 4 4 4
41747 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41748 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41749 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
41750 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41751 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
41752 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
41753 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
41754 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41755 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41756 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41757 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41758 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41759 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41760 +4 4 4 4 4 4
41761 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41762 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41763 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41764 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
41765 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
41766 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
41767 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
41768 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41769 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41770 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41771 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41772 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41773 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41774 +4 4 4 4 4 4
41775 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41776 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41777 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41778 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41779 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
41780 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
41781 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
41782 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41783 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41784 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41785 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41786 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41787 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41788 +4 4 4 4 4 4
41789 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41790 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41791 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41792 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41793 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41794 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
41795 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
41796 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41797 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41798 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41799 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41800 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41801 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41802 +4 4 4 4 4 4
41803 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41804 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41805 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41806 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41807 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41808 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41809 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
41810 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41811 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41812 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41813 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41814 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41815 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41816 +4 4 4 4 4 4
41817 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41818 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41819 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41820 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
41821 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
41822 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
41823 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
41824 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41825 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41826 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41827 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41828 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41829 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41830 +4 4 4 4 4 4
41831 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41832 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41833 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41834 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41835 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
41836 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41837 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41838 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41839 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41840 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41841 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41842 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41843 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41844 +4 4 4 4 4 4
41845 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41846 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41847 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41848 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41849 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
41850 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
41851 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41852 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41853 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41854 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41855 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41856 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41857 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41858 +4 4 4 4 4 4
41859 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41860 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41861 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41862 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41863 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
41864 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
41865 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41866 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41867 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41868 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41869 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41870 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41871 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41872 +4 4 4 4 4 4
41873 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41874 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41875 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41876 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41877 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
41878 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
41879 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41880 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41881 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41882 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41883 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41884 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41885 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41886 +4 4 4 4 4 4
41887 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41888 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41889 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41890 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41891 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41892 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
41893 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41894 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41895 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41896 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41897 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41898 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41899 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41900 +4 4 4 4 4 4
41901 diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
41902 index 8af6414..658c030 100644
41903 --- a/drivers/video/udlfb.c
41904 +++ b/drivers/video/udlfb.c
41905 @@ -620,11 +620,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
41906 dlfb_urb_completion(urb);
41907
41908 error:
41909 - atomic_add(bytes_sent, &dev->bytes_sent);
41910 - atomic_add(bytes_identical, &dev->bytes_identical);
41911 - atomic_add(width*height*2, &dev->bytes_rendered);
41912 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41913 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41914 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
41915 end_cycles = get_cycles();
41916 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
41917 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41918 >> 10)), /* Kcycles */
41919 &dev->cpu_kcycles_used);
41920
41921 @@ -745,11 +745,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
41922 dlfb_urb_completion(urb);
41923
41924 error:
41925 - atomic_add(bytes_sent, &dev->bytes_sent);
41926 - atomic_add(bytes_identical, &dev->bytes_identical);
41927 - atomic_add(bytes_rendered, &dev->bytes_rendered);
41928 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41929 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41930 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
41931 end_cycles = get_cycles();
41932 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
41933 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41934 >> 10)), /* Kcycles */
41935 &dev->cpu_kcycles_used);
41936 }
41937 @@ -1373,7 +1373,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
41938 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41939 struct dlfb_data *dev = fb_info->par;
41940 return snprintf(buf, PAGE_SIZE, "%u\n",
41941 - atomic_read(&dev->bytes_rendered));
41942 + atomic_read_unchecked(&dev->bytes_rendered));
41943 }
41944
41945 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41946 @@ -1381,7 +1381,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41947 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41948 struct dlfb_data *dev = fb_info->par;
41949 return snprintf(buf, PAGE_SIZE, "%u\n",
41950 - atomic_read(&dev->bytes_identical));
41951 + atomic_read_unchecked(&dev->bytes_identical));
41952 }
41953
41954 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41955 @@ -1389,7 +1389,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41956 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41957 struct dlfb_data *dev = fb_info->par;
41958 return snprintf(buf, PAGE_SIZE, "%u\n",
41959 - atomic_read(&dev->bytes_sent));
41960 + atomic_read_unchecked(&dev->bytes_sent));
41961 }
41962
41963 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41964 @@ -1397,7 +1397,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41965 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41966 struct dlfb_data *dev = fb_info->par;
41967 return snprintf(buf, PAGE_SIZE, "%u\n",
41968 - atomic_read(&dev->cpu_kcycles_used));
41969 + atomic_read_unchecked(&dev->cpu_kcycles_used));
41970 }
41971
41972 static ssize_t edid_show(
41973 @@ -1457,10 +1457,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
41974 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41975 struct dlfb_data *dev = fb_info->par;
41976
41977 - atomic_set(&dev->bytes_rendered, 0);
41978 - atomic_set(&dev->bytes_identical, 0);
41979 - atomic_set(&dev->bytes_sent, 0);
41980 - atomic_set(&dev->cpu_kcycles_used, 0);
41981 + atomic_set_unchecked(&dev->bytes_rendered, 0);
41982 + atomic_set_unchecked(&dev->bytes_identical, 0);
41983 + atomic_set_unchecked(&dev->bytes_sent, 0);
41984 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
41985
41986 return count;
41987 }
41988 diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
41989 index b0e2a42..e2df3ad 100644
41990 --- a/drivers/video/uvesafb.c
41991 +++ b/drivers/video/uvesafb.c
41992 @@ -19,6 +19,7 @@
41993 #include <linux/io.h>
41994 #include <linux/mutex.h>
41995 #include <linux/slab.h>
41996 +#include <linux/moduleloader.h>
41997 #include <video/edid.h>
41998 #include <video/uvesafb.h>
41999 #ifdef CONFIG_X86
42000 @@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
42001 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
42002 par->pmi_setpal = par->ypan = 0;
42003 } else {
42004 +
42005 +#ifdef CONFIG_PAX_KERNEXEC
42006 +#ifdef CONFIG_MODULES
42007 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
42008 +#endif
42009 + if (!par->pmi_code) {
42010 + par->pmi_setpal = par->ypan = 0;
42011 + return 0;
42012 + }
42013 +#endif
42014 +
42015 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
42016 + task->t.regs.edi);
42017 +
42018 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42019 + pax_open_kernel();
42020 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
42021 + pax_close_kernel();
42022 +
42023 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
42024 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
42025 +#else
42026 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
42027 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
42028 +#endif
42029 +
42030 printk(KERN_INFO "uvesafb: protected mode interface info at "
42031 "%04x:%04x\n",
42032 (u16)task->t.regs.es, (u16)task->t.regs.edi);
42033 @@ -816,13 +839,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
42034 par->ypan = ypan;
42035
42036 if (par->pmi_setpal || par->ypan) {
42037 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
42038 if (__supported_pte_mask & _PAGE_NX) {
42039 par->pmi_setpal = par->ypan = 0;
42040 printk(KERN_WARNING "uvesafb: NX protection is actively."
42041 "We have better not to use the PMI.\n");
42042 - } else {
42043 + } else
42044 +#endif
42045 uvesafb_vbe_getpmi(task, par);
42046 - }
42047 }
42048 #else
42049 /* The protected mode interface is not available on non-x86. */
42050 @@ -1836,6 +1860,11 @@ out:
42051 if (par->vbe_modes)
42052 kfree(par->vbe_modes);
42053
42054 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42055 + if (par->pmi_code)
42056 + module_free_exec(NULL, par->pmi_code);
42057 +#endif
42058 +
42059 framebuffer_release(info);
42060 return err;
42061 }
42062 @@ -1862,6 +1891,12 @@ static int uvesafb_remove(struct platform_device *dev)
42063 kfree(par->vbe_state_orig);
42064 if (par->vbe_state_saved)
42065 kfree(par->vbe_state_saved);
42066 +
42067 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42068 + if (par->pmi_code)
42069 + module_free_exec(NULL, par->pmi_code);
42070 +#endif
42071 +
42072 }
42073
42074 framebuffer_release(info);
42075 diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
42076 index 501b340..86bd4cf 100644
42077 --- a/drivers/video/vesafb.c
42078 +++ b/drivers/video/vesafb.c
42079 @@ -9,6 +9,7 @@
42080 */
42081
42082 #include <linux/module.h>
42083 +#include <linux/moduleloader.h>
42084 #include <linux/kernel.h>
42085 #include <linux/errno.h>
42086 #include <linux/string.h>
42087 @@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
42088 static int vram_total __initdata; /* Set total amount of memory */
42089 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
42090 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
42091 -static void (*pmi_start)(void) __read_mostly;
42092 -static void (*pmi_pal) (void) __read_mostly;
42093 +static void (*pmi_start)(void) __read_only;
42094 +static void (*pmi_pal) (void) __read_only;
42095 static int depth __read_mostly;
42096 static int vga_compat __read_mostly;
42097 /* --------------------------------------------------------------------- */
42098 @@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
42099 unsigned int size_vmode;
42100 unsigned int size_remap;
42101 unsigned int size_total;
42102 + void *pmi_code = NULL;
42103
42104 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
42105 return -ENODEV;
42106 @@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
42107 size_remap = size_total;
42108 vesafb_fix.smem_len = size_remap;
42109
42110 -#ifndef __i386__
42111 - screen_info.vesapm_seg = 0;
42112 -#endif
42113 -
42114 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
42115 printk(KERN_WARNING
42116 "vesafb: cannot reserve video memory at 0x%lx\n",
42117 @@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
42118 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
42119 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
42120
42121 +#ifdef __i386__
42122 +
42123 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42124 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
42125 + if (!pmi_code)
42126 +#elif !defined(CONFIG_PAX_KERNEXEC)
42127 + if (0)
42128 +#endif
42129 +
42130 +#endif
42131 + screen_info.vesapm_seg = 0;
42132 +
42133 if (screen_info.vesapm_seg) {
42134 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
42135 - screen_info.vesapm_seg,screen_info.vesapm_off);
42136 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
42137 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
42138 }
42139
42140 if (screen_info.vesapm_seg < 0xc000)
42141 @@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
42142
42143 if (ypan || pmi_setpal) {
42144 unsigned short *pmi_base;
42145 +
42146 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
42147 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
42148 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
42149 +
42150 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42151 + pax_open_kernel();
42152 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
42153 +#else
42154 + pmi_code = pmi_base;
42155 +#endif
42156 +
42157 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
42158 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
42159 +
42160 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42161 + pmi_start = ktva_ktla(pmi_start);
42162 + pmi_pal = ktva_ktla(pmi_pal);
42163 + pax_close_kernel();
42164 +#endif
42165 +
42166 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
42167 if (pmi_base[3]) {
42168 printk(KERN_INFO "vesafb: pmi: ports = ");
42169 @@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
42170 info->node, info->fix.id);
42171 return 0;
42172 err:
42173 +
42174 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42175 + module_free_exec(NULL, pmi_code);
42176 +#endif
42177 +
42178 if (info->screen_base)
42179 iounmap(info->screen_base);
42180 framebuffer_release(info);
42181 diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
42182 index 88714ae..16c2e11 100644
42183 --- a/drivers/video/via/via_clock.h
42184 +++ b/drivers/video/via/via_clock.h
42185 @@ -56,7 +56,7 @@ struct via_clock {
42186
42187 void (*set_engine_pll_state)(u8 state);
42188 void (*set_engine_pll)(struct via_pll_config config);
42189 -};
42190 +} __no_const;
42191
42192
42193 static inline u32 get_pll_internal_frequency(u32 ref_freq,
42194 diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
42195 index e56c934..fc22f4b 100644
42196 --- a/drivers/xen/xen-pciback/conf_space.h
42197 +++ b/drivers/xen/xen-pciback/conf_space.h
42198 @@ -44,15 +44,15 @@ struct config_field {
42199 struct {
42200 conf_dword_write write;
42201 conf_dword_read read;
42202 - } dw;
42203 + } __no_const dw;
42204 struct {
42205 conf_word_write write;
42206 conf_word_read read;
42207 - } w;
42208 + } __no_const w;
42209 struct {
42210 conf_byte_write write;
42211 conf_byte_read read;
42212 - } b;
42213 + } __no_const b;
42214 } u;
42215 struct list_head list;
42216 };
42217 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
42218 index 57ccb75..f6d05f8 100644
42219 --- a/fs/9p/vfs_inode.c
42220 +++ b/fs/9p/vfs_inode.c
42221 @@ -1303,7 +1303,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
42222 void
42223 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42224 {
42225 - char *s = nd_get_link(nd);
42226 + const char *s = nd_get_link(nd);
42227
42228 p9_debug(P9_DEBUG_VFS, " %s %s\n",
42229 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
42230 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
42231 index 0225742..1cd4732 100644
42232 --- a/fs/Kconfig.binfmt
42233 +++ b/fs/Kconfig.binfmt
42234 @@ -89,7 +89,7 @@ config HAVE_AOUT
42235
42236 config BINFMT_AOUT
42237 tristate "Kernel support for a.out and ECOFF binaries"
42238 - depends on HAVE_AOUT
42239 + depends on HAVE_AOUT && BROKEN
42240 ---help---
42241 A.out (Assembler.OUTput) is a set of formats for libraries and
42242 executables used in the earliest versions of UNIX. Linux used
42243 diff --git a/fs/aio.c b/fs/aio.c
42244 index 55c4c76..11aee6f 100644
42245 --- a/fs/aio.c
42246 +++ b/fs/aio.c
42247 @@ -118,7 +118,7 @@ static int aio_setup_ring(struct kioctx *ctx)
42248 size += sizeof(struct io_event) * nr_events;
42249 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
42250
42251 - if (nr_pages < 0)
42252 + if (nr_pages <= 0)
42253 return -EINVAL;
42254
42255 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
42256 @@ -1440,18 +1440,19 @@ static ssize_t aio_fsync(struct kiocb *iocb)
42257 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
42258 {
42259 ssize_t ret;
42260 + struct iovec iovstack;
42261
42262 #ifdef CONFIG_COMPAT
42263 if (compat)
42264 ret = compat_rw_copy_check_uvector(type,
42265 (struct compat_iovec __user *)kiocb->ki_buf,
42266 - kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42267 + kiocb->ki_nbytes, 1, &iovstack,
42268 &kiocb->ki_iovec);
42269 else
42270 #endif
42271 ret = rw_copy_check_uvector(type,
42272 (struct iovec __user *)kiocb->ki_buf,
42273 - kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
42274 + kiocb->ki_nbytes, 1, &iovstack,
42275 &kiocb->ki_iovec);
42276 if (ret < 0)
42277 goto out;
42278 @@ -1460,6 +1461,10 @@ static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
42279 if (ret < 0)
42280 goto out;
42281
42282 + if (kiocb->ki_iovec == &iovstack) {
42283 + kiocb->ki_inline_vec = iovstack;
42284 + kiocb->ki_iovec = &kiocb->ki_inline_vec;
42285 + }
42286 kiocb->ki_nr_segs = kiocb->ki_nbytes;
42287 kiocb->ki_cur_seg = 0;
42288 /* ki_nbytes/left now reflect bytes instead of segs */
42289 diff --git a/fs/attr.c b/fs/attr.c
42290 index 0da9095..1386693 100644
42291 --- a/fs/attr.c
42292 +++ b/fs/attr.c
42293 @@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
42294 unsigned long limit;
42295
42296 limit = rlimit(RLIMIT_FSIZE);
42297 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
42298 if (limit != RLIM_INFINITY && offset > limit)
42299 goto out_sig;
42300 if (offset > inode->i_sb->s_maxbytes)
42301 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
42302 index da8876d..9f3e6d8 100644
42303 --- a/fs/autofs4/waitq.c
42304 +++ b/fs/autofs4/waitq.c
42305 @@ -61,7 +61,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
42306 {
42307 unsigned long sigpipe, flags;
42308 mm_segment_t fs;
42309 - const char *data = (const char *)addr;
42310 + const char __user *data = (const char __force_user *)addr;
42311 ssize_t wr = 0;
42312
42313 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
42314 diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
42315 index e18da23..affc30e 100644
42316 --- a/fs/befs/linuxvfs.c
42317 +++ b/fs/befs/linuxvfs.c
42318 @@ -502,7 +502,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42319 {
42320 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
42321 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
42322 - char *link = nd_get_link(nd);
42323 + const char *link = nd_get_link(nd);
42324 if (!IS_ERR(link))
42325 kfree(link);
42326 }
42327 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
42328 index d146e18..12d1bd1 100644
42329 --- a/fs/binfmt_aout.c
42330 +++ b/fs/binfmt_aout.c
42331 @@ -16,6 +16,7 @@
42332 #include <linux/string.h>
42333 #include <linux/fs.h>
42334 #include <linux/file.h>
42335 +#include <linux/security.h>
42336 #include <linux/stat.h>
42337 #include <linux/fcntl.h>
42338 #include <linux/ptrace.h>
42339 @@ -83,6 +84,8 @@ static int aout_core_dump(struct coredump_params *cprm)
42340 #endif
42341 # define START_STACK(u) ((void __user *)u.start_stack)
42342
42343 + memset(&dump, 0, sizeof(dump));
42344 +
42345 fs = get_fs();
42346 set_fs(KERNEL_DS);
42347 has_dumped = 1;
42348 @@ -94,10 +97,12 @@ static int aout_core_dump(struct coredump_params *cprm)
42349
42350 /* If the size of the dump file exceeds the rlimit, then see what would happen
42351 if we wrote the stack, but not the data area. */
42352 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
42353 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
42354 dump.u_dsize = 0;
42355
42356 /* Make sure we have enough room to write the stack and data areas. */
42357 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42358 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
42359 dump.u_ssize = 0;
42360
42361 @@ -231,6 +236,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42362 rlim = rlimit(RLIMIT_DATA);
42363 if (rlim >= RLIM_INFINITY)
42364 rlim = ~0;
42365 +
42366 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42367 if (ex.a_data + ex.a_bss > rlim)
42368 return -ENOMEM;
42369
42370 @@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42371
42372 install_exec_creds(bprm);
42373
42374 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42375 + current->mm->pax_flags = 0UL;
42376 +#endif
42377 +
42378 +#ifdef CONFIG_PAX_PAGEEXEC
42379 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42380 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42381 +
42382 +#ifdef CONFIG_PAX_EMUTRAMP
42383 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42384 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42385 +#endif
42386 +
42387 +#ifdef CONFIG_PAX_MPROTECT
42388 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42389 + current->mm->pax_flags |= MF_PAX_MPROTECT;
42390 +#endif
42391 +
42392 + }
42393 +#endif
42394 +
42395 if (N_MAGIC(ex) == OMAGIC) {
42396 unsigned long text_addr, map_size;
42397 loff_t pos;
42398 @@ -330,7 +358,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42399 }
42400
42401 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42402 - PROT_READ | PROT_WRITE | PROT_EXEC,
42403 + PROT_READ | PROT_WRITE,
42404 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42405 fd_offset + ex.a_text);
42406 if (error != N_DATADDR(ex)) {
42407 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
42408 index 1b52956..271266e 100644
42409 --- a/fs/binfmt_elf.c
42410 +++ b/fs/binfmt_elf.c
42411 @@ -32,6 +32,7 @@
42412 #include <linux/elf.h>
42413 #include <linux/utsname.h>
42414 #include <linux/coredump.h>
42415 +#include <linux/xattr.h>
42416 #include <asm/uaccess.h>
42417 #include <asm/param.h>
42418 #include <asm/page.h>
42419 @@ -52,6 +53,10 @@ static int elf_core_dump(struct coredump_params *cprm);
42420 #define elf_core_dump NULL
42421 #endif
42422
42423 +#ifdef CONFIG_PAX_MPROTECT
42424 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42425 +#endif
42426 +
42427 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42428 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42429 #else
42430 @@ -71,6 +76,11 @@ static struct linux_binfmt elf_format = {
42431 .load_binary = load_elf_binary,
42432 .load_shlib = load_elf_library,
42433 .core_dump = elf_core_dump,
42434 +
42435 +#ifdef CONFIG_PAX_MPROTECT
42436 + .handle_mprotect= elf_handle_mprotect,
42437 +#endif
42438 +
42439 .min_coredump = ELF_EXEC_PAGESIZE,
42440 };
42441
42442 @@ -78,6 +88,8 @@ static struct linux_binfmt elf_format = {
42443
42444 static int set_brk(unsigned long start, unsigned long end)
42445 {
42446 + unsigned long e = end;
42447 +
42448 start = ELF_PAGEALIGN(start);
42449 end = ELF_PAGEALIGN(end);
42450 if (end > start) {
42451 @@ -86,7 +98,7 @@ static int set_brk(unsigned long start, unsigned long end)
42452 if (BAD_ADDR(addr))
42453 return addr;
42454 }
42455 - current->mm->start_brk = current->mm->brk = end;
42456 + current->mm->start_brk = current->mm->brk = e;
42457 return 0;
42458 }
42459
42460 @@ -147,12 +159,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42461 elf_addr_t __user *u_rand_bytes;
42462 const char *k_platform = ELF_PLATFORM;
42463 const char *k_base_platform = ELF_BASE_PLATFORM;
42464 - unsigned char k_rand_bytes[16];
42465 + u32 k_rand_bytes[4];
42466 int items;
42467 elf_addr_t *elf_info;
42468 int ei_index = 0;
42469 const struct cred *cred = current_cred();
42470 struct vm_area_struct *vma;
42471 + unsigned long saved_auxv[AT_VECTOR_SIZE];
42472
42473 /*
42474 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42475 @@ -194,8 +207,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42476 * Generate 16 random bytes for userspace PRNG seeding.
42477 */
42478 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42479 - u_rand_bytes = (elf_addr_t __user *)
42480 - STACK_ALLOC(p, sizeof(k_rand_bytes));
42481 + srandom32(k_rand_bytes[0] ^ random32());
42482 + srandom32(k_rand_bytes[1] ^ random32());
42483 + srandom32(k_rand_bytes[2] ^ random32());
42484 + srandom32(k_rand_bytes[3] ^ random32());
42485 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
42486 + u_rand_bytes = (elf_addr_t __user *) p;
42487 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42488 return -EFAULT;
42489
42490 @@ -307,9 +324,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42491 return -EFAULT;
42492 current->mm->env_end = p;
42493
42494 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42495 +
42496 /* Put the elf_info on the stack in the right place. */
42497 sp = (elf_addr_t __user *)envp + 1;
42498 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42499 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42500 return -EFAULT;
42501 return 0;
42502 }
42503 @@ -378,10 +397,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42504 {
42505 struct elf_phdr *elf_phdata;
42506 struct elf_phdr *eppnt;
42507 - unsigned long load_addr = 0;
42508 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42509 int load_addr_set = 0;
42510 unsigned long last_bss = 0, elf_bss = 0;
42511 - unsigned long error = ~0UL;
42512 + unsigned long error = -EINVAL;
42513 unsigned long total_size;
42514 int retval, i, size;
42515
42516 @@ -427,6 +446,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42517 goto out_close;
42518 }
42519
42520 +#ifdef CONFIG_PAX_SEGMEXEC
42521 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42522 + pax_task_size = SEGMEXEC_TASK_SIZE;
42523 +#endif
42524 +
42525 eppnt = elf_phdata;
42526 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42527 if (eppnt->p_type == PT_LOAD) {
42528 @@ -470,8 +494,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42529 k = load_addr + eppnt->p_vaddr;
42530 if (BAD_ADDR(k) ||
42531 eppnt->p_filesz > eppnt->p_memsz ||
42532 - eppnt->p_memsz > TASK_SIZE ||
42533 - TASK_SIZE - eppnt->p_memsz < k) {
42534 + eppnt->p_memsz > pax_task_size ||
42535 + pax_task_size - eppnt->p_memsz < k) {
42536 error = -ENOMEM;
42537 goto out_close;
42538 }
42539 @@ -523,6 +547,311 @@ out:
42540 return error;
42541 }
42542
42543 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
42544 +#ifdef CONFIG_PAX_SOFTMODE
42545 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
42546 +{
42547 + unsigned long pax_flags = 0UL;
42548 +
42549 +#ifdef CONFIG_PAX_PAGEEXEC
42550 + if (elf_phdata->p_flags & PF_PAGEEXEC)
42551 + pax_flags |= MF_PAX_PAGEEXEC;
42552 +#endif
42553 +
42554 +#ifdef CONFIG_PAX_SEGMEXEC
42555 + if (elf_phdata->p_flags & PF_SEGMEXEC)
42556 + pax_flags |= MF_PAX_SEGMEXEC;
42557 +#endif
42558 +
42559 +#ifdef CONFIG_PAX_EMUTRAMP
42560 + if (elf_phdata->p_flags & PF_EMUTRAMP)
42561 + pax_flags |= MF_PAX_EMUTRAMP;
42562 +#endif
42563 +
42564 +#ifdef CONFIG_PAX_MPROTECT
42565 + if (elf_phdata->p_flags & PF_MPROTECT)
42566 + pax_flags |= MF_PAX_MPROTECT;
42567 +#endif
42568 +
42569 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42570 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42571 + pax_flags |= MF_PAX_RANDMMAP;
42572 +#endif
42573 +
42574 + return pax_flags;
42575 +}
42576 +#endif
42577 +
42578 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
42579 +{
42580 + unsigned long pax_flags = 0UL;
42581 +
42582 +#ifdef CONFIG_PAX_PAGEEXEC
42583 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42584 + pax_flags |= MF_PAX_PAGEEXEC;
42585 +#endif
42586 +
42587 +#ifdef CONFIG_PAX_SEGMEXEC
42588 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42589 + pax_flags |= MF_PAX_SEGMEXEC;
42590 +#endif
42591 +
42592 +#ifdef CONFIG_PAX_EMUTRAMP
42593 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42594 + pax_flags |= MF_PAX_EMUTRAMP;
42595 +#endif
42596 +
42597 +#ifdef CONFIG_PAX_MPROTECT
42598 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42599 + pax_flags |= MF_PAX_MPROTECT;
42600 +#endif
42601 +
42602 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42603 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42604 + pax_flags |= MF_PAX_RANDMMAP;
42605 +#endif
42606 +
42607 + return pax_flags;
42608 +}
42609 +#endif
42610 +
42611 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42612 +#ifdef CONFIG_PAX_SOFTMODE
42613 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
42614 +{
42615 + unsigned long pax_flags = 0UL;
42616 +
42617 +#ifdef CONFIG_PAX_PAGEEXEC
42618 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
42619 + pax_flags |= MF_PAX_PAGEEXEC;
42620 +#endif
42621 +
42622 +#ifdef CONFIG_PAX_SEGMEXEC
42623 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
42624 + pax_flags |= MF_PAX_SEGMEXEC;
42625 +#endif
42626 +
42627 +#ifdef CONFIG_PAX_EMUTRAMP
42628 + if (pax_flags_softmode & MF_PAX_EMUTRAMP)
42629 + pax_flags |= MF_PAX_EMUTRAMP;
42630 +#endif
42631 +
42632 +#ifdef CONFIG_PAX_MPROTECT
42633 + if (pax_flags_softmode & MF_PAX_MPROTECT)
42634 + pax_flags |= MF_PAX_MPROTECT;
42635 +#endif
42636 +
42637 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42638 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
42639 + pax_flags |= MF_PAX_RANDMMAP;
42640 +#endif
42641 +
42642 + return pax_flags;
42643 +}
42644 +#endif
42645 +
42646 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
42647 +{
42648 + unsigned long pax_flags = 0UL;
42649 +
42650 +#ifdef CONFIG_PAX_PAGEEXEC
42651 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
42652 + pax_flags |= MF_PAX_PAGEEXEC;
42653 +#endif
42654 +
42655 +#ifdef CONFIG_PAX_SEGMEXEC
42656 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
42657 + pax_flags |= MF_PAX_SEGMEXEC;
42658 +#endif
42659 +
42660 +#ifdef CONFIG_PAX_EMUTRAMP
42661 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
42662 + pax_flags |= MF_PAX_EMUTRAMP;
42663 +#endif
42664 +
42665 +#ifdef CONFIG_PAX_MPROTECT
42666 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
42667 + pax_flags |= MF_PAX_MPROTECT;
42668 +#endif
42669 +
42670 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42671 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
42672 + pax_flags |= MF_PAX_RANDMMAP;
42673 +#endif
42674 +
42675 + return pax_flags;
42676 +}
42677 +#endif
42678 +
42679 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42680 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42681 +{
42682 + unsigned long pax_flags = 0UL;
42683 +
42684 +#ifdef CONFIG_PAX_EI_PAX
42685 +
42686 +#ifdef CONFIG_PAX_PAGEEXEC
42687 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42688 + pax_flags |= MF_PAX_PAGEEXEC;
42689 +#endif
42690 +
42691 +#ifdef CONFIG_PAX_SEGMEXEC
42692 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42693 + pax_flags |= MF_PAX_SEGMEXEC;
42694 +#endif
42695 +
42696 +#ifdef CONFIG_PAX_EMUTRAMP
42697 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42698 + pax_flags |= MF_PAX_EMUTRAMP;
42699 +#endif
42700 +
42701 +#ifdef CONFIG_PAX_MPROTECT
42702 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42703 + pax_flags |= MF_PAX_MPROTECT;
42704 +#endif
42705 +
42706 +#ifdef CONFIG_PAX_ASLR
42707 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42708 + pax_flags |= MF_PAX_RANDMMAP;
42709 +#endif
42710 +
42711 +#else
42712 +
42713 +#ifdef CONFIG_PAX_PAGEEXEC
42714 + pax_flags |= MF_PAX_PAGEEXEC;
42715 +#endif
42716 +
42717 +#ifdef CONFIG_PAX_SEGMEXEC
42718 + pax_flags |= MF_PAX_SEGMEXEC;
42719 +#endif
42720 +
42721 +#ifdef CONFIG_PAX_MPROTECT
42722 + pax_flags |= MF_PAX_MPROTECT;
42723 +#endif
42724 +
42725 +#ifdef CONFIG_PAX_RANDMMAP
42726 + if (randomize_va_space)
42727 + pax_flags |= MF_PAX_RANDMMAP;
42728 +#endif
42729 +
42730 +#endif
42731 +
42732 + return pax_flags;
42733 +}
42734 +
42735 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42736 +{
42737 +
42738 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
42739 + unsigned long i;
42740 +
42741 + for (i = 0UL; i < elf_ex->e_phnum; i++)
42742 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42743 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42744 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42745 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42746 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42747 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42748 + return ~0UL;
42749 +
42750 +#ifdef CONFIG_PAX_SOFTMODE
42751 + if (pax_softmode)
42752 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
42753 + else
42754 +#endif
42755 +
42756 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
42757 + break;
42758 + }
42759 +#endif
42760 +
42761 + return ~0UL;
42762 +}
42763 +
42764 +static unsigned long pax_parse_xattr_pax(struct file * const file)
42765 +{
42766 +
42767 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42768 + ssize_t xattr_size, i;
42769 + unsigned char xattr_value[5];
42770 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
42771 +
42772 + xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
42773 + if (xattr_size <= 0)
42774 + return ~0UL;
42775 +
42776 + for (i = 0; i < xattr_size; i++)
42777 + switch (xattr_value[i]) {
42778 + default:
42779 + return ~0UL;
42780 +
42781 +#define parse_flag(option1, option2, flag) \
42782 + case option1: \
42783 + pax_flags_hardmode |= MF_PAX_##flag; \
42784 + break; \
42785 + case option2: \
42786 + pax_flags_softmode |= MF_PAX_##flag; \
42787 + break;
42788 +
42789 + parse_flag('p', 'P', PAGEEXEC);
42790 + parse_flag('e', 'E', EMUTRAMP);
42791 + parse_flag('m', 'M', MPROTECT);
42792 + parse_flag('r', 'R', RANDMMAP);
42793 + parse_flag('s', 'S', SEGMEXEC);
42794 +
42795 +#undef parse_flag
42796 + }
42797 +
42798 + if (pax_flags_hardmode & pax_flags_softmode)
42799 + return ~0UL;
42800 +
42801 +#ifdef CONFIG_PAX_SOFTMODE
42802 + if (pax_softmode)
42803 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
42804 + else
42805 +#endif
42806 +
42807 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
42808 +#else
42809 + return ~0UL;
42810 +#endif
42811 +
42812 +}
42813 +
42814 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
42815 +{
42816 + unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
42817 +
42818 + pax_flags = pax_parse_ei_pax(elf_ex);
42819 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
42820 + xattr_pax_flags = pax_parse_xattr_pax(file);
42821 +
42822 + if (pt_pax_flags == ~0UL)
42823 + pt_pax_flags = xattr_pax_flags;
42824 + else if (xattr_pax_flags == ~0UL)
42825 + xattr_pax_flags = pt_pax_flags;
42826 + if (pt_pax_flags != xattr_pax_flags)
42827 + return -EINVAL;
42828 + if (pt_pax_flags != ~0UL)
42829 + pax_flags = pt_pax_flags;
42830 +
42831 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42832 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42833 + if ((__supported_pte_mask & _PAGE_NX))
42834 + pax_flags &= ~MF_PAX_SEGMEXEC;
42835 + else
42836 + pax_flags &= ~MF_PAX_PAGEEXEC;
42837 + }
42838 +#endif
42839 +
42840 + if (0 > pax_check_flags(&pax_flags))
42841 + return -EINVAL;
42842 +
42843 + current->mm->pax_flags = pax_flags;
42844 + return 0;
42845 +}
42846 +#endif
42847 +
42848 /*
42849 * These are the functions used to load ELF style executables and shared
42850 * libraries. There is no binary dependent code anywhere else.
42851 @@ -539,6 +868,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
42852 {
42853 unsigned int random_variable = 0;
42854
42855 +#ifdef CONFIG_PAX_RANDUSTACK
42856 + if (randomize_va_space)
42857 + return stack_top - current->mm->delta_stack;
42858 +#endif
42859 +
42860 if ((current->flags & PF_RANDOMIZE) &&
42861 !(current->personality & ADDR_NO_RANDOMIZE)) {
42862 random_variable = get_random_int() & STACK_RND_MASK;
42863 @@ -557,7 +891,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42864 unsigned long load_addr = 0, load_bias = 0;
42865 int load_addr_set = 0;
42866 char * elf_interpreter = NULL;
42867 - unsigned long error;
42868 + unsigned long error = 0;
42869 struct elf_phdr *elf_ppnt, *elf_phdata;
42870 unsigned long elf_bss, elf_brk;
42871 int retval, i;
42872 @@ -567,11 +901,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42873 unsigned long start_code, end_code, start_data, end_data;
42874 unsigned long reloc_func_desc __maybe_unused = 0;
42875 int executable_stack = EXSTACK_DEFAULT;
42876 - unsigned long def_flags = 0;
42877 struct {
42878 struct elfhdr elf_ex;
42879 struct elfhdr interp_elf_ex;
42880 } *loc;
42881 + unsigned long pax_task_size = TASK_SIZE;
42882
42883 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42884 if (!loc) {
42885 @@ -707,11 +1041,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42886 goto out_free_dentry;
42887
42888 /* OK, This is the point of no return */
42889 - current->mm->def_flags = def_flags;
42890 +
42891 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42892 + current->mm->pax_flags = 0UL;
42893 +#endif
42894 +
42895 +#ifdef CONFIG_PAX_DLRESOLVE
42896 + current->mm->call_dl_resolve = 0UL;
42897 +#endif
42898 +
42899 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42900 + current->mm->call_syscall = 0UL;
42901 +#endif
42902 +
42903 +#ifdef CONFIG_PAX_ASLR
42904 + current->mm->delta_mmap = 0UL;
42905 + current->mm->delta_stack = 0UL;
42906 +#endif
42907 +
42908 + current->mm->def_flags = 0;
42909 +
42910 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42911 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
42912 + send_sig(SIGKILL, current, 0);
42913 + goto out_free_dentry;
42914 + }
42915 +#endif
42916 +
42917 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42918 + pax_set_initial_flags(bprm);
42919 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42920 + if (pax_set_initial_flags_func)
42921 + (pax_set_initial_flags_func)(bprm);
42922 +#endif
42923 +
42924 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42925 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
42926 + current->mm->context.user_cs_limit = PAGE_SIZE;
42927 + current->mm->def_flags |= VM_PAGEEXEC;
42928 + }
42929 +#endif
42930 +
42931 +#ifdef CONFIG_PAX_SEGMEXEC
42932 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42933 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42934 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42935 + pax_task_size = SEGMEXEC_TASK_SIZE;
42936 + current->mm->def_flags |= VM_NOHUGEPAGE;
42937 + }
42938 +#endif
42939 +
42940 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42941 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42942 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42943 + put_cpu();
42944 + }
42945 +#endif
42946
42947 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42948 may depend on the personality. */
42949 SET_PERSONALITY(loc->elf_ex);
42950 +
42951 +#ifdef CONFIG_PAX_ASLR
42952 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42953 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42954 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42955 + }
42956 +#endif
42957 +
42958 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
42959 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42960 + executable_stack = EXSTACK_DISABLE_X;
42961 + current->personality &= ~READ_IMPLIES_EXEC;
42962 + } else
42963 +#endif
42964 +
42965 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
42966 current->personality |= READ_IMPLIES_EXEC;
42967
42968 @@ -802,6 +1206,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42969 #else
42970 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
42971 #endif
42972 +
42973 +#ifdef CONFIG_PAX_RANDMMAP
42974 + /* PaX: randomize base address at the default exe base if requested */
42975 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
42976 +#ifdef CONFIG_SPARC64
42977 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
42978 +#else
42979 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
42980 +#endif
42981 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
42982 + elf_flags |= MAP_FIXED;
42983 + }
42984 +#endif
42985 +
42986 }
42987
42988 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
42989 @@ -834,9 +1252,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42990 * allowed task size. Note that p_filesz must always be
42991 * <= p_memsz so it is only necessary to check p_memsz.
42992 */
42993 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42994 - elf_ppnt->p_memsz > TASK_SIZE ||
42995 - TASK_SIZE - elf_ppnt->p_memsz < k) {
42996 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42997 + elf_ppnt->p_memsz > pax_task_size ||
42998 + pax_task_size - elf_ppnt->p_memsz < k) {
42999 /* set_brk can never work. Avoid overflows. */
43000 send_sig(SIGKILL, current, 0);
43001 retval = -EINVAL;
43002 @@ -875,11 +1293,41 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43003 goto out_free_dentry;
43004 }
43005 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
43006 - send_sig(SIGSEGV, current, 0);
43007 - retval = -EFAULT; /* Nobody gets to see this, but.. */
43008 - goto out_free_dentry;
43009 + /*
43010 + * This bss-zeroing can fail if the ELF
43011 + * file specifies odd protections. So
43012 + * we don't check the return value
43013 + */
43014 }
43015
43016 +#ifdef CONFIG_PAX_RANDMMAP
43017 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
43018 + unsigned long start, size;
43019 +
43020 + start = ELF_PAGEALIGN(elf_brk);
43021 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
43022 + down_read(&current->mm->mmap_sem);
43023 + retval = -ENOMEM;
43024 + if (!find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
43025 + unsigned long prot = PROT_NONE;
43026 +
43027 + up_read(&current->mm->mmap_sem);
43028 + current->mm->brk_gap = PAGE_ALIGN(size) >> PAGE_SHIFT;
43029 +// if (current->personality & ADDR_NO_RANDOMIZE)
43030 +// prot = PROT_READ;
43031 + start = vm_mmap(NULL, start, size, prot, MAP_ANONYMOUS | MAP_FIXED | MAP_PRIVATE, 0);
43032 + retval = IS_ERR_VALUE(start) ? start : 0;
43033 + } else
43034 + up_read(&current->mm->mmap_sem);
43035 + if (retval == 0)
43036 + retval = set_brk(start + size, start + size + PAGE_SIZE);
43037 + if (retval < 0) {
43038 + send_sig(SIGKILL, current, 0);
43039 + goto out_free_dentry;
43040 + }
43041 + }
43042 +#endif
43043 +
43044 if (elf_interpreter) {
43045 unsigned long uninitialized_var(interp_map_addr);
43046
43047 @@ -1107,7 +1555,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
43048 * Decide what to dump of a segment, part, all or none.
43049 */
43050 static unsigned long vma_dump_size(struct vm_area_struct *vma,
43051 - unsigned long mm_flags)
43052 + unsigned long mm_flags, long signr)
43053 {
43054 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
43055
43056 @@ -1144,7 +1592,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
43057 if (vma->vm_file == NULL)
43058 return 0;
43059
43060 - if (FILTER(MAPPED_PRIVATE))
43061 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
43062 goto whole;
43063
43064 /*
43065 @@ -1366,9 +1814,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
43066 {
43067 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
43068 int i = 0;
43069 - do
43070 + do {
43071 i += 2;
43072 - while (auxv[i - 2] != AT_NULL);
43073 + } while (auxv[i - 2] != AT_NULL);
43074 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
43075 }
43076
43077 @@ -1890,14 +2338,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
43078 }
43079
43080 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
43081 - unsigned long mm_flags)
43082 + struct coredump_params *cprm)
43083 {
43084 struct vm_area_struct *vma;
43085 size_t size = 0;
43086
43087 for (vma = first_vma(current, gate_vma); vma != NULL;
43088 vma = next_vma(vma, gate_vma))
43089 - size += vma_dump_size(vma, mm_flags);
43090 + size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43091 return size;
43092 }
43093
43094 @@ -1991,7 +2439,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43095
43096 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
43097
43098 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
43099 + offset += elf_core_vma_data_size(gate_vma, cprm);
43100 offset += elf_core_extra_data_size();
43101 e_shoff = offset;
43102
43103 @@ -2005,10 +2453,12 @@ static int elf_core_dump(struct coredump_params *cprm)
43104 offset = dataoff;
43105
43106 size += sizeof(*elf);
43107 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43108 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
43109 goto end_coredump;
43110
43111 size += sizeof(*phdr4note);
43112 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43113 if (size > cprm->limit
43114 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
43115 goto end_coredump;
43116 @@ -2022,7 +2472,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43117 phdr.p_offset = offset;
43118 phdr.p_vaddr = vma->vm_start;
43119 phdr.p_paddr = 0;
43120 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
43121 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43122 phdr.p_memsz = vma->vm_end - vma->vm_start;
43123 offset += phdr.p_filesz;
43124 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
43125 @@ -2033,6 +2483,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43126 phdr.p_align = ELF_EXEC_PAGESIZE;
43127
43128 size += sizeof(phdr);
43129 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43130 if (size > cprm->limit
43131 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
43132 goto end_coredump;
43133 @@ -2057,7 +2508,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43134 unsigned long addr;
43135 unsigned long end;
43136
43137 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
43138 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43139
43140 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
43141 struct page *page;
43142 @@ -2066,6 +2517,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43143 page = get_dump_page(addr);
43144 if (page) {
43145 void *kaddr = kmap(page);
43146 + gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
43147 stop = ((size += PAGE_SIZE) > cprm->limit) ||
43148 !dump_write(cprm->file, kaddr,
43149 PAGE_SIZE);
43150 @@ -2083,6 +2535,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43151
43152 if (e_phnum == PN_XNUM) {
43153 size += sizeof(*shdr4extnum);
43154 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43155 if (size > cprm->limit
43156 || !dump_write(cprm->file, shdr4extnum,
43157 sizeof(*shdr4extnum)))
43158 @@ -2103,6 +2556,97 @@ out:
43159
43160 #endif /* CONFIG_ELF_CORE */
43161
43162 +#ifdef CONFIG_PAX_MPROTECT
43163 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
43164 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
43165 + * we'll remove VM_MAYWRITE for good on RELRO segments.
43166 + *
43167 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
43168 + * basis because we want to allow the common case and not the special ones.
43169 + */
43170 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
43171 +{
43172 + struct elfhdr elf_h;
43173 + struct elf_phdr elf_p;
43174 + unsigned long i;
43175 + unsigned long oldflags;
43176 + bool is_textrel_rw, is_textrel_rx, is_relro;
43177 +
43178 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
43179 + return;
43180 +
43181 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
43182 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
43183 +
43184 +#ifdef CONFIG_PAX_ELFRELOCS
43185 + /* possible TEXTREL */
43186 + is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
43187 + is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
43188 +#else
43189 + is_textrel_rw = false;
43190 + is_textrel_rx = false;
43191 +#endif
43192 +
43193 + /* possible RELRO */
43194 + is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
43195 +
43196 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
43197 + return;
43198 +
43199 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
43200 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
43201 +
43202 +#ifdef CONFIG_PAX_ETEXECRELOCS
43203 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43204 +#else
43205 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
43206 +#endif
43207 +
43208 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
43209 + !elf_check_arch(&elf_h) ||
43210 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
43211 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
43212 + return;
43213 +
43214 + for (i = 0UL; i < elf_h.e_phnum; i++) {
43215 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
43216 + return;
43217 + switch (elf_p.p_type) {
43218 + case PT_DYNAMIC:
43219 + if (!is_textrel_rw && !is_textrel_rx)
43220 + continue;
43221 + i = 0UL;
43222 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
43223 + elf_dyn dyn;
43224 +
43225 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
43226 + return;
43227 + if (dyn.d_tag == DT_NULL)
43228 + return;
43229 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
43230 + gr_log_textrel(vma);
43231 + if (is_textrel_rw)
43232 + vma->vm_flags |= VM_MAYWRITE;
43233 + else
43234 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
43235 + vma->vm_flags &= ~VM_MAYWRITE;
43236 + return;
43237 + }
43238 + i++;
43239 + }
43240 + return;
43241 +
43242 + case PT_GNU_RELRO:
43243 + if (!is_relro)
43244 + continue;
43245 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
43246 + vma->vm_flags &= ~VM_MAYWRITE;
43247 + return;
43248 + }
43249 + }
43250 +}
43251 +#endif
43252 +
43253 static int __init init_elf_binfmt(void)
43254 {
43255 register_binfmt(&elf_format);
43256 diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
43257 index 178cb70..8972997 100644
43258 --- a/fs/binfmt_flat.c
43259 +++ b/fs/binfmt_flat.c
43260 @@ -562,7 +562,9 @@ static int load_flat_file(struct linux_binprm * bprm,
43261 realdatastart = (unsigned long) -ENOMEM;
43262 printk("Unable to allocate RAM for process data, errno %d\n",
43263 (int)-realdatastart);
43264 + down_write(&current->mm->mmap_sem);
43265 vm_munmap(textpos, text_len);
43266 + up_write(&current->mm->mmap_sem);
43267 ret = realdatastart;
43268 goto err;
43269 }
43270 @@ -586,8 +588,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43271 }
43272 if (IS_ERR_VALUE(result)) {
43273 printk("Unable to read data+bss, errno %d\n", (int)-result);
43274 + down_write(&current->mm->mmap_sem);
43275 vm_munmap(textpos, text_len);
43276 vm_munmap(realdatastart, len);
43277 + up_write(&current->mm->mmap_sem);
43278 ret = result;
43279 goto err;
43280 }
43281 @@ -654,8 +658,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43282 }
43283 if (IS_ERR_VALUE(result)) {
43284 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
43285 + down_write(&current->mm->mmap_sem);
43286 vm_munmap(textpos, text_len + data_len + extra +
43287 MAX_SHARED_LIBS * sizeof(unsigned long));
43288 + up_write(&current->mm->mmap_sem);
43289 ret = result;
43290 goto err;
43291 }
43292 diff --git a/fs/bio.c b/fs/bio.c
43293 index 73922ab..16642dd 100644
43294 --- a/fs/bio.c
43295 +++ b/fs/bio.c
43296 @@ -841,7 +841,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
43297 /*
43298 * Overflow, abort
43299 */
43300 - if (end < start)
43301 + if (end < start || end - start > INT_MAX - nr_pages)
43302 return ERR_PTR(-EINVAL);
43303
43304 nr_pages += end - start;
43305 @@ -975,7 +975,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
43306 /*
43307 * Overflow, abort
43308 */
43309 - if (end < start)
43310 + if (end < start || end - start > INT_MAX - nr_pages)
43311 return ERR_PTR(-EINVAL);
43312
43313 nr_pages += end - start;
43314 @@ -1237,7 +1237,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
43315 const int read = bio_data_dir(bio) == READ;
43316 struct bio_map_data *bmd = bio->bi_private;
43317 int i;
43318 - char *p = bmd->sgvecs[0].iov_base;
43319 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
43320
43321 __bio_for_each_segment(bvec, bio, i, 0) {
43322 char *addr = page_address(bvec->bv_page);
43323 diff --git a/fs/block_dev.c b/fs/block_dev.c
43324 index c2bbe1f..9dfbc23 100644
43325 --- a/fs/block_dev.c
43326 +++ b/fs/block_dev.c
43327 @@ -704,7 +704,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
43328 else if (bdev->bd_contains == bdev)
43329 return true; /* is a whole device which isn't held */
43330
43331 - else if (whole->bd_holder == bd_may_claim)
43332 + else if (whole->bd_holder == (void *)bd_may_claim)
43333 return true; /* is a partition of a device that is being partitioned */
43334 else if (whole->bd_holder != NULL)
43335 return false; /* is a partition of a held device */
43336 diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
43337 index da6e936..1598dd0 100644
43338 --- a/fs/btrfs/check-integrity.c
43339 +++ b/fs/btrfs/check-integrity.c
43340 @@ -155,7 +155,7 @@ struct btrfsic_block {
43341 union {
43342 bio_end_io_t *bio;
43343 bh_end_io_t *bh;
43344 - } orig_bio_bh_end_io;
43345 + } __no_const orig_bio_bh_end_io;
43346 int submit_bio_bh_rw;
43347 u64 flush_gen; /* only valid if !never_written */
43348 };
43349 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
43350 index 8206b39..06d5654 100644
43351 --- a/fs/btrfs/ctree.c
43352 +++ b/fs/btrfs/ctree.c
43353 @@ -973,9 +973,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
43354 free_extent_buffer(buf);
43355 add_root_to_dirty_list(root);
43356 } else {
43357 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43358 - parent_start = parent->start;
43359 - else
43360 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43361 + if (parent)
43362 + parent_start = parent->start;
43363 + else
43364 + parent_start = 0;
43365 + } else
43366 parent_start = 0;
43367
43368 WARN_ON(trans->transid != btrfs_header_generation(parent));
43369 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
43370 index a7d1921..a32dba2 100644
43371 --- a/fs/btrfs/inode.c
43372 +++ b/fs/btrfs/inode.c
43373 @@ -7111,7 +7111,7 @@ fail:
43374 return -ENOMEM;
43375 }
43376
43377 -static int btrfs_getattr(struct vfsmount *mnt,
43378 +int btrfs_getattr(struct vfsmount *mnt,
43379 struct dentry *dentry, struct kstat *stat)
43380 {
43381 struct inode *inode = dentry->d_inode;
43382 @@ -7125,6 +7125,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
43383 return 0;
43384 }
43385
43386 +EXPORT_SYMBOL(btrfs_getattr);
43387 +
43388 +dev_t get_btrfs_dev_from_inode(struct inode *inode)
43389 +{
43390 + return BTRFS_I(inode)->root->anon_dev;
43391 +}
43392 +EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43393 +
43394 /*
43395 * If a file is moved, it will inherit the cow and compression flags of the new
43396 * directory.
43397 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
43398 index 0e92e57..8b560de 100644
43399 --- a/fs/btrfs/ioctl.c
43400 +++ b/fs/btrfs/ioctl.c
43401 @@ -2902,9 +2902,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43402 for (i = 0; i < num_types; i++) {
43403 struct btrfs_space_info *tmp;
43404
43405 + /* Don't copy in more than we allocated */
43406 if (!slot_count)
43407 break;
43408
43409 + slot_count--;
43410 +
43411 info = NULL;
43412 rcu_read_lock();
43413 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
43414 @@ -2926,10 +2929,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43415 memcpy(dest, &space, sizeof(space));
43416 dest++;
43417 space_args.total_spaces++;
43418 - slot_count--;
43419 }
43420 - if (!slot_count)
43421 - break;
43422 }
43423 up_read(&info->groups_sem);
43424 }
43425 diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
43426 index 646ee21..f020f87 100644
43427 --- a/fs/btrfs/relocation.c
43428 +++ b/fs/btrfs/relocation.c
43429 @@ -1268,7 +1268,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
43430 }
43431 spin_unlock(&rc->reloc_root_tree.lock);
43432
43433 - BUG_ON((struct btrfs_root *)node->data != root);
43434 + BUG_ON(!node || (struct btrfs_root *)node->data != root);
43435
43436 if (!del) {
43437 spin_lock(&rc->reloc_root_tree.lock);
43438 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
43439 index 622f469..e8d2d55 100644
43440 --- a/fs/cachefiles/bind.c
43441 +++ b/fs/cachefiles/bind.c
43442 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
43443 args);
43444
43445 /* start by checking things over */
43446 - ASSERT(cache->fstop_percent >= 0 &&
43447 - cache->fstop_percent < cache->fcull_percent &&
43448 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
43449 cache->fcull_percent < cache->frun_percent &&
43450 cache->frun_percent < 100);
43451
43452 - ASSERT(cache->bstop_percent >= 0 &&
43453 - cache->bstop_percent < cache->bcull_percent &&
43454 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
43455 cache->bcull_percent < cache->brun_percent &&
43456 cache->brun_percent < 100);
43457
43458 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
43459 index 0a1467b..6a53245 100644
43460 --- a/fs/cachefiles/daemon.c
43461 +++ b/fs/cachefiles/daemon.c
43462 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
43463 if (n > buflen)
43464 return -EMSGSIZE;
43465
43466 - if (copy_to_user(_buffer, buffer, n) != 0)
43467 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
43468 return -EFAULT;
43469
43470 return n;
43471 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
43472 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43473 return -EIO;
43474
43475 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
43476 + if (datalen > PAGE_SIZE - 1)
43477 return -EOPNOTSUPP;
43478
43479 /* drag the command string into the kernel so we can parse it */
43480 @@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
43481 if (args[0] != '%' || args[1] != '\0')
43482 return -EINVAL;
43483
43484 - if (fstop < 0 || fstop >= cache->fcull_percent)
43485 + if (fstop >= cache->fcull_percent)
43486 return cachefiles_daemon_range_error(cache, args);
43487
43488 cache->fstop_percent = fstop;
43489 @@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
43490 if (args[0] != '%' || args[1] != '\0')
43491 return -EINVAL;
43492
43493 - if (bstop < 0 || bstop >= cache->bcull_percent)
43494 + if (bstop >= cache->bcull_percent)
43495 return cachefiles_daemon_range_error(cache, args);
43496
43497 cache->bstop_percent = bstop;
43498 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
43499 index bd6bc1b..b627b53 100644
43500 --- a/fs/cachefiles/internal.h
43501 +++ b/fs/cachefiles/internal.h
43502 @@ -57,7 +57,7 @@ struct cachefiles_cache {
43503 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43504 struct rb_root active_nodes; /* active nodes (can't be culled) */
43505 rwlock_t active_lock; /* lock for active_nodes */
43506 - atomic_t gravecounter; /* graveyard uniquifier */
43507 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43508 unsigned frun_percent; /* when to stop culling (% files) */
43509 unsigned fcull_percent; /* when to start culling (% files) */
43510 unsigned fstop_percent; /* when to stop allocating (% files) */
43511 @@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
43512 * proc.c
43513 */
43514 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43515 -extern atomic_t cachefiles_lookup_histogram[HZ];
43516 -extern atomic_t cachefiles_mkdir_histogram[HZ];
43517 -extern atomic_t cachefiles_create_histogram[HZ];
43518 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43519 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43520 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43521
43522 extern int __init cachefiles_proc_init(void);
43523 extern void cachefiles_proc_cleanup(void);
43524 static inline
43525 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43526 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43527 {
43528 unsigned long jif = jiffies - start_jif;
43529 if (jif >= HZ)
43530 jif = HZ - 1;
43531 - atomic_inc(&histogram[jif]);
43532 + atomic_inc_unchecked(&histogram[jif]);
43533 }
43534
43535 #else
43536 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
43537 index 7f0771d..87d4f36 100644
43538 --- a/fs/cachefiles/namei.c
43539 +++ b/fs/cachefiles/namei.c
43540 @@ -318,7 +318,7 @@ try_again:
43541 /* first step is to make up a grave dentry in the graveyard */
43542 sprintf(nbuffer, "%08x%08x",
43543 (uint32_t) get_seconds(),
43544 - (uint32_t) atomic_inc_return(&cache->gravecounter));
43545 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43546
43547 /* do the multiway lock magic */
43548 trap = lock_rename(cache->graveyard, dir);
43549 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
43550 index eccd339..4c1d995 100644
43551 --- a/fs/cachefiles/proc.c
43552 +++ b/fs/cachefiles/proc.c
43553 @@ -14,9 +14,9 @@
43554 #include <linux/seq_file.h>
43555 #include "internal.h"
43556
43557 -atomic_t cachefiles_lookup_histogram[HZ];
43558 -atomic_t cachefiles_mkdir_histogram[HZ];
43559 -atomic_t cachefiles_create_histogram[HZ];
43560 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43561 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43562 +atomic_unchecked_t cachefiles_create_histogram[HZ];
43563
43564 /*
43565 * display the latency histogram
43566 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
43567 return 0;
43568 default:
43569 index = (unsigned long) v - 3;
43570 - x = atomic_read(&cachefiles_lookup_histogram[index]);
43571 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
43572 - z = atomic_read(&cachefiles_create_histogram[index]);
43573 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43574 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43575 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43576 if (x == 0 && y == 0 && z == 0)
43577 return 0;
43578
43579 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
43580 index 0e3c092..818480e 100644
43581 --- a/fs/cachefiles/rdwr.c
43582 +++ b/fs/cachefiles/rdwr.c
43583 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
43584 old_fs = get_fs();
43585 set_fs(KERNEL_DS);
43586 ret = file->f_op->write(
43587 - file, (const void __user *) data, len, &pos);
43588 + file, (const void __force_user *) data, len, &pos);
43589 set_fs(old_fs);
43590 kunmap(page);
43591 if (ret != len)
43592 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
43593 index 3e8094b..cb3ff3d 100644
43594 --- a/fs/ceph/dir.c
43595 +++ b/fs/ceph/dir.c
43596 @@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
43597 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
43598 struct ceph_mds_client *mdsc = fsc->mdsc;
43599 unsigned frag = fpos_frag(filp->f_pos);
43600 - int off = fpos_off(filp->f_pos);
43601 + unsigned int off = fpos_off(filp->f_pos);
43602 int err;
43603 u32 ftype;
43604 struct ceph_mds_reply_info_parsed *rinfo;
43605 @@ -598,7 +598,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
43606 if (nd &&
43607 (nd->flags & LOOKUP_OPEN) &&
43608 !(nd->intent.open.flags & O_CREAT)) {
43609 - int mode = nd->intent.open.create_mode & ~current->fs->umask;
43610 + int mode = nd->intent.open.create_mode & ~current_umask();
43611 return ceph_lookup_open(dir, dentry, nd, mode, 1);
43612 }
43613
43614 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
43615 index e814052..28dcdf7 100644
43616 --- a/fs/cifs/cifs_debug.c
43617 +++ b/fs/cifs/cifs_debug.c
43618 @@ -267,8 +267,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43619
43620 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
43621 #ifdef CONFIG_CIFS_STATS2
43622 - atomic_set(&totBufAllocCount, 0);
43623 - atomic_set(&totSmBufAllocCount, 0);
43624 + atomic_set_unchecked(&totBufAllocCount, 0);
43625 + atomic_set_unchecked(&totSmBufAllocCount, 0);
43626 #endif /* CONFIG_CIFS_STATS2 */
43627 spin_lock(&cifs_tcp_ses_lock);
43628 list_for_each(tmp1, &cifs_tcp_ses_list) {
43629 @@ -281,25 +281,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43630 tcon = list_entry(tmp3,
43631 struct cifs_tcon,
43632 tcon_list);
43633 - atomic_set(&tcon->num_smbs_sent, 0);
43634 - atomic_set(&tcon->num_writes, 0);
43635 - atomic_set(&tcon->num_reads, 0);
43636 - atomic_set(&tcon->num_oplock_brks, 0);
43637 - atomic_set(&tcon->num_opens, 0);
43638 - atomic_set(&tcon->num_posixopens, 0);
43639 - atomic_set(&tcon->num_posixmkdirs, 0);
43640 - atomic_set(&tcon->num_closes, 0);
43641 - atomic_set(&tcon->num_deletes, 0);
43642 - atomic_set(&tcon->num_mkdirs, 0);
43643 - atomic_set(&tcon->num_rmdirs, 0);
43644 - atomic_set(&tcon->num_renames, 0);
43645 - atomic_set(&tcon->num_t2renames, 0);
43646 - atomic_set(&tcon->num_ffirst, 0);
43647 - atomic_set(&tcon->num_fnext, 0);
43648 - atomic_set(&tcon->num_fclose, 0);
43649 - atomic_set(&tcon->num_hardlinks, 0);
43650 - atomic_set(&tcon->num_symlinks, 0);
43651 - atomic_set(&tcon->num_locks, 0);
43652 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43653 + atomic_set_unchecked(&tcon->num_writes, 0);
43654 + atomic_set_unchecked(&tcon->num_reads, 0);
43655 + atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43656 + atomic_set_unchecked(&tcon->num_opens, 0);
43657 + atomic_set_unchecked(&tcon->num_posixopens, 0);
43658 + atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43659 + atomic_set_unchecked(&tcon->num_closes, 0);
43660 + atomic_set_unchecked(&tcon->num_deletes, 0);
43661 + atomic_set_unchecked(&tcon->num_mkdirs, 0);
43662 + atomic_set_unchecked(&tcon->num_rmdirs, 0);
43663 + atomic_set_unchecked(&tcon->num_renames, 0);
43664 + atomic_set_unchecked(&tcon->num_t2renames, 0);
43665 + atomic_set_unchecked(&tcon->num_ffirst, 0);
43666 + atomic_set_unchecked(&tcon->num_fnext, 0);
43667 + atomic_set_unchecked(&tcon->num_fclose, 0);
43668 + atomic_set_unchecked(&tcon->num_hardlinks, 0);
43669 + atomic_set_unchecked(&tcon->num_symlinks, 0);
43670 + atomic_set_unchecked(&tcon->num_locks, 0);
43671 }
43672 }
43673 }
43674 @@ -329,8 +329,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43675 smBufAllocCount.counter, cifs_min_small);
43676 #ifdef CONFIG_CIFS_STATS2
43677 seq_printf(m, "Total Large %d Small %d Allocations\n",
43678 - atomic_read(&totBufAllocCount),
43679 - atomic_read(&totSmBufAllocCount));
43680 + atomic_read_unchecked(&totBufAllocCount),
43681 + atomic_read_unchecked(&totSmBufAllocCount));
43682 #endif /* CONFIG_CIFS_STATS2 */
43683
43684 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
43685 @@ -359,41 +359,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43686 if (tcon->need_reconnect)
43687 seq_puts(m, "\tDISCONNECTED ");
43688 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43689 - atomic_read(&tcon->num_smbs_sent),
43690 - atomic_read(&tcon->num_oplock_brks));
43691 + atomic_read_unchecked(&tcon->num_smbs_sent),
43692 + atomic_read_unchecked(&tcon->num_oplock_brks));
43693 seq_printf(m, "\nReads: %d Bytes: %lld",
43694 - atomic_read(&tcon->num_reads),
43695 + atomic_read_unchecked(&tcon->num_reads),
43696 (long long)(tcon->bytes_read));
43697 seq_printf(m, "\nWrites: %d Bytes: %lld",
43698 - atomic_read(&tcon->num_writes),
43699 + atomic_read_unchecked(&tcon->num_writes),
43700 (long long)(tcon->bytes_written));
43701 seq_printf(m, "\nFlushes: %d",
43702 - atomic_read(&tcon->num_flushes));
43703 + atomic_read_unchecked(&tcon->num_flushes));
43704 seq_printf(m, "\nLocks: %d HardLinks: %d "
43705 "Symlinks: %d",
43706 - atomic_read(&tcon->num_locks),
43707 - atomic_read(&tcon->num_hardlinks),
43708 - atomic_read(&tcon->num_symlinks));
43709 + atomic_read_unchecked(&tcon->num_locks),
43710 + atomic_read_unchecked(&tcon->num_hardlinks),
43711 + atomic_read_unchecked(&tcon->num_symlinks));
43712 seq_printf(m, "\nOpens: %d Closes: %d "
43713 "Deletes: %d",
43714 - atomic_read(&tcon->num_opens),
43715 - atomic_read(&tcon->num_closes),
43716 - atomic_read(&tcon->num_deletes));
43717 + atomic_read_unchecked(&tcon->num_opens),
43718 + atomic_read_unchecked(&tcon->num_closes),
43719 + atomic_read_unchecked(&tcon->num_deletes));
43720 seq_printf(m, "\nPosix Opens: %d "
43721 "Posix Mkdirs: %d",
43722 - atomic_read(&tcon->num_posixopens),
43723 - atomic_read(&tcon->num_posixmkdirs));
43724 + atomic_read_unchecked(&tcon->num_posixopens),
43725 + atomic_read_unchecked(&tcon->num_posixmkdirs));
43726 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43727 - atomic_read(&tcon->num_mkdirs),
43728 - atomic_read(&tcon->num_rmdirs));
43729 + atomic_read_unchecked(&tcon->num_mkdirs),
43730 + atomic_read_unchecked(&tcon->num_rmdirs));
43731 seq_printf(m, "\nRenames: %d T2 Renames %d",
43732 - atomic_read(&tcon->num_renames),
43733 - atomic_read(&tcon->num_t2renames));
43734 + atomic_read_unchecked(&tcon->num_renames),
43735 + atomic_read_unchecked(&tcon->num_t2renames));
43736 seq_printf(m, "\nFindFirst: %d FNext %d "
43737 "FClose %d",
43738 - atomic_read(&tcon->num_ffirst),
43739 - atomic_read(&tcon->num_fnext),
43740 - atomic_read(&tcon->num_fclose));
43741 + atomic_read_unchecked(&tcon->num_ffirst),
43742 + atomic_read_unchecked(&tcon->num_fnext),
43743 + atomic_read_unchecked(&tcon->num_fclose));
43744 }
43745 }
43746 }
43747 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
43748 index 8b6e344..303a662 100644
43749 --- a/fs/cifs/cifsfs.c
43750 +++ b/fs/cifs/cifsfs.c
43751 @@ -994,7 +994,7 @@ cifs_init_request_bufs(void)
43752 cifs_req_cachep = kmem_cache_create("cifs_request",
43753 CIFSMaxBufSize +
43754 MAX_CIFS_HDR_SIZE, 0,
43755 - SLAB_HWCACHE_ALIGN, NULL);
43756 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43757 if (cifs_req_cachep == NULL)
43758 return -ENOMEM;
43759
43760 @@ -1021,7 +1021,7 @@ cifs_init_request_bufs(void)
43761 efficient to alloc 1 per page off the slab compared to 17K (5page)
43762 alloc of large cifs buffers even when page debugging is on */
43763 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43764 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43765 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43766 NULL);
43767 if (cifs_sm_req_cachep == NULL) {
43768 mempool_destroy(cifs_req_poolp);
43769 @@ -1106,8 +1106,8 @@ init_cifs(void)
43770 atomic_set(&bufAllocCount, 0);
43771 atomic_set(&smBufAllocCount, 0);
43772 #ifdef CONFIG_CIFS_STATS2
43773 - atomic_set(&totBufAllocCount, 0);
43774 - atomic_set(&totSmBufAllocCount, 0);
43775 + atomic_set_unchecked(&totBufAllocCount, 0);
43776 + atomic_set_unchecked(&totSmBufAllocCount, 0);
43777 #endif /* CONFIG_CIFS_STATS2 */
43778
43779 atomic_set(&midCount, 0);
43780 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
43781 index d86ba9f..e80049d 100644
43782 --- a/fs/cifs/cifsglob.h
43783 +++ b/fs/cifs/cifsglob.h
43784 @@ -491,28 +491,28 @@ struct cifs_tcon {
43785 __u16 Flags; /* optional support bits */
43786 enum statusEnum tidStatus;
43787 #ifdef CONFIG_CIFS_STATS
43788 - atomic_t num_smbs_sent;
43789 - atomic_t num_writes;
43790 - atomic_t num_reads;
43791 - atomic_t num_flushes;
43792 - atomic_t num_oplock_brks;
43793 - atomic_t num_opens;
43794 - atomic_t num_closes;
43795 - atomic_t num_deletes;
43796 - atomic_t num_mkdirs;
43797 - atomic_t num_posixopens;
43798 - atomic_t num_posixmkdirs;
43799 - atomic_t num_rmdirs;
43800 - atomic_t num_renames;
43801 - atomic_t num_t2renames;
43802 - atomic_t num_ffirst;
43803 - atomic_t num_fnext;
43804 - atomic_t num_fclose;
43805 - atomic_t num_hardlinks;
43806 - atomic_t num_symlinks;
43807 - atomic_t num_locks;
43808 - atomic_t num_acl_get;
43809 - atomic_t num_acl_set;
43810 + atomic_unchecked_t num_smbs_sent;
43811 + atomic_unchecked_t num_writes;
43812 + atomic_unchecked_t num_reads;
43813 + atomic_unchecked_t num_flushes;
43814 + atomic_unchecked_t num_oplock_brks;
43815 + atomic_unchecked_t num_opens;
43816 + atomic_unchecked_t num_closes;
43817 + atomic_unchecked_t num_deletes;
43818 + atomic_unchecked_t num_mkdirs;
43819 + atomic_unchecked_t num_posixopens;
43820 + atomic_unchecked_t num_posixmkdirs;
43821 + atomic_unchecked_t num_rmdirs;
43822 + atomic_unchecked_t num_renames;
43823 + atomic_unchecked_t num_t2renames;
43824 + atomic_unchecked_t num_ffirst;
43825 + atomic_unchecked_t num_fnext;
43826 + atomic_unchecked_t num_fclose;
43827 + atomic_unchecked_t num_hardlinks;
43828 + atomic_unchecked_t num_symlinks;
43829 + atomic_unchecked_t num_locks;
43830 + atomic_unchecked_t num_acl_get;
43831 + atomic_unchecked_t num_acl_set;
43832 #ifdef CONFIG_CIFS_STATS2
43833 unsigned long long time_writes;
43834 unsigned long long time_reads;
43835 @@ -735,7 +735,7 @@ convert_delimiter(char *path, char delim)
43836 }
43837
43838 #ifdef CONFIG_CIFS_STATS
43839 -#define cifs_stats_inc atomic_inc
43840 +#define cifs_stats_inc atomic_inc_unchecked
43841
43842 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
43843 unsigned int bytes)
43844 @@ -1093,8 +1093,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
43845 /* Various Debug counters */
43846 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43847 #ifdef CONFIG_CIFS_STATS2
43848 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43849 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43850 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43851 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43852 #endif
43853 GLOBAL_EXTERN atomic_t smBufAllocCount;
43854 GLOBAL_EXTERN atomic_t midCount;
43855 diff --git a/fs/cifs/link.c b/fs/cifs/link.c
43856 index 6b0e064..94e6c3c 100644
43857 --- a/fs/cifs/link.c
43858 +++ b/fs/cifs/link.c
43859 @@ -600,7 +600,7 @@ symlink_exit:
43860
43861 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43862 {
43863 - char *p = nd_get_link(nd);
43864 + const char *p = nd_get_link(nd);
43865 if (!IS_ERR(p))
43866 kfree(p);
43867 }
43868 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
43869 index 557506a..2fd3816 100644
43870 --- a/fs/cifs/misc.c
43871 +++ b/fs/cifs/misc.c
43872 @@ -156,7 +156,7 @@ cifs_buf_get(void)
43873 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43874 atomic_inc(&bufAllocCount);
43875 #ifdef CONFIG_CIFS_STATS2
43876 - atomic_inc(&totBufAllocCount);
43877 + atomic_inc_unchecked(&totBufAllocCount);
43878 #endif /* CONFIG_CIFS_STATS2 */
43879 }
43880
43881 @@ -191,7 +191,7 @@ cifs_small_buf_get(void)
43882 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43883 atomic_inc(&smBufAllocCount);
43884 #ifdef CONFIG_CIFS_STATS2
43885 - atomic_inc(&totSmBufAllocCount);
43886 + atomic_inc_unchecked(&totSmBufAllocCount);
43887 #endif /* CONFIG_CIFS_STATS2 */
43888
43889 }
43890 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
43891 index 6901578..d402eb5 100644
43892 --- a/fs/coda/cache.c
43893 +++ b/fs/coda/cache.c
43894 @@ -24,7 +24,7 @@
43895 #include "coda_linux.h"
43896 #include "coda_cache.h"
43897
43898 -static atomic_t permission_epoch = ATOMIC_INIT(0);
43899 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43900
43901 /* replace or extend an acl cache hit */
43902 void coda_cache_enter(struct inode *inode, int mask)
43903 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
43904 struct coda_inode_info *cii = ITOC(inode);
43905
43906 spin_lock(&cii->c_lock);
43907 - cii->c_cached_epoch = atomic_read(&permission_epoch);
43908 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43909 if (cii->c_uid != current_fsuid()) {
43910 cii->c_uid = current_fsuid();
43911 cii->c_cached_perm = mask;
43912 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
43913 {
43914 struct coda_inode_info *cii = ITOC(inode);
43915 spin_lock(&cii->c_lock);
43916 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43917 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43918 spin_unlock(&cii->c_lock);
43919 }
43920
43921 /* remove all acl caches */
43922 void coda_cache_clear_all(struct super_block *sb)
43923 {
43924 - atomic_inc(&permission_epoch);
43925 + atomic_inc_unchecked(&permission_epoch);
43926 }
43927
43928
43929 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
43930 spin_lock(&cii->c_lock);
43931 hit = (mask & cii->c_cached_perm) == mask &&
43932 cii->c_uid == current_fsuid() &&
43933 - cii->c_cached_epoch == atomic_read(&permission_epoch);
43934 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43935 spin_unlock(&cii->c_lock);
43936
43937 return hit;
43938 diff --git a/fs/compat.c b/fs/compat.c
43939 index 6161255..9f28287 100644
43940 --- a/fs/compat.c
43941 +++ b/fs/compat.c
43942 @@ -490,7 +490,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
43943
43944 set_fs(KERNEL_DS);
43945 /* The __user pointer cast is valid because of the set_fs() */
43946 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
43947 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
43948 set_fs(oldfs);
43949 /* truncating is ok because it's a user address */
43950 if (!ret)
43951 @@ -548,7 +548,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
43952 goto out;
43953
43954 ret = -EINVAL;
43955 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
43956 + if (nr_segs > UIO_MAXIOV)
43957 goto out;
43958 if (nr_segs > fast_segs) {
43959 ret = -ENOMEM;
43960 @@ -831,6 +831,7 @@ struct compat_old_linux_dirent {
43961
43962 struct compat_readdir_callback {
43963 struct compat_old_linux_dirent __user *dirent;
43964 + struct file * file;
43965 int result;
43966 };
43967
43968 @@ -848,6 +849,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
43969 buf->result = -EOVERFLOW;
43970 return -EOVERFLOW;
43971 }
43972 +
43973 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43974 + return 0;
43975 +
43976 buf->result++;
43977 dirent = buf->dirent;
43978 if (!access_ok(VERIFY_WRITE, dirent,
43979 @@ -880,6 +885,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
43980
43981 buf.result = 0;
43982 buf.dirent = dirent;
43983 + buf.file = file;
43984
43985 error = vfs_readdir(file, compat_fillonedir, &buf);
43986 if (buf.result)
43987 @@ -899,6 +905,7 @@ struct compat_linux_dirent {
43988 struct compat_getdents_callback {
43989 struct compat_linux_dirent __user *current_dir;
43990 struct compat_linux_dirent __user *previous;
43991 + struct file * file;
43992 int count;
43993 int error;
43994 };
43995 @@ -920,6 +927,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
43996 buf->error = -EOVERFLOW;
43997 return -EOVERFLOW;
43998 }
43999 +
44000 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44001 + return 0;
44002 +
44003 dirent = buf->previous;
44004 if (dirent) {
44005 if (__put_user(offset, &dirent->d_off))
44006 @@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
44007 buf.previous = NULL;
44008 buf.count = count;
44009 buf.error = 0;
44010 + buf.file = file;
44011
44012 error = vfs_readdir(file, compat_filldir, &buf);
44013 if (error >= 0)
44014 @@ -986,6 +998,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
44015 struct compat_getdents_callback64 {
44016 struct linux_dirent64 __user *current_dir;
44017 struct linux_dirent64 __user *previous;
44018 + struct file * file;
44019 int count;
44020 int error;
44021 };
44022 @@ -1002,6 +1015,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
44023 buf->error = -EINVAL; /* only used if we fail.. */
44024 if (reclen > buf->count)
44025 return -EINVAL;
44026 +
44027 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44028 + return 0;
44029 +
44030 dirent = buf->previous;
44031
44032 if (dirent) {
44033 @@ -1052,13 +1069,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
44034 buf.previous = NULL;
44035 buf.count = count;
44036 buf.error = 0;
44037 + buf.file = file;
44038
44039 error = vfs_readdir(file, compat_filldir64, &buf);
44040 if (error >= 0)
44041 error = buf.error;
44042 lastdirent = buf.previous;
44043 if (lastdirent) {
44044 - typeof(lastdirent->d_off) d_off = file->f_pos;
44045 + typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
44046 if (__put_user_unaligned(d_off, &lastdirent->d_off))
44047 error = -EFAULT;
44048 else
44049 @@ -1155,11 +1173,14 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,
44050 struct file *file;
44051 int fput_needed;
44052 ssize_t ret;
44053 + loff_t pos;
44054
44055 file = fget_light(fd, &fput_needed);
44056 if (!file)
44057 return -EBADF;
44058 - ret = compat_readv(file, vec, vlen, &file->f_pos);
44059 + pos = file->f_pos;
44060 + ret = compat_readv(file, vec, vlen, &pos);
44061 + file->f_pos = pos;
44062 fput_light(file, fput_needed);
44063 return ret;
44064 }
44065 @@ -1221,11 +1242,14 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,
44066 struct file *file;
44067 int fput_needed;
44068 ssize_t ret;
44069 + loff_t pos;
44070
44071 file = fget_light(fd, &fput_needed);
44072 if (!file)
44073 return -EBADF;
44074 - ret = compat_writev(file, vec, vlen, &file->f_pos);
44075 + pos = file->f_pos;
44076 + ret = compat_writev(file, vec, vlen, &pos);
44077 + file->f_pos = pos;
44078 fput_light(file, fput_needed);
44079 return ret;
44080 }
44081 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
44082 index 112e45a..b59845b 100644
44083 --- a/fs/compat_binfmt_elf.c
44084 +++ b/fs/compat_binfmt_elf.c
44085 @@ -30,11 +30,13 @@
44086 #undef elf_phdr
44087 #undef elf_shdr
44088 #undef elf_note
44089 +#undef elf_dyn
44090 #undef elf_addr_t
44091 #define elfhdr elf32_hdr
44092 #define elf_phdr elf32_phdr
44093 #define elf_shdr elf32_shdr
44094 #define elf_note elf32_note
44095 +#define elf_dyn Elf32_Dyn
44096 #define elf_addr_t Elf32_Addr
44097
44098 /*
44099 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
44100 index debdfe0..75d31d4 100644
44101 --- a/fs/compat_ioctl.c
44102 +++ b/fs/compat_ioctl.c
44103 @@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
44104
44105 err = get_user(palp, &up->palette);
44106 err |= get_user(length, &up->length);
44107 + if (err)
44108 + return -EFAULT;
44109
44110 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
44111 err = put_user(compat_ptr(palp), &up_native->palette);
44112 @@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
44113 return -EFAULT;
44114 if (__get_user(udata, &ss32->iomem_base))
44115 return -EFAULT;
44116 - ss.iomem_base = compat_ptr(udata);
44117 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
44118 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
44119 __get_user(ss.port_high, &ss32->port_high))
44120 return -EFAULT;
44121 @@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
44122 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
44123 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
44124 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
44125 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44126 + copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
44127 return -EFAULT;
44128
44129 return ioctl_preallocate(file, p);
44130 @@ -1610,8 +1612,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
44131 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
44132 {
44133 unsigned int a, b;
44134 - a = *(unsigned int *)p;
44135 - b = *(unsigned int *)q;
44136 + a = *(const unsigned int *)p;
44137 + b = *(const unsigned int *)q;
44138 if (a > b)
44139 return 1;
44140 if (a < b)
44141 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
44142 index 7e6c52d..94bc756 100644
44143 --- a/fs/configfs/dir.c
44144 +++ b/fs/configfs/dir.c
44145 @@ -1564,7 +1564,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
44146 }
44147 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
44148 struct configfs_dirent *next;
44149 - const char * name;
44150 + const unsigned char * name;
44151 + char d_name[sizeof(next->s_dentry->d_iname)];
44152 int len;
44153 struct inode *inode = NULL;
44154
44155 @@ -1574,7 +1575,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
44156 continue;
44157
44158 name = configfs_get_name(next);
44159 - len = strlen(name);
44160 + if (next->s_dentry && name == next->s_dentry->d_iname) {
44161 + len = next->s_dentry->d_name.len;
44162 + memcpy(d_name, name, len);
44163 + name = d_name;
44164 + } else
44165 + len = strlen(name);
44166
44167 /*
44168 * We'll have a dentry and an inode for
44169 diff --git a/fs/dcache.c b/fs/dcache.c
44170 index 4046904..5e31505 100644
44171 --- a/fs/dcache.c
44172 +++ b/fs/dcache.c
44173 @@ -3154,7 +3154,7 @@ void __init vfs_caches_init(unsigned long mempages)
44174 mempages -= reserve;
44175
44176 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
44177 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
44178 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
44179
44180 dcache_init();
44181 inode_init();
44182 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
44183 index b80bc84..0d46d1a 100644
44184 --- a/fs/debugfs/inode.c
44185 +++ b/fs/debugfs/inode.c
44186 @@ -408,7 +408,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
44187 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
44188 {
44189 return debugfs_create_file(name,
44190 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
44191 + S_IFDIR | S_IRWXU,
44192 +#else
44193 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
44194 +#endif
44195 parent, NULL, NULL);
44196 }
44197 EXPORT_SYMBOL_GPL(debugfs_create_dir);
44198 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
44199 index a07441a..046fc0d 100644
44200 --- a/fs/ecryptfs/inode.c
44201 +++ b/fs/ecryptfs/inode.c
44202 @@ -671,7 +671,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
44203 old_fs = get_fs();
44204 set_fs(get_ds());
44205 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
44206 - (char __user *)lower_buf,
44207 + (char __force_user *)lower_buf,
44208 PATH_MAX);
44209 set_fs(old_fs);
44210 if (rc < 0)
44211 @@ -703,7 +703,7 @@ out:
44212 static void
44213 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
44214 {
44215 - char *buf = nd_get_link(nd);
44216 + const char *buf = nd_get_link(nd);
44217 if (!IS_ERR(buf)) {
44218 /* Free the char* */
44219 kfree(buf);
44220 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
44221 index c0038f6..47ab347 100644
44222 --- a/fs/ecryptfs/miscdev.c
44223 +++ b/fs/ecryptfs/miscdev.c
44224 @@ -355,7 +355,7 @@ check_list:
44225 goto out_unlock_msg_ctx;
44226 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
44227 if (msg_ctx->msg) {
44228 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
44229 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
44230 goto out_unlock_msg_ctx;
44231 i += packet_length_size;
44232 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
44233 diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
44234 index b2a34a1..162fa69 100644
44235 --- a/fs/ecryptfs/read_write.c
44236 +++ b/fs/ecryptfs/read_write.c
44237 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
44238 return -EIO;
44239 fs_save = get_fs();
44240 set_fs(get_ds());
44241 - rc = vfs_write(lower_file, data, size, &offset);
44242 + rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
44243 set_fs(fs_save);
44244 mark_inode_dirty_sync(ecryptfs_inode);
44245 return rc;
44246 @@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
44247 return -EIO;
44248 fs_save = get_fs();
44249 set_fs(get_ds());
44250 - rc = vfs_read(lower_file, data, size, &offset);
44251 + rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
44252 set_fs(fs_save);
44253 return rc;
44254 }
44255 diff --git a/fs/eventpoll.c b/fs/eventpoll.c
44256 index 1c8b556..eedec84 100644
44257 --- a/fs/eventpoll.c
44258 +++ b/fs/eventpoll.c
44259 @@ -1654,8 +1654,8 @@ SYSCALL_DEFINE1(epoll_create1, int, flags)
44260 error = PTR_ERR(file);
44261 goto out_free_fd;
44262 }
44263 - fd_install(fd, file);
44264 ep->file = file;
44265 + fd_install(fd, file);
44266 return fd;
44267
44268 out_free_fd:
44269 diff --git a/fs/exec.c b/fs/exec.c
44270 index e95aeed..a943469 100644
44271 --- a/fs/exec.c
44272 +++ b/fs/exec.c
44273 @@ -55,6 +55,15 @@
44274 #include <linux/pipe_fs_i.h>
44275 #include <linux/oom.h>
44276 #include <linux/compat.h>
44277 +#include <linux/random.h>
44278 +#include <linux/seq_file.h>
44279 +
44280 +#ifdef CONFIG_PAX_REFCOUNT
44281 +#include <linux/kallsyms.h>
44282 +#include <linux/kdebug.h>
44283 +#endif
44284 +
44285 +#include <trace/events/fs.h>
44286
44287 #include <asm/uaccess.h>
44288 #include <asm/mmu_context.h>
44289 @@ -66,6 +75,18 @@
44290
44291 #include <trace/events/sched.h>
44292
44293 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
44294 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
44295 +{
44296 + WARN_ONCE(1, "PAX: PAX_HAVE_ACL_FLAGS was enabled without providing the pax_set_initial_flags callback, this is probably not what you wanted.\n");
44297 +}
44298 +#endif
44299 +
44300 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
44301 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
44302 +EXPORT_SYMBOL(pax_set_initial_flags_func);
44303 +#endif
44304 +
44305 int core_uses_pid;
44306 char core_pattern[CORENAME_MAX_SIZE] = "core";
44307 unsigned int core_pipe_limit;
44308 @@ -75,7 +96,7 @@ struct core_name {
44309 char *corename;
44310 int used, size;
44311 };
44312 -static atomic_t call_count = ATOMIC_INIT(1);
44313 +static atomic_unchecked_t call_count = ATOMIC_INIT(1);
44314
44315 /* The maximal length of core_pattern is also specified in sysctl.c */
44316
44317 @@ -191,18 +212,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44318 int write)
44319 {
44320 struct page *page;
44321 - int ret;
44322
44323 -#ifdef CONFIG_STACK_GROWSUP
44324 - if (write) {
44325 - ret = expand_downwards(bprm->vma, pos);
44326 - if (ret < 0)
44327 - return NULL;
44328 - }
44329 -#endif
44330 - ret = get_user_pages(current, bprm->mm, pos,
44331 - 1, write, 1, &page, NULL);
44332 - if (ret <= 0)
44333 + if (0 > expand_downwards(bprm->vma, pos))
44334 + return NULL;
44335 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44336 return NULL;
44337
44338 if (write) {
44339 @@ -218,6 +231,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44340 if (size <= ARG_MAX)
44341 return page;
44342
44343 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44344 + // only allow 512KB for argv+env on suid/sgid binaries
44345 + // to prevent easy ASLR exhaustion
44346 + if (((bprm->cred->euid != current_euid()) ||
44347 + (bprm->cred->egid != current_egid())) &&
44348 + (size > (512 * 1024))) {
44349 + put_page(page);
44350 + return NULL;
44351 + }
44352 +#endif
44353 +
44354 /*
44355 * Limit to 1/4-th the stack size for the argv+env strings.
44356 * This ensures that:
44357 @@ -277,6 +301,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44358 vma->vm_end = STACK_TOP_MAX;
44359 vma->vm_start = vma->vm_end - PAGE_SIZE;
44360 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
44361 +
44362 +#ifdef CONFIG_PAX_SEGMEXEC
44363 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44364 +#endif
44365 +
44366 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44367 INIT_LIST_HEAD(&vma->anon_vma_chain);
44368
44369 @@ -287,6 +316,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44370 mm->stack_vm = mm->total_vm = 1;
44371 up_write(&mm->mmap_sem);
44372 bprm->p = vma->vm_end - sizeof(void *);
44373 +
44374 +#ifdef CONFIG_PAX_RANDUSTACK
44375 + if (randomize_va_space)
44376 + bprm->p ^= random32() & ~PAGE_MASK;
44377 +#endif
44378 +
44379 return 0;
44380 err:
44381 up_write(&mm->mmap_sem);
44382 @@ -395,19 +430,7 @@ err:
44383 return err;
44384 }
44385
44386 -struct user_arg_ptr {
44387 -#ifdef CONFIG_COMPAT
44388 - bool is_compat;
44389 -#endif
44390 - union {
44391 - const char __user *const __user *native;
44392 -#ifdef CONFIG_COMPAT
44393 - compat_uptr_t __user *compat;
44394 -#endif
44395 - } ptr;
44396 -};
44397 -
44398 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44399 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44400 {
44401 const char __user *native;
44402
44403 @@ -416,14 +439,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44404 compat_uptr_t compat;
44405
44406 if (get_user(compat, argv.ptr.compat + nr))
44407 - return ERR_PTR(-EFAULT);
44408 + return (const char __force_user *)ERR_PTR(-EFAULT);
44409
44410 return compat_ptr(compat);
44411 }
44412 #endif
44413
44414 if (get_user(native, argv.ptr.native + nr))
44415 - return ERR_PTR(-EFAULT);
44416 + return (const char __force_user *)ERR_PTR(-EFAULT);
44417
44418 return native;
44419 }
44420 @@ -442,7 +465,7 @@ static int count(struct user_arg_ptr argv, int max)
44421 if (!p)
44422 break;
44423
44424 - if (IS_ERR(p))
44425 + if (IS_ERR((const char __force_kernel *)p))
44426 return -EFAULT;
44427
44428 if (i++ >= max)
44429 @@ -476,7 +499,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
44430
44431 ret = -EFAULT;
44432 str = get_user_arg_ptr(argv, argc);
44433 - if (IS_ERR(str))
44434 + if (IS_ERR((const char __force_kernel *)str))
44435 goto out;
44436
44437 len = strnlen_user(str, MAX_ARG_STRLEN);
44438 @@ -558,7 +581,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
44439 int r;
44440 mm_segment_t oldfs = get_fs();
44441 struct user_arg_ptr argv = {
44442 - .ptr.native = (const char __user *const __user *)__argv,
44443 + .ptr.native = (const char __force_user *const __force_user *)__argv,
44444 };
44445
44446 set_fs(KERNEL_DS);
44447 @@ -593,7 +616,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44448 unsigned long new_end = old_end - shift;
44449 struct mmu_gather tlb;
44450
44451 - BUG_ON(new_start > new_end);
44452 + if (new_start >= new_end || new_start < mmap_min_addr)
44453 + return -ENOMEM;
44454
44455 /*
44456 * ensure there are no vmas between where we want to go
44457 @@ -602,6 +626,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44458 if (vma != find_vma(mm, new_start))
44459 return -EFAULT;
44460
44461 +#ifdef CONFIG_PAX_SEGMEXEC
44462 + BUG_ON(pax_find_mirror_vma(vma));
44463 +#endif
44464 +
44465 /*
44466 * cover the whole range: [new_start, old_end)
44467 */
44468 @@ -682,10 +710,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44469 stack_top = arch_align_stack(stack_top);
44470 stack_top = PAGE_ALIGN(stack_top);
44471
44472 - if (unlikely(stack_top < mmap_min_addr) ||
44473 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44474 - return -ENOMEM;
44475 -
44476 stack_shift = vma->vm_end - stack_top;
44477
44478 bprm->p -= stack_shift;
44479 @@ -697,8 +721,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
44480 bprm->exec -= stack_shift;
44481
44482 down_write(&mm->mmap_sem);
44483 +
44484 + /* Move stack pages down in memory. */
44485 + if (stack_shift) {
44486 + ret = shift_arg_pages(vma, stack_shift);
44487 + if (ret)
44488 + goto out_unlock;
44489 + }
44490 +
44491 vm_flags = VM_STACK_FLAGS;
44492
44493 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44494 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44495 + vm_flags &= ~VM_EXEC;
44496 +
44497 +#ifdef CONFIG_PAX_MPROTECT
44498 + if (mm->pax_flags & MF_PAX_MPROTECT)
44499 + vm_flags &= ~VM_MAYEXEC;
44500 +#endif
44501 +
44502 + }
44503 +#endif
44504 +
44505 /*
44506 * Adjust stack execute permissions; explicitly enable for
44507 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
44508 @@ -717,13 +761,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44509 goto out_unlock;
44510 BUG_ON(prev != vma);
44511
44512 - /* Move stack pages down in memory. */
44513 - if (stack_shift) {
44514 - ret = shift_arg_pages(vma, stack_shift);
44515 - if (ret)
44516 - goto out_unlock;
44517 - }
44518 -
44519 /* mprotect_fixup is overkill to remove the temporary stack flags */
44520 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
44521
44522 @@ -781,6 +818,8 @@ struct file *open_exec(const char *name)
44523
44524 fsnotify_open(file);
44525
44526 + trace_open_exec(name);
44527 +
44528 err = deny_write_access(file);
44529 if (err)
44530 goto exit;
44531 @@ -804,7 +843,7 @@ int kernel_read(struct file *file, loff_t offset,
44532 old_fs = get_fs();
44533 set_fs(get_ds());
44534 /* The cast to a user pointer is valid due to the set_fs() */
44535 - result = vfs_read(file, (void __user *)addr, count, &pos);
44536 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
44537 set_fs(old_fs);
44538 return result;
44539 }
44540 @@ -1257,7 +1296,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
44541 }
44542 rcu_read_unlock();
44543
44544 - if (p->fs->users > n_fs) {
44545 + if (atomic_read(&p->fs->users) > n_fs) {
44546 bprm->unsafe |= LSM_UNSAFE_SHARE;
44547 } else {
44548 res = -EAGAIN;
44549 @@ -1460,6 +1499,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
44550
44551 EXPORT_SYMBOL(search_binary_handler);
44552
44553 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44554 +static DEFINE_PER_CPU(u64, exec_counter);
44555 +static int __init init_exec_counters(void)
44556 +{
44557 + unsigned int cpu;
44558 +
44559 + for_each_possible_cpu(cpu) {
44560 + per_cpu(exec_counter, cpu) = (u64)cpu;
44561 + }
44562 +
44563 + return 0;
44564 +}
44565 +early_initcall(init_exec_counters);
44566 +static inline void increment_exec_counter(void)
44567 +{
44568 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
44569 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
44570 +}
44571 +#else
44572 +static inline void increment_exec_counter(void) {}
44573 +#endif
44574 +
44575 /*
44576 * sys_execve() executes a new program.
44577 */
44578 @@ -1468,6 +1529,11 @@ static int do_execve_common(const char *filename,
44579 struct user_arg_ptr envp,
44580 struct pt_regs *regs)
44581 {
44582 +#ifdef CONFIG_GRKERNSEC
44583 + struct file *old_exec_file;
44584 + struct acl_subject_label *old_acl;
44585 + struct rlimit old_rlim[RLIM_NLIMITS];
44586 +#endif
44587 struct linux_binprm *bprm;
44588 struct file *file;
44589 struct files_struct *displaced;
44590 @@ -1475,6 +1541,8 @@ static int do_execve_common(const char *filename,
44591 int retval;
44592 const struct cred *cred = current_cred();
44593
44594 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44595 +
44596 /*
44597 * We move the actual failure in case of RLIMIT_NPROC excess from
44598 * set*uid() to execve() because too many poorly written programs
44599 @@ -1515,12 +1583,27 @@ static int do_execve_common(const char *filename,
44600 if (IS_ERR(file))
44601 goto out_unmark;
44602
44603 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
44604 + retval = -EPERM;
44605 + goto out_file;
44606 + }
44607 +
44608 sched_exec();
44609
44610 bprm->file = file;
44611 bprm->filename = filename;
44612 bprm->interp = filename;
44613
44614 + if (gr_process_user_ban()) {
44615 + retval = -EPERM;
44616 + goto out_file;
44617 + }
44618 +
44619 + if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44620 + retval = -EACCES;
44621 + goto out_file;
44622 + }
44623 +
44624 retval = bprm_mm_init(bprm);
44625 if (retval)
44626 goto out_file;
44627 @@ -1537,24 +1620,65 @@ static int do_execve_common(const char *filename,
44628 if (retval < 0)
44629 goto out;
44630
44631 +#ifdef CONFIG_GRKERNSEC
44632 + old_acl = current->acl;
44633 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44634 + old_exec_file = current->exec_file;
44635 + get_file(file);
44636 + current->exec_file = file;
44637 +#endif
44638 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44639 + /* limit suid stack to 8MB
44640 + we saved the old limits above and will restore them if this exec fails
44641 + */
44642 + if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
44643 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
44644 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
44645 +#endif
44646 +
44647 + if (!gr_tpe_allow(file)) {
44648 + retval = -EACCES;
44649 + goto out_fail;
44650 + }
44651 +
44652 + if (gr_check_crash_exec(file)) {
44653 + retval = -EACCES;
44654 + goto out_fail;
44655 + }
44656 +
44657 + retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44658 + bprm->unsafe);
44659 + if (retval < 0)
44660 + goto out_fail;
44661 +
44662 retval = copy_strings_kernel(1, &bprm->filename, bprm);
44663 if (retval < 0)
44664 - goto out;
44665 + goto out_fail;
44666
44667 bprm->exec = bprm->p;
44668 retval = copy_strings(bprm->envc, envp, bprm);
44669 if (retval < 0)
44670 - goto out;
44671 + goto out_fail;
44672
44673 retval = copy_strings(bprm->argc, argv, bprm);
44674 if (retval < 0)
44675 - goto out;
44676 + goto out_fail;
44677 +
44678 + gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44679 +
44680 + gr_handle_exec_args(bprm, argv);
44681
44682 retval = search_binary_handler(bprm,regs);
44683 if (retval < 0)
44684 - goto out;
44685 + goto out_fail;
44686 +#ifdef CONFIG_GRKERNSEC
44687 + if (old_exec_file)
44688 + fput(old_exec_file);
44689 +#endif
44690
44691 /* execve succeeded */
44692 +
44693 + increment_exec_counter();
44694 current->fs->in_exec = 0;
44695 current->in_execve = 0;
44696 acct_update_integrals(current);
44697 @@ -1563,6 +1687,14 @@ static int do_execve_common(const char *filename,
44698 put_files_struct(displaced);
44699 return retval;
44700
44701 +out_fail:
44702 +#ifdef CONFIG_GRKERNSEC
44703 + current->acl = old_acl;
44704 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44705 + fput(current->exec_file);
44706 + current->exec_file = old_exec_file;
44707 +#endif
44708 +
44709 out:
44710 if (bprm->mm) {
44711 acct_arg_size(bprm, 0);
44712 @@ -1636,7 +1768,7 @@ static int expand_corename(struct core_name *cn)
44713 {
44714 char *old_corename = cn->corename;
44715
44716 - cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
44717 + cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
44718 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
44719
44720 if (!cn->corename) {
44721 @@ -1733,7 +1865,7 @@ static int format_corename(struct core_name *cn, long signr)
44722 int pid_in_pattern = 0;
44723 int err = 0;
44724
44725 - cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
44726 + cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
44727 cn->corename = kmalloc(cn->size, GFP_KERNEL);
44728 cn->used = 0;
44729
44730 @@ -1830,6 +1962,250 @@ out:
44731 return ispipe;
44732 }
44733
44734 +int pax_check_flags(unsigned long *flags)
44735 +{
44736 + int retval = 0;
44737 +
44738 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44739 + if (*flags & MF_PAX_SEGMEXEC)
44740 + {
44741 + *flags &= ~MF_PAX_SEGMEXEC;
44742 + retval = -EINVAL;
44743 + }
44744 +#endif
44745 +
44746 + if ((*flags & MF_PAX_PAGEEXEC)
44747 +
44748 +#ifdef CONFIG_PAX_PAGEEXEC
44749 + && (*flags & MF_PAX_SEGMEXEC)
44750 +#endif
44751 +
44752 + )
44753 + {
44754 + *flags &= ~MF_PAX_PAGEEXEC;
44755 + retval = -EINVAL;
44756 + }
44757 +
44758 + if ((*flags & MF_PAX_MPROTECT)
44759 +
44760 +#ifdef CONFIG_PAX_MPROTECT
44761 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44762 +#endif
44763 +
44764 + )
44765 + {
44766 + *flags &= ~MF_PAX_MPROTECT;
44767 + retval = -EINVAL;
44768 + }
44769 +
44770 + if ((*flags & MF_PAX_EMUTRAMP)
44771 +
44772 +#ifdef CONFIG_PAX_EMUTRAMP
44773 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44774 +#endif
44775 +
44776 + )
44777 + {
44778 + *flags &= ~MF_PAX_EMUTRAMP;
44779 + retval = -EINVAL;
44780 + }
44781 +
44782 + return retval;
44783 +}
44784 +
44785 +EXPORT_SYMBOL(pax_check_flags);
44786 +
44787 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44788 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44789 +{
44790 + struct task_struct *tsk = current;
44791 + struct mm_struct *mm = current->mm;
44792 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44793 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44794 + char *path_exec = NULL;
44795 + char *path_fault = NULL;
44796 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
44797 +
44798 + if (buffer_exec && buffer_fault) {
44799 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44800 +
44801 + down_read(&mm->mmap_sem);
44802 + vma = mm->mmap;
44803 + while (vma && (!vma_exec || !vma_fault)) {
44804 + if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44805 + vma_exec = vma;
44806 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44807 + vma_fault = vma;
44808 + vma = vma->vm_next;
44809 + }
44810 + if (vma_exec) {
44811 + path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44812 + if (IS_ERR(path_exec))
44813 + path_exec = "<path too long>";
44814 + else {
44815 + path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44816 + if (path_exec) {
44817 + *path_exec = 0;
44818 + path_exec = buffer_exec;
44819 + } else
44820 + path_exec = "<path too long>";
44821 + }
44822 + }
44823 + if (vma_fault) {
44824 + start = vma_fault->vm_start;
44825 + end = vma_fault->vm_end;
44826 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44827 + if (vma_fault->vm_file) {
44828 + path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44829 + if (IS_ERR(path_fault))
44830 + path_fault = "<path too long>";
44831 + else {
44832 + path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44833 + if (path_fault) {
44834 + *path_fault = 0;
44835 + path_fault = buffer_fault;
44836 + } else
44837 + path_fault = "<path too long>";
44838 + }
44839 + } else
44840 + path_fault = "<anonymous mapping>";
44841 + }
44842 + up_read(&mm->mmap_sem);
44843 + }
44844 + if (tsk->signal->curr_ip)
44845 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44846 + else
44847 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44848 + printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44849 + "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44850 + task_uid(tsk), task_euid(tsk), pc, sp);
44851 + free_page((unsigned long)buffer_exec);
44852 + free_page((unsigned long)buffer_fault);
44853 + pax_report_insns(regs, pc, sp);
44854 + do_coredump(SIGKILL, SIGKILL, regs);
44855 +}
44856 +#endif
44857 +
44858 +#ifdef CONFIG_PAX_REFCOUNT
44859 +void pax_report_refcount_overflow(struct pt_regs *regs)
44860 +{
44861 + if (current->signal->curr_ip)
44862 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44863 + &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44864 + else
44865 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44866 + current->comm, task_pid_nr(current), current_uid(), current_euid());
44867 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44868 + show_regs(regs);
44869 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
44870 +}
44871 +#endif
44872 +
44873 +#ifdef CONFIG_PAX_USERCOPY
44874 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44875 +static noinline int check_stack_object(const void *obj, unsigned long len)
44876 +{
44877 + const void * const stack = task_stack_page(current);
44878 + const void * const stackend = stack + THREAD_SIZE;
44879 +
44880 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44881 + const void *frame = NULL;
44882 + const void *oldframe;
44883 +#endif
44884 +
44885 + if (obj + len < obj)
44886 + return -1;
44887 +
44888 + if (obj + len <= stack || stackend <= obj)
44889 + return 0;
44890 +
44891 + if (obj < stack || stackend < obj + len)
44892 + return -1;
44893 +
44894 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44895 + oldframe = __builtin_frame_address(1);
44896 + if (oldframe)
44897 + frame = __builtin_frame_address(2);
44898 + /*
44899 + low ----------------------------------------------> high
44900 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
44901 + ^----------------^
44902 + allow copies only within here
44903 + */
44904 + while (stack <= frame && frame < stackend) {
44905 + /* if obj + len extends past the last frame, this
44906 + check won't pass and the next frame will be 0,
44907 + causing us to bail out and correctly report
44908 + the copy as invalid
44909 + */
44910 + if (obj + len <= frame)
44911 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44912 + oldframe = frame;
44913 + frame = *(const void * const *)frame;
44914 + }
44915 + return -1;
44916 +#else
44917 + return 1;
44918 +#endif
44919 +}
44920 +
44921 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44922 +{
44923 + if (current->signal->curr_ip)
44924 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44925 + &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44926 + else
44927 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44928 + to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44929 + dump_stack();
44930 + gr_handle_kernel_exploit();
44931 + do_group_exit(SIGKILL);
44932 +}
44933 +#endif
44934 +
44935 +void check_object_size(const void *ptr, unsigned long n, bool to)
44936 +{
44937 +
44938 +#ifdef CONFIG_PAX_USERCOPY
44939 + const char *type;
44940 +
44941 + if (!n)
44942 + return;
44943 +
44944 + type = check_heap_object(ptr, n, to);
44945 + if (!type) {
44946 + if (check_stack_object(ptr, n) != -1)
44947 + return;
44948 + type = "<process stack>";
44949 + }
44950 +
44951 + pax_report_usercopy(ptr, n, to, type);
44952 +#endif
44953 +
44954 +}
44955 +EXPORT_SYMBOL(check_object_size);
44956 +
44957 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44958 +void pax_track_stack(void)
44959 +{
44960 + unsigned long sp = (unsigned long)&sp;
44961 + if (sp < current_thread_info()->lowest_stack &&
44962 + sp > (unsigned long)task_stack_page(current))
44963 + current_thread_info()->lowest_stack = sp;
44964 +}
44965 +EXPORT_SYMBOL(pax_track_stack);
44966 +#endif
44967 +
44968 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
44969 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
44970 +{
44971 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
44972 + dump_stack();
44973 + do_group_exit(SIGKILL);
44974 +}
44975 +EXPORT_SYMBOL(report_size_overflow);
44976 +#endif
44977 +
44978 static int zap_process(struct task_struct *start, int exit_code)
44979 {
44980 struct task_struct *t;
44981 @@ -2002,17 +2378,17 @@ static void coredump_finish(struct mm_struct *mm)
44982 void set_dumpable(struct mm_struct *mm, int value)
44983 {
44984 switch (value) {
44985 - case 0:
44986 + case SUID_DUMPABLE_DISABLED:
44987 clear_bit(MMF_DUMPABLE, &mm->flags);
44988 smp_wmb();
44989 clear_bit(MMF_DUMP_SECURELY, &mm->flags);
44990 break;
44991 - case 1:
44992 + case SUID_DUMPABLE_ENABLED:
44993 set_bit(MMF_DUMPABLE, &mm->flags);
44994 smp_wmb();
44995 clear_bit(MMF_DUMP_SECURELY, &mm->flags);
44996 break;
44997 - case 2:
44998 + case SUID_DUMPABLE_SAFE:
44999 set_bit(MMF_DUMP_SECURELY, &mm->flags);
45000 smp_wmb();
45001 set_bit(MMF_DUMPABLE, &mm->flags);
45002 @@ -2025,7 +2401,7 @@ static int __get_dumpable(unsigned long mm_flags)
45003 int ret;
45004
45005 ret = mm_flags & MMF_DUMPABLE_MASK;
45006 - return (ret >= 2) ? 2 : ret;
45007 + return (ret > SUID_DUMPABLE_ENABLED) ? SUID_DUMPABLE_SAFE : ret;
45008 }
45009
45010 int get_dumpable(struct mm_struct *mm)
45011 @@ -2040,17 +2416,17 @@ static void wait_for_dump_helpers(struct file *file)
45012 pipe = file->f_path.dentry->d_inode->i_pipe;
45013
45014 pipe_lock(pipe);
45015 - pipe->readers++;
45016 - pipe->writers--;
45017 + atomic_inc(&pipe->readers);
45018 + atomic_dec(&pipe->writers);
45019
45020 - while ((pipe->readers > 1) && (!signal_pending(current))) {
45021 + while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
45022 wake_up_interruptible_sync(&pipe->wait);
45023 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
45024 pipe_wait(pipe);
45025 }
45026
45027 - pipe->readers--;
45028 - pipe->writers++;
45029 + atomic_dec(&pipe->readers);
45030 + atomic_inc(&pipe->writers);
45031 pipe_unlock(pipe);
45032
45033 }
45034 @@ -2111,7 +2487,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45035 int retval = 0;
45036 int flag = 0;
45037 int ispipe;
45038 - static atomic_t core_dump_count = ATOMIC_INIT(0);
45039 + bool need_nonrelative = false;
45040 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
45041 struct coredump_params cprm = {
45042 .signr = signr,
45043 .regs = regs,
45044 @@ -2126,6 +2503,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45045
45046 audit_core_dumps(signr);
45047
45048 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
45049 + gr_handle_brute_attach(current, cprm.mm_flags);
45050 +
45051 binfmt = mm->binfmt;
45052 if (!binfmt || !binfmt->core_dump)
45053 goto fail;
45054 @@ -2136,14 +2516,16 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45055 if (!cred)
45056 goto fail;
45057 /*
45058 - * We cannot trust fsuid as being the "true" uid of the
45059 - * process nor do we know its entire history. We only know it
45060 - * was tainted so we dump it as root in mode 2.
45061 + * We cannot trust fsuid as being the "true" uid of the process
45062 + * nor do we know its entire history. We only know it was tainted
45063 + * so we dump it as root in mode 2, and only into a controlled
45064 + * environment (pipe handler or fully qualified path).
45065 */
45066 - if (__get_dumpable(cprm.mm_flags) == 2) {
45067 + if (__get_dumpable(cprm.mm_flags) == SUID_DUMPABLE_SAFE) {
45068 /* Setuid core dump mode */
45069 flag = O_EXCL; /* Stop rewrite attacks */
45070 cred->fsuid = GLOBAL_ROOT_UID; /* Dump root private */
45071 + need_nonrelative = true;
45072 }
45073
45074 retval = coredump_wait(exit_code, &core_state);
45075 @@ -2193,7 +2575,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45076 }
45077 cprm.limit = RLIM_INFINITY;
45078
45079 - dump_count = atomic_inc_return(&core_dump_count);
45080 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
45081 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
45082 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
45083 task_tgid_vnr(current), current->comm);
45084 @@ -2220,9 +2602,19 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45085 } else {
45086 struct inode *inode;
45087
45088 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
45089 +
45090 if (cprm.limit < binfmt->min_coredump)
45091 goto fail_unlock;
45092
45093 + if (need_nonrelative && cn.corename[0] != '/') {
45094 + printk(KERN_WARNING "Pid %d(%s) can only dump core "\
45095 + "to fully qualified path!\n",
45096 + task_tgid_vnr(current), current->comm);
45097 + printk(KERN_WARNING "Skipping core dump\n");
45098 + goto fail_unlock;
45099 + }
45100 +
45101 cprm.file = filp_open(cn.corename,
45102 O_CREAT | 2 | O_NOFOLLOW | O_LARGEFILE | flag,
45103 0600);
45104 @@ -2263,7 +2655,7 @@ close_fail:
45105 filp_close(cprm.file, NULL);
45106 fail_dropcount:
45107 if (ispipe)
45108 - atomic_dec(&core_dump_count);
45109 + atomic_dec_unchecked(&core_dump_count);
45110 fail_unlock:
45111 kfree(cn.corename);
45112 fail_corename:
45113 @@ -2282,7 +2674,7 @@ fail:
45114 */
45115 int dump_write(struct file *file, const void *addr, int nr)
45116 {
45117 - return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
45118 + return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
45119 }
45120 EXPORT_SYMBOL(dump_write);
45121
45122 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
45123 index 1c36139..cf6b350 100644
45124 --- a/fs/ext2/balloc.c
45125 +++ b/fs/ext2/balloc.c
45126 @@ -1190,10 +1190,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
45127
45128 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
45129 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
45130 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
45131 + if (free_blocks < root_blocks + 1 &&
45132 !uid_eq(sbi->s_resuid, current_fsuid()) &&
45133 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
45134 - !in_group_p (sbi->s_resgid))) {
45135 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
45136 return 0;
45137 }
45138 return 1;
45139 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
45140 index 25cd608..9ed5294 100644
45141 --- a/fs/ext3/balloc.c
45142 +++ b/fs/ext3/balloc.c
45143 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
45144
45145 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
45146 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
45147 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
45148 + if (free_blocks < root_blocks + 1 &&
45149 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
45150 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
45151 - !in_group_p (sbi->s_resgid))) {
45152 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
45153 return 0;
45154 }
45155 return 1;
45156 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
45157 index 1b50890..e56c5ad 100644
45158 --- a/fs/ext4/balloc.c
45159 +++ b/fs/ext4/balloc.c
45160 @@ -500,8 +500,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
45161 /* Hm, nope. Are (enough) root reserved clusters available? */
45162 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
45163 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
45164 - capable(CAP_SYS_RESOURCE) ||
45165 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
45166 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
45167 + capable_nolog(CAP_SYS_RESOURCE)) {
45168
45169 if (free_clusters >= (nclusters + dirty_clusters))
45170 return 1;
45171 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
45172 index 01434f2..bd995b4 100644
45173 --- a/fs/ext4/ext4.h
45174 +++ b/fs/ext4/ext4.h
45175 @@ -1246,19 +1246,19 @@ struct ext4_sb_info {
45176 unsigned long s_mb_last_start;
45177
45178 /* stats for buddy allocator */
45179 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
45180 - atomic_t s_bal_success; /* we found long enough chunks */
45181 - atomic_t s_bal_allocated; /* in blocks */
45182 - atomic_t s_bal_ex_scanned; /* total extents scanned */
45183 - atomic_t s_bal_goals; /* goal hits */
45184 - atomic_t s_bal_breaks; /* too long searches */
45185 - atomic_t s_bal_2orders; /* 2^order hits */
45186 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
45187 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
45188 + atomic_unchecked_t s_bal_allocated; /* in blocks */
45189 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
45190 + atomic_unchecked_t s_bal_goals; /* goal hits */
45191 + atomic_unchecked_t s_bal_breaks; /* too long searches */
45192 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
45193 spinlock_t s_bal_lock;
45194 unsigned long s_mb_buddies_generated;
45195 unsigned long long s_mb_generation_time;
45196 - atomic_t s_mb_lost_chunks;
45197 - atomic_t s_mb_preallocated;
45198 - atomic_t s_mb_discarded;
45199 + atomic_unchecked_t s_mb_lost_chunks;
45200 + atomic_unchecked_t s_mb_preallocated;
45201 + atomic_unchecked_t s_mb_discarded;
45202 atomic_t s_lock_busy;
45203
45204 /* locality groups */
45205 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
45206 index 1cd6994..5799d45 100644
45207 --- a/fs/ext4/mballoc.c
45208 +++ b/fs/ext4/mballoc.c
45209 @@ -1747,7 +1747,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
45210 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
45211
45212 if (EXT4_SB(sb)->s_mb_stats)
45213 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
45214 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
45215
45216 break;
45217 }
45218 @@ -2041,7 +2041,7 @@ repeat:
45219 ac->ac_status = AC_STATUS_CONTINUE;
45220 ac->ac_flags |= EXT4_MB_HINT_FIRST;
45221 cr = 3;
45222 - atomic_inc(&sbi->s_mb_lost_chunks);
45223 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
45224 goto repeat;
45225 }
45226 }
45227 @@ -2545,25 +2545,25 @@ int ext4_mb_release(struct super_block *sb)
45228 if (sbi->s_mb_stats) {
45229 ext4_msg(sb, KERN_INFO,
45230 "mballoc: %u blocks %u reqs (%u success)",
45231 - atomic_read(&sbi->s_bal_allocated),
45232 - atomic_read(&sbi->s_bal_reqs),
45233 - atomic_read(&sbi->s_bal_success));
45234 + atomic_read_unchecked(&sbi->s_bal_allocated),
45235 + atomic_read_unchecked(&sbi->s_bal_reqs),
45236 + atomic_read_unchecked(&sbi->s_bal_success));
45237 ext4_msg(sb, KERN_INFO,
45238 "mballoc: %u extents scanned, %u goal hits, "
45239 "%u 2^N hits, %u breaks, %u lost",
45240 - atomic_read(&sbi->s_bal_ex_scanned),
45241 - atomic_read(&sbi->s_bal_goals),
45242 - atomic_read(&sbi->s_bal_2orders),
45243 - atomic_read(&sbi->s_bal_breaks),
45244 - atomic_read(&sbi->s_mb_lost_chunks));
45245 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
45246 + atomic_read_unchecked(&sbi->s_bal_goals),
45247 + atomic_read_unchecked(&sbi->s_bal_2orders),
45248 + atomic_read_unchecked(&sbi->s_bal_breaks),
45249 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
45250 ext4_msg(sb, KERN_INFO,
45251 "mballoc: %lu generated and it took %Lu",
45252 sbi->s_mb_buddies_generated,
45253 sbi->s_mb_generation_time);
45254 ext4_msg(sb, KERN_INFO,
45255 "mballoc: %u preallocated, %u discarded",
45256 - atomic_read(&sbi->s_mb_preallocated),
45257 - atomic_read(&sbi->s_mb_discarded));
45258 + atomic_read_unchecked(&sbi->s_mb_preallocated),
45259 + atomic_read_unchecked(&sbi->s_mb_discarded));
45260 }
45261
45262 free_percpu(sbi->s_locality_groups);
45263 @@ -3047,16 +3047,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
45264 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
45265
45266 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
45267 - atomic_inc(&sbi->s_bal_reqs);
45268 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45269 + atomic_inc_unchecked(&sbi->s_bal_reqs);
45270 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
45271 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
45272 - atomic_inc(&sbi->s_bal_success);
45273 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
45274 + atomic_inc_unchecked(&sbi->s_bal_success);
45275 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
45276 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
45277 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
45278 - atomic_inc(&sbi->s_bal_goals);
45279 + atomic_inc_unchecked(&sbi->s_bal_goals);
45280 if (ac->ac_found > sbi->s_mb_max_to_scan)
45281 - atomic_inc(&sbi->s_bal_breaks);
45282 + atomic_inc_unchecked(&sbi->s_bal_breaks);
45283 }
45284
45285 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
45286 @@ -3456,7 +3456,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
45287 trace_ext4_mb_new_inode_pa(ac, pa);
45288
45289 ext4_mb_use_inode_pa(ac, pa);
45290 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
45291 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
45292
45293 ei = EXT4_I(ac->ac_inode);
45294 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45295 @@ -3516,7 +3516,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
45296 trace_ext4_mb_new_group_pa(ac, pa);
45297
45298 ext4_mb_use_group_pa(ac, pa);
45299 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45300 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
45301
45302 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
45303 lg = ac->ac_lg;
45304 @@ -3605,7 +3605,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
45305 * from the bitmap and continue.
45306 */
45307 }
45308 - atomic_add(free, &sbi->s_mb_discarded);
45309 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
45310
45311 return err;
45312 }
45313 @@ -3623,7 +3623,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
45314 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
45315 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
45316 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
45317 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45318 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45319 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
45320
45321 return 0;
45322 diff --git a/fs/fcntl.c b/fs/fcntl.c
45323 index 81b70e6..d9ae6cf 100644
45324 --- a/fs/fcntl.c
45325 +++ b/fs/fcntl.c
45326 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
45327 if (err)
45328 return err;
45329
45330 + if (gr_handle_chroot_fowner(pid, type))
45331 + return -ENOENT;
45332 + if (gr_check_protected_task_fowner(pid, type))
45333 + return -EACCES;
45334 +
45335 f_modown(filp, pid, type, force);
45336 return 0;
45337 }
45338 @@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
45339
45340 static int f_setown_ex(struct file *filp, unsigned long arg)
45341 {
45342 - struct f_owner_ex * __user owner_p = (void * __user)arg;
45343 + struct f_owner_ex __user *owner_p = (void __user *)arg;
45344 struct f_owner_ex owner;
45345 struct pid *pid;
45346 int type;
45347 @@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
45348
45349 static int f_getown_ex(struct file *filp, unsigned long arg)
45350 {
45351 - struct f_owner_ex * __user owner_p = (void * __user)arg;
45352 + struct f_owner_ex __user *owner_p = (void __user *)arg;
45353 struct f_owner_ex owner;
45354 int ret = 0;
45355
45356 @@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
45357 switch (cmd) {
45358 case F_DUPFD:
45359 case F_DUPFD_CLOEXEC:
45360 + gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
45361 if (arg >= rlimit(RLIMIT_NOFILE))
45362 break;
45363 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
45364 diff --git a/fs/fifo.c b/fs/fifo.c
45365 index cf6f434..3d7942c 100644
45366 --- a/fs/fifo.c
45367 +++ b/fs/fifo.c
45368 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
45369 */
45370 filp->f_op = &read_pipefifo_fops;
45371 pipe->r_counter++;
45372 - if (pipe->readers++ == 0)
45373 + if (atomic_inc_return(&pipe->readers) == 1)
45374 wake_up_partner(inode);
45375
45376 - if (!pipe->writers) {
45377 + if (!atomic_read(&pipe->writers)) {
45378 if ((filp->f_flags & O_NONBLOCK)) {
45379 /* suppress POLLHUP until we have
45380 * seen a writer */
45381 @@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
45382 * errno=ENXIO when there is no process reading the FIFO.
45383 */
45384 ret = -ENXIO;
45385 - if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
45386 + if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
45387 goto err;
45388
45389 filp->f_op = &write_pipefifo_fops;
45390 pipe->w_counter++;
45391 - if (!pipe->writers++)
45392 + if (atomic_inc_return(&pipe->writers) == 1)
45393 wake_up_partner(inode);
45394
45395 - if (!pipe->readers) {
45396 + if (!atomic_read(&pipe->readers)) {
45397 if (wait_for_partner(inode, &pipe->r_counter))
45398 goto err_wr;
45399 }
45400 @@ -104,11 +104,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
45401 */
45402 filp->f_op = &rdwr_pipefifo_fops;
45403
45404 - pipe->readers++;
45405 - pipe->writers++;
45406 + atomic_inc(&pipe->readers);
45407 + atomic_inc(&pipe->writers);
45408 pipe->r_counter++;
45409 pipe->w_counter++;
45410 - if (pipe->readers == 1 || pipe->writers == 1)
45411 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
45412 wake_up_partner(inode);
45413 break;
45414
45415 @@ -122,19 +122,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
45416 return 0;
45417
45418 err_rd:
45419 - if (!--pipe->readers)
45420 + if (atomic_dec_and_test(&pipe->readers))
45421 wake_up_interruptible(&pipe->wait);
45422 ret = -ERESTARTSYS;
45423 goto err;
45424
45425 err_wr:
45426 - if (!--pipe->writers)
45427 + if (atomic_dec_and_test(&pipe->writers))
45428 wake_up_interruptible(&pipe->wait);
45429 ret = -ERESTARTSYS;
45430 goto err;
45431
45432 err:
45433 - if (!pipe->readers && !pipe->writers)
45434 + if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45435 free_pipe_info(inode);
45436
45437 err_nocleanup:
45438 diff --git a/fs/file.c b/fs/file.c
45439 index ba3f605..fade102 100644
45440 --- a/fs/file.c
45441 +++ b/fs/file.c
45442 @@ -15,6 +15,7 @@
45443 #include <linux/slab.h>
45444 #include <linux/vmalloc.h>
45445 #include <linux/file.h>
45446 +#include <linux/security.h>
45447 #include <linux/fdtable.h>
45448 #include <linux/bitops.h>
45449 #include <linux/interrupt.h>
45450 @@ -255,6 +256,7 @@ int expand_files(struct files_struct *files, int nr)
45451 * N.B. For clone tasks sharing a files structure, this test
45452 * will limit the total number of files that can be opened.
45453 */
45454 + gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45455 if (nr >= rlimit(RLIMIT_NOFILE))
45456 return -EMFILE;
45457
45458 diff --git a/fs/filesystems.c b/fs/filesystems.c
45459 index 96f2428..f5eeb8e 100644
45460 --- a/fs/filesystems.c
45461 +++ b/fs/filesystems.c
45462 @@ -273,7 +273,12 @@ struct file_system_type *get_fs_type(const char *name)
45463 int len = dot ? dot - name : strlen(name);
45464
45465 fs = __get_fs_type(name, len);
45466 +
45467 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
45468 + if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45469 +#else
45470 if (!fs && (request_module("%.*s", len, name) == 0))
45471 +#endif
45472 fs = __get_fs_type(name, len);
45473
45474 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45475 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
45476 index e159e68..e7d2a6f 100644
45477 --- a/fs/fs_struct.c
45478 +++ b/fs/fs_struct.c
45479 @@ -4,6 +4,7 @@
45480 #include <linux/path.h>
45481 #include <linux/slab.h>
45482 #include <linux/fs_struct.h>
45483 +#include <linux/grsecurity.h>
45484 #include "internal.h"
45485
45486 static inline void path_get_longterm(struct path *path)
45487 @@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
45488 write_seqcount_begin(&fs->seq);
45489 old_root = fs->root;
45490 fs->root = *path;
45491 + gr_set_chroot_entries(current, path);
45492 write_seqcount_end(&fs->seq);
45493 spin_unlock(&fs->lock);
45494 if (old_root.dentry)
45495 @@ -65,6 +67,17 @@ static inline int replace_path(struct path *p, const struct path *old, const str
45496 return 1;
45497 }
45498
45499 +static inline int replace_root_path(struct task_struct *task, struct path *p, const struct path *old, struct path *new)
45500 +{
45501 + if (likely(p->dentry != old->dentry || p->mnt != old->mnt))
45502 + return 0;
45503 + *p = *new;
45504 +
45505 + gr_set_chroot_entries(task, new);
45506 +
45507 + return 1;
45508 +}
45509 +
45510 void chroot_fs_refs(struct path *old_root, struct path *new_root)
45511 {
45512 struct task_struct *g, *p;
45513 @@ -79,7 +92,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
45514 int hits = 0;
45515 spin_lock(&fs->lock);
45516 write_seqcount_begin(&fs->seq);
45517 - hits += replace_path(&fs->root, old_root, new_root);
45518 + hits += replace_root_path(p, &fs->root, old_root, new_root);
45519 hits += replace_path(&fs->pwd, old_root, new_root);
45520 write_seqcount_end(&fs->seq);
45521 while (hits--) {
45522 @@ -111,7 +124,8 @@ void exit_fs(struct task_struct *tsk)
45523 task_lock(tsk);
45524 spin_lock(&fs->lock);
45525 tsk->fs = NULL;
45526 - kill = !--fs->users;
45527 + gr_clear_chroot_entries(tsk);
45528 + kill = !atomic_dec_return(&fs->users);
45529 spin_unlock(&fs->lock);
45530 task_unlock(tsk);
45531 if (kill)
45532 @@ -124,7 +138,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45533 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
45534 /* We don't need to lock fs - think why ;-) */
45535 if (fs) {
45536 - fs->users = 1;
45537 + atomic_set(&fs->users, 1);
45538 fs->in_exec = 0;
45539 spin_lock_init(&fs->lock);
45540 seqcount_init(&fs->seq);
45541 @@ -133,6 +147,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45542 spin_lock(&old->lock);
45543 fs->root = old->root;
45544 path_get_longterm(&fs->root);
45545 + /* instead of calling gr_set_chroot_entries here,
45546 + we call it from every caller of this function
45547 + */
45548 fs->pwd = old->pwd;
45549 path_get_longterm(&fs->pwd);
45550 spin_unlock(&old->lock);
45551 @@ -151,8 +168,9 @@ int unshare_fs_struct(void)
45552
45553 task_lock(current);
45554 spin_lock(&fs->lock);
45555 - kill = !--fs->users;
45556 + kill = !atomic_dec_return(&fs->users);
45557 current->fs = new_fs;
45558 + gr_set_chroot_entries(current, &new_fs->root);
45559 spin_unlock(&fs->lock);
45560 task_unlock(current);
45561
45562 @@ -165,13 +183,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
45563
45564 int current_umask(void)
45565 {
45566 - return current->fs->umask;
45567 + return current->fs->umask | gr_acl_umask();
45568 }
45569 EXPORT_SYMBOL(current_umask);
45570
45571 /* to be mentioned only in INIT_TASK */
45572 struct fs_struct init_fs = {
45573 - .users = 1,
45574 + .users = ATOMIC_INIT(1),
45575 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
45576 .seq = SEQCNT_ZERO,
45577 .umask = 0022,
45578 @@ -187,12 +205,13 @@ void daemonize_fs_struct(void)
45579 task_lock(current);
45580
45581 spin_lock(&init_fs.lock);
45582 - init_fs.users++;
45583 + atomic_inc(&init_fs.users);
45584 spin_unlock(&init_fs.lock);
45585
45586 spin_lock(&fs->lock);
45587 current->fs = &init_fs;
45588 - kill = !--fs->users;
45589 + gr_set_chroot_entries(current, &current->fs->root);
45590 + kill = !atomic_dec_return(&fs->users);
45591 spin_unlock(&fs->lock);
45592
45593 task_unlock(current);
45594 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
45595 index 9905350..02eaec4 100644
45596 --- a/fs/fscache/cookie.c
45597 +++ b/fs/fscache/cookie.c
45598 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
45599 parent ? (char *) parent->def->name : "<no-parent>",
45600 def->name, netfs_data);
45601
45602 - fscache_stat(&fscache_n_acquires);
45603 + fscache_stat_unchecked(&fscache_n_acquires);
45604
45605 /* if there's no parent cookie, then we don't create one here either */
45606 if (!parent) {
45607 - fscache_stat(&fscache_n_acquires_null);
45608 + fscache_stat_unchecked(&fscache_n_acquires_null);
45609 _leave(" [no parent]");
45610 return NULL;
45611 }
45612 @@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
45613 /* allocate and initialise a cookie */
45614 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45615 if (!cookie) {
45616 - fscache_stat(&fscache_n_acquires_oom);
45617 + fscache_stat_unchecked(&fscache_n_acquires_oom);
45618 _leave(" [ENOMEM]");
45619 return NULL;
45620 }
45621 @@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45622
45623 switch (cookie->def->type) {
45624 case FSCACHE_COOKIE_TYPE_INDEX:
45625 - fscache_stat(&fscache_n_cookie_index);
45626 + fscache_stat_unchecked(&fscache_n_cookie_index);
45627 break;
45628 case FSCACHE_COOKIE_TYPE_DATAFILE:
45629 - fscache_stat(&fscache_n_cookie_data);
45630 + fscache_stat_unchecked(&fscache_n_cookie_data);
45631 break;
45632 default:
45633 - fscache_stat(&fscache_n_cookie_special);
45634 + fscache_stat_unchecked(&fscache_n_cookie_special);
45635 break;
45636 }
45637
45638 @@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45639 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45640 atomic_dec(&parent->n_children);
45641 __fscache_cookie_put(cookie);
45642 - fscache_stat(&fscache_n_acquires_nobufs);
45643 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45644 _leave(" = NULL");
45645 return NULL;
45646 }
45647 }
45648
45649 - fscache_stat(&fscache_n_acquires_ok);
45650 + fscache_stat_unchecked(&fscache_n_acquires_ok);
45651 _leave(" = %p", cookie);
45652 return cookie;
45653 }
45654 @@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
45655 cache = fscache_select_cache_for_object(cookie->parent);
45656 if (!cache) {
45657 up_read(&fscache_addremove_sem);
45658 - fscache_stat(&fscache_n_acquires_no_cache);
45659 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45660 _leave(" = -ENOMEDIUM [no cache]");
45661 return -ENOMEDIUM;
45662 }
45663 @@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
45664 object = cache->ops->alloc_object(cache, cookie);
45665 fscache_stat_d(&fscache_n_cop_alloc_object);
45666 if (IS_ERR(object)) {
45667 - fscache_stat(&fscache_n_object_no_alloc);
45668 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
45669 ret = PTR_ERR(object);
45670 goto error;
45671 }
45672
45673 - fscache_stat(&fscache_n_object_alloc);
45674 + fscache_stat_unchecked(&fscache_n_object_alloc);
45675
45676 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45677
45678 @@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
45679 struct fscache_object *object;
45680 struct hlist_node *_p;
45681
45682 - fscache_stat(&fscache_n_updates);
45683 + fscache_stat_unchecked(&fscache_n_updates);
45684
45685 if (!cookie) {
45686 - fscache_stat(&fscache_n_updates_null);
45687 + fscache_stat_unchecked(&fscache_n_updates_null);
45688 _leave(" [no cookie]");
45689 return;
45690 }
45691 @@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45692 struct fscache_object *object;
45693 unsigned long event;
45694
45695 - fscache_stat(&fscache_n_relinquishes);
45696 + fscache_stat_unchecked(&fscache_n_relinquishes);
45697 if (retire)
45698 - fscache_stat(&fscache_n_relinquishes_retire);
45699 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45700
45701 if (!cookie) {
45702 - fscache_stat(&fscache_n_relinquishes_null);
45703 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
45704 _leave(" [no cookie]");
45705 return;
45706 }
45707 @@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45708
45709 /* wait for the cookie to finish being instantiated (or to fail) */
45710 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45711 - fscache_stat(&fscache_n_relinquishes_waitcrt);
45712 + fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45713 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45714 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45715 }
45716 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
45717 index f6aad48..88dcf26 100644
45718 --- a/fs/fscache/internal.h
45719 +++ b/fs/fscache/internal.h
45720 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
45721 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45722 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45723
45724 -extern atomic_t fscache_n_op_pend;
45725 -extern atomic_t fscache_n_op_run;
45726 -extern atomic_t fscache_n_op_enqueue;
45727 -extern atomic_t fscache_n_op_deferred_release;
45728 -extern atomic_t fscache_n_op_release;
45729 -extern atomic_t fscache_n_op_gc;
45730 -extern atomic_t fscache_n_op_cancelled;
45731 -extern atomic_t fscache_n_op_rejected;
45732 +extern atomic_unchecked_t fscache_n_op_pend;
45733 +extern atomic_unchecked_t fscache_n_op_run;
45734 +extern atomic_unchecked_t fscache_n_op_enqueue;
45735 +extern atomic_unchecked_t fscache_n_op_deferred_release;
45736 +extern atomic_unchecked_t fscache_n_op_release;
45737 +extern atomic_unchecked_t fscache_n_op_gc;
45738 +extern atomic_unchecked_t fscache_n_op_cancelled;
45739 +extern atomic_unchecked_t fscache_n_op_rejected;
45740
45741 -extern atomic_t fscache_n_attr_changed;
45742 -extern atomic_t fscache_n_attr_changed_ok;
45743 -extern atomic_t fscache_n_attr_changed_nobufs;
45744 -extern atomic_t fscache_n_attr_changed_nomem;
45745 -extern atomic_t fscache_n_attr_changed_calls;
45746 +extern atomic_unchecked_t fscache_n_attr_changed;
45747 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
45748 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45749 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45750 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
45751
45752 -extern atomic_t fscache_n_allocs;
45753 -extern atomic_t fscache_n_allocs_ok;
45754 -extern atomic_t fscache_n_allocs_wait;
45755 -extern atomic_t fscache_n_allocs_nobufs;
45756 -extern atomic_t fscache_n_allocs_intr;
45757 -extern atomic_t fscache_n_allocs_object_dead;
45758 -extern atomic_t fscache_n_alloc_ops;
45759 -extern atomic_t fscache_n_alloc_op_waits;
45760 +extern atomic_unchecked_t fscache_n_allocs;
45761 +extern atomic_unchecked_t fscache_n_allocs_ok;
45762 +extern atomic_unchecked_t fscache_n_allocs_wait;
45763 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
45764 +extern atomic_unchecked_t fscache_n_allocs_intr;
45765 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
45766 +extern atomic_unchecked_t fscache_n_alloc_ops;
45767 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
45768
45769 -extern atomic_t fscache_n_retrievals;
45770 -extern atomic_t fscache_n_retrievals_ok;
45771 -extern atomic_t fscache_n_retrievals_wait;
45772 -extern atomic_t fscache_n_retrievals_nodata;
45773 -extern atomic_t fscache_n_retrievals_nobufs;
45774 -extern atomic_t fscache_n_retrievals_intr;
45775 -extern atomic_t fscache_n_retrievals_nomem;
45776 -extern atomic_t fscache_n_retrievals_object_dead;
45777 -extern atomic_t fscache_n_retrieval_ops;
45778 -extern atomic_t fscache_n_retrieval_op_waits;
45779 +extern atomic_unchecked_t fscache_n_retrievals;
45780 +extern atomic_unchecked_t fscache_n_retrievals_ok;
45781 +extern atomic_unchecked_t fscache_n_retrievals_wait;
45782 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
45783 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45784 +extern atomic_unchecked_t fscache_n_retrievals_intr;
45785 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
45786 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45787 +extern atomic_unchecked_t fscache_n_retrieval_ops;
45788 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45789
45790 -extern atomic_t fscache_n_stores;
45791 -extern atomic_t fscache_n_stores_ok;
45792 -extern atomic_t fscache_n_stores_again;
45793 -extern atomic_t fscache_n_stores_nobufs;
45794 -extern atomic_t fscache_n_stores_oom;
45795 -extern atomic_t fscache_n_store_ops;
45796 -extern atomic_t fscache_n_store_calls;
45797 -extern atomic_t fscache_n_store_pages;
45798 -extern atomic_t fscache_n_store_radix_deletes;
45799 -extern atomic_t fscache_n_store_pages_over_limit;
45800 +extern atomic_unchecked_t fscache_n_stores;
45801 +extern atomic_unchecked_t fscache_n_stores_ok;
45802 +extern atomic_unchecked_t fscache_n_stores_again;
45803 +extern atomic_unchecked_t fscache_n_stores_nobufs;
45804 +extern atomic_unchecked_t fscache_n_stores_oom;
45805 +extern atomic_unchecked_t fscache_n_store_ops;
45806 +extern atomic_unchecked_t fscache_n_store_calls;
45807 +extern atomic_unchecked_t fscache_n_store_pages;
45808 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
45809 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45810
45811 -extern atomic_t fscache_n_store_vmscan_not_storing;
45812 -extern atomic_t fscache_n_store_vmscan_gone;
45813 -extern atomic_t fscache_n_store_vmscan_busy;
45814 -extern atomic_t fscache_n_store_vmscan_cancelled;
45815 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45816 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45817 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45818 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45819
45820 -extern atomic_t fscache_n_marks;
45821 -extern atomic_t fscache_n_uncaches;
45822 +extern atomic_unchecked_t fscache_n_marks;
45823 +extern atomic_unchecked_t fscache_n_uncaches;
45824
45825 -extern atomic_t fscache_n_acquires;
45826 -extern atomic_t fscache_n_acquires_null;
45827 -extern atomic_t fscache_n_acquires_no_cache;
45828 -extern atomic_t fscache_n_acquires_ok;
45829 -extern atomic_t fscache_n_acquires_nobufs;
45830 -extern atomic_t fscache_n_acquires_oom;
45831 +extern atomic_unchecked_t fscache_n_acquires;
45832 +extern atomic_unchecked_t fscache_n_acquires_null;
45833 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
45834 +extern atomic_unchecked_t fscache_n_acquires_ok;
45835 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
45836 +extern atomic_unchecked_t fscache_n_acquires_oom;
45837
45838 -extern atomic_t fscache_n_updates;
45839 -extern atomic_t fscache_n_updates_null;
45840 -extern atomic_t fscache_n_updates_run;
45841 +extern atomic_unchecked_t fscache_n_updates;
45842 +extern atomic_unchecked_t fscache_n_updates_null;
45843 +extern atomic_unchecked_t fscache_n_updates_run;
45844
45845 -extern atomic_t fscache_n_relinquishes;
45846 -extern atomic_t fscache_n_relinquishes_null;
45847 -extern atomic_t fscache_n_relinquishes_waitcrt;
45848 -extern atomic_t fscache_n_relinquishes_retire;
45849 +extern atomic_unchecked_t fscache_n_relinquishes;
45850 +extern atomic_unchecked_t fscache_n_relinquishes_null;
45851 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45852 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
45853
45854 -extern atomic_t fscache_n_cookie_index;
45855 -extern atomic_t fscache_n_cookie_data;
45856 -extern atomic_t fscache_n_cookie_special;
45857 +extern atomic_unchecked_t fscache_n_cookie_index;
45858 +extern atomic_unchecked_t fscache_n_cookie_data;
45859 +extern atomic_unchecked_t fscache_n_cookie_special;
45860
45861 -extern atomic_t fscache_n_object_alloc;
45862 -extern atomic_t fscache_n_object_no_alloc;
45863 -extern atomic_t fscache_n_object_lookups;
45864 -extern atomic_t fscache_n_object_lookups_negative;
45865 -extern atomic_t fscache_n_object_lookups_positive;
45866 -extern atomic_t fscache_n_object_lookups_timed_out;
45867 -extern atomic_t fscache_n_object_created;
45868 -extern atomic_t fscache_n_object_avail;
45869 -extern atomic_t fscache_n_object_dead;
45870 +extern atomic_unchecked_t fscache_n_object_alloc;
45871 +extern atomic_unchecked_t fscache_n_object_no_alloc;
45872 +extern atomic_unchecked_t fscache_n_object_lookups;
45873 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
45874 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
45875 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45876 +extern atomic_unchecked_t fscache_n_object_created;
45877 +extern atomic_unchecked_t fscache_n_object_avail;
45878 +extern atomic_unchecked_t fscache_n_object_dead;
45879
45880 -extern atomic_t fscache_n_checkaux_none;
45881 -extern atomic_t fscache_n_checkaux_okay;
45882 -extern atomic_t fscache_n_checkaux_update;
45883 -extern atomic_t fscache_n_checkaux_obsolete;
45884 +extern atomic_unchecked_t fscache_n_checkaux_none;
45885 +extern atomic_unchecked_t fscache_n_checkaux_okay;
45886 +extern atomic_unchecked_t fscache_n_checkaux_update;
45887 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45888
45889 extern atomic_t fscache_n_cop_alloc_object;
45890 extern atomic_t fscache_n_cop_lookup_object;
45891 @@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
45892 atomic_inc(stat);
45893 }
45894
45895 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45896 +{
45897 + atomic_inc_unchecked(stat);
45898 +}
45899 +
45900 static inline void fscache_stat_d(atomic_t *stat)
45901 {
45902 atomic_dec(stat);
45903 @@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
45904
45905 #define __fscache_stat(stat) (NULL)
45906 #define fscache_stat(stat) do {} while (0)
45907 +#define fscache_stat_unchecked(stat) do {} while (0)
45908 #define fscache_stat_d(stat) do {} while (0)
45909 #endif
45910
45911 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
45912 index b6b897c..0ffff9c 100644
45913 --- a/fs/fscache/object.c
45914 +++ b/fs/fscache/object.c
45915 @@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45916 /* update the object metadata on disk */
45917 case FSCACHE_OBJECT_UPDATING:
45918 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45919 - fscache_stat(&fscache_n_updates_run);
45920 + fscache_stat_unchecked(&fscache_n_updates_run);
45921 fscache_stat(&fscache_n_cop_update_object);
45922 object->cache->ops->update_object(object);
45923 fscache_stat_d(&fscache_n_cop_update_object);
45924 @@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45925 spin_lock(&object->lock);
45926 object->state = FSCACHE_OBJECT_DEAD;
45927 spin_unlock(&object->lock);
45928 - fscache_stat(&fscache_n_object_dead);
45929 + fscache_stat_unchecked(&fscache_n_object_dead);
45930 goto terminal_transit;
45931
45932 /* handle the parent cache of this object being withdrawn from
45933 @@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45934 spin_lock(&object->lock);
45935 object->state = FSCACHE_OBJECT_DEAD;
45936 spin_unlock(&object->lock);
45937 - fscache_stat(&fscache_n_object_dead);
45938 + fscache_stat_unchecked(&fscache_n_object_dead);
45939 goto terminal_transit;
45940
45941 /* complain about the object being woken up once it is
45942 @@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45943 parent->cookie->def->name, cookie->def->name,
45944 object->cache->tag->name);
45945
45946 - fscache_stat(&fscache_n_object_lookups);
45947 + fscache_stat_unchecked(&fscache_n_object_lookups);
45948 fscache_stat(&fscache_n_cop_lookup_object);
45949 ret = object->cache->ops->lookup_object(object);
45950 fscache_stat_d(&fscache_n_cop_lookup_object);
45951 @@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45952 if (ret == -ETIMEDOUT) {
45953 /* probably stuck behind another object, so move this one to
45954 * the back of the queue */
45955 - fscache_stat(&fscache_n_object_lookups_timed_out);
45956 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45957 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45958 }
45959
45960 @@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
45961
45962 spin_lock(&object->lock);
45963 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45964 - fscache_stat(&fscache_n_object_lookups_negative);
45965 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45966
45967 /* transit here to allow write requests to begin stacking up
45968 * and read requests to begin returning ENODATA */
45969 @@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
45970 * result, in which case there may be data available */
45971 spin_lock(&object->lock);
45972 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45973 - fscache_stat(&fscache_n_object_lookups_positive);
45974 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45975
45976 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45977
45978 @@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
45979 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45980 } else {
45981 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45982 - fscache_stat(&fscache_n_object_created);
45983 + fscache_stat_unchecked(&fscache_n_object_created);
45984
45985 object->state = FSCACHE_OBJECT_AVAILABLE;
45986 spin_unlock(&object->lock);
45987 @@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
45988 fscache_enqueue_dependents(object);
45989
45990 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45991 - fscache_stat(&fscache_n_object_avail);
45992 + fscache_stat_unchecked(&fscache_n_object_avail);
45993
45994 _leave("");
45995 }
45996 @@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45997 enum fscache_checkaux result;
45998
45999 if (!object->cookie->def->check_aux) {
46000 - fscache_stat(&fscache_n_checkaux_none);
46001 + fscache_stat_unchecked(&fscache_n_checkaux_none);
46002 return FSCACHE_CHECKAUX_OKAY;
46003 }
46004
46005 @@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
46006 switch (result) {
46007 /* entry okay as is */
46008 case FSCACHE_CHECKAUX_OKAY:
46009 - fscache_stat(&fscache_n_checkaux_okay);
46010 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
46011 break;
46012
46013 /* entry requires update */
46014 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
46015 - fscache_stat(&fscache_n_checkaux_update);
46016 + fscache_stat_unchecked(&fscache_n_checkaux_update);
46017 break;
46018
46019 /* entry requires deletion */
46020 case FSCACHE_CHECKAUX_OBSOLETE:
46021 - fscache_stat(&fscache_n_checkaux_obsolete);
46022 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
46023 break;
46024
46025 default:
46026 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
46027 index 30afdfa..2256596 100644
46028 --- a/fs/fscache/operation.c
46029 +++ b/fs/fscache/operation.c
46030 @@ -17,7 +17,7 @@
46031 #include <linux/slab.h>
46032 #include "internal.h"
46033
46034 -atomic_t fscache_op_debug_id;
46035 +atomic_unchecked_t fscache_op_debug_id;
46036 EXPORT_SYMBOL(fscache_op_debug_id);
46037
46038 /**
46039 @@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
46040 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
46041 ASSERTCMP(atomic_read(&op->usage), >, 0);
46042
46043 - fscache_stat(&fscache_n_op_enqueue);
46044 + fscache_stat_unchecked(&fscache_n_op_enqueue);
46045 switch (op->flags & FSCACHE_OP_TYPE) {
46046 case FSCACHE_OP_ASYNC:
46047 _debug("queue async");
46048 @@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
46049 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
46050 if (op->processor)
46051 fscache_enqueue_operation(op);
46052 - fscache_stat(&fscache_n_op_run);
46053 + fscache_stat_unchecked(&fscache_n_op_run);
46054 }
46055
46056 /*
46057 @@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
46058 if (object->n_ops > 1) {
46059 atomic_inc(&op->usage);
46060 list_add_tail(&op->pend_link, &object->pending_ops);
46061 - fscache_stat(&fscache_n_op_pend);
46062 + fscache_stat_unchecked(&fscache_n_op_pend);
46063 } else if (!list_empty(&object->pending_ops)) {
46064 atomic_inc(&op->usage);
46065 list_add_tail(&op->pend_link, &object->pending_ops);
46066 - fscache_stat(&fscache_n_op_pend);
46067 + fscache_stat_unchecked(&fscache_n_op_pend);
46068 fscache_start_operations(object);
46069 } else {
46070 ASSERTCMP(object->n_in_progress, ==, 0);
46071 @@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
46072 object->n_exclusive++; /* reads and writes must wait */
46073 atomic_inc(&op->usage);
46074 list_add_tail(&op->pend_link, &object->pending_ops);
46075 - fscache_stat(&fscache_n_op_pend);
46076 + fscache_stat_unchecked(&fscache_n_op_pend);
46077 ret = 0;
46078 } else {
46079 /* not allowed to submit ops in any other state */
46080 @@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
46081 if (object->n_exclusive > 0) {
46082 atomic_inc(&op->usage);
46083 list_add_tail(&op->pend_link, &object->pending_ops);
46084 - fscache_stat(&fscache_n_op_pend);
46085 + fscache_stat_unchecked(&fscache_n_op_pend);
46086 } else if (!list_empty(&object->pending_ops)) {
46087 atomic_inc(&op->usage);
46088 list_add_tail(&op->pend_link, &object->pending_ops);
46089 - fscache_stat(&fscache_n_op_pend);
46090 + fscache_stat_unchecked(&fscache_n_op_pend);
46091 fscache_start_operations(object);
46092 } else {
46093 ASSERTCMP(object->n_exclusive, ==, 0);
46094 @@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
46095 object->n_ops++;
46096 atomic_inc(&op->usage);
46097 list_add_tail(&op->pend_link, &object->pending_ops);
46098 - fscache_stat(&fscache_n_op_pend);
46099 + fscache_stat_unchecked(&fscache_n_op_pend);
46100 ret = 0;
46101 } else if (object->state == FSCACHE_OBJECT_DYING ||
46102 object->state == FSCACHE_OBJECT_LC_DYING ||
46103 object->state == FSCACHE_OBJECT_WITHDRAWING) {
46104 - fscache_stat(&fscache_n_op_rejected);
46105 + fscache_stat_unchecked(&fscache_n_op_rejected);
46106 ret = -ENOBUFS;
46107 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
46108 fscache_report_unexpected_submission(object, op, ostate);
46109 @@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
46110
46111 ret = -EBUSY;
46112 if (!list_empty(&op->pend_link)) {
46113 - fscache_stat(&fscache_n_op_cancelled);
46114 + fscache_stat_unchecked(&fscache_n_op_cancelled);
46115 list_del_init(&op->pend_link);
46116 object->n_ops--;
46117 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
46118 @@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
46119 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
46120 BUG();
46121
46122 - fscache_stat(&fscache_n_op_release);
46123 + fscache_stat_unchecked(&fscache_n_op_release);
46124
46125 if (op->release) {
46126 op->release(op);
46127 @@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
46128 * lock, and defer it otherwise */
46129 if (!spin_trylock(&object->lock)) {
46130 _debug("defer put");
46131 - fscache_stat(&fscache_n_op_deferred_release);
46132 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
46133
46134 cache = object->cache;
46135 spin_lock(&cache->op_gc_list_lock);
46136 @@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
46137
46138 _debug("GC DEFERRED REL OBJ%x OP%x",
46139 object->debug_id, op->debug_id);
46140 - fscache_stat(&fscache_n_op_gc);
46141 + fscache_stat_unchecked(&fscache_n_op_gc);
46142
46143 ASSERTCMP(atomic_read(&op->usage), ==, 0);
46144
46145 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
46146 index 3f7a59b..cf196cc 100644
46147 --- a/fs/fscache/page.c
46148 +++ b/fs/fscache/page.c
46149 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
46150 val = radix_tree_lookup(&cookie->stores, page->index);
46151 if (!val) {
46152 rcu_read_unlock();
46153 - fscache_stat(&fscache_n_store_vmscan_not_storing);
46154 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
46155 __fscache_uncache_page(cookie, page);
46156 return true;
46157 }
46158 @@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
46159 spin_unlock(&cookie->stores_lock);
46160
46161 if (xpage) {
46162 - fscache_stat(&fscache_n_store_vmscan_cancelled);
46163 - fscache_stat(&fscache_n_store_radix_deletes);
46164 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
46165 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
46166 ASSERTCMP(xpage, ==, page);
46167 } else {
46168 - fscache_stat(&fscache_n_store_vmscan_gone);
46169 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
46170 }
46171
46172 wake_up_bit(&cookie->flags, 0);
46173 @@ -107,7 +107,7 @@ page_busy:
46174 /* we might want to wait here, but that could deadlock the allocator as
46175 * the work threads writing to the cache may all end up sleeping
46176 * on memory allocation */
46177 - fscache_stat(&fscache_n_store_vmscan_busy);
46178 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
46179 return false;
46180 }
46181 EXPORT_SYMBOL(__fscache_maybe_release_page);
46182 @@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
46183 FSCACHE_COOKIE_STORING_TAG);
46184 if (!radix_tree_tag_get(&cookie->stores, page->index,
46185 FSCACHE_COOKIE_PENDING_TAG)) {
46186 - fscache_stat(&fscache_n_store_radix_deletes);
46187 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
46188 xpage = radix_tree_delete(&cookie->stores, page->index);
46189 }
46190 spin_unlock(&cookie->stores_lock);
46191 @@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
46192
46193 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
46194
46195 - fscache_stat(&fscache_n_attr_changed_calls);
46196 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
46197
46198 if (fscache_object_is_active(object)) {
46199 fscache_stat(&fscache_n_cop_attr_changed);
46200 @@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46201
46202 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46203
46204 - fscache_stat(&fscache_n_attr_changed);
46205 + fscache_stat_unchecked(&fscache_n_attr_changed);
46206
46207 op = kzalloc(sizeof(*op), GFP_KERNEL);
46208 if (!op) {
46209 - fscache_stat(&fscache_n_attr_changed_nomem);
46210 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
46211 _leave(" = -ENOMEM");
46212 return -ENOMEM;
46213 }
46214 @@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46215 if (fscache_submit_exclusive_op(object, op) < 0)
46216 goto nobufs;
46217 spin_unlock(&cookie->lock);
46218 - fscache_stat(&fscache_n_attr_changed_ok);
46219 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
46220 fscache_put_operation(op);
46221 _leave(" = 0");
46222 return 0;
46223 @@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
46224 nobufs:
46225 spin_unlock(&cookie->lock);
46226 kfree(op);
46227 - fscache_stat(&fscache_n_attr_changed_nobufs);
46228 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
46229 _leave(" = %d", -ENOBUFS);
46230 return -ENOBUFS;
46231 }
46232 @@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
46233 /* allocate a retrieval operation and attempt to submit it */
46234 op = kzalloc(sizeof(*op), GFP_NOIO);
46235 if (!op) {
46236 - fscache_stat(&fscache_n_retrievals_nomem);
46237 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46238 return NULL;
46239 }
46240
46241 @@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
46242 return 0;
46243 }
46244
46245 - fscache_stat(&fscache_n_retrievals_wait);
46246 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
46247
46248 jif = jiffies;
46249 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
46250 fscache_wait_bit_interruptible,
46251 TASK_INTERRUPTIBLE) != 0) {
46252 - fscache_stat(&fscache_n_retrievals_intr);
46253 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
46254 _leave(" = -ERESTARTSYS");
46255 return -ERESTARTSYS;
46256 }
46257 @@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
46258 */
46259 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46260 struct fscache_retrieval *op,
46261 - atomic_t *stat_op_waits,
46262 - atomic_t *stat_object_dead)
46263 + atomic_unchecked_t *stat_op_waits,
46264 + atomic_unchecked_t *stat_object_dead)
46265 {
46266 int ret;
46267
46268 @@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46269 goto check_if_dead;
46270
46271 _debug(">>> WT");
46272 - fscache_stat(stat_op_waits);
46273 + fscache_stat_unchecked(stat_op_waits);
46274 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
46275 fscache_wait_bit_interruptible,
46276 TASK_INTERRUPTIBLE) < 0) {
46277 @@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
46278
46279 check_if_dead:
46280 if (unlikely(fscache_object_is_dead(object))) {
46281 - fscache_stat(stat_object_dead);
46282 + fscache_stat_unchecked(stat_object_dead);
46283 return -ENOBUFS;
46284 }
46285 return 0;
46286 @@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46287
46288 _enter("%p,%p,,,", cookie, page);
46289
46290 - fscache_stat(&fscache_n_retrievals);
46291 + fscache_stat_unchecked(&fscache_n_retrievals);
46292
46293 if (hlist_empty(&cookie->backing_objects))
46294 goto nobufs;
46295 @@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46296 goto nobufs_unlock;
46297 spin_unlock(&cookie->lock);
46298
46299 - fscache_stat(&fscache_n_retrieval_ops);
46300 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
46301
46302 /* pin the netfs read context in case we need to do the actual netfs
46303 * read because we've encountered a cache read failure */
46304 @@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
46305
46306 error:
46307 if (ret == -ENOMEM)
46308 - fscache_stat(&fscache_n_retrievals_nomem);
46309 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46310 else if (ret == -ERESTARTSYS)
46311 - fscache_stat(&fscache_n_retrievals_intr);
46312 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
46313 else if (ret == -ENODATA)
46314 - fscache_stat(&fscache_n_retrievals_nodata);
46315 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46316 else if (ret < 0)
46317 - fscache_stat(&fscache_n_retrievals_nobufs);
46318 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46319 else
46320 - fscache_stat(&fscache_n_retrievals_ok);
46321 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
46322
46323 fscache_put_retrieval(op);
46324 _leave(" = %d", ret);
46325 @@ -429,7 +429,7 @@ nobufs_unlock:
46326 spin_unlock(&cookie->lock);
46327 kfree(op);
46328 nobufs:
46329 - fscache_stat(&fscache_n_retrievals_nobufs);
46330 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46331 _leave(" = -ENOBUFS");
46332 return -ENOBUFS;
46333 }
46334 @@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46335
46336 _enter("%p,,%d,,,", cookie, *nr_pages);
46337
46338 - fscache_stat(&fscache_n_retrievals);
46339 + fscache_stat_unchecked(&fscache_n_retrievals);
46340
46341 if (hlist_empty(&cookie->backing_objects))
46342 goto nobufs;
46343 @@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46344 goto nobufs_unlock;
46345 spin_unlock(&cookie->lock);
46346
46347 - fscache_stat(&fscache_n_retrieval_ops);
46348 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
46349
46350 /* pin the netfs read context in case we need to do the actual netfs
46351 * read because we've encountered a cache read failure */
46352 @@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46353
46354 error:
46355 if (ret == -ENOMEM)
46356 - fscache_stat(&fscache_n_retrievals_nomem);
46357 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46358 else if (ret == -ERESTARTSYS)
46359 - fscache_stat(&fscache_n_retrievals_intr);
46360 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
46361 else if (ret == -ENODATA)
46362 - fscache_stat(&fscache_n_retrievals_nodata);
46363 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46364 else if (ret < 0)
46365 - fscache_stat(&fscache_n_retrievals_nobufs);
46366 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46367 else
46368 - fscache_stat(&fscache_n_retrievals_ok);
46369 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
46370
46371 fscache_put_retrieval(op);
46372 _leave(" = %d", ret);
46373 @@ -545,7 +545,7 @@ nobufs_unlock:
46374 spin_unlock(&cookie->lock);
46375 kfree(op);
46376 nobufs:
46377 - fscache_stat(&fscache_n_retrievals_nobufs);
46378 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46379 _leave(" = -ENOBUFS");
46380 return -ENOBUFS;
46381 }
46382 @@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46383
46384 _enter("%p,%p,,,", cookie, page);
46385
46386 - fscache_stat(&fscache_n_allocs);
46387 + fscache_stat_unchecked(&fscache_n_allocs);
46388
46389 if (hlist_empty(&cookie->backing_objects))
46390 goto nobufs;
46391 @@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46392 goto nobufs_unlock;
46393 spin_unlock(&cookie->lock);
46394
46395 - fscache_stat(&fscache_n_alloc_ops);
46396 + fscache_stat_unchecked(&fscache_n_alloc_ops);
46397
46398 ret = fscache_wait_for_retrieval_activation(
46399 object, op,
46400 @@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46401
46402 error:
46403 if (ret == -ERESTARTSYS)
46404 - fscache_stat(&fscache_n_allocs_intr);
46405 + fscache_stat_unchecked(&fscache_n_allocs_intr);
46406 else if (ret < 0)
46407 - fscache_stat(&fscache_n_allocs_nobufs);
46408 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46409 else
46410 - fscache_stat(&fscache_n_allocs_ok);
46411 + fscache_stat_unchecked(&fscache_n_allocs_ok);
46412
46413 fscache_put_retrieval(op);
46414 _leave(" = %d", ret);
46415 @@ -625,7 +625,7 @@ nobufs_unlock:
46416 spin_unlock(&cookie->lock);
46417 kfree(op);
46418 nobufs:
46419 - fscache_stat(&fscache_n_allocs_nobufs);
46420 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46421 _leave(" = -ENOBUFS");
46422 return -ENOBUFS;
46423 }
46424 @@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46425
46426 spin_lock(&cookie->stores_lock);
46427
46428 - fscache_stat(&fscache_n_store_calls);
46429 + fscache_stat_unchecked(&fscache_n_store_calls);
46430
46431 /* find a page to store */
46432 page = NULL;
46433 @@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46434 page = results[0];
46435 _debug("gang %d [%lx]", n, page->index);
46436 if (page->index > op->store_limit) {
46437 - fscache_stat(&fscache_n_store_pages_over_limit);
46438 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
46439 goto superseded;
46440 }
46441
46442 @@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46443 spin_unlock(&cookie->stores_lock);
46444 spin_unlock(&object->lock);
46445
46446 - fscache_stat(&fscache_n_store_pages);
46447 + fscache_stat_unchecked(&fscache_n_store_pages);
46448 fscache_stat(&fscache_n_cop_write_page);
46449 ret = object->cache->ops->write_page(op, page);
46450 fscache_stat_d(&fscache_n_cop_write_page);
46451 @@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46452 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46453 ASSERT(PageFsCache(page));
46454
46455 - fscache_stat(&fscache_n_stores);
46456 + fscache_stat_unchecked(&fscache_n_stores);
46457
46458 op = kzalloc(sizeof(*op), GFP_NOIO);
46459 if (!op)
46460 @@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46461 spin_unlock(&cookie->stores_lock);
46462 spin_unlock(&object->lock);
46463
46464 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46465 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46466 op->store_limit = object->store_limit;
46467
46468 if (fscache_submit_op(object, &op->op) < 0)
46469 @@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46470
46471 spin_unlock(&cookie->lock);
46472 radix_tree_preload_end();
46473 - fscache_stat(&fscache_n_store_ops);
46474 - fscache_stat(&fscache_n_stores_ok);
46475 + fscache_stat_unchecked(&fscache_n_store_ops);
46476 + fscache_stat_unchecked(&fscache_n_stores_ok);
46477
46478 /* the work queue now carries its own ref on the object */
46479 fscache_put_operation(&op->op);
46480 @@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46481 return 0;
46482
46483 already_queued:
46484 - fscache_stat(&fscache_n_stores_again);
46485 + fscache_stat_unchecked(&fscache_n_stores_again);
46486 already_pending:
46487 spin_unlock(&cookie->stores_lock);
46488 spin_unlock(&object->lock);
46489 spin_unlock(&cookie->lock);
46490 radix_tree_preload_end();
46491 kfree(op);
46492 - fscache_stat(&fscache_n_stores_ok);
46493 + fscache_stat_unchecked(&fscache_n_stores_ok);
46494 _leave(" = 0");
46495 return 0;
46496
46497 @@ -851,14 +851,14 @@ nobufs:
46498 spin_unlock(&cookie->lock);
46499 radix_tree_preload_end();
46500 kfree(op);
46501 - fscache_stat(&fscache_n_stores_nobufs);
46502 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
46503 _leave(" = -ENOBUFS");
46504 return -ENOBUFS;
46505
46506 nomem_free:
46507 kfree(op);
46508 nomem:
46509 - fscache_stat(&fscache_n_stores_oom);
46510 + fscache_stat_unchecked(&fscache_n_stores_oom);
46511 _leave(" = -ENOMEM");
46512 return -ENOMEM;
46513 }
46514 @@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
46515 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46516 ASSERTCMP(page, !=, NULL);
46517
46518 - fscache_stat(&fscache_n_uncaches);
46519 + fscache_stat_unchecked(&fscache_n_uncaches);
46520
46521 /* cache withdrawal may beat us to it */
46522 if (!PageFsCache(page))
46523 @@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
46524 unsigned long loop;
46525
46526 #ifdef CONFIG_FSCACHE_STATS
46527 - atomic_add(pagevec->nr, &fscache_n_marks);
46528 + atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46529 #endif
46530
46531 for (loop = 0; loop < pagevec->nr; loop++) {
46532 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
46533 index 4765190..2a067f2 100644
46534 --- a/fs/fscache/stats.c
46535 +++ b/fs/fscache/stats.c
46536 @@ -18,95 +18,95 @@
46537 /*
46538 * operation counters
46539 */
46540 -atomic_t fscache_n_op_pend;
46541 -atomic_t fscache_n_op_run;
46542 -atomic_t fscache_n_op_enqueue;
46543 -atomic_t fscache_n_op_requeue;
46544 -atomic_t fscache_n_op_deferred_release;
46545 -atomic_t fscache_n_op_release;
46546 -atomic_t fscache_n_op_gc;
46547 -atomic_t fscache_n_op_cancelled;
46548 -atomic_t fscache_n_op_rejected;
46549 +atomic_unchecked_t fscache_n_op_pend;
46550 +atomic_unchecked_t fscache_n_op_run;
46551 +atomic_unchecked_t fscache_n_op_enqueue;
46552 +atomic_unchecked_t fscache_n_op_requeue;
46553 +atomic_unchecked_t fscache_n_op_deferred_release;
46554 +atomic_unchecked_t fscache_n_op_release;
46555 +atomic_unchecked_t fscache_n_op_gc;
46556 +atomic_unchecked_t fscache_n_op_cancelled;
46557 +atomic_unchecked_t fscache_n_op_rejected;
46558
46559 -atomic_t fscache_n_attr_changed;
46560 -atomic_t fscache_n_attr_changed_ok;
46561 -atomic_t fscache_n_attr_changed_nobufs;
46562 -atomic_t fscache_n_attr_changed_nomem;
46563 -atomic_t fscache_n_attr_changed_calls;
46564 +atomic_unchecked_t fscache_n_attr_changed;
46565 +atomic_unchecked_t fscache_n_attr_changed_ok;
46566 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
46567 +atomic_unchecked_t fscache_n_attr_changed_nomem;
46568 +atomic_unchecked_t fscache_n_attr_changed_calls;
46569
46570 -atomic_t fscache_n_allocs;
46571 -atomic_t fscache_n_allocs_ok;
46572 -atomic_t fscache_n_allocs_wait;
46573 -atomic_t fscache_n_allocs_nobufs;
46574 -atomic_t fscache_n_allocs_intr;
46575 -atomic_t fscache_n_allocs_object_dead;
46576 -atomic_t fscache_n_alloc_ops;
46577 -atomic_t fscache_n_alloc_op_waits;
46578 +atomic_unchecked_t fscache_n_allocs;
46579 +atomic_unchecked_t fscache_n_allocs_ok;
46580 +atomic_unchecked_t fscache_n_allocs_wait;
46581 +atomic_unchecked_t fscache_n_allocs_nobufs;
46582 +atomic_unchecked_t fscache_n_allocs_intr;
46583 +atomic_unchecked_t fscache_n_allocs_object_dead;
46584 +atomic_unchecked_t fscache_n_alloc_ops;
46585 +atomic_unchecked_t fscache_n_alloc_op_waits;
46586
46587 -atomic_t fscache_n_retrievals;
46588 -atomic_t fscache_n_retrievals_ok;
46589 -atomic_t fscache_n_retrievals_wait;
46590 -atomic_t fscache_n_retrievals_nodata;
46591 -atomic_t fscache_n_retrievals_nobufs;
46592 -atomic_t fscache_n_retrievals_intr;
46593 -atomic_t fscache_n_retrievals_nomem;
46594 -atomic_t fscache_n_retrievals_object_dead;
46595 -atomic_t fscache_n_retrieval_ops;
46596 -atomic_t fscache_n_retrieval_op_waits;
46597 +atomic_unchecked_t fscache_n_retrievals;
46598 +atomic_unchecked_t fscache_n_retrievals_ok;
46599 +atomic_unchecked_t fscache_n_retrievals_wait;
46600 +atomic_unchecked_t fscache_n_retrievals_nodata;
46601 +atomic_unchecked_t fscache_n_retrievals_nobufs;
46602 +atomic_unchecked_t fscache_n_retrievals_intr;
46603 +atomic_unchecked_t fscache_n_retrievals_nomem;
46604 +atomic_unchecked_t fscache_n_retrievals_object_dead;
46605 +atomic_unchecked_t fscache_n_retrieval_ops;
46606 +atomic_unchecked_t fscache_n_retrieval_op_waits;
46607
46608 -atomic_t fscache_n_stores;
46609 -atomic_t fscache_n_stores_ok;
46610 -atomic_t fscache_n_stores_again;
46611 -atomic_t fscache_n_stores_nobufs;
46612 -atomic_t fscache_n_stores_oom;
46613 -atomic_t fscache_n_store_ops;
46614 -atomic_t fscache_n_store_calls;
46615 -atomic_t fscache_n_store_pages;
46616 -atomic_t fscache_n_store_radix_deletes;
46617 -atomic_t fscache_n_store_pages_over_limit;
46618 +atomic_unchecked_t fscache_n_stores;
46619 +atomic_unchecked_t fscache_n_stores_ok;
46620 +atomic_unchecked_t fscache_n_stores_again;
46621 +atomic_unchecked_t fscache_n_stores_nobufs;
46622 +atomic_unchecked_t fscache_n_stores_oom;
46623 +atomic_unchecked_t fscache_n_store_ops;
46624 +atomic_unchecked_t fscache_n_store_calls;
46625 +atomic_unchecked_t fscache_n_store_pages;
46626 +atomic_unchecked_t fscache_n_store_radix_deletes;
46627 +atomic_unchecked_t fscache_n_store_pages_over_limit;
46628
46629 -atomic_t fscache_n_store_vmscan_not_storing;
46630 -atomic_t fscache_n_store_vmscan_gone;
46631 -atomic_t fscache_n_store_vmscan_busy;
46632 -atomic_t fscache_n_store_vmscan_cancelled;
46633 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46634 +atomic_unchecked_t fscache_n_store_vmscan_gone;
46635 +atomic_unchecked_t fscache_n_store_vmscan_busy;
46636 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46637
46638 -atomic_t fscache_n_marks;
46639 -atomic_t fscache_n_uncaches;
46640 +atomic_unchecked_t fscache_n_marks;
46641 +atomic_unchecked_t fscache_n_uncaches;
46642
46643 -atomic_t fscache_n_acquires;
46644 -atomic_t fscache_n_acquires_null;
46645 -atomic_t fscache_n_acquires_no_cache;
46646 -atomic_t fscache_n_acquires_ok;
46647 -atomic_t fscache_n_acquires_nobufs;
46648 -atomic_t fscache_n_acquires_oom;
46649 +atomic_unchecked_t fscache_n_acquires;
46650 +atomic_unchecked_t fscache_n_acquires_null;
46651 +atomic_unchecked_t fscache_n_acquires_no_cache;
46652 +atomic_unchecked_t fscache_n_acquires_ok;
46653 +atomic_unchecked_t fscache_n_acquires_nobufs;
46654 +atomic_unchecked_t fscache_n_acquires_oom;
46655
46656 -atomic_t fscache_n_updates;
46657 -atomic_t fscache_n_updates_null;
46658 -atomic_t fscache_n_updates_run;
46659 +atomic_unchecked_t fscache_n_updates;
46660 +atomic_unchecked_t fscache_n_updates_null;
46661 +atomic_unchecked_t fscache_n_updates_run;
46662
46663 -atomic_t fscache_n_relinquishes;
46664 -atomic_t fscache_n_relinquishes_null;
46665 -atomic_t fscache_n_relinquishes_waitcrt;
46666 -atomic_t fscache_n_relinquishes_retire;
46667 +atomic_unchecked_t fscache_n_relinquishes;
46668 +atomic_unchecked_t fscache_n_relinquishes_null;
46669 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46670 +atomic_unchecked_t fscache_n_relinquishes_retire;
46671
46672 -atomic_t fscache_n_cookie_index;
46673 -atomic_t fscache_n_cookie_data;
46674 -atomic_t fscache_n_cookie_special;
46675 +atomic_unchecked_t fscache_n_cookie_index;
46676 +atomic_unchecked_t fscache_n_cookie_data;
46677 +atomic_unchecked_t fscache_n_cookie_special;
46678
46679 -atomic_t fscache_n_object_alloc;
46680 -atomic_t fscache_n_object_no_alloc;
46681 -atomic_t fscache_n_object_lookups;
46682 -atomic_t fscache_n_object_lookups_negative;
46683 -atomic_t fscache_n_object_lookups_positive;
46684 -atomic_t fscache_n_object_lookups_timed_out;
46685 -atomic_t fscache_n_object_created;
46686 -atomic_t fscache_n_object_avail;
46687 -atomic_t fscache_n_object_dead;
46688 +atomic_unchecked_t fscache_n_object_alloc;
46689 +atomic_unchecked_t fscache_n_object_no_alloc;
46690 +atomic_unchecked_t fscache_n_object_lookups;
46691 +atomic_unchecked_t fscache_n_object_lookups_negative;
46692 +atomic_unchecked_t fscache_n_object_lookups_positive;
46693 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
46694 +atomic_unchecked_t fscache_n_object_created;
46695 +atomic_unchecked_t fscache_n_object_avail;
46696 +atomic_unchecked_t fscache_n_object_dead;
46697
46698 -atomic_t fscache_n_checkaux_none;
46699 -atomic_t fscache_n_checkaux_okay;
46700 -atomic_t fscache_n_checkaux_update;
46701 -atomic_t fscache_n_checkaux_obsolete;
46702 +atomic_unchecked_t fscache_n_checkaux_none;
46703 +atomic_unchecked_t fscache_n_checkaux_okay;
46704 +atomic_unchecked_t fscache_n_checkaux_update;
46705 +atomic_unchecked_t fscache_n_checkaux_obsolete;
46706
46707 atomic_t fscache_n_cop_alloc_object;
46708 atomic_t fscache_n_cop_lookup_object;
46709 @@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
46710 seq_puts(m, "FS-Cache statistics\n");
46711
46712 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46713 - atomic_read(&fscache_n_cookie_index),
46714 - atomic_read(&fscache_n_cookie_data),
46715 - atomic_read(&fscache_n_cookie_special));
46716 + atomic_read_unchecked(&fscache_n_cookie_index),
46717 + atomic_read_unchecked(&fscache_n_cookie_data),
46718 + atomic_read_unchecked(&fscache_n_cookie_special));
46719
46720 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46721 - atomic_read(&fscache_n_object_alloc),
46722 - atomic_read(&fscache_n_object_no_alloc),
46723 - atomic_read(&fscache_n_object_avail),
46724 - atomic_read(&fscache_n_object_dead));
46725 + atomic_read_unchecked(&fscache_n_object_alloc),
46726 + atomic_read_unchecked(&fscache_n_object_no_alloc),
46727 + atomic_read_unchecked(&fscache_n_object_avail),
46728 + atomic_read_unchecked(&fscache_n_object_dead));
46729 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46730 - atomic_read(&fscache_n_checkaux_none),
46731 - atomic_read(&fscache_n_checkaux_okay),
46732 - atomic_read(&fscache_n_checkaux_update),
46733 - atomic_read(&fscache_n_checkaux_obsolete));
46734 + atomic_read_unchecked(&fscache_n_checkaux_none),
46735 + atomic_read_unchecked(&fscache_n_checkaux_okay),
46736 + atomic_read_unchecked(&fscache_n_checkaux_update),
46737 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46738
46739 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46740 - atomic_read(&fscache_n_marks),
46741 - atomic_read(&fscache_n_uncaches));
46742 + atomic_read_unchecked(&fscache_n_marks),
46743 + atomic_read_unchecked(&fscache_n_uncaches));
46744
46745 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46746 " oom=%u\n",
46747 - atomic_read(&fscache_n_acquires),
46748 - atomic_read(&fscache_n_acquires_null),
46749 - atomic_read(&fscache_n_acquires_no_cache),
46750 - atomic_read(&fscache_n_acquires_ok),
46751 - atomic_read(&fscache_n_acquires_nobufs),
46752 - atomic_read(&fscache_n_acquires_oom));
46753 + atomic_read_unchecked(&fscache_n_acquires),
46754 + atomic_read_unchecked(&fscache_n_acquires_null),
46755 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
46756 + atomic_read_unchecked(&fscache_n_acquires_ok),
46757 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
46758 + atomic_read_unchecked(&fscache_n_acquires_oom));
46759
46760 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46761 - atomic_read(&fscache_n_object_lookups),
46762 - atomic_read(&fscache_n_object_lookups_negative),
46763 - atomic_read(&fscache_n_object_lookups_positive),
46764 - atomic_read(&fscache_n_object_created),
46765 - atomic_read(&fscache_n_object_lookups_timed_out));
46766 + atomic_read_unchecked(&fscache_n_object_lookups),
46767 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
46768 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
46769 + atomic_read_unchecked(&fscache_n_object_created),
46770 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
46771
46772 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46773 - atomic_read(&fscache_n_updates),
46774 - atomic_read(&fscache_n_updates_null),
46775 - atomic_read(&fscache_n_updates_run));
46776 + atomic_read_unchecked(&fscache_n_updates),
46777 + atomic_read_unchecked(&fscache_n_updates_null),
46778 + atomic_read_unchecked(&fscache_n_updates_run));
46779
46780 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46781 - atomic_read(&fscache_n_relinquishes),
46782 - atomic_read(&fscache_n_relinquishes_null),
46783 - atomic_read(&fscache_n_relinquishes_waitcrt),
46784 - atomic_read(&fscache_n_relinquishes_retire));
46785 + atomic_read_unchecked(&fscache_n_relinquishes),
46786 + atomic_read_unchecked(&fscache_n_relinquishes_null),
46787 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46788 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
46789
46790 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46791 - atomic_read(&fscache_n_attr_changed),
46792 - atomic_read(&fscache_n_attr_changed_ok),
46793 - atomic_read(&fscache_n_attr_changed_nobufs),
46794 - atomic_read(&fscache_n_attr_changed_nomem),
46795 - atomic_read(&fscache_n_attr_changed_calls));
46796 + atomic_read_unchecked(&fscache_n_attr_changed),
46797 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
46798 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46799 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46800 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
46801
46802 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46803 - atomic_read(&fscache_n_allocs),
46804 - atomic_read(&fscache_n_allocs_ok),
46805 - atomic_read(&fscache_n_allocs_wait),
46806 - atomic_read(&fscache_n_allocs_nobufs),
46807 - atomic_read(&fscache_n_allocs_intr));
46808 + atomic_read_unchecked(&fscache_n_allocs),
46809 + atomic_read_unchecked(&fscache_n_allocs_ok),
46810 + atomic_read_unchecked(&fscache_n_allocs_wait),
46811 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
46812 + atomic_read_unchecked(&fscache_n_allocs_intr));
46813 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46814 - atomic_read(&fscache_n_alloc_ops),
46815 - atomic_read(&fscache_n_alloc_op_waits),
46816 - atomic_read(&fscache_n_allocs_object_dead));
46817 + atomic_read_unchecked(&fscache_n_alloc_ops),
46818 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
46819 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
46820
46821 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46822 " int=%u oom=%u\n",
46823 - atomic_read(&fscache_n_retrievals),
46824 - atomic_read(&fscache_n_retrievals_ok),
46825 - atomic_read(&fscache_n_retrievals_wait),
46826 - atomic_read(&fscache_n_retrievals_nodata),
46827 - atomic_read(&fscache_n_retrievals_nobufs),
46828 - atomic_read(&fscache_n_retrievals_intr),
46829 - atomic_read(&fscache_n_retrievals_nomem));
46830 + atomic_read_unchecked(&fscache_n_retrievals),
46831 + atomic_read_unchecked(&fscache_n_retrievals_ok),
46832 + atomic_read_unchecked(&fscache_n_retrievals_wait),
46833 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
46834 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46835 + atomic_read_unchecked(&fscache_n_retrievals_intr),
46836 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
46837 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46838 - atomic_read(&fscache_n_retrieval_ops),
46839 - atomic_read(&fscache_n_retrieval_op_waits),
46840 - atomic_read(&fscache_n_retrievals_object_dead));
46841 + atomic_read_unchecked(&fscache_n_retrieval_ops),
46842 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46843 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46844
46845 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46846 - atomic_read(&fscache_n_stores),
46847 - atomic_read(&fscache_n_stores_ok),
46848 - atomic_read(&fscache_n_stores_again),
46849 - atomic_read(&fscache_n_stores_nobufs),
46850 - atomic_read(&fscache_n_stores_oom));
46851 + atomic_read_unchecked(&fscache_n_stores),
46852 + atomic_read_unchecked(&fscache_n_stores_ok),
46853 + atomic_read_unchecked(&fscache_n_stores_again),
46854 + atomic_read_unchecked(&fscache_n_stores_nobufs),
46855 + atomic_read_unchecked(&fscache_n_stores_oom));
46856 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46857 - atomic_read(&fscache_n_store_ops),
46858 - atomic_read(&fscache_n_store_calls),
46859 - atomic_read(&fscache_n_store_pages),
46860 - atomic_read(&fscache_n_store_radix_deletes),
46861 - atomic_read(&fscache_n_store_pages_over_limit));
46862 + atomic_read_unchecked(&fscache_n_store_ops),
46863 + atomic_read_unchecked(&fscache_n_store_calls),
46864 + atomic_read_unchecked(&fscache_n_store_pages),
46865 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
46866 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46867
46868 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46869 - atomic_read(&fscache_n_store_vmscan_not_storing),
46870 - atomic_read(&fscache_n_store_vmscan_gone),
46871 - atomic_read(&fscache_n_store_vmscan_busy),
46872 - atomic_read(&fscache_n_store_vmscan_cancelled));
46873 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46874 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46875 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46876 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46877
46878 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46879 - atomic_read(&fscache_n_op_pend),
46880 - atomic_read(&fscache_n_op_run),
46881 - atomic_read(&fscache_n_op_enqueue),
46882 - atomic_read(&fscache_n_op_cancelled),
46883 - atomic_read(&fscache_n_op_rejected));
46884 + atomic_read_unchecked(&fscache_n_op_pend),
46885 + atomic_read_unchecked(&fscache_n_op_run),
46886 + atomic_read_unchecked(&fscache_n_op_enqueue),
46887 + atomic_read_unchecked(&fscache_n_op_cancelled),
46888 + atomic_read_unchecked(&fscache_n_op_rejected));
46889 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46890 - atomic_read(&fscache_n_op_deferred_release),
46891 - atomic_read(&fscache_n_op_release),
46892 - atomic_read(&fscache_n_op_gc));
46893 + atomic_read_unchecked(&fscache_n_op_deferred_release),
46894 + atomic_read_unchecked(&fscache_n_op_release),
46895 + atomic_read_unchecked(&fscache_n_op_gc));
46896
46897 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46898 atomic_read(&fscache_n_cop_alloc_object),
46899 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
46900 index 3426521..3b75162 100644
46901 --- a/fs/fuse/cuse.c
46902 +++ b/fs/fuse/cuse.c
46903 @@ -587,10 +587,12 @@ static int __init cuse_init(void)
46904 INIT_LIST_HEAD(&cuse_conntbl[i]);
46905
46906 /* inherit and extend fuse_dev_operations */
46907 - cuse_channel_fops = fuse_dev_operations;
46908 - cuse_channel_fops.owner = THIS_MODULE;
46909 - cuse_channel_fops.open = cuse_channel_open;
46910 - cuse_channel_fops.release = cuse_channel_release;
46911 + pax_open_kernel();
46912 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46913 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46914 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
46915 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
46916 + pax_close_kernel();
46917
46918 cuse_class = class_create(THIS_MODULE, "cuse");
46919 if (IS_ERR(cuse_class))
46920 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
46921 index 7df2b5e..5804aa7 100644
46922 --- a/fs/fuse/dev.c
46923 +++ b/fs/fuse/dev.c
46924 @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
46925 ret = 0;
46926 pipe_lock(pipe);
46927
46928 - if (!pipe->readers) {
46929 + if (!atomic_read(&pipe->readers)) {
46930 send_sig(SIGPIPE, current, 0);
46931 if (!ret)
46932 ret = -EPIPE;
46933 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
46934 index 334e0b1..fc571e8 100644
46935 --- a/fs/fuse/dir.c
46936 +++ b/fs/fuse/dir.c
46937 @@ -1189,7 +1189,7 @@ static char *read_link(struct dentry *dentry)
46938 return link;
46939 }
46940
46941 -static void free_link(char *link)
46942 +static void free_link(const char *link)
46943 {
46944 if (!IS_ERR(link))
46945 free_page((unsigned long) link);
46946 diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
46947 index a9ba244..d9df391 100644
46948 --- a/fs/gfs2/inode.c
46949 +++ b/fs/gfs2/inode.c
46950 @@ -1496,7 +1496,7 @@ out:
46951
46952 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46953 {
46954 - char *s = nd_get_link(nd);
46955 + const char *s = nd_get_link(nd);
46956 if (!IS_ERR(s))
46957 kfree(s);
46958 }
46959 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
46960 index cc9281b..58996fb 100644
46961 --- a/fs/hugetlbfs/inode.c
46962 +++ b/fs/hugetlbfs/inode.c
46963 @@ -920,7 +920,7 @@ static struct file_system_type hugetlbfs_fs_type = {
46964 .kill_sb = kill_litter_super,
46965 };
46966
46967 -static struct vfsmount *hugetlbfs_vfsmount;
46968 +struct vfsmount *hugetlbfs_vfsmount;
46969
46970 static int can_do_hugetlb_shm(void)
46971 {
46972 diff --git a/fs/inode.c b/fs/inode.c
46973 index c99163b..a11ad40 100644
46974 --- a/fs/inode.c
46975 +++ b/fs/inode.c
46976 @@ -867,8 +867,8 @@ unsigned int get_next_ino(void)
46977
46978 #ifdef CONFIG_SMP
46979 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
46980 - static atomic_t shared_last_ino;
46981 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
46982 + static atomic_unchecked_t shared_last_ino;
46983 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
46984
46985 res = next - LAST_INO_BATCH;
46986 }
46987 diff --git a/fs/isofs/export.c b/fs/isofs/export.c
46988 index aa4356d..1d38044 100644
46989 --- a/fs/isofs/export.c
46990 +++ b/fs/isofs/export.c
46991 @@ -134,6 +134,7 @@ isofs_export_encode_fh(struct inode *inode,
46992 len = 3;
46993 fh32[0] = ei->i_iget5_block;
46994 fh16[2] = (__u16)ei->i_iget5_offset; /* fh16 [sic] */
46995 + fh16[3] = 0; /* avoid leaking uninitialized data */
46996 fh32[2] = inode->i_generation;
46997 if (parent) {
46998 struct iso_inode_info *eparent;
46999 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
47000 index 4a6cf28..d3a29d3 100644
47001 --- a/fs/jffs2/erase.c
47002 +++ b/fs/jffs2/erase.c
47003 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
47004 struct jffs2_unknown_node marker = {
47005 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
47006 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
47007 - .totlen = cpu_to_je32(c->cleanmarker_size)
47008 + .totlen = cpu_to_je32(c->cleanmarker_size),
47009 + .hdr_crc = cpu_to_je32(0)
47010 };
47011
47012 jffs2_prealloc_raw_node_refs(c, jeb, 1);
47013 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
47014 index 6f4529d..bf12806 100644
47015 --- a/fs/jffs2/wbuf.c
47016 +++ b/fs/jffs2/wbuf.c
47017 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
47018 {
47019 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
47020 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
47021 - .totlen = constant_cpu_to_je32(8)
47022 + .totlen = constant_cpu_to_je32(8),
47023 + .hdr_crc = constant_cpu_to_je32(0)
47024 };
47025
47026 /*
47027 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
47028 index 4a82950..bcaa0cb 100644
47029 --- a/fs/jfs/super.c
47030 +++ b/fs/jfs/super.c
47031 @@ -801,7 +801,7 @@ static int __init init_jfs_fs(void)
47032
47033 jfs_inode_cachep =
47034 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
47035 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
47036 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
47037 init_once);
47038 if (jfs_inode_cachep == NULL)
47039 return -ENOMEM;
47040 diff --git a/fs/libfs.c b/fs/libfs.c
47041 index f86ec27..4734776 100644
47042 --- a/fs/libfs.c
47043 +++ b/fs/libfs.c
47044 @@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
47045
47046 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
47047 struct dentry *next;
47048 + char d_name[sizeof(next->d_iname)];
47049 + const unsigned char *name;
47050 +
47051 next = list_entry(p, struct dentry, d_u.d_child);
47052 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
47053 if (!simple_positive(next)) {
47054 @@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
47055
47056 spin_unlock(&next->d_lock);
47057 spin_unlock(&dentry->d_lock);
47058 - if (filldir(dirent, next->d_name.name,
47059 + name = next->d_name.name;
47060 + if (name == next->d_iname) {
47061 + memcpy(d_name, name, next->d_name.len);
47062 + name = d_name;
47063 + }
47064 + if (filldir(dirent, name,
47065 next->d_name.len, filp->f_pos,
47066 next->d_inode->i_ino,
47067 dt_type(next->d_inode)) < 0)
47068 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
47069 index 8392cb8..80d6193 100644
47070 --- a/fs/lockd/clntproc.c
47071 +++ b/fs/lockd/clntproc.c
47072 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
47073 /*
47074 * Cookie counter for NLM requests
47075 */
47076 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
47077 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
47078
47079 void nlmclnt_next_cookie(struct nlm_cookie *c)
47080 {
47081 - u32 cookie = atomic_inc_return(&nlm_cookie);
47082 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
47083
47084 memcpy(c->data, &cookie, 4);
47085 c->len=4;
47086 diff --git a/fs/locks.c b/fs/locks.c
47087 index 82c3533..34e929c 100644
47088 --- a/fs/locks.c
47089 +++ b/fs/locks.c
47090 @@ -2076,16 +2076,16 @@ void locks_remove_flock(struct file *filp)
47091 return;
47092
47093 if (filp->f_op && filp->f_op->flock) {
47094 - struct file_lock fl = {
47095 + struct file_lock flock = {
47096 .fl_pid = current->tgid,
47097 .fl_file = filp,
47098 .fl_flags = FL_FLOCK,
47099 .fl_type = F_UNLCK,
47100 .fl_end = OFFSET_MAX,
47101 };
47102 - filp->f_op->flock(filp, F_SETLKW, &fl);
47103 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
47104 - fl.fl_ops->fl_release_private(&fl);
47105 + filp->f_op->flock(filp, F_SETLKW, &flock);
47106 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
47107 + flock.fl_ops->fl_release_private(&flock);
47108 }
47109
47110 lock_flocks();
47111 diff --git a/fs/namei.c b/fs/namei.c
47112 index 7d69419..10c6af6 100644
47113 --- a/fs/namei.c
47114 +++ b/fs/namei.c
47115 @@ -265,16 +265,32 @@ int generic_permission(struct inode *inode, int mask)
47116 if (ret != -EACCES)
47117 return ret;
47118
47119 +#ifdef CONFIG_GRKERNSEC
47120 + /* we'll block if we have to log due to a denied capability use */
47121 + if (mask & MAY_NOT_BLOCK)
47122 + return -ECHILD;
47123 +#endif
47124 +
47125 if (S_ISDIR(inode->i_mode)) {
47126 /* DACs are overridable for directories */
47127 - if (inode_capable(inode, CAP_DAC_OVERRIDE))
47128 - return 0;
47129 if (!(mask & MAY_WRITE))
47130 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
47131 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
47132 + inode_capable(inode, CAP_DAC_READ_SEARCH))
47133 return 0;
47134 + if (inode_capable(inode, CAP_DAC_OVERRIDE))
47135 + return 0;
47136 return -EACCES;
47137 }
47138 /*
47139 + * Searching includes executable on directories, else just read.
47140 + */
47141 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
47142 + if (mask == MAY_READ)
47143 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
47144 + inode_capable(inode, CAP_DAC_READ_SEARCH))
47145 + return 0;
47146 +
47147 + /*
47148 * Read/write DACs are always overridable.
47149 * Executable DACs are overridable when there is
47150 * at least one exec bit set.
47151 @@ -283,14 +299,6 @@ int generic_permission(struct inode *inode, int mask)
47152 if (inode_capable(inode, CAP_DAC_OVERRIDE))
47153 return 0;
47154
47155 - /*
47156 - * Searching includes executable on directories, else just read.
47157 - */
47158 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
47159 - if (mask == MAY_READ)
47160 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
47161 - return 0;
47162 -
47163 return -EACCES;
47164 }
47165
47166 @@ -639,11 +647,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
47167 return error;
47168 }
47169
47170 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
47171 + dentry->d_inode, dentry, nd->path.mnt)) {
47172 + error = -EACCES;
47173 + *p = ERR_PTR(error); /* no ->put_link(), please */
47174 + path_put(&nd->path);
47175 + return error;
47176 + }
47177 +
47178 nd->last_type = LAST_BIND;
47179 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
47180 error = PTR_ERR(*p);
47181 if (!IS_ERR(*p)) {
47182 - char *s = nd_get_link(nd);
47183 + const char *s = nd_get_link(nd);
47184 error = 0;
47185 if (s)
47186 error = __vfs_follow_link(nd, s);
47187 @@ -1386,6 +1402,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
47188 if (!res)
47189 res = walk_component(nd, path, &nd->last,
47190 nd->last_type, LOOKUP_FOLLOW);
47191 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
47192 + res = -EACCES;
47193 put_link(nd, &link, cookie);
47194 } while (res > 0);
47195
47196 @@ -1779,6 +1797,8 @@ static int path_lookupat(int dfd, const char *name,
47197 err = follow_link(&link, nd, &cookie);
47198 if (!err)
47199 err = lookup_last(nd, &path);
47200 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
47201 + err = -EACCES;
47202 put_link(nd, &link, cookie);
47203 }
47204 }
47205 @@ -1786,6 +1806,21 @@ static int path_lookupat(int dfd, const char *name,
47206 if (!err)
47207 err = complete_walk(nd);
47208
47209 + if (!(nd->flags & LOOKUP_PARENT)) {
47210 +#ifdef CONFIG_GRKERNSEC
47211 + if (flags & LOOKUP_RCU) {
47212 + if (!err)
47213 + path_put(&nd->path);
47214 + err = -ECHILD;
47215 + } else
47216 +#endif
47217 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47218 + if (!err)
47219 + path_put(&nd->path);
47220 + err = -ENOENT;
47221 + }
47222 + }
47223 +
47224 if (!err && nd->flags & LOOKUP_DIRECTORY) {
47225 if (!nd->inode->i_op->lookup) {
47226 path_put(&nd->path);
47227 @@ -1813,6 +1848,15 @@ static int do_path_lookup(int dfd, const char *name,
47228 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
47229
47230 if (likely(!retval)) {
47231 + if (*name != '/' && nd->path.dentry && nd->inode) {
47232 +#ifdef CONFIG_GRKERNSEC
47233 + if (flags & LOOKUP_RCU)
47234 + return -ECHILD;
47235 +#endif
47236 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
47237 + return -ENOENT;
47238 + }
47239 +
47240 if (unlikely(!audit_dummy_context())) {
47241 if (nd->path.dentry && nd->inode)
47242 audit_inode(name, nd->path.dentry);
47243 @@ -2155,6 +2199,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
47244 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
47245 return -EPERM;
47246
47247 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
47248 + return -EPERM;
47249 + if (gr_handle_rawio(inode))
47250 + return -EPERM;
47251 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
47252 + return -EACCES;
47253 +
47254 return 0;
47255 }
47256
47257 @@ -2190,7 +2241,7 @@ static inline int open_to_namei_flags(int flag)
47258 /*
47259 * Handle the last step of open()
47260 */
47261 -static struct file *do_last(struct nameidata *nd, struct path *path,
47262 +static struct file *do_last(struct nameidata *nd, struct path *path, struct path *link,
47263 const struct open_flags *op, const char *pathname)
47264 {
47265 struct dentry *dir = nd->path.dentry;
47266 @@ -2220,16 +2271,44 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
47267 error = complete_walk(nd);
47268 if (error)
47269 return ERR_PTR(error);
47270 +#ifdef CONFIG_GRKERNSEC
47271 + if (nd->flags & LOOKUP_RCU) {
47272 + error = -ECHILD;
47273 + goto exit;
47274 + }
47275 +#endif
47276 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47277 + error = -ENOENT;
47278 + goto exit;
47279 + }
47280 audit_inode(pathname, nd->path.dentry);
47281 if (open_flag & O_CREAT) {
47282 error = -EISDIR;
47283 goto exit;
47284 }
47285 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
47286 + error = -EACCES;
47287 + goto exit;
47288 + }
47289 goto ok;
47290 case LAST_BIND:
47291 error = complete_walk(nd);
47292 if (error)
47293 return ERR_PTR(error);
47294 +#ifdef CONFIG_GRKERNSEC
47295 + if (nd->flags & LOOKUP_RCU) {
47296 + error = -ECHILD;
47297 + goto exit;
47298 + }
47299 +#endif
47300 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
47301 + error = -ENOENT;
47302 + goto exit;
47303 + }
47304 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
47305 + error = -EACCES;
47306 + goto exit;
47307 + }
47308 audit_inode(pathname, dir);
47309 goto ok;
47310 }
47311 @@ -2285,6 +2364,12 @@ retry_lookup:
47312 /* Negative dentry, just create the file */
47313 if (!dentry->d_inode) {
47314 umode_t mode = op->mode;
47315 +
47316 + if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
47317 + error = -EACCES;
47318 + goto exit_mutex_unlock;
47319 + }
47320 +
47321 if (!IS_POSIXACL(dir->d_inode))
47322 mode &= ~current_umask();
47323 /*
47324 @@ -2308,6 +2393,8 @@ retry_lookup:
47325 error = vfs_create(dir->d_inode, dentry, mode, nd);
47326 if (error)
47327 goto exit_mutex_unlock;
47328 + else
47329 + gr_handle_create(path->dentry, path->mnt);
47330 mutex_unlock(&dir->d_inode->i_mutex);
47331 dput(nd->path.dentry);
47332 nd->path.dentry = dentry;
47333 @@ -2317,6 +2404,23 @@ retry_lookup:
47334 /*
47335 * It already exists.
47336 */
47337 +
47338 + if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
47339 + error = -ENOENT;
47340 + goto exit_mutex_unlock;
47341 + }
47342 + if (link && gr_handle_symlink_owner(link, dentry->d_inode)) {
47343 + error = -EACCES;
47344 + goto exit_mutex_unlock;
47345 + }
47346 +
47347 + /* only check if O_CREAT is specified, all other checks need to go
47348 + into may_open */
47349 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
47350 + error = -EACCES;
47351 + goto exit_mutex_unlock;
47352 + }
47353 +
47354 mutex_unlock(&dir->d_inode->i_mutex);
47355 audit_inode(pathname, path->dentry);
47356
47357 @@ -2349,6 +2453,11 @@ finish_lookup:
47358 }
47359 }
47360 BUG_ON(inode != path->dentry->d_inode);
47361 + /* if we're resolving a symlink to another symlink */
47362 + if (link && gr_handle_symlink_owner(link, inode)) {
47363 + error = -EACCES;
47364 + goto exit;
47365 + }
47366 return NULL;
47367 }
47368
47369 @@ -2358,7 +2467,6 @@ finish_lookup:
47370 save_parent.dentry = nd->path.dentry;
47371 save_parent.mnt = mntget(path->mnt);
47372 nd->path.dentry = path->dentry;
47373 -
47374 }
47375 nd->inode = inode;
47376 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
47377 @@ -2367,6 +2475,21 @@ finish_lookup:
47378 path_put(&save_parent);
47379 return ERR_PTR(error);
47380 }
47381 +#ifdef CONFIG_GRKERNSEC
47382 + if (nd->flags & LOOKUP_RCU) {
47383 + error = -ECHILD;
47384 + goto exit;
47385 + }
47386 +#endif
47387 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
47388 + error = -ENOENT;
47389 + goto exit;
47390 + }
47391 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
47392 + error = -EACCES;
47393 + goto exit;
47394 + }
47395 +
47396 error = -EISDIR;
47397 if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
47398 goto exit;
47399 @@ -2461,7 +2584,7 @@ static struct file *path_openat(int dfd, const char *pathname,
47400 if (unlikely(error))
47401 goto out_filp;
47402
47403 - filp = do_last(nd, &path, op, pathname);
47404 + filp = do_last(nd, &path, NULL, op, pathname);
47405 while (unlikely(!filp)) { /* trailing symlink */
47406 struct path link = path;
47407 void *cookie;
47408 @@ -2476,8 +2599,9 @@ static struct file *path_openat(int dfd, const char *pathname,
47409 error = follow_link(&link, nd, &cookie);
47410 if (unlikely(error))
47411 filp = ERR_PTR(error);
47412 - else
47413 - filp = do_last(nd, &path, op, pathname);
47414 + else {
47415 + filp = do_last(nd, &path, &link, op, pathname);
47416 + }
47417 put_link(nd, &link, cookie);
47418 }
47419 out:
47420 @@ -2577,6 +2701,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
47421 *path = nd.path;
47422 return dentry;
47423 eexist:
47424 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
47425 + dput(dentry);
47426 + dentry = ERR_PTR(-ENOENT);
47427 + goto fail;
47428 + }
47429 dput(dentry);
47430 dentry = ERR_PTR(-EEXIST);
47431 fail:
47432 @@ -2599,6 +2728,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
47433 }
47434 EXPORT_SYMBOL(user_path_create);
47435
47436 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
47437 +{
47438 + char *tmp = getname(pathname);
47439 + struct dentry *res;
47440 + if (IS_ERR(tmp))
47441 + return ERR_CAST(tmp);
47442 + res = kern_path_create(dfd, tmp, path, is_dir);
47443 + if (IS_ERR(res))
47444 + putname(tmp);
47445 + else
47446 + *to = tmp;
47447 + return res;
47448 +}
47449 +
47450 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
47451 {
47452 int error = may_create(dir, dentry);
47453 @@ -2665,6 +2808,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
47454 error = mnt_want_write(path.mnt);
47455 if (error)
47456 goto out_dput;
47457 +
47458 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
47459 + error = -EPERM;
47460 + goto out_drop_write;
47461 + }
47462 +
47463 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
47464 + error = -EACCES;
47465 + goto out_drop_write;
47466 + }
47467 +
47468 error = security_path_mknod(&path, dentry, mode, dev);
47469 if (error)
47470 goto out_drop_write;
47471 @@ -2682,6 +2836,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
47472 }
47473 out_drop_write:
47474 mnt_drop_write(path.mnt);
47475 +
47476 + if (!error)
47477 + gr_handle_create(dentry, path.mnt);
47478 out_dput:
47479 dput(dentry);
47480 mutex_unlock(&path.dentry->d_inode->i_mutex);
47481 @@ -2735,12 +2892,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
47482 error = mnt_want_write(path.mnt);
47483 if (error)
47484 goto out_dput;
47485 +
47486 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
47487 + error = -EACCES;
47488 + goto out_drop_write;
47489 + }
47490 +
47491 error = security_path_mkdir(&path, dentry, mode);
47492 if (error)
47493 goto out_drop_write;
47494 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
47495 out_drop_write:
47496 mnt_drop_write(path.mnt);
47497 +
47498 + if (!error)
47499 + gr_handle_create(dentry, path.mnt);
47500 out_dput:
47501 dput(dentry);
47502 mutex_unlock(&path.dentry->d_inode->i_mutex);
47503 @@ -2820,6 +2986,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47504 char * name;
47505 struct dentry *dentry;
47506 struct nameidata nd;
47507 + ino_t saved_ino = 0;
47508 + dev_t saved_dev = 0;
47509
47510 error = user_path_parent(dfd, pathname, &nd, &name);
47511 if (error)
47512 @@ -2848,6 +3016,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
47513 error = -ENOENT;
47514 goto exit3;
47515 }
47516 +
47517 + saved_ino = dentry->d_inode->i_ino;
47518 + saved_dev = gr_get_dev_from_dentry(dentry);
47519 +
47520 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
47521 + error = -EACCES;
47522 + goto exit3;
47523 + }
47524 +
47525 error = mnt_want_write(nd.path.mnt);
47526 if (error)
47527 goto exit3;
47528 @@ -2855,6 +3032,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47529 if (error)
47530 goto exit4;
47531 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
47532 + if (!error && (saved_dev || saved_ino))
47533 + gr_handle_delete(saved_ino, saved_dev);
47534 exit4:
47535 mnt_drop_write(nd.path.mnt);
47536 exit3:
47537 @@ -2917,6 +3096,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47538 struct dentry *dentry;
47539 struct nameidata nd;
47540 struct inode *inode = NULL;
47541 + ino_t saved_ino = 0;
47542 + dev_t saved_dev = 0;
47543
47544 error = user_path_parent(dfd, pathname, &nd, &name);
47545 if (error)
47546 @@ -2939,6 +3120,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47547 if (!inode)
47548 goto slashes;
47549 ihold(inode);
47550 +
47551 + if (inode->i_nlink <= 1) {
47552 + saved_ino = inode->i_ino;
47553 + saved_dev = gr_get_dev_from_dentry(dentry);
47554 + }
47555 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47556 + error = -EACCES;
47557 + goto exit2;
47558 + }
47559 +
47560 error = mnt_want_write(nd.path.mnt);
47561 if (error)
47562 goto exit2;
47563 @@ -2946,6 +3137,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47564 if (error)
47565 goto exit3;
47566 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47567 + if (!error && (saved_ino || saved_dev))
47568 + gr_handle_delete(saved_ino, saved_dev);
47569 exit3:
47570 mnt_drop_write(nd.path.mnt);
47571 exit2:
47572 @@ -3021,10 +3214,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
47573 error = mnt_want_write(path.mnt);
47574 if (error)
47575 goto out_dput;
47576 +
47577 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
47578 + error = -EACCES;
47579 + goto out_drop_write;
47580 + }
47581 +
47582 error = security_path_symlink(&path, dentry, from);
47583 if (error)
47584 goto out_drop_write;
47585 error = vfs_symlink(path.dentry->d_inode, dentry, from);
47586 + if (!error)
47587 + gr_handle_create(dentry, path.mnt);
47588 out_drop_write:
47589 mnt_drop_write(path.mnt);
47590 out_dput:
47591 @@ -3099,6 +3300,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47592 {
47593 struct dentry *new_dentry;
47594 struct path old_path, new_path;
47595 + char *to = NULL;
47596 int how = 0;
47597 int error;
47598
47599 @@ -3122,7 +3324,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47600 if (error)
47601 return error;
47602
47603 - new_dentry = user_path_create(newdfd, newname, &new_path, 0);
47604 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
47605 error = PTR_ERR(new_dentry);
47606 if (IS_ERR(new_dentry))
47607 goto out;
47608 @@ -3133,13 +3335,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47609 error = mnt_want_write(new_path.mnt);
47610 if (error)
47611 goto out_dput;
47612 +
47613 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47614 + old_path.dentry->d_inode,
47615 + old_path.dentry->d_inode->i_mode, to)) {
47616 + error = -EACCES;
47617 + goto out_drop_write;
47618 + }
47619 +
47620 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
47621 + old_path.dentry, old_path.mnt, to)) {
47622 + error = -EACCES;
47623 + goto out_drop_write;
47624 + }
47625 +
47626 error = security_path_link(old_path.dentry, &new_path, new_dentry);
47627 if (error)
47628 goto out_drop_write;
47629 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
47630 + if (!error)
47631 + gr_handle_create(new_dentry, new_path.mnt);
47632 out_drop_write:
47633 mnt_drop_write(new_path.mnt);
47634 out_dput:
47635 + putname(to);
47636 dput(new_dentry);
47637 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
47638 path_put(&new_path);
47639 @@ -3373,6 +3592,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47640 if (new_dentry == trap)
47641 goto exit5;
47642
47643 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47644 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
47645 + to);
47646 + if (error)
47647 + goto exit5;
47648 +
47649 error = mnt_want_write(oldnd.path.mnt);
47650 if (error)
47651 goto exit5;
47652 @@ -3382,6 +3607,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47653 goto exit6;
47654 error = vfs_rename(old_dir->d_inode, old_dentry,
47655 new_dir->d_inode, new_dentry);
47656 + if (!error)
47657 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47658 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47659 exit6:
47660 mnt_drop_write(oldnd.path.mnt);
47661 exit5:
47662 @@ -3407,6 +3635,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
47663
47664 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47665 {
47666 + char tmpbuf[64];
47667 + const char *newlink;
47668 int len;
47669
47670 len = PTR_ERR(link);
47671 @@ -3416,7 +3646,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
47672 len = strlen(link);
47673 if (len > (unsigned) buflen)
47674 len = buflen;
47675 - if (copy_to_user(buffer, link, len))
47676 +
47677 + if (len < sizeof(tmpbuf)) {
47678 + memcpy(tmpbuf, link, len);
47679 + newlink = tmpbuf;
47680 + } else
47681 + newlink = link;
47682 +
47683 + if (copy_to_user(buffer, newlink, len))
47684 len = -EFAULT;
47685 out:
47686 return len;
47687 diff --git a/fs/namespace.c b/fs/namespace.c
47688 index 1e4a5fe..a5ce747 100644
47689 --- a/fs/namespace.c
47690 +++ b/fs/namespace.c
47691 @@ -1157,6 +1157,9 @@ static int do_umount(struct mount *mnt, int flags)
47692 if (!(sb->s_flags & MS_RDONLY))
47693 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47694 up_write(&sb->s_umount);
47695 +
47696 + gr_log_remount(mnt->mnt_devname, retval);
47697 +
47698 return retval;
47699 }
47700
47701 @@ -1176,6 +1179,9 @@ static int do_umount(struct mount *mnt, int flags)
47702 br_write_unlock(&vfsmount_lock);
47703 up_write(&namespace_sem);
47704 release_mounts(&umount_list);
47705 +
47706 + gr_log_unmount(mnt->mnt_devname, retval);
47707 +
47708 return retval;
47709 }
47710
47711 @@ -2177,6 +2183,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47712 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
47713 MS_STRICTATIME);
47714
47715 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47716 + retval = -EPERM;
47717 + goto dput_out;
47718 + }
47719 +
47720 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47721 + retval = -EPERM;
47722 + goto dput_out;
47723 + }
47724 +
47725 if (flags & MS_REMOUNT)
47726 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47727 data_page);
47728 @@ -2191,6 +2207,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47729 dev_name, data_page);
47730 dput_out:
47731 path_put(&path);
47732 +
47733 + gr_log_mount(dev_name, dir_name, retval);
47734 +
47735 return retval;
47736 }
47737
47738 @@ -2472,6 +2491,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
47739 if (error)
47740 goto out2;
47741
47742 + if (gr_handle_chroot_pivot()) {
47743 + error = -EPERM;
47744 + goto out2;
47745 + }
47746 +
47747 get_fs_root(current->fs, &root);
47748 error = lock_mount(&old);
47749 if (error)
47750 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
47751 index f729698..2bac081 100644
47752 --- a/fs/nfs/inode.c
47753 +++ b/fs/nfs/inode.c
47754 @@ -152,7 +152,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
47755 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47756 nfsi->attrtimeo_timestamp = jiffies;
47757
47758 - memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47759 + memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47760 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47761 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47762 else
47763 @@ -1008,16 +1008,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
47764 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47765 }
47766
47767 -static atomic_long_t nfs_attr_generation_counter;
47768 +static atomic_long_unchecked_t nfs_attr_generation_counter;
47769
47770 static unsigned long nfs_read_attr_generation_counter(void)
47771 {
47772 - return atomic_long_read(&nfs_attr_generation_counter);
47773 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47774 }
47775
47776 unsigned long nfs_inc_attr_generation_counter(void)
47777 {
47778 - return atomic_long_inc_return(&nfs_attr_generation_counter);
47779 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47780 }
47781
47782 void nfs_fattr_init(struct nfs_fattr *fattr)
47783 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
47784 index c8bd9c3..4f83416 100644
47785 --- a/fs/nfsd/vfs.c
47786 +++ b/fs/nfsd/vfs.c
47787 @@ -933,7 +933,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47788 } else {
47789 oldfs = get_fs();
47790 set_fs(KERNEL_DS);
47791 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47792 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47793 set_fs(oldfs);
47794 }
47795
47796 @@ -1037,7 +1037,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47797
47798 /* Write the data. */
47799 oldfs = get_fs(); set_fs(KERNEL_DS);
47800 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47801 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47802 set_fs(oldfs);
47803 if (host_err < 0)
47804 goto out_nfserr;
47805 @@ -1573,7 +1573,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
47806 */
47807
47808 oldfs = get_fs(); set_fs(KERNEL_DS);
47809 - host_err = inode->i_op->readlink(path.dentry, buf, *lenp);
47810 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
47811 set_fs(oldfs);
47812
47813 if (host_err < 0)
47814 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
47815 index 3568c8a..e0240d8 100644
47816 --- a/fs/notify/fanotify/fanotify_user.c
47817 +++ b/fs/notify/fanotify/fanotify_user.c
47818 @@ -278,7 +278,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
47819 goto out_close_fd;
47820
47821 ret = -EFAULT;
47822 - if (copy_to_user(buf, &fanotify_event_metadata,
47823 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
47824 + copy_to_user(buf, &fanotify_event_metadata,
47825 fanotify_event_metadata.event_len))
47826 goto out_kill_access_response;
47827
47828 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
47829 index c887b13..0fdf472 100644
47830 --- a/fs/notify/notification.c
47831 +++ b/fs/notify/notification.c
47832 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
47833 * get set to 0 so it will never get 'freed'
47834 */
47835 static struct fsnotify_event *q_overflow_event;
47836 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47837 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47838
47839 /**
47840 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47841 @@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47842 */
47843 u32 fsnotify_get_cookie(void)
47844 {
47845 - return atomic_inc_return(&fsnotify_sync_cookie);
47846 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47847 }
47848 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47849
47850 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
47851 index 99e3610..02c1068 100644
47852 --- a/fs/ntfs/dir.c
47853 +++ b/fs/ntfs/dir.c
47854 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
47855 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47856 ~(s64)(ndir->itype.index.block_size - 1)));
47857 /* Bounds checks. */
47858 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47859 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47860 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47861 "inode 0x%lx or driver bug.", vdir->i_ino);
47862 goto err_out;
47863 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
47864 index 7389d2d..dfd5dbe 100644
47865 --- a/fs/ntfs/file.c
47866 +++ b/fs/ntfs/file.c
47867 @@ -2231,6 +2231,6 @@ const struct inode_operations ntfs_file_inode_ops = {
47868 #endif /* NTFS_RW */
47869 };
47870
47871 -const struct file_operations ntfs_empty_file_ops = {};
47872 +const struct file_operations ntfs_empty_file_ops __read_only;
47873
47874 -const struct inode_operations ntfs_empty_inode_ops = {};
47875 +const struct inode_operations ntfs_empty_inode_ops __read_only;
47876 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
47877 index 210c352..a174f83 100644
47878 --- a/fs/ocfs2/localalloc.c
47879 +++ b/fs/ocfs2/localalloc.c
47880 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
47881 goto bail;
47882 }
47883
47884 - atomic_inc(&osb->alloc_stats.moves);
47885 + atomic_inc_unchecked(&osb->alloc_stats.moves);
47886
47887 bail:
47888 if (handle)
47889 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
47890 index d355e6e..578d905 100644
47891 --- a/fs/ocfs2/ocfs2.h
47892 +++ b/fs/ocfs2/ocfs2.h
47893 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
47894
47895 struct ocfs2_alloc_stats
47896 {
47897 - atomic_t moves;
47898 - atomic_t local_data;
47899 - atomic_t bitmap_data;
47900 - atomic_t bg_allocs;
47901 - atomic_t bg_extends;
47902 + atomic_unchecked_t moves;
47903 + atomic_unchecked_t local_data;
47904 + atomic_unchecked_t bitmap_data;
47905 + atomic_unchecked_t bg_allocs;
47906 + atomic_unchecked_t bg_extends;
47907 };
47908
47909 enum ocfs2_local_alloc_state
47910 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
47911 index f169da4..9112253 100644
47912 --- a/fs/ocfs2/suballoc.c
47913 +++ b/fs/ocfs2/suballoc.c
47914 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
47915 mlog_errno(status);
47916 goto bail;
47917 }
47918 - atomic_inc(&osb->alloc_stats.bg_extends);
47919 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
47920
47921 /* You should never ask for this much metadata */
47922 BUG_ON(bits_wanted >
47923 @@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
47924 mlog_errno(status);
47925 goto bail;
47926 }
47927 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47928 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47929
47930 *suballoc_loc = res.sr_bg_blkno;
47931 *suballoc_bit_start = res.sr_bit_offset;
47932 @@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
47933 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
47934 res->sr_bits);
47935
47936 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47937 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47938
47939 BUG_ON(res->sr_bits != 1);
47940
47941 @@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
47942 mlog_errno(status);
47943 goto bail;
47944 }
47945 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47946 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47947
47948 BUG_ON(res.sr_bits != 1);
47949
47950 @@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47951 cluster_start,
47952 num_clusters);
47953 if (!status)
47954 - atomic_inc(&osb->alloc_stats.local_data);
47955 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
47956 } else {
47957 if (min_clusters > (osb->bitmap_cpg - 1)) {
47958 /* The only paths asking for contiguousness
47959 @@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47960 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
47961 res.sr_bg_blkno,
47962 res.sr_bit_offset);
47963 - atomic_inc(&osb->alloc_stats.bitmap_data);
47964 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
47965 *num_clusters = res.sr_bits;
47966 }
47967 }
47968 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
47969 index 68f4541..89cfe6a 100644
47970 --- a/fs/ocfs2/super.c
47971 +++ b/fs/ocfs2/super.c
47972 @@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
47973 "%10s => GlobalAllocs: %d LocalAllocs: %d "
47974 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
47975 "Stats",
47976 - atomic_read(&osb->alloc_stats.bitmap_data),
47977 - atomic_read(&osb->alloc_stats.local_data),
47978 - atomic_read(&osb->alloc_stats.bg_allocs),
47979 - atomic_read(&osb->alloc_stats.moves),
47980 - atomic_read(&osb->alloc_stats.bg_extends));
47981 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
47982 + atomic_read_unchecked(&osb->alloc_stats.local_data),
47983 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
47984 + atomic_read_unchecked(&osb->alloc_stats.moves),
47985 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
47986
47987 out += snprintf(buf + out, len - out,
47988 "%10s => State: %u Descriptor: %llu Size: %u bits "
47989 @@ -2116,11 +2116,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
47990 spin_lock_init(&osb->osb_xattr_lock);
47991 ocfs2_init_steal_slots(osb);
47992
47993 - atomic_set(&osb->alloc_stats.moves, 0);
47994 - atomic_set(&osb->alloc_stats.local_data, 0);
47995 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
47996 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
47997 - atomic_set(&osb->alloc_stats.bg_extends, 0);
47998 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
47999 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
48000 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
48001 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
48002 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
48003
48004 /* Copy the blockcheck stats from the superblock probe */
48005 osb->osb_ecc_stats = *stats;
48006 diff --git a/fs/open.c b/fs/open.c
48007 index 1540632..79d7242 100644
48008 --- a/fs/open.c
48009 +++ b/fs/open.c
48010 @@ -31,6 +31,8 @@
48011 #include <linux/ima.h>
48012 #include <linux/dnotify.h>
48013
48014 +#define CREATE_TRACE_POINTS
48015 +#include <trace/events/fs.h>
48016 #include "internal.h"
48017
48018 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
48019 @@ -112,6 +114,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
48020 error = locks_verify_truncate(inode, NULL, length);
48021 if (!error)
48022 error = security_path_truncate(&path);
48023 +
48024 + if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
48025 + error = -EACCES;
48026 +
48027 if (!error)
48028 error = do_truncate(path.dentry, length, 0, NULL);
48029
48030 @@ -359,6 +365,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
48031 if (__mnt_is_readonly(path.mnt))
48032 res = -EROFS;
48033
48034 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
48035 + res = -EACCES;
48036 +
48037 out_path_release:
48038 path_put(&path);
48039 out:
48040 @@ -385,6 +394,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
48041 if (error)
48042 goto dput_and_out;
48043
48044 + gr_log_chdir(path.dentry, path.mnt);
48045 +
48046 set_fs_pwd(current->fs, &path);
48047
48048 dput_and_out:
48049 @@ -411,6 +422,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
48050 goto out_putf;
48051
48052 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
48053 +
48054 + if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
48055 + error = -EPERM;
48056 +
48057 + if (!error)
48058 + gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
48059 +
48060 if (!error)
48061 set_fs_pwd(current->fs, &file->f_path);
48062 out_putf:
48063 @@ -439,7 +457,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
48064 if (error)
48065 goto dput_and_out;
48066
48067 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
48068 + goto dput_and_out;
48069 +
48070 set_fs_root(current->fs, &path);
48071 +
48072 + gr_handle_chroot_chdir(&path);
48073 +
48074 error = 0;
48075 dput_and_out:
48076 path_put(&path);
48077 @@ -457,6 +481,16 @@ static int chmod_common(struct path *path, umode_t mode)
48078 if (error)
48079 return error;
48080 mutex_lock(&inode->i_mutex);
48081 +
48082 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
48083 + error = -EACCES;
48084 + goto out_unlock;
48085 + }
48086 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
48087 + error = -EACCES;
48088 + goto out_unlock;
48089 + }
48090 +
48091 error = security_path_chmod(path, mode);
48092 if (error)
48093 goto out_unlock;
48094 @@ -512,6 +546,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
48095 uid = make_kuid(current_user_ns(), user);
48096 gid = make_kgid(current_user_ns(), group);
48097
48098 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
48099 + return -EACCES;
48100 +
48101 newattrs.ia_valid = ATTR_CTIME;
48102 if (user != (uid_t) -1) {
48103 if (!uid_valid(uid))
48104 @@ -1035,6 +1072,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
48105 } else {
48106 fsnotify_open(f);
48107 fd_install(fd, f);
48108 + trace_do_sys_open(tmp, flags, mode);
48109 }
48110 }
48111 putname(tmp);
48112 diff --git a/fs/pipe.c b/fs/pipe.c
48113 index 49c1065..13b9e12 100644
48114 --- a/fs/pipe.c
48115 +++ b/fs/pipe.c
48116 @@ -438,9 +438,9 @@ redo:
48117 }
48118 if (bufs) /* More to do? */
48119 continue;
48120 - if (!pipe->writers)
48121 + if (!atomic_read(&pipe->writers))
48122 break;
48123 - if (!pipe->waiting_writers) {
48124 + if (!atomic_read(&pipe->waiting_writers)) {
48125 /* syscall merging: Usually we must not sleep
48126 * if O_NONBLOCK is set, or if we got some data.
48127 * But if a writer sleeps in kernel space, then
48128 @@ -504,7 +504,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
48129 mutex_lock(&inode->i_mutex);
48130 pipe = inode->i_pipe;
48131
48132 - if (!pipe->readers) {
48133 + if (!atomic_read(&pipe->readers)) {
48134 send_sig(SIGPIPE, current, 0);
48135 ret = -EPIPE;
48136 goto out;
48137 @@ -553,7 +553,7 @@ redo1:
48138 for (;;) {
48139 int bufs;
48140
48141 - if (!pipe->readers) {
48142 + if (!atomic_read(&pipe->readers)) {
48143 send_sig(SIGPIPE, current, 0);
48144 if (!ret)
48145 ret = -EPIPE;
48146 @@ -644,9 +644,9 @@ redo2:
48147 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
48148 do_wakeup = 0;
48149 }
48150 - pipe->waiting_writers++;
48151 + atomic_inc(&pipe->waiting_writers);
48152 pipe_wait(pipe);
48153 - pipe->waiting_writers--;
48154 + atomic_dec(&pipe->waiting_writers);
48155 }
48156 out:
48157 mutex_unlock(&inode->i_mutex);
48158 @@ -716,7 +716,7 @@ pipe_poll(struct file *filp, poll_table *wait)
48159 mask = 0;
48160 if (filp->f_mode & FMODE_READ) {
48161 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
48162 - if (!pipe->writers && filp->f_version != pipe->w_counter)
48163 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
48164 mask |= POLLHUP;
48165 }
48166
48167 @@ -726,7 +726,7 @@ pipe_poll(struct file *filp, poll_table *wait)
48168 * Most Unices do not set POLLERR for FIFOs but on Linux they
48169 * behave exactly like pipes for poll().
48170 */
48171 - if (!pipe->readers)
48172 + if (!atomic_read(&pipe->readers))
48173 mask |= POLLERR;
48174 }
48175
48176 @@ -740,10 +740,10 @@ pipe_release(struct inode *inode, int decr, int decw)
48177
48178 mutex_lock(&inode->i_mutex);
48179 pipe = inode->i_pipe;
48180 - pipe->readers -= decr;
48181 - pipe->writers -= decw;
48182 + atomic_sub(decr, &pipe->readers);
48183 + atomic_sub(decw, &pipe->writers);
48184
48185 - if (!pipe->readers && !pipe->writers) {
48186 + if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
48187 free_pipe_info(inode);
48188 } else {
48189 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
48190 @@ -833,7 +833,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
48191
48192 if (inode->i_pipe) {
48193 ret = 0;
48194 - inode->i_pipe->readers++;
48195 + atomic_inc(&inode->i_pipe->readers);
48196 }
48197
48198 mutex_unlock(&inode->i_mutex);
48199 @@ -850,7 +850,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
48200
48201 if (inode->i_pipe) {
48202 ret = 0;
48203 - inode->i_pipe->writers++;
48204 + atomic_inc(&inode->i_pipe->writers);
48205 }
48206
48207 mutex_unlock(&inode->i_mutex);
48208 @@ -868,9 +868,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
48209 if (inode->i_pipe) {
48210 ret = 0;
48211 if (filp->f_mode & FMODE_READ)
48212 - inode->i_pipe->readers++;
48213 + atomic_inc(&inode->i_pipe->readers);
48214 if (filp->f_mode & FMODE_WRITE)
48215 - inode->i_pipe->writers++;
48216 + atomic_inc(&inode->i_pipe->writers);
48217 }
48218
48219 mutex_unlock(&inode->i_mutex);
48220 @@ -962,7 +962,7 @@ void free_pipe_info(struct inode *inode)
48221 inode->i_pipe = NULL;
48222 }
48223
48224 -static struct vfsmount *pipe_mnt __read_mostly;
48225 +struct vfsmount *pipe_mnt __read_mostly;
48226
48227 /*
48228 * pipefs_dname() is called from d_path().
48229 @@ -992,7 +992,8 @@ static struct inode * get_pipe_inode(void)
48230 goto fail_iput;
48231 inode->i_pipe = pipe;
48232
48233 - pipe->readers = pipe->writers = 1;
48234 + atomic_set(&pipe->readers, 1);
48235 + atomic_set(&pipe->writers, 1);
48236 inode->i_fop = &rdwr_pipefifo_fops;
48237
48238 /*
48239 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
48240 index 15af622..0e9f4467 100644
48241 --- a/fs/proc/Kconfig
48242 +++ b/fs/proc/Kconfig
48243 @@ -30,12 +30,12 @@ config PROC_FS
48244
48245 config PROC_KCORE
48246 bool "/proc/kcore support" if !ARM
48247 - depends on PROC_FS && MMU
48248 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
48249
48250 config PROC_VMCORE
48251 bool "/proc/vmcore support"
48252 - depends on PROC_FS && CRASH_DUMP
48253 - default y
48254 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
48255 + default n
48256 help
48257 Exports the dump image of crashed kernel in ELF format.
48258
48259 @@ -59,8 +59,8 @@ config PROC_SYSCTL
48260 limited in memory.
48261
48262 config PROC_PAGE_MONITOR
48263 - default y
48264 - depends on PROC_FS && MMU
48265 + default n
48266 + depends on PROC_FS && MMU && !GRKERNSEC
48267 bool "Enable /proc page monitoring" if EXPERT
48268 help
48269 Various /proc files exist to monitor process memory utilization:
48270 diff --git a/fs/proc/array.c b/fs/proc/array.c
48271 index c1c207c..5179411 100644
48272 --- a/fs/proc/array.c
48273 +++ b/fs/proc/array.c
48274 @@ -60,6 +60,7 @@
48275 #include <linux/tty.h>
48276 #include <linux/string.h>
48277 #include <linux/mman.h>
48278 +#include <linux/grsecurity.h>
48279 #include <linux/proc_fs.h>
48280 #include <linux/ioport.h>
48281 #include <linux/uaccess.h>
48282 @@ -346,6 +347,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
48283 seq_putc(m, '\n');
48284 }
48285
48286 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48287 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
48288 +{
48289 + if (p->mm)
48290 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
48291 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
48292 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
48293 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
48294 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
48295 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
48296 + else
48297 + seq_printf(m, "PaX:\t-----\n");
48298 +}
48299 +#endif
48300 +
48301 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48302 struct pid *pid, struct task_struct *task)
48303 {
48304 @@ -363,9 +379,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48305 task_cpus_allowed(m, task);
48306 cpuset_task_status_allowed(m, task);
48307 task_context_switch_counts(m, task);
48308 +
48309 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
48310 + task_pax(m, task);
48311 +#endif
48312 +
48313 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
48314 + task_grsec_rbac(m, task);
48315 +#endif
48316 +
48317 return 0;
48318 }
48319
48320 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48321 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48322 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
48323 + _mm->pax_flags & MF_PAX_SEGMEXEC))
48324 +#endif
48325 +
48326 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48327 struct pid *pid, struct task_struct *task, int whole)
48328 {
48329 @@ -387,6 +418,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48330 char tcomm[sizeof(task->comm)];
48331 unsigned long flags;
48332
48333 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48334 + if (current->exec_id != m->exec_id) {
48335 + gr_log_badprocpid("stat");
48336 + return 0;
48337 + }
48338 +#endif
48339 +
48340 state = *get_task_state(task);
48341 vsize = eip = esp = 0;
48342 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
48343 @@ -458,6 +496,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48344 gtime = task->gtime;
48345 }
48346
48347 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48348 + if (PAX_RAND_FLAGS(mm)) {
48349 + eip = 0;
48350 + esp = 0;
48351 + wchan = 0;
48352 + }
48353 +#endif
48354 +#ifdef CONFIG_GRKERNSEC_HIDESYM
48355 + wchan = 0;
48356 + eip =0;
48357 + esp =0;
48358 +#endif
48359 +
48360 /* scale priority and nice values from timeslices to -20..20 */
48361 /* to make it look like a "normal" Unix priority/nice value */
48362 priority = task_prio(task);
48363 @@ -494,9 +545,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48364 seq_put_decimal_ull(m, ' ', vsize);
48365 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
48366 seq_put_decimal_ull(m, ' ', rsslim);
48367 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48368 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
48369 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
48370 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
48371 +#else
48372 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
48373 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
48374 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
48375 +#endif
48376 seq_put_decimal_ull(m, ' ', esp);
48377 seq_put_decimal_ull(m, ' ', eip);
48378 /* The signal information here is obsolete.
48379 @@ -518,7 +575,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48380 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
48381 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
48382
48383 - if (mm && permitted) {
48384 + if (mm && permitted
48385 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48386 + && !PAX_RAND_FLAGS(mm)
48387 +#endif
48388 + ) {
48389 seq_put_decimal_ull(m, ' ', mm->start_data);
48390 seq_put_decimal_ull(m, ' ', mm->end_data);
48391 seq_put_decimal_ull(m, ' ', mm->start_brk);
48392 @@ -556,8 +617,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48393 struct pid *pid, struct task_struct *task)
48394 {
48395 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
48396 - struct mm_struct *mm = get_task_mm(task);
48397 + struct mm_struct *mm;
48398
48399 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48400 + if (current->exec_id != m->exec_id) {
48401 + gr_log_badprocpid("statm");
48402 + return 0;
48403 + }
48404 +#endif
48405 + mm = get_task_mm(task);
48406 if (mm) {
48407 size = task_statm(mm, &shared, &text, &data, &resident);
48408 mmput(mm);
48409 @@ -580,6 +648,21 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48410 return 0;
48411 }
48412
48413 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48414 +int proc_pid_ipaddr(struct task_struct *task, char *buffer)
48415 +{
48416 + u32 curr_ip = 0;
48417 + unsigned long flags;
48418 +
48419 + if (lock_task_sighand(task, &flags)) {
48420 + curr_ip = task->signal->curr_ip;
48421 + unlock_task_sighand(task, &flags);
48422 + }
48423 +
48424 + return sprintf(buffer, "%pI4\n", &curr_ip);
48425 +}
48426 +#endif
48427 +
48428 #ifdef CONFIG_CHECKPOINT_RESTORE
48429 static struct pid *
48430 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
48431 diff --git a/fs/proc/base.c b/fs/proc/base.c
48432 index 437195f..cd2210d 100644
48433 --- a/fs/proc/base.c
48434 +++ b/fs/proc/base.c
48435 @@ -110,6 +110,14 @@ struct pid_entry {
48436 union proc_op op;
48437 };
48438
48439 +struct getdents_callback {
48440 + struct linux_dirent __user * current_dir;
48441 + struct linux_dirent __user * previous;
48442 + struct file * file;
48443 + int count;
48444 + int error;
48445 +};
48446 +
48447 #define NOD(NAME, MODE, IOP, FOP, OP) { \
48448 .name = (NAME), \
48449 .len = sizeof(NAME) - 1, \
48450 @@ -209,6 +217,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
48451 if (!mm->arg_end)
48452 goto out_mm; /* Shh! No looking before we're done */
48453
48454 + if (gr_acl_handle_procpidmem(task))
48455 + goto out_mm;
48456 +
48457 len = mm->arg_end - mm->arg_start;
48458
48459 if (len > PAGE_SIZE)
48460 @@ -236,12 +247,28 @@ out:
48461 return res;
48462 }
48463
48464 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48465 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48466 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
48467 + _mm->pax_flags & MF_PAX_SEGMEXEC))
48468 +#endif
48469 +
48470 static int proc_pid_auxv(struct task_struct *task, char *buffer)
48471 {
48472 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
48473 int res = PTR_ERR(mm);
48474 if (mm && !IS_ERR(mm)) {
48475 unsigned int nwords = 0;
48476 +
48477 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48478 + /* allow if we're currently ptracing this task */
48479 + if (PAX_RAND_FLAGS(mm) &&
48480 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
48481 + mmput(mm);
48482 + return 0;
48483 + }
48484 +#endif
48485 +
48486 do {
48487 nwords += 2;
48488 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
48489 @@ -255,7 +282,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
48490 }
48491
48492
48493 -#ifdef CONFIG_KALLSYMS
48494 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48495 /*
48496 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
48497 * Returns the resolved symbol. If that fails, simply return the address.
48498 @@ -294,7 +321,7 @@ static void unlock_trace(struct task_struct *task)
48499 mutex_unlock(&task->signal->cred_guard_mutex);
48500 }
48501
48502 -#ifdef CONFIG_STACKTRACE
48503 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48504
48505 #define MAX_STACK_TRACE_DEPTH 64
48506
48507 @@ -486,7 +513,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
48508 return count;
48509 }
48510
48511 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48512 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48513 static int proc_pid_syscall(struct task_struct *task, char *buffer)
48514 {
48515 long nr;
48516 @@ -515,7 +542,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
48517 /************************************************************************/
48518
48519 /* permission checks */
48520 -static int proc_fd_access_allowed(struct inode *inode)
48521 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
48522 {
48523 struct task_struct *task;
48524 int allowed = 0;
48525 @@ -525,7 +552,10 @@ static int proc_fd_access_allowed(struct inode *inode)
48526 */
48527 task = get_proc_task(inode);
48528 if (task) {
48529 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48530 + if (log)
48531 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48532 + else
48533 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
48534 put_task_struct(task);
48535 }
48536 return allowed;
48537 @@ -563,10 +593,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
48538 struct task_struct *task,
48539 int hide_pid_min)
48540 {
48541 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48542 + return false;
48543 +
48544 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48545 + rcu_read_lock();
48546 + {
48547 + const struct cred *tmpcred = current_cred();
48548 + const struct cred *cred = __task_cred(task);
48549 +
48550 + if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48551 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48552 + || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48553 +#endif
48554 + ) {
48555 + rcu_read_unlock();
48556 + return true;
48557 + }
48558 + }
48559 + rcu_read_unlock();
48560 +
48561 + if (!pid->hide_pid)
48562 + return false;
48563 +#endif
48564 +
48565 if (pid->hide_pid < hide_pid_min)
48566 return true;
48567 if (in_group_p(pid->pid_gid))
48568 return true;
48569 +
48570 return ptrace_may_access(task, PTRACE_MODE_READ);
48571 }
48572
48573 @@ -584,7 +639,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
48574 put_task_struct(task);
48575
48576 if (!has_perms) {
48577 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48578 + {
48579 +#else
48580 if (pid->hide_pid == 2) {
48581 +#endif
48582 /*
48583 * Let's make getdents(), stat(), and open()
48584 * consistent with each other. If a process
48585 @@ -682,6 +741,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
48586 if (!task)
48587 return -ESRCH;
48588
48589 + if (gr_acl_handle_procpidmem(task)) {
48590 + put_task_struct(task);
48591 + return -EPERM;
48592 + }
48593 +
48594 mm = mm_access(task, mode);
48595 put_task_struct(task);
48596
48597 @@ -695,16 +759,24 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
48598 mmput(mm);
48599 }
48600
48601 - /* OK to pass negative loff_t, we can catch out-of-range */
48602 - file->f_mode |= FMODE_UNSIGNED_OFFSET;
48603 file->private_data = mm;
48604
48605 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48606 + file->f_version = current->exec_id;
48607 +#endif
48608 +
48609 return 0;
48610 }
48611
48612 static int mem_open(struct inode *inode, struct file *file)
48613 {
48614 - return __mem_open(inode, file, PTRACE_MODE_ATTACH);
48615 + int ret;
48616 + ret = __mem_open(inode, file, PTRACE_MODE_ATTACH);
48617 +
48618 + /* OK to pass negative loff_t, we can catch out-of-range */
48619 + file->f_mode |= FMODE_UNSIGNED_OFFSET;
48620 +
48621 + return ret;
48622 }
48623
48624 static ssize_t mem_rw(struct file *file, char __user *buf,
48625 @@ -715,6 +787,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
48626 ssize_t copied;
48627 char *page;
48628
48629 +#ifdef CONFIG_GRKERNSEC
48630 + if (write)
48631 + return -EPERM;
48632 +#endif
48633 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48634 + if (file->f_version != current->exec_id) {
48635 + gr_log_badprocpid("mem");
48636 + return 0;
48637 + }
48638 +#endif
48639 +
48640 if (!mm)
48641 return 0;
48642
48643 @@ -819,6 +902,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48644 if (!mm)
48645 return 0;
48646
48647 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48648 + if (file->f_version != current->exec_id) {
48649 + gr_log_badprocpid("environ");
48650 + return 0;
48651 + }
48652 +#endif
48653 +
48654 page = (char *)__get_free_page(GFP_TEMPORARY);
48655 if (!page)
48656 return -ENOMEM;
48657 @@ -827,15 +917,17 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48658 if (!atomic_inc_not_zero(&mm->mm_users))
48659 goto free;
48660 while (count > 0) {
48661 - int this_len, retval, max_len;
48662 + size_t this_len, max_len;
48663 + int retval;
48664 +
48665 + if (src >= (mm->env_end - mm->env_start))
48666 + break;
48667
48668 this_len = mm->env_end - (mm->env_start + src);
48669
48670 - if (this_len <= 0)
48671 - break;
48672
48673 - max_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
48674 - this_len = (this_len > max_len) ? max_len : this_len;
48675 + max_len = min_t(size_t, PAGE_SIZE, count);
48676 + this_len = min(max_len, this_len);
48677
48678 retval = access_remote_vm(mm, (mm->env_start + src),
48679 page, this_len, 0);
48680 @@ -1433,7 +1525,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
48681 path_put(&nd->path);
48682
48683 /* Are we allowed to snoop on the tasks file descriptors? */
48684 - if (!proc_fd_access_allowed(inode))
48685 + if (!proc_fd_access_allowed(inode, 0))
48686 goto out;
48687
48688 error = PROC_I(inode)->op.proc_get_link(dentry, &nd->path);
48689 @@ -1472,8 +1564,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
48690 struct path path;
48691
48692 /* Are we allowed to snoop on the tasks file descriptors? */
48693 - if (!proc_fd_access_allowed(inode))
48694 - goto out;
48695 + /* logging this is needed for learning on chromium to work properly,
48696 + but we don't want to flood the logs from 'ps' which does a readlink
48697 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48698 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
48699 + */
48700 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48701 + if (!proc_fd_access_allowed(inode,0))
48702 + goto out;
48703 + } else {
48704 + if (!proc_fd_access_allowed(inode,1))
48705 + goto out;
48706 + }
48707
48708 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
48709 if (error)
48710 @@ -1538,7 +1640,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
48711 rcu_read_lock();
48712 cred = __task_cred(task);
48713 inode->i_uid = cred->euid;
48714 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48715 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48716 +#else
48717 inode->i_gid = cred->egid;
48718 +#endif
48719 rcu_read_unlock();
48720 }
48721 security_task_to_inode(task, inode);
48722 @@ -1574,10 +1680,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48723 return -ENOENT;
48724 }
48725 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48726 +#ifdef CONFIG_GRKERNSEC_PROC_USER
48727 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48728 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48729 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48730 +#endif
48731 task_dumpable(task)) {
48732 cred = __task_cred(task);
48733 stat->uid = cred->euid;
48734 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48735 + stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48736 +#else
48737 stat->gid = cred->egid;
48738 +#endif
48739 }
48740 }
48741 rcu_read_unlock();
48742 @@ -1615,11 +1730,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
48743
48744 if (task) {
48745 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48746 +#ifdef CONFIG_GRKERNSEC_PROC_USER
48747 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48748 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48749 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48750 +#endif
48751 task_dumpable(task)) {
48752 rcu_read_lock();
48753 cred = __task_cred(task);
48754 inode->i_uid = cred->euid;
48755 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48756 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48757 +#else
48758 inode->i_gid = cred->egid;
48759 +#endif
48760 rcu_read_unlock();
48761 } else {
48762 inode->i_uid = GLOBAL_ROOT_UID;
48763 @@ -1737,7 +1861,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
48764 int fd = proc_fd(inode);
48765
48766 if (task) {
48767 - files = get_files_struct(task);
48768 + if (!gr_acl_handle_procpidmem(task))
48769 + files = get_files_struct(task);
48770 put_task_struct(task);
48771 }
48772 if (files) {
48773 @@ -2336,11 +2461,21 @@ static const struct file_operations proc_map_files_operations = {
48774 */
48775 static int proc_fd_permission(struct inode *inode, int mask)
48776 {
48777 + struct task_struct *task;
48778 int rv = generic_permission(inode, mask);
48779 - if (rv == 0)
48780 - return 0;
48781 +
48782 if (task_pid(current) == proc_pid(inode))
48783 rv = 0;
48784 +
48785 + task = get_proc_task(inode);
48786 + if (task == NULL)
48787 + return rv;
48788 +
48789 + if (gr_acl_handle_procpidmem(task))
48790 + rv = -EACCES;
48791 +
48792 + put_task_struct(task);
48793 +
48794 return rv;
48795 }
48796
48797 @@ -2450,6 +2585,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
48798 if (!task)
48799 goto out_no_task;
48800
48801 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48802 + goto out;
48803 +
48804 /*
48805 * Yes, it does not scale. And it should not. Don't add
48806 * new entries into /proc/<tgid>/ without very good reasons.
48807 @@ -2494,6 +2632,9 @@ static int proc_pident_readdir(struct file *filp,
48808 if (!task)
48809 goto out_no_task;
48810
48811 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48812 + goto out;
48813 +
48814 ret = 0;
48815 i = filp->f_pos;
48816 switch (i) {
48817 @@ -2764,7 +2905,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
48818 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48819 void *cookie)
48820 {
48821 - char *s = nd_get_link(nd);
48822 + const char *s = nd_get_link(nd);
48823 if (!IS_ERR(s))
48824 __putname(s);
48825 }
48826 @@ -3033,7 +3174,7 @@ static const struct pid_entry tgid_base_stuff[] = {
48827 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
48828 #endif
48829 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48830 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48831 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48832 INF("syscall", S_IRUGO, proc_pid_syscall),
48833 #endif
48834 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48835 @@ -3058,10 +3199,10 @@ static const struct pid_entry tgid_base_stuff[] = {
48836 #ifdef CONFIG_SECURITY
48837 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48838 #endif
48839 -#ifdef CONFIG_KALLSYMS
48840 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48841 INF("wchan", S_IRUGO, proc_pid_wchan),
48842 #endif
48843 -#ifdef CONFIG_STACKTRACE
48844 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48845 ONE("stack", S_IRUGO, proc_pid_stack),
48846 #endif
48847 #ifdef CONFIG_SCHEDSTATS
48848 @@ -3095,6 +3236,9 @@ static const struct pid_entry tgid_base_stuff[] = {
48849 #ifdef CONFIG_HARDWALL
48850 INF("hardwall", S_IRUGO, proc_pid_hardwall),
48851 #endif
48852 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48853 + INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48854 +#endif
48855 #ifdef CONFIG_USER_NS
48856 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
48857 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
48858 @@ -3225,7 +3369,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
48859 if (!inode)
48860 goto out;
48861
48862 +#ifdef CONFIG_GRKERNSEC_PROC_USER
48863 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48864 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48865 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48866 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48867 +#else
48868 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48869 +#endif
48870 inode->i_op = &proc_tgid_base_inode_operations;
48871 inode->i_fop = &proc_tgid_base_operations;
48872 inode->i_flags|=S_IMMUTABLE;
48873 @@ -3267,7 +3418,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
48874 if (!task)
48875 goto out;
48876
48877 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48878 + goto out_put_task;
48879 +
48880 result = proc_pid_instantiate(dir, dentry, task, NULL);
48881 +out_put_task:
48882 put_task_struct(task);
48883 out:
48884 return result;
48885 @@ -3330,6 +3485,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
48886 static int fake_filldir(void *buf, const char *name, int namelen,
48887 loff_t offset, u64 ino, unsigned d_type)
48888 {
48889 + struct getdents_callback * __buf = (struct getdents_callback *) buf;
48890 + __buf->error = -EINVAL;
48891 return 0;
48892 }
48893
48894 @@ -3396,7 +3553,7 @@ static const struct pid_entry tid_base_stuff[] = {
48895 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48896 #endif
48897 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48898 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48899 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48900 INF("syscall", S_IRUGO, proc_pid_syscall),
48901 #endif
48902 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48903 @@ -3423,10 +3580,10 @@ static const struct pid_entry tid_base_stuff[] = {
48904 #ifdef CONFIG_SECURITY
48905 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48906 #endif
48907 -#ifdef CONFIG_KALLSYMS
48908 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48909 INF("wchan", S_IRUGO, proc_pid_wchan),
48910 #endif
48911 -#ifdef CONFIG_STACKTRACE
48912 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48913 ONE("stack", S_IRUGO, proc_pid_stack),
48914 #endif
48915 #ifdef CONFIG_SCHEDSTATS
48916 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
48917 index 82676e3..5f8518a 100644
48918 --- a/fs/proc/cmdline.c
48919 +++ b/fs/proc/cmdline.c
48920 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
48921
48922 static int __init proc_cmdline_init(void)
48923 {
48924 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
48925 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
48926 +#else
48927 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
48928 +#endif
48929 return 0;
48930 }
48931 module_init(proc_cmdline_init);
48932 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
48933 index b143471..bb105e5 100644
48934 --- a/fs/proc/devices.c
48935 +++ b/fs/proc/devices.c
48936 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
48937
48938 static int __init proc_devices_init(void)
48939 {
48940 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
48941 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
48942 +#else
48943 proc_create("devices", 0, NULL, &proc_devinfo_operations);
48944 +#endif
48945 return 0;
48946 }
48947 module_init(proc_devices_init);
48948 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
48949 index 7ac817b..abab1a5 100644
48950 --- a/fs/proc/inode.c
48951 +++ b/fs/proc/inode.c
48952 @@ -21,11 +21,17 @@
48953 #include <linux/seq_file.h>
48954 #include <linux/slab.h>
48955 #include <linux/mount.h>
48956 +#include <linux/grsecurity.h>
48957
48958 #include <asm/uaccess.h>
48959
48960 #include "internal.h"
48961
48962 +#ifdef CONFIG_PROC_SYSCTL
48963 +extern const struct inode_operations proc_sys_inode_operations;
48964 +extern const struct inode_operations proc_sys_dir_operations;
48965 +#endif
48966 +
48967 static void proc_evict_inode(struct inode *inode)
48968 {
48969 struct proc_dir_entry *de;
48970 @@ -51,6 +57,13 @@ static void proc_evict_inode(struct inode *inode)
48971 ns_ops = PROC_I(inode)->ns_ops;
48972 if (ns_ops && ns_ops->put)
48973 ns_ops->put(PROC_I(inode)->ns);
48974 +
48975 +#ifdef CONFIG_PROC_SYSCTL
48976 + if (inode->i_op == &proc_sys_inode_operations ||
48977 + inode->i_op == &proc_sys_dir_operations)
48978 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
48979 +#endif
48980 +
48981 }
48982
48983 static struct kmem_cache * proc_inode_cachep;
48984 @@ -456,7 +469,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
48985 if (de->mode) {
48986 inode->i_mode = de->mode;
48987 inode->i_uid = de->uid;
48988 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48989 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48990 +#else
48991 inode->i_gid = de->gid;
48992 +#endif
48993 }
48994 if (de->size)
48995 inode->i_size = de->size;
48996 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
48997 index eca4aca..19166b2 100644
48998 --- a/fs/proc/internal.h
48999 +++ b/fs/proc/internal.h
49000 @@ -52,6 +52,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
49001 struct pid *pid, struct task_struct *task);
49002 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
49003 struct pid *pid, struct task_struct *task);
49004 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
49005 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
49006 +#endif
49007 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
49008
49009 extern const struct file_operations proc_tid_children_operations;
49010 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
49011 index 86c67ee..cdca321 100644
49012 --- a/fs/proc/kcore.c
49013 +++ b/fs/proc/kcore.c
49014 @@ -480,9 +480,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
49015 * the addresses in the elf_phdr on our list.
49016 */
49017 start = kc_offset_to_vaddr(*fpos - elf_buflen);
49018 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
49019 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
49020 + if (tsz > buflen)
49021 tsz = buflen;
49022 -
49023 +
49024 while (buflen) {
49025 struct kcore_list *m;
49026
49027 @@ -511,20 +512,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
49028 kfree(elf_buf);
49029 } else {
49030 if (kern_addr_valid(start)) {
49031 - unsigned long n;
49032 + char *elf_buf;
49033 + mm_segment_t oldfs;
49034
49035 - n = copy_to_user(buffer, (char *)start, tsz);
49036 - /*
49037 - * We cannot distinguish between fault on source
49038 - * and fault on destination. When this happens
49039 - * we clear too and hope it will trigger the
49040 - * EFAULT again.
49041 - */
49042 - if (n) {
49043 - if (clear_user(buffer + tsz - n,
49044 - n))
49045 + elf_buf = kmalloc(tsz, GFP_KERNEL);
49046 + if (!elf_buf)
49047 + return -ENOMEM;
49048 + oldfs = get_fs();
49049 + set_fs(KERNEL_DS);
49050 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
49051 + set_fs(oldfs);
49052 + if (copy_to_user(buffer, elf_buf, tsz)) {
49053 + kfree(elf_buf);
49054 return -EFAULT;
49055 + }
49056 }
49057 + set_fs(oldfs);
49058 + kfree(elf_buf);
49059 } else {
49060 if (clear_user(buffer, tsz))
49061 return -EFAULT;
49062 @@ -544,6 +548,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
49063
49064 static int open_kcore(struct inode *inode, struct file *filp)
49065 {
49066 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
49067 + return -EPERM;
49068 +#endif
49069 if (!capable(CAP_SYS_RAWIO))
49070 return -EPERM;
49071 if (kcore_need_update)
49072 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
49073 index 80e4645..53e5fcf 100644
49074 --- a/fs/proc/meminfo.c
49075 +++ b/fs/proc/meminfo.c
49076 @@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
49077 vmi.used >> 10,
49078 vmi.largest_chunk >> 10
49079 #ifdef CONFIG_MEMORY_FAILURE
49080 - ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
49081 + ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
49082 #endif
49083 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
49084 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
49085 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
49086 index b1822dd..df622cb 100644
49087 --- a/fs/proc/nommu.c
49088 +++ b/fs/proc/nommu.c
49089 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
49090 if (len < 1)
49091 len = 1;
49092 seq_printf(m, "%*c", len, ' ');
49093 - seq_path(m, &file->f_path, "");
49094 + seq_path(m, &file->f_path, "\n\\");
49095 }
49096
49097 seq_putc(m, '\n');
49098 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
49099 index 06e1cc1..177cd98 100644
49100 --- a/fs/proc/proc_net.c
49101 +++ b/fs/proc/proc_net.c
49102 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
49103 struct task_struct *task;
49104 struct nsproxy *ns;
49105 struct net *net = NULL;
49106 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49107 + const struct cred *cred = current_cred();
49108 +#endif
49109 +
49110 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49111 + if (cred->fsuid)
49112 + return net;
49113 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49114 + if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
49115 + return net;
49116 +#endif
49117
49118 rcu_read_lock();
49119 task = pid_task(proc_pid(dir), PIDTYPE_PID);
49120 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
49121 index 3476bca..cb6d86a 100644
49122 --- a/fs/proc/proc_sysctl.c
49123 +++ b/fs/proc/proc_sysctl.c
49124 @@ -12,11 +12,15 @@
49125 #include <linux/module.h>
49126 #include "internal.h"
49127
49128 +extern int gr_handle_chroot_sysctl(const int op);
49129 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
49130 + const int op);
49131 +
49132 static const struct dentry_operations proc_sys_dentry_operations;
49133 static const struct file_operations proc_sys_file_operations;
49134 -static const struct inode_operations proc_sys_inode_operations;
49135 +const struct inode_operations proc_sys_inode_operations;
49136 static const struct file_operations proc_sys_dir_file_operations;
49137 -static const struct inode_operations proc_sys_dir_operations;
49138 +const struct inode_operations proc_sys_dir_operations;
49139
49140 void proc_sys_poll_notify(struct ctl_table_poll *poll)
49141 {
49142 @@ -470,8 +474,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
49143
49144 err = NULL;
49145 d_set_d_op(dentry, &proc_sys_dentry_operations);
49146 +
49147 + gr_handle_proc_create(dentry, inode);
49148 +
49149 d_add(dentry, inode);
49150
49151 + if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt))
49152 + err = ERR_PTR(-ENOENT);
49153 +
49154 out:
49155 sysctl_head_finish(head);
49156 return err;
49157 @@ -483,18 +493,20 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
49158 struct inode *inode = filp->f_path.dentry->d_inode;
49159 struct ctl_table_header *head = grab_header(inode);
49160 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
49161 + int op = write ? MAY_WRITE : MAY_READ;
49162 ssize_t error;
49163 size_t res;
49164
49165 if (IS_ERR(head))
49166 return PTR_ERR(head);
49167
49168 +
49169 /*
49170 * At this point we know that the sysctl was not unregistered
49171 * and won't be until we finish.
49172 */
49173 error = -EPERM;
49174 - if (sysctl_perm(head->root, table, write ? MAY_WRITE : MAY_READ))
49175 + if (sysctl_perm(head->root, table, op))
49176 goto out;
49177
49178 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
49179 @@ -502,6 +514,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
49180 if (!table->proc_handler)
49181 goto out;
49182
49183 +#ifdef CONFIG_GRKERNSEC
49184 + error = -EPERM;
49185 + if (gr_handle_chroot_sysctl(op))
49186 + goto out;
49187 + dget(filp->f_path.dentry);
49188 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
49189 + dput(filp->f_path.dentry);
49190 + goto out;
49191 + }
49192 + dput(filp->f_path.dentry);
49193 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
49194 + goto out;
49195 + if (write && !capable(CAP_SYS_ADMIN))
49196 + goto out;
49197 +#endif
49198 +
49199 /* careful: calling conventions are nasty here */
49200 res = count;
49201 error = table->proc_handler(table, write, buf, &res, ppos);
49202 @@ -599,6 +627,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
49203 return -ENOMEM;
49204 } else {
49205 d_set_d_op(child, &proc_sys_dentry_operations);
49206 +
49207 + gr_handle_proc_create(child, inode);
49208 +
49209 d_add(child, inode);
49210 }
49211 } else {
49212 @@ -642,6 +673,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
49213 if ((*pos)++ < file->f_pos)
49214 return 0;
49215
49216 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
49217 + return 0;
49218 +
49219 if (unlikely(S_ISLNK(table->mode)))
49220 res = proc_sys_link_fill_cache(file, dirent, filldir, head, table);
49221 else
49222 @@ -759,6 +793,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
49223 if (IS_ERR(head))
49224 return PTR_ERR(head);
49225
49226 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
49227 + return -ENOENT;
49228 +
49229 generic_fillattr(inode, stat);
49230 if (table)
49231 stat->mode = (stat->mode & S_IFMT) | table->mode;
49232 @@ -781,13 +818,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
49233 .llseek = generic_file_llseek,
49234 };
49235
49236 -static const struct inode_operations proc_sys_inode_operations = {
49237 +const struct inode_operations proc_sys_inode_operations = {
49238 .permission = proc_sys_permission,
49239 .setattr = proc_sys_setattr,
49240 .getattr = proc_sys_getattr,
49241 };
49242
49243 -static const struct inode_operations proc_sys_dir_operations = {
49244 +const struct inode_operations proc_sys_dir_operations = {
49245 .lookup = proc_sys_lookup,
49246 .permission = proc_sys_permission,
49247 .setattr = proc_sys_setattr,
49248 diff --git a/fs/proc/root.c b/fs/proc/root.c
49249 index 7c30fce..b3d3aa2 100644
49250 --- a/fs/proc/root.c
49251 +++ b/fs/proc/root.c
49252 @@ -188,7 +188,15 @@ void __init proc_root_init(void)
49253 #ifdef CONFIG_PROC_DEVICETREE
49254 proc_device_tree_init();
49255 #endif
49256 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
49257 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49258 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
49259 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49260 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49261 +#endif
49262 +#else
49263 proc_mkdir("bus", NULL);
49264 +#endif
49265 proc_sys_init();
49266 }
49267
49268 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
49269 index 4540b8f..1b9772f 100644
49270 --- a/fs/proc/task_mmu.c
49271 +++ b/fs/proc/task_mmu.c
49272 @@ -11,12 +11,19 @@
49273 #include <linux/rmap.h>
49274 #include <linux/swap.h>
49275 #include <linux/swapops.h>
49276 +#include <linux/grsecurity.h>
49277
49278 #include <asm/elf.h>
49279 #include <asm/uaccess.h>
49280 #include <asm/tlbflush.h>
49281 #include "internal.h"
49282
49283 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49284 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
49285 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
49286 + _mm->pax_flags & MF_PAX_SEGMEXEC))
49287 +#endif
49288 +
49289 void task_mem(struct seq_file *m, struct mm_struct *mm)
49290 {
49291 unsigned long data, text, lib, swap;
49292 @@ -52,8 +59,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49293 "VmExe:\t%8lu kB\n"
49294 "VmLib:\t%8lu kB\n"
49295 "VmPTE:\t%8lu kB\n"
49296 - "VmSwap:\t%8lu kB\n",
49297 - hiwater_vm << (PAGE_SHIFT-10),
49298 + "VmSwap:\t%8lu kB\n"
49299 +
49300 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49301 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
49302 +#endif
49303 +
49304 + ,hiwater_vm << (PAGE_SHIFT-10),
49305 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
49306 mm->locked_vm << (PAGE_SHIFT-10),
49307 mm->pinned_vm << (PAGE_SHIFT-10),
49308 @@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49309 data << (PAGE_SHIFT-10),
49310 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
49311 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
49312 - swap << (PAGE_SHIFT-10));
49313 + swap << (PAGE_SHIFT-10)
49314 +
49315 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
49316 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49317 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
49318 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
49319 +#else
49320 + , mm->context.user_cs_base
49321 + , mm->context.user_cs_limit
49322 +#endif
49323 +#endif
49324 +
49325 + );
49326 }
49327
49328 unsigned long task_vsize(struct mm_struct *mm)
49329 @@ -231,13 +255,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
49330 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
49331 }
49332
49333 - /* We don't show the stack guard page in /proc/maps */
49334 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49335 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
49336 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
49337 +#else
49338 start = vma->vm_start;
49339 - if (stack_guard_page_start(vma, start))
49340 - start += PAGE_SIZE;
49341 end = vma->vm_end;
49342 - if (stack_guard_page_end(vma, end))
49343 - end -= PAGE_SIZE;
49344 +#endif
49345
49346 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
49347 start,
49348 @@ -246,7 +270,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
49349 flags & VM_WRITE ? 'w' : '-',
49350 flags & VM_EXEC ? 'x' : '-',
49351 flags & VM_MAYSHARE ? 's' : 'p',
49352 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49353 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
49354 +#else
49355 pgoff,
49356 +#endif
49357 MAJOR(dev), MINOR(dev), ino, &len);
49358
49359 /*
49360 @@ -255,7 +283,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
49361 */
49362 if (file) {
49363 pad_len_spaces(m, len);
49364 - seq_path(m, &file->f_path, "\n");
49365 + seq_path(m, &file->f_path, "\n\\");
49366 goto done;
49367 }
49368
49369 @@ -281,8 +309,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
49370 * Thread stack in /proc/PID/task/TID/maps or
49371 * the main process stack.
49372 */
49373 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
49374 - vma->vm_end >= mm->start_stack)) {
49375 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
49376 + (vma->vm_start <= mm->start_stack &&
49377 + vma->vm_end >= mm->start_stack)) {
49378 name = "[stack]";
49379 } else {
49380 /* Thread stack in /proc/PID/maps */
49381 @@ -306,6 +335,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
49382 struct proc_maps_private *priv = m->private;
49383 struct task_struct *task = priv->task;
49384
49385 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49386 + if (current->exec_id != m->exec_id) {
49387 + gr_log_badprocpid("maps");
49388 + return 0;
49389 + }
49390 +#endif
49391 +
49392 show_map_vma(m, vma, is_pid);
49393
49394 if (m->count < m->size) /* vma is copied successfully */
49395 @@ -492,12 +528,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
49396 .private = &mss,
49397 };
49398
49399 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49400 + if (current->exec_id != m->exec_id) {
49401 + gr_log_badprocpid("smaps");
49402 + return 0;
49403 + }
49404 +#endif
49405 memset(&mss, 0, sizeof mss);
49406 - mss.vma = vma;
49407 - /* mmap_sem is held in m_start */
49408 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49409 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49410 -
49411 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49412 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
49413 +#endif
49414 + mss.vma = vma;
49415 + /* mmap_sem is held in m_start */
49416 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49417 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49418 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49419 + }
49420 +#endif
49421 show_map_vma(m, vma, is_pid);
49422
49423 seq_printf(m,
49424 @@ -515,7 +562,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
49425 "KernelPageSize: %8lu kB\n"
49426 "MMUPageSize: %8lu kB\n"
49427 "Locked: %8lu kB\n",
49428 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49429 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
49430 +#else
49431 (vma->vm_end - vma->vm_start) >> 10,
49432 +#endif
49433 mss.resident >> 10,
49434 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
49435 mss.shared_clean >> 10,
49436 @@ -1164,6 +1215,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
49437 int n;
49438 char buffer[50];
49439
49440 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49441 + if (current->exec_id != m->exec_id) {
49442 + gr_log_badprocpid("numa_maps");
49443 + return 0;
49444 + }
49445 +#endif
49446 +
49447 if (!mm)
49448 return 0;
49449
49450 @@ -1181,11 +1239,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
49451 mpol_to_str(buffer, sizeof(buffer), pol, 0);
49452 mpol_cond_put(pol);
49453
49454 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49455 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
49456 +#else
49457 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
49458 +#endif
49459
49460 if (file) {
49461 seq_printf(m, " file=");
49462 - seq_path(m, &file->f_path, "\n\t= ");
49463 + seq_path(m, &file->f_path, "\n\t\\= ");
49464 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49465 seq_printf(m, " heap");
49466 } else {
49467 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
49468 index 1ccfa53..0848f95 100644
49469 --- a/fs/proc/task_nommu.c
49470 +++ b/fs/proc/task_nommu.c
49471 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49472 else
49473 bytes += kobjsize(mm);
49474
49475 - if (current->fs && current->fs->users > 1)
49476 + if (current->fs && atomic_read(&current->fs->users) > 1)
49477 sbytes += kobjsize(current->fs);
49478 else
49479 bytes += kobjsize(current->fs);
49480 @@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
49481
49482 if (file) {
49483 pad_len_spaces(m, len);
49484 - seq_path(m, &file->f_path, "");
49485 + seq_path(m, &file->f_path, "\n\\");
49486 } else if (mm) {
49487 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
49488
49489 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
49490 index d67908b..d13f6a6 100644
49491 --- a/fs/quota/netlink.c
49492 +++ b/fs/quota/netlink.c
49493 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
49494 void quota_send_warning(short type, unsigned int id, dev_t dev,
49495 const char warntype)
49496 {
49497 - static atomic_t seq;
49498 + static atomic_unchecked_t seq;
49499 struct sk_buff *skb;
49500 void *msg_head;
49501 int ret;
49502 @@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
49503 "VFS: Not enough memory to send quota warning.\n");
49504 return;
49505 }
49506 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
49507 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
49508 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
49509 if (!msg_head) {
49510 printk(KERN_ERR
49511 diff --git a/fs/readdir.c b/fs/readdir.c
49512 index 39e3370..20d446d 100644
49513 --- a/fs/readdir.c
49514 +++ b/fs/readdir.c
49515 @@ -17,6 +17,7 @@
49516 #include <linux/security.h>
49517 #include <linux/syscalls.h>
49518 #include <linux/unistd.h>
49519 +#include <linux/namei.h>
49520
49521 #include <asm/uaccess.h>
49522
49523 @@ -67,6 +68,7 @@ struct old_linux_dirent {
49524
49525 struct readdir_callback {
49526 struct old_linux_dirent __user * dirent;
49527 + struct file * file;
49528 int result;
49529 };
49530
49531 @@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
49532 buf->result = -EOVERFLOW;
49533 return -EOVERFLOW;
49534 }
49535 +
49536 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49537 + return 0;
49538 +
49539 buf->result++;
49540 dirent = buf->dirent;
49541 if (!access_ok(VERIFY_WRITE, dirent,
49542 @@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
49543
49544 buf.result = 0;
49545 buf.dirent = dirent;
49546 + buf.file = file;
49547
49548 error = vfs_readdir(file, fillonedir, &buf);
49549 if (buf.result)
49550 @@ -141,6 +148,7 @@ struct linux_dirent {
49551 struct getdents_callback {
49552 struct linux_dirent __user * current_dir;
49553 struct linux_dirent __user * previous;
49554 + struct file * file;
49555 int count;
49556 int error;
49557 };
49558 @@ -162,6 +170,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
49559 buf->error = -EOVERFLOW;
49560 return -EOVERFLOW;
49561 }
49562 +
49563 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49564 + return 0;
49565 +
49566 dirent = buf->previous;
49567 if (dirent) {
49568 if (__put_user(offset, &dirent->d_off))
49569 @@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
49570 buf.previous = NULL;
49571 buf.count = count;
49572 buf.error = 0;
49573 + buf.file = file;
49574
49575 error = vfs_readdir(file, filldir, &buf);
49576 if (error >= 0)
49577 @@ -226,6 +239,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
49578 struct getdents_callback64 {
49579 struct linux_dirent64 __user * current_dir;
49580 struct linux_dirent64 __user * previous;
49581 + struct file *file;
49582 int count;
49583 int error;
49584 };
49585 @@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
49586 buf->error = -EINVAL; /* only used if we fail.. */
49587 if (reclen > buf->count)
49588 return -EINVAL;
49589 +
49590 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49591 + return 0;
49592 +
49593 dirent = buf->previous;
49594 if (dirent) {
49595 if (__put_user(offset, &dirent->d_off))
49596 @@ -287,6 +305,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49597
49598 buf.current_dir = dirent;
49599 buf.previous = NULL;
49600 + buf.file = file;
49601 buf.count = count;
49602 buf.error = 0;
49603
49604 @@ -295,7 +314,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49605 error = buf.error;
49606 lastdirent = buf.previous;
49607 if (lastdirent) {
49608 - typeof(lastdirent->d_off) d_off = file->f_pos;
49609 + typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
49610 if (__put_user(d_off, &lastdirent->d_off))
49611 error = -EFAULT;
49612 else
49613 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
49614 index 2b7882b..1c5ef48 100644
49615 --- a/fs/reiserfs/do_balan.c
49616 +++ b/fs/reiserfs/do_balan.c
49617 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
49618 return;
49619 }
49620
49621 - atomic_inc(&(fs_generation(tb->tb_sb)));
49622 + atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
49623 do_balance_starts(tb);
49624
49625 /* balance leaf returns 0 except if combining L R and S into
49626 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
49627 index 2c1ade6..8c59d8d 100644
49628 --- a/fs/reiserfs/procfs.c
49629 +++ b/fs/reiserfs/procfs.c
49630 @@ -112,7 +112,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
49631 "SMALL_TAILS " : "NO_TAILS ",
49632 replay_only(sb) ? "REPLAY_ONLY " : "",
49633 convert_reiserfs(sb) ? "CONV " : "",
49634 - atomic_read(&r->s_generation_counter),
49635 + atomic_read_unchecked(&r->s_generation_counter),
49636 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49637 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49638 SF(s_good_search_by_key_reada), SF(s_bmaps),
49639 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
49640 index 33215f5..c5d427a 100644
49641 --- a/fs/reiserfs/reiserfs.h
49642 +++ b/fs/reiserfs/reiserfs.h
49643 @@ -453,7 +453,7 @@ struct reiserfs_sb_info {
49644 /* Comment? -Hans */
49645 wait_queue_head_t s_wait;
49646 /* To be obsoleted soon by per buffer seals.. -Hans */
49647 - atomic_t s_generation_counter; // increased by one every time the
49648 + atomic_unchecked_t s_generation_counter; // increased by one every time the
49649 // tree gets re-balanced
49650 unsigned long s_properties; /* File system properties. Currently holds
49651 on-disk FS format */
49652 @@ -1978,7 +1978,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
49653 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
49654
49655 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
49656 -#define get_generation(s) atomic_read (&fs_generation(s))
49657 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
49658 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
49659 #define __fs_changed(gen,s) (gen != get_generation (s))
49660 #define fs_changed(gen,s) \
49661 diff --git a/fs/select.c b/fs/select.c
49662 index db14c78..3aae1bd 100644
49663 --- a/fs/select.c
49664 +++ b/fs/select.c
49665 @@ -20,6 +20,7 @@
49666 #include <linux/export.h>
49667 #include <linux/slab.h>
49668 #include <linux/poll.h>
49669 +#include <linux/security.h>
49670 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49671 #include <linux/file.h>
49672 #include <linux/fdtable.h>
49673 @@ -831,6 +832,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
49674 struct poll_list *walk = head;
49675 unsigned long todo = nfds;
49676
49677 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49678 if (nfds > rlimit(RLIMIT_NOFILE))
49679 return -EINVAL;
49680
49681 diff --git a/fs/seq_file.c b/fs/seq_file.c
49682 index 0cbd049..64e705c 100644
49683 --- a/fs/seq_file.c
49684 +++ b/fs/seq_file.c
49685 @@ -9,6 +9,7 @@
49686 #include <linux/export.h>
49687 #include <linux/seq_file.h>
49688 #include <linux/slab.h>
49689 +#include <linux/sched.h>
49690
49691 #include <asm/uaccess.h>
49692 #include <asm/page.h>
49693 @@ -56,6 +57,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
49694 memset(p, 0, sizeof(*p));
49695 mutex_init(&p->lock);
49696 p->op = op;
49697 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49698 + p->exec_id = current->exec_id;
49699 +#endif
49700
49701 /*
49702 * Wrappers around seq_open(e.g. swaps_open) need to be
49703 @@ -92,7 +96,7 @@ static int traverse(struct seq_file *m, loff_t offset)
49704 return 0;
49705 }
49706 if (!m->buf) {
49707 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
49708 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
49709 if (!m->buf)
49710 return -ENOMEM;
49711 }
49712 @@ -132,7 +136,7 @@ static int traverse(struct seq_file *m, loff_t offset)
49713 Eoverflow:
49714 m->op->stop(m, p);
49715 kfree(m->buf);
49716 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
49717 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
49718 return !m->buf ? -ENOMEM : -EAGAIN;
49719 }
49720
49721 @@ -187,7 +191,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
49722
49723 /* grab buffer if we didn't have one */
49724 if (!m->buf) {
49725 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
49726 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
49727 if (!m->buf)
49728 goto Enomem;
49729 }
49730 @@ -228,7 +232,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
49731 goto Fill;
49732 m->op->stop(m, p);
49733 kfree(m->buf);
49734 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
49735 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
49736 if (!m->buf)
49737 goto Enomem;
49738 m->count = 0;
49739 @@ -567,7 +571,7 @@ static void single_stop(struct seq_file *p, void *v)
49740 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49741 void *data)
49742 {
49743 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49744 + seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49745 int res = -ENOMEM;
49746
49747 if (op) {
49748 diff --git a/fs/splice.c b/fs/splice.c
49749 index 7bf08fa..eb35c2f 100644
49750 --- a/fs/splice.c
49751 +++ b/fs/splice.c
49752 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49753 pipe_lock(pipe);
49754
49755 for (;;) {
49756 - if (!pipe->readers) {
49757 + if (!atomic_read(&pipe->readers)) {
49758 send_sig(SIGPIPE, current, 0);
49759 if (!ret)
49760 ret = -EPIPE;
49761 @@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49762 do_wakeup = 0;
49763 }
49764
49765 - pipe->waiting_writers++;
49766 + atomic_inc(&pipe->waiting_writers);
49767 pipe_wait(pipe);
49768 - pipe->waiting_writers--;
49769 + atomic_dec(&pipe->waiting_writers);
49770 }
49771
49772 pipe_unlock(pipe);
49773 @@ -563,7 +563,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
49774 old_fs = get_fs();
49775 set_fs(get_ds());
49776 /* The cast to a user pointer is valid due to the set_fs() */
49777 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49778 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49779 set_fs(old_fs);
49780
49781 return res;
49782 @@ -578,7 +578,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
49783 old_fs = get_fs();
49784 set_fs(get_ds());
49785 /* The cast to a user pointer is valid due to the set_fs() */
49786 - res = vfs_write(file, (const char __user *)buf, count, &pos);
49787 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49788 set_fs(old_fs);
49789
49790 return res;
49791 @@ -630,7 +630,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
49792 goto err;
49793
49794 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49795 - vec[i].iov_base = (void __user *) page_address(page);
49796 + vec[i].iov_base = (void __force_user *) page_address(page);
49797 vec[i].iov_len = this_len;
49798 spd.pages[i] = page;
49799 spd.nr_pages++;
49800 @@ -849,10 +849,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49801 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49802 {
49803 while (!pipe->nrbufs) {
49804 - if (!pipe->writers)
49805 + if (!atomic_read(&pipe->writers))
49806 return 0;
49807
49808 - if (!pipe->waiting_writers && sd->num_spliced)
49809 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49810 return 0;
49811
49812 if (sd->flags & SPLICE_F_NONBLOCK)
49813 @@ -1187,7 +1187,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
49814 * out of the pipe right after the splice_to_pipe(). So set
49815 * PIPE_READERS appropriately.
49816 */
49817 - pipe->readers = 1;
49818 + atomic_set(&pipe->readers, 1);
49819
49820 current->splice_pipe = pipe;
49821 }
49822 @@ -1740,9 +1740,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49823 ret = -ERESTARTSYS;
49824 break;
49825 }
49826 - if (!pipe->writers)
49827 + if (!atomic_read(&pipe->writers))
49828 break;
49829 - if (!pipe->waiting_writers) {
49830 + if (!atomic_read(&pipe->waiting_writers)) {
49831 if (flags & SPLICE_F_NONBLOCK) {
49832 ret = -EAGAIN;
49833 break;
49834 @@ -1774,7 +1774,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49835 pipe_lock(pipe);
49836
49837 while (pipe->nrbufs >= pipe->buffers) {
49838 - if (!pipe->readers) {
49839 + if (!atomic_read(&pipe->readers)) {
49840 send_sig(SIGPIPE, current, 0);
49841 ret = -EPIPE;
49842 break;
49843 @@ -1787,9 +1787,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49844 ret = -ERESTARTSYS;
49845 break;
49846 }
49847 - pipe->waiting_writers++;
49848 + atomic_inc(&pipe->waiting_writers);
49849 pipe_wait(pipe);
49850 - pipe->waiting_writers--;
49851 + atomic_dec(&pipe->waiting_writers);
49852 }
49853
49854 pipe_unlock(pipe);
49855 @@ -1825,14 +1825,14 @@ retry:
49856 pipe_double_lock(ipipe, opipe);
49857
49858 do {
49859 - if (!opipe->readers) {
49860 + if (!atomic_read(&opipe->readers)) {
49861 send_sig(SIGPIPE, current, 0);
49862 if (!ret)
49863 ret = -EPIPE;
49864 break;
49865 }
49866
49867 - if (!ipipe->nrbufs && !ipipe->writers)
49868 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
49869 break;
49870
49871 /*
49872 @@ -1929,7 +1929,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49873 pipe_double_lock(ipipe, opipe);
49874
49875 do {
49876 - if (!opipe->readers) {
49877 + if (!atomic_read(&opipe->readers)) {
49878 send_sig(SIGPIPE, current, 0);
49879 if (!ret)
49880 ret = -EPIPE;
49881 @@ -1974,7 +1974,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49882 * return EAGAIN if we have the potential of some data in the
49883 * future, otherwise just return 0
49884 */
49885 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
49886 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
49887 ret = -EAGAIN;
49888
49889 pipe_unlock(ipipe);
49890 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
49891 index e6bb9b2..d8e3951 100644
49892 --- a/fs/sysfs/dir.c
49893 +++ b/fs/sysfs/dir.c
49894 @@ -678,6 +678,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
49895 struct sysfs_dirent *sd;
49896 int rc;
49897
49898 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
49899 + const char *parent_name = parent_sd->s_name;
49900 +
49901 + mode = S_IFDIR | S_IRWXU;
49902 +
49903 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
49904 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
49905 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
49906 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
49907 + mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
49908 +#endif
49909 +
49910 /* allocate */
49911 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
49912 if (!sd)
49913 diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
49914 index 00012e3..8392349 100644
49915 --- a/fs/sysfs/file.c
49916 +++ b/fs/sysfs/file.c
49917 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
49918
49919 struct sysfs_open_dirent {
49920 atomic_t refcnt;
49921 - atomic_t event;
49922 + atomic_unchecked_t event;
49923 wait_queue_head_t poll;
49924 struct list_head buffers; /* goes through sysfs_buffer.list */
49925 };
49926 @@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
49927 if (!sysfs_get_active(attr_sd))
49928 return -ENODEV;
49929
49930 - buffer->event = atomic_read(&attr_sd->s_attr.open->event);
49931 + buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
49932 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
49933
49934 sysfs_put_active(attr_sd);
49935 @@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
49936 return -ENOMEM;
49937
49938 atomic_set(&new_od->refcnt, 0);
49939 - atomic_set(&new_od->event, 1);
49940 + atomic_set_unchecked(&new_od->event, 1);
49941 init_waitqueue_head(&new_od->poll);
49942 INIT_LIST_HEAD(&new_od->buffers);
49943 goto retry;
49944 @@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
49945
49946 sysfs_put_active(attr_sd);
49947
49948 - if (buffer->event != atomic_read(&od->event))
49949 + if (buffer->event != atomic_read_unchecked(&od->event))
49950 goto trigger;
49951
49952 return DEFAULT_POLLMASK;
49953 @@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
49954
49955 od = sd->s_attr.open;
49956 if (od) {
49957 - atomic_inc(&od->event);
49958 + atomic_inc_unchecked(&od->event);
49959 wake_up_interruptible(&od->poll);
49960 }
49961
49962 diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
49963 index a7ac78f..02158e1 100644
49964 --- a/fs/sysfs/symlink.c
49965 +++ b/fs/sysfs/symlink.c
49966 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
49967
49968 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
49969 {
49970 - char *page = nd_get_link(nd);
49971 + const char *page = nd_get_link(nd);
49972 if (!IS_ERR(page))
49973 free_page((unsigned long)page);
49974 }
49975 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
49976 index c175b4d..8f36a16 100644
49977 --- a/fs/udf/misc.c
49978 +++ b/fs/udf/misc.c
49979 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
49980
49981 u8 udf_tag_checksum(const struct tag *t)
49982 {
49983 - u8 *data = (u8 *)t;
49984 + const u8 *data = (const u8 *)t;
49985 u8 checksum = 0;
49986 int i;
49987 for (i = 0; i < sizeof(struct tag); ++i)
49988 diff --git a/fs/udf/namei.c b/fs/udf/namei.c
49989 index 1802417..c31deb3 100644
49990 --- a/fs/udf/namei.c
49991 +++ b/fs/udf/namei.c
49992 @@ -1279,6 +1279,7 @@ static int udf_encode_fh(struct inode *inode, __u32 *fh, int *lenp,
49993 *lenp = 3;
49994 fid->udf.block = location.logicalBlockNum;
49995 fid->udf.partref = location.partitionReferenceNum;
49996 + fid->udf.parent_partref = 0;
49997 fid->udf.generation = inode->i_generation;
49998
49999 if (parent) {
50000 diff --git a/fs/utimes.c b/fs/utimes.c
50001 index fa4dbe4..e12d1b9 100644
50002 --- a/fs/utimes.c
50003 +++ b/fs/utimes.c
50004 @@ -1,6 +1,7 @@
50005 #include <linux/compiler.h>
50006 #include <linux/file.h>
50007 #include <linux/fs.h>
50008 +#include <linux/security.h>
50009 #include <linux/linkage.h>
50010 #include <linux/mount.h>
50011 #include <linux/namei.h>
50012 @@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
50013 goto mnt_drop_write_and_out;
50014 }
50015 }
50016 +
50017 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
50018 + error = -EACCES;
50019 + goto mnt_drop_write_and_out;
50020 + }
50021 +
50022 mutex_lock(&inode->i_mutex);
50023 error = notify_change(path->dentry, &newattrs);
50024 mutex_unlock(&inode->i_mutex);
50025 diff --git a/fs/xattr.c b/fs/xattr.c
50026 index 1d7ac37..23cb9ec 100644
50027 --- a/fs/xattr.c
50028 +++ b/fs/xattr.c
50029 @@ -316,7 +316,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
50030 * Extended attribute SET operations
50031 */
50032 static long
50033 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
50034 +setxattr(struct path *path, const char __user *name, const void __user *value,
50035 size_t size, int flags)
50036 {
50037 int error;
50038 @@ -349,7 +349,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
50039 }
50040 }
50041
50042 - error = vfs_setxattr(d, kname, kvalue, size, flags);
50043 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
50044 + error = -EACCES;
50045 + goto out;
50046 + }
50047 +
50048 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
50049 out:
50050 if (vvalue)
50051 vfree(vvalue);
50052 @@ -370,7 +375,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
50053 return error;
50054 error = mnt_want_write(path.mnt);
50055 if (!error) {
50056 - error = setxattr(path.dentry, name, value, size, flags);
50057 + error = setxattr(&path, name, value, size, flags);
50058 mnt_drop_write(path.mnt);
50059 }
50060 path_put(&path);
50061 @@ -389,7 +394,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
50062 return error;
50063 error = mnt_want_write(path.mnt);
50064 if (!error) {
50065 - error = setxattr(path.dentry, name, value, size, flags);
50066 + error = setxattr(&path, name, value, size, flags);
50067 mnt_drop_write(path.mnt);
50068 }
50069 path_put(&path);
50070 @@ -401,17 +406,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
50071 {
50072 int fput_needed;
50073 struct file *f;
50074 - struct dentry *dentry;
50075 int error = -EBADF;
50076
50077 f = fget_light(fd, &fput_needed);
50078 if (!f)
50079 return error;
50080 - dentry = f->f_path.dentry;
50081 - audit_inode(NULL, dentry);
50082 + audit_inode(NULL, f->f_path.dentry);
50083 error = mnt_want_write_file(f);
50084 if (!error) {
50085 - error = setxattr(dentry, name, value, size, flags);
50086 + error = setxattr(&f->f_path, name, value, size, flags);
50087 mnt_drop_write_file(f);
50088 }
50089 fput_light(f, fput_needed);
50090 diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
50091 index 69d06b0..c0996e5 100644
50092 --- a/fs/xattr_acl.c
50093 +++ b/fs/xattr_acl.c
50094 @@ -17,8 +17,8 @@
50095 struct posix_acl *
50096 posix_acl_from_xattr(const void *value, size_t size)
50097 {
50098 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
50099 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
50100 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
50101 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
50102 int count;
50103 struct posix_acl *acl;
50104 struct posix_acl_entry *acl_e;
50105 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
50106 index 58b815e..595ddee 100644
50107 --- a/fs/xfs/xfs_bmap.c
50108 +++ b/fs/xfs/xfs_bmap.c
50109 @@ -189,7 +189,7 @@ xfs_bmap_validate_ret(
50110 int nmap,
50111 int ret_nmap);
50112 #else
50113 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
50114 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
50115 #endif /* DEBUG */
50116
50117 STATIC int
50118 diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
50119 index 19bf0c5..9f26b02 100644
50120 --- a/fs/xfs/xfs_dir2_sf.c
50121 +++ b/fs/xfs/xfs_dir2_sf.c
50122 @@ -851,7 +851,15 @@ xfs_dir2_sf_getdents(
50123 }
50124
50125 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
50126 - if (filldir(dirent, (char *)sfep->name, sfep->namelen,
50127 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
50128 + char name[sfep->namelen];
50129 + memcpy(name, sfep->name, sfep->namelen);
50130 + if (filldir(dirent, name, sfep->namelen,
50131 + off & 0x7fffffff, ino, DT_UNKNOWN)) {
50132 + *offset = off & 0x7fffffff;
50133 + return 0;
50134 + }
50135 + } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
50136 off & 0x7fffffff, ino, DT_UNKNOWN)) {
50137 *offset = off & 0x7fffffff;
50138 return 0;
50139 diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
50140 index f9c3fe3..69cf4fc 100644
50141 --- a/fs/xfs/xfs_discard.c
50142 +++ b/fs/xfs/xfs_discard.c
50143 @@ -179,12 +179,14 @@ xfs_ioc_trim(
50144 * used by the fstrim application. In the end it really doesn't
50145 * matter as trimming blocks is an advisory interface.
50146 */
50147 + if (range.start >= XFS_FSB_TO_B(mp, mp->m_sb.sb_dblocks) ||
50148 + range.minlen > XFS_FSB_TO_B(mp, XFS_ALLOC_AG_MAX_USABLE(mp)))
50149 + return -XFS_ERROR(EINVAL);
50150 +
50151 start = BTOBB(range.start);
50152 end = start + BTOBBT(range.len) - 1;
50153 minlen = BTOBB(max_t(u64, granularity, range.minlen));
50154
50155 - if (XFS_BB_TO_FSB(mp, start) >= mp->m_sb.sb_dblocks)
50156 - return -XFS_ERROR(EINVAL);
50157 if (end > XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks) - 1)
50158 end = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks)- 1;
50159
50160 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
50161 index 3a05a41..320bec6 100644
50162 --- a/fs/xfs/xfs_ioctl.c
50163 +++ b/fs/xfs/xfs_ioctl.c
50164 @@ -126,7 +126,7 @@ xfs_find_handle(
50165 }
50166
50167 error = -EFAULT;
50168 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
50169 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
50170 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
50171 goto out_put;
50172
50173 diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
50174 index 1a25fd8..e935581 100644
50175 --- a/fs/xfs/xfs_iops.c
50176 +++ b/fs/xfs/xfs_iops.c
50177 @@ -394,7 +394,7 @@ xfs_vn_put_link(
50178 struct nameidata *nd,
50179 void *p)
50180 {
50181 - char *s = nd_get_link(nd);
50182 + const char *s = nd_get_link(nd);
50183
50184 if (!IS_ERR(s))
50185 kfree(s);
50186 diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
50187 index 92d4331..ca28a4b 100644
50188 --- a/fs/xfs/xfs_rtalloc.c
50189 +++ b/fs/xfs/xfs_rtalloc.c
50190 @@ -857,7 +857,7 @@ xfs_rtbuf_get(
50191 xfs_buf_t *bp; /* block buffer, result */
50192 xfs_inode_t *ip; /* bitmap or summary inode */
50193 xfs_bmbt_irec_t map;
50194 - int nmap;
50195 + int nmap = 1;
50196 int error; /* error value */
50197
50198 ip = issum ? mp->m_rsumip : mp->m_rbmip;
50199 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
50200 new file mode 100644
50201 index 0000000..4d533f1
50202 --- /dev/null
50203 +++ b/grsecurity/Kconfig
50204 @@ -0,0 +1,941 @@
50205 +#
50206 +# grecurity configuration
50207 +#
50208 +menu "Memory Protections"
50209 +depends on GRKERNSEC
50210 +
50211 +config GRKERNSEC_KMEM
50212 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
50213 + default y if GRKERNSEC_CONFIG_AUTO
50214 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
50215 + help
50216 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
50217 + be written to or read from to modify or leak the contents of the running
50218 + kernel. /dev/port will also not be allowed to be opened. If you have module
50219 + support disabled, enabling this will close up four ways that are
50220 + currently used to insert malicious code into the running kernel.
50221 + Even with all these features enabled, we still highly recommend that
50222 + you use the RBAC system, as it is still possible for an attacker to
50223 + modify the running kernel through privileged I/O granted by ioperm/iopl.
50224 + If you are not using XFree86, you may be able to stop this additional
50225 + case by enabling the 'Disable privileged I/O' option. Though nothing
50226 + legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
50227 + but only to video memory, which is the only writing we allow in this
50228 + case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
50229 + not be allowed to mprotect it with PROT_WRITE later.
50230 + It is highly recommended that you say Y here if you meet all the
50231 + conditions above.
50232 +
50233 +config GRKERNSEC_VM86
50234 + bool "Restrict VM86 mode"
50235 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
50236 + depends on X86_32
50237 +
50238 + help
50239 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
50240 + make use of a special execution mode on 32bit x86 processors called
50241 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
50242 + video cards and will still work with this option enabled. The purpose
50243 + of the option is to prevent exploitation of emulation errors in
50244 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
50245 + Nearly all users should be able to enable this option.
50246 +
50247 +config GRKERNSEC_IO
50248 + bool "Disable privileged I/O"
50249 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
50250 + depends on X86
50251 + select RTC_CLASS
50252 + select RTC_INTF_DEV
50253 + select RTC_DRV_CMOS
50254 +
50255 + help
50256 + If you say Y here, all ioperm and iopl calls will return an error.
50257 + Ioperm and iopl can be used to modify the running kernel.
50258 + Unfortunately, some programs need this access to operate properly,
50259 + the most notable of which are XFree86 and hwclock. hwclock can be
50260 + remedied by having RTC support in the kernel, so real-time
50261 + clock support is enabled if this option is enabled, to ensure
50262 + that hwclock operates correctly. XFree86 still will not
50263 + operate correctly with this option enabled, so DO NOT CHOOSE Y
50264 + IF YOU USE XFree86. If you use XFree86 and you still want to
50265 + protect your kernel against modification, use the RBAC system.
50266 +
50267 +config GRKERNSEC_PROC_MEMMAP
50268 + bool "Harden ASLR against information leaks and entropy reduction"
50269 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
50270 + depends on PAX_NOEXEC || PAX_ASLR
50271 + help
50272 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
50273 + give no information about the addresses of its mappings if
50274 + PaX features that rely on random addresses are enabled on the task.
50275 + In addition to sanitizing this information and disabling other
50276 + dangerous sources of information, this option causes reads of sensitive
50277 + /proc/<pid> entries where the file descriptor was opened in a different
50278 + task than the one performing the read. Such attempts are logged.
50279 + This option also limits argv/env strings for suid/sgid binaries
50280 + to 512KB to prevent a complete exhaustion of the stack entropy provided
50281 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
50282 + binaries to prevent alternative mmap layouts from being abused.
50283 +
50284 + If you use PaX it is essential that you say Y here as it closes up
50285 + several holes that make full ASLR useless locally.
50286 +
50287 +config GRKERNSEC_BRUTE
50288 + bool "Deter exploit bruteforcing"
50289 + default y if GRKERNSEC_CONFIG_AUTO
50290 + help
50291 + If you say Y here, attempts to bruteforce exploits against forking
50292 + daemons such as apache or sshd, as well as against suid/sgid binaries
50293 + will be deterred. When a child of a forking daemon is killed by PaX
50294 + or crashes due to an illegal instruction or other suspicious signal,
50295 + the parent process will be delayed 30 seconds upon every subsequent
50296 + fork until the administrator is able to assess the situation and
50297 + restart the daemon.
50298 + In the suid/sgid case, the attempt is logged, the user has all their
50299 + processes terminated, and they are prevented from executing any further
50300 + processes for 15 minutes.
50301 + It is recommended that you also enable signal logging in the auditing
50302 + section so that logs are generated when a process triggers a suspicious
50303 + signal.
50304 + If the sysctl option is enabled, a sysctl option with name
50305 + "deter_bruteforce" is created.
50306 +
50307 +
50308 +config GRKERNSEC_MODHARDEN
50309 + bool "Harden module auto-loading"
50310 + default y if GRKERNSEC_CONFIG_AUTO
50311 + depends on MODULES
50312 + help
50313 + If you say Y here, module auto-loading in response to use of some
50314 + feature implemented by an unloaded module will be restricted to
50315 + root users. Enabling this option helps defend against attacks
50316 + by unprivileged users who abuse the auto-loading behavior to
50317 + cause a vulnerable module to load that is then exploited.
50318 +
50319 + If this option prevents a legitimate use of auto-loading for a
50320 + non-root user, the administrator can execute modprobe manually
50321 + with the exact name of the module mentioned in the alert log.
50322 + Alternatively, the administrator can add the module to the list
50323 + of modules loaded at boot by modifying init scripts.
50324 +
50325 + Modification of init scripts will most likely be needed on
50326 + Ubuntu servers with encrypted home directory support enabled,
50327 + as the first non-root user logging in will cause the ecb(aes),
50328 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
50329 +
50330 +config GRKERNSEC_HIDESYM
50331 + bool "Hide kernel symbols"
50332 + default y if GRKERNSEC_CONFIG_AUTO
50333 + select PAX_USERCOPY_SLABS
50334 + help
50335 + If you say Y here, getting information on loaded modules, and
50336 + displaying all kernel symbols through a syscall will be restricted
50337 + to users with CAP_SYS_MODULE. For software compatibility reasons,
50338 + /proc/kallsyms will be restricted to the root user. The RBAC
50339 + system can hide that entry even from root.
50340 +
50341 + This option also prevents leaking of kernel addresses through
50342 + several /proc entries.
50343 +
50344 + Note that this option is only effective provided the following
50345 + conditions are met:
50346 + 1) The kernel using grsecurity is not precompiled by some distribution
50347 + 2) You have also enabled GRKERNSEC_DMESG
50348 + 3) You are using the RBAC system and hiding other files such as your
50349 + kernel image and System.map. Alternatively, enabling this option
50350 + causes the permissions on /boot, /lib/modules, and the kernel
50351 + source directory to change at compile time to prevent
50352 + reading by non-root users.
50353 + If the above conditions are met, this option will aid in providing a
50354 + useful protection against local kernel exploitation of overflows
50355 + and arbitrary read/write vulnerabilities.
50356 +
50357 +config GRKERNSEC_KERN_LOCKOUT
50358 + bool "Active kernel exploit response"
50359 + default y if GRKERNSEC_CONFIG_AUTO
50360 + depends on X86 || ARM || PPC || SPARC
50361 + help
50362 + If you say Y here, when a PaX alert is triggered due to suspicious
50363 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
50364 + or an OOPS occurs due to bad memory accesses, instead of just
50365 + terminating the offending process (and potentially allowing
50366 + a subsequent exploit from the same user), we will take one of two
50367 + actions:
50368 + If the user was root, we will panic the system
50369 + If the user was non-root, we will log the attempt, terminate
50370 + all processes owned by the user, then prevent them from creating
50371 + any new processes until the system is restarted
50372 + This deters repeated kernel exploitation/bruteforcing attempts
50373 + and is useful for later forensics.
50374 +
50375 +endmenu
50376 +menu "Role Based Access Control Options"
50377 +depends on GRKERNSEC
50378 +
50379 +config GRKERNSEC_RBAC_DEBUG
50380 + bool
50381 +
50382 +config GRKERNSEC_NO_RBAC
50383 + bool "Disable RBAC system"
50384 + help
50385 + If you say Y here, the /dev/grsec device will be removed from the kernel,
50386 + preventing the RBAC system from being enabled. You should only say Y
50387 + here if you have no intention of using the RBAC system, so as to prevent
50388 + an attacker with root access from misusing the RBAC system to hide files
50389 + and processes when loadable module support and /dev/[k]mem have been
50390 + locked down.
50391 +
50392 +config GRKERNSEC_ACL_HIDEKERN
50393 + bool "Hide kernel processes"
50394 + help
50395 + If you say Y here, all kernel threads will be hidden to all
50396 + processes but those whose subject has the "view hidden processes"
50397 + flag.
50398 +
50399 +config GRKERNSEC_ACL_MAXTRIES
50400 + int "Maximum tries before password lockout"
50401 + default 3
50402 + help
50403 + This option enforces the maximum number of times a user can attempt
50404 + to authorize themselves with the grsecurity RBAC system before being
50405 + denied the ability to attempt authorization again for a specified time.
50406 + The lower the number, the harder it will be to brute-force a password.
50407 +
50408 +config GRKERNSEC_ACL_TIMEOUT
50409 + int "Time to wait after max password tries, in seconds"
50410 + default 30
50411 + help
50412 + This option specifies the time the user must wait after attempting to
50413 + authorize to the RBAC system with the maximum number of invalid
50414 + passwords. The higher the number, the harder it will be to brute-force
50415 + a password.
50416 +
50417 +endmenu
50418 +menu "Filesystem Protections"
50419 +depends on GRKERNSEC
50420 +
50421 +config GRKERNSEC_PROC
50422 + bool "Proc restrictions"
50423 + default y if GRKERNSEC_CONFIG_AUTO
50424 + help
50425 + If you say Y here, the permissions of the /proc filesystem
50426 + will be altered to enhance system security and privacy. You MUST
50427 + choose either a user only restriction or a user and group restriction.
50428 + Depending upon the option you choose, you can either restrict users to
50429 + see only the processes they themselves run, or choose a group that can
50430 + view all processes and files normally restricted to root if you choose
50431 + the "restrict to user only" option. NOTE: If you're running identd or
50432 + ntpd as a non-root user, you will have to run it as the group you
50433 + specify here.
50434 +
50435 +config GRKERNSEC_PROC_USER
50436 + bool "Restrict /proc to user only"
50437 + depends on GRKERNSEC_PROC
50438 + help
50439 + If you say Y here, non-root users will only be able to view their own
50440 + processes, and restricts them from viewing network-related information,
50441 + and viewing kernel symbol and module information.
50442 +
50443 +config GRKERNSEC_PROC_USERGROUP
50444 + bool "Allow special group"
50445 + default y if GRKERNSEC_CONFIG_AUTO
50446 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
50447 + help
50448 + If you say Y here, you will be able to select a group that will be
50449 + able to view all processes and network-related information. If you've
50450 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
50451 + remain hidden. This option is useful if you want to run identd as
50452 + a non-root user.
50453 +
50454 +config GRKERNSEC_PROC_GID
50455 + int "GID for special group"
50456 + depends on GRKERNSEC_PROC_USERGROUP
50457 + default 1001
50458 +
50459 +config GRKERNSEC_PROC_ADD
50460 + bool "Additional restrictions"
50461 + default y if GRKERNSEC_CONFIG_AUTO
50462 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
50463 + help
50464 + If you say Y here, additional restrictions will be placed on
50465 + /proc that keep normal users from viewing device information and
50466 + slabinfo information that could be useful for exploits.
50467 +
50468 +config GRKERNSEC_LINK
50469 + bool "Linking restrictions"
50470 + default y if GRKERNSEC_CONFIG_AUTO
50471 + help
50472 + If you say Y here, /tmp race exploits will be prevented, since users
50473 + will no longer be able to follow symlinks owned by other users in
50474 + world-writable +t directories (e.g. /tmp), unless the owner of the
50475 + symlink is the owner of the directory. users will also not be
50476 + able to hardlink to files they do not own. If the sysctl option is
50477 + enabled, a sysctl option with name "linking_restrictions" is created.
50478 +
50479 +config GRKERNSEC_SYMLINKOWN
50480 + bool "Kernel-enforced SymlinksIfOwnerMatch"
50481 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
50482 + help
50483 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
50484 + that prevents it from being used as a security feature. As Apache
50485 + verifies the symlink by performing a stat() against the target of
50486 + the symlink before it is followed, an attacker can setup a symlink
50487 + to point to a same-owned file, then replace the symlink with one
50488 + that targets another user's file just after Apache "validates" the
50489 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
50490 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
50491 + will be in place for the group you specify. If the sysctl option
50492 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
50493 + created.
50494 +
50495 +config GRKERNSEC_SYMLINKOWN_GID
50496 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
50497 + depends on GRKERNSEC_SYMLINKOWN
50498 + default 1006
50499 + help
50500 + Setting this GID determines what group kernel-enforced
50501 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
50502 + is enabled, a sysctl option with name "symlinkown_gid" is created.
50503 +
50504 +config GRKERNSEC_FIFO
50505 + bool "FIFO restrictions"
50506 + default y if GRKERNSEC_CONFIG_AUTO
50507 + help
50508 + If you say Y here, users will not be able to write to FIFOs they don't
50509 + own in world-writable +t directories (e.g. /tmp), unless the owner of
50510 + the FIFO is the same owner of the directory it's held in. If the sysctl
50511 + option is enabled, a sysctl option with name "fifo_restrictions" is
50512 + created.
50513 +
50514 +config GRKERNSEC_SYSFS_RESTRICT
50515 + bool "Sysfs/debugfs restriction"
50516 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
50517 + depends on SYSFS
50518 + help
50519 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
50520 + any filesystem normally mounted under it (e.g. debugfs) will be
50521 + mostly accessible only by root. These filesystems generally provide access
50522 + to hardware and debug information that isn't appropriate for unprivileged
50523 + users of the system. Sysfs and debugfs have also become a large source
50524 + of new vulnerabilities, ranging from infoleaks to local compromise.
50525 + There has been very little oversight with an eye toward security involved
50526 + in adding new exporters of information to these filesystems, so their
50527 + use is discouraged.
50528 + For reasons of compatibility, a few directories have been whitelisted
50529 + for access by non-root users:
50530 + /sys/fs/selinux
50531 + /sys/fs/fuse
50532 + /sys/devices/system/cpu
50533 +
50534 +config GRKERNSEC_ROFS
50535 + bool "Runtime read-only mount protection"
50536 + help
50537 + If you say Y here, a sysctl option with name "romount_protect" will
50538 + be created. By setting this option to 1 at runtime, filesystems
50539 + will be protected in the following ways:
50540 + * No new writable mounts will be allowed
50541 + * Existing read-only mounts won't be able to be remounted read/write
50542 + * Write operations will be denied on all block devices
50543 + This option acts independently of grsec_lock: once it is set to 1,
50544 + it cannot be turned off. Therefore, please be mindful of the resulting
50545 + behavior if this option is enabled in an init script on a read-only
50546 + filesystem. This feature is mainly intended for secure embedded systems.
50547 +
50548 +config GRKERNSEC_CHROOT
50549 + bool "Chroot jail restrictions"
50550 + default y if GRKERNSEC_CONFIG_AUTO
50551 + help
50552 + If you say Y here, you will be able to choose several options that will
50553 + make breaking out of a chrooted jail much more difficult. If you
50554 + encounter no software incompatibilities with the following options, it
50555 + is recommended that you enable each one.
50556 +
50557 +config GRKERNSEC_CHROOT_MOUNT
50558 + bool "Deny mounts"
50559 + default y if GRKERNSEC_CONFIG_AUTO
50560 + depends on GRKERNSEC_CHROOT
50561 + help
50562 + If you say Y here, processes inside a chroot will not be able to
50563 + mount or remount filesystems. If the sysctl option is enabled, a
50564 + sysctl option with name "chroot_deny_mount" is created.
50565 +
50566 +config GRKERNSEC_CHROOT_DOUBLE
50567 + bool "Deny double-chroots"
50568 + default y if GRKERNSEC_CONFIG_AUTO
50569 + depends on GRKERNSEC_CHROOT
50570 + help
50571 + If you say Y here, processes inside a chroot will not be able to chroot
50572 + again outside the chroot. This is a widely used method of breaking
50573 + out of a chroot jail and should not be allowed. If the sysctl
50574 + option is enabled, a sysctl option with name
50575 + "chroot_deny_chroot" is created.
50576 +
50577 +config GRKERNSEC_CHROOT_PIVOT
50578 + bool "Deny pivot_root in chroot"
50579 + default y if GRKERNSEC_CONFIG_AUTO
50580 + depends on GRKERNSEC_CHROOT
50581 + help
50582 + If you say Y here, processes inside a chroot will not be able to use
50583 + a function called pivot_root() that was introduced in Linux 2.3.41. It
50584 + works similar to chroot in that it changes the root filesystem. This
50585 + function could be misused in a chrooted process to attempt to break out
50586 + of the chroot, and therefore should not be allowed. If the sysctl
50587 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
50588 + created.
50589 +
50590 +config GRKERNSEC_CHROOT_CHDIR
50591 + bool "Enforce chdir(\"/\") on all chroots"
50592 + default y if GRKERNSEC_CONFIG_AUTO
50593 + depends on GRKERNSEC_CHROOT
50594 + help
50595 + If you say Y here, the current working directory of all newly-chrooted
50596 + applications will be set to the the root directory of the chroot.
50597 + The man page on chroot(2) states:
50598 + Note that this call does not change the current working
50599 + directory, so that `.' can be outside the tree rooted at
50600 + `/'. In particular, the super-user can escape from a
50601 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
50602 +
50603 + It is recommended that you say Y here, since it's not known to break
50604 + any software. If the sysctl option is enabled, a sysctl option with
50605 + name "chroot_enforce_chdir" is created.
50606 +
50607 +config GRKERNSEC_CHROOT_CHMOD
50608 + bool "Deny (f)chmod +s"
50609 + default y if GRKERNSEC_CONFIG_AUTO
50610 + depends on GRKERNSEC_CHROOT
50611 + help
50612 + If you say Y here, processes inside a chroot will not be able to chmod
50613 + or fchmod files to make them have suid or sgid bits. This protects
50614 + against another published method of breaking a chroot. If the sysctl
50615 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
50616 + created.
50617 +
50618 +config GRKERNSEC_CHROOT_FCHDIR
50619 + bool "Deny fchdir out of chroot"
50620 + default y if GRKERNSEC_CONFIG_AUTO
50621 + depends on GRKERNSEC_CHROOT
50622 + help
50623 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
50624 + to a file descriptor of the chrooting process that points to a directory
50625 + outside the filesystem will be stopped. If the sysctl option
50626 + is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
50627 +
50628 +config GRKERNSEC_CHROOT_MKNOD
50629 + bool "Deny mknod"
50630 + default y if GRKERNSEC_CONFIG_AUTO
50631 + depends on GRKERNSEC_CHROOT
50632 + help
50633 + If you say Y here, processes inside a chroot will not be allowed to
50634 + mknod. The problem with using mknod inside a chroot is that it
50635 + would allow an attacker to create a device entry that is the same
50636 + as one on the physical root of your system, which could range from
50637 + anything from the console device to a device for your harddrive (which
50638 + they could then use to wipe the drive or steal data). It is recommended
50639 + that you say Y here, unless you run into software incompatibilities.
50640 + If the sysctl option is enabled, a sysctl option with name
50641 + "chroot_deny_mknod" is created.
50642 +
50643 +config GRKERNSEC_CHROOT_SHMAT
50644 + bool "Deny shmat() out of chroot"
50645 + default y if GRKERNSEC_CONFIG_AUTO
50646 + depends on GRKERNSEC_CHROOT
50647 + help
50648 + If you say Y here, processes inside a chroot will not be able to attach
50649 + to shared memory segments that were created outside of the chroot jail.
50650 + It is recommended that you say Y here. If the sysctl option is enabled,
50651 + a sysctl option with name "chroot_deny_shmat" is created.
50652 +
50653 +config GRKERNSEC_CHROOT_UNIX
50654 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
50655 + default y if GRKERNSEC_CONFIG_AUTO
50656 + depends on GRKERNSEC_CHROOT
50657 + help
50658 + If you say Y here, processes inside a chroot will not be able to
50659 + connect to abstract (meaning not belonging to a filesystem) Unix
50660 + domain sockets that were bound outside of a chroot. It is recommended
50661 + that you say Y here. If the sysctl option is enabled, a sysctl option
50662 + with name "chroot_deny_unix" is created.
50663 +
50664 +config GRKERNSEC_CHROOT_FINDTASK
50665 + bool "Protect outside processes"
50666 + default y if GRKERNSEC_CONFIG_AUTO
50667 + depends on GRKERNSEC_CHROOT
50668 + help
50669 + If you say Y here, processes inside a chroot will not be able to
50670 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
50671 + getsid, or view any process outside of the chroot. If the sysctl
50672 + option is enabled, a sysctl option with name "chroot_findtask" is
50673 + created.
50674 +
50675 +config GRKERNSEC_CHROOT_NICE
50676 + bool "Restrict priority changes"
50677 + default y if GRKERNSEC_CONFIG_AUTO
50678 + depends on GRKERNSEC_CHROOT
50679 + help
50680 + If you say Y here, processes inside a chroot will not be able to raise
50681 + the priority of processes in the chroot, or alter the priority of
50682 + processes outside the chroot. This provides more security than simply
50683 + removing CAP_SYS_NICE from the process' capability set. If the
50684 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
50685 + is created.
50686 +
50687 +config GRKERNSEC_CHROOT_SYSCTL
50688 + bool "Deny sysctl writes"
50689 + default y if GRKERNSEC_CONFIG_AUTO
50690 + depends on GRKERNSEC_CHROOT
50691 + help
50692 + If you say Y here, an attacker in a chroot will not be able to
50693 + write to sysctl entries, either by sysctl(2) or through a /proc
50694 + interface. It is strongly recommended that you say Y here. If the
50695 + sysctl option is enabled, a sysctl option with name
50696 + "chroot_deny_sysctl" is created.
50697 +
50698 +config GRKERNSEC_CHROOT_CAPS
50699 + bool "Capability restrictions"
50700 + default y if GRKERNSEC_CONFIG_AUTO
50701 + depends on GRKERNSEC_CHROOT
50702 + help
50703 + If you say Y here, the capabilities on all processes within a
50704 + chroot jail will be lowered to stop module insertion, raw i/o,
50705 + system and net admin tasks, rebooting the system, modifying immutable
50706 + files, modifying IPC owned by another, and changing the system time.
50707 + This is left an option because it can break some apps. Disable this
50708 + if your chrooted apps are having problems performing those kinds of
50709 + tasks. If the sysctl option is enabled, a sysctl option with
50710 + name "chroot_caps" is created.
50711 +
50712 +endmenu
50713 +menu "Kernel Auditing"
50714 +depends on GRKERNSEC
50715 +
50716 +config GRKERNSEC_AUDIT_GROUP
50717 + bool "Single group for auditing"
50718 + help
50719 + If you say Y here, the exec, chdir, and (un)mount logging features
50720 + will only operate on a group you specify. This option is recommended
50721 + if you only want to watch certain users instead of having a large
50722 + amount of logs from the entire system. If the sysctl option is enabled,
50723 + a sysctl option with name "audit_group" is created.
50724 +
50725 +config GRKERNSEC_AUDIT_GID
50726 + int "GID for auditing"
50727 + depends on GRKERNSEC_AUDIT_GROUP
50728 + default 1007
50729 +
50730 +config GRKERNSEC_EXECLOG
50731 + bool "Exec logging"
50732 + help
50733 + If you say Y here, all execve() calls will be logged (since the
50734 + other exec*() calls are frontends to execve(), all execution
50735 + will be logged). Useful for shell-servers that like to keep track
50736 + of their users. If the sysctl option is enabled, a sysctl option with
50737 + name "exec_logging" is created.
50738 + WARNING: This option when enabled will produce a LOT of logs, especially
50739 + on an active system.
50740 +
50741 +config GRKERNSEC_RESLOG
50742 + bool "Resource logging"
50743 + default y if GRKERNSEC_CONFIG_AUTO
50744 + help
50745 + If you say Y here, all attempts to overstep resource limits will
50746 + be logged with the resource name, the requested size, and the current
50747 + limit. It is highly recommended that you say Y here. If the sysctl
50748 + option is enabled, a sysctl option with name "resource_logging" is
50749 + created. If the RBAC system is enabled, the sysctl value is ignored.
50750 +
50751 +config GRKERNSEC_CHROOT_EXECLOG
50752 + bool "Log execs within chroot"
50753 + help
50754 + If you say Y here, all executions inside a chroot jail will be logged
50755 + to syslog. This can cause a large amount of logs if certain
50756 + applications (eg. djb's daemontools) are installed on the system, and
50757 + is therefore left as an option. If the sysctl option is enabled, a
50758 + sysctl option with name "chroot_execlog" is created.
50759 +
50760 +config GRKERNSEC_AUDIT_PTRACE
50761 + bool "Ptrace logging"
50762 + help
50763 + If you say Y here, all attempts to attach to a process via ptrace
50764 + will be logged. If the sysctl option is enabled, a sysctl option
50765 + with name "audit_ptrace" is created.
50766 +
50767 +config GRKERNSEC_AUDIT_CHDIR
50768 + bool "Chdir logging"
50769 + help
50770 + If you say Y here, all chdir() calls will be logged. If the sysctl
50771 + option is enabled, a sysctl option with name "audit_chdir" is created.
50772 +
50773 +config GRKERNSEC_AUDIT_MOUNT
50774 + bool "(Un)Mount logging"
50775 + help
50776 + If you say Y here, all mounts and unmounts will be logged. If the
50777 + sysctl option is enabled, a sysctl option with name "audit_mount" is
50778 + created.
50779 +
50780 +config GRKERNSEC_SIGNAL
50781 + bool "Signal logging"
50782 + default y if GRKERNSEC_CONFIG_AUTO
50783 + help
50784 + If you say Y here, certain important signals will be logged, such as
50785 + SIGSEGV, which will as a result inform you of when a error in a program
50786 + occurred, which in some cases could mean a possible exploit attempt.
50787 + If the sysctl option is enabled, a sysctl option with name
50788 + "signal_logging" is created.
50789 +
50790 +config GRKERNSEC_FORKFAIL
50791 + bool "Fork failure logging"
50792 + help
50793 + If you say Y here, all failed fork() attempts will be logged.
50794 + This could suggest a fork bomb, or someone attempting to overstep
50795 + their process limit. If the sysctl option is enabled, a sysctl option
50796 + with name "forkfail_logging" is created.
50797 +
50798 +config GRKERNSEC_TIME
50799 + bool "Time change logging"
50800 + default y if GRKERNSEC_CONFIG_AUTO
50801 + help
50802 + If you say Y here, any changes of the system clock will be logged.
50803 + If the sysctl option is enabled, a sysctl option with name
50804 + "timechange_logging" is created.
50805 +
50806 +config GRKERNSEC_PROC_IPADDR
50807 + bool "/proc/<pid>/ipaddr support"
50808 + default y if GRKERNSEC_CONFIG_AUTO
50809 + help
50810 + If you say Y here, a new entry will be added to each /proc/<pid>
50811 + directory that contains the IP address of the person using the task.
50812 + The IP is carried across local TCP and AF_UNIX stream sockets.
50813 + This information can be useful for IDS/IPSes to perform remote response
50814 + to a local attack. The entry is readable by only the owner of the
50815 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
50816 + the RBAC system), and thus does not create privacy concerns.
50817 +
50818 +config GRKERNSEC_RWXMAP_LOG
50819 + bool 'Denied RWX mmap/mprotect logging'
50820 + default y if GRKERNSEC_CONFIG_AUTO
50821 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
50822 + help
50823 + If you say Y here, calls to mmap() and mprotect() with explicit
50824 + usage of PROT_WRITE and PROT_EXEC together will be logged when
50825 + denied by the PAX_MPROTECT feature. If the sysctl option is
50826 + enabled, a sysctl option with name "rwxmap_logging" is created.
50827 +
50828 +config GRKERNSEC_AUDIT_TEXTREL
50829 + bool 'ELF text relocations logging (READ HELP)'
50830 + depends on PAX_MPROTECT
50831 + help
50832 + If you say Y here, text relocations will be logged with the filename
50833 + of the offending library or binary. The purpose of the feature is
50834 + to help Linux distribution developers get rid of libraries and
50835 + binaries that need text relocations which hinder the future progress
50836 + of PaX. Only Linux distribution developers should say Y here, and
50837 + never on a production machine, as this option creates an information
50838 + leak that could aid an attacker in defeating the randomization of
50839 + a single memory region. If the sysctl option is enabled, a sysctl
50840 + option with name "audit_textrel" is created.
50841 +
50842 +endmenu
50843 +
50844 +menu "Executable Protections"
50845 +depends on GRKERNSEC
50846 +
50847 +config GRKERNSEC_DMESG
50848 + bool "Dmesg(8) restriction"
50849 + default y if GRKERNSEC_CONFIG_AUTO
50850 + help
50851 + If you say Y here, non-root users will not be able to use dmesg(8)
50852 + to view up to the last 4kb of messages in the kernel's log buffer.
50853 + The kernel's log buffer often contains kernel addresses and other
50854 + identifying information useful to an attacker in fingerprinting a
50855 + system for a targeted exploit.
50856 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
50857 + created.
50858 +
50859 +config GRKERNSEC_HARDEN_PTRACE
50860 + bool "Deter ptrace-based process snooping"
50861 + default y if GRKERNSEC_CONFIG_AUTO
50862 + help
50863 + If you say Y here, TTY sniffers and other malicious monitoring
50864 + programs implemented through ptrace will be defeated. If you
50865 + have been using the RBAC system, this option has already been
50866 + enabled for several years for all users, with the ability to make
50867 + fine-grained exceptions.
50868 +
50869 + This option only affects the ability of non-root users to ptrace
50870 + processes that are not a descendent of the ptracing process.
50871 + This means that strace ./binary and gdb ./binary will still work,
50872 + but attaching to arbitrary processes will not. If the sysctl
50873 + option is enabled, a sysctl option with name "harden_ptrace" is
50874 + created.
50875 +
50876 +config GRKERNSEC_PTRACE_READEXEC
50877 + bool "Require read access to ptrace sensitive binaries"
50878 + default y if GRKERNSEC_CONFIG_AUTO
50879 + help
50880 + If you say Y here, unprivileged users will not be able to ptrace unreadable
50881 + binaries. This option is useful in environments that
50882 + remove the read bits (e.g. file mode 4711) from suid binaries to
50883 + prevent infoleaking of their contents. This option adds
50884 + consistency to the use of that file mode, as the binary could normally
50885 + be read out when run without privileges while ptracing.
50886 +
50887 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
50888 + is created.
50889 +
50890 +config GRKERNSEC_SETXID
50891 + bool "Enforce consistent multithreaded privileges"
50892 + default y if GRKERNSEC_CONFIG_AUTO
50893 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
50894 + help
50895 + If you say Y here, a change from a root uid to a non-root uid
50896 + in a multithreaded application will cause the resulting uids,
50897 + gids, supplementary groups, and capabilities in that thread
50898 + to be propagated to the other threads of the process. In most
50899 + cases this is unnecessary, as glibc will emulate this behavior
50900 + on behalf of the application. Other libcs do not act in the
50901 + same way, allowing the other threads of the process to continue
50902 + running with root privileges. If the sysctl option is enabled,
50903 + a sysctl option with name "consistent_setxid" is created.
50904 +
50905 +config GRKERNSEC_TPE
50906 + bool "Trusted Path Execution (TPE)"
50907 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
50908 + help
50909 + If you say Y here, you will be able to choose a gid to add to the
50910 + supplementary groups of users you want to mark as "untrusted."
50911 + These users will not be able to execute any files that are not in
50912 + root-owned directories writable only by root. If the sysctl option
50913 + is enabled, a sysctl option with name "tpe" is created.
50914 +
50915 +config GRKERNSEC_TPE_ALL
50916 + bool "Partially restrict all non-root users"
50917 + depends on GRKERNSEC_TPE
50918 + help
50919 + If you say Y here, all non-root users will be covered under
50920 + a weaker TPE restriction. This is separate from, and in addition to,
50921 + the main TPE options that you have selected elsewhere. Thus, if a
50922 + "trusted" GID is chosen, this restriction applies to even that GID.
50923 + Under this restriction, all non-root users will only be allowed to
50924 + execute files in directories they own that are not group or
50925 + world-writable, or in directories owned by root and writable only by
50926 + root. If the sysctl option is enabled, a sysctl option with name
50927 + "tpe_restrict_all" is created.
50928 +
50929 +config GRKERNSEC_TPE_INVERT
50930 + bool "Invert GID option"
50931 + depends on GRKERNSEC_TPE
50932 + help
50933 + If you say Y here, the group you specify in the TPE configuration will
50934 + decide what group TPE restrictions will be *disabled* for. This
50935 + option is useful if you want TPE restrictions to be applied to most
50936 + users on the system. If the sysctl option is enabled, a sysctl option
50937 + with name "tpe_invert" is created. Unlike other sysctl options, this
50938 + entry will default to on for backward-compatibility.
50939 +
50940 +config GRKERNSEC_TPE_GID
50941 + int "GID for untrusted users"
50942 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
50943 + default 1005
50944 + help
50945 + Setting this GID determines what group TPE restrictions will be
50946 + *enabled* for. If the sysctl option is enabled, a sysctl option
50947 + with name "tpe_gid" is created.
50948 +
50949 +config GRKERNSEC_TPE_GID
50950 + int "GID for trusted users"
50951 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
50952 + default 1005
50953 + help
50954 + Setting this GID determines what group TPE restrictions will be
50955 + *disabled* for. If the sysctl option is enabled, a sysctl option
50956 + with name "tpe_gid" is created.
50957 +
50958 +endmenu
50959 +menu "Network Protections"
50960 +depends on GRKERNSEC
50961 +
50962 +config GRKERNSEC_RANDNET
50963 + bool "Larger entropy pools"
50964 + default y if GRKERNSEC_CONFIG_AUTO
50965 + help
50966 + If you say Y here, the entropy pools used for many features of Linux
50967 + and grsecurity will be doubled in size. Since several grsecurity
50968 + features use additional randomness, it is recommended that you say Y
50969 + here. Saying Y here has a similar effect as modifying
50970 + /proc/sys/kernel/random/poolsize.
50971 +
50972 +config GRKERNSEC_BLACKHOLE
50973 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
50974 + default y if GRKERNSEC_CONFIG_AUTO
50975 + depends on NET
50976 + help
50977 + If you say Y here, neither TCP resets nor ICMP
50978 + destination-unreachable packets will be sent in response to packets
50979 + sent to ports for which no associated listening process exists.
50980 + This feature supports both IPV4 and IPV6 and exempts the
50981 + loopback interface from blackholing. Enabling this feature
50982 + makes a host more resilient to DoS attacks and reduces network
50983 + visibility against scanners.
50984 +
50985 + The blackhole feature as-implemented is equivalent to the FreeBSD
50986 + blackhole feature, as it prevents RST responses to all packets, not
50987 + just SYNs. Under most application behavior this causes no
50988 + problems, but applications (like haproxy) may not close certain
50989 + connections in a way that cleanly terminates them on the remote
50990 + end, leaving the remote host in LAST_ACK state. Because of this
50991 + side-effect and to prevent intentional LAST_ACK DoSes, this
50992 + feature also adds automatic mitigation against such attacks.
50993 + The mitigation drastically reduces the amount of time a socket
50994 + can spend in LAST_ACK state. If you're using haproxy and not
50995 + all servers it connects to have this option enabled, consider
50996 + disabling this feature on the haproxy host.
50997 +
50998 + If the sysctl option is enabled, two sysctl options with names
50999 + "ip_blackhole" and "lastack_retries" will be created.
51000 + While "ip_blackhole" takes the standard zero/non-zero on/off
51001 + toggle, "lastack_retries" uses the same kinds of values as
51002 + "tcp_retries1" and "tcp_retries2". The default value of 4
51003 + prevents a socket from lasting more than 45 seconds in LAST_ACK
51004 + state.
51005 +
51006 +config GRKERNSEC_SOCKET
51007 + bool "Socket restrictions"
51008 + depends on NET
51009 + help
51010 + If you say Y here, you will be able to choose from several options.
51011 + If you assign a GID on your system and add it to the supplementary
51012 + groups of users you want to restrict socket access to, this patch
51013 + will perform up to three things, based on the option(s) you choose.
51014 +
51015 +config GRKERNSEC_SOCKET_ALL
51016 + bool "Deny any sockets to group"
51017 + depends on GRKERNSEC_SOCKET
51018 + help
51019 + If you say Y here, you will be able to choose a GID of whose users will
51020 + be unable to connect to other hosts from your machine or run server
51021 + applications from your machine. If the sysctl option is enabled, a
51022 + sysctl option with name "socket_all" is created.
51023 +
51024 +config GRKERNSEC_SOCKET_ALL_GID
51025 + int "GID to deny all sockets for"
51026 + depends on GRKERNSEC_SOCKET_ALL
51027 + default 1004
51028 + help
51029 + Here you can choose the GID to disable socket access for. Remember to
51030 + add the users you want socket access disabled for to the GID
51031 + specified here. If the sysctl option is enabled, a sysctl option
51032 + with name "socket_all_gid" is created.
51033 +
51034 +config GRKERNSEC_SOCKET_CLIENT
51035 + bool "Deny client sockets to group"
51036 + depends on GRKERNSEC_SOCKET
51037 + help
51038 + If you say Y here, you will be able to choose a GID of whose users will
51039 + be unable to connect to other hosts from your machine, but will be
51040 + able to run servers. If this option is enabled, all users in the group
51041 + you specify will have to use passive mode when initiating ftp transfers
51042 + from the shell on your machine. If the sysctl option is enabled, a
51043 + sysctl option with name "socket_client" is created.
51044 +
51045 +config GRKERNSEC_SOCKET_CLIENT_GID
51046 + int "GID to deny client sockets for"
51047 + depends on GRKERNSEC_SOCKET_CLIENT
51048 + default 1003
51049 + help
51050 + Here you can choose the GID to disable client socket access for.
51051 + Remember to add the users you want client socket access disabled for to
51052 + the GID specified here. If the sysctl option is enabled, a sysctl
51053 + option with name "socket_client_gid" is created.
51054 +
51055 +config GRKERNSEC_SOCKET_SERVER
51056 + bool "Deny server sockets to group"
51057 + depends on GRKERNSEC_SOCKET
51058 + help
51059 + If you say Y here, you will be able to choose a GID of whose users will
51060 + be unable to run server applications from your machine. If the sysctl
51061 + option is enabled, a sysctl option with name "socket_server" is created.
51062 +
51063 +config GRKERNSEC_SOCKET_SERVER_GID
51064 + int "GID to deny server sockets for"
51065 + depends on GRKERNSEC_SOCKET_SERVER
51066 + default 1002
51067 + help
51068 + Here you can choose the GID to disable server socket access for.
51069 + Remember to add the users you want server socket access disabled for to
51070 + the GID specified here. If the sysctl option is enabled, a sysctl
51071 + option with name "socket_server_gid" is created.
51072 +
51073 +endmenu
51074 +menu "Sysctl Support"
51075 +depends on GRKERNSEC && SYSCTL
51076 +
51077 +config GRKERNSEC_SYSCTL
51078 + bool "Sysctl support"
51079 + default y if GRKERNSEC_CONFIG_AUTO
51080 + help
51081 + If you say Y here, you will be able to change the options that
51082 + grsecurity runs with at bootup, without having to recompile your
51083 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
51084 + to enable (1) or disable (0) various features. All the sysctl entries
51085 + are mutable until the "grsec_lock" entry is set to a non-zero value.
51086 + All features enabled in the kernel configuration are disabled at boot
51087 + if you do not say Y to the "Turn on features by default" option.
51088 + All options should be set at startup, and the grsec_lock entry should
51089 + be set to a non-zero value after all the options are set.
51090 + *THIS IS EXTREMELY IMPORTANT*
51091 +
51092 +config GRKERNSEC_SYSCTL_DISTRO
51093 + bool "Extra sysctl support for distro makers (READ HELP)"
51094 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
51095 + help
51096 + If you say Y here, additional sysctl options will be created
51097 + for features that affect processes running as root. Therefore,
51098 + it is critical when using this option that the grsec_lock entry be
51099 + enabled after boot. Only distros with prebuilt kernel packages
51100 + with this option enabled that can ensure grsec_lock is enabled
51101 + after boot should use this option.
51102 + *Failure to set grsec_lock after boot makes all grsec features
51103 + this option covers useless*
51104 +
51105 + Currently this option creates the following sysctl entries:
51106 + "Disable Privileged I/O": "disable_priv_io"
51107 +
51108 +config GRKERNSEC_SYSCTL_ON
51109 + bool "Turn on features by default"
51110 + default y if GRKERNSEC_CONFIG_AUTO
51111 + depends on GRKERNSEC_SYSCTL
51112 + help
51113 + If you say Y here, instead of having all features enabled in the
51114 + kernel configuration disabled at boot time, the features will be
51115 + enabled at boot time. It is recommended you say Y here unless
51116 + there is some reason you would want all sysctl-tunable features to
51117 + be disabled by default. As mentioned elsewhere, it is important
51118 + to enable the grsec_lock entry once you have finished modifying
51119 + the sysctl entries.
51120 +
51121 +endmenu
51122 +menu "Logging Options"
51123 +depends on GRKERNSEC
51124 +
51125 +config GRKERNSEC_FLOODTIME
51126 + int "Seconds in between log messages (minimum)"
51127 + default 10
51128 + help
51129 + This option allows you to enforce the number of seconds between
51130 + grsecurity log messages. The default should be suitable for most
51131 + people, however, if you choose to change it, choose a value small enough
51132 + to allow informative logs to be produced, but large enough to
51133 + prevent flooding.
51134 +
51135 +config GRKERNSEC_FLOODBURST
51136 + int "Number of messages in a burst (maximum)"
51137 + default 6
51138 + help
51139 + This option allows you to choose the maximum number of messages allowed
51140 + within the flood time interval you chose in a separate option. The
51141 + default should be suitable for most people, however if you find that
51142 + many of your logs are being interpreted as flooding, you may want to
51143 + raise this value.
51144 +
51145 +endmenu
51146 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
51147 new file mode 100644
51148 index 0000000..1b9afa9
51149 --- /dev/null
51150 +++ b/grsecurity/Makefile
51151 @@ -0,0 +1,38 @@
51152 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
51153 +# during 2001-2009 it has been completely redesigned by Brad Spengler
51154 +# into an RBAC system
51155 +#
51156 +# All code in this directory and various hooks inserted throughout the kernel
51157 +# are copyright Brad Spengler - Open Source Security, Inc., and released
51158 +# under the GPL v2 or higher
51159 +
51160 +KBUILD_CFLAGS += -Werror
51161 +
51162 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
51163 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
51164 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
51165 +
51166 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
51167 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
51168 + gracl_learn.o grsec_log.o
51169 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
51170 +
51171 +ifdef CONFIG_NET
51172 +obj-y += grsec_sock.o
51173 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
51174 +endif
51175 +
51176 +ifndef CONFIG_GRKERNSEC
51177 +obj-y += grsec_disabled.o
51178 +endif
51179 +
51180 +ifdef CONFIG_GRKERNSEC_HIDESYM
51181 +extra-y := grsec_hidesym.o
51182 +$(obj)/grsec_hidesym.o:
51183 + @-chmod -f 500 /boot
51184 + @-chmod -f 500 /lib/modules
51185 + @-chmod -f 500 /lib64/modules
51186 + @-chmod -f 500 /lib32/modules
51187 + @-chmod -f 700 .
51188 + @echo ' grsec: protected kernel image paths'
51189 +endif
51190 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
51191 new file mode 100644
51192 index 0000000..1561617
51193 --- /dev/null
51194 +++ b/grsecurity/gracl.c
51195 @@ -0,0 +1,4017 @@
51196 +#include <linux/kernel.h>
51197 +#include <linux/module.h>
51198 +#include <linux/sched.h>
51199 +#include <linux/mm.h>
51200 +#include <linux/file.h>
51201 +#include <linux/fs.h>
51202 +#include <linux/namei.h>
51203 +#include <linux/mount.h>
51204 +#include <linux/tty.h>
51205 +#include <linux/proc_fs.h>
51206 +#include <linux/lglock.h>
51207 +#include <linux/slab.h>
51208 +#include <linux/vmalloc.h>
51209 +#include <linux/types.h>
51210 +#include <linux/sysctl.h>
51211 +#include <linux/netdevice.h>
51212 +#include <linux/ptrace.h>
51213 +#include <linux/gracl.h>
51214 +#include <linux/gralloc.h>
51215 +#include <linux/security.h>
51216 +#include <linux/grinternal.h>
51217 +#include <linux/pid_namespace.h>
51218 +#include <linux/stop_machine.h>
51219 +#include <linux/fdtable.h>
51220 +#include <linux/percpu.h>
51221 +#include <linux/lglock.h>
51222 +#include "../fs/mount.h"
51223 +
51224 +#include <asm/uaccess.h>
51225 +#include <asm/errno.h>
51226 +#include <asm/mman.h>
51227 +
51228 +extern struct lglock vfsmount_lock;
51229 +
51230 +static struct acl_role_db acl_role_set;
51231 +static struct name_db name_set;
51232 +static struct inodev_db inodev_set;
51233 +
51234 +/* for keeping track of userspace pointers used for subjects, so we
51235 + can share references in the kernel as well
51236 +*/
51237 +
51238 +static struct path real_root;
51239 +
51240 +static struct acl_subj_map_db subj_map_set;
51241 +
51242 +static struct acl_role_label *default_role;
51243 +
51244 +static struct acl_role_label *role_list;
51245 +
51246 +static u16 acl_sp_role_value;
51247 +
51248 +extern char *gr_shared_page[4];
51249 +static DEFINE_MUTEX(gr_dev_mutex);
51250 +DEFINE_RWLOCK(gr_inode_lock);
51251 +
51252 +struct gr_arg *gr_usermode;
51253 +
51254 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
51255 +
51256 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
51257 +extern void gr_clear_learn_entries(void);
51258 +
51259 +#ifdef CONFIG_GRKERNSEC_RESLOG
51260 +extern void gr_log_resource(const struct task_struct *task,
51261 + const int res, const unsigned long wanted, const int gt);
51262 +#endif
51263 +
51264 +unsigned char *gr_system_salt;
51265 +unsigned char *gr_system_sum;
51266 +
51267 +static struct sprole_pw **acl_special_roles = NULL;
51268 +static __u16 num_sprole_pws = 0;
51269 +
51270 +static struct acl_role_label *kernel_role = NULL;
51271 +
51272 +static unsigned int gr_auth_attempts = 0;
51273 +static unsigned long gr_auth_expires = 0UL;
51274 +
51275 +#ifdef CONFIG_NET
51276 +extern struct vfsmount *sock_mnt;
51277 +#endif
51278 +
51279 +extern struct vfsmount *pipe_mnt;
51280 +extern struct vfsmount *shm_mnt;
51281 +#ifdef CONFIG_HUGETLBFS
51282 +extern struct vfsmount *hugetlbfs_vfsmount;
51283 +#endif
51284 +
51285 +static struct acl_object_label *fakefs_obj_rw;
51286 +static struct acl_object_label *fakefs_obj_rwx;
51287 +
51288 +extern int gr_init_uidset(void);
51289 +extern void gr_free_uidset(void);
51290 +extern void gr_remove_uid(uid_t uid);
51291 +extern int gr_find_uid(uid_t uid);
51292 +
51293 +__inline__ int
51294 +gr_acl_is_enabled(void)
51295 +{
51296 + return (gr_status & GR_READY);
51297 +}
51298 +
51299 +#ifdef CONFIG_BTRFS_FS
51300 +extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
51301 +extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
51302 +#endif
51303 +
51304 +static inline dev_t __get_dev(const struct dentry *dentry)
51305 +{
51306 +#ifdef CONFIG_BTRFS_FS
51307 + if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
51308 + return get_btrfs_dev_from_inode(dentry->d_inode);
51309 + else
51310 +#endif
51311 + return dentry->d_inode->i_sb->s_dev;
51312 +}
51313 +
51314 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
51315 +{
51316 + return __get_dev(dentry);
51317 +}
51318 +
51319 +static char gr_task_roletype_to_char(struct task_struct *task)
51320 +{
51321 + switch (task->role->roletype &
51322 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
51323 + GR_ROLE_SPECIAL)) {
51324 + case GR_ROLE_DEFAULT:
51325 + return 'D';
51326 + case GR_ROLE_USER:
51327 + return 'U';
51328 + case GR_ROLE_GROUP:
51329 + return 'G';
51330 + case GR_ROLE_SPECIAL:
51331 + return 'S';
51332 + }
51333 +
51334 + return 'X';
51335 +}
51336 +
51337 +char gr_roletype_to_char(void)
51338 +{
51339 + return gr_task_roletype_to_char(current);
51340 +}
51341 +
51342 +__inline__ int
51343 +gr_acl_tpe_check(void)
51344 +{
51345 + if (unlikely(!(gr_status & GR_READY)))
51346 + return 0;
51347 + if (current->role->roletype & GR_ROLE_TPE)
51348 + return 1;
51349 + else
51350 + return 0;
51351 +}
51352 +
51353 +int
51354 +gr_handle_rawio(const struct inode *inode)
51355 +{
51356 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
51357 + if (inode && S_ISBLK(inode->i_mode) &&
51358 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
51359 + !capable(CAP_SYS_RAWIO))
51360 + return 1;
51361 +#endif
51362 + return 0;
51363 +}
51364 +
51365 +static int
51366 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
51367 +{
51368 + if (likely(lena != lenb))
51369 + return 0;
51370 +
51371 + return !memcmp(a, b, lena);
51372 +}
51373 +
51374 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
51375 +{
51376 + *buflen -= namelen;
51377 + if (*buflen < 0)
51378 + return -ENAMETOOLONG;
51379 + *buffer -= namelen;
51380 + memcpy(*buffer, str, namelen);
51381 + return 0;
51382 +}
51383 +
51384 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
51385 +{
51386 + return prepend(buffer, buflen, name->name, name->len);
51387 +}
51388 +
51389 +static int prepend_path(const struct path *path, struct path *root,
51390 + char **buffer, int *buflen)
51391 +{
51392 + struct dentry *dentry = path->dentry;
51393 + struct vfsmount *vfsmnt = path->mnt;
51394 + struct mount *mnt = real_mount(vfsmnt);
51395 + bool slash = false;
51396 + int error = 0;
51397 +
51398 + while (dentry != root->dentry || vfsmnt != root->mnt) {
51399 + struct dentry * parent;
51400 +
51401 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
51402 + /* Global root? */
51403 + if (!mnt_has_parent(mnt)) {
51404 + goto out;
51405 + }
51406 + dentry = mnt->mnt_mountpoint;
51407 + mnt = mnt->mnt_parent;
51408 + vfsmnt = &mnt->mnt;
51409 + continue;
51410 + }
51411 + parent = dentry->d_parent;
51412 + prefetch(parent);
51413 + spin_lock(&dentry->d_lock);
51414 + error = prepend_name(buffer, buflen, &dentry->d_name);
51415 + spin_unlock(&dentry->d_lock);
51416 + if (!error)
51417 + error = prepend(buffer, buflen, "/", 1);
51418 + if (error)
51419 + break;
51420 +
51421 + slash = true;
51422 + dentry = parent;
51423 + }
51424 +
51425 +out:
51426 + if (!error && !slash)
51427 + error = prepend(buffer, buflen, "/", 1);
51428 +
51429 + return error;
51430 +}
51431 +
51432 +/* this must be called with vfsmount_lock and rename_lock held */
51433 +
51434 +static char *__our_d_path(const struct path *path, struct path *root,
51435 + char *buf, int buflen)
51436 +{
51437 + char *res = buf + buflen;
51438 + int error;
51439 +
51440 + prepend(&res, &buflen, "\0", 1);
51441 + error = prepend_path(path, root, &res, &buflen);
51442 + if (error)
51443 + return ERR_PTR(error);
51444 +
51445 + return res;
51446 +}
51447 +
51448 +static char *
51449 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
51450 +{
51451 + char *retval;
51452 +
51453 + retval = __our_d_path(path, root, buf, buflen);
51454 + if (unlikely(IS_ERR(retval)))
51455 + retval = strcpy(buf, "<path too long>");
51456 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
51457 + retval[1] = '\0';
51458 +
51459 + return retval;
51460 +}
51461 +
51462 +static char *
51463 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51464 + char *buf, int buflen)
51465 +{
51466 + struct path path;
51467 + char *res;
51468 +
51469 + path.dentry = (struct dentry *)dentry;
51470 + path.mnt = (struct vfsmount *)vfsmnt;
51471 +
51472 + /* we can use real_root.dentry, real_root.mnt, because this is only called
51473 + by the RBAC system */
51474 + res = gen_full_path(&path, &real_root, buf, buflen);
51475 +
51476 + return res;
51477 +}
51478 +
51479 +static char *
51480 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51481 + char *buf, int buflen)
51482 +{
51483 + char *res;
51484 + struct path path;
51485 + struct path root;
51486 + struct task_struct *reaper = init_pid_ns.child_reaper;
51487 +
51488 + path.dentry = (struct dentry *)dentry;
51489 + path.mnt = (struct vfsmount *)vfsmnt;
51490 +
51491 + /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
51492 + get_fs_root(reaper->fs, &root);
51493 +
51494 + write_seqlock(&rename_lock);
51495 + br_read_lock(&vfsmount_lock);
51496 + res = gen_full_path(&path, &root, buf, buflen);
51497 + br_read_unlock(&vfsmount_lock);
51498 + write_sequnlock(&rename_lock);
51499 +
51500 + path_put(&root);
51501 + return res;
51502 +}
51503 +
51504 +static char *
51505 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51506 +{
51507 + char *ret;
51508 + write_seqlock(&rename_lock);
51509 + br_read_lock(&vfsmount_lock);
51510 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51511 + PAGE_SIZE);
51512 + br_read_unlock(&vfsmount_lock);
51513 + write_sequnlock(&rename_lock);
51514 + return ret;
51515 +}
51516 +
51517 +static char *
51518 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51519 +{
51520 + char *ret;
51521 + char *buf;
51522 + int buflen;
51523 +
51524 + write_seqlock(&rename_lock);
51525 + br_read_lock(&vfsmount_lock);
51526 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51527 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
51528 + buflen = (int)(ret - buf);
51529 + if (buflen >= 5)
51530 + prepend(&ret, &buflen, "/proc", 5);
51531 + else
51532 + ret = strcpy(buf, "<path too long>");
51533 + br_read_unlock(&vfsmount_lock);
51534 + write_sequnlock(&rename_lock);
51535 + return ret;
51536 +}
51537 +
51538 +char *
51539 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
51540 +{
51541 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51542 + PAGE_SIZE);
51543 +}
51544 +
51545 +char *
51546 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
51547 +{
51548 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
51549 + PAGE_SIZE);
51550 +}
51551 +
51552 +char *
51553 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
51554 +{
51555 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
51556 + PAGE_SIZE);
51557 +}
51558 +
51559 +char *
51560 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
51561 +{
51562 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
51563 + PAGE_SIZE);
51564 +}
51565 +
51566 +char *
51567 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
51568 +{
51569 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
51570 + PAGE_SIZE);
51571 +}
51572 +
51573 +__inline__ __u32
51574 +to_gr_audit(const __u32 reqmode)
51575 +{
51576 + /* masks off auditable permission flags, then shifts them to create
51577 + auditing flags, and adds the special case of append auditing if
51578 + we're requesting write */
51579 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
51580 +}
51581 +
51582 +struct acl_subject_label *
51583 +lookup_subject_map(const struct acl_subject_label *userp)
51584 +{
51585 + unsigned int index = shash(userp, subj_map_set.s_size);
51586 + struct subject_map *match;
51587 +
51588 + match = subj_map_set.s_hash[index];
51589 +
51590 + while (match && match->user != userp)
51591 + match = match->next;
51592 +
51593 + if (match != NULL)
51594 + return match->kernel;
51595 + else
51596 + return NULL;
51597 +}
51598 +
51599 +static void
51600 +insert_subj_map_entry(struct subject_map *subjmap)
51601 +{
51602 + unsigned int index = shash(subjmap->user, subj_map_set.s_size);
51603 + struct subject_map **curr;
51604 +
51605 + subjmap->prev = NULL;
51606 +
51607 + curr = &subj_map_set.s_hash[index];
51608 + if (*curr != NULL)
51609 + (*curr)->prev = subjmap;
51610 +
51611 + subjmap->next = *curr;
51612 + *curr = subjmap;
51613 +
51614 + return;
51615 +}
51616 +
51617 +static struct acl_role_label *
51618 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
51619 + const gid_t gid)
51620 +{
51621 + unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
51622 + struct acl_role_label *match;
51623 + struct role_allowed_ip *ipp;
51624 + unsigned int x;
51625 + u32 curr_ip = task->signal->curr_ip;
51626 +
51627 + task->signal->saved_ip = curr_ip;
51628 +
51629 + match = acl_role_set.r_hash[index];
51630 +
51631 + while (match) {
51632 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
51633 + for (x = 0; x < match->domain_child_num; x++) {
51634 + if (match->domain_children[x] == uid)
51635 + goto found;
51636 + }
51637 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
51638 + break;
51639 + match = match->next;
51640 + }
51641 +found:
51642 + if (match == NULL) {
51643 + try_group:
51644 + index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
51645 + match = acl_role_set.r_hash[index];
51646 +
51647 + while (match) {
51648 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
51649 + for (x = 0; x < match->domain_child_num; x++) {
51650 + if (match->domain_children[x] == gid)
51651 + goto found2;
51652 + }
51653 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
51654 + break;
51655 + match = match->next;
51656 + }
51657 +found2:
51658 + if (match == NULL)
51659 + match = default_role;
51660 + if (match->allowed_ips == NULL)
51661 + return match;
51662 + else {
51663 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51664 + if (likely
51665 + ((ntohl(curr_ip) & ipp->netmask) ==
51666 + (ntohl(ipp->addr) & ipp->netmask)))
51667 + return match;
51668 + }
51669 + match = default_role;
51670 + }
51671 + } else if (match->allowed_ips == NULL) {
51672 + return match;
51673 + } else {
51674 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51675 + if (likely
51676 + ((ntohl(curr_ip) & ipp->netmask) ==
51677 + (ntohl(ipp->addr) & ipp->netmask)))
51678 + return match;
51679 + }
51680 + goto try_group;
51681 + }
51682 +
51683 + return match;
51684 +}
51685 +
51686 +struct acl_subject_label *
51687 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
51688 + const struct acl_role_label *role)
51689 +{
51690 + unsigned int index = fhash(ino, dev, role->subj_hash_size);
51691 + struct acl_subject_label *match;
51692 +
51693 + match = role->subj_hash[index];
51694 +
51695 + while (match && (match->inode != ino || match->device != dev ||
51696 + (match->mode & GR_DELETED))) {
51697 + match = match->next;
51698 + }
51699 +
51700 + if (match && !(match->mode & GR_DELETED))
51701 + return match;
51702 + else
51703 + return NULL;
51704 +}
51705 +
51706 +struct acl_subject_label *
51707 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
51708 + const struct acl_role_label *role)
51709 +{
51710 + unsigned int index = fhash(ino, dev, role->subj_hash_size);
51711 + struct acl_subject_label *match;
51712 +
51713 + match = role->subj_hash[index];
51714 +
51715 + while (match && (match->inode != ino || match->device != dev ||
51716 + !(match->mode & GR_DELETED))) {
51717 + match = match->next;
51718 + }
51719 +
51720 + if (match && (match->mode & GR_DELETED))
51721 + return match;
51722 + else
51723 + return NULL;
51724 +}
51725 +
51726 +static struct acl_object_label *
51727 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51728 + const struct acl_subject_label *subj)
51729 +{
51730 + unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51731 + struct acl_object_label *match;
51732 +
51733 + match = subj->obj_hash[index];
51734 +
51735 + while (match && (match->inode != ino || match->device != dev ||
51736 + (match->mode & GR_DELETED))) {
51737 + match = match->next;
51738 + }
51739 +
51740 + if (match && !(match->mode & GR_DELETED))
51741 + return match;
51742 + else
51743 + return NULL;
51744 +}
51745 +
51746 +static struct acl_object_label *
51747 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51748 + const struct acl_subject_label *subj)
51749 +{
51750 + unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51751 + struct acl_object_label *match;
51752 +
51753 + match = subj->obj_hash[index];
51754 +
51755 + while (match && (match->inode != ino || match->device != dev ||
51756 + !(match->mode & GR_DELETED))) {
51757 + match = match->next;
51758 + }
51759 +
51760 + if (match && (match->mode & GR_DELETED))
51761 + return match;
51762 +
51763 + match = subj->obj_hash[index];
51764 +
51765 + while (match && (match->inode != ino || match->device != dev ||
51766 + (match->mode & GR_DELETED))) {
51767 + match = match->next;
51768 + }
51769 +
51770 + if (match && !(match->mode & GR_DELETED))
51771 + return match;
51772 + else
51773 + return NULL;
51774 +}
51775 +
51776 +static struct name_entry *
51777 +lookup_name_entry(const char *name)
51778 +{
51779 + unsigned int len = strlen(name);
51780 + unsigned int key = full_name_hash(name, len);
51781 + unsigned int index = key % name_set.n_size;
51782 + struct name_entry *match;
51783 +
51784 + match = name_set.n_hash[index];
51785 +
51786 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51787 + match = match->next;
51788 +
51789 + return match;
51790 +}
51791 +
51792 +static struct name_entry *
51793 +lookup_name_entry_create(const char *name)
51794 +{
51795 + unsigned int len = strlen(name);
51796 + unsigned int key = full_name_hash(name, len);
51797 + unsigned int index = key % name_set.n_size;
51798 + struct name_entry *match;
51799 +
51800 + match = name_set.n_hash[index];
51801 +
51802 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51803 + !match->deleted))
51804 + match = match->next;
51805 +
51806 + if (match && match->deleted)
51807 + return match;
51808 +
51809 + match = name_set.n_hash[index];
51810 +
51811 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51812 + match->deleted))
51813 + match = match->next;
51814 +
51815 + if (match && !match->deleted)
51816 + return match;
51817 + else
51818 + return NULL;
51819 +}
51820 +
51821 +static struct inodev_entry *
51822 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
51823 +{
51824 + unsigned int index = fhash(ino, dev, inodev_set.i_size);
51825 + struct inodev_entry *match;
51826 +
51827 + match = inodev_set.i_hash[index];
51828 +
51829 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51830 + match = match->next;
51831 +
51832 + return match;
51833 +}
51834 +
51835 +static void
51836 +insert_inodev_entry(struct inodev_entry *entry)
51837 +{
51838 + unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51839 + inodev_set.i_size);
51840 + struct inodev_entry **curr;
51841 +
51842 + entry->prev = NULL;
51843 +
51844 + curr = &inodev_set.i_hash[index];
51845 + if (*curr != NULL)
51846 + (*curr)->prev = entry;
51847 +
51848 + entry->next = *curr;
51849 + *curr = entry;
51850 +
51851 + return;
51852 +}
51853 +
51854 +static void
51855 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51856 +{
51857 + unsigned int index =
51858 + rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51859 + struct acl_role_label **curr;
51860 + struct acl_role_label *tmp, *tmp2;
51861 +
51862 + curr = &acl_role_set.r_hash[index];
51863 +
51864 + /* simple case, slot is empty, just set it to our role */
51865 + if (*curr == NULL) {
51866 + *curr = role;
51867 + } else {
51868 + /* example:
51869 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
51870 + 2 -> 3
51871 + */
51872 + /* first check to see if we can already be reached via this slot */
51873 + tmp = *curr;
51874 + while (tmp && tmp != role)
51875 + tmp = tmp->next;
51876 + if (tmp == role) {
51877 + /* we don't need to add ourselves to this slot's chain */
51878 + return;
51879 + }
51880 + /* we need to add ourselves to this chain, two cases */
51881 + if (role->next == NULL) {
51882 + /* simple case, append the current chain to our role */
51883 + role->next = *curr;
51884 + *curr = role;
51885 + } else {
51886 + /* 1 -> 2 -> 3 -> 4
51887 + 2 -> 3 -> 4
51888 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
51889 + */
51890 + /* trickier case: walk our role's chain until we find
51891 + the role for the start of the current slot's chain */
51892 + tmp = role;
51893 + tmp2 = *curr;
51894 + while (tmp->next && tmp->next != tmp2)
51895 + tmp = tmp->next;
51896 + if (tmp->next == tmp2) {
51897 + /* from example above, we found 3, so just
51898 + replace this slot's chain with ours */
51899 + *curr = role;
51900 + } else {
51901 + /* we didn't find a subset of our role's chain
51902 + in the current slot's chain, so append their
51903 + chain to ours, and set us as the first role in
51904 + the slot's chain
51905 +
51906 + we could fold this case with the case above,
51907 + but making it explicit for clarity
51908 + */
51909 + tmp->next = tmp2;
51910 + *curr = role;
51911 + }
51912 + }
51913 + }
51914 +
51915 + return;
51916 +}
51917 +
51918 +static void
51919 +insert_acl_role_label(struct acl_role_label *role)
51920 +{
51921 + int i;
51922 +
51923 + if (role_list == NULL) {
51924 + role_list = role;
51925 + role->prev = NULL;
51926 + } else {
51927 + role->prev = role_list;
51928 + role_list = role;
51929 + }
51930 +
51931 + /* used for hash chains */
51932 + role->next = NULL;
51933 +
51934 + if (role->roletype & GR_ROLE_DOMAIN) {
51935 + for (i = 0; i < role->domain_child_num; i++)
51936 + __insert_acl_role_label(role, role->domain_children[i]);
51937 + } else
51938 + __insert_acl_role_label(role, role->uidgid);
51939 +}
51940 +
51941 +static int
51942 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51943 +{
51944 + struct name_entry **curr, *nentry;
51945 + struct inodev_entry *ientry;
51946 + unsigned int len = strlen(name);
51947 + unsigned int key = full_name_hash(name, len);
51948 + unsigned int index = key % name_set.n_size;
51949 +
51950 + curr = &name_set.n_hash[index];
51951 +
51952 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51953 + curr = &((*curr)->next);
51954 +
51955 + if (*curr != NULL)
51956 + return 1;
51957 +
51958 + nentry = acl_alloc(sizeof (struct name_entry));
51959 + if (nentry == NULL)
51960 + return 0;
51961 + ientry = acl_alloc(sizeof (struct inodev_entry));
51962 + if (ientry == NULL)
51963 + return 0;
51964 + ientry->nentry = nentry;
51965 +
51966 + nentry->key = key;
51967 + nentry->name = name;
51968 + nentry->inode = inode;
51969 + nentry->device = device;
51970 + nentry->len = len;
51971 + nentry->deleted = deleted;
51972 +
51973 + nentry->prev = NULL;
51974 + curr = &name_set.n_hash[index];
51975 + if (*curr != NULL)
51976 + (*curr)->prev = nentry;
51977 + nentry->next = *curr;
51978 + *curr = nentry;
51979 +
51980 + /* insert us into the table searchable by inode/dev */
51981 + insert_inodev_entry(ientry);
51982 +
51983 + return 1;
51984 +}
51985 +
51986 +static void
51987 +insert_acl_obj_label(struct acl_object_label *obj,
51988 + struct acl_subject_label *subj)
51989 +{
51990 + unsigned int index =
51991 + fhash(obj->inode, obj->device, subj->obj_hash_size);
51992 + struct acl_object_label **curr;
51993 +
51994 +
51995 + obj->prev = NULL;
51996 +
51997 + curr = &subj->obj_hash[index];
51998 + if (*curr != NULL)
51999 + (*curr)->prev = obj;
52000 +
52001 + obj->next = *curr;
52002 + *curr = obj;
52003 +
52004 + return;
52005 +}
52006 +
52007 +static void
52008 +insert_acl_subj_label(struct acl_subject_label *obj,
52009 + struct acl_role_label *role)
52010 +{
52011 + unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
52012 + struct acl_subject_label **curr;
52013 +
52014 + obj->prev = NULL;
52015 +
52016 + curr = &role->subj_hash[index];
52017 + if (*curr != NULL)
52018 + (*curr)->prev = obj;
52019 +
52020 + obj->next = *curr;
52021 + *curr = obj;
52022 +
52023 + return;
52024 +}
52025 +
52026 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
52027 +
52028 +static void *
52029 +create_table(__u32 * len, int elementsize)
52030 +{
52031 + unsigned int table_sizes[] = {
52032 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
52033 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
52034 + 4194301, 8388593, 16777213, 33554393, 67108859
52035 + };
52036 + void *newtable = NULL;
52037 + unsigned int pwr = 0;
52038 +
52039 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
52040 + table_sizes[pwr] <= *len)
52041 + pwr++;
52042 +
52043 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
52044 + return newtable;
52045 +
52046 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
52047 + newtable =
52048 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
52049 + else
52050 + newtable = vmalloc(table_sizes[pwr] * elementsize);
52051 +
52052 + *len = table_sizes[pwr];
52053 +
52054 + return newtable;
52055 +}
52056 +
52057 +static int
52058 +init_variables(const struct gr_arg *arg)
52059 +{
52060 + struct task_struct *reaper = init_pid_ns.child_reaper;
52061 + unsigned int stacksize;
52062 +
52063 + subj_map_set.s_size = arg->role_db.num_subjects;
52064 + acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
52065 + name_set.n_size = arg->role_db.num_objects;
52066 + inodev_set.i_size = arg->role_db.num_objects;
52067 +
52068 + if (!subj_map_set.s_size || !acl_role_set.r_size ||
52069 + !name_set.n_size || !inodev_set.i_size)
52070 + return 1;
52071 +
52072 + if (!gr_init_uidset())
52073 + return 1;
52074 +
52075 + /* set up the stack that holds allocation info */
52076 +
52077 + stacksize = arg->role_db.num_pointers + 5;
52078 +
52079 + if (!acl_alloc_stack_init(stacksize))
52080 + return 1;
52081 +
52082 + /* grab reference for the real root dentry and vfsmount */
52083 + get_fs_root(reaper->fs, &real_root);
52084 +
52085 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52086 + printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
52087 +#endif
52088 +
52089 + fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
52090 + if (fakefs_obj_rw == NULL)
52091 + return 1;
52092 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
52093 +
52094 + fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
52095 + if (fakefs_obj_rwx == NULL)
52096 + return 1;
52097 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
52098 +
52099 + subj_map_set.s_hash =
52100 + (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
52101 + acl_role_set.r_hash =
52102 + (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
52103 + name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
52104 + inodev_set.i_hash =
52105 + (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
52106 +
52107 + if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
52108 + !name_set.n_hash || !inodev_set.i_hash)
52109 + return 1;
52110 +
52111 + memset(subj_map_set.s_hash, 0,
52112 + sizeof(struct subject_map *) * subj_map_set.s_size);
52113 + memset(acl_role_set.r_hash, 0,
52114 + sizeof (struct acl_role_label *) * acl_role_set.r_size);
52115 + memset(name_set.n_hash, 0,
52116 + sizeof (struct name_entry *) * name_set.n_size);
52117 + memset(inodev_set.i_hash, 0,
52118 + sizeof (struct inodev_entry *) * inodev_set.i_size);
52119 +
52120 + return 0;
52121 +}
52122 +
52123 +/* free information not needed after startup
52124 + currently contains user->kernel pointer mappings for subjects
52125 +*/
52126 +
52127 +static void
52128 +free_init_variables(void)
52129 +{
52130 + __u32 i;
52131 +
52132 + if (subj_map_set.s_hash) {
52133 + for (i = 0; i < subj_map_set.s_size; i++) {
52134 + if (subj_map_set.s_hash[i]) {
52135 + kfree(subj_map_set.s_hash[i]);
52136 + subj_map_set.s_hash[i] = NULL;
52137 + }
52138 + }
52139 +
52140 + if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
52141 + PAGE_SIZE)
52142 + kfree(subj_map_set.s_hash);
52143 + else
52144 + vfree(subj_map_set.s_hash);
52145 + }
52146 +
52147 + return;
52148 +}
52149 +
52150 +static void
52151 +free_variables(void)
52152 +{
52153 + struct acl_subject_label *s;
52154 + struct acl_role_label *r;
52155 + struct task_struct *task, *task2;
52156 + unsigned int x;
52157 +
52158 + gr_clear_learn_entries();
52159 +
52160 + read_lock(&tasklist_lock);
52161 + do_each_thread(task2, task) {
52162 + task->acl_sp_role = 0;
52163 + task->acl_role_id = 0;
52164 + task->acl = NULL;
52165 + task->role = NULL;
52166 + } while_each_thread(task2, task);
52167 + read_unlock(&tasklist_lock);
52168 +
52169 + /* release the reference to the real root dentry and vfsmount */
52170 + path_put(&real_root);
52171 + memset(&real_root, 0, sizeof(real_root));
52172 +
52173 + /* free all object hash tables */
52174 +
52175 + FOR_EACH_ROLE_START(r)
52176 + if (r->subj_hash == NULL)
52177 + goto next_role;
52178 + FOR_EACH_SUBJECT_START(r, s, x)
52179 + if (s->obj_hash == NULL)
52180 + break;
52181 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
52182 + kfree(s->obj_hash);
52183 + else
52184 + vfree(s->obj_hash);
52185 + FOR_EACH_SUBJECT_END(s, x)
52186 + FOR_EACH_NESTED_SUBJECT_START(r, s)
52187 + if (s->obj_hash == NULL)
52188 + break;
52189 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
52190 + kfree(s->obj_hash);
52191 + else
52192 + vfree(s->obj_hash);
52193 + FOR_EACH_NESTED_SUBJECT_END(s)
52194 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
52195 + kfree(r->subj_hash);
52196 + else
52197 + vfree(r->subj_hash);
52198 + r->subj_hash = NULL;
52199 +next_role:
52200 + FOR_EACH_ROLE_END(r)
52201 +
52202 + acl_free_all();
52203 +
52204 + if (acl_role_set.r_hash) {
52205 + if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
52206 + PAGE_SIZE)
52207 + kfree(acl_role_set.r_hash);
52208 + else
52209 + vfree(acl_role_set.r_hash);
52210 + }
52211 + if (name_set.n_hash) {
52212 + if ((name_set.n_size * sizeof (struct name_entry *)) <=
52213 + PAGE_SIZE)
52214 + kfree(name_set.n_hash);
52215 + else
52216 + vfree(name_set.n_hash);
52217 + }
52218 +
52219 + if (inodev_set.i_hash) {
52220 + if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
52221 + PAGE_SIZE)
52222 + kfree(inodev_set.i_hash);
52223 + else
52224 + vfree(inodev_set.i_hash);
52225 + }
52226 +
52227 + gr_free_uidset();
52228 +
52229 + memset(&name_set, 0, sizeof (struct name_db));
52230 + memset(&inodev_set, 0, sizeof (struct inodev_db));
52231 + memset(&acl_role_set, 0, sizeof (struct acl_role_db));
52232 + memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
52233 +
52234 + default_role = NULL;
52235 + kernel_role = NULL;
52236 + role_list = NULL;
52237 +
52238 + return;
52239 +}
52240 +
52241 +static __u32
52242 +count_user_objs(struct acl_object_label *userp)
52243 +{
52244 + struct acl_object_label o_tmp;
52245 + __u32 num = 0;
52246 +
52247 + while (userp) {
52248 + if (copy_from_user(&o_tmp, userp,
52249 + sizeof (struct acl_object_label)))
52250 + break;
52251 +
52252 + userp = o_tmp.prev;
52253 + num++;
52254 + }
52255 +
52256 + return num;
52257 +}
52258 +
52259 +static struct acl_subject_label *
52260 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
52261 +
52262 +static int
52263 +copy_user_glob(struct acl_object_label *obj)
52264 +{
52265 + struct acl_object_label *g_tmp, **guser;
52266 + unsigned int len;
52267 + char *tmp;
52268 +
52269 + if (obj->globbed == NULL)
52270 + return 0;
52271 +
52272 + guser = &obj->globbed;
52273 + while (*guser) {
52274 + g_tmp = (struct acl_object_label *)
52275 + acl_alloc(sizeof (struct acl_object_label));
52276 + if (g_tmp == NULL)
52277 + return -ENOMEM;
52278 +
52279 + if (copy_from_user(g_tmp, *guser,
52280 + sizeof (struct acl_object_label)))
52281 + return -EFAULT;
52282 +
52283 + len = strnlen_user(g_tmp->filename, PATH_MAX);
52284 +
52285 + if (!len || len >= PATH_MAX)
52286 + return -EINVAL;
52287 +
52288 + if ((tmp = (char *) acl_alloc(len)) == NULL)
52289 + return -ENOMEM;
52290 +
52291 + if (copy_from_user(tmp, g_tmp->filename, len))
52292 + return -EFAULT;
52293 + tmp[len-1] = '\0';
52294 + g_tmp->filename = tmp;
52295 +
52296 + *guser = g_tmp;
52297 + guser = &(g_tmp->next);
52298 + }
52299 +
52300 + return 0;
52301 +}
52302 +
52303 +static int
52304 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
52305 + struct acl_role_label *role)
52306 +{
52307 + struct acl_object_label *o_tmp;
52308 + unsigned int len;
52309 + int ret;
52310 + char *tmp;
52311 +
52312 + while (userp) {
52313 + if ((o_tmp = (struct acl_object_label *)
52314 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
52315 + return -ENOMEM;
52316 +
52317 + if (copy_from_user(o_tmp, userp,
52318 + sizeof (struct acl_object_label)))
52319 + return -EFAULT;
52320 +
52321 + userp = o_tmp->prev;
52322 +
52323 + len = strnlen_user(o_tmp->filename, PATH_MAX);
52324 +
52325 + if (!len || len >= PATH_MAX)
52326 + return -EINVAL;
52327 +
52328 + if ((tmp = (char *) acl_alloc(len)) == NULL)
52329 + return -ENOMEM;
52330 +
52331 + if (copy_from_user(tmp, o_tmp->filename, len))
52332 + return -EFAULT;
52333 + tmp[len-1] = '\0';
52334 + o_tmp->filename = tmp;
52335 +
52336 + insert_acl_obj_label(o_tmp, subj);
52337 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
52338 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
52339 + return -ENOMEM;
52340 +
52341 + ret = copy_user_glob(o_tmp);
52342 + if (ret)
52343 + return ret;
52344 +
52345 + if (o_tmp->nested) {
52346 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
52347 + if (IS_ERR(o_tmp->nested))
52348 + return PTR_ERR(o_tmp->nested);
52349 +
52350 + /* insert into nested subject list */
52351 + o_tmp->nested->next = role->hash->first;
52352 + role->hash->first = o_tmp->nested;
52353 + }
52354 + }
52355 +
52356 + return 0;
52357 +}
52358 +
52359 +static __u32
52360 +count_user_subjs(struct acl_subject_label *userp)
52361 +{
52362 + struct acl_subject_label s_tmp;
52363 + __u32 num = 0;
52364 +
52365 + while (userp) {
52366 + if (copy_from_user(&s_tmp, userp,
52367 + sizeof (struct acl_subject_label)))
52368 + break;
52369 +
52370 + userp = s_tmp.prev;
52371 + /* do not count nested subjects against this count, since
52372 + they are not included in the hash table, but are
52373 + attached to objects. We have already counted
52374 + the subjects in userspace for the allocation
52375 + stack
52376 + */
52377 + if (!(s_tmp.mode & GR_NESTED))
52378 + num++;
52379 + }
52380 +
52381 + return num;
52382 +}
52383 +
52384 +static int
52385 +copy_user_allowedips(struct acl_role_label *rolep)
52386 +{
52387 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
52388 +
52389 + ruserip = rolep->allowed_ips;
52390 +
52391 + while (ruserip) {
52392 + rlast = rtmp;
52393 +
52394 + if ((rtmp = (struct role_allowed_ip *)
52395 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
52396 + return -ENOMEM;
52397 +
52398 + if (copy_from_user(rtmp, ruserip,
52399 + sizeof (struct role_allowed_ip)))
52400 + return -EFAULT;
52401 +
52402 + ruserip = rtmp->prev;
52403 +
52404 + if (!rlast) {
52405 + rtmp->prev = NULL;
52406 + rolep->allowed_ips = rtmp;
52407 + } else {
52408 + rlast->next = rtmp;
52409 + rtmp->prev = rlast;
52410 + }
52411 +
52412 + if (!ruserip)
52413 + rtmp->next = NULL;
52414 + }
52415 +
52416 + return 0;
52417 +}
52418 +
52419 +static int
52420 +copy_user_transitions(struct acl_role_label *rolep)
52421 +{
52422 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
52423 +
52424 + unsigned int len;
52425 + char *tmp;
52426 +
52427 + rusertp = rolep->transitions;
52428 +
52429 + while (rusertp) {
52430 + rlast = rtmp;
52431 +
52432 + if ((rtmp = (struct role_transition *)
52433 + acl_alloc(sizeof (struct role_transition))) == NULL)
52434 + return -ENOMEM;
52435 +
52436 + if (copy_from_user(rtmp, rusertp,
52437 + sizeof (struct role_transition)))
52438 + return -EFAULT;
52439 +
52440 + rusertp = rtmp->prev;
52441 +
52442 + len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
52443 +
52444 + if (!len || len >= GR_SPROLE_LEN)
52445 + return -EINVAL;
52446 +
52447 + if ((tmp = (char *) acl_alloc(len)) == NULL)
52448 + return -ENOMEM;
52449 +
52450 + if (copy_from_user(tmp, rtmp->rolename, len))
52451 + return -EFAULT;
52452 + tmp[len-1] = '\0';
52453 + rtmp->rolename = tmp;
52454 +
52455 + if (!rlast) {
52456 + rtmp->prev = NULL;
52457 + rolep->transitions = rtmp;
52458 + } else {
52459 + rlast->next = rtmp;
52460 + rtmp->prev = rlast;
52461 + }
52462 +
52463 + if (!rusertp)
52464 + rtmp->next = NULL;
52465 + }
52466 +
52467 + return 0;
52468 +}
52469 +
52470 +static struct acl_subject_label *
52471 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
52472 +{
52473 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
52474 + unsigned int len;
52475 + char *tmp;
52476 + __u32 num_objs;
52477 + struct acl_ip_label **i_tmp, *i_utmp2;
52478 + struct gr_hash_struct ghash;
52479 + struct subject_map *subjmap;
52480 + unsigned int i_num;
52481 + int err;
52482 +
52483 + s_tmp = lookup_subject_map(userp);
52484 +
52485 + /* we've already copied this subject into the kernel, just return
52486 + the reference to it, and don't copy it over again
52487 + */
52488 + if (s_tmp)
52489 + return(s_tmp);
52490 +
52491 + if ((s_tmp = (struct acl_subject_label *)
52492 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
52493 + return ERR_PTR(-ENOMEM);
52494 +
52495 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
52496 + if (subjmap == NULL)
52497 + return ERR_PTR(-ENOMEM);
52498 +
52499 + subjmap->user = userp;
52500 + subjmap->kernel = s_tmp;
52501 + insert_subj_map_entry(subjmap);
52502 +
52503 + if (copy_from_user(s_tmp, userp,
52504 + sizeof (struct acl_subject_label)))
52505 + return ERR_PTR(-EFAULT);
52506 +
52507 + len = strnlen_user(s_tmp->filename, PATH_MAX);
52508 +
52509 + if (!len || len >= PATH_MAX)
52510 + return ERR_PTR(-EINVAL);
52511 +
52512 + if ((tmp = (char *) acl_alloc(len)) == NULL)
52513 + return ERR_PTR(-ENOMEM);
52514 +
52515 + if (copy_from_user(tmp, s_tmp->filename, len))
52516 + return ERR_PTR(-EFAULT);
52517 + tmp[len-1] = '\0';
52518 + s_tmp->filename = tmp;
52519 +
52520 + if (!strcmp(s_tmp->filename, "/"))
52521 + role->root_label = s_tmp;
52522 +
52523 + if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
52524 + return ERR_PTR(-EFAULT);
52525 +
52526 + /* copy user and group transition tables */
52527 +
52528 + if (s_tmp->user_trans_num) {
52529 + uid_t *uidlist;
52530 +
52531 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
52532 + if (uidlist == NULL)
52533 + return ERR_PTR(-ENOMEM);
52534 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
52535 + return ERR_PTR(-EFAULT);
52536 +
52537 + s_tmp->user_transitions = uidlist;
52538 + }
52539 +
52540 + if (s_tmp->group_trans_num) {
52541 + gid_t *gidlist;
52542 +
52543 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
52544 + if (gidlist == NULL)
52545 + return ERR_PTR(-ENOMEM);
52546 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
52547 + return ERR_PTR(-EFAULT);
52548 +
52549 + s_tmp->group_transitions = gidlist;
52550 + }
52551 +
52552 + /* set up object hash table */
52553 + num_objs = count_user_objs(ghash.first);
52554 +
52555 + s_tmp->obj_hash_size = num_objs;
52556 + s_tmp->obj_hash =
52557 + (struct acl_object_label **)
52558 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
52559 +
52560 + if (!s_tmp->obj_hash)
52561 + return ERR_PTR(-ENOMEM);
52562 +
52563 + memset(s_tmp->obj_hash, 0,
52564 + s_tmp->obj_hash_size *
52565 + sizeof (struct acl_object_label *));
52566 +
52567 + /* add in objects */
52568 + err = copy_user_objs(ghash.first, s_tmp, role);
52569 +
52570 + if (err)
52571 + return ERR_PTR(err);
52572 +
52573 + /* set pointer for parent subject */
52574 + if (s_tmp->parent_subject) {
52575 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
52576 +
52577 + if (IS_ERR(s_tmp2))
52578 + return s_tmp2;
52579 +
52580 + s_tmp->parent_subject = s_tmp2;
52581 + }
52582 +
52583 + /* add in ip acls */
52584 +
52585 + if (!s_tmp->ip_num) {
52586 + s_tmp->ips = NULL;
52587 + goto insert;
52588 + }
52589 +
52590 + i_tmp =
52591 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
52592 + sizeof (struct acl_ip_label *));
52593 +
52594 + if (!i_tmp)
52595 + return ERR_PTR(-ENOMEM);
52596 +
52597 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
52598 + *(i_tmp + i_num) =
52599 + (struct acl_ip_label *)
52600 + acl_alloc(sizeof (struct acl_ip_label));
52601 + if (!*(i_tmp + i_num))
52602 + return ERR_PTR(-ENOMEM);
52603 +
52604 + if (copy_from_user
52605 + (&i_utmp2, s_tmp->ips + i_num,
52606 + sizeof (struct acl_ip_label *)))
52607 + return ERR_PTR(-EFAULT);
52608 +
52609 + if (copy_from_user
52610 + (*(i_tmp + i_num), i_utmp2,
52611 + sizeof (struct acl_ip_label)))
52612 + return ERR_PTR(-EFAULT);
52613 +
52614 + if ((*(i_tmp + i_num))->iface == NULL)
52615 + continue;
52616 +
52617 + len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
52618 + if (!len || len >= IFNAMSIZ)
52619 + return ERR_PTR(-EINVAL);
52620 + tmp = acl_alloc(len);
52621 + if (tmp == NULL)
52622 + return ERR_PTR(-ENOMEM);
52623 + if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
52624 + return ERR_PTR(-EFAULT);
52625 + (*(i_tmp + i_num))->iface = tmp;
52626 + }
52627 +
52628 + s_tmp->ips = i_tmp;
52629 +
52630 +insert:
52631 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
52632 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
52633 + return ERR_PTR(-ENOMEM);
52634 +
52635 + return s_tmp;
52636 +}
52637 +
52638 +static int
52639 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
52640 +{
52641 + struct acl_subject_label s_pre;
52642 + struct acl_subject_label * ret;
52643 + int err;
52644 +
52645 + while (userp) {
52646 + if (copy_from_user(&s_pre, userp,
52647 + sizeof (struct acl_subject_label)))
52648 + return -EFAULT;
52649 +
52650 + /* do not add nested subjects here, add
52651 + while parsing objects
52652 + */
52653 +
52654 + if (s_pre.mode & GR_NESTED) {
52655 + userp = s_pre.prev;
52656 + continue;
52657 + }
52658 +
52659 + ret = do_copy_user_subj(userp, role);
52660 +
52661 + err = PTR_ERR(ret);
52662 + if (IS_ERR(ret))
52663 + return err;
52664 +
52665 + insert_acl_subj_label(ret, role);
52666 +
52667 + userp = s_pre.prev;
52668 + }
52669 +
52670 + return 0;
52671 +}
52672 +
52673 +static int
52674 +copy_user_acl(struct gr_arg *arg)
52675 +{
52676 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
52677 + struct sprole_pw *sptmp;
52678 + struct gr_hash_struct *ghash;
52679 + uid_t *domainlist;
52680 + unsigned int r_num;
52681 + unsigned int len;
52682 + char *tmp;
52683 + int err = 0;
52684 + __u16 i;
52685 + __u32 num_subjs;
52686 +
52687 + /* we need a default and kernel role */
52688 + if (arg->role_db.num_roles < 2)
52689 + return -EINVAL;
52690 +
52691 + /* copy special role authentication info from userspace */
52692 +
52693 + num_sprole_pws = arg->num_sprole_pws;
52694 + acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
52695 +
52696 + if (!acl_special_roles && num_sprole_pws)
52697 + return -ENOMEM;
52698 +
52699 + for (i = 0; i < num_sprole_pws; i++) {
52700 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
52701 + if (!sptmp)
52702 + return -ENOMEM;
52703 + if (copy_from_user(sptmp, arg->sprole_pws + i,
52704 + sizeof (struct sprole_pw)))
52705 + return -EFAULT;
52706 +
52707 + len = strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
52708 +
52709 + if (!len || len >= GR_SPROLE_LEN)
52710 + return -EINVAL;
52711 +
52712 + if ((tmp = (char *) acl_alloc(len)) == NULL)
52713 + return -ENOMEM;
52714 +
52715 + if (copy_from_user(tmp, sptmp->rolename, len))
52716 + return -EFAULT;
52717 +
52718 + tmp[len-1] = '\0';
52719 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52720 + printk(KERN_ALERT "Copying special role %s\n", tmp);
52721 +#endif
52722 + sptmp->rolename = tmp;
52723 + acl_special_roles[i] = sptmp;
52724 + }
52725 +
52726 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
52727 +
52728 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52729 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
52730 +
52731 + if (!r_tmp)
52732 + return -ENOMEM;
52733 +
52734 + if (copy_from_user(&r_utmp2, r_utmp + r_num,
52735 + sizeof (struct acl_role_label *)))
52736 + return -EFAULT;
52737 +
52738 + if (copy_from_user(r_tmp, r_utmp2,
52739 + sizeof (struct acl_role_label)))
52740 + return -EFAULT;
52741 +
52742 + len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52743 +
52744 + if (!len || len >= PATH_MAX)
52745 + return -EINVAL;
52746 +
52747 + if ((tmp = (char *) acl_alloc(len)) == NULL)
52748 + return -ENOMEM;
52749 +
52750 + if (copy_from_user(tmp, r_tmp->rolename, len))
52751 + return -EFAULT;
52752 +
52753 + tmp[len-1] = '\0';
52754 + r_tmp->rolename = tmp;
52755 +
52756 + if (!strcmp(r_tmp->rolename, "default")
52757 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52758 + default_role = r_tmp;
52759 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52760 + kernel_role = r_tmp;
52761 + }
52762 +
52763 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
52764 + return -ENOMEM;
52765 +
52766 + if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct)))
52767 + return -EFAULT;
52768 +
52769 + r_tmp->hash = ghash;
52770 +
52771 + num_subjs = count_user_subjs(r_tmp->hash->first);
52772 +
52773 + r_tmp->subj_hash_size = num_subjs;
52774 + r_tmp->subj_hash =
52775 + (struct acl_subject_label **)
52776 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52777 +
52778 + if (!r_tmp->subj_hash)
52779 + return -ENOMEM;
52780 +
52781 + err = copy_user_allowedips(r_tmp);
52782 + if (err)
52783 + return err;
52784 +
52785 + /* copy domain info */
52786 + if (r_tmp->domain_children != NULL) {
52787 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52788 + if (domainlist == NULL)
52789 + return -ENOMEM;
52790 +
52791 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
52792 + return -EFAULT;
52793 +
52794 + r_tmp->domain_children = domainlist;
52795 + }
52796 +
52797 + err = copy_user_transitions(r_tmp);
52798 + if (err)
52799 + return err;
52800 +
52801 + memset(r_tmp->subj_hash, 0,
52802 + r_tmp->subj_hash_size *
52803 + sizeof (struct acl_subject_label *));
52804 +
52805 + err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52806 +
52807 + if (err)
52808 + return err;
52809 +
52810 + /* set nested subject list to null */
52811 + r_tmp->hash->first = NULL;
52812 +
52813 + insert_acl_role_label(r_tmp);
52814 + }
52815 +
52816 + if (default_role == NULL || kernel_role == NULL)
52817 + return -EINVAL;
52818 +
52819 + return err;
52820 +}
52821 +
52822 +static int
52823 +gracl_init(struct gr_arg *args)
52824 +{
52825 + int error = 0;
52826 +
52827 + memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52828 + memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52829 +
52830 + if (init_variables(args)) {
52831 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52832 + error = -ENOMEM;
52833 + free_variables();
52834 + goto out;
52835 + }
52836 +
52837 + error = copy_user_acl(args);
52838 + free_init_variables();
52839 + if (error) {
52840 + free_variables();
52841 + goto out;
52842 + }
52843 +
52844 + if ((error = gr_set_acls(0))) {
52845 + free_variables();
52846 + goto out;
52847 + }
52848 +
52849 + pax_open_kernel();
52850 + gr_status |= GR_READY;
52851 + pax_close_kernel();
52852 +
52853 + out:
52854 + return error;
52855 +}
52856 +
52857 +/* derived from glibc fnmatch() 0: match, 1: no match*/
52858 +
52859 +static int
52860 +glob_match(const char *p, const char *n)
52861 +{
52862 + char c;
52863 +
52864 + while ((c = *p++) != '\0') {
52865 + switch (c) {
52866 + case '?':
52867 + if (*n == '\0')
52868 + return 1;
52869 + else if (*n == '/')
52870 + return 1;
52871 + break;
52872 + case '\\':
52873 + if (*n != c)
52874 + return 1;
52875 + break;
52876 + case '*':
52877 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
52878 + if (*n == '/')
52879 + return 1;
52880 + else if (c == '?') {
52881 + if (*n == '\0')
52882 + return 1;
52883 + else
52884 + ++n;
52885 + }
52886 + }
52887 + if (c == '\0') {
52888 + return 0;
52889 + } else {
52890 + const char *endp;
52891 +
52892 + if ((endp = strchr(n, '/')) == NULL)
52893 + endp = n + strlen(n);
52894 +
52895 + if (c == '[') {
52896 + for (--p; n < endp; ++n)
52897 + if (!glob_match(p, n))
52898 + return 0;
52899 + } else if (c == '/') {
52900 + while (*n != '\0' && *n != '/')
52901 + ++n;
52902 + if (*n == '/' && !glob_match(p, n + 1))
52903 + return 0;
52904 + } else {
52905 + for (--p; n < endp; ++n)
52906 + if (*n == c && !glob_match(p, n))
52907 + return 0;
52908 + }
52909 +
52910 + return 1;
52911 + }
52912 + case '[':
52913 + {
52914 + int not;
52915 + char cold;
52916 +
52917 + if (*n == '\0' || *n == '/')
52918 + return 1;
52919 +
52920 + not = (*p == '!' || *p == '^');
52921 + if (not)
52922 + ++p;
52923 +
52924 + c = *p++;
52925 + for (;;) {
52926 + unsigned char fn = (unsigned char)*n;
52927 +
52928 + if (c == '\0')
52929 + return 1;
52930 + else {
52931 + if (c == fn)
52932 + goto matched;
52933 + cold = c;
52934 + c = *p++;
52935 +
52936 + if (c == '-' && *p != ']') {
52937 + unsigned char cend = *p++;
52938 +
52939 + if (cend == '\0')
52940 + return 1;
52941 +
52942 + if (cold <= fn && fn <= cend)
52943 + goto matched;
52944 +
52945 + c = *p++;
52946 + }
52947 + }
52948 +
52949 + if (c == ']')
52950 + break;
52951 + }
52952 + if (!not)
52953 + return 1;
52954 + break;
52955 + matched:
52956 + while (c != ']') {
52957 + if (c == '\0')
52958 + return 1;
52959 +
52960 + c = *p++;
52961 + }
52962 + if (not)
52963 + return 1;
52964 + }
52965 + break;
52966 + default:
52967 + if (c != *n)
52968 + return 1;
52969 + }
52970 +
52971 + ++n;
52972 + }
52973 +
52974 + if (*n == '\0')
52975 + return 0;
52976 +
52977 + if (*n == '/')
52978 + return 0;
52979 +
52980 + return 1;
52981 +}
52982 +
52983 +static struct acl_object_label *
52984 +chk_glob_label(struct acl_object_label *globbed,
52985 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
52986 +{
52987 + struct acl_object_label *tmp;
52988 +
52989 + if (*path == NULL)
52990 + *path = gr_to_filename_nolock(dentry, mnt);
52991 +
52992 + tmp = globbed;
52993 +
52994 + while (tmp) {
52995 + if (!glob_match(tmp->filename, *path))
52996 + return tmp;
52997 + tmp = tmp->next;
52998 + }
52999 +
53000 + return NULL;
53001 +}
53002 +
53003 +static struct acl_object_label *
53004 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
53005 + const ino_t curr_ino, const dev_t curr_dev,
53006 + const struct acl_subject_label *subj, char **path, const int checkglob)
53007 +{
53008 + struct acl_subject_label *tmpsubj;
53009 + struct acl_object_label *retval;
53010 + struct acl_object_label *retval2;
53011 +
53012 + tmpsubj = (struct acl_subject_label *) subj;
53013 + read_lock(&gr_inode_lock);
53014 + do {
53015 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
53016 + if (retval) {
53017 + if (checkglob && retval->globbed) {
53018 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
53019 + if (retval2)
53020 + retval = retval2;
53021 + }
53022 + break;
53023 + }
53024 + } while ((tmpsubj = tmpsubj->parent_subject));
53025 + read_unlock(&gr_inode_lock);
53026 +
53027 + return retval;
53028 +}
53029 +
53030 +static __inline__ struct acl_object_label *
53031 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
53032 + struct dentry *curr_dentry,
53033 + const struct acl_subject_label *subj, char **path, const int checkglob)
53034 +{
53035 + int newglob = checkglob;
53036 + ino_t inode;
53037 + dev_t device;
53038 +
53039 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
53040 + as we don't want a / * rule to match instead of the / object
53041 + don't do this for create lookups that call this function though, since they're looking up
53042 + on the parent and thus need globbing checks on all paths
53043 + */
53044 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
53045 + newglob = GR_NO_GLOB;
53046 +
53047 + spin_lock(&curr_dentry->d_lock);
53048 + inode = curr_dentry->d_inode->i_ino;
53049 + device = __get_dev(curr_dentry);
53050 + spin_unlock(&curr_dentry->d_lock);
53051 +
53052 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
53053 +}
53054 +
53055 +static struct acl_object_label *
53056 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
53057 + const struct acl_subject_label *subj, char *path, const int checkglob)
53058 +{
53059 + struct dentry *dentry = (struct dentry *) l_dentry;
53060 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
53061 + struct mount *real_mnt = real_mount(mnt);
53062 + struct acl_object_label *retval;
53063 + struct dentry *parent;
53064 +
53065 + write_seqlock(&rename_lock);
53066 + br_read_lock(&vfsmount_lock);
53067 +
53068 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
53069 +#ifdef CONFIG_NET
53070 + mnt == sock_mnt ||
53071 +#endif
53072 +#ifdef CONFIG_HUGETLBFS
53073 + (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
53074 +#endif
53075 + /* ignore Eric Biederman */
53076 + IS_PRIVATE(l_dentry->d_inode))) {
53077 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
53078 + goto out;
53079 + }
53080 +
53081 + for (;;) {
53082 + if (dentry == real_root.dentry && mnt == real_root.mnt)
53083 + break;
53084 +
53085 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
53086 + if (!mnt_has_parent(real_mnt))
53087 + break;
53088 +
53089 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
53090 + if (retval != NULL)
53091 + goto out;
53092 +
53093 + dentry = real_mnt->mnt_mountpoint;
53094 + real_mnt = real_mnt->mnt_parent;
53095 + mnt = &real_mnt->mnt;
53096 + continue;
53097 + }
53098 +
53099 + parent = dentry->d_parent;
53100 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
53101 + if (retval != NULL)
53102 + goto out;
53103 +
53104 + dentry = parent;
53105 + }
53106 +
53107 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
53108 +
53109 + /* real_root is pinned so we don't have to hold a reference */
53110 + if (retval == NULL)
53111 + retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
53112 +out:
53113 + br_read_unlock(&vfsmount_lock);
53114 + write_sequnlock(&rename_lock);
53115 +
53116 + BUG_ON(retval == NULL);
53117 +
53118 + return retval;
53119 +}
53120 +
53121 +static __inline__ struct acl_object_label *
53122 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
53123 + const struct acl_subject_label *subj)
53124 +{
53125 + char *path = NULL;
53126 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
53127 +}
53128 +
53129 +static __inline__ struct acl_object_label *
53130 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
53131 + const struct acl_subject_label *subj)
53132 +{
53133 + char *path = NULL;
53134 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
53135 +}
53136 +
53137 +static __inline__ struct acl_object_label *
53138 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
53139 + const struct acl_subject_label *subj, char *path)
53140 +{
53141 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
53142 +}
53143 +
53144 +static struct acl_subject_label *
53145 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
53146 + const struct acl_role_label *role)
53147 +{
53148 + struct dentry *dentry = (struct dentry *) l_dentry;
53149 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
53150 + struct mount *real_mnt = real_mount(mnt);
53151 + struct acl_subject_label *retval;
53152 + struct dentry *parent;
53153 +
53154 + write_seqlock(&rename_lock);
53155 + br_read_lock(&vfsmount_lock);
53156 +
53157 + for (;;) {
53158 + if (dentry == real_root.dentry && mnt == real_root.mnt)
53159 + break;
53160 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
53161 + if (!mnt_has_parent(real_mnt))
53162 + break;
53163 +
53164 + spin_lock(&dentry->d_lock);
53165 + read_lock(&gr_inode_lock);
53166 + retval =
53167 + lookup_acl_subj_label(dentry->d_inode->i_ino,
53168 + __get_dev(dentry), role);
53169 + read_unlock(&gr_inode_lock);
53170 + spin_unlock(&dentry->d_lock);
53171 + if (retval != NULL)
53172 + goto out;
53173 +
53174 + dentry = real_mnt->mnt_mountpoint;
53175 + real_mnt = real_mnt->mnt_parent;
53176 + mnt = &real_mnt->mnt;
53177 + continue;
53178 + }
53179 +
53180 + spin_lock(&dentry->d_lock);
53181 + read_lock(&gr_inode_lock);
53182 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
53183 + __get_dev(dentry), role);
53184 + read_unlock(&gr_inode_lock);
53185 + parent = dentry->d_parent;
53186 + spin_unlock(&dentry->d_lock);
53187 +
53188 + if (retval != NULL)
53189 + goto out;
53190 +
53191 + dentry = parent;
53192 + }
53193 +
53194 + spin_lock(&dentry->d_lock);
53195 + read_lock(&gr_inode_lock);
53196 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
53197 + __get_dev(dentry), role);
53198 + read_unlock(&gr_inode_lock);
53199 + spin_unlock(&dentry->d_lock);
53200 +
53201 + if (unlikely(retval == NULL)) {
53202 + /* real_root is pinned, we don't need to hold a reference */
53203 + read_lock(&gr_inode_lock);
53204 + retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
53205 + __get_dev(real_root.dentry), role);
53206 + read_unlock(&gr_inode_lock);
53207 + }
53208 +out:
53209 + br_read_unlock(&vfsmount_lock);
53210 + write_sequnlock(&rename_lock);
53211 +
53212 + BUG_ON(retval == NULL);
53213 +
53214 + return retval;
53215 +}
53216 +
53217 +static void
53218 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
53219 +{
53220 + struct task_struct *task = current;
53221 + const struct cred *cred = current_cred();
53222 +
53223 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
53224 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53225 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53226 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
53227 +
53228 + return;
53229 +}
53230 +
53231 +static void
53232 +gr_log_learn_id_change(const char type, const unsigned int real,
53233 + const unsigned int effective, const unsigned int fs)
53234 +{
53235 + struct task_struct *task = current;
53236 + const struct cred *cred = current_cred();
53237 +
53238 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
53239 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
53240 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
53241 + type, real, effective, fs, &task->signal->saved_ip);
53242 +
53243 + return;
53244 +}
53245 +
53246 +__u32
53247 +gr_search_file(const struct dentry * dentry, const __u32 mode,
53248 + const struct vfsmount * mnt)
53249 +{
53250 + __u32 retval = mode;
53251 + struct acl_subject_label *curracl;
53252 + struct acl_object_label *currobj;
53253 +
53254 + if (unlikely(!(gr_status & GR_READY)))
53255 + return (mode & ~GR_AUDITS);
53256 +
53257 + curracl = current->acl;
53258 +
53259 + currobj = chk_obj_label(dentry, mnt, curracl);
53260 + retval = currobj->mode & mode;
53261 +
53262 + /* if we're opening a specified transfer file for writing
53263 + (e.g. /dev/initctl), then transfer our role to init
53264 + */
53265 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
53266 + current->role->roletype & GR_ROLE_PERSIST)) {
53267 + struct task_struct *task = init_pid_ns.child_reaper;
53268 +
53269 + if (task->role != current->role) {
53270 + task->acl_sp_role = 0;
53271 + task->acl_role_id = current->acl_role_id;
53272 + task->role = current->role;
53273 + rcu_read_lock();
53274 + read_lock(&grsec_exec_file_lock);
53275 + gr_apply_subject_to_task(task);
53276 + read_unlock(&grsec_exec_file_lock);
53277 + rcu_read_unlock();
53278 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
53279 + }
53280 + }
53281 +
53282 + if (unlikely
53283 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
53284 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
53285 + __u32 new_mode = mode;
53286 +
53287 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53288 +
53289 + retval = new_mode;
53290 +
53291 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
53292 + new_mode |= GR_INHERIT;
53293 +
53294 + if (!(mode & GR_NOLEARN))
53295 + gr_log_learn(dentry, mnt, new_mode);
53296 + }
53297 +
53298 + return retval;
53299 +}
53300 +
53301 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
53302 + const struct dentry *parent,
53303 + const struct vfsmount *mnt)
53304 +{
53305 + struct name_entry *match;
53306 + struct acl_object_label *matchpo;
53307 + struct acl_subject_label *curracl;
53308 + char *path;
53309 +
53310 + if (unlikely(!(gr_status & GR_READY)))
53311 + return NULL;
53312 +
53313 + preempt_disable();
53314 + path = gr_to_filename_rbac(new_dentry, mnt);
53315 + match = lookup_name_entry_create(path);
53316 +
53317 + curracl = current->acl;
53318 +
53319 + if (match) {
53320 + read_lock(&gr_inode_lock);
53321 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
53322 + read_unlock(&gr_inode_lock);
53323 +
53324 + if (matchpo) {
53325 + preempt_enable();
53326 + return matchpo;
53327 + }
53328 + }
53329 +
53330 + // lookup parent
53331 +
53332 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
53333 +
53334 + preempt_enable();
53335 + return matchpo;
53336 +}
53337 +
53338 +__u32
53339 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
53340 + const struct vfsmount * mnt, const __u32 mode)
53341 +{
53342 + struct acl_object_label *matchpo;
53343 + __u32 retval;
53344 +
53345 + if (unlikely(!(gr_status & GR_READY)))
53346 + return (mode & ~GR_AUDITS);
53347 +
53348 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
53349 +
53350 + retval = matchpo->mode & mode;
53351 +
53352 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
53353 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53354 + __u32 new_mode = mode;
53355 +
53356 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53357 +
53358 + gr_log_learn(new_dentry, mnt, new_mode);
53359 + return new_mode;
53360 + }
53361 +
53362 + return retval;
53363 +}
53364 +
53365 +__u32
53366 +gr_check_link(const struct dentry * new_dentry,
53367 + const struct dentry * parent_dentry,
53368 + const struct vfsmount * parent_mnt,
53369 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
53370 +{
53371 + struct acl_object_label *obj;
53372 + __u32 oldmode, newmode;
53373 + __u32 needmode;
53374 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
53375 + GR_DELETE | GR_INHERIT;
53376 +
53377 + if (unlikely(!(gr_status & GR_READY)))
53378 + return (GR_CREATE | GR_LINK);
53379 +
53380 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
53381 + oldmode = obj->mode;
53382 +
53383 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
53384 + newmode = obj->mode;
53385 +
53386 + needmode = newmode & checkmodes;
53387 +
53388 + // old name for hardlink must have at least the permissions of the new name
53389 + if ((oldmode & needmode) != needmode)
53390 + goto bad;
53391 +
53392 + // if old name had restrictions/auditing, make sure the new name does as well
53393 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
53394 +
53395 + // don't allow hardlinking of suid/sgid/fcapped files without permission
53396 + if (is_privileged_binary(old_dentry))
53397 + needmode |= GR_SETID;
53398 +
53399 + if ((newmode & needmode) != needmode)
53400 + goto bad;
53401 +
53402 + // enforce minimum permissions
53403 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
53404 + return newmode;
53405 +bad:
53406 + needmode = oldmode;
53407 + if (is_privileged_binary(old_dentry))
53408 + needmode |= GR_SETID;
53409 +
53410 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
53411 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
53412 + return (GR_CREATE | GR_LINK);
53413 + } else if (newmode & GR_SUPPRESS)
53414 + return GR_SUPPRESS;
53415 + else
53416 + return 0;
53417 +}
53418 +
53419 +int
53420 +gr_check_hidden_task(const struct task_struct *task)
53421 +{
53422 + if (unlikely(!(gr_status & GR_READY)))
53423 + return 0;
53424 +
53425 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
53426 + return 1;
53427 +
53428 + return 0;
53429 +}
53430 +
53431 +int
53432 +gr_check_protected_task(const struct task_struct *task)
53433 +{
53434 + if (unlikely(!(gr_status & GR_READY) || !task))
53435 + return 0;
53436 +
53437 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53438 + task->acl != current->acl)
53439 + return 1;
53440 +
53441 + return 0;
53442 +}
53443 +
53444 +int
53445 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
53446 +{
53447 + struct task_struct *p;
53448 + int ret = 0;
53449 +
53450 + if (unlikely(!(gr_status & GR_READY) || !pid))
53451 + return ret;
53452 +
53453 + read_lock(&tasklist_lock);
53454 + do_each_pid_task(pid, type, p) {
53455 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53456 + p->acl != current->acl) {
53457 + ret = 1;
53458 + goto out;
53459 + }
53460 + } while_each_pid_task(pid, type, p);
53461 +out:
53462 + read_unlock(&tasklist_lock);
53463 +
53464 + return ret;
53465 +}
53466 +
53467 +void
53468 +gr_copy_label(struct task_struct *tsk)
53469 +{
53470 + tsk->signal->used_accept = 0;
53471 + tsk->acl_sp_role = 0;
53472 + tsk->acl_role_id = current->acl_role_id;
53473 + tsk->acl = current->acl;
53474 + tsk->role = current->role;
53475 + tsk->signal->curr_ip = current->signal->curr_ip;
53476 + tsk->signal->saved_ip = current->signal->saved_ip;
53477 + if (current->exec_file)
53478 + get_file(current->exec_file);
53479 + tsk->exec_file = current->exec_file;
53480 + tsk->is_writable = current->is_writable;
53481 + if (unlikely(current->signal->used_accept)) {
53482 + current->signal->curr_ip = 0;
53483 + current->signal->saved_ip = 0;
53484 + }
53485 +
53486 + return;
53487 +}
53488 +
53489 +static void
53490 +gr_set_proc_res(struct task_struct *task)
53491 +{
53492 + struct acl_subject_label *proc;
53493 + unsigned short i;
53494 +
53495 + proc = task->acl;
53496 +
53497 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
53498 + return;
53499 +
53500 + for (i = 0; i < RLIM_NLIMITS; i++) {
53501 + if (!(proc->resmask & (1 << i)))
53502 + continue;
53503 +
53504 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
53505 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
53506 + }
53507 +
53508 + return;
53509 +}
53510 +
53511 +extern int __gr_process_user_ban(struct user_struct *user);
53512 +
53513 +int
53514 +gr_check_user_change(int real, int effective, int fs)
53515 +{
53516 + unsigned int i;
53517 + __u16 num;
53518 + uid_t *uidlist;
53519 + int curuid;
53520 + int realok = 0;
53521 + int effectiveok = 0;
53522 + int fsok = 0;
53523 +
53524 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
53525 + struct user_struct *user;
53526 +
53527 + if (real == -1)
53528 + goto skipit;
53529 +
53530 + user = find_user(real);
53531 + if (user == NULL)
53532 + goto skipit;
53533 +
53534 + if (__gr_process_user_ban(user)) {
53535 + /* for find_user */
53536 + free_uid(user);
53537 + return 1;
53538 + }
53539 +
53540 + /* for find_user */
53541 + free_uid(user);
53542 +
53543 +skipit:
53544 +#endif
53545 +
53546 + if (unlikely(!(gr_status & GR_READY)))
53547 + return 0;
53548 +
53549 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53550 + gr_log_learn_id_change('u', real, effective, fs);
53551 +
53552 + num = current->acl->user_trans_num;
53553 + uidlist = current->acl->user_transitions;
53554 +
53555 + if (uidlist == NULL)
53556 + return 0;
53557 +
53558 + if (real == -1)
53559 + realok = 1;
53560 + if (effective == -1)
53561 + effectiveok = 1;
53562 + if (fs == -1)
53563 + fsok = 1;
53564 +
53565 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
53566 + for (i = 0; i < num; i++) {
53567 + curuid = (int)uidlist[i];
53568 + if (real == curuid)
53569 + realok = 1;
53570 + if (effective == curuid)
53571 + effectiveok = 1;
53572 + if (fs == curuid)
53573 + fsok = 1;
53574 + }
53575 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
53576 + for (i = 0; i < num; i++) {
53577 + curuid = (int)uidlist[i];
53578 + if (real == curuid)
53579 + break;
53580 + if (effective == curuid)
53581 + break;
53582 + if (fs == curuid)
53583 + break;
53584 + }
53585 + /* not in deny list */
53586 + if (i == num) {
53587 + realok = 1;
53588 + effectiveok = 1;
53589 + fsok = 1;
53590 + }
53591 + }
53592 +
53593 + if (realok && effectiveok && fsok)
53594 + return 0;
53595 + else {
53596 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53597 + return 1;
53598 + }
53599 +}
53600 +
53601 +int
53602 +gr_check_group_change(int real, int effective, int fs)
53603 +{
53604 + unsigned int i;
53605 + __u16 num;
53606 + gid_t *gidlist;
53607 + int curgid;
53608 + int realok = 0;
53609 + int effectiveok = 0;
53610 + int fsok = 0;
53611 +
53612 + if (unlikely(!(gr_status & GR_READY)))
53613 + return 0;
53614 +
53615 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53616 + gr_log_learn_id_change('g', real, effective, fs);
53617 +
53618 + num = current->acl->group_trans_num;
53619 + gidlist = current->acl->group_transitions;
53620 +
53621 + if (gidlist == NULL)
53622 + return 0;
53623 +
53624 + if (real == -1)
53625 + realok = 1;
53626 + if (effective == -1)
53627 + effectiveok = 1;
53628 + if (fs == -1)
53629 + fsok = 1;
53630 +
53631 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
53632 + for (i = 0; i < num; i++) {
53633 + curgid = (int)gidlist[i];
53634 + if (real == curgid)
53635 + realok = 1;
53636 + if (effective == curgid)
53637 + effectiveok = 1;
53638 + if (fs == curgid)
53639 + fsok = 1;
53640 + }
53641 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
53642 + for (i = 0; i < num; i++) {
53643 + curgid = (int)gidlist[i];
53644 + if (real == curgid)
53645 + break;
53646 + if (effective == curgid)
53647 + break;
53648 + if (fs == curgid)
53649 + break;
53650 + }
53651 + /* not in deny list */
53652 + if (i == num) {
53653 + realok = 1;
53654 + effectiveok = 1;
53655 + fsok = 1;
53656 + }
53657 + }
53658 +
53659 + if (realok && effectiveok && fsok)
53660 + return 0;
53661 + else {
53662 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53663 + return 1;
53664 + }
53665 +}
53666 +
53667 +extern int gr_acl_is_capable(const int cap);
53668 +
53669 +void
53670 +gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
53671 +{
53672 + struct acl_role_label *role = task->role;
53673 + struct acl_subject_label *subj = NULL;
53674 + struct acl_object_label *obj;
53675 + struct file *filp;
53676 +
53677 + if (unlikely(!(gr_status & GR_READY)))
53678 + return;
53679 +
53680 + filp = task->exec_file;
53681 +
53682 + /* kernel process, we'll give them the kernel role */
53683 + if (unlikely(!filp)) {
53684 + task->role = kernel_role;
53685 + task->acl = kernel_role->root_label;
53686 + return;
53687 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
53688 + role = lookup_acl_role_label(task, uid, gid);
53689 +
53690 + /* don't change the role if we're not a privileged process */
53691 + if (role && task->role != role &&
53692 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
53693 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
53694 + return;
53695 +
53696 + /* perform subject lookup in possibly new role
53697 + we can use this result below in the case where role == task->role
53698 + */
53699 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
53700 +
53701 + /* if we changed uid/gid, but result in the same role
53702 + and are using inheritance, don't lose the inherited subject
53703 + if current subject is other than what normal lookup
53704 + would result in, we arrived via inheritance, don't
53705 + lose subject
53706 + */
53707 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
53708 + (subj == task->acl)))
53709 + task->acl = subj;
53710 +
53711 + task->role = role;
53712 +
53713 + task->is_writable = 0;
53714 +
53715 + /* ignore additional mmap checks for processes that are writable
53716 + by the default ACL */
53717 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53718 + if (unlikely(obj->mode & GR_WRITE))
53719 + task->is_writable = 1;
53720 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53721 + if (unlikely(obj->mode & GR_WRITE))
53722 + task->is_writable = 1;
53723 +
53724 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53725 + printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53726 +#endif
53727 +
53728 + gr_set_proc_res(task);
53729 +
53730 + return;
53731 +}
53732 +
53733 +int
53734 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53735 + const int unsafe_flags)
53736 +{
53737 + struct task_struct *task = current;
53738 + struct acl_subject_label *newacl;
53739 + struct acl_object_label *obj;
53740 + __u32 retmode;
53741 +
53742 + if (unlikely(!(gr_status & GR_READY)))
53743 + return 0;
53744 +
53745 + newacl = chk_subj_label(dentry, mnt, task->role);
53746 +
53747 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
53748 + did an exec
53749 + */
53750 + rcu_read_lock();
53751 + read_lock(&tasklist_lock);
53752 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
53753 + (task->parent->acl->mode & GR_POVERRIDE))) {
53754 + read_unlock(&tasklist_lock);
53755 + rcu_read_unlock();
53756 + goto skip_check;
53757 + }
53758 + read_unlock(&tasklist_lock);
53759 + rcu_read_unlock();
53760 +
53761 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53762 + !(task->role->roletype & GR_ROLE_GOD) &&
53763 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53764 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53765 + if (unsafe_flags & LSM_UNSAFE_SHARE)
53766 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53767 + else
53768 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53769 + return -EACCES;
53770 + }
53771 +
53772 +skip_check:
53773 +
53774 + obj = chk_obj_label(dentry, mnt, task->acl);
53775 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53776 +
53777 + if (!(task->acl->mode & GR_INHERITLEARN) &&
53778 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53779 + if (obj->nested)
53780 + task->acl = obj->nested;
53781 + else
53782 + task->acl = newacl;
53783 + } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53784 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53785 +
53786 + task->is_writable = 0;
53787 +
53788 + /* ignore additional mmap checks for processes that are writable
53789 + by the default ACL */
53790 + obj = chk_obj_label(dentry, mnt, default_role->root_label);
53791 + if (unlikely(obj->mode & GR_WRITE))
53792 + task->is_writable = 1;
53793 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
53794 + if (unlikely(obj->mode & GR_WRITE))
53795 + task->is_writable = 1;
53796 +
53797 + gr_set_proc_res(task);
53798 +
53799 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53800 + printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53801 +#endif
53802 + return 0;
53803 +}
53804 +
53805 +/* always called with valid inodev ptr */
53806 +static void
53807 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53808 +{
53809 + struct acl_object_label *matchpo;
53810 + struct acl_subject_label *matchps;
53811 + struct acl_subject_label *subj;
53812 + struct acl_role_label *role;
53813 + unsigned int x;
53814 +
53815 + FOR_EACH_ROLE_START(role)
53816 + FOR_EACH_SUBJECT_START(role, subj, x)
53817 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53818 + matchpo->mode |= GR_DELETED;
53819 + FOR_EACH_SUBJECT_END(subj,x)
53820 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
53821 + if (subj->inode == ino && subj->device == dev)
53822 + subj->mode |= GR_DELETED;
53823 + FOR_EACH_NESTED_SUBJECT_END(subj)
53824 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53825 + matchps->mode |= GR_DELETED;
53826 + FOR_EACH_ROLE_END(role)
53827 +
53828 + inodev->nentry->deleted = 1;
53829 +
53830 + return;
53831 +}
53832 +
53833 +void
53834 +gr_handle_delete(const ino_t ino, const dev_t dev)
53835 +{
53836 + struct inodev_entry *inodev;
53837 +
53838 + if (unlikely(!(gr_status & GR_READY)))
53839 + return;
53840 +
53841 + write_lock(&gr_inode_lock);
53842 + inodev = lookup_inodev_entry(ino, dev);
53843 + if (inodev != NULL)
53844 + do_handle_delete(inodev, ino, dev);
53845 + write_unlock(&gr_inode_lock);
53846 +
53847 + return;
53848 +}
53849 +
53850 +static void
53851 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53852 + const ino_t newinode, const dev_t newdevice,
53853 + struct acl_subject_label *subj)
53854 +{
53855 + unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53856 + struct acl_object_label *match;
53857 +
53858 + match = subj->obj_hash[index];
53859 +
53860 + while (match && (match->inode != oldinode ||
53861 + match->device != olddevice ||
53862 + !(match->mode & GR_DELETED)))
53863 + match = match->next;
53864 +
53865 + if (match && (match->inode == oldinode)
53866 + && (match->device == olddevice)
53867 + && (match->mode & GR_DELETED)) {
53868 + if (match->prev == NULL) {
53869 + subj->obj_hash[index] = match->next;
53870 + if (match->next != NULL)
53871 + match->next->prev = NULL;
53872 + } else {
53873 + match->prev->next = match->next;
53874 + if (match->next != NULL)
53875 + match->next->prev = match->prev;
53876 + }
53877 + match->prev = NULL;
53878 + match->next = NULL;
53879 + match->inode = newinode;
53880 + match->device = newdevice;
53881 + match->mode &= ~GR_DELETED;
53882 +
53883 + insert_acl_obj_label(match, subj);
53884 + }
53885 +
53886 + return;
53887 +}
53888 +
53889 +static void
53890 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53891 + const ino_t newinode, const dev_t newdevice,
53892 + struct acl_role_label *role)
53893 +{
53894 + unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53895 + struct acl_subject_label *match;
53896 +
53897 + match = role->subj_hash[index];
53898 +
53899 + while (match && (match->inode != oldinode ||
53900 + match->device != olddevice ||
53901 + !(match->mode & GR_DELETED)))
53902 + match = match->next;
53903 +
53904 + if (match && (match->inode == oldinode)
53905 + && (match->device == olddevice)
53906 + && (match->mode & GR_DELETED)) {
53907 + if (match->prev == NULL) {
53908 + role->subj_hash[index] = match->next;
53909 + if (match->next != NULL)
53910 + match->next->prev = NULL;
53911 + } else {
53912 + match->prev->next = match->next;
53913 + if (match->next != NULL)
53914 + match->next->prev = match->prev;
53915 + }
53916 + match->prev = NULL;
53917 + match->next = NULL;
53918 + match->inode = newinode;
53919 + match->device = newdevice;
53920 + match->mode &= ~GR_DELETED;
53921 +
53922 + insert_acl_subj_label(match, role);
53923 + }
53924 +
53925 + return;
53926 +}
53927 +
53928 +static void
53929 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53930 + const ino_t newinode, const dev_t newdevice)
53931 +{
53932 + unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53933 + struct inodev_entry *match;
53934 +
53935 + match = inodev_set.i_hash[index];
53936 +
53937 + while (match && (match->nentry->inode != oldinode ||
53938 + match->nentry->device != olddevice || !match->nentry->deleted))
53939 + match = match->next;
53940 +
53941 + if (match && (match->nentry->inode == oldinode)
53942 + && (match->nentry->device == olddevice) &&
53943 + match->nentry->deleted) {
53944 + if (match->prev == NULL) {
53945 + inodev_set.i_hash[index] = match->next;
53946 + if (match->next != NULL)
53947 + match->next->prev = NULL;
53948 + } else {
53949 + match->prev->next = match->next;
53950 + if (match->next != NULL)
53951 + match->next->prev = match->prev;
53952 + }
53953 + match->prev = NULL;
53954 + match->next = NULL;
53955 + match->nentry->inode = newinode;
53956 + match->nentry->device = newdevice;
53957 + match->nentry->deleted = 0;
53958 +
53959 + insert_inodev_entry(match);
53960 + }
53961 +
53962 + return;
53963 +}
53964 +
53965 +static void
53966 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
53967 +{
53968 + struct acl_subject_label *subj;
53969 + struct acl_role_label *role;
53970 + unsigned int x;
53971 +
53972 + FOR_EACH_ROLE_START(role)
53973 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
53974 +
53975 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
53976 + if ((subj->inode == ino) && (subj->device == dev)) {
53977 + subj->inode = ino;
53978 + subj->device = dev;
53979 + }
53980 + FOR_EACH_NESTED_SUBJECT_END(subj)
53981 + FOR_EACH_SUBJECT_START(role, subj, x)
53982 + update_acl_obj_label(matchn->inode, matchn->device,
53983 + ino, dev, subj);
53984 + FOR_EACH_SUBJECT_END(subj,x)
53985 + FOR_EACH_ROLE_END(role)
53986 +
53987 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
53988 +
53989 + return;
53990 +}
53991 +
53992 +static void
53993 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53994 + const struct vfsmount *mnt)
53995 +{
53996 + ino_t ino = dentry->d_inode->i_ino;
53997 + dev_t dev = __get_dev(dentry);
53998 +
53999 + __do_handle_create(matchn, ino, dev);
54000 +
54001 + return;
54002 +}
54003 +
54004 +void
54005 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
54006 +{
54007 + struct name_entry *matchn;
54008 +
54009 + if (unlikely(!(gr_status & GR_READY)))
54010 + return;
54011 +
54012 + preempt_disable();
54013 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
54014 +
54015 + if (unlikely((unsigned long)matchn)) {
54016 + write_lock(&gr_inode_lock);
54017 + do_handle_create(matchn, dentry, mnt);
54018 + write_unlock(&gr_inode_lock);
54019 + }
54020 + preempt_enable();
54021 +
54022 + return;
54023 +}
54024 +
54025 +void
54026 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
54027 +{
54028 + struct name_entry *matchn;
54029 +
54030 + if (unlikely(!(gr_status & GR_READY)))
54031 + return;
54032 +
54033 + preempt_disable();
54034 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
54035 +
54036 + if (unlikely((unsigned long)matchn)) {
54037 + write_lock(&gr_inode_lock);
54038 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
54039 + write_unlock(&gr_inode_lock);
54040 + }
54041 + preempt_enable();
54042 +
54043 + return;
54044 +}
54045 +
54046 +void
54047 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
54048 + struct dentry *old_dentry,
54049 + struct dentry *new_dentry,
54050 + struct vfsmount *mnt, const __u8 replace)
54051 +{
54052 + struct name_entry *matchn;
54053 + struct inodev_entry *inodev;
54054 + struct inode *inode = new_dentry->d_inode;
54055 + ino_t old_ino = old_dentry->d_inode->i_ino;
54056 + dev_t old_dev = __get_dev(old_dentry);
54057 +
54058 + /* vfs_rename swaps the name and parent link for old_dentry and
54059 + new_dentry
54060 + at this point, old_dentry has the new name, parent link, and inode
54061 + for the renamed file
54062 + if a file is being replaced by a rename, new_dentry has the inode
54063 + and name for the replaced file
54064 + */
54065 +
54066 + if (unlikely(!(gr_status & GR_READY)))
54067 + return;
54068 +
54069 + preempt_disable();
54070 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
54071 +
54072 + /* we wouldn't have to check d_inode if it weren't for
54073 + NFS silly-renaming
54074 + */
54075 +
54076 + write_lock(&gr_inode_lock);
54077 + if (unlikely(replace && inode)) {
54078 + ino_t new_ino = inode->i_ino;
54079 + dev_t new_dev = __get_dev(new_dentry);
54080 +
54081 + inodev = lookup_inodev_entry(new_ino, new_dev);
54082 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
54083 + do_handle_delete(inodev, new_ino, new_dev);
54084 + }
54085 +
54086 + inodev = lookup_inodev_entry(old_ino, old_dev);
54087 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
54088 + do_handle_delete(inodev, old_ino, old_dev);
54089 +
54090 + if (unlikely((unsigned long)matchn))
54091 + do_handle_create(matchn, old_dentry, mnt);
54092 +
54093 + write_unlock(&gr_inode_lock);
54094 + preempt_enable();
54095 +
54096 + return;
54097 +}
54098 +
54099 +static int
54100 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
54101 + unsigned char **sum)
54102 +{
54103 + struct acl_role_label *r;
54104 + struct role_allowed_ip *ipp;
54105 + struct role_transition *trans;
54106 + unsigned int i;
54107 + int found = 0;
54108 + u32 curr_ip = current->signal->curr_ip;
54109 +
54110 + current->signal->saved_ip = curr_ip;
54111 +
54112 + /* check transition table */
54113 +
54114 + for (trans = current->role->transitions; trans; trans = trans->next) {
54115 + if (!strcmp(rolename, trans->rolename)) {
54116 + found = 1;
54117 + break;
54118 + }
54119 + }
54120 +
54121 + if (!found)
54122 + return 0;
54123 +
54124 + /* handle special roles that do not require authentication
54125 + and check ip */
54126 +
54127 + FOR_EACH_ROLE_START(r)
54128 + if (!strcmp(rolename, r->rolename) &&
54129 + (r->roletype & GR_ROLE_SPECIAL)) {
54130 + found = 0;
54131 + if (r->allowed_ips != NULL) {
54132 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
54133 + if ((ntohl(curr_ip) & ipp->netmask) ==
54134 + (ntohl(ipp->addr) & ipp->netmask))
54135 + found = 1;
54136 + }
54137 + } else
54138 + found = 2;
54139 + if (!found)
54140 + return 0;
54141 +
54142 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
54143 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
54144 + *salt = NULL;
54145 + *sum = NULL;
54146 + return 1;
54147 + }
54148 + }
54149 + FOR_EACH_ROLE_END(r)
54150 +
54151 + for (i = 0; i < num_sprole_pws; i++) {
54152 + if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
54153 + *salt = acl_special_roles[i]->salt;
54154 + *sum = acl_special_roles[i]->sum;
54155 + return 1;
54156 + }
54157 + }
54158 +
54159 + return 0;
54160 +}
54161 +
54162 +static void
54163 +assign_special_role(char *rolename)
54164 +{
54165 + struct acl_object_label *obj;
54166 + struct acl_role_label *r;
54167 + struct acl_role_label *assigned = NULL;
54168 + struct task_struct *tsk;
54169 + struct file *filp;
54170 +
54171 + FOR_EACH_ROLE_START(r)
54172 + if (!strcmp(rolename, r->rolename) &&
54173 + (r->roletype & GR_ROLE_SPECIAL)) {
54174 + assigned = r;
54175 + break;
54176 + }
54177 + FOR_EACH_ROLE_END(r)
54178 +
54179 + if (!assigned)
54180 + return;
54181 +
54182 + read_lock(&tasklist_lock);
54183 + read_lock(&grsec_exec_file_lock);
54184 +
54185 + tsk = current->real_parent;
54186 + if (tsk == NULL)
54187 + goto out_unlock;
54188 +
54189 + filp = tsk->exec_file;
54190 + if (filp == NULL)
54191 + goto out_unlock;
54192 +
54193 + tsk->is_writable = 0;
54194 +
54195 + tsk->acl_sp_role = 1;
54196 + tsk->acl_role_id = ++acl_sp_role_value;
54197 + tsk->role = assigned;
54198 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
54199 +
54200 + /* ignore additional mmap checks for processes that are writable
54201 + by the default ACL */
54202 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54203 + if (unlikely(obj->mode & GR_WRITE))
54204 + tsk->is_writable = 1;
54205 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
54206 + if (unlikely(obj->mode & GR_WRITE))
54207 + tsk->is_writable = 1;
54208 +
54209 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54210 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
54211 +#endif
54212 +
54213 +out_unlock:
54214 + read_unlock(&grsec_exec_file_lock);
54215 + read_unlock(&tasklist_lock);
54216 + return;
54217 +}
54218 +
54219 +int gr_check_secure_terminal(struct task_struct *task)
54220 +{
54221 + struct task_struct *p, *p2, *p3;
54222 + struct files_struct *files;
54223 + struct fdtable *fdt;
54224 + struct file *our_file = NULL, *file;
54225 + int i;
54226 +
54227 + if (task->signal->tty == NULL)
54228 + return 1;
54229 +
54230 + files = get_files_struct(task);
54231 + if (files != NULL) {
54232 + rcu_read_lock();
54233 + fdt = files_fdtable(files);
54234 + for (i=0; i < fdt->max_fds; i++) {
54235 + file = fcheck_files(files, i);
54236 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
54237 + get_file(file);
54238 + our_file = file;
54239 + }
54240 + }
54241 + rcu_read_unlock();
54242 + put_files_struct(files);
54243 + }
54244 +
54245 + if (our_file == NULL)
54246 + return 1;
54247 +
54248 + read_lock(&tasklist_lock);
54249 + do_each_thread(p2, p) {
54250 + files = get_files_struct(p);
54251 + if (files == NULL ||
54252 + (p->signal && p->signal->tty == task->signal->tty)) {
54253 + if (files != NULL)
54254 + put_files_struct(files);
54255 + continue;
54256 + }
54257 + rcu_read_lock();
54258 + fdt = files_fdtable(files);
54259 + for (i=0; i < fdt->max_fds; i++) {
54260 + file = fcheck_files(files, i);
54261 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
54262 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
54263 + p3 = task;
54264 + while (p3->pid > 0) {
54265 + if (p3 == p)
54266 + break;
54267 + p3 = p3->real_parent;
54268 + }
54269 + if (p3 == p)
54270 + break;
54271 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
54272 + gr_handle_alertkill(p);
54273 + rcu_read_unlock();
54274 + put_files_struct(files);
54275 + read_unlock(&tasklist_lock);
54276 + fput(our_file);
54277 + return 0;
54278 + }
54279 + }
54280 + rcu_read_unlock();
54281 + put_files_struct(files);
54282 + } while_each_thread(p2, p);
54283 + read_unlock(&tasklist_lock);
54284 +
54285 + fput(our_file);
54286 + return 1;
54287 +}
54288 +
54289 +static int gr_rbac_disable(void *unused)
54290 +{
54291 + pax_open_kernel();
54292 + gr_status &= ~GR_READY;
54293 + pax_close_kernel();
54294 +
54295 + return 0;
54296 +}
54297 +
54298 +ssize_t
54299 +write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
54300 +{
54301 + struct gr_arg_wrapper uwrap;
54302 + unsigned char *sprole_salt = NULL;
54303 + unsigned char *sprole_sum = NULL;
54304 + int error = sizeof (struct gr_arg_wrapper);
54305 + int error2 = 0;
54306 +
54307 + mutex_lock(&gr_dev_mutex);
54308 +
54309 + if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
54310 + error = -EPERM;
54311 + goto out;
54312 + }
54313 +
54314 + if (count != sizeof (struct gr_arg_wrapper)) {
54315 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
54316 + error = -EINVAL;
54317 + goto out;
54318 + }
54319 +
54320 +
54321 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
54322 + gr_auth_expires = 0;
54323 + gr_auth_attempts = 0;
54324 + }
54325 +
54326 + if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
54327 + error = -EFAULT;
54328 + goto out;
54329 + }
54330 +
54331 + if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
54332 + error = -EINVAL;
54333 + goto out;
54334 + }
54335 +
54336 + if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
54337 + error = -EFAULT;
54338 + goto out;
54339 + }
54340 +
54341 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54342 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54343 + time_after(gr_auth_expires, get_seconds())) {
54344 + error = -EBUSY;
54345 + goto out;
54346 + }
54347 +
54348 + /* if non-root trying to do anything other than use a special role,
54349 + do not attempt authentication, do not count towards authentication
54350 + locking
54351 + */
54352 +
54353 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
54354 + gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54355 + !uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
54356 + error = -EPERM;
54357 + goto out;
54358 + }
54359 +
54360 + /* ensure pw and special role name are null terminated */
54361 +
54362 + gr_usermode->pw[GR_PW_LEN - 1] = '\0';
54363 + gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
54364 +
54365 + /* Okay.
54366 + * We have our enough of the argument structure..(we have yet
54367 + * to copy_from_user the tables themselves) . Copy the tables
54368 + * only if we need them, i.e. for loading operations. */
54369 +
54370 + switch (gr_usermode->mode) {
54371 + case GR_STATUS:
54372 + if (gr_status & GR_READY) {
54373 + error = 1;
54374 + if (!gr_check_secure_terminal(current))
54375 + error = 3;
54376 + } else
54377 + error = 2;
54378 + goto out;
54379 + case GR_SHUTDOWN:
54380 + if ((gr_status & GR_READY)
54381 + && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54382 + stop_machine(gr_rbac_disable, NULL, NULL);
54383 + free_variables();
54384 + memset(gr_usermode, 0, sizeof (struct gr_arg));
54385 + memset(gr_system_salt, 0, GR_SALT_LEN);
54386 + memset(gr_system_sum, 0, GR_SHA_LEN);
54387 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
54388 + } else if (gr_status & GR_READY) {
54389 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
54390 + error = -EPERM;
54391 + } else {
54392 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
54393 + error = -EAGAIN;
54394 + }
54395 + break;
54396 + case GR_ENABLE:
54397 + if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
54398 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
54399 + else {
54400 + if (gr_status & GR_READY)
54401 + error = -EAGAIN;
54402 + else
54403 + error = error2;
54404 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
54405 + }
54406 + break;
54407 + case GR_RELOAD:
54408 + if (!(gr_status & GR_READY)) {
54409 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
54410 + error = -EAGAIN;
54411 + } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54412 + stop_machine(gr_rbac_disable, NULL, NULL);
54413 + free_variables();
54414 + error2 = gracl_init(gr_usermode);
54415 + if (!error2)
54416 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
54417 + else {
54418 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54419 + error = error2;
54420 + }
54421 + } else {
54422 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54423 + error = -EPERM;
54424 + }
54425 + break;
54426 + case GR_SEGVMOD:
54427 + if (unlikely(!(gr_status & GR_READY))) {
54428 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
54429 + error = -EAGAIN;
54430 + break;
54431 + }
54432 +
54433 + if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54434 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
54435 + if (gr_usermode->segv_device && gr_usermode->segv_inode) {
54436 + struct acl_subject_label *segvacl;
54437 + segvacl =
54438 + lookup_acl_subj_label(gr_usermode->segv_inode,
54439 + gr_usermode->segv_device,
54440 + current->role);
54441 + if (segvacl) {
54442 + segvacl->crashes = 0;
54443 + segvacl->expires = 0;
54444 + }
54445 + } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
54446 + gr_remove_uid(gr_usermode->segv_uid);
54447 + }
54448 + } else {
54449 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
54450 + error = -EPERM;
54451 + }
54452 + break;
54453 + case GR_SPROLE:
54454 + case GR_SPROLEPAM:
54455 + if (unlikely(!(gr_status & GR_READY))) {
54456 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
54457 + error = -EAGAIN;
54458 + break;
54459 + }
54460 +
54461 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
54462 + current->role->expires = 0;
54463 + current->role->auth_attempts = 0;
54464 + }
54465 +
54466 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54467 + time_after(current->role->expires, get_seconds())) {
54468 + error = -EBUSY;
54469 + goto out;
54470 + }
54471 +
54472 + if (lookup_special_role_auth
54473 + (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
54474 + && ((!sprole_salt && !sprole_sum)
54475 + || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
54476 + char *p = "";
54477 + assign_special_role(gr_usermode->sp_role);
54478 + read_lock(&tasklist_lock);
54479 + if (current->real_parent)
54480 + p = current->real_parent->role->rolename;
54481 + read_unlock(&tasklist_lock);
54482 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
54483 + p, acl_sp_role_value);
54484 + } else {
54485 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
54486 + error = -EPERM;
54487 + if(!(current->role->auth_attempts++))
54488 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54489 +
54490 + goto out;
54491 + }
54492 + break;
54493 + case GR_UNSPROLE:
54494 + if (unlikely(!(gr_status & GR_READY))) {
54495 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
54496 + error = -EAGAIN;
54497 + break;
54498 + }
54499 +
54500 + if (current->role->roletype & GR_ROLE_SPECIAL) {
54501 + char *p = "";
54502 + int i = 0;
54503 +
54504 + read_lock(&tasklist_lock);
54505 + if (current->real_parent) {
54506 + p = current->real_parent->role->rolename;
54507 + i = current->real_parent->acl_role_id;
54508 + }
54509 + read_unlock(&tasklist_lock);
54510 +
54511 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
54512 + gr_set_acls(1);
54513 + } else {
54514 + error = -EPERM;
54515 + goto out;
54516 + }
54517 + break;
54518 + default:
54519 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
54520 + error = -EINVAL;
54521 + break;
54522 + }
54523 +
54524 + if (error != -EPERM)
54525 + goto out;
54526 +
54527 + if(!(gr_auth_attempts++))
54528 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54529 +
54530 + out:
54531 + mutex_unlock(&gr_dev_mutex);
54532 + return error;
54533 +}
54534 +
54535 +/* must be called with
54536 + rcu_read_lock();
54537 + read_lock(&tasklist_lock);
54538 + read_lock(&grsec_exec_file_lock);
54539 +*/
54540 +int gr_apply_subject_to_task(struct task_struct *task)
54541 +{
54542 + struct acl_object_label *obj;
54543 + char *tmpname;
54544 + struct acl_subject_label *tmpsubj;
54545 + struct file *filp;
54546 + struct name_entry *nmatch;
54547 +
54548 + filp = task->exec_file;
54549 + if (filp == NULL)
54550 + return 0;
54551 +
54552 + /* the following is to apply the correct subject
54553 + on binaries running when the RBAC system
54554 + is enabled, when the binaries have been
54555 + replaced or deleted since their execution
54556 + -----
54557 + when the RBAC system starts, the inode/dev
54558 + from exec_file will be one the RBAC system
54559 + is unaware of. It only knows the inode/dev
54560 + of the present file on disk, or the absence
54561 + of it.
54562 + */
54563 + preempt_disable();
54564 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
54565 +
54566 + nmatch = lookup_name_entry(tmpname);
54567 + preempt_enable();
54568 + tmpsubj = NULL;
54569 + if (nmatch) {
54570 + if (nmatch->deleted)
54571 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
54572 + else
54573 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
54574 + if (tmpsubj != NULL)
54575 + task->acl = tmpsubj;
54576 + }
54577 + if (tmpsubj == NULL)
54578 + task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
54579 + task->role);
54580 + if (task->acl) {
54581 + task->is_writable = 0;
54582 + /* ignore additional mmap checks for processes that are writable
54583 + by the default ACL */
54584 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54585 + if (unlikely(obj->mode & GR_WRITE))
54586 + task->is_writable = 1;
54587 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54588 + if (unlikely(obj->mode & GR_WRITE))
54589 + task->is_writable = 1;
54590 +
54591 + gr_set_proc_res(task);
54592 +
54593 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54594 + printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54595 +#endif
54596 + } else {
54597 + return 1;
54598 + }
54599 +
54600 + return 0;
54601 +}
54602 +
54603 +int
54604 +gr_set_acls(const int type)
54605 +{
54606 + struct task_struct *task, *task2;
54607 + struct acl_role_label *role = current->role;
54608 + __u16 acl_role_id = current->acl_role_id;
54609 + const struct cred *cred;
54610 + int ret;
54611 +
54612 + rcu_read_lock();
54613 + read_lock(&tasklist_lock);
54614 + read_lock(&grsec_exec_file_lock);
54615 + do_each_thread(task2, task) {
54616 + /* check to see if we're called from the exit handler,
54617 + if so, only replace ACLs that have inherited the admin
54618 + ACL */
54619 +
54620 + if (type && (task->role != role ||
54621 + task->acl_role_id != acl_role_id))
54622 + continue;
54623 +
54624 + task->acl_role_id = 0;
54625 + task->acl_sp_role = 0;
54626 +
54627 + if (task->exec_file) {
54628 + cred = __task_cred(task);
54629 + task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
54630 + ret = gr_apply_subject_to_task(task);
54631 + if (ret) {
54632 + read_unlock(&grsec_exec_file_lock);
54633 + read_unlock(&tasklist_lock);
54634 + rcu_read_unlock();
54635 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
54636 + return ret;
54637 + }
54638 + } else {
54639 + // it's a kernel process
54640 + task->role = kernel_role;
54641 + task->acl = kernel_role->root_label;
54642 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
54643 + task->acl->mode &= ~GR_PROCFIND;
54644 +#endif
54645 + }
54646 + } while_each_thread(task2, task);
54647 + read_unlock(&grsec_exec_file_lock);
54648 + read_unlock(&tasklist_lock);
54649 + rcu_read_unlock();
54650 +
54651 + return 0;
54652 +}
54653 +
54654 +void
54655 +gr_learn_resource(const struct task_struct *task,
54656 + const int res, const unsigned long wanted, const int gt)
54657 +{
54658 + struct acl_subject_label *acl;
54659 + const struct cred *cred;
54660 +
54661 + if (unlikely((gr_status & GR_READY) &&
54662 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
54663 + goto skip_reslog;
54664 +
54665 +#ifdef CONFIG_GRKERNSEC_RESLOG
54666 + gr_log_resource(task, res, wanted, gt);
54667 +#endif
54668 + skip_reslog:
54669 +
54670 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
54671 + return;
54672 +
54673 + acl = task->acl;
54674 +
54675 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
54676 + !(acl->resmask & (1 << (unsigned short) res))))
54677 + return;
54678 +
54679 + if (wanted >= acl->res[res].rlim_cur) {
54680 + unsigned long res_add;
54681 +
54682 + res_add = wanted;
54683 + switch (res) {
54684 + case RLIMIT_CPU:
54685 + res_add += GR_RLIM_CPU_BUMP;
54686 + break;
54687 + case RLIMIT_FSIZE:
54688 + res_add += GR_RLIM_FSIZE_BUMP;
54689 + break;
54690 + case RLIMIT_DATA:
54691 + res_add += GR_RLIM_DATA_BUMP;
54692 + break;
54693 + case RLIMIT_STACK:
54694 + res_add += GR_RLIM_STACK_BUMP;
54695 + break;
54696 + case RLIMIT_CORE:
54697 + res_add += GR_RLIM_CORE_BUMP;
54698 + break;
54699 + case RLIMIT_RSS:
54700 + res_add += GR_RLIM_RSS_BUMP;
54701 + break;
54702 + case RLIMIT_NPROC:
54703 + res_add += GR_RLIM_NPROC_BUMP;
54704 + break;
54705 + case RLIMIT_NOFILE:
54706 + res_add += GR_RLIM_NOFILE_BUMP;
54707 + break;
54708 + case RLIMIT_MEMLOCK:
54709 + res_add += GR_RLIM_MEMLOCK_BUMP;
54710 + break;
54711 + case RLIMIT_AS:
54712 + res_add += GR_RLIM_AS_BUMP;
54713 + break;
54714 + case RLIMIT_LOCKS:
54715 + res_add += GR_RLIM_LOCKS_BUMP;
54716 + break;
54717 + case RLIMIT_SIGPENDING:
54718 + res_add += GR_RLIM_SIGPENDING_BUMP;
54719 + break;
54720 + case RLIMIT_MSGQUEUE:
54721 + res_add += GR_RLIM_MSGQUEUE_BUMP;
54722 + break;
54723 + case RLIMIT_NICE:
54724 + res_add += GR_RLIM_NICE_BUMP;
54725 + break;
54726 + case RLIMIT_RTPRIO:
54727 + res_add += GR_RLIM_RTPRIO_BUMP;
54728 + break;
54729 + case RLIMIT_RTTIME:
54730 + res_add += GR_RLIM_RTTIME_BUMP;
54731 + break;
54732 + }
54733 +
54734 + acl->res[res].rlim_cur = res_add;
54735 +
54736 + if (wanted > acl->res[res].rlim_max)
54737 + acl->res[res].rlim_max = res_add;
54738 +
54739 + /* only log the subject filename, since resource logging is supported for
54740 + single-subject learning only */
54741 + rcu_read_lock();
54742 + cred = __task_cred(task);
54743 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54744 + task->role->roletype, cred->uid, cred->gid, acl->filename,
54745 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
54746 + "", (unsigned long) res, &task->signal->saved_ip);
54747 + rcu_read_unlock();
54748 + }
54749 +
54750 + return;
54751 +}
54752 +
54753 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
54754 +void
54755 +pax_set_initial_flags(struct linux_binprm *bprm)
54756 +{
54757 + struct task_struct *task = current;
54758 + struct acl_subject_label *proc;
54759 + unsigned long flags;
54760 +
54761 + if (unlikely(!(gr_status & GR_READY)))
54762 + return;
54763 +
54764 + flags = pax_get_flags(task);
54765 +
54766 + proc = task->acl;
54767 +
54768 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54769 + flags &= ~MF_PAX_PAGEEXEC;
54770 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54771 + flags &= ~MF_PAX_SEGMEXEC;
54772 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54773 + flags &= ~MF_PAX_RANDMMAP;
54774 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54775 + flags &= ~MF_PAX_EMUTRAMP;
54776 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54777 + flags &= ~MF_PAX_MPROTECT;
54778 +
54779 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54780 + flags |= MF_PAX_PAGEEXEC;
54781 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54782 + flags |= MF_PAX_SEGMEXEC;
54783 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54784 + flags |= MF_PAX_RANDMMAP;
54785 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54786 + flags |= MF_PAX_EMUTRAMP;
54787 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54788 + flags |= MF_PAX_MPROTECT;
54789 +
54790 + pax_set_flags(task, flags);
54791 +
54792 + return;
54793 +}
54794 +#endif
54795 +
54796 +int
54797 +gr_handle_proc_ptrace(struct task_struct *task)
54798 +{
54799 + struct file *filp;
54800 + struct task_struct *tmp = task;
54801 + struct task_struct *curtemp = current;
54802 + __u32 retmode;
54803 +
54804 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54805 + if (unlikely(!(gr_status & GR_READY)))
54806 + return 0;
54807 +#endif
54808 +
54809 + read_lock(&tasklist_lock);
54810 + read_lock(&grsec_exec_file_lock);
54811 + filp = task->exec_file;
54812 +
54813 + while (tmp->pid > 0) {
54814 + if (tmp == curtemp)
54815 + break;
54816 + tmp = tmp->real_parent;
54817 + }
54818 +
54819 + if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && !uid_eq(current_uid(), GLOBAL_ROOT_UID) && !(gr_status & GR_READY)) ||
54820 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54821 + read_unlock(&grsec_exec_file_lock);
54822 + read_unlock(&tasklist_lock);
54823 + return 1;
54824 + }
54825 +
54826 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54827 + if (!(gr_status & GR_READY)) {
54828 + read_unlock(&grsec_exec_file_lock);
54829 + read_unlock(&tasklist_lock);
54830 + return 0;
54831 + }
54832 +#endif
54833 +
54834 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54835 + read_unlock(&grsec_exec_file_lock);
54836 + read_unlock(&tasklist_lock);
54837 +
54838 + if (retmode & GR_NOPTRACE)
54839 + return 1;
54840 +
54841 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54842 + && (current->acl != task->acl || (current->acl != current->role->root_label
54843 + && current->pid != task->pid)))
54844 + return 1;
54845 +
54846 + return 0;
54847 +}
54848 +
54849 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54850 +{
54851 + if (unlikely(!(gr_status & GR_READY)))
54852 + return;
54853 +
54854 + if (!(current->role->roletype & GR_ROLE_GOD))
54855 + return;
54856 +
54857 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54858 + p->role->rolename, gr_task_roletype_to_char(p),
54859 + p->acl->filename);
54860 +}
54861 +
54862 +int
54863 +gr_handle_ptrace(struct task_struct *task, const long request)
54864 +{
54865 + struct task_struct *tmp = task;
54866 + struct task_struct *curtemp = current;
54867 + __u32 retmode;
54868 +
54869 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54870 + if (unlikely(!(gr_status & GR_READY)))
54871 + return 0;
54872 +#endif
54873 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
54874 + read_lock(&tasklist_lock);
54875 + while (tmp->pid > 0) {
54876 + if (tmp == curtemp)
54877 + break;
54878 + tmp = tmp->real_parent;
54879 + }
54880 +
54881 + if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && !uid_eq(current_uid(), GLOBAL_ROOT_UID) && !(gr_status & GR_READY)) ||
54882 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54883 + read_unlock(&tasklist_lock);
54884 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54885 + return 1;
54886 + }
54887 + read_unlock(&tasklist_lock);
54888 + }
54889 +
54890 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54891 + if (!(gr_status & GR_READY))
54892 + return 0;
54893 +#endif
54894 +
54895 + read_lock(&grsec_exec_file_lock);
54896 + if (unlikely(!task->exec_file)) {
54897 + read_unlock(&grsec_exec_file_lock);
54898 + return 0;
54899 + }
54900 +
54901 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54902 + read_unlock(&grsec_exec_file_lock);
54903 +
54904 + if (retmode & GR_NOPTRACE) {
54905 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54906 + return 1;
54907 + }
54908 +
54909 + if (retmode & GR_PTRACERD) {
54910 + switch (request) {
54911 + case PTRACE_SEIZE:
54912 + case PTRACE_POKETEXT:
54913 + case PTRACE_POKEDATA:
54914 + case PTRACE_POKEUSR:
54915 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54916 + case PTRACE_SETREGS:
54917 + case PTRACE_SETFPREGS:
54918 +#endif
54919 +#ifdef CONFIG_X86
54920 + case PTRACE_SETFPXREGS:
54921 +#endif
54922 +#ifdef CONFIG_ALTIVEC
54923 + case PTRACE_SETVRREGS:
54924 +#endif
54925 + return 1;
54926 + default:
54927 + return 0;
54928 + }
54929 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
54930 + !(current->role->roletype & GR_ROLE_GOD) &&
54931 + (current->acl != task->acl)) {
54932 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54933 + return 1;
54934 + }
54935 +
54936 + return 0;
54937 +}
54938 +
54939 +static int is_writable_mmap(const struct file *filp)
54940 +{
54941 + struct task_struct *task = current;
54942 + struct acl_object_label *obj, *obj2;
54943 +
54944 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54945 + !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))) {
54946 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54947 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54948 + task->role->root_label);
54949 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54950 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54951 + return 1;
54952 + }
54953 + }
54954 + return 0;
54955 +}
54956 +
54957 +int
54958 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54959 +{
54960 + __u32 mode;
54961 +
54962 + if (unlikely(!file || !(prot & PROT_EXEC)))
54963 + return 1;
54964 +
54965 + if (is_writable_mmap(file))
54966 + return 0;
54967 +
54968 + mode =
54969 + gr_search_file(file->f_path.dentry,
54970 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54971 + file->f_path.mnt);
54972 +
54973 + if (!gr_tpe_allow(file))
54974 + return 0;
54975 +
54976 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54977 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54978 + return 0;
54979 + } else if (unlikely(!(mode & GR_EXEC))) {
54980 + return 0;
54981 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54982 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54983 + return 1;
54984 + }
54985 +
54986 + return 1;
54987 +}
54988 +
54989 +int
54990 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54991 +{
54992 + __u32 mode;
54993 +
54994 + if (unlikely(!file || !(prot & PROT_EXEC)))
54995 + return 1;
54996 +
54997 + if (is_writable_mmap(file))
54998 + return 0;
54999 +
55000 + mode =
55001 + gr_search_file(file->f_path.dentry,
55002 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
55003 + file->f_path.mnt);
55004 +
55005 + if (!gr_tpe_allow(file))
55006 + return 0;
55007 +
55008 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
55009 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55010 + return 0;
55011 + } else if (unlikely(!(mode & GR_EXEC))) {
55012 + return 0;
55013 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
55014 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55015 + return 1;
55016 + }
55017 +
55018 + return 1;
55019 +}
55020 +
55021 +void
55022 +gr_acl_handle_psacct(struct task_struct *task, const long code)
55023 +{
55024 + unsigned long runtime;
55025 + unsigned long cputime;
55026 + unsigned int wday, cday;
55027 + __u8 whr, chr;
55028 + __u8 wmin, cmin;
55029 + __u8 wsec, csec;
55030 + struct timespec timeval;
55031 +
55032 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
55033 + !(task->acl->mode & GR_PROCACCT)))
55034 + return;
55035 +
55036 + do_posix_clock_monotonic_gettime(&timeval);
55037 + runtime = timeval.tv_sec - task->start_time.tv_sec;
55038 + wday = runtime / (3600 * 24);
55039 + runtime -= wday * (3600 * 24);
55040 + whr = runtime / 3600;
55041 + runtime -= whr * 3600;
55042 + wmin = runtime / 60;
55043 + runtime -= wmin * 60;
55044 + wsec = runtime;
55045 +
55046 + cputime = (task->utime + task->stime) / HZ;
55047 + cday = cputime / (3600 * 24);
55048 + cputime -= cday * (3600 * 24);
55049 + chr = cputime / 3600;
55050 + cputime -= chr * 3600;
55051 + cmin = cputime / 60;
55052 + cputime -= cmin * 60;
55053 + csec = cputime;
55054 +
55055 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
55056 +
55057 + return;
55058 +}
55059 +
55060 +void gr_set_kernel_label(struct task_struct *task)
55061 +{
55062 + if (gr_status & GR_READY) {
55063 + task->role = kernel_role;
55064 + task->acl = kernel_role->root_label;
55065 + }
55066 + return;
55067 +}
55068 +
55069 +#ifdef CONFIG_TASKSTATS
55070 +int gr_is_taskstats_denied(int pid)
55071 +{
55072 + struct task_struct *task;
55073 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55074 + const struct cred *cred;
55075 +#endif
55076 + int ret = 0;
55077 +
55078 + /* restrict taskstats viewing to un-chrooted root users
55079 + who have the 'view' subject flag if the RBAC system is enabled
55080 + */
55081 +
55082 + rcu_read_lock();
55083 + read_lock(&tasklist_lock);
55084 + task = find_task_by_vpid(pid);
55085 + if (task) {
55086 +#ifdef CONFIG_GRKERNSEC_CHROOT
55087 + if (proc_is_chrooted(task))
55088 + ret = -EACCES;
55089 +#endif
55090 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55091 + cred = __task_cred(task);
55092 +#ifdef CONFIG_GRKERNSEC_PROC_USER
55093 + if (!uid_eq(cred->uid, GLOBAL_ROOT_UID))
55094 + ret = -EACCES;
55095 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55096 + if (!uid_eq(cred->uid, GLOBAL_ROOT_UID) && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
55097 + ret = -EACCES;
55098 +#endif
55099 +#endif
55100 + if (gr_status & GR_READY) {
55101 + if (!(task->acl->mode & GR_VIEW))
55102 + ret = -EACCES;
55103 + }
55104 + } else
55105 + ret = -ENOENT;
55106 +
55107 + read_unlock(&tasklist_lock);
55108 + rcu_read_unlock();
55109 +
55110 + return ret;
55111 +}
55112 +#endif
55113 +
55114 +/* AUXV entries are filled via a descendant of search_binary_handler
55115 + after we've already applied the subject for the target
55116 +*/
55117 +int gr_acl_enable_at_secure(void)
55118 +{
55119 + if (unlikely(!(gr_status & GR_READY)))
55120 + return 0;
55121 +
55122 + if (current->acl->mode & GR_ATSECURE)
55123 + return 1;
55124 +
55125 + return 0;
55126 +}
55127 +
55128 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
55129 +{
55130 + struct task_struct *task = current;
55131 + struct dentry *dentry = file->f_path.dentry;
55132 + struct vfsmount *mnt = file->f_path.mnt;
55133 + struct acl_object_label *obj, *tmp;
55134 + struct acl_subject_label *subj;
55135 + unsigned int bufsize;
55136 + int is_not_root;
55137 + char *path;
55138 + dev_t dev = __get_dev(dentry);
55139 +
55140 + if (unlikely(!(gr_status & GR_READY)))
55141 + return 1;
55142 +
55143 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
55144 + return 1;
55145 +
55146 + /* ignore Eric Biederman */
55147 + if (IS_PRIVATE(dentry->d_inode))
55148 + return 1;
55149 +
55150 + subj = task->acl;
55151 + read_lock(&gr_inode_lock);
55152 + do {
55153 + obj = lookup_acl_obj_label(ino, dev, subj);
55154 + if (obj != NULL) {
55155 + read_unlock(&gr_inode_lock);
55156 + return (obj->mode & GR_FIND) ? 1 : 0;
55157 + }
55158 + } while ((subj = subj->parent_subject));
55159 + read_unlock(&gr_inode_lock);
55160 +
55161 + /* this is purely an optimization since we're looking for an object
55162 + for the directory we're doing a readdir on
55163 + if it's possible for any globbed object to match the entry we're
55164 + filling into the directory, then the object we find here will be
55165 + an anchor point with attached globbed objects
55166 + */
55167 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
55168 + if (obj->globbed == NULL)
55169 + return (obj->mode & GR_FIND) ? 1 : 0;
55170 +
55171 + is_not_root = ((obj->filename[0] == '/') &&
55172 + (obj->filename[1] == '\0')) ? 0 : 1;
55173 + bufsize = PAGE_SIZE - namelen - is_not_root;
55174 +
55175 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
55176 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
55177 + return 1;
55178 +
55179 + preempt_disable();
55180 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
55181 + bufsize);
55182 +
55183 + bufsize = strlen(path);
55184 +
55185 + /* if base is "/", don't append an additional slash */
55186 + if (is_not_root)
55187 + *(path + bufsize) = '/';
55188 + memcpy(path + bufsize + is_not_root, name, namelen);
55189 + *(path + bufsize + namelen + is_not_root) = '\0';
55190 +
55191 + tmp = obj->globbed;
55192 + while (tmp) {
55193 + if (!glob_match(tmp->filename, path)) {
55194 + preempt_enable();
55195 + return (tmp->mode & GR_FIND) ? 1 : 0;
55196 + }
55197 + tmp = tmp->next;
55198 + }
55199 + preempt_enable();
55200 + return (obj->mode & GR_FIND) ? 1 : 0;
55201 +}
55202 +
55203 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
55204 +EXPORT_SYMBOL(gr_acl_is_enabled);
55205 +#endif
55206 +EXPORT_SYMBOL(gr_learn_resource);
55207 +EXPORT_SYMBOL(gr_set_kernel_label);
55208 +#ifdef CONFIG_SECURITY
55209 +EXPORT_SYMBOL(gr_check_user_change);
55210 +EXPORT_SYMBOL(gr_check_group_change);
55211 +#endif
55212 +
55213 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
55214 new file mode 100644
55215 index 0000000..34fefda
55216 --- /dev/null
55217 +++ b/grsecurity/gracl_alloc.c
55218 @@ -0,0 +1,105 @@
55219 +#include <linux/kernel.h>
55220 +#include <linux/mm.h>
55221 +#include <linux/slab.h>
55222 +#include <linux/vmalloc.h>
55223 +#include <linux/gracl.h>
55224 +#include <linux/grsecurity.h>
55225 +
55226 +static unsigned long alloc_stack_next = 1;
55227 +static unsigned long alloc_stack_size = 1;
55228 +static void **alloc_stack;
55229 +
55230 +static __inline__ int
55231 +alloc_pop(void)
55232 +{
55233 + if (alloc_stack_next == 1)
55234 + return 0;
55235 +
55236 + kfree(alloc_stack[alloc_stack_next - 2]);
55237 +
55238 + alloc_stack_next--;
55239 +
55240 + return 1;
55241 +}
55242 +
55243 +static __inline__ int
55244 +alloc_push(void *buf)
55245 +{
55246 + if (alloc_stack_next >= alloc_stack_size)
55247 + return 1;
55248 +
55249 + alloc_stack[alloc_stack_next - 1] = buf;
55250 +
55251 + alloc_stack_next++;
55252 +
55253 + return 0;
55254 +}
55255 +
55256 +void *
55257 +acl_alloc(unsigned long len)
55258 +{
55259 + void *ret = NULL;
55260 +
55261 + if (!len || len > PAGE_SIZE)
55262 + goto out;
55263 +
55264 + ret = kmalloc(len, GFP_KERNEL);
55265 +
55266 + if (ret) {
55267 + if (alloc_push(ret)) {
55268 + kfree(ret);
55269 + ret = NULL;
55270 + }
55271 + }
55272 +
55273 +out:
55274 + return ret;
55275 +}
55276 +
55277 +void *
55278 +acl_alloc_num(unsigned long num, unsigned long len)
55279 +{
55280 + if (!len || (num > (PAGE_SIZE / len)))
55281 + return NULL;
55282 +
55283 + return acl_alloc(num * len);
55284 +}
55285 +
55286 +void
55287 +acl_free_all(void)
55288 +{
55289 + if (gr_acl_is_enabled() || !alloc_stack)
55290 + return;
55291 +
55292 + while (alloc_pop()) ;
55293 +
55294 + if (alloc_stack) {
55295 + if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
55296 + kfree(alloc_stack);
55297 + else
55298 + vfree(alloc_stack);
55299 + }
55300 +
55301 + alloc_stack = NULL;
55302 + alloc_stack_size = 1;
55303 + alloc_stack_next = 1;
55304 +
55305 + return;
55306 +}
55307 +
55308 +int
55309 +acl_alloc_stack_init(unsigned long size)
55310 +{
55311 + if ((size * sizeof (void *)) <= PAGE_SIZE)
55312 + alloc_stack =
55313 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
55314 + else
55315 + alloc_stack = (void **) vmalloc(size * sizeof (void *));
55316 +
55317 + alloc_stack_size = size;
55318 +
55319 + if (!alloc_stack)
55320 + return 0;
55321 + else
55322 + return 1;
55323 +}
55324 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
55325 new file mode 100644
55326 index 0000000..6d21049
55327 --- /dev/null
55328 +++ b/grsecurity/gracl_cap.c
55329 @@ -0,0 +1,110 @@
55330 +#include <linux/kernel.h>
55331 +#include <linux/module.h>
55332 +#include <linux/sched.h>
55333 +#include <linux/gracl.h>
55334 +#include <linux/grsecurity.h>
55335 +#include <linux/grinternal.h>
55336 +
55337 +extern const char *captab_log[];
55338 +extern int captab_log_entries;
55339 +
55340 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
55341 +{
55342 + struct acl_subject_label *curracl;
55343 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55344 + kernel_cap_t cap_audit = __cap_empty_set;
55345 +
55346 + if (!gr_acl_is_enabled())
55347 + return 1;
55348 +
55349 + curracl = task->acl;
55350 +
55351 + cap_drop = curracl->cap_lower;
55352 + cap_mask = curracl->cap_mask;
55353 + cap_audit = curracl->cap_invert_audit;
55354 +
55355 + while ((curracl = curracl->parent_subject)) {
55356 + /* if the cap isn't specified in the current computed mask but is specified in the
55357 + current level subject, and is lowered in the current level subject, then add
55358 + it to the set of dropped capabilities
55359 + otherwise, add the current level subject's mask to the current computed mask
55360 + */
55361 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55362 + cap_raise(cap_mask, cap);
55363 + if (cap_raised(curracl->cap_lower, cap))
55364 + cap_raise(cap_drop, cap);
55365 + if (cap_raised(curracl->cap_invert_audit, cap))
55366 + cap_raise(cap_audit, cap);
55367 + }
55368 + }
55369 +
55370 + if (!cap_raised(cap_drop, cap)) {
55371 + if (cap_raised(cap_audit, cap))
55372 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
55373 + return 1;
55374 + }
55375 +
55376 + curracl = task->acl;
55377 +
55378 + if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
55379 + && cap_raised(cred->cap_effective, cap)) {
55380 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
55381 + task->role->roletype, cred->uid,
55382 + cred->gid, task->exec_file ?
55383 + gr_to_filename(task->exec_file->f_path.dentry,
55384 + task->exec_file->f_path.mnt) : curracl->filename,
55385 + curracl->filename, 0UL,
55386 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
55387 + return 1;
55388 + }
55389 +
55390 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
55391 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
55392 +
55393 + return 0;
55394 +}
55395 +
55396 +int
55397 +gr_acl_is_capable(const int cap)
55398 +{
55399 + return gr_task_acl_is_capable(current, current_cred(), cap);
55400 +}
55401 +
55402 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
55403 +{
55404 + struct acl_subject_label *curracl;
55405 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55406 +
55407 + if (!gr_acl_is_enabled())
55408 + return 1;
55409 +
55410 + curracl = task->acl;
55411 +
55412 + cap_drop = curracl->cap_lower;
55413 + cap_mask = curracl->cap_mask;
55414 +
55415 + while ((curracl = curracl->parent_subject)) {
55416 + /* if the cap isn't specified in the current computed mask but is specified in the
55417 + current level subject, and is lowered in the current level subject, then add
55418 + it to the set of dropped capabilities
55419 + otherwise, add the current level subject's mask to the current computed mask
55420 + */
55421 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55422 + cap_raise(cap_mask, cap);
55423 + if (cap_raised(curracl->cap_lower, cap))
55424 + cap_raise(cap_drop, cap);
55425 + }
55426 + }
55427 +
55428 + if (!cap_raised(cap_drop, cap))
55429 + return 1;
55430 +
55431 + return 0;
55432 +}
55433 +
55434 +int
55435 +gr_acl_is_capable_nolog(const int cap)
55436 +{
55437 + return gr_task_acl_is_capable_nolog(current, cap);
55438 +}
55439 +
55440 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
55441 new file mode 100644
55442 index 0000000..d28e241
55443 --- /dev/null
55444 +++ b/grsecurity/gracl_fs.c
55445 @@ -0,0 +1,437 @@
55446 +#include <linux/kernel.h>
55447 +#include <linux/sched.h>
55448 +#include <linux/types.h>
55449 +#include <linux/fs.h>
55450 +#include <linux/file.h>
55451 +#include <linux/stat.h>
55452 +#include <linux/grsecurity.h>
55453 +#include <linux/grinternal.h>
55454 +#include <linux/gracl.h>
55455 +
55456 +umode_t
55457 +gr_acl_umask(void)
55458 +{
55459 + if (unlikely(!gr_acl_is_enabled()))
55460 + return 0;
55461 +
55462 + return current->role->umask;
55463 +}
55464 +
55465 +__u32
55466 +gr_acl_handle_hidden_file(const struct dentry * dentry,
55467 + const struct vfsmount * mnt)
55468 +{
55469 + __u32 mode;
55470 +
55471 + if (unlikely(!dentry->d_inode))
55472 + return GR_FIND;
55473 +
55474 + mode =
55475 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
55476 +
55477 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
55478 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55479 + return mode;
55480 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
55481 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55482 + return 0;
55483 + } else if (unlikely(!(mode & GR_FIND)))
55484 + return 0;
55485 +
55486 + return GR_FIND;
55487 +}
55488 +
55489 +__u32
55490 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
55491 + int acc_mode)
55492 +{
55493 + __u32 reqmode = GR_FIND;
55494 + __u32 mode;
55495 +
55496 + if (unlikely(!dentry->d_inode))
55497 + return reqmode;
55498 +
55499 + if (acc_mode & MAY_APPEND)
55500 + reqmode |= GR_APPEND;
55501 + else if (acc_mode & MAY_WRITE)
55502 + reqmode |= GR_WRITE;
55503 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
55504 + reqmode |= GR_READ;
55505 +
55506 + mode =
55507 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55508 + mnt);
55509 +
55510 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55511 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55512 + reqmode & GR_READ ? " reading" : "",
55513 + reqmode & GR_WRITE ? " writing" : reqmode &
55514 + GR_APPEND ? " appending" : "");
55515 + return reqmode;
55516 + } else
55517 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55518 + {
55519 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55520 + reqmode & GR_READ ? " reading" : "",
55521 + reqmode & GR_WRITE ? " writing" : reqmode &
55522 + GR_APPEND ? " appending" : "");
55523 + return 0;
55524 + } else if (unlikely((mode & reqmode) != reqmode))
55525 + return 0;
55526 +
55527 + return reqmode;
55528 +}
55529 +
55530 +__u32
55531 +gr_acl_handle_creat(const struct dentry * dentry,
55532 + const struct dentry * p_dentry,
55533 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
55534 + const int imode)
55535 +{
55536 + __u32 reqmode = GR_WRITE | GR_CREATE;
55537 + __u32 mode;
55538 +
55539 + if (acc_mode & MAY_APPEND)
55540 + reqmode |= GR_APPEND;
55541 + // if a directory was required or the directory already exists, then
55542 + // don't count this open as a read
55543 + if ((acc_mode & MAY_READ) &&
55544 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
55545 + reqmode |= GR_READ;
55546 + if ((open_flags & O_CREAT) &&
55547 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
55548 + reqmode |= GR_SETID;
55549 +
55550 + mode =
55551 + gr_check_create(dentry, p_dentry, p_mnt,
55552 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55553 +
55554 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55555 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55556 + reqmode & GR_READ ? " reading" : "",
55557 + reqmode & GR_WRITE ? " writing" : reqmode &
55558 + GR_APPEND ? " appending" : "");
55559 + return reqmode;
55560 + } else
55561 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55562 + {
55563 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55564 + reqmode & GR_READ ? " reading" : "",
55565 + reqmode & GR_WRITE ? " writing" : reqmode &
55566 + GR_APPEND ? " appending" : "");
55567 + return 0;
55568 + } else if (unlikely((mode & reqmode) != reqmode))
55569 + return 0;
55570 +
55571 + return reqmode;
55572 +}
55573 +
55574 +__u32
55575 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
55576 + const int fmode)
55577 +{
55578 + __u32 mode, reqmode = GR_FIND;
55579 +
55580 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
55581 + reqmode |= GR_EXEC;
55582 + if (fmode & S_IWOTH)
55583 + reqmode |= GR_WRITE;
55584 + if (fmode & S_IROTH)
55585 + reqmode |= GR_READ;
55586 +
55587 + mode =
55588 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55589 + mnt);
55590 +
55591 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55592 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55593 + reqmode & GR_READ ? " reading" : "",
55594 + reqmode & GR_WRITE ? " writing" : "",
55595 + reqmode & GR_EXEC ? " executing" : "");
55596 + return reqmode;
55597 + } else
55598 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55599 + {
55600 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55601 + reqmode & GR_READ ? " reading" : "",
55602 + reqmode & GR_WRITE ? " writing" : "",
55603 + reqmode & GR_EXEC ? " executing" : "");
55604 + return 0;
55605 + } else if (unlikely((mode & reqmode) != reqmode))
55606 + return 0;
55607 +
55608 + return reqmode;
55609 +}
55610 +
55611 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
55612 +{
55613 + __u32 mode;
55614 +
55615 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
55616 +
55617 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55618 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
55619 + return mode;
55620 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55621 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
55622 + return 0;
55623 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
55624 + return 0;
55625 +
55626 + return (reqmode);
55627 +}
55628 +
55629 +__u32
55630 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
55631 +{
55632 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
55633 +}
55634 +
55635 +__u32
55636 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
55637 +{
55638 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
55639 +}
55640 +
55641 +__u32
55642 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
55643 +{
55644 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
55645 +}
55646 +
55647 +__u32
55648 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
55649 +{
55650 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
55651 +}
55652 +
55653 +__u32
55654 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
55655 + umode_t *modeptr)
55656 +{
55657 + umode_t mode;
55658 +
55659 + *modeptr &= ~gr_acl_umask();
55660 + mode = *modeptr;
55661 +
55662 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
55663 + return 1;
55664 +
55665 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
55666 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
55667 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
55668 + GR_CHMOD_ACL_MSG);
55669 + } else {
55670 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
55671 + }
55672 +}
55673 +
55674 +__u32
55675 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
55676 +{
55677 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
55678 +}
55679 +
55680 +__u32
55681 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
55682 +{
55683 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
55684 +}
55685 +
55686 +__u32
55687 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
55688 +{
55689 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
55690 +}
55691 +
55692 +__u32
55693 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
55694 +{
55695 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
55696 + GR_UNIXCONNECT_ACL_MSG);
55697 +}
55698 +
55699 +/* hardlinks require at minimum create and link permission,
55700 + any additional privilege required is based on the
55701 + privilege of the file being linked to
55702 +*/
55703 +__u32
55704 +gr_acl_handle_link(const struct dentry * new_dentry,
55705 + const struct dentry * parent_dentry,
55706 + const struct vfsmount * parent_mnt,
55707 + const struct dentry * old_dentry,
55708 + const struct vfsmount * old_mnt, const char *to)
55709 +{
55710 + __u32 mode;
55711 + __u32 needmode = GR_CREATE | GR_LINK;
55712 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
55713 +
55714 + mode =
55715 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
55716 + old_mnt);
55717 +
55718 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
55719 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55720 + return mode;
55721 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55722 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55723 + return 0;
55724 + } else if (unlikely((mode & needmode) != needmode))
55725 + return 0;
55726 +
55727 + return 1;
55728 +}
55729 +
55730 +__u32
55731 +gr_acl_handle_symlink(const struct dentry * new_dentry,
55732 + const struct dentry * parent_dentry,
55733 + const struct vfsmount * parent_mnt, const char *from)
55734 +{
55735 + __u32 needmode = GR_WRITE | GR_CREATE;
55736 + __u32 mode;
55737 +
55738 + mode =
55739 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
55740 + GR_CREATE | GR_AUDIT_CREATE |
55741 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55742 +
55743 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55744 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55745 + return mode;
55746 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55747 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55748 + return 0;
55749 + } else if (unlikely((mode & needmode) != needmode))
55750 + return 0;
55751 +
55752 + return (GR_WRITE | GR_CREATE);
55753 +}
55754 +
55755 +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)
55756 +{
55757 + __u32 mode;
55758 +
55759 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55760 +
55761 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55762 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55763 + return mode;
55764 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55765 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55766 + return 0;
55767 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
55768 + return 0;
55769 +
55770 + return (reqmode);
55771 +}
55772 +
55773 +__u32
55774 +gr_acl_handle_mknod(const struct dentry * new_dentry,
55775 + const struct dentry * parent_dentry,
55776 + const struct vfsmount * parent_mnt,
55777 + const int mode)
55778 +{
55779 + __u32 reqmode = GR_WRITE | GR_CREATE;
55780 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
55781 + reqmode |= GR_SETID;
55782 +
55783 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55784 + reqmode, GR_MKNOD_ACL_MSG);
55785 +}
55786 +
55787 +__u32
55788 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
55789 + const struct dentry *parent_dentry,
55790 + const struct vfsmount *parent_mnt)
55791 +{
55792 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55793 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55794 +}
55795 +
55796 +#define RENAME_CHECK_SUCCESS(old, new) \
55797 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55798 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55799 +
55800 +int
55801 +gr_acl_handle_rename(struct dentry *new_dentry,
55802 + struct dentry *parent_dentry,
55803 + const struct vfsmount *parent_mnt,
55804 + struct dentry *old_dentry,
55805 + struct inode *old_parent_inode,
55806 + struct vfsmount *old_mnt, const char *newname)
55807 +{
55808 + __u32 comp1, comp2;
55809 + int error = 0;
55810 +
55811 + if (unlikely(!gr_acl_is_enabled()))
55812 + return 0;
55813 +
55814 + if (!new_dentry->d_inode) {
55815 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55816 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55817 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55818 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55819 + GR_DELETE | GR_AUDIT_DELETE |
55820 + GR_AUDIT_READ | GR_AUDIT_WRITE |
55821 + GR_SUPPRESS, old_mnt);
55822 + } else {
55823 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55824 + GR_CREATE | GR_DELETE |
55825 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55826 + GR_AUDIT_READ | GR_AUDIT_WRITE |
55827 + GR_SUPPRESS, parent_mnt);
55828 + comp2 =
55829 + gr_search_file(old_dentry,
55830 + GR_READ | GR_WRITE | GR_AUDIT_READ |
55831 + GR_DELETE | GR_AUDIT_DELETE |
55832 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55833 + }
55834 +
55835 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55836 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55837 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55838 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55839 + && !(comp2 & GR_SUPPRESS)) {
55840 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55841 + error = -EACCES;
55842 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55843 + error = -EACCES;
55844 +
55845 + return error;
55846 +}
55847 +
55848 +void
55849 +gr_acl_handle_exit(void)
55850 +{
55851 + u16 id;
55852 + char *rolename;
55853 + struct file *exec_file;
55854 +
55855 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55856 + !(current->role->roletype & GR_ROLE_PERSIST))) {
55857 + id = current->acl_role_id;
55858 + rolename = current->role->rolename;
55859 + gr_set_acls(1);
55860 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55861 + }
55862 +
55863 + write_lock(&grsec_exec_file_lock);
55864 + exec_file = current->exec_file;
55865 + current->exec_file = NULL;
55866 + write_unlock(&grsec_exec_file_lock);
55867 +
55868 + if (exec_file)
55869 + fput(exec_file);
55870 +}
55871 +
55872 +int
55873 +gr_acl_handle_procpidmem(const struct task_struct *task)
55874 +{
55875 + if (unlikely(!gr_acl_is_enabled()))
55876 + return 0;
55877 +
55878 + if (task != current && task->acl->mode & GR_PROTPROCFD)
55879 + return -EACCES;
55880 +
55881 + return 0;
55882 +}
55883 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
55884 new file mode 100644
55885 index 0000000..58800a7
55886 --- /dev/null
55887 +++ b/grsecurity/gracl_ip.c
55888 @@ -0,0 +1,384 @@
55889 +#include <linux/kernel.h>
55890 +#include <asm/uaccess.h>
55891 +#include <asm/errno.h>
55892 +#include <net/sock.h>
55893 +#include <linux/file.h>
55894 +#include <linux/fs.h>
55895 +#include <linux/net.h>
55896 +#include <linux/in.h>
55897 +#include <linux/skbuff.h>
55898 +#include <linux/ip.h>
55899 +#include <linux/udp.h>
55900 +#include <linux/types.h>
55901 +#include <linux/sched.h>
55902 +#include <linux/netdevice.h>
55903 +#include <linux/inetdevice.h>
55904 +#include <linux/gracl.h>
55905 +#include <linux/grsecurity.h>
55906 +#include <linux/grinternal.h>
55907 +
55908 +#define GR_BIND 0x01
55909 +#define GR_CONNECT 0x02
55910 +#define GR_INVERT 0x04
55911 +#define GR_BINDOVERRIDE 0x08
55912 +#define GR_CONNECTOVERRIDE 0x10
55913 +#define GR_SOCK_FAMILY 0x20
55914 +
55915 +static const char * gr_protocols[IPPROTO_MAX] = {
55916 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55917 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55918 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55919 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55920 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55921 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55922 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55923 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55924 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55925 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55926 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55927 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55928 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55929 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55930 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55931 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55932 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55933 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55934 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55935 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55936 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55937 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55938 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55939 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55940 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55941 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55942 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55943 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55944 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55945 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55946 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55947 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55948 + };
55949 +
55950 +static const char * gr_socktypes[SOCK_MAX] = {
55951 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55952 + "unknown:7", "unknown:8", "unknown:9", "packet"
55953 + };
55954 +
55955 +static const char * gr_sockfamilies[AF_MAX+1] = {
55956 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55957 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55958 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55959 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
55960 + };
55961 +
55962 +const char *
55963 +gr_proto_to_name(unsigned char proto)
55964 +{
55965 + return gr_protocols[proto];
55966 +}
55967 +
55968 +const char *
55969 +gr_socktype_to_name(unsigned char type)
55970 +{
55971 + return gr_socktypes[type];
55972 +}
55973 +
55974 +const char *
55975 +gr_sockfamily_to_name(unsigned char family)
55976 +{
55977 + return gr_sockfamilies[family];
55978 +}
55979 +
55980 +int
55981 +gr_search_socket(const int domain, const int type, const int protocol)
55982 +{
55983 + struct acl_subject_label *curr;
55984 + const struct cred *cred = current_cred();
55985 +
55986 + if (unlikely(!gr_acl_is_enabled()))
55987 + goto exit;
55988 +
55989 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
55990 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55991 + goto exit; // let the kernel handle it
55992 +
55993 + curr = current->acl;
55994 +
55995 + if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55996 + /* the family is allowed, if this is PF_INET allow it only if
55997 + the extra sock type/protocol checks pass */
55998 + if (domain == PF_INET)
55999 + goto inet_check;
56000 + goto exit;
56001 + } else {
56002 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56003 + __u32 fakeip = 0;
56004 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56005 + current->role->roletype, cred->uid,
56006 + cred->gid, current->exec_file ?
56007 + gr_to_filename(current->exec_file->f_path.dentry,
56008 + current->exec_file->f_path.mnt) :
56009 + curr->filename, curr->filename,
56010 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
56011 + &current->signal->saved_ip);
56012 + goto exit;
56013 + }
56014 + goto exit_fail;
56015 + }
56016 +
56017 +inet_check:
56018 + /* the rest of this checking is for IPv4 only */
56019 + if (!curr->ips)
56020 + goto exit;
56021 +
56022 + if ((curr->ip_type & (1 << type)) &&
56023 + (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
56024 + goto exit;
56025 +
56026 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56027 + /* we don't place acls on raw sockets , and sometimes
56028 + dgram/ip sockets are opened for ioctl and not
56029 + bind/connect, so we'll fake a bind learn log */
56030 + if (type == SOCK_RAW || type == SOCK_PACKET) {
56031 + __u32 fakeip = 0;
56032 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56033 + current->role->roletype, cred->uid,
56034 + cred->gid, current->exec_file ?
56035 + gr_to_filename(current->exec_file->f_path.dentry,
56036 + current->exec_file->f_path.mnt) :
56037 + curr->filename, curr->filename,
56038 + &fakeip, 0, type,
56039 + protocol, GR_CONNECT, &current->signal->saved_ip);
56040 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
56041 + __u32 fakeip = 0;
56042 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56043 + current->role->roletype, cred->uid,
56044 + cred->gid, current->exec_file ?
56045 + gr_to_filename(current->exec_file->f_path.dentry,
56046 + current->exec_file->f_path.mnt) :
56047 + curr->filename, curr->filename,
56048 + &fakeip, 0, type,
56049 + protocol, GR_BIND, &current->signal->saved_ip);
56050 + }
56051 + /* we'll log when they use connect or bind */
56052 + goto exit;
56053 + }
56054 +
56055 +exit_fail:
56056 + if (domain == PF_INET)
56057 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
56058 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
56059 + else
56060 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
56061 + gr_socktype_to_name(type), protocol);
56062 +
56063 + return 0;
56064 +exit:
56065 + return 1;
56066 +}
56067 +
56068 +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)
56069 +{
56070 + if ((ip->mode & mode) &&
56071 + (ip_port >= ip->low) &&
56072 + (ip_port <= ip->high) &&
56073 + ((ntohl(ip_addr) & our_netmask) ==
56074 + (ntohl(our_addr) & our_netmask))
56075 + && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
56076 + && (ip->type & (1 << type))) {
56077 + if (ip->mode & GR_INVERT)
56078 + return 2; // specifically denied
56079 + else
56080 + return 1; // allowed
56081 + }
56082 +
56083 + return 0; // not specifically allowed, may continue parsing
56084 +}
56085 +
56086 +static int
56087 +gr_search_connectbind(const int full_mode, struct sock *sk,
56088 + struct sockaddr_in *addr, const int type)
56089 +{
56090 + char iface[IFNAMSIZ] = {0};
56091 + struct acl_subject_label *curr;
56092 + struct acl_ip_label *ip;
56093 + struct inet_sock *isk;
56094 + struct net_device *dev;
56095 + struct in_device *idev;
56096 + unsigned long i;
56097 + int ret;
56098 + int mode = full_mode & (GR_BIND | GR_CONNECT);
56099 + __u32 ip_addr = 0;
56100 + __u32 our_addr;
56101 + __u32 our_netmask;
56102 + char *p;
56103 + __u16 ip_port = 0;
56104 + const struct cred *cred = current_cred();
56105 +
56106 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
56107 + return 0;
56108 +
56109 + curr = current->acl;
56110 + isk = inet_sk(sk);
56111 +
56112 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
56113 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
56114 + addr->sin_addr.s_addr = curr->inaddr_any_override;
56115 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
56116 + struct sockaddr_in saddr;
56117 + int err;
56118 +
56119 + saddr.sin_family = AF_INET;
56120 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
56121 + saddr.sin_port = isk->inet_sport;
56122 +
56123 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
56124 + if (err)
56125 + return err;
56126 +
56127 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
56128 + if (err)
56129 + return err;
56130 + }
56131 +
56132 + if (!curr->ips)
56133 + return 0;
56134 +
56135 + ip_addr = addr->sin_addr.s_addr;
56136 + ip_port = ntohs(addr->sin_port);
56137 +
56138 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56139 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56140 + current->role->roletype, cred->uid,
56141 + cred->gid, current->exec_file ?
56142 + gr_to_filename(current->exec_file->f_path.dentry,
56143 + current->exec_file->f_path.mnt) :
56144 + curr->filename, curr->filename,
56145 + &ip_addr, ip_port, type,
56146 + sk->sk_protocol, mode, &current->signal->saved_ip);
56147 + return 0;
56148 + }
56149 +
56150 + for (i = 0; i < curr->ip_num; i++) {
56151 + ip = *(curr->ips + i);
56152 + if (ip->iface != NULL) {
56153 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
56154 + p = strchr(iface, ':');
56155 + if (p != NULL)
56156 + *p = '\0';
56157 + dev = dev_get_by_name(sock_net(sk), iface);
56158 + if (dev == NULL)
56159 + continue;
56160 + idev = in_dev_get(dev);
56161 + if (idev == NULL) {
56162 + dev_put(dev);
56163 + continue;
56164 + }
56165 + rcu_read_lock();
56166 + for_ifa(idev) {
56167 + if (!strcmp(ip->iface, ifa->ifa_label)) {
56168 + our_addr = ifa->ifa_address;
56169 + our_netmask = 0xffffffff;
56170 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56171 + if (ret == 1) {
56172 + rcu_read_unlock();
56173 + in_dev_put(idev);
56174 + dev_put(dev);
56175 + return 0;
56176 + } else if (ret == 2) {
56177 + rcu_read_unlock();
56178 + in_dev_put(idev);
56179 + dev_put(dev);
56180 + goto denied;
56181 + }
56182 + }
56183 + } endfor_ifa(idev);
56184 + rcu_read_unlock();
56185 + in_dev_put(idev);
56186 + dev_put(dev);
56187 + } else {
56188 + our_addr = ip->addr;
56189 + our_netmask = ip->netmask;
56190 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56191 + if (ret == 1)
56192 + return 0;
56193 + else if (ret == 2)
56194 + goto denied;
56195 + }
56196 + }
56197 +
56198 +denied:
56199 + if (mode == GR_BIND)
56200 + 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));
56201 + else if (mode == GR_CONNECT)
56202 + 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));
56203 +
56204 + return -EACCES;
56205 +}
56206 +
56207 +int
56208 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
56209 +{
56210 + /* always allow disconnection of dgram sockets with connect */
56211 + if (addr->sin_family == AF_UNSPEC)
56212 + return 0;
56213 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
56214 +}
56215 +
56216 +int
56217 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
56218 +{
56219 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
56220 +}
56221 +
56222 +int gr_search_listen(struct socket *sock)
56223 +{
56224 + struct sock *sk = sock->sk;
56225 + struct sockaddr_in addr;
56226 +
56227 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56228 + addr.sin_port = inet_sk(sk)->inet_sport;
56229 +
56230 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56231 +}
56232 +
56233 +int gr_search_accept(struct socket *sock)
56234 +{
56235 + struct sock *sk = sock->sk;
56236 + struct sockaddr_in addr;
56237 +
56238 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56239 + addr.sin_port = inet_sk(sk)->inet_sport;
56240 +
56241 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56242 +}
56243 +
56244 +int
56245 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
56246 +{
56247 + if (addr)
56248 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
56249 + else {
56250 + struct sockaddr_in sin;
56251 + const struct inet_sock *inet = inet_sk(sk);
56252 +
56253 + sin.sin_addr.s_addr = inet->inet_daddr;
56254 + sin.sin_port = inet->inet_dport;
56255 +
56256 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56257 + }
56258 +}
56259 +
56260 +int
56261 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
56262 +{
56263 + struct sockaddr_in sin;
56264 +
56265 + if (unlikely(skb->len < sizeof (struct udphdr)))
56266 + return 0; // skip this packet
56267 +
56268 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
56269 + sin.sin_port = udp_hdr(skb)->source;
56270 +
56271 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56272 +}
56273 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
56274 new file mode 100644
56275 index 0000000..25f54ef
56276 --- /dev/null
56277 +++ b/grsecurity/gracl_learn.c
56278 @@ -0,0 +1,207 @@
56279 +#include <linux/kernel.h>
56280 +#include <linux/mm.h>
56281 +#include <linux/sched.h>
56282 +#include <linux/poll.h>
56283 +#include <linux/string.h>
56284 +#include <linux/file.h>
56285 +#include <linux/types.h>
56286 +#include <linux/vmalloc.h>
56287 +#include <linux/grinternal.h>
56288 +
56289 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
56290 + size_t count, loff_t *ppos);
56291 +extern int gr_acl_is_enabled(void);
56292 +
56293 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
56294 +static int gr_learn_attached;
56295 +
56296 +/* use a 512k buffer */
56297 +#define LEARN_BUFFER_SIZE (512 * 1024)
56298 +
56299 +static DEFINE_SPINLOCK(gr_learn_lock);
56300 +static DEFINE_MUTEX(gr_learn_user_mutex);
56301 +
56302 +/* we need to maintain two buffers, so that the kernel context of grlearn
56303 + uses a semaphore around the userspace copying, and the other kernel contexts
56304 + use a spinlock when copying into the buffer, since they cannot sleep
56305 +*/
56306 +static char *learn_buffer;
56307 +static char *learn_buffer_user;
56308 +static int learn_buffer_len;
56309 +static int learn_buffer_user_len;
56310 +
56311 +static ssize_t
56312 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
56313 +{
56314 + DECLARE_WAITQUEUE(wait, current);
56315 + ssize_t retval = 0;
56316 +
56317 + add_wait_queue(&learn_wait, &wait);
56318 + set_current_state(TASK_INTERRUPTIBLE);
56319 + do {
56320 + mutex_lock(&gr_learn_user_mutex);
56321 + spin_lock(&gr_learn_lock);
56322 + if (learn_buffer_len)
56323 + break;
56324 + spin_unlock(&gr_learn_lock);
56325 + mutex_unlock(&gr_learn_user_mutex);
56326 + if (file->f_flags & O_NONBLOCK) {
56327 + retval = -EAGAIN;
56328 + goto out;
56329 + }
56330 + if (signal_pending(current)) {
56331 + retval = -ERESTARTSYS;
56332 + goto out;
56333 + }
56334 +
56335 + schedule();
56336 + } while (1);
56337 +
56338 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
56339 + learn_buffer_user_len = learn_buffer_len;
56340 + retval = learn_buffer_len;
56341 + learn_buffer_len = 0;
56342 +
56343 + spin_unlock(&gr_learn_lock);
56344 +
56345 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
56346 + retval = -EFAULT;
56347 +
56348 + mutex_unlock(&gr_learn_user_mutex);
56349 +out:
56350 + set_current_state(TASK_RUNNING);
56351 + remove_wait_queue(&learn_wait, &wait);
56352 + return retval;
56353 +}
56354 +
56355 +static unsigned int
56356 +poll_learn(struct file * file, poll_table * wait)
56357 +{
56358 + poll_wait(file, &learn_wait, wait);
56359 +
56360 + if (learn_buffer_len)
56361 + return (POLLIN | POLLRDNORM);
56362 +
56363 + return 0;
56364 +}
56365 +
56366 +void
56367 +gr_clear_learn_entries(void)
56368 +{
56369 + char *tmp;
56370 +
56371 + mutex_lock(&gr_learn_user_mutex);
56372 + spin_lock(&gr_learn_lock);
56373 + tmp = learn_buffer;
56374 + learn_buffer = NULL;
56375 + spin_unlock(&gr_learn_lock);
56376 + if (tmp)
56377 + vfree(tmp);
56378 + if (learn_buffer_user != NULL) {
56379 + vfree(learn_buffer_user);
56380 + learn_buffer_user = NULL;
56381 + }
56382 + learn_buffer_len = 0;
56383 + mutex_unlock(&gr_learn_user_mutex);
56384 +
56385 + return;
56386 +}
56387 +
56388 +void
56389 +gr_add_learn_entry(const char *fmt, ...)
56390 +{
56391 + va_list args;
56392 + unsigned int len;
56393 +
56394 + if (!gr_learn_attached)
56395 + return;
56396 +
56397 + spin_lock(&gr_learn_lock);
56398 +
56399 + /* leave a gap at the end so we know when it's "full" but don't have to
56400 + compute the exact length of the string we're trying to append
56401 + */
56402 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
56403 + spin_unlock(&gr_learn_lock);
56404 + wake_up_interruptible(&learn_wait);
56405 + return;
56406 + }
56407 + if (learn_buffer == NULL) {
56408 + spin_unlock(&gr_learn_lock);
56409 + return;
56410 + }
56411 +
56412 + va_start(args, fmt);
56413 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
56414 + va_end(args);
56415 +
56416 + learn_buffer_len += len + 1;
56417 +
56418 + spin_unlock(&gr_learn_lock);
56419 + wake_up_interruptible(&learn_wait);
56420 +
56421 + return;
56422 +}
56423 +
56424 +static int
56425 +open_learn(struct inode *inode, struct file *file)
56426 +{
56427 + if (file->f_mode & FMODE_READ && gr_learn_attached)
56428 + return -EBUSY;
56429 + if (file->f_mode & FMODE_READ) {
56430 + int retval = 0;
56431 + mutex_lock(&gr_learn_user_mutex);
56432 + if (learn_buffer == NULL)
56433 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
56434 + if (learn_buffer_user == NULL)
56435 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
56436 + if (learn_buffer == NULL) {
56437 + retval = -ENOMEM;
56438 + goto out_error;
56439 + }
56440 + if (learn_buffer_user == NULL) {
56441 + retval = -ENOMEM;
56442 + goto out_error;
56443 + }
56444 + learn_buffer_len = 0;
56445 + learn_buffer_user_len = 0;
56446 + gr_learn_attached = 1;
56447 +out_error:
56448 + mutex_unlock(&gr_learn_user_mutex);
56449 + return retval;
56450 + }
56451 + return 0;
56452 +}
56453 +
56454 +static int
56455 +close_learn(struct inode *inode, struct file *file)
56456 +{
56457 + if (file->f_mode & FMODE_READ) {
56458 + char *tmp = NULL;
56459 + mutex_lock(&gr_learn_user_mutex);
56460 + spin_lock(&gr_learn_lock);
56461 + tmp = learn_buffer;
56462 + learn_buffer = NULL;
56463 + spin_unlock(&gr_learn_lock);
56464 + if (tmp)
56465 + vfree(tmp);
56466 + if (learn_buffer_user != NULL) {
56467 + vfree(learn_buffer_user);
56468 + learn_buffer_user = NULL;
56469 + }
56470 + learn_buffer_len = 0;
56471 + learn_buffer_user_len = 0;
56472 + gr_learn_attached = 0;
56473 + mutex_unlock(&gr_learn_user_mutex);
56474 + }
56475 +
56476 + return 0;
56477 +}
56478 +
56479 +const struct file_operations grsec_fops = {
56480 + .read = read_learn,
56481 + .write = write_grsec_handler,
56482 + .open = open_learn,
56483 + .release = close_learn,
56484 + .poll = poll_learn,
56485 +};
56486 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
56487 new file mode 100644
56488 index 0000000..39645c9
56489 --- /dev/null
56490 +++ b/grsecurity/gracl_res.c
56491 @@ -0,0 +1,68 @@
56492 +#include <linux/kernel.h>
56493 +#include <linux/sched.h>
56494 +#include <linux/gracl.h>
56495 +#include <linux/grinternal.h>
56496 +
56497 +static const char *restab_log[] = {
56498 + [RLIMIT_CPU] = "RLIMIT_CPU",
56499 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
56500 + [RLIMIT_DATA] = "RLIMIT_DATA",
56501 + [RLIMIT_STACK] = "RLIMIT_STACK",
56502 + [RLIMIT_CORE] = "RLIMIT_CORE",
56503 + [RLIMIT_RSS] = "RLIMIT_RSS",
56504 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
56505 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
56506 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
56507 + [RLIMIT_AS] = "RLIMIT_AS",
56508 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
56509 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
56510 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
56511 + [RLIMIT_NICE] = "RLIMIT_NICE",
56512 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
56513 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
56514 + [GR_CRASH_RES] = "RLIMIT_CRASH"
56515 +};
56516 +
56517 +void
56518 +gr_log_resource(const struct task_struct *task,
56519 + const int res, const unsigned long wanted, const int gt)
56520 +{
56521 + const struct cred *cred;
56522 + unsigned long rlim;
56523 +
56524 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
56525 + return;
56526 +
56527 + // not yet supported resource
56528 + if (unlikely(!restab_log[res]))
56529 + return;
56530 +
56531 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
56532 + rlim = task_rlimit_max(task, res);
56533 + else
56534 + rlim = task_rlimit(task, res);
56535 +
56536 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
56537 + return;
56538 +
56539 + rcu_read_lock();
56540 + cred = __task_cred(task);
56541 +
56542 + if (res == RLIMIT_NPROC &&
56543 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
56544 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
56545 + goto out_rcu_unlock;
56546 + else if (res == RLIMIT_MEMLOCK &&
56547 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
56548 + goto out_rcu_unlock;
56549 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
56550 + goto out_rcu_unlock;
56551 + rcu_read_unlock();
56552 +
56553 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
56554 +
56555 + return;
56556 +out_rcu_unlock:
56557 + rcu_read_unlock();
56558 + return;
56559 +}
56560 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
56561 new file mode 100644
56562 index 0000000..25197e9
56563 --- /dev/null
56564 +++ b/grsecurity/gracl_segv.c
56565 @@ -0,0 +1,299 @@
56566 +#include <linux/kernel.h>
56567 +#include <linux/mm.h>
56568 +#include <asm/uaccess.h>
56569 +#include <asm/errno.h>
56570 +#include <asm/mman.h>
56571 +#include <net/sock.h>
56572 +#include <linux/file.h>
56573 +#include <linux/fs.h>
56574 +#include <linux/net.h>
56575 +#include <linux/in.h>
56576 +#include <linux/slab.h>
56577 +#include <linux/types.h>
56578 +#include <linux/sched.h>
56579 +#include <linux/timer.h>
56580 +#include <linux/gracl.h>
56581 +#include <linux/grsecurity.h>
56582 +#include <linux/grinternal.h>
56583 +
56584 +static struct crash_uid *uid_set;
56585 +static unsigned short uid_used;
56586 +static DEFINE_SPINLOCK(gr_uid_lock);
56587 +extern rwlock_t gr_inode_lock;
56588 +extern struct acl_subject_label *
56589 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
56590 + struct acl_role_label *role);
56591 +
56592 +#ifdef CONFIG_BTRFS_FS
56593 +extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56594 +extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56595 +#endif
56596 +
56597 +static inline dev_t __get_dev(const struct dentry *dentry)
56598 +{
56599 +#ifdef CONFIG_BTRFS_FS
56600 + if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56601 + return get_btrfs_dev_from_inode(dentry->d_inode);
56602 + else
56603 +#endif
56604 + return dentry->d_inode->i_sb->s_dev;
56605 +}
56606 +
56607 +int
56608 +gr_init_uidset(void)
56609 +{
56610 + uid_set =
56611 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
56612 + uid_used = 0;
56613 +
56614 + return uid_set ? 1 : 0;
56615 +}
56616 +
56617 +void
56618 +gr_free_uidset(void)
56619 +{
56620 + if (uid_set)
56621 + kfree(uid_set);
56622 +
56623 + return;
56624 +}
56625 +
56626 +int
56627 +gr_find_uid(const uid_t uid)
56628 +{
56629 + struct crash_uid *tmp = uid_set;
56630 + uid_t buid;
56631 + int low = 0, high = uid_used - 1, mid;
56632 +
56633 + while (high >= low) {
56634 + mid = (low + high) >> 1;
56635 + buid = tmp[mid].uid;
56636 + if (buid == uid)
56637 + return mid;
56638 + if (buid > uid)
56639 + high = mid - 1;
56640 + if (buid < uid)
56641 + low = mid + 1;
56642 + }
56643 +
56644 + return -1;
56645 +}
56646 +
56647 +static __inline__ void
56648 +gr_insertsort(void)
56649 +{
56650 + unsigned short i, j;
56651 + struct crash_uid index;
56652 +
56653 + for (i = 1; i < uid_used; i++) {
56654 + index = uid_set[i];
56655 + j = i;
56656 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
56657 + uid_set[j] = uid_set[j - 1];
56658 + j--;
56659 + }
56660 + uid_set[j] = index;
56661 + }
56662 +
56663 + return;
56664 +}
56665 +
56666 +static __inline__ void
56667 +gr_insert_uid(const uid_t uid, const unsigned long expires)
56668 +{
56669 + int loc;
56670 +
56671 + if (uid_used == GR_UIDTABLE_MAX)
56672 + return;
56673 +
56674 + loc = gr_find_uid(uid);
56675 +
56676 + if (loc >= 0) {
56677 + uid_set[loc].expires = expires;
56678 + return;
56679 + }
56680 +
56681 + uid_set[uid_used].uid = uid;
56682 + uid_set[uid_used].expires = expires;
56683 + uid_used++;
56684 +
56685 + gr_insertsort();
56686 +
56687 + return;
56688 +}
56689 +
56690 +void
56691 +gr_remove_uid(const unsigned short loc)
56692 +{
56693 + unsigned short i;
56694 +
56695 + for (i = loc + 1; i < uid_used; i++)
56696 + uid_set[i - 1] = uid_set[i];
56697 +
56698 + uid_used--;
56699 +
56700 + return;
56701 +}
56702 +
56703 +int
56704 +gr_check_crash_uid(const uid_t uid)
56705 +{
56706 + int loc;
56707 + int ret = 0;
56708 +
56709 + if (unlikely(!gr_acl_is_enabled()))
56710 + return 0;
56711 +
56712 + spin_lock(&gr_uid_lock);
56713 + loc = gr_find_uid(uid);
56714 +
56715 + if (loc < 0)
56716 + goto out_unlock;
56717 +
56718 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
56719 + gr_remove_uid(loc);
56720 + else
56721 + ret = 1;
56722 +
56723 +out_unlock:
56724 + spin_unlock(&gr_uid_lock);
56725 + return ret;
56726 +}
56727 +
56728 +static __inline__ int
56729 +proc_is_setxid(const struct cred *cred)
56730 +{
56731 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
56732 + !uid_eq(cred->uid, cred->fsuid))
56733 + return 1;
56734 + if (!uid_eq(cred->gid, cred->egid) || !uid_eq(cred->gid, cred->sgid) ||
56735 + !uid_eq(cred->gid, cred->fsgid))
56736 + return 1;
56737 +
56738 + return 0;
56739 +}
56740 +
56741 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
56742 +
56743 +void
56744 +gr_handle_crash(struct task_struct *task, const int sig)
56745 +{
56746 + struct acl_subject_label *curr;
56747 + struct task_struct *tsk, *tsk2;
56748 + const struct cred *cred;
56749 + const struct cred *cred2;
56750 +
56751 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
56752 + return;
56753 +
56754 + if (unlikely(!gr_acl_is_enabled()))
56755 + return;
56756 +
56757 + curr = task->acl;
56758 +
56759 + if (!(curr->resmask & (1 << GR_CRASH_RES)))
56760 + return;
56761 +
56762 + if (time_before_eq(curr->expires, get_seconds())) {
56763 + curr->expires = 0;
56764 + curr->crashes = 0;
56765 + }
56766 +
56767 + curr->crashes++;
56768 +
56769 + if (!curr->expires)
56770 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56771 +
56772 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56773 + time_after(curr->expires, get_seconds())) {
56774 + rcu_read_lock();
56775 + cred = __task_cred(task);
56776 + if (!uid_eq(cred->uid, GLOBAL_ROOT_UID) && proc_is_setxid(cred)) {
56777 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56778 + spin_lock(&gr_uid_lock);
56779 + gr_insert_uid(cred->uid, curr->expires);
56780 + spin_unlock(&gr_uid_lock);
56781 + curr->expires = 0;
56782 + curr->crashes = 0;
56783 + read_lock(&tasklist_lock);
56784 + do_each_thread(tsk2, tsk) {
56785 + cred2 = __task_cred(tsk);
56786 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
56787 + gr_fake_force_sig(SIGKILL, tsk);
56788 + } while_each_thread(tsk2, tsk);
56789 + read_unlock(&tasklist_lock);
56790 + } else {
56791 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56792 + read_lock(&tasklist_lock);
56793 + read_lock(&grsec_exec_file_lock);
56794 + do_each_thread(tsk2, tsk) {
56795 + if (likely(tsk != task)) {
56796 + // if this thread has the same subject as the one that triggered
56797 + // RES_CRASH and it's the same binary, kill it
56798 + if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
56799 + gr_fake_force_sig(SIGKILL, tsk);
56800 + }
56801 + } while_each_thread(tsk2, tsk);
56802 + read_unlock(&grsec_exec_file_lock);
56803 + read_unlock(&tasklist_lock);
56804 + }
56805 + rcu_read_unlock();
56806 + }
56807 +
56808 + return;
56809 +}
56810 +
56811 +int
56812 +gr_check_crash_exec(const struct file *filp)
56813 +{
56814 + struct acl_subject_label *curr;
56815 +
56816 + if (unlikely(!gr_acl_is_enabled()))
56817 + return 0;
56818 +
56819 + read_lock(&gr_inode_lock);
56820 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56821 + __get_dev(filp->f_path.dentry),
56822 + current->role);
56823 + read_unlock(&gr_inode_lock);
56824 +
56825 + if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56826 + (!curr->crashes && !curr->expires))
56827 + return 0;
56828 +
56829 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56830 + time_after(curr->expires, get_seconds()))
56831 + return 1;
56832 + else if (time_before_eq(curr->expires, get_seconds())) {
56833 + curr->crashes = 0;
56834 + curr->expires = 0;
56835 + }
56836 +
56837 + return 0;
56838 +}
56839 +
56840 +void
56841 +gr_handle_alertkill(struct task_struct *task)
56842 +{
56843 + struct acl_subject_label *curracl;
56844 + __u32 curr_ip;
56845 + struct task_struct *p, *p2;
56846 +
56847 + if (unlikely(!gr_acl_is_enabled()))
56848 + return;
56849 +
56850 + curracl = task->acl;
56851 + curr_ip = task->signal->curr_ip;
56852 +
56853 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56854 + read_lock(&tasklist_lock);
56855 + do_each_thread(p2, p) {
56856 + if (p->signal->curr_ip == curr_ip)
56857 + gr_fake_force_sig(SIGKILL, p);
56858 + } while_each_thread(p2, p);
56859 + read_unlock(&tasklist_lock);
56860 + } else if (curracl->mode & GR_KILLPROC)
56861 + gr_fake_force_sig(SIGKILL, task);
56862 +
56863 + return;
56864 +}
56865 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
56866 new file mode 100644
56867 index 0000000..9d83a69
56868 --- /dev/null
56869 +++ b/grsecurity/gracl_shm.c
56870 @@ -0,0 +1,40 @@
56871 +#include <linux/kernel.h>
56872 +#include <linux/mm.h>
56873 +#include <linux/sched.h>
56874 +#include <linux/file.h>
56875 +#include <linux/ipc.h>
56876 +#include <linux/gracl.h>
56877 +#include <linux/grsecurity.h>
56878 +#include <linux/grinternal.h>
56879 +
56880 +int
56881 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56882 + const time_t shm_createtime, const uid_t cuid, const int shmid)
56883 +{
56884 + struct task_struct *task;
56885 +
56886 + if (!gr_acl_is_enabled())
56887 + return 1;
56888 +
56889 + rcu_read_lock();
56890 + read_lock(&tasklist_lock);
56891 +
56892 + task = find_task_by_vpid(shm_cprid);
56893 +
56894 + if (unlikely(!task))
56895 + task = find_task_by_vpid(shm_lapid);
56896 +
56897 + if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56898 + (task->pid == shm_lapid)) &&
56899 + (task->acl->mode & GR_PROTSHM) &&
56900 + (task->acl != current->acl))) {
56901 + read_unlock(&tasklist_lock);
56902 + rcu_read_unlock();
56903 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56904 + return 0;
56905 + }
56906 + read_unlock(&tasklist_lock);
56907 + rcu_read_unlock();
56908 +
56909 + return 1;
56910 +}
56911 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
56912 new file mode 100644
56913 index 0000000..bc0be01
56914 --- /dev/null
56915 +++ b/grsecurity/grsec_chdir.c
56916 @@ -0,0 +1,19 @@
56917 +#include <linux/kernel.h>
56918 +#include <linux/sched.h>
56919 +#include <linux/fs.h>
56920 +#include <linux/file.h>
56921 +#include <linux/grsecurity.h>
56922 +#include <linux/grinternal.h>
56923 +
56924 +void
56925 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56926 +{
56927 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56928 + if ((grsec_enable_chdir && grsec_enable_group &&
56929 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56930 + !grsec_enable_group)) {
56931 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56932 + }
56933 +#endif
56934 + return;
56935 +}
56936 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
56937 new file mode 100644
56938 index 0000000..9807ee2
56939 --- /dev/null
56940 +++ b/grsecurity/grsec_chroot.c
56941 @@ -0,0 +1,368 @@
56942 +#include <linux/kernel.h>
56943 +#include <linux/module.h>
56944 +#include <linux/sched.h>
56945 +#include <linux/file.h>
56946 +#include <linux/fs.h>
56947 +#include <linux/mount.h>
56948 +#include <linux/types.h>
56949 +#include "../fs/mount.h"
56950 +#include <linux/grsecurity.h>
56951 +#include <linux/grinternal.h>
56952 +
56953 +void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56954 +{
56955 +#ifdef CONFIG_GRKERNSEC
56956 + if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56957 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root)
56958 + task->gr_is_chrooted = 1;
56959 + else
56960 + task->gr_is_chrooted = 0;
56961 +
56962 + task->gr_chroot_dentry = path->dentry;
56963 +#endif
56964 + return;
56965 +}
56966 +
56967 +void gr_clear_chroot_entries(struct task_struct *task)
56968 +{
56969 +#ifdef CONFIG_GRKERNSEC
56970 + task->gr_is_chrooted = 0;
56971 + task->gr_chroot_dentry = NULL;
56972 +#endif
56973 + return;
56974 +}
56975 +
56976 +int
56977 +gr_handle_chroot_unix(const pid_t pid)
56978 +{
56979 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56980 + struct task_struct *p;
56981 +
56982 + if (unlikely(!grsec_enable_chroot_unix))
56983 + return 1;
56984 +
56985 + if (likely(!proc_is_chrooted(current)))
56986 + return 1;
56987 +
56988 + rcu_read_lock();
56989 + read_lock(&tasklist_lock);
56990 + p = find_task_by_vpid_unrestricted(pid);
56991 + if (unlikely(p && !have_same_root(current, p))) {
56992 + read_unlock(&tasklist_lock);
56993 + rcu_read_unlock();
56994 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56995 + return 0;
56996 + }
56997 + read_unlock(&tasklist_lock);
56998 + rcu_read_unlock();
56999 +#endif
57000 + return 1;
57001 +}
57002 +
57003 +int
57004 +gr_handle_chroot_nice(void)
57005 +{
57006 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57007 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
57008 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
57009 + return -EPERM;
57010 + }
57011 +#endif
57012 + return 0;
57013 +}
57014 +
57015 +int
57016 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
57017 +{
57018 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57019 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
57020 + && proc_is_chrooted(current)) {
57021 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
57022 + return -EACCES;
57023 + }
57024 +#endif
57025 + return 0;
57026 +}
57027 +
57028 +int
57029 +gr_handle_chroot_rawio(const struct inode *inode)
57030 +{
57031 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57032 + if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
57033 + inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
57034 + return 1;
57035 +#endif
57036 + return 0;
57037 +}
57038 +
57039 +int
57040 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
57041 +{
57042 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57043 + struct task_struct *p;
57044 + int ret = 0;
57045 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
57046 + return ret;
57047 +
57048 + read_lock(&tasklist_lock);
57049 + do_each_pid_task(pid, type, p) {
57050 + if (!have_same_root(current, p)) {
57051 + ret = 1;
57052 + goto out;
57053 + }
57054 + } while_each_pid_task(pid, type, p);
57055 +out:
57056 + read_unlock(&tasklist_lock);
57057 + return ret;
57058 +#endif
57059 + return 0;
57060 +}
57061 +
57062 +int
57063 +gr_pid_is_chrooted(struct task_struct *p)
57064 +{
57065 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57066 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
57067 + return 0;
57068 +
57069 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
57070 + !have_same_root(current, p)) {
57071 + return 1;
57072 + }
57073 +#endif
57074 + return 0;
57075 +}
57076 +
57077 +EXPORT_SYMBOL(gr_pid_is_chrooted);
57078 +
57079 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
57080 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
57081 +{
57082 + struct path path, currentroot;
57083 + int ret = 0;
57084 +
57085 + path.dentry = (struct dentry *)u_dentry;
57086 + path.mnt = (struct vfsmount *)u_mnt;
57087 + get_fs_root(current->fs, &currentroot);
57088 + if (path_is_under(&path, &currentroot))
57089 + ret = 1;
57090 + path_put(&currentroot);
57091 +
57092 + return ret;
57093 +}
57094 +#endif
57095 +
57096 +int
57097 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
57098 +{
57099 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
57100 + if (!grsec_enable_chroot_fchdir)
57101 + return 1;
57102 +
57103 + if (!proc_is_chrooted(current))
57104 + return 1;
57105 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
57106 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
57107 + return 0;
57108 + }
57109 +#endif
57110 + return 1;
57111 +}
57112 +
57113 +int
57114 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57115 + const time_t shm_createtime)
57116 +{
57117 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
57118 + struct task_struct *p;
57119 + time_t starttime;
57120 +
57121 + if (unlikely(!grsec_enable_chroot_shmat))
57122 + return 1;
57123 +
57124 + if (likely(!proc_is_chrooted(current)))
57125 + return 1;
57126 +
57127 + rcu_read_lock();
57128 + read_lock(&tasklist_lock);
57129 +
57130 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
57131 + starttime = p->start_time.tv_sec;
57132 + if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
57133 + if (have_same_root(current, p)) {
57134 + goto allow;
57135 + } else {
57136 + read_unlock(&tasklist_lock);
57137 + rcu_read_unlock();
57138 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
57139 + return 0;
57140 + }
57141 + }
57142 + /* creator exited, pid reuse, fall through to next check */
57143 + }
57144 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
57145 + if (unlikely(!have_same_root(current, p))) {
57146 + read_unlock(&tasklist_lock);
57147 + rcu_read_unlock();
57148 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
57149 + return 0;
57150 + }
57151 + }
57152 +
57153 +allow:
57154 + read_unlock(&tasklist_lock);
57155 + rcu_read_unlock();
57156 +#endif
57157 + return 1;
57158 +}
57159 +
57160 +void
57161 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
57162 +{
57163 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57164 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
57165 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
57166 +#endif
57167 + return;
57168 +}
57169 +
57170 +int
57171 +gr_handle_chroot_mknod(const struct dentry *dentry,
57172 + const struct vfsmount *mnt, const int mode)
57173 +{
57174 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57175 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
57176 + proc_is_chrooted(current)) {
57177 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
57178 + return -EPERM;
57179 + }
57180 +#endif
57181 + return 0;
57182 +}
57183 +
57184 +int
57185 +gr_handle_chroot_mount(const struct dentry *dentry,
57186 + const struct vfsmount *mnt, const char *dev_name)
57187 +{
57188 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57189 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
57190 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
57191 + return -EPERM;
57192 + }
57193 +#endif
57194 + return 0;
57195 +}
57196 +
57197 +int
57198 +gr_handle_chroot_pivot(void)
57199 +{
57200 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57201 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
57202 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
57203 + return -EPERM;
57204 + }
57205 +#endif
57206 + return 0;
57207 +}
57208 +
57209 +int
57210 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
57211 +{
57212 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57213 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
57214 + !gr_is_outside_chroot(dentry, mnt)) {
57215 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
57216 + return -EPERM;
57217 + }
57218 +#endif
57219 + return 0;
57220 +}
57221 +
57222 +extern const char *captab_log[];
57223 +extern int captab_log_entries;
57224 +
57225 +int
57226 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
57227 +{
57228 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57229 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
57230 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57231 + if (cap_raised(chroot_caps, cap)) {
57232 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
57233 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
57234 + }
57235 + return 0;
57236 + }
57237 + }
57238 +#endif
57239 + return 1;
57240 +}
57241 +
57242 +int
57243 +gr_chroot_is_capable(const int cap)
57244 +{
57245 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57246 + return gr_task_chroot_is_capable(current, current_cred(), cap);
57247 +#endif
57248 + return 1;
57249 +}
57250 +
57251 +int
57252 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
57253 +{
57254 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57255 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
57256 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57257 + if (cap_raised(chroot_caps, cap)) {
57258 + return 0;
57259 + }
57260 + }
57261 +#endif
57262 + return 1;
57263 +}
57264 +
57265 +int
57266 +gr_chroot_is_capable_nolog(const int cap)
57267 +{
57268 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57269 + return gr_task_chroot_is_capable_nolog(current, cap);
57270 +#endif
57271 + return 1;
57272 +}
57273 +
57274 +int
57275 +gr_handle_chroot_sysctl(const int op)
57276 +{
57277 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57278 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
57279 + proc_is_chrooted(current))
57280 + return -EACCES;
57281 +#endif
57282 + return 0;
57283 +}
57284 +
57285 +void
57286 +gr_handle_chroot_chdir(struct path *path)
57287 +{
57288 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57289 + if (grsec_enable_chroot_chdir)
57290 + set_fs_pwd(current->fs, path);
57291 +#endif
57292 + return;
57293 +}
57294 +
57295 +int
57296 +gr_handle_chroot_chmod(const struct dentry *dentry,
57297 + const struct vfsmount *mnt, const int mode)
57298 +{
57299 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57300 + /* allow chmod +s on directories, but not files */
57301 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
57302 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
57303 + proc_is_chrooted(current)) {
57304 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
57305 + return -EPERM;
57306 + }
57307 +#endif
57308 + return 0;
57309 +}
57310 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
57311 new file mode 100644
57312 index 0000000..213ad8b
57313 --- /dev/null
57314 +++ b/grsecurity/grsec_disabled.c
57315 @@ -0,0 +1,437 @@
57316 +#include <linux/kernel.h>
57317 +#include <linux/module.h>
57318 +#include <linux/sched.h>
57319 +#include <linux/file.h>
57320 +#include <linux/fs.h>
57321 +#include <linux/kdev_t.h>
57322 +#include <linux/net.h>
57323 +#include <linux/in.h>
57324 +#include <linux/ip.h>
57325 +#include <linux/skbuff.h>
57326 +#include <linux/sysctl.h>
57327 +
57328 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
57329 +void
57330 +pax_set_initial_flags(struct linux_binprm *bprm)
57331 +{
57332 + return;
57333 +}
57334 +#endif
57335 +
57336 +#ifdef CONFIG_SYSCTL
57337 +__u32
57338 +gr_handle_sysctl(const struct ctl_table * table, const int op)
57339 +{
57340 + return 0;
57341 +}
57342 +#endif
57343 +
57344 +#ifdef CONFIG_TASKSTATS
57345 +int gr_is_taskstats_denied(int pid)
57346 +{
57347 + return 0;
57348 +}
57349 +#endif
57350 +
57351 +int
57352 +gr_acl_is_enabled(void)
57353 +{
57354 + return 0;
57355 +}
57356 +
57357 +void
57358 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
57359 +{
57360 + return;
57361 +}
57362 +
57363 +int
57364 +gr_handle_rawio(const struct inode *inode)
57365 +{
57366 + return 0;
57367 +}
57368 +
57369 +void
57370 +gr_acl_handle_psacct(struct task_struct *task, const long code)
57371 +{
57372 + return;
57373 +}
57374 +
57375 +int
57376 +gr_handle_ptrace(struct task_struct *task, const long request)
57377 +{
57378 + return 0;
57379 +}
57380 +
57381 +int
57382 +gr_handle_proc_ptrace(struct task_struct *task)
57383 +{
57384 + return 0;
57385 +}
57386 +
57387 +void
57388 +gr_learn_resource(const struct task_struct *task,
57389 + const int res, const unsigned long wanted, const int gt)
57390 +{
57391 + return;
57392 +}
57393 +
57394 +int
57395 +gr_set_acls(const int type)
57396 +{
57397 + return 0;
57398 +}
57399 +
57400 +int
57401 +gr_check_hidden_task(const struct task_struct *tsk)
57402 +{
57403 + return 0;
57404 +}
57405 +
57406 +int
57407 +gr_check_protected_task(const struct task_struct *task)
57408 +{
57409 + return 0;
57410 +}
57411 +
57412 +int
57413 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
57414 +{
57415 + return 0;
57416 +}
57417 +
57418 +void
57419 +gr_copy_label(struct task_struct *tsk)
57420 +{
57421 + return;
57422 +}
57423 +
57424 +void
57425 +gr_set_pax_flags(struct task_struct *task)
57426 +{
57427 + return;
57428 +}
57429 +
57430 +int
57431 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
57432 + const int unsafe_share)
57433 +{
57434 + return 0;
57435 +}
57436 +
57437 +void
57438 +gr_handle_delete(const ino_t ino, const dev_t dev)
57439 +{
57440 + return;
57441 +}
57442 +
57443 +void
57444 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
57445 +{
57446 + return;
57447 +}
57448 +
57449 +void
57450 +gr_handle_crash(struct task_struct *task, const int sig)
57451 +{
57452 + return;
57453 +}
57454 +
57455 +int
57456 +gr_check_crash_exec(const struct file *filp)
57457 +{
57458 + return 0;
57459 +}
57460 +
57461 +int
57462 +gr_check_crash_uid(const uid_t uid)
57463 +{
57464 + return 0;
57465 +}
57466 +
57467 +void
57468 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
57469 + struct dentry *old_dentry,
57470 + struct dentry *new_dentry,
57471 + struct vfsmount *mnt, const __u8 replace)
57472 +{
57473 + return;
57474 +}
57475 +
57476 +int
57477 +gr_search_socket(const int family, const int type, const int protocol)
57478 +{
57479 + return 1;
57480 +}
57481 +
57482 +int
57483 +gr_search_connectbind(const int mode, const struct socket *sock,
57484 + const struct sockaddr_in *addr)
57485 +{
57486 + return 0;
57487 +}
57488 +
57489 +void
57490 +gr_handle_alertkill(struct task_struct *task)
57491 +{
57492 + return;
57493 +}
57494 +
57495 +__u32
57496 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
57497 +{
57498 + return 1;
57499 +}
57500 +
57501 +__u32
57502 +gr_acl_handle_hidden_file(const struct dentry * dentry,
57503 + const struct vfsmount * mnt)
57504 +{
57505 + return 1;
57506 +}
57507 +
57508 +__u32
57509 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
57510 + int acc_mode)
57511 +{
57512 + return 1;
57513 +}
57514 +
57515 +__u32
57516 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
57517 +{
57518 + return 1;
57519 +}
57520 +
57521 +__u32
57522 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
57523 +{
57524 + return 1;
57525 +}
57526 +
57527 +int
57528 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
57529 + unsigned int *vm_flags)
57530 +{
57531 + return 1;
57532 +}
57533 +
57534 +__u32
57535 +gr_acl_handle_truncate(const struct dentry * dentry,
57536 + const struct vfsmount * mnt)
57537 +{
57538 + return 1;
57539 +}
57540 +
57541 +__u32
57542 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
57543 +{
57544 + return 1;
57545 +}
57546 +
57547 +__u32
57548 +gr_acl_handle_access(const struct dentry * dentry,
57549 + const struct vfsmount * mnt, const int fmode)
57550 +{
57551 + return 1;
57552 +}
57553 +
57554 +__u32
57555 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
57556 + umode_t *mode)
57557 +{
57558 + return 1;
57559 +}
57560 +
57561 +__u32
57562 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
57563 +{
57564 + return 1;
57565 +}
57566 +
57567 +__u32
57568 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
57569 +{
57570 + return 1;
57571 +}
57572 +
57573 +void
57574 +grsecurity_init(void)
57575 +{
57576 + return;
57577 +}
57578 +
57579 +umode_t gr_acl_umask(void)
57580 +{
57581 + return 0;
57582 +}
57583 +
57584 +__u32
57585 +gr_acl_handle_mknod(const struct dentry * new_dentry,
57586 + const struct dentry * parent_dentry,
57587 + const struct vfsmount * parent_mnt,
57588 + const int mode)
57589 +{
57590 + return 1;
57591 +}
57592 +
57593 +__u32
57594 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
57595 + const struct dentry * parent_dentry,
57596 + const struct vfsmount * parent_mnt)
57597 +{
57598 + return 1;
57599 +}
57600 +
57601 +__u32
57602 +gr_acl_handle_symlink(const struct dentry * new_dentry,
57603 + const struct dentry * parent_dentry,
57604 + const struct vfsmount * parent_mnt, const char *from)
57605 +{
57606 + return 1;
57607 +}
57608 +
57609 +__u32
57610 +gr_acl_handle_link(const struct dentry * new_dentry,
57611 + const struct dentry * parent_dentry,
57612 + const struct vfsmount * parent_mnt,
57613 + const struct dentry * old_dentry,
57614 + const struct vfsmount * old_mnt, const char *to)
57615 +{
57616 + return 1;
57617 +}
57618 +
57619 +int
57620 +gr_acl_handle_rename(const struct dentry *new_dentry,
57621 + const struct dentry *parent_dentry,
57622 + const struct vfsmount *parent_mnt,
57623 + const struct dentry *old_dentry,
57624 + const struct inode *old_parent_inode,
57625 + const struct vfsmount *old_mnt, const char *newname)
57626 +{
57627 + return 0;
57628 +}
57629 +
57630 +int
57631 +gr_acl_handle_filldir(const struct file *file, const char *name,
57632 + const int namelen, const ino_t ino)
57633 +{
57634 + return 1;
57635 +}
57636 +
57637 +int
57638 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57639 + const time_t shm_createtime, const uid_t cuid, const int shmid)
57640 +{
57641 + return 1;
57642 +}
57643 +
57644 +int
57645 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
57646 +{
57647 + return 0;
57648 +}
57649 +
57650 +int
57651 +gr_search_accept(const struct socket *sock)
57652 +{
57653 + return 0;
57654 +}
57655 +
57656 +int
57657 +gr_search_listen(const struct socket *sock)
57658 +{
57659 + return 0;
57660 +}
57661 +
57662 +int
57663 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
57664 +{
57665 + return 0;
57666 +}
57667 +
57668 +__u32
57669 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
57670 +{
57671 + return 1;
57672 +}
57673 +
57674 +__u32
57675 +gr_acl_handle_creat(const struct dentry * dentry,
57676 + const struct dentry * p_dentry,
57677 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
57678 + const int imode)
57679 +{
57680 + return 1;
57681 +}
57682 +
57683 +void
57684 +gr_acl_handle_exit(void)
57685 +{
57686 + return;
57687 +}
57688 +
57689 +int
57690 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
57691 +{
57692 + return 1;
57693 +}
57694 +
57695 +void
57696 +gr_set_role_label(const uid_t uid, const gid_t gid)
57697 +{
57698 + return;
57699 +}
57700 +
57701 +int
57702 +gr_acl_handle_procpidmem(const struct task_struct *task)
57703 +{
57704 + return 0;
57705 +}
57706 +
57707 +int
57708 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
57709 +{
57710 + return 0;
57711 +}
57712 +
57713 +int
57714 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
57715 +{
57716 + return 0;
57717 +}
57718 +
57719 +void
57720 +gr_set_kernel_label(struct task_struct *task)
57721 +{
57722 + return;
57723 +}
57724 +
57725 +int
57726 +gr_check_user_change(int real, int effective, int fs)
57727 +{
57728 + return 0;
57729 +}
57730 +
57731 +int
57732 +gr_check_group_change(int real, int effective, int fs)
57733 +{
57734 + return 0;
57735 +}
57736 +
57737 +int gr_acl_enable_at_secure(void)
57738 +{
57739 + return 0;
57740 +}
57741 +
57742 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
57743 +{
57744 + return dentry->d_inode->i_sb->s_dev;
57745 +}
57746 +
57747 +EXPORT_SYMBOL(gr_learn_resource);
57748 +EXPORT_SYMBOL(gr_set_kernel_label);
57749 +#ifdef CONFIG_SECURITY
57750 +EXPORT_SYMBOL(gr_check_user_change);
57751 +EXPORT_SYMBOL(gr_check_group_change);
57752 +#endif
57753 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
57754 new file mode 100644
57755 index 0000000..abfa971
57756 --- /dev/null
57757 +++ b/grsecurity/grsec_exec.c
57758 @@ -0,0 +1,174 @@
57759 +#include <linux/kernel.h>
57760 +#include <linux/sched.h>
57761 +#include <linux/file.h>
57762 +#include <linux/binfmts.h>
57763 +#include <linux/fs.h>
57764 +#include <linux/types.h>
57765 +#include <linux/grdefs.h>
57766 +#include <linux/grsecurity.h>
57767 +#include <linux/grinternal.h>
57768 +#include <linux/capability.h>
57769 +#include <linux/module.h>
57770 +
57771 +#include <asm/uaccess.h>
57772 +
57773 +#ifdef CONFIG_GRKERNSEC_EXECLOG
57774 +static char gr_exec_arg_buf[132];
57775 +static DEFINE_MUTEX(gr_exec_arg_mutex);
57776 +#endif
57777 +
57778 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
57779 +
57780 +void
57781 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
57782 +{
57783 +#ifdef CONFIG_GRKERNSEC_EXECLOG
57784 + char *grarg = gr_exec_arg_buf;
57785 + unsigned int i, x, execlen = 0;
57786 + char c;
57787 +
57788 + if (!((grsec_enable_execlog && grsec_enable_group &&
57789 + in_group_p(grsec_audit_gid))
57790 + || (grsec_enable_execlog && !grsec_enable_group)))
57791 + return;
57792 +
57793 + mutex_lock(&gr_exec_arg_mutex);
57794 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
57795 +
57796 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
57797 + const char __user *p;
57798 + unsigned int len;
57799 +
57800 + p = get_user_arg_ptr(argv, i);
57801 + if (IS_ERR(p))
57802 + goto log;
57803 +
57804 + len = strnlen_user(p, 128 - execlen);
57805 + if (len > 128 - execlen)
57806 + len = 128 - execlen;
57807 + else if (len > 0)
57808 + len--;
57809 + if (copy_from_user(grarg + execlen, p, len))
57810 + goto log;
57811 +
57812 + /* rewrite unprintable characters */
57813 + for (x = 0; x < len; x++) {
57814 + c = *(grarg + execlen + x);
57815 + if (c < 32 || c > 126)
57816 + *(grarg + execlen + x) = ' ';
57817 + }
57818 +
57819 + execlen += len;
57820 + *(grarg + execlen) = ' ';
57821 + *(grarg + execlen + 1) = '\0';
57822 + execlen++;
57823 + }
57824 +
57825 + log:
57826 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57827 + bprm->file->f_path.mnt, grarg);
57828 + mutex_unlock(&gr_exec_arg_mutex);
57829 +#endif
57830 + return;
57831 +}
57832 +
57833 +#ifdef CONFIG_GRKERNSEC
57834 +extern int gr_acl_is_capable(const int cap);
57835 +extern int gr_acl_is_capable_nolog(const int cap);
57836 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
57837 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
57838 +extern int gr_chroot_is_capable(const int cap);
57839 +extern int gr_chroot_is_capable_nolog(const int cap);
57840 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
57841 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
57842 +#endif
57843 +
57844 +const char *captab_log[] = {
57845 + "CAP_CHOWN",
57846 + "CAP_DAC_OVERRIDE",
57847 + "CAP_DAC_READ_SEARCH",
57848 + "CAP_FOWNER",
57849 + "CAP_FSETID",
57850 + "CAP_KILL",
57851 + "CAP_SETGID",
57852 + "CAP_SETUID",
57853 + "CAP_SETPCAP",
57854 + "CAP_LINUX_IMMUTABLE",
57855 + "CAP_NET_BIND_SERVICE",
57856 + "CAP_NET_BROADCAST",
57857 + "CAP_NET_ADMIN",
57858 + "CAP_NET_RAW",
57859 + "CAP_IPC_LOCK",
57860 + "CAP_IPC_OWNER",
57861 + "CAP_SYS_MODULE",
57862 + "CAP_SYS_RAWIO",
57863 + "CAP_SYS_CHROOT",
57864 + "CAP_SYS_PTRACE",
57865 + "CAP_SYS_PACCT",
57866 + "CAP_SYS_ADMIN",
57867 + "CAP_SYS_BOOT",
57868 + "CAP_SYS_NICE",
57869 + "CAP_SYS_RESOURCE",
57870 + "CAP_SYS_TIME",
57871 + "CAP_SYS_TTY_CONFIG",
57872 + "CAP_MKNOD",
57873 + "CAP_LEASE",
57874 + "CAP_AUDIT_WRITE",
57875 + "CAP_AUDIT_CONTROL",
57876 + "CAP_SETFCAP",
57877 + "CAP_MAC_OVERRIDE",
57878 + "CAP_MAC_ADMIN",
57879 + "CAP_SYSLOG",
57880 + "CAP_WAKE_ALARM"
57881 +};
57882 +
57883 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57884 +
57885 +int gr_is_capable(const int cap)
57886 +{
57887 +#ifdef CONFIG_GRKERNSEC
57888 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57889 + return 1;
57890 + return 0;
57891 +#else
57892 + return 1;
57893 +#endif
57894 +}
57895 +
57896 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
57897 +{
57898 +#ifdef CONFIG_GRKERNSEC
57899 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
57900 + return 1;
57901 + return 0;
57902 +#else
57903 + return 1;
57904 +#endif
57905 +}
57906 +
57907 +int gr_is_capable_nolog(const int cap)
57908 +{
57909 +#ifdef CONFIG_GRKERNSEC
57910 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57911 + return 1;
57912 + return 0;
57913 +#else
57914 + return 1;
57915 +#endif
57916 +}
57917 +
57918 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
57919 +{
57920 +#ifdef CONFIG_GRKERNSEC
57921 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
57922 + return 1;
57923 + return 0;
57924 +#else
57925 + return 1;
57926 +#endif
57927 +}
57928 +
57929 +EXPORT_SYMBOL(gr_is_capable);
57930 +EXPORT_SYMBOL(gr_is_capable_nolog);
57931 +EXPORT_SYMBOL(gr_task_is_capable);
57932 +EXPORT_SYMBOL(gr_task_is_capable_nolog);
57933 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
57934 new file mode 100644
57935 index 0000000..d3ee748
57936 --- /dev/null
57937 +++ b/grsecurity/grsec_fifo.c
57938 @@ -0,0 +1,24 @@
57939 +#include <linux/kernel.h>
57940 +#include <linux/sched.h>
57941 +#include <linux/fs.h>
57942 +#include <linux/file.h>
57943 +#include <linux/grinternal.h>
57944 +
57945 +int
57946 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57947 + const struct dentry *dir, const int flag, const int acc_mode)
57948 +{
57949 +#ifdef CONFIG_GRKERNSEC_FIFO
57950 + const struct cred *cred = current_cred();
57951 +
57952 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57953 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57954 + (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57955 + (cred->fsuid != dentry->d_inode->i_uid)) {
57956 + if (!inode_permission(dentry->d_inode, acc_mode))
57957 + gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57958 + return -EACCES;
57959 + }
57960 +#endif
57961 + return 0;
57962 +}
57963 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
57964 new file mode 100644
57965 index 0000000..8ca18bf
57966 --- /dev/null
57967 +++ b/grsecurity/grsec_fork.c
57968 @@ -0,0 +1,23 @@
57969 +#include <linux/kernel.h>
57970 +#include <linux/sched.h>
57971 +#include <linux/grsecurity.h>
57972 +#include <linux/grinternal.h>
57973 +#include <linux/errno.h>
57974 +
57975 +void
57976 +gr_log_forkfail(const int retval)
57977 +{
57978 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
57979 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57980 + switch (retval) {
57981 + case -EAGAIN:
57982 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57983 + break;
57984 + case -ENOMEM:
57985 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57986 + break;
57987 + }
57988 + }
57989 +#endif
57990 + return;
57991 +}
57992 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
57993 new file mode 100644
57994 index 0000000..05a6015
57995 --- /dev/null
57996 +++ b/grsecurity/grsec_init.c
57997 @@ -0,0 +1,283 @@
57998 +#include <linux/kernel.h>
57999 +#include <linux/sched.h>
58000 +#include <linux/mm.h>
58001 +#include <linux/gracl.h>
58002 +#include <linux/slab.h>
58003 +#include <linux/vmalloc.h>
58004 +#include <linux/percpu.h>
58005 +#include <linux/module.h>
58006 +
58007 +int grsec_enable_ptrace_readexec;
58008 +int grsec_enable_setxid;
58009 +int grsec_enable_symlinkown;
58010 +int grsec_symlinkown_gid;
58011 +int grsec_enable_brute;
58012 +int grsec_enable_link;
58013 +int grsec_enable_dmesg;
58014 +int grsec_enable_harden_ptrace;
58015 +int grsec_enable_fifo;
58016 +int grsec_enable_execlog;
58017 +int grsec_enable_signal;
58018 +int grsec_enable_forkfail;
58019 +int grsec_enable_audit_ptrace;
58020 +int grsec_enable_time;
58021 +int grsec_enable_audit_textrel;
58022 +int grsec_enable_group;
58023 +int grsec_audit_gid;
58024 +int grsec_enable_chdir;
58025 +int grsec_enable_mount;
58026 +int grsec_enable_rofs;
58027 +int grsec_enable_chroot_findtask;
58028 +int grsec_enable_chroot_mount;
58029 +int grsec_enable_chroot_shmat;
58030 +int grsec_enable_chroot_fchdir;
58031 +int grsec_enable_chroot_double;
58032 +int grsec_enable_chroot_pivot;
58033 +int grsec_enable_chroot_chdir;
58034 +int grsec_enable_chroot_chmod;
58035 +int grsec_enable_chroot_mknod;
58036 +int grsec_enable_chroot_nice;
58037 +int grsec_enable_chroot_execlog;
58038 +int grsec_enable_chroot_caps;
58039 +int grsec_enable_chroot_sysctl;
58040 +int grsec_enable_chroot_unix;
58041 +int grsec_enable_tpe;
58042 +int grsec_tpe_gid;
58043 +int grsec_enable_blackhole;
58044 +#ifdef CONFIG_IPV6_MODULE
58045 +EXPORT_SYMBOL(grsec_enable_blackhole);
58046 +#endif
58047 +int grsec_lastack_retries;
58048 +int grsec_enable_tpe_all;
58049 +int grsec_enable_tpe_invert;
58050 +int grsec_enable_socket_all;
58051 +int grsec_socket_all_gid;
58052 +int grsec_enable_socket_client;
58053 +int grsec_socket_client_gid;
58054 +int grsec_enable_socket_server;
58055 +int grsec_socket_server_gid;
58056 +int grsec_resource_logging;
58057 +int grsec_disable_privio;
58058 +int grsec_enable_log_rwxmaps;
58059 +int grsec_lock;
58060 +
58061 +DEFINE_SPINLOCK(grsec_alert_lock);
58062 +unsigned long grsec_alert_wtime = 0;
58063 +unsigned long grsec_alert_fyet = 0;
58064 +
58065 +DEFINE_SPINLOCK(grsec_audit_lock);
58066 +
58067 +DEFINE_RWLOCK(grsec_exec_file_lock);
58068 +
58069 +char *gr_shared_page[4];
58070 +
58071 +char *gr_alert_log_fmt;
58072 +char *gr_audit_log_fmt;
58073 +char *gr_alert_log_buf;
58074 +char *gr_audit_log_buf;
58075 +
58076 +extern struct gr_arg *gr_usermode;
58077 +extern unsigned char *gr_system_salt;
58078 +extern unsigned char *gr_system_sum;
58079 +
58080 +void __init
58081 +grsecurity_init(void)
58082 +{
58083 + int j;
58084 + /* create the per-cpu shared pages */
58085 +
58086 +#ifdef CONFIG_X86
58087 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
58088 +#endif
58089 +
58090 + for (j = 0; j < 4; j++) {
58091 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
58092 + if (gr_shared_page[j] == NULL) {
58093 + panic("Unable to allocate grsecurity shared page");
58094 + return;
58095 + }
58096 + }
58097 +
58098 + /* allocate log buffers */
58099 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
58100 + if (!gr_alert_log_fmt) {
58101 + panic("Unable to allocate grsecurity alert log format buffer");
58102 + return;
58103 + }
58104 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
58105 + if (!gr_audit_log_fmt) {
58106 + panic("Unable to allocate grsecurity audit log format buffer");
58107 + return;
58108 + }
58109 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
58110 + if (!gr_alert_log_buf) {
58111 + panic("Unable to allocate grsecurity alert log buffer");
58112 + return;
58113 + }
58114 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
58115 + if (!gr_audit_log_buf) {
58116 + panic("Unable to allocate grsecurity audit log buffer");
58117 + return;
58118 + }
58119 +
58120 + /* allocate memory for authentication structure */
58121 + gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
58122 + gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
58123 + gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
58124 +
58125 + if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
58126 + panic("Unable to allocate grsecurity authentication structure");
58127 + return;
58128 + }
58129 +
58130 +
58131 +#ifdef CONFIG_GRKERNSEC_IO
58132 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
58133 + grsec_disable_privio = 1;
58134 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
58135 + grsec_disable_privio = 1;
58136 +#else
58137 + grsec_disable_privio = 0;
58138 +#endif
58139 +#endif
58140 +
58141 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
58142 + /* for backward compatibility, tpe_invert always defaults to on if
58143 + enabled in the kernel
58144 + */
58145 + grsec_enable_tpe_invert = 1;
58146 +#endif
58147 +
58148 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
58149 +#ifndef CONFIG_GRKERNSEC_SYSCTL
58150 + grsec_lock = 1;
58151 +#endif
58152 +
58153 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58154 + grsec_enable_audit_textrel = 1;
58155 +#endif
58156 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58157 + grsec_enable_log_rwxmaps = 1;
58158 +#endif
58159 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
58160 + grsec_enable_group = 1;
58161 + grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
58162 +#endif
58163 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58164 + grsec_enable_ptrace_readexec = 1;
58165 +#endif
58166 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
58167 + grsec_enable_chdir = 1;
58168 +#endif
58169 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
58170 + grsec_enable_harden_ptrace = 1;
58171 +#endif
58172 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58173 + grsec_enable_mount = 1;
58174 +#endif
58175 +#ifdef CONFIG_GRKERNSEC_LINK
58176 + grsec_enable_link = 1;
58177 +#endif
58178 +#ifdef CONFIG_GRKERNSEC_BRUTE
58179 + grsec_enable_brute = 1;
58180 +#endif
58181 +#ifdef CONFIG_GRKERNSEC_DMESG
58182 + grsec_enable_dmesg = 1;
58183 +#endif
58184 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
58185 + grsec_enable_blackhole = 1;
58186 + grsec_lastack_retries = 4;
58187 +#endif
58188 +#ifdef CONFIG_GRKERNSEC_FIFO
58189 + grsec_enable_fifo = 1;
58190 +#endif
58191 +#ifdef CONFIG_GRKERNSEC_EXECLOG
58192 + grsec_enable_execlog = 1;
58193 +#endif
58194 +#ifdef CONFIG_GRKERNSEC_SETXID
58195 + grsec_enable_setxid = 1;
58196 +#endif
58197 +#ifdef CONFIG_GRKERNSEC_SIGNAL
58198 + grsec_enable_signal = 1;
58199 +#endif
58200 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
58201 + grsec_enable_forkfail = 1;
58202 +#endif
58203 +#ifdef CONFIG_GRKERNSEC_TIME
58204 + grsec_enable_time = 1;
58205 +#endif
58206 +#ifdef CONFIG_GRKERNSEC_RESLOG
58207 + grsec_resource_logging = 1;
58208 +#endif
58209 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
58210 + grsec_enable_chroot_findtask = 1;
58211 +#endif
58212 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
58213 + grsec_enable_chroot_unix = 1;
58214 +#endif
58215 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
58216 + grsec_enable_chroot_mount = 1;
58217 +#endif
58218 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
58219 + grsec_enable_chroot_fchdir = 1;
58220 +#endif
58221 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
58222 + grsec_enable_chroot_shmat = 1;
58223 +#endif
58224 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58225 + grsec_enable_audit_ptrace = 1;
58226 +#endif
58227 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
58228 + grsec_enable_chroot_double = 1;
58229 +#endif
58230 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
58231 + grsec_enable_chroot_pivot = 1;
58232 +#endif
58233 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
58234 + grsec_enable_chroot_chdir = 1;
58235 +#endif
58236 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
58237 + grsec_enable_chroot_chmod = 1;
58238 +#endif
58239 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
58240 + grsec_enable_chroot_mknod = 1;
58241 +#endif
58242 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
58243 + grsec_enable_chroot_nice = 1;
58244 +#endif
58245 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
58246 + grsec_enable_chroot_execlog = 1;
58247 +#endif
58248 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58249 + grsec_enable_chroot_caps = 1;
58250 +#endif
58251 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
58252 + grsec_enable_chroot_sysctl = 1;
58253 +#endif
58254 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
58255 + grsec_enable_symlinkown = 1;
58256 + grsec_symlinkown_gid = CONFIG_GRKERNSEC_SYMLINKOWN_GID;
58257 +#endif
58258 +#ifdef CONFIG_GRKERNSEC_TPE
58259 + grsec_enable_tpe = 1;
58260 + grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
58261 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
58262 + grsec_enable_tpe_all = 1;
58263 +#endif
58264 +#endif
58265 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58266 + grsec_enable_socket_all = 1;
58267 + grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
58268 +#endif
58269 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58270 + grsec_enable_socket_client = 1;
58271 + grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
58272 +#endif
58273 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58274 + grsec_enable_socket_server = 1;
58275 + grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
58276 +#endif
58277 +#endif
58278 +
58279 + return;
58280 +}
58281 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
58282 new file mode 100644
58283 index 0000000..589481f
58284 --- /dev/null
58285 +++ b/grsecurity/grsec_link.c
58286 @@ -0,0 +1,58 @@
58287 +#include <linux/kernel.h>
58288 +#include <linux/sched.h>
58289 +#include <linux/fs.h>
58290 +#include <linux/file.h>
58291 +#include <linux/grinternal.h>
58292 +
58293 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
58294 +{
58295 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
58296 + const struct inode *link_inode = link->dentry->d_inode;
58297 +
58298 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
58299 + /* ignore root-owned links, e.g. /proc/self */
58300 + !uid_eq(link_inode->i_uid, GLOBAL_ROOT_UID) && target &&
58301 + !uid_eq(link_inode->i_uid, target->i_uid)) {
58302 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
58303 + return 1;
58304 + }
58305 +#endif
58306 + return 0;
58307 +}
58308 +
58309 +int
58310 +gr_handle_follow_link(const struct inode *parent,
58311 + const struct inode *inode,
58312 + const struct dentry *dentry, const struct vfsmount *mnt)
58313 +{
58314 +#ifdef CONFIG_GRKERNSEC_LINK
58315 + const struct cred *cred = current_cred();
58316 +
58317 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
58318 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
58319 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
58320 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
58321 + return -EACCES;
58322 + }
58323 +#endif
58324 + return 0;
58325 +}
58326 +
58327 +int
58328 +gr_handle_hardlink(const struct dentry *dentry,
58329 + const struct vfsmount *mnt,
58330 + struct inode *inode, const int mode, const char *to)
58331 +{
58332 +#ifdef CONFIG_GRKERNSEC_LINK
58333 + const struct cred *cred = current_cred();
58334 +
58335 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
58336 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
58337 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
58338 + !capable(CAP_FOWNER) && !uid_eq(cred->uid, GLOBAL_ROOT_UID)) {
58339 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
58340 + return -EPERM;
58341 + }
58342 +#endif
58343 + return 0;
58344 +}
58345 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
58346 new file mode 100644
58347 index 0000000..a45d2e9
58348 --- /dev/null
58349 +++ b/grsecurity/grsec_log.c
58350 @@ -0,0 +1,322 @@
58351 +#include <linux/kernel.h>
58352 +#include <linux/sched.h>
58353 +#include <linux/file.h>
58354 +#include <linux/tty.h>
58355 +#include <linux/fs.h>
58356 +#include <linux/grinternal.h>
58357 +
58358 +#ifdef CONFIG_TREE_PREEMPT_RCU
58359 +#define DISABLE_PREEMPT() preempt_disable()
58360 +#define ENABLE_PREEMPT() preempt_enable()
58361 +#else
58362 +#define DISABLE_PREEMPT()
58363 +#define ENABLE_PREEMPT()
58364 +#endif
58365 +
58366 +#define BEGIN_LOCKS(x) \
58367 + DISABLE_PREEMPT(); \
58368 + rcu_read_lock(); \
58369 + read_lock(&tasklist_lock); \
58370 + read_lock(&grsec_exec_file_lock); \
58371 + if (x != GR_DO_AUDIT) \
58372 + spin_lock(&grsec_alert_lock); \
58373 + else \
58374 + spin_lock(&grsec_audit_lock)
58375 +
58376 +#define END_LOCKS(x) \
58377 + if (x != GR_DO_AUDIT) \
58378 + spin_unlock(&grsec_alert_lock); \
58379 + else \
58380 + spin_unlock(&grsec_audit_lock); \
58381 + read_unlock(&grsec_exec_file_lock); \
58382 + read_unlock(&tasklist_lock); \
58383 + rcu_read_unlock(); \
58384 + ENABLE_PREEMPT(); \
58385 + if (x == GR_DONT_AUDIT) \
58386 + gr_handle_alertkill(current)
58387 +
58388 +enum {
58389 + FLOODING,
58390 + NO_FLOODING
58391 +};
58392 +
58393 +extern char *gr_alert_log_fmt;
58394 +extern char *gr_audit_log_fmt;
58395 +extern char *gr_alert_log_buf;
58396 +extern char *gr_audit_log_buf;
58397 +
58398 +static int gr_log_start(int audit)
58399 +{
58400 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
58401 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
58402 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58403 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
58404 + unsigned long curr_secs = get_seconds();
58405 +
58406 + if (audit == GR_DO_AUDIT)
58407 + goto set_fmt;
58408 +
58409 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
58410 + grsec_alert_wtime = curr_secs;
58411 + grsec_alert_fyet = 0;
58412 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
58413 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
58414 + grsec_alert_fyet++;
58415 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
58416 + grsec_alert_wtime = curr_secs;
58417 + grsec_alert_fyet++;
58418 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
58419 + return FLOODING;
58420 + }
58421 + else return FLOODING;
58422 +
58423 +set_fmt:
58424 +#endif
58425 + memset(buf, 0, PAGE_SIZE);
58426 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
58427 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
58428 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58429 + } else if (current->signal->curr_ip) {
58430 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
58431 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
58432 + } else if (gr_acl_is_enabled()) {
58433 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
58434 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58435 + } else {
58436 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
58437 + strcpy(buf, fmt);
58438 + }
58439 +
58440 + return NO_FLOODING;
58441 +}
58442 +
58443 +static void gr_log_middle(int audit, const char *msg, va_list ap)
58444 + __attribute__ ((format (printf, 2, 0)));
58445 +
58446 +static void gr_log_middle(int audit, const char *msg, va_list ap)
58447 +{
58448 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58449 + unsigned int len = strlen(buf);
58450 +
58451 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58452 +
58453 + return;
58454 +}
58455 +
58456 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
58457 + __attribute__ ((format (printf, 2, 3)));
58458 +
58459 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
58460 +{
58461 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58462 + unsigned int len = strlen(buf);
58463 + va_list ap;
58464 +
58465 + va_start(ap, msg);
58466 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58467 + va_end(ap);
58468 +
58469 + return;
58470 +}
58471 +
58472 +static void gr_log_end(int audit, int append_default)
58473 +{
58474 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58475 +
58476 + if (append_default) {
58477 + unsigned int len = strlen(buf);
58478 + snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
58479 + }
58480 +
58481 + printk("%s\n", buf);
58482 +
58483 + return;
58484 +}
58485 +
58486 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
58487 +{
58488 + int logtype;
58489 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
58490 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
58491 + void *voidptr = NULL;
58492 + int num1 = 0, num2 = 0;
58493 + unsigned long ulong1 = 0, ulong2 = 0;
58494 + struct dentry *dentry = NULL;
58495 + struct vfsmount *mnt = NULL;
58496 + struct file *file = NULL;
58497 + struct task_struct *task = NULL;
58498 + const struct cred *cred, *pcred;
58499 + va_list ap;
58500 +
58501 + BEGIN_LOCKS(audit);
58502 + logtype = gr_log_start(audit);
58503 + if (logtype == FLOODING) {
58504 + END_LOCKS(audit);
58505 + return;
58506 + }
58507 + va_start(ap, argtypes);
58508 + switch (argtypes) {
58509 + case GR_TTYSNIFF:
58510 + task = va_arg(ap, struct task_struct *);
58511 + gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid);
58512 + break;
58513 + case GR_SYSCTL_HIDDEN:
58514 + str1 = va_arg(ap, char *);
58515 + gr_log_middle_varargs(audit, msg, result, str1);
58516 + break;
58517 + case GR_RBAC:
58518 + dentry = va_arg(ap, struct dentry *);
58519 + mnt = va_arg(ap, struct vfsmount *);
58520 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
58521 + break;
58522 + case GR_RBAC_STR:
58523 + dentry = va_arg(ap, struct dentry *);
58524 + mnt = va_arg(ap, struct vfsmount *);
58525 + str1 = va_arg(ap, char *);
58526 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
58527 + break;
58528 + case GR_STR_RBAC:
58529 + str1 = va_arg(ap, char *);
58530 + dentry = va_arg(ap, struct dentry *);
58531 + mnt = va_arg(ap, struct vfsmount *);
58532 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
58533 + break;
58534 + case GR_RBAC_MODE2:
58535 + dentry = va_arg(ap, struct dentry *);
58536 + mnt = va_arg(ap, struct vfsmount *);
58537 + str1 = va_arg(ap, char *);
58538 + str2 = va_arg(ap, char *);
58539 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
58540 + break;
58541 + case GR_RBAC_MODE3:
58542 + dentry = va_arg(ap, struct dentry *);
58543 + mnt = va_arg(ap, struct vfsmount *);
58544 + str1 = va_arg(ap, char *);
58545 + str2 = va_arg(ap, char *);
58546 + str3 = va_arg(ap, char *);
58547 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
58548 + break;
58549 + case GR_FILENAME:
58550 + dentry = va_arg(ap, struct dentry *);
58551 + mnt = va_arg(ap, struct vfsmount *);
58552 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
58553 + break;
58554 + case GR_STR_FILENAME:
58555 + str1 = va_arg(ap, char *);
58556 + dentry = va_arg(ap, struct dentry *);
58557 + mnt = va_arg(ap, struct vfsmount *);
58558 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
58559 + break;
58560 + case GR_FILENAME_STR:
58561 + dentry = va_arg(ap, struct dentry *);
58562 + mnt = va_arg(ap, struct vfsmount *);
58563 + str1 = va_arg(ap, char *);
58564 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
58565 + break;
58566 + case GR_FILENAME_TWO_INT:
58567 + dentry = va_arg(ap, struct dentry *);
58568 + mnt = va_arg(ap, struct vfsmount *);
58569 + num1 = va_arg(ap, int);
58570 + num2 = va_arg(ap, int);
58571 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
58572 + break;
58573 + case GR_FILENAME_TWO_INT_STR:
58574 + dentry = va_arg(ap, struct dentry *);
58575 + mnt = va_arg(ap, struct vfsmount *);
58576 + num1 = va_arg(ap, int);
58577 + num2 = va_arg(ap, int);
58578 + str1 = va_arg(ap, char *);
58579 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
58580 + break;
58581 + case GR_TEXTREL:
58582 + file = va_arg(ap, struct file *);
58583 + ulong1 = va_arg(ap, unsigned long);
58584 + ulong2 = va_arg(ap, unsigned long);
58585 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
58586 + break;
58587 + case GR_PTRACE:
58588 + task = va_arg(ap, struct task_struct *);
58589 + 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);
58590 + break;
58591 + case GR_RESOURCE:
58592 + task = va_arg(ap, struct task_struct *);
58593 + cred = __task_cred(task);
58594 + pcred = __task_cred(task->real_parent);
58595 + ulong1 = va_arg(ap, unsigned long);
58596 + str1 = va_arg(ap, char *);
58597 + ulong2 = va_arg(ap, unsigned long);
58598 + gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
58599 + break;
58600 + case GR_CAP:
58601 + task = va_arg(ap, struct task_struct *);
58602 + cred = __task_cred(task);
58603 + pcred = __task_cred(task->real_parent);
58604 + str1 = va_arg(ap, char *);
58605 + gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
58606 + break;
58607 + case GR_SIG:
58608 + str1 = va_arg(ap, char *);
58609 + voidptr = va_arg(ap, void *);
58610 + gr_log_middle_varargs(audit, msg, str1, voidptr);
58611 + break;
58612 + case GR_SIG2:
58613 + task = va_arg(ap, struct task_struct *);
58614 + cred = __task_cred(task);
58615 + pcred = __task_cred(task->real_parent);
58616 + num1 = va_arg(ap, int);
58617 + gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
58618 + break;
58619 + case GR_CRASH1:
58620 + task = va_arg(ap, struct task_struct *);
58621 + cred = __task_cred(task);
58622 + pcred = __task_cred(task->real_parent);
58623 + ulong1 = va_arg(ap, unsigned long);
58624 + gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
58625 + break;
58626 + case GR_CRASH2:
58627 + task = va_arg(ap, struct task_struct *);
58628 + cred = __task_cred(task);
58629 + pcred = __task_cred(task->real_parent);
58630 + ulong1 = va_arg(ap, unsigned long);
58631 + gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
58632 + break;
58633 + case GR_RWXMAP:
58634 + file = va_arg(ap, struct file *);
58635 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
58636 + break;
58637 + case GR_PSACCT:
58638 + {
58639 + unsigned int wday, cday;
58640 + __u8 whr, chr;
58641 + __u8 wmin, cmin;
58642 + __u8 wsec, csec;
58643 + char cur_tty[64] = { 0 };
58644 + char parent_tty[64] = { 0 };
58645 +
58646 + task = va_arg(ap, struct task_struct *);
58647 + wday = va_arg(ap, unsigned int);
58648 + cday = va_arg(ap, unsigned int);
58649 + whr = va_arg(ap, int);
58650 + chr = va_arg(ap, int);
58651 + wmin = va_arg(ap, int);
58652 + cmin = va_arg(ap, int);
58653 + wsec = va_arg(ap, int);
58654 + csec = va_arg(ap, int);
58655 + ulong1 = va_arg(ap, unsigned long);
58656 + cred = __task_cred(task);
58657 + pcred = __task_cred(task->real_parent);
58658 +
58659 + gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->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->real_parent->pid, &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
58660 + }
58661 + break;
58662 + default:
58663 + gr_log_middle(audit, msg, ap);
58664 + }
58665 + va_end(ap);
58666 + // these don't need DEFAULTSECARGS printed on the end
58667 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
58668 + gr_log_end(audit, 0);
58669 + else
58670 + gr_log_end(audit, 1);
58671 + END_LOCKS(audit);
58672 +}
58673 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
58674 new file mode 100644
58675 index 0000000..f536303
58676 --- /dev/null
58677 +++ b/grsecurity/grsec_mem.c
58678 @@ -0,0 +1,40 @@
58679 +#include <linux/kernel.h>
58680 +#include <linux/sched.h>
58681 +#include <linux/mm.h>
58682 +#include <linux/mman.h>
58683 +#include <linux/grinternal.h>
58684 +
58685 +void
58686 +gr_handle_ioperm(void)
58687 +{
58688 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
58689 + return;
58690 +}
58691 +
58692 +void
58693 +gr_handle_iopl(void)
58694 +{
58695 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
58696 + return;
58697 +}
58698 +
58699 +void
58700 +gr_handle_mem_readwrite(u64 from, u64 to)
58701 +{
58702 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
58703 + return;
58704 +}
58705 +
58706 +void
58707 +gr_handle_vm86(void)
58708 +{
58709 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
58710 + return;
58711 +}
58712 +
58713 +void
58714 +gr_log_badprocpid(const char *entry)
58715 +{
58716 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
58717 + return;
58718 +}
58719 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
58720 new file mode 100644
58721 index 0000000..2131422
58722 --- /dev/null
58723 +++ b/grsecurity/grsec_mount.c
58724 @@ -0,0 +1,62 @@
58725 +#include <linux/kernel.h>
58726 +#include <linux/sched.h>
58727 +#include <linux/mount.h>
58728 +#include <linux/grsecurity.h>
58729 +#include <linux/grinternal.h>
58730 +
58731 +void
58732 +gr_log_remount(const char *devname, const int retval)
58733 +{
58734 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58735 + if (grsec_enable_mount && (retval >= 0))
58736 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
58737 +#endif
58738 + return;
58739 +}
58740 +
58741 +void
58742 +gr_log_unmount(const char *devname, const int retval)
58743 +{
58744 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58745 + if (grsec_enable_mount && (retval >= 0))
58746 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
58747 +#endif
58748 + return;
58749 +}
58750 +
58751 +void
58752 +gr_log_mount(const char *from, const char *to, const int retval)
58753 +{
58754 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58755 + if (grsec_enable_mount && (retval >= 0))
58756 + gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
58757 +#endif
58758 + return;
58759 +}
58760 +
58761 +int
58762 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
58763 +{
58764 +#ifdef CONFIG_GRKERNSEC_ROFS
58765 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
58766 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
58767 + return -EPERM;
58768 + } else
58769 + return 0;
58770 +#endif
58771 + return 0;
58772 +}
58773 +
58774 +int
58775 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
58776 +{
58777 +#ifdef CONFIG_GRKERNSEC_ROFS
58778 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
58779 + dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58780 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58781 + return -EPERM;
58782 + } else
58783 + return 0;
58784 +#endif
58785 + return 0;
58786 +}
58787 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
58788 new file mode 100644
58789 index 0000000..a3b12a0
58790 --- /dev/null
58791 +++ b/grsecurity/grsec_pax.c
58792 @@ -0,0 +1,36 @@
58793 +#include <linux/kernel.h>
58794 +#include <linux/sched.h>
58795 +#include <linux/mm.h>
58796 +#include <linux/file.h>
58797 +#include <linux/grinternal.h>
58798 +#include <linux/grsecurity.h>
58799 +
58800 +void
58801 +gr_log_textrel(struct vm_area_struct * vma)
58802 +{
58803 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58804 + if (grsec_enable_audit_textrel)
58805 + gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58806 +#endif
58807 + return;
58808 +}
58809 +
58810 +void
58811 +gr_log_rwxmmap(struct file *file)
58812 +{
58813 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58814 + if (grsec_enable_log_rwxmaps)
58815 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58816 +#endif
58817 + return;
58818 +}
58819 +
58820 +void
58821 +gr_log_rwxmprotect(struct file *file)
58822 +{
58823 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58824 + if (grsec_enable_log_rwxmaps)
58825 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58826 +#endif
58827 + return;
58828 +}
58829 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
58830 new file mode 100644
58831 index 0000000..f7f29aa
58832 --- /dev/null
58833 +++ b/grsecurity/grsec_ptrace.c
58834 @@ -0,0 +1,30 @@
58835 +#include <linux/kernel.h>
58836 +#include <linux/sched.h>
58837 +#include <linux/grinternal.h>
58838 +#include <linux/security.h>
58839 +
58840 +void
58841 +gr_audit_ptrace(struct task_struct *task)
58842 +{
58843 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58844 + if (grsec_enable_audit_ptrace)
58845 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58846 +#endif
58847 + return;
58848 +}
58849 +
58850 +int
58851 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
58852 +{
58853 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58854 + const struct dentry *dentry = file->f_path.dentry;
58855 + const struct vfsmount *mnt = file->f_path.mnt;
58856 +
58857 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
58858 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
58859 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
58860 + return -EACCES;
58861 + }
58862 +#endif
58863 + return 0;
58864 +}
58865 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
58866 new file mode 100644
58867 index 0000000..b4ac94c
58868 --- /dev/null
58869 +++ b/grsecurity/grsec_sig.c
58870 @@ -0,0 +1,209 @@
58871 +#include <linux/kernel.h>
58872 +#include <linux/sched.h>
58873 +#include <linux/delay.h>
58874 +#include <linux/grsecurity.h>
58875 +#include <linux/grinternal.h>
58876 +#include <linux/hardirq.h>
58877 +
58878 +char *signames[] = {
58879 + [SIGSEGV] = "Segmentation fault",
58880 + [SIGILL] = "Illegal instruction",
58881 + [SIGABRT] = "Abort",
58882 + [SIGBUS] = "Invalid alignment/Bus error"
58883 +};
58884 +
58885 +void
58886 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58887 +{
58888 +#ifdef CONFIG_GRKERNSEC_SIGNAL
58889 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58890 + (sig == SIGABRT) || (sig == SIGBUS))) {
58891 + if (t->pid == current->pid) {
58892 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58893 + } else {
58894 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58895 + }
58896 + }
58897 +#endif
58898 + return;
58899 +}
58900 +
58901 +int
58902 +gr_handle_signal(const struct task_struct *p, const int sig)
58903 +{
58904 +#ifdef CONFIG_GRKERNSEC
58905 + /* ignore the 0 signal for protected task checks */
58906 + if (current->pid > 1 && sig && gr_check_protected_task(p)) {
58907 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58908 + return -EPERM;
58909 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58910 + return -EPERM;
58911 + }
58912 +#endif
58913 + return 0;
58914 +}
58915 +
58916 +#ifdef CONFIG_GRKERNSEC
58917 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58918 +
58919 +int gr_fake_force_sig(int sig, struct task_struct *t)
58920 +{
58921 + unsigned long int flags;
58922 + int ret, blocked, ignored;
58923 + struct k_sigaction *action;
58924 +
58925 + spin_lock_irqsave(&t->sighand->siglock, flags);
58926 + action = &t->sighand->action[sig-1];
58927 + ignored = action->sa.sa_handler == SIG_IGN;
58928 + blocked = sigismember(&t->blocked, sig);
58929 + if (blocked || ignored) {
58930 + action->sa.sa_handler = SIG_DFL;
58931 + if (blocked) {
58932 + sigdelset(&t->blocked, sig);
58933 + recalc_sigpending_and_wake(t);
58934 + }
58935 + }
58936 + if (action->sa.sa_handler == SIG_DFL)
58937 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
58938 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58939 +
58940 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
58941 +
58942 + return ret;
58943 +}
58944 +#endif
58945 +
58946 +#ifdef CONFIG_GRKERNSEC_BRUTE
58947 +#define GR_USER_BAN_TIME (15 * 60)
58948 +
58949 +static int __get_dumpable(unsigned long mm_flags)
58950 +{
58951 + int ret;
58952 +
58953 + ret = mm_flags & MMF_DUMPABLE_MASK;
58954 + return (ret >= 2) ? 2 : ret;
58955 +}
58956 +#endif
58957 +
58958 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58959 +{
58960 +#ifdef CONFIG_GRKERNSEC_BRUTE
58961 + kuid_t uid = GLOBAL_ROOT_UID;
58962 +
58963 + if (!grsec_enable_brute)
58964 + return;
58965 +
58966 + rcu_read_lock();
58967 + read_lock(&tasklist_lock);
58968 + read_lock(&grsec_exec_file_lock);
58969 + if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58970 + p->real_parent->brute = 1;
58971 + else {
58972 + const struct cred *cred = __task_cred(p), *cred2;
58973 + struct task_struct *tsk, *tsk2;
58974 +
58975 + if (!__get_dumpable(mm_flags) && !uid_eq(cred->uid, GLOBAL_ROOT_UID)) {
58976 + struct user_struct *user;
58977 +
58978 + uid = cred->uid;
58979 +
58980 + /* this is put upon execution past expiration */
58981 + user = find_user(uid);
58982 + if (user == NULL)
58983 + goto unlock;
58984 + user->banned = 1;
58985 + user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58986 + if (user->ban_expires == ~0UL)
58987 + user->ban_expires--;
58988 +
58989 + do_each_thread(tsk2, tsk) {
58990 + cred2 = __task_cred(tsk);
58991 + if (tsk != p && uid_eq(cred2->uid, uid))
58992 + gr_fake_force_sig(SIGKILL, tsk);
58993 + } while_each_thread(tsk2, tsk);
58994 + }
58995 + }
58996 +unlock:
58997 + read_unlock(&grsec_exec_file_lock);
58998 + read_unlock(&tasklist_lock);
58999 + rcu_read_unlock();
59000 +
59001 + if (!uid_eq(uid, GLOBAL_ROOT_UID))
59002 + printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n",
59003 + from_kuid_munged(&init_user_ns, uid), GR_USER_BAN_TIME / 60);
59004 +
59005 +#endif
59006 + return;
59007 +}
59008 +
59009 +void gr_handle_brute_check(void)
59010 +{
59011 +#ifdef CONFIG_GRKERNSEC_BRUTE
59012 + if (current->brute)
59013 + msleep(30 * 1000);
59014 +#endif
59015 + return;
59016 +}
59017 +
59018 +void gr_handle_kernel_exploit(void)
59019 +{
59020 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
59021 + const struct cred *cred;
59022 + struct task_struct *tsk, *tsk2;
59023 + struct user_struct *user;
59024 + kuid_t uid;
59025 +
59026 + if (in_irq() || in_serving_softirq() || in_nmi())
59027 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
59028 +
59029 + uid = current_uid();
59030 +
59031 + if (uid_eq(uid, GLOBAL_ROOT_UID))
59032 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
59033 + else {
59034 + /* kill all the processes of this user, hold a reference
59035 + to their creds struct, and prevent them from creating
59036 + another process until system reset
59037 + */
59038 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
59039 + from_kuid_munged(&init_user_ns, uid));
59040 + /* we intentionally leak this ref */
59041 + user = get_uid(current->cred->user);
59042 + if (user) {
59043 + user->banned = 1;
59044 + user->ban_expires = ~0UL;
59045 + }
59046 +
59047 + read_lock(&tasklist_lock);
59048 + do_each_thread(tsk2, tsk) {
59049 + cred = __task_cred(tsk);
59050 + if (uid_eq(cred->uid, uid))
59051 + gr_fake_force_sig(SIGKILL, tsk);
59052 + } while_each_thread(tsk2, tsk);
59053 + read_unlock(&tasklist_lock);
59054 + }
59055 +#endif
59056 +}
59057 +
59058 +int __gr_process_user_ban(struct user_struct *user)
59059 +{
59060 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
59061 + if (unlikely(user->banned)) {
59062 + if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
59063 + user->banned = 0;
59064 + user->ban_expires = 0;
59065 + free_uid(user);
59066 + } else
59067 + return -EPERM;
59068 + }
59069 +#endif
59070 + return 0;
59071 +}
59072 +
59073 +int gr_process_user_ban(void)
59074 +{
59075 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
59076 + return __gr_process_user_ban(current->cred->user);
59077 +#endif
59078 + return 0;
59079 +}
59080 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
59081 new file mode 100644
59082 index 0000000..4030d57
59083 --- /dev/null
59084 +++ b/grsecurity/grsec_sock.c
59085 @@ -0,0 +1,244 @@
59086 +#include <linux/kernel.h>
59087 +#include <linux/module.h>
59088 +#include <linux/sched.h>
59089 +#include <linux/file.h>
59090 +#include <linux/net.h>
59091 +#include <linux/in.h>
59092 +#include <linux/ip.h>
59093 +#include <net/sock.h>
59094 +#include <net/inet_sock.h>
59095 +#include <linux/grsecurity.h>
59096 +#include <linux/grinternal.h>
59097 +#include <linux/gracl.h>
59098 +
59099 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
59100 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
59101 +
59102 +EXPORT_SYMBOL(gr_search_udp_recvmsg);
59103 +EXPORT_SYMBOL(gr_search_udp_sendmsg);
59104 +
59105 +#ifdef CONFIG_UNIX_MODULE
59106 +EXPORT_SYMBOL(gr_acl_handle_unix);
59107 +EXPORT_SYMBOL(gr_acl_handle_mknod);
59108 +EXPORT_SYMBOL(gr_handle_chroot_unix);
59109 +EXPORT_SYMBOL(gr_handle_create);
59110 +#endif
59111 +
59112 +#ifdef CONFIG_GRKERNSEC
59113 +#define gr_conn_table_size 32749
59114 +struct conn_table_entry {
59115 + struct conn_table_entry *next;
59116 + struct signal_struct *sig;
59117 +};
59118 +
59119 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
59120 +DEFINE_SPINLOCK(gr_conn_table_lock);
59121 +
59122 +extern const char * gr_socktype_to_name(unsigned char type);
59123 +extern const char * gr_proto_to_name(unsigned char proto);
59124 +extern const char * gr_sockfamily_to_name(unsigned char family);
59125 +
59126 +static __inline__ int
59127 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
59128 +{
59129 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
59130 +}
59131 +
59132 +static __inline__ int
59133 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
59134 + __u16 sport, __u16 dport)
59135 +{
59136 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
59137 + sig->gr_sport == sport && sig->gr_dport == dport))
59138 + return 1;
59139 + else
59140 + return 0;
59141 +}
59142 +
59143 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
59144 +{
59145 + struct conn_table_entry **match;
59146 + unsigned int index;
59147 +
59148 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
59149 + sig->gr_sport, sig->gr_dport,
59150 + gr_conn_table_size);
59151 +
59152 + newent->sig = sig;
59153 +
59154 + match = &gr_conn_table[index];
59155 + newent->next = *match;
59156 + *match = newent;
59157 +
59158 + return;
59159 +}
59160 +
59161 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
59162 +{
59163 + struct conn_table_entry *match, *last = NULL;
59164 + unsigned int index;
59165 +
59166 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
59167 + sig->gr_sport, sig->gr_dport,
59168 + gr_conn_table_size);
59169 +
59170 + match = gr_conn_table[index];
59171 + while (match && !conn_match(match->sig,
59172 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
59173 + sig->gr_dport)) {
59174 + last = match;
59175 + match = match->next;
59176 + }
59177 +
59178 + if (match) {
59179 + if (last)
59180 + last->next = match->next;
59181 + else
59182 + gr_conn_table[index] = NULL;
59183 + kfree(match);
59184 + }
59185 +
59186 + return;
59187 +}
59188 +
59189 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
59190 + __u16 sport, __u16 dport)
59191 +{
59192 + struct conn_table_entry *match;
59193 + unsigned int index;
59194 +
59195 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
59196 +
59197 + match = gr_conn_table[index];
59198 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
59199 + match = match->next;
59200 +
59201 + if (match)
59202 + return match->sig;
59203 + else
59204 + return NULL;
59205 +}
59206 +
59207 +#endif
59208 +
59209 +void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
59210 +{
59211 +#ifdef CONFIG_GRKERNSEC
59212 + struct signal_struct *sig = task->signal;
59213 + struct conn_table_entry *newent;
59214 +
59215 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
59216 + if (newent == NULL)
59217 + return;
59218 + /* no bh lock needed since we are called with bh disabled */
59219 + spin_lock(&gr_conn_table_lock);
59220 + gr_del_task_from_ip_table_nolock(sig);
59221 + sig->gr_saddr = inet->inet_rcv_saddr;
59222 + sig->gr_daddr = inet->inet_daddr;
59223 + sig->gr_sport = inet->inet_sport;
59224 + sig->gr_dport = inet->inet_dport;
59225 + gr_add_to_task_ip_table_nolock(sig, newent);
59226 + spin_unlock(&gr_conn_table_lock);
59227 +#endif
59228 + return;
59229 +}
59230 +
59231 +void gr_del_task_from_ip_table(struct task_struct *task)
59232 +{
59233 +#ifdef CONFIG_GRKERNSEC
59234 + spin_lock_bh(&gr_conn_table_lock);
59235 + gr_del_task_from_ip_table_nolock(task->signal);
59236 + spin_unlock_bh(&gr_conn_table_lock);
59237 +#endif
59238 + return;
59239 +}
59240 +
59241 +void
59242 +gr_attach_curr_ip(const struct sock *sk)
59243 +{
59244 +#ifdef CONFIG_GRKERNSEC
59245 + struct signal_struct *p, *set;
59246 + const struct inet_sock *inet = inet_sk(sk);
59247 +
59248 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
59249 + return;
59250 +
59251 + set = current->signal;
59252 +
59253 + spin_lock_bh(&gr_conn_table_lock);
59254 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
59255 + inet->inet_dport, inet->inet_sport);
59256 + if (unlikely(p != NULL)) {
59257 + set->curr_ip = p->curr_ip;
59258 + set->used_accept = 1;
59259 + gr_del_task_from_ip_table_nolock(p);
59260 + spin_unlock_bh(&gr_conn_table_lock);
59261 + return;
59262 + }
59263 + spin_unlock_bh(&gr_conn_table_lock);
59264 +
59265 + set->curr_ip = inet->inet_daddr;
59266 + set->used_accept = 1;
59267 +#endif
59268 + return;
59269 +}
59270 +
59271 +int
59272 +gr_handle_sock_all(const int family, const int type, const int protocol)
59273 +{
59274 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59275 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
59276 + (family != AF_UNIX)) {
59277 + if (family == AF_INET)
59278 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
59279 + else
59280 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
59281 + return -EACCES;
59282 + }
59283 +#endif
59284 + return 0;
59285 +}
59286 +
59287 +int
59288 +gr_handle_sock_server(const struct sockaddr *sck)
59289 +{
59290 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59291 + if (grsec_enable_socket_server &&
59292 + in_group_p(grsec_socket_server_gid) &&
59293 + sck && (sck->sa_family != AF_UNIX) &&
59294 + (sck->sa_family != AF_LOCAL)) {
59295 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59296 + return -EACCES;
59297 + }
59298 +#endif
59299 + return 0;
59300 +}
59301 +
59302 +int
59303 +gr_handle_sock_server_other(const struct sock *sck)
59304 +{
59305 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59306 + if (grsec_enable_socket_server &&
59307 + in_group_p(grsec_socket_server_gid) &&
59308 + sck && (sck->sk_family != AF_UNIX) &&
59309 + (sck->sk_family != AF_LOCAL)) {
59310 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59311 + return -EACCES;
59312 + }
59313 +#endif
59314 + return 0;
59315 +}
59316 +
59317 +int
59318 +gr_handle_sock_client(const struct sockaddr *sck)
59319 +{
59320 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59321 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
59322 + sck && (sck->sa_family != AF_UNIX) &&
59323 + (sck->sa_family != AF_LOCAL)) {
59324 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
59325 + return -EACCES;
59326 + }
59327 +#endif
59328 + return 0;
59329 +}
59330 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
59331 new file mode 100644
59332 index 0000000..f55ef0f
59333 --- /dev/null
59334 +++ b/grsecurity/grsec_sysctl.c
59335 @@ -0,0 +1,469 @@
59336 +#include <linux/kernel.h>
59337 +#include <linux/sched.h>
59338 +#include <linux/sysctl.h>
59339 +#include <linux/grsecurity.h>
59340 +#include <linux/grinternal.h>
59341 +
59342 +int
59343 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
59344 +{
59345 +#ifdef CONFIG_GRKERNSEC_SYSCTL
59346 + if (dirname == NULL || name == NULL)
59347 + return 0;
59348 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
59349 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
59350 + return -EACCES;
59351 + }
59352 +#endif
59353 + return 0;
59354 +}
59355 +
59356 +#ifdef CONFIG_GRKERNSEC_ROFS
59357 +static int __maybe_unused one = 1;
59358 +#endif
59359 +
59360 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
59361 +struct ctl_table grsecurity_table[] = {
59362 +#ifdef CONFIG_GRKERNSEC_SYSCTL
59363 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
59364 +#ifdef CONFIG_GRKERNSEC_IO
59365 + {
59366 + .procname = "disable_priv_io",
59367 + .data = &grsec_disable_privio,
59368 + .maxlen = sizeof(int),
59369 + .mode = 0600,
59370 + .proc_handler = &proc_dointvec,
59371 + },
59372 +#endif
59373 +#endif
59374 +#ifdef CONFIG_GRKERNSEC_LINK
59375 + {
59376 + .procname = "linking_restrictions",
59377 + .data = &grsec_enable_link,
59378 + .maxlen = sizeof(int),
59379 + .mode = 0600,
59380 + .proc_handler = &proc_dointvec,
59381 + },
59382 +#endif
59383 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
59384 + {
59385 + .procname = "enforce_symlinksifowner",
59386 + .data = &grsec_enable_symlinkown,
59387 + .maxlen = sizeof(int),
59388 + .mode = 0600,
59389 + .proc_handler = &proc_dointvec,
59390 + },
59391 + {
59392 + .procname = "symlinkown_gid",
59393 + .data = &grsec_symlinkown_gid,
59394 + .maxlen = sizeof(int),
59395 + .mode = 0600,
59396 + .proc_handler = &proc_dointvec,
59397 + },
59398 +#endif
59399 +#ifdef CONFIG_GRKERNSEC_BRUTE
59400 + {
59401 + .procname = "deter_bruteforce",
59402 + .data = &grsec_enable_brute,
59403 + .maxlen = sizeof(int),
59404 + .mode = 0600,
59405 + .proc_handler = &proc_dointvec,
59406 + },
59407 +#endif
59408 +#ifdef CONFIG_GRKERNSEC_FIFO
59409 + {
59410 + .procname = "fifo_restrictions",
59411 + .data = &grsec_enable_fifo,
59412 + .maxlen = sizeof(int),
59413 + .mode = 0600,
59414 + .proc_handler = &proc_dointvec,
59415 + },
59416 +#endif
59417 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59418 + {
59419 + .procname = "ptrace_readexec",
59420 + .data = &grsec_enable_ptrace_readexec,
59421 + .maxlen = sizeof(int),
59422 + .mode = 0600,
59423 + .proc_handler = &proc_dointvec,
59424 + },
59425 +#endif
59426 +#ifdef CONFIG_GRKERNSEC_SETXID
59427 + {
59428 + .procname = "consistent_setxid",
59429 + .data = &grsec_enable_setxid,
59430 + .maxlen = sizeof(int),
59431 + .mode = 0600,
59432 + .proc_handler = &proc_dointvec,
59433 + },
59434 +#endif
59435 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59436 + {
59437 + .procname = "ip_blackhole",
59438 + .data = &grsec_enable_blackhole,
59439 + .maxlen = sizeof(int),
59440 + .mode = 0600,
59441 + .proc_handler = &proc_dointvec,
59442 + },
59443 + {
59444 + .procname = "lastack_retries",
59445 + .data = &grsec_lastack_retries,
59446 + .maxlen = sizeof(int),
59447 + .mode = 0600,
59448 + .proc_handler = &proc_dointvec,
59449 + },
59450 +#endif
59451 +#ifdef CONFIG_GRKERNSEC_EXECLOG
59452 + {
59453 + .procname = "exec_logging",
59454 + .data = &grsec_enable_execlog,
59455 + .maxlen = sizeof(int),
59456 + .mode = 0600,
59457 + .proc_handler = &proc_dointvec,
59458 + },
59459 +#endif
59460 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59461 + {
59462 + .procname = "rwxmap_logging",
59463 + .data = &grsec_enable_log_rwxmaps,
59464 + .maxlen = sizeof(int),
59465 + .mode = 0600,
59466 + .proc_handler = &proc_dointvec,
59467 + },
59468 +#endif
59469 +#ifdef CONFIG_GRKERNSEC_SIGNAL
59470 + {
59471 + .procname = "signal_logging",
59472 + .data = &grsec_enable_signal,
59473 + .maxlen = sizeof(int),
59474 + .mode = 0600,
59475 + .proc_handler = &proc_dointvec,
59476 + },
59477 +#endif
59478 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
59479 + {
59480 + .procname = "forkfail_logging",
59481 + .data = &grsec_enable_forkfail,
59482 + .maxlen = sizeof(int),
59483 + .mode = 0600,
59484 + .proc_handler = &proc_dointvec,
59485 + },
59486 +#endif
59487 +#ifdef CONFIG_GRKERNSEC_TIME
59488 + {
59489 + .procname = "timechange_logging",
59490 + .data = &grsec_enable_time,
59491 + .maxlen = sizeof(int),
59492 + .mode = 0600,
59493 + .proc_handler = &proc_dointvec,
59494 + },
59495 +#endif
59496 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59497 + {
59498 + .procname = "chroot_deny_shmat",
59499 + .data = &grsec_enable_chroot_shmat,
59500 + .maxlen = sizeof(int),
59501 + .mode = 0600,
59502 + .proc_handler = &proc_dointvec,
59503 + },
59504 +#endif
59505 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59506 + {
59507 + .procname = "chroot_deny_unix",
59508 + .data = &grsec_enable_chroot_unix,
59509 + .maxlen = sizeof(int),
59510 + .mode = 0600,
59511 + .proc_handler = &proc_dointvec,
59512 + },
59513 +#endif
59514 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59515 + {
59516 + .procname = "chroot_deny_mount",
59517 + .data = &grsec_enable_chroot_mount,
59518 + .maxlen = sizeof(int),
59519 + .mode = 0600,
59520 + .proc_handler = &proc_dointvec,
59521 + },
59522 +#endif
59523 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59524 + {
59525 + .procname = "chroot_deny_fchdir",
59526 + .data = &grsec_enable_chroot_fchdir,
59527 + .maxlen = sizeof(int),
59528 + .mode = 0600,
59529 + .proc_handler = &proc_dointvec,
59530 + },
59531 +#endif
59532 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59533 + {
59534 + .procname = "chroot_deny_chroot",
59535 + .data = &grsec_enable_chroot_double,
59536 + .maxlen = sizeof(int),
59537 + .mode = 0600,
59538 + .proc_handler = &proc_dointvec,
59539 + },
59540 +#endif
59541 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59542 + {
59543 + .procname = "chroot_deny_pivot",
59544 + .data = &grsec_enable_chroot_pivot,
59545 + .maxlen = sizeof(int),
59546 + .mode = 0600,
59547 + .proc_handler = &proc_dointvec,
59548 + },
59549 +#endif
59550 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59551 + {
59552 + .procname = "chroot_enforce_chdir",
59553 + .data = &grsec_enable_chroot_chdir,
59554 + .maxlen = sizeof(int),
59555 + .mode = 0600,
59556 + .proc_handler = &proc_dointvec,
59557 + },
59558 +#endif
59559 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59560 + {
59561 + .procname = "chroot_deny_chmod",
59562 + .data = &grsec_enable_chroot_chmod,
59563 + .maxlen = sizeof(int),
59564 + .mode = 0600,
59565 + .proc_handler = &proc_dointvec,
59566 + },
59567 +#endif
59568 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59569 + {
59570 + .procname = "chroot_deny_mknod",
59571 + .data = &grsec_enable_chroot_mknod,
59572 + .maxlen = sizeof(int),
59573 + .mode = 0600,
59574 + .proc_handler = &proc_dointvec,
59575 + },
59576 +#endif
59577 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59578 + {
59579 + .procname = "chroot_restrict_nice",
59580 + .data = &grsec_enable_chroot_nice,
59581 + .maxlen = sizeof(int),
59582 + .mode = 0600,
59583 + .proc_handler = &proc_dointvec,
59584 + },
59585 +#endif
59586 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59587 + {
59588 + .procname = "chroot_execlog",
59589 + .data = &grsec_enable_chroot_execlog,
59590 + .maxlen = sizeof(int),
59591 + .mode = 0600,
59592 + .proc_handler = &proc_dointvec,
59593 + },
59594 +#endif
59595 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59596 + {
59597 + .procname = "chroot_caps",
59598 + .data = &grsec_enable_chroot_caps,
59599 + .maxlen = sizeof(int),
59600 + .mode = 0600,
59601 + .proc_handler = &proc_dointvec,
59602 + },
59603 +#endif
59604 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59605 + {
59606 + .procname = "chroot_deny_sysctl",
59607 + .data = &grsec_enable_chroot_sysctl,
59608 + .maxlen = sizeof(int),
59609 + .mode = 0600,
59610 + .proc_handler = &proc_dointvec,
59611 + },
59612 +#endif
59613 +#ifdef CONFIG_GRKERNSEC_TPE
59614 + {
59615 + .procname = "tpe",
59616 + .data = &grsec_enable_tpe,
59617 + .maxlen = sizeof(int),
59618 + .mode = 0600,
59619 + .proc_handler = &proc_dointvec,
59620 + },
59621 + {
59622 + .procname = "tpe_gid",
59623 + .data = &grsec_tpe_gid,
59624 + .maxlen = sizeof(int),
59625 + .mode = 0600,
59626 + .proc_handler = &proc_dointvec,
59627 + },
59628 +#endif
59629 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59630 + {
59631 + .procname = "tpe_invert",
59632 + .data = &grsec_enable_tpe_invert,
59633 + .maxlen = sizeof(int),
59634 + .mode = 0600,
59635 + .proc_handler = &proc_dointvec,
59636 + },
59637 +#endif
59638 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
59639 + {
59640 + .procname = "tpe_restrict_all",
59641 + .data = &grsec_enable_tpe_all,
59642 + .maxlen = sizeof(int),
59643 + .mode = 0600,
59644 + .proc_handler = &proc_dointvec,
59645 + },
59646 +#endif
59647 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59648 + {
59649 + .procname = "socket_all",
59650 + .data = &grsec_enable_socket_all,
59651 + .maxlen = sizeof(int),
59652 + .mode = 0600,
59653 + .proc_handler = &proc_dointvec,
59654 + },
59655 + {
59656 + .procname = "socket_all_gid",
59657 + .data = &grsec_socket_all_gid,
59658 + .maxlen = sizeof(int),
59659 + .mode = 0600,
59660 + .proc_handler = &proc_dointvec,
59661 + },
59662 +#endif
59663 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59664 + {
59665 + .procname = "socket_client",
59666 + .data = &grsec_enable_socket_client,
59667 + .maxlen = sizeof(int),
59668 + .mode = 0600,
59669 + .proc_handler = &proc_dointvec,
59670 + },
59671 + {
59672 + .procname = "socket_client_gid",
59673 + .data = &grsec_socket_client_gid,
59674 + .maxlen = sizeof(int),
59675 + .mode = 0600,
59676 + .proc_handler = &proc_dointvec,
59677 + },
59678 +#endif
59679 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59680 + {
59681 + .procname = "socket_server",
59682 + .data = &grsec_enable_socket_server,
59683 + .maxlen = sizeof(int),
59684 + .mode = 0600,
59685 + .proc_handler = &proc_dointvec,
59686 + },
59687 + {
59688 + .procname = "socket_server_gid",
59689 + .data = &grsec_socket_server_gid,
59690 + .maxlen = sizeof(int),
59691 + .mode = 0600,
59692 + .proc_handler = &proc_dointvec,
59693 + },
59694 +#endif
59695 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59696 + {
59697 + .procname = "audit_group",
59698 + .data = &grsec_enable_group,
59699 + .maxlen = sizeof(int),
59700 + .mode = 0600,
59701 + .proc_handler = &proc_dointvec,
59702 + },
59703 + {
59704 + .procname = "audit_gid",
59705 + .data = &grsec_audit_gid,
59706 + .maxlen = sizeof(int),
59707 + .mode = 0600,
59708 + .proc_handler = &proc_dointvec,
59709 + },
59710 +#endif
59711 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59712 + {
59713 + .procname = "audit_chdir",
59714 + .data = &grsec_enable_chdir,
59715 + .maxlen = sizeof(int),
59716 + .mode = 0600,
59717 + .proc_handler = &proc_dointvec,
59718 + },
59719 +#endif
59720 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59721 + {
59722 + .procname = "audit_mount",
59723 + .data = &grsec_enable_mount,
59724 + .maxlen = sizeof(int),
59725 + .mode = 0600,
59726 + .proc_handler = &proc_dointvec,
59727 + },
59728 +#endif
59729 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59730 + {
59731 + .procname = "audit_textrel",
59732 + .data = &grsec_enable_audit_textrel,
59733 + .maxlen = sizeof(int),
59734 + .mode = 0600,
59735 + .proc_handler = &proc_dointvec,
59736 + },
59737 +#endif
59738 +#ifdef CONFIG_GRKERNSEC_DMESG
59739 + {
59740 + .procname = "dmesg",
59741 + .data = &grsec_enable_dmesg,
59742 + .maxlen = sizeof(int),
59743 + .mode = 0600,
59744 + .proc_handler = &proc_dointvec,
59745 + },
59746 +#endif
59747 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59748 + {
59749 + .procname = "chroot_findtask",
59750 + .data = &grsec_enable_chroot_findtask,
59751 + .maxlen = sizeof(int),
59752 + .mode = 0600,
59753 + .proc_handler = &proc_dointvec,
59754 + },
59755 +#endif
59756 +#ifdef CONFIG_GRKERNSEC_RESLOG
59757 + {
59758 + .procname = "resource_logging",
59759 + .data = &grsec_resource_logging,
59760 + .maxlen = sizeof(int),
59761 + .mode = 0600,
59762 + .proc_handler = &proc_dointvec,
59763 + },
59764 +#endif
59765 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59766 + {
59767 + .procname = "audit_ptrace",
59768 + .data = &grsec_enable_audit_ptrace,
59769 + .maxlen = sizeof(int),
59770 + .mode = 0600,
59771 + .proc_handler = &proc_dointvec,
59772 + },
59773 +#endif
59774 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59775 + {
59776 + .procname = "harden_ptrace",
59777 + .data = &grsec_enable_harden_ptrace,
59778 + .maxlen = sizeof(int),
59779 + .mode = 0600,
59780 + .proc_handler = &proc_dointvec,
59781 + },
59782 +#endif
59783 + {
59784 + .procname = "grsec_lock",
59785 + .data = &grsec_lock,
59786 + .maxlen = sizeof(int),
59787 + .mode = 0600,
59788 + .proc_handler = &proc_dointvec,
59789 + },
59790 +#endif
59791 +#ifdef CONFIG_GRKERNSEC_ROFS
59792 + {
59793 + .procname = "romount_protect",
59794 + .data = &grsec_enable_rofs,
59795 + .maxlen = sizeof(int),
59796 + .mode = 0600,
59797 + .proc_handler = &proc_dointvec_minmax,
59798 + .extra1 = &one,
59799 + .extra2 = &one,
59800 + },
59801 +#endif
59802 + { }
59803 +};
59804 +#endif
59805 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
59806 new file mode 100644
59807 index 0000000..0dc13c3
59808 --- /dev/null
59809 +++ b/grsecurity/grsec_time.c
59810 @@ -0,0 +1,16 @@
59811 +#include <linux/kernel.h>
59812 +#include <linux/sched.h>
59813 +#include <linux/grinternal.h>
59814 +#include <linux/module.h>
59815 +
59816 +void
59817 +gr_log_timechange(void)
59818 +{
59819 +#ifdef CONFIG_GRKERNSEC_TIME
59820 + if (grsec_enable_time)
59821 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59822 +#endif
59823 + return;
59824 +}
59825 +
59826 +EXPORT_SYMBOL(gr_log_timechange);
59827 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
59828 new file mode 100644
59829 index 0000000..07e0dc0
59830 --- /dev/null
59831 +++ b/grsecurity/grsec_tpe.c
59832 @@ -0,0 +1,73 @@
59833 +#include <linux/kernel.h>
59834 +#include <linux/sched.h>
59835 +#include <linux/file.h>
59836 +#include <linux/fs.h>
59837 +#include <linux/grinternal.h>
59838 +
59839 +extern int gr_acl_tpe_check(void);
59840 +
59841 +int
59842 +gr_tpe_allow(const struct file *file)
59843 +{
59844 +#ifdef CONFIG_GRKERNSEC
59845 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59846 + const struct cred *cred = current_cred();
59847 + char *msg = NULL;
59848 + char *msg2 = NULL;
59849 +
59850 + // never restrict root
59851 + if (!cred->uid)
59852 + return 1;
59853 +
59854 + if (grsec_enable_tpe) {
59855 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59856 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
59857 + msg = "not being in trusted group";
59858 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
59859 + msg = "being in untrusted group";
59860 +#else
59861 + if (in_group_p(grsec_tpe_gid))
59862 + msg = "being in untrusted group";
59863 +#endif
59864 + }
59865 + if (!msg && gr_acl_tpe_check())
59866 + msg = "being in untrusted role";
59867 +
59868 + // not in any affected group/role
59869 + if (!msg)
59870 + goto next_check;
59871 +
59872 + if (inode->i_uid)
59873 + msg2 = "file in non-root-owned directory";
59874 + else if (inode->i_mode & S_IWOTH)
59875 + msg2 = "file in world-writable directory";
59876 + else if (inode->i_mode & S_IWGRP)
59877 + msg2 = "file in group-writable directory";
59878 +
59879 + if (msg && msg2) {
59880 + char fullmsg[70] = {0};
59881 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
59882 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
59883 + return 0;
59884 + }
59885 + msg = NULL;
59886 +next_check:
59887 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
59888 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
59889 + return 1;
59890 +
59891 + if (inode->i_uid && (inode->i_uid != cred->uid))
59892 + msg = "directory not owned by user";
59893 + else if (inode->i_mode & S_IWOTH)
59894 + msg = "file in world-writable directory";
59895 + else if (inode->i_mode & S_IWGRP)
59896 + msg = "file in group-writable directory";
59897 +
59898 + if (msg) {
59899 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
59900 + return 0;
59901 + }
59902 +#endif
59903 +#endif
59904 + return 1;
59905 +}
59906 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
59907 new file mode 100644
59908 index 0000000..9f7b1ac
59909 --- /dev/null
59910 +++ b/grsecurity/grsum.c
59911 @@ -0,0 +1,61 @@
59912 +#include <linux/err.h>
59913 +#include <linux/kernel.h>
59914 +#include <linux/sched.h>
59915 +#include <linux/mm.h>
59916 +#include <linux/scatterlist.h>
59917 +#include <linux/crypto.h>
59918 +#include <linux/gracl.h>
59919 +
59920 +
59921 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59922 +#error "crypto and sha256 must be built into the kernel"
59923 +#endif
59924 +
59925 +int
59926 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59927 +{
59928 + char *p;
59929 + struct crypto_hash *tfm;
59930 + struct hash_desc desc;
59931 + struct scatterlist sg;
59932 + unsigned char temp_sum[GR_SHA_LEN];
59933 + volatile int retval = 0;
59934 + volatile int dummy = 0;
59935 + unsigned int i;
59936 +
59937 + sg_init_table(&sg, 1);
59938 +
59939 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59940 + if (IS_ERR(tfm)) {
59941 + /* should never happen, since sha256 should be built in */
59942 + return 1;
59943 + }
59944 +
59945 + desc.tfm = tfm;
59946 + desc.flags = 0;
59947 +
59948 + crypto_hash_init(&desc);
59949 +
59950 + p = salt;
59951 + sg_set_buf(&sg, p, GR_SALT_LEN);
59952 + crypto_hash_update(&desc, &sg, sg.length);
59953 +
59954 + p = entry->pw;
59955 + sg_set_buf(&sg, p, strlen(p));
59956 +
59957 + crypto_hash_update(&desc, &sg, sg.length);
59958 +
59959 + crypto_hash_final(&desc, temp_sum);
59960 +
59961 + memset(entry->pw, 0, GR_PW_LEN);
59962 +
59963 + for (i = 0; i < GR_SHA_LEN; i++)
59964 + if (sum[i] != temp_sum[i])
59965 + retval = 1;
59966 + else
59967 + dummy = 1; // waste a cycle
59968 +
59969 + crypto_free_hash(tfm);
59970 +
59971 + return retval;
59972 +}
59973 diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
59974 index 9e6e1c6..d47b906 100644
59975 --- a/include/acpi/acpi_bus.h
59976 +++ b/include/acpi/acpi_bus.h
59977 @@ -138,7 +138,7 @@ struct acpi_device_ops {
59978 acpi_op_bind bind;
59979 acpi_op_unbind unbind;
59980 acpi_op_notify notify;
59981 -};
59982 +} __no_const;
59983
59984 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
59985
59986 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
59987 index b7babf0..3ba8aee 100644
59988 --- a/include/asm-generic/atomic-long.h
59989 +++ b/include/asm-generic/atomic-long.h
59990 @@ -22,6 +22,12 @@
59991
59992 typedef atomic64_t atomic_long_t;
59993
59994 +#ifdef CONFIG_PAX_REFCOUNT
59995 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
59996 +#else
59997 +typedef atomic64_t atomic_long_unchecked_t;
59998 +#endif
59999 +
60000 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
60001
60002 static inline long atomic_long_read(atomic_long_t *l)
60003 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
60004 return (long)atomic64_read(v);
60005 }
60006
60007 +#ifdef CONFIG_PAX_REFCOUNT
60008 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60009 +{
60010 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60011 +
60012 + return (long)atomic64_read_unchecked(v);
60013 +}
60014 +#endif
60015 +
60016 static inline void atomic_long_set(atomic_long_t *l, long i)
60017 {
60018 atomic64_t *v = (atomic64_t *)l;
60019 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
60020 atomic64_set(v, i);
60021 }
60022
60023 +#ifdef CONFIG_PAX_REFCOUNT
60024 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60025 +{
60026 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60027 +
60028 + atomic64_set_unchecked(v, i);
60029 +}
60030 +#endif
60031 +
60032 static inline void atomic_long_inc(atomic_long_t *l)
60033 {
60034 atomic64_t *v = (atomic64_t *)l;
60035 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
60036 atomic64_inc(v);
60037 }
60038
60039 +#ifdef CONFIG_PAX_REFCOUNT
60040 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60041 +{
60042 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60043 +
60044 + atomic64_inc_unchecked(v);
60045 +}
60046 +#endif
60047 +
60048 static inline void atomic_long_dec(atomic_long_t *l)
60049 {
60050 atomic64_t *v = (atomic64_t *)l;
60051 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
60052 atomic64_dec(v);
60053 }
60054
60055 +#ifdef CONFIG_PAX_REFCOUNT
60056 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60057 +{
60058 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60059 +
60060 + atomic64_dec_unchecked(v);
60061 +}
60062 +#endif
60063 +
60064 static inline void atomic_long_add(long i, atomic_long_t *l)
60065 {
60066 atomic64_t *v = (atomic64_t *)l;
60067 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
60068 atomic64_add(i, v);
60069 }
60070
60071 +#ifdef CONFIG_PAX_REFCOUNT
60072 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60073 +{
60074 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60075 +
60076 + atomic64_add_unchecked(i, v);
60077 +}
60078 +#endif
60079 +
60080 static inline void atomic_long_sub(long i, atomic_long_t *l)
60081 {
60082 atomic64_t *v = (atomic64_t *)l;
60083 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
60084 atomic64_sub(i, v);
60085 }
60086
60087 +#ifdef CONFIG_PAX_REFCOUNT
60088 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
60089 +{
60090 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60091 +
60092 + atomic64_sub_unchecked(i, v);
60093 +}
60094 +#endif
60095 +
60096 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
60097 {
60098 atomic64_t *v = (atomic64_t *)l;
60099 @@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
60100 return (long)atomic64_inc_return(v);
60101 }
60102
60103 +#ifdef CONFIG_PAX_REFCOUNT
60104 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60105 +{
60106 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60107 +
60108 + return (long)atomic64_inc_return_unchecked(v);
60109 +}
60110 +#endif
60111 +
60112 static inline long atomic_long_dec_return(atomic_long_t *l)
60113 {
60114 atomic64_t *v = (atomic64_t *)l;
60115 @@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
60116
60117 typedef atomic_t atomic_long_t;
60118
60119 +#ifdef CONFIG_PAX_REFCOUNT
60120 +typedef atomic_unchecked_t atomic_long_unchecked_t;
60121 +#else
60122 +typedef atomic_t atomic_long_unchecked_t;
60123 +#endif
60124 +
60125 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
60126 static inline long atomic_long_read(atomic_long_t *l)
60127 {
60128 @@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
60129 return (long)atomic_read(v);
60130 }
60131
60132 +#ifdef CONFIG_PAX_REFCOUNT
60133 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60134 +{
60135 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60136 +
60137 + return (long)atomic_read_unchecked(v);
60138 +}
60139 +#endif
60140 +
60141 static inline void atomic_long_set(atomic_long_t *l, long i)
60142 {
60143 atomic_t *v = (atomic_t *)l;
60144 @@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
60145 atomic_set(v, i);
60146 }
60147
60148 +#ifdef CONFIG_PAX_REFCOUNT
60149 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60150 +{
60151 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60152 +
60153 + atomic_set_unchecked(v, i);
60154 +}
60155 +#endif
60156 +
60157 static inline void atomic_long_inc(atomic_long_t *l)
60158 {
60159 atomic_t *v = (atomic_t *)l;
60160 @@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
60161 atomic_inc(v);
60162 }
60163
60164 +#ifdef CONFIG_PAX_REFCOUNT
60165 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60166 +{
60167 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60168 +
60169 + atomic_inc_unchecked(v);
60170 +}
60171 +#endif
60172 +
60173 static inline void atomic_long_dec(atomic_long_t *l)
60174 {
60175 atomic_t *v = (atomic_t *)l;
60176 @@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
60177 atomic_dec(v);
60178 }
60179
60180 +#ifdef CONFIG_PAX_REFCOUNT
60181 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60182 +{
60183 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60184 +
60185 + atomic_dec_unchecked(v);
60186 +}
60187 +#endif
60188 +
60189 static inline void atomic_long_add(long i, atomic_long_t *l)
60190 {
60191 atomic_t *v = (atomic_t *)l;
60192 @@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
60193 atomic_add(i, v);
60194 }
60195
60196 +#ifdef CONFIG_PAX_REFCOUNT
60197 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60198 +{
60199 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60200 +
60201 + atomic_add_unchecked(i, v);
60202 +}
60203 +#endif
60204 +
60205 static inline void atomic_long_sub(long i, atomic_long_t *l)
60206 {
60207 atomic_t *v = (atomic_t *)l;
60208 @@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
60209 atomic_sub(i, v);
60210 }
60211
60212 +#ifdef CONFIG_PAX_REFCOUNT
60213 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
60214 +{
60215 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60216 +
60217 + atomic_sub_unchecked(i, v);
60218 +}
60219 +#endif
60220 +
60221 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
60222 {
60223 atomic_t *v = (atomic_t *)l;
60224 @@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
60225 return (long)atomic_inc_return(v);
60226 }
60227
60228 +#ifdef CONFIG_PAX_REFCOUNT
60229 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
60230 +{
60231 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
60232 +
60233 + return (long)atomic_inc_return_unchecked(v);
60234 +}
60235 +#endif
60236 +
60237 static inline long atomic_long_dec_return(atomic_long_t *l)
60238 {
60239 atomic_t *v = (atomic_t *)l;
60240 @@ -255,4 +393,55 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
60241
60242 #endif /* BITS_PER_LONG == 64 */
60243
60244 +#ifdef CONFIG_PAX_REFCOUNT
60245 +static inline void pax_refcount_needs_these_functions(void)
60246 +{
60247 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
60248 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
60249 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
60250 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
60251 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
60252 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
60253 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
60254 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
60255 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
60256 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
60257 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
60258 +#ifdef CONFIG_X86
60259 + atomic_clear_mask_unchecked(0, NULL);
60260 + atomic_set_mask_unchecked(0, NULL);
60261 +#endif
60262 +
60263 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
60264 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
60265 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
60266 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
60267 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
60268 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
60269 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
60270 +}
60271 +#else
60272 +#define atomic_read_unchecked(v) atomic_read(v)
60273 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
60274 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
60275 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
60276 +#define atomic_inc_unchecked(v) atomic_inc(v)
60277 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
60278 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
60279 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
60280 +#define atomic_dec_unchecked(v) atomic_dec(v)
60281 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
60282 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
60283 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
60284 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
60285 +
60286 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
60287 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
60288 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
60289 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
60290 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
60291 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
60292 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
60293 +#endif
60294 +
60295 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
60296 diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
60297 index 1ced641..c896ee8 100644
60298 --- a/include/asm-generic/atomic.h
60299 +++ b/include/asm-generic/atomic.h
60300 @@ -159,7 +159,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
60301 * Atomically clears the bits set in @mask from @v
60302 */
60303 #ifndef atomic_clear_mask
60304 -static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
60305 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
60306 {
60307 unsigned long flags;
60308
60309 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
60310 index b18ce4f..2ee2843 100644
60311 --- a/include/asm-generic/atomic64.h
60312 +++ b/include/asm-generic/atomic64.h
60313 @@ -16,6 +16,8 @@ typedef struct {
60314 long long counter;
60315 } atomic64_t;
60316
60317 +typedef atomic64_t atomic64_unchecked_t;
60318 +
60319 #define ATOMIC64_INIT(i) { (i) }
60320
60321 extern long long atomic64_read(const atomic64_t *v);
60322 @@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
60323 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
60324 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
60325
60326 +#define atomic64_read_unchecked(v) atomic64_read(v)
60327 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
60328 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
60329 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
60330 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
60331 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
60332 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
60333 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
60334 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
60335 +
60336 #endif /* _ASM_GENERIC_ATOMIC64_H */
60337 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
60338 index 1bfcfe5..e04c5c9 100644
60339 --- a/include/asm-generic/cache.h
60340 +++ b/include/asm-generic/cache.h
60341 @@ -6,7 +6,7 @@
60342 * cache lines need to provide their own cache.h.
60343 */
60344
60345 -#define L1_CACHE_SHIFT 5
60346 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
60347 +#define L1_CACHE_SHIFT 5UL
60348 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
60349
60350 #endif /* __ASM_GENERIC_CACHE_H */
60351 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
60352 index 0d68a1e..b74a761 100644
60353 --- a/include/asm-generic/emergency-restart.h
60354 +++ b/include/asm-generic/emergency-restart.h
60355 @@ -1,7 +1,7 @@
60356 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
60357 #define _ASM_GENERIC_EMERGENCY_RESTART_H
60358
60359 -static inline void machine_emergency_restart(void)
60360 +static inline __noreturn void machine_emergency_restart(void)
60361 {
60362 machine_restart(NULL);
60363 }
60364 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
60365 index 0232ccb..13d9165 100644
60366 --- a/include/asm-generic/kmap_types.h
60367 +++ b/include/asm-generic/kmap_types.h
60368 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
60369 KMAP_D(17) KM_NMI,
60370 KMAP_D(18) KM_NMI_PTE,
60371 KMAP_D(19) KM_KDB,
60372 +KMAP_D(20) KM_CLEARPAGE,
60373 /*
60374 * Remember to update debug_kmap_atomic() when adding new kmap types!
60375 */
60376 -KMAP_D(20) KM_TYPE_NR
60377 +KMAP_D(21) KM_TYPE_NR
60378 };
60379
60380 #undef KMAP_D
60381 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
60382 index 9ceb03b..2efbcbd 100644
60383 --- a/include/asm-generic/local.h
60384 +++ b/include/asm-generic/local.h
60385 @@ -39,6 +39,7 @@ typedef struct
60386 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
60387 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
60388 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
60389 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
60390
60391 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
60392 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
60393 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
60394 index 725612b..9cc513a 100644
60395 --- a/include/asm-generic/pgtable-nopmd.h
60396 +++ b/include/asm-generic/pgtable-nopmd.h
60397 @@ -1,14 +1,19 @@
60398 #ifndef _PGTABLE_NOPMD_H
60399 #define _PGTABLE_NOPMD_H
60400
60401 -#ifndef __ASSEMBLY__
60402 -
60403 #include <asm-generic/pgtable-nopud.h>
60404
60405 -struct mm_struct;
60406 -
60407 #define __PAGETABLE_PMD_FOLDED
60408
60409 +#define PMD_SHIFT PUD_SHIFT
60410 +#define PTRS_PER_PMD 1
60411 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
60412 +#define PMD_MASK (~(PMD_SIZE-1))
60413 +
60414 +#ifndef __ASSEMBLY__
60415 +
60416 +struct mm_struct;
60417 +
60418 /*
60419 * Having the pmd type consist of a pud gets the size right, and allows
60420 * us to conceptually access the pud entry that this pmd is folded into
60421 @@ -16,11 +21,6 @@ struct mm_struct;
60422 */
60423 typedef struct { pud_t pud; } pmd_t;
60424
60425 -#define PMD_SHIFT PUD_SHIFT
60426 -#define PTRS_PER_PMD 1
60427 -#define PMD_SIZE (1UL << PMD_SHIFT)
60428 -#define PMD_MASK (~(PMD_SIZE-1))
60429 -
60430 /*
60431 * The "pud_xxx()" functions here are trivial for a folded two-level
60432 * setup: the pmd is never bad, and a pmd always exists (as it's folded
60433 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
60434 index 810431d..0ec4804f 100644
60435 --- a/include/asm-generic/pgtable-nopud.h
60436 +++ b/include/asm-generic/pgtable-nopud.h
60437 @@ -1,10 +1,15 @@
60438 #ifndef _PGTABLE_NOPUD_H
60439 #define _PGTABLE_NOPUD_H
60440
60441 -#ifndef __ASSEMBLY__
60442 -
60443 #define __PAGETABLE_PUD_FOLDED
60444
60445 +#define PUD_SHIFT PGDIR_SHIFT
60446 +#define PTRS_PER_PUD 1
60447 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
60448 +#define PUD_MASK (~(PUD_SIZE-1))
60449 +
60450 +#ifndef __ASSEMBLY__
60451 +
60452 /*
60453 * Having the pud type consist of a pgd gets the size right, and allows
60454 * us to conceptually access the pgd entry that this pud is folded into
60455 @@ -12,11 +17,6 @@
60456 */
60457 typedef struct { pgd_t pgd; } pud_t;
60458
60459 -#define PUD_SHIFT PGDIR_SHIFT
60460 -#define PTRS_PER_PUD 1
60461 -#define PUD_SIZE (1UL << PUD_SHIFT)
60462 -#define PUD_MASK (~(PUD_SIZE-1))
60463 -
60464 /*
60465 * The "pgd_xxx()" functions here are trivial for a folded two-level
60466 * setup: the pud is never bad, and a pud always exists (as it's folded
60467 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
60468 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
60469
60470 #define pgd_populate(mm, pgd, pud) do { } while (0)
60471 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
60472 /*
60473 * (puds are folded into pgds so this doesn't get actually called,
60474 * but the define is needed for a generic inline function.)
60475 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
60476 index ff4947b..f48183f 100644
60477 --- a/include/asm-generic/pgtable.h
60478 +++ b/include/asm-generic/pgtable.h
60479 @@ -530,6 +530,14 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
60480 #endif
60481 }
60482
60483 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60484 +static inline unsigned long pax_open_kernel(void) { return 0; }
60485 +#endif
60486 +
60487 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60488 +static inline unsigned long pax_close_kernel(void) { return 0; }
60489 +#endif
60490 +
60491 #endif /* CONFIG_MMU */
60492
60493 #endif /* !__ASSEMBLY__ */
60494 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
60495 index 4e2e1cc..12c266b 100644
60496 --- a/include/asm-generic/vmlinux.lds.h
60497 +++ b/include/asm-generic/vmlinux.lds.h
60498 @@ -218,6 +218,7 @@
60499 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60500 VMLINUX_SYMBOL(__start_rodata) = .; \
60501 *(.rodata) *(.rodata.*) \
60502 + *(.data..read_only) \
60503 *(__vermagic) /* Kernel version magic */ \
60504 . = ALIGN(8); \
60505 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
60506 @@ -716,17 +717,18 @@
60507 * section in the linker script will go there too. @phdr should have
60508 * a leading colon.
60509 *
60510 - * Note that this macros defines __per_cpu_load as an absolute symbol.
60511 + * Note that this macros defines per_cpu_load as an absolute symbol.
60512 * If there is no need to put the percpu section at a predetermined
60513 * address, use PERCPU_SECTION.
60514 */
60515 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
60516 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
60517 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60518 + per_cpu_load = .; \
60519 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60520 - LOAD_OFFSET) { \
60521 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60522 PERCPU_INPUT(cacheline) \
60523 } phdr \
60524 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
60525 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
60526
60527 /**
60528 * PERCPU_SECTION - define output section for percpu area, simple version
60529 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
60530 index 31ad880..4e79884 100644
60531 --- a/include/drm/drmP.h
60532 +++ b/include/drm/drmP.h
60533 @@ -72,6 +72,7 @@
60534 #include <linux/workqueue.h>
60535 #include <linux/poll.h>
60536 #include <asm/pgalloc.h>
60537 +#include <asm/local.h>
60538 #include "drm.h"
60539
60540 #include <linux/idr.h>
60541 @@ -1074,7 +1075,7 @@ struct drm_device {
60542
60543 /** \name Usage Counters */
60544 /*@{ */
60545 - int open_count; /**< Outstanding files open */
60546 + local_t open_count; /**< Outstanding files open */
60547 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60548 atomic_t vma_count; /**< Outstanding vma areas open */
60549 int buf_use; /**< Buffers in use -- cannot alloc */
60550 @@ -1085,7 +1086,7 @@ struct drm_device {
60551 /*@{ */
60552 unsigned long counters;
60553 enum drm_stat_type types[15];
60554 - atomic_t counts[15];
60555 + atomic_unchecked_t counts[15];
60556 /*@} */
60557
60558 struct list_head filelist;
60559 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
60560 index 7988e55..ec974c9 100644
60561 --- a/include/drm/drm_crtc_helper.h
60562 +++ b/include/drm/drm_crtc_helper.h
60563 @@ -81,7 +81,7 @@ struct drm_crtc_helper_funcs {
60564
60565 /* disable crtc when not in use - more explicit than dpms off */
60566 void (*disable)(struct drm_crtc *crtc);
60567 -};
60568 +} __no_const;
60569
60570 /**
60571 * drm_encoder_helper_funcs - helper operations for encoders
60572 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
60573 struct drm_connector *connector);
60574 /* disable encoder when not in use - more explicit than dpms off */
60575 void (*disable)(struct drm_encoder *encoder);
60576 -};
60577 +} __no_const;
60578
60579 /**
60580 * drm_connector_helper_funcs - helper operations for connectors
60581 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
60582 index d6d1da4..fdd1ac5 100644
60583 --- a/include/drm/ttm/ttm_memory.h
60584 +++ b/include/drm/ttm/ttm_memory.h
60585 @@ -48,7 +48,7 @@
60586
60587 struct ttm_mem_shrink {
60588 int (*do_shrink) (struct ttm_mem_shrink *);
60589 -};
60590 +} __no_const;
60591
60592 /**
60593 * struct ttm_mem_global - Global memory accounting structure.
60594 diff --git a/include/linux/a.out.h b/include/linux/a.out.h
60595 index e86dfca..40cc55f 100644
60596 --- a/include/linux/a.out.h
60597 +++ b/include/linux/a.out.h
60598 @@ -39,6 +39,14 @@ enum machine_type {
60599 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60600 };
60601
60602 +/* Constants for the N_FLAGS field */
60603 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60604 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
60605 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
60606 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
60607 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60608 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60609 +
60610 #if !defined (N_MAGIC)
60611 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
60612 #endif
60613 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
60614 index 06fd4bb..1caec0d 100644
60615 --- a/include/linux/atmdev.h
60616 +++ b/include/linux/atmdev.h
60617 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
60618 #endif
60619
60620 struct k_atm_aal_stats {
60621 -#define __HANDLE_ITEM(i) atomic_t i
60622 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
60623 __AAL_STAT_ITEMS
60624 #undef __HANDLE_ITEM
60625 };
60626 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
60627 index 366422b..1fa7f84 100644
60628 --- a/include/linux/binfmts.h
60629 +++ b/include/linux/binfmts.h
60630 @@ -89,6 +89,7 @@ struct linux_binfmt {
60631 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
60632 int (*load_shlib)(struct file *);
60633 int (*core_dump)(struct coredump_params *cprm);
60634 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
60635 unsigned long min_coredump; /* minimal dump size */
60636 };
60637
60638 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
60639 index 07954b0..cb2ae71 100644
60640 --- a/include/linux/blkdev.h
60641 +++ b/include/linux/blkdev.h
60642 @@ -1393,7 +1393,7 @@ struct block_device_operations {
60643 /* this callback is with swap_lock and sometimes page table lock held */
60644 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
60645 struct module *owner;
60646 -};
60647 +} __do_const;
60648
60649 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
60650 unsigned long);
60651 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
60652 index 4d1a074..88f929a 100644
60653 --- a/include/linux/blktrace_api.h
60654 +++ b/include/linux/blktrace_api.h
60655 @@ -162,7 +162,7 @@ struct blk_trace {
60656 struct dentry *dir;
60657 struct dentry *dropped_file;
60658 struct dentry *msg_file;
60659 - atomic_t dropped;
60660 + atomic_unchecked_t dropped;
60661 };
60662
60663 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
60664 diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
60665 index 83195fb..0b0f77d 100644
60666 --- a/include/linux/byteorder/little_endian.h
60667 +++ b/include/linux/byteorder/little_endian.h
60668 @@ -42,51 +42,51 @@
60669
60670 static inline __le64 __cpu_to_le64p(const __u64 *p)
60671 {
60672 - return (__force __le64)*p;
60673 + return (__force const __le64)*p;
60674 }
60675 static inline __u64 __le64_to_cpup(const __le64 *p)
60676 {
60677 - return (__force __u64)*p;
60678 + return (__force const __u64)*p;
60679 }
60680 static inline __le32 __cpu_to_le32p(const __u32 *p)
60681 {
60682 - return (__force __le32)*p;
60683 + return (__force const __le32)*p;
60684 }
60685 static inline __u32 __le32_to_cpup(const __le32 *p)
60686 {
60687 - return (__force __u32)*p;
60688 + return (__force const __u32)*p;
60689 }
60690 static inline __le16 __cpu_to_le16p(const __u16 *p)
60691 {
60692 - return (__force __le16)*p;
60693 + return (__force const __le16)*p;
60694 }
60695 static inline __u16 __le16_to_cpup(const __le16 *p)
60696 {
60697 - return (__force __u16)*p;
60698 + return (__force const __u16)*p;
60699 }
60700 static inline __be64 __cpu_to_be64p(const __u64 *p)
60701 {
60702 - return (__force __be64)__swab64p(p);
60703 + return (__force const __be64)__swab64p(p);
60704 }
60705 static inline __u64 __be64_to_cpup(const __be64 *p)
60706 {
60707 - return __swab64p((__u64 *)p);
60708 + return __swab64p((const __u64 *)p);
60709 }
60710 static inline __be32 __cpu_to_be32p(const __u32 *p)
60711 {
60712 - return (__force __be32)__swab32p(p);
60713 + return (__force const __be32)__swab32p(p);
60714 }
60715 static inline __u32 __be32_to_cpup(const __be32 *p)
60716 {
60717 - return __swab32p((__u32 *)p);
60718 + return __swab32p((const __u32 *)p);
60719 }
60720 static inline __be16 __cpu_to_be16p(const __u16 *p)
60721 {
60722 - return (__force __be16)__swab16p(p);
60723 + return (__force const __be16)__swab16p(p);
60724 }
60725 static inline __u16 __be16_to_cpup(const __be16 *p)
60726 {
60727 - return __swab16p((__u16 *)p);
60728 + return __swab16p((const __u16 *)p);
60729 }
60730 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
60731 #define __le64_to_cpus(x) do { (void)(x); } while (0)
60732 diff --git a/include/linux/cache.h b/include/linux/cache.h
60733 index 4c57065..4307975 100644
60734 --- a/include/linux/cache.h
60735 +++ b/include/linux/cache.h
60736 @@ -16,6 +16,10 @@
60737 #define __read_mostly
60738 #endif
60739
60740 +#ifndef __read_only
60741 +#define __read_only __read_mostly
60742 +#endif
60743 +
60744 #ifndef ____cacheline_aligned
60745 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
60746 #endif
60747 diff --git a/include/linux/capability.h b/include/linux/capability.h
60748 index d10b7ed..0288b79 100644
60749 --- a/include/linux/capability.h
60750 +++ b/include/linux/capability.h
60751 @@ -553,10 +553,15 @@ extern bool capable(int cap);
60752 extern bool ns_capable(struct user_namespace *ns, int cap);
60753 extern bool nsown_capable(int cap);
60754 extern bool inode_capable(const struct inode *inode, int cap);
60755 +extern bool capable_nolog(int cap);
60756 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
60757 +extern bool inode_capable_nolog(const struct inode *inode, int cap);
60758
60759 /* audit system wants to get cap info from files as well */
60760 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
60761
60762 +extern int is_privileged_binary(const struct dentry *dentry);
60763 +
60764 #endif /* __KERNEL__ */
60765
60766 #endif /* !_LINUX_CAPABILITY_H */
60767 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
60768 index 42e55de..1cd0e66 100644
60769 --- a/include/linux/cleancache.h
60770 +++ b/include/linux/cleancache.h
60771 @@ -31,7 +31,7 @@ struct cleancache_ops {
60772 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
60773 void (*invalidate_inode)(int, struct cleancache_filekey);
60774 void (*invalidate_fs)(int);
60775 -};
60776 +} __no_const;
60777
60778 extern struct cleancache_ops
60779 cleancache_register_ops(struct cleancache_ops *ops);
60780 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
60781 index 4a0b483..f1f70ba 100644
60782 --- a/include/linux/clk-provider.h
60783 +++ b/include/linux/clk-provider.h
60784 @@ -110,6 +110,7 @@ struct clk_ops {
60785 unsigned long);
60786 void (*init)(struct clk_hw *hw);
60787 };
60788 +typedef struct clk_ops __no_const clk_ops_no_const;
60789
60790 /**
60791 * struct clk_init_data - holds init data that's common to all clocks and is
60792 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
60793 index 2f40791..9c9e13c 100644
60794 --- a/include/linux/compiler-gcc4.h
60795 +++ b/include/linux/compiler-gcc4.h
60796 @@ -32,6 +32,20 @@
60797 #define __linktime_error(message) __attribute__((__error__(message)))
60798
60799 #if __GNUC_MINOR__ >= 5
60800 +
60801 +#ifdef CONSTIFY_PLUGIN
60802 +#define __no_const __attribute__((no_const))
60803 +#define __do_const __attribute__((do_const))
60804 +#endif
60805 +
60806 +#ifdef SIZE_OVERFLOW_PLUGIN
60807 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
60808 +#endif
60809 +
60810 +#ifdef LATENT_ENTROPY_PLUGIN
60811 +#define __latent_entropy __attribute__((latent_entropy))
60812 +#endif
60813 +
60814 /*
60815 * Mark a position in code as unreachable. This can be used to
60816 * suppress control flow warnings after asm blocks that transfer
60817 @@ -47,6 +61,11 @@
60818 #define __noclone __attribute__((__noclone__))
60819
60820 #endif
60821 +
60822 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
60823 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
60824 +#define __bos0(ptr) __bos((ptr), 0)
60825 +#define __bos1(ptr) __bos((ptr), 1)
60826 #endif
60827
60828 #if __GNUC_MINOR__ > 0
60829 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
60830 index 923d093..1fef491 100644
60831 --- a/include/linux/compiler.h
60832 +++ b/include/linux/compiler.h
60833 @@ -5,31 +5,62 @@
60834
60835 #ifdef __CHECKER__
60836 # define __user __attribute__((noderef, address_space(1)))
60837 +# define __force_user __force __user
60838 # define __kernel __attribute__((address_space(0)))
60839 +# define __force_kernel __force __kernel
60840 # define __safe __attribute__((safe))
60841 # define __force __attribute__((force))
60842 # define __nocast __attribute__((nocast))
60843 # define __iomem __attribute__((noderef, address_space(2)))
60844 +# define __force_iomem __force __iomem
60845 # define __acquires(x) __attribute__((context(x,0,1)))
60846 # define __releases(x) __attribute__((context(x,1,0)))
60847 # define __acquire(x) __context__(x,1)
60848 # define __release(x) __context__(x,-1)
60849 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
60850 # define __percpu __attribute__((noderef, address_space(3)))
60851 +# define __force_percpu __force __percpu
60852 #ifdef CONFIG_SPARSE_RCU_POINTER
60853 # define __rcu __attribute__((noderef, address_space(4)))
60854 +# define __force_rcu __force __rcu
60855 #else
60856 # define __rcu
60857 +# define __force_rcu
60858 #endif
60859 extern void __chk_user_ptr(const volatile void __user *);
60860 extern void __chk_io_ptr(const volatile void __iomem *);
60861 +#elif defined(CHECKER_PLUGIN)
60862 +//# define __user
60863 +//# define __force_user
60864 +//# define __kernel
60865 +//# define __force_kernel
60866 +# define __safe
60867 +# define __force
60868 +# define __nocast
60869 +# define __iomem
60870 +# define __force_iomem
60871 +# define __chk_user_ptr(x) (void)0
60872 +# define __chk_io_ptr(x) (void)0
60873 +# define __builtin_warning(x, y...) (1)
60874 +# define __acquires(x)
60875 +# define __releases(x)
60876 +# define __acquire(x) (void)0
60877 +# define __release(x) (void)0
60878 +# define __cond_lock(x,c) (c)
60879 +# define __percpu
60880 +# define __force_percpu
60881 +# define __rcu
60882 +# define __force_rcu
60883 #else
60884 # define __user
60885 +# define __force_user
60886 # define __kernel
60887 +# define __force_kernel
60888 # define __safe
60889 # define __force
60890 # define __nocast
60891 # define __iomem
60892 +# define __force_iomem
60893 # define __chk_user_ptr(x) (void)0
60894 # define __chk_io_ptr(x) (void)0
60895 # define __builtin_warning(x, y...) (1)
60896 @@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
60897 # define __release(x) (void)0
60898 # define __cond_lock(x,c) (c)
60899 # define __percpu
60900 +# define __force_percpu
60901 # define __rcu
60902 +# define __force_rcu
60903 #endif
60904
60905 #ifdef __KERNEL__
60906 @@ -264,6 +297,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60907 # define __attribute_const__ /* unimplemented */
60908 #endif
60909
60910 +#ifndef __no_const
60911 +# define __no_const
60912 +#endif
60913 +
60914 +#ifndef __do_const
60915 +# define __do_const
60916 +#endif
60917 +
60918 +#ifndef __size_overflow
60919 +# define __size_overflow(...)
60920 +#endif
60921 +
60922 +#ifndef __latent_entropy
60923 +# define __latent_entropy
60924 +#endif
60925 +
60926 /*
60927 * Tell gcc if a function is cold. The compiler will assume any path
60928 * directly leading to the call is unlikely.
60929 @@ -273,6 +322,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60930 #define __cold
60931 #endif
60932
60933 +#ifndef __alloc_size
60934 +#define __alloc_size(...)
60935 +#endif
60936 +
60937 +#ifndef __bos
60938 +#define __bos(ptr, arg)
60939 +#endif
60940 +
60941 +#ifndef __bos0
60942 +#define __bos0(ptr)
60943 +#endif
60944 +
60945 +#ifndef __bos1
60946 +#define __bos1(ptr)
60947 +#endif
60948 +
60949 /* Simple shorthand for a section definition */
60950 #ifndef __section
60951 # define __section(S) __attribute__ ((__section__(#S)))
60952 @@ -308,6 +373,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60953 * use is to mediate communication between process-level code and irq/NMI
60954 * handlers, all running on the same CPU.
60955 */
60956 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
60957 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
60958 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
60959
60960 #endif /* __LINUX_COMPILER_H */
60961 diff --git a/include/linux/cred.h b/include/linux/cred.h
60962 index ebbed2c..908cc2c 100644
60963 --- a/include/linux/cred.h
60964 +++ b/include/linux/cred.h
60965 @@ -208,6 +208,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
60966 static inline void validate_process_creds(void)
60967 {
60968 }
60969 +static inline void validate_task_creds(struct task_struct *task)
60970 +{
60971 +}
60972 #endif
60973
60974 /**
60975 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
60976 index b92eadf..b4ecdc1 100644
60977 --- a/include/linux/crypto.h
60978 +++ b/include/linux/crypto.h
60979 @@ -373,7 +373,7 @@ struct cipher_tfm {
60980 const u8 *key, unsigned int keylen);
60981 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60982 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60983 -};
60984 +} __no_const;
60985
60986 struct hash_tfm {
60987 int (*init)(struct hash_desc *desc);
60988 @@ -394,13 +394,13 @@ struct compress_tfm {
60989 int (*cot_decompress)(struct crypto_tfm *tfm,
60990 const u8 *src, unsigned int slen,
60991 u8 *dst, unsigned int *dlen);
60992 -};
60993 +} __no_const;
60994
60995 struct rng_tfm {
60996 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
60997 unsigned int dlen);
60998 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
60999 -};
61000 +} __no_const;
61001
61002 #define crt_ablkcipher crt_u.ablkcipher
61003 #define crt_aead crt_u.aead
61004 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
61005 index 7925bf0..d5143d2 100644
61006 --- a/include/linux/decompress/mm.h
61007 +++ b/include/linux/decompress/mm.h
61008 @@ -77,7 +77,7 @@ static void free(void *where)
61009 * warnings when not needed (indeed large_malloc / large_free are not
61010 * needed by inflate */
61011
61012 -#define malloc(a) kmalloc(a, GFP_KERNEL)
61013 +#define malloc(a) kmalloc((a), GFP_KERNEL)
61014 #define free(a) kfree(a)
61015
61016 #define large_malloc(a) vmalloc(a)
61017 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
61018 index dfc099e..e583e66 100644
61019 --- a/include/linux/dma-mapping.h
61020 +++ b/include/linux/dma-mapping.h
61021 @@ -51,7 +51,7 @@ struct dma_map_ops {
61022 u64 (*get_required_mask)(struct device *dev);
61023 #endif
61024 int is_phys;
61025 -};
61026 +} __do_const;
61027
61028 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
61029
61030 diff --git a/include/linux/efi.h b/include/linux/efi.h
61031 index ec45ccd..9923c32 100644
61032 --- a/include/linux/efi.h
61033 +++ b/include/linux/efi.h
61034 @@ -635,7 +635,7 @@ struct efivar_operations {
61035 efi_get_variable_t *get_variable;
61036 efi_get_next_variable_t *get_next_variable;
61037 efi_set_variable_t *set_variable;
61038 -};
61039 +} __no_const;
61040
61041 struct efivars {
61042 /*
61043 diff --git a/include/linux/elf.h b/include/linux/elf.h
61044 index 999b4f5..57753b4 100644
61045 --- a/include/linux/elf.h
61046 +++ b/include/linux/elf.h
61047 @@ -40,6 +40,17 @@ typedef __s64 Elf64_Sxword;
61048 #define PT_GNU_EH_FRAME 0x6474e550
61049
61050 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
61051 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
61052 +
61053 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
61054 +
61055 +/* Constants for the e_flags field */
61056 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
61057 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
61058 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
61059 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
61060 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
61061 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
61062
61063 /*
61064 * Extended Numbering
61065 @@ -97,6 +108,8 @@ typedef __s64 Elf64_Sxword;
61066 #define DT_DEBUG 21
61067 #define DT_TEXTREL 22
61068 #define DT_JMPREL 23
61069 +#define DT_FLAGS 30
61070 + #define DF_TEXTREL 0x00000004
61071 #define DT_ENCODING 32
61072 #define OLD_DT_LOOS 0x60000000
61073 #define DT_LOOS 0x6000000d
61074 @@ -243,6 +256,19 @@ typedef struct elf64_hdr {
61075 #define PF_W 0x2
61076 #define PF_X 0x1
61077
61078 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
61079 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
61080 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
61081 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
61082 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
61083 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
61084 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
61085 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
61086 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
61087 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
61088 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
61089 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
61090 +
61091 typedef struct elf32_phdr{
61092 Elf32_Word p_type;
61093 Elf32_Off p_offset;
61094 @@ -335,6 +361,8 @@ typedef struct elf64_shdr {
61095 #define EI_OSABI 7
61096 #define EI_PAD 8
61097
61098 +#define EI_PAX 14
61099 +
61100 #define ELFMAG0 0x7f /* EI_MAG */
61101 #define ELFMAG1 'E'
61102 #define ELFMAG2 'L'
61103 @@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
61104 #define elf_note elf32_note
61105 #define elf_addr_t Elf32_Off
61106 #define Elf_Half Elf32_Half
61107 +#define elf_dyn Elf32_Dyn
61108
61109 #else
61110
61111 @@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
61112 #define elf_note elf64_note
61113 #define elf_addr_t Elf64_Off
61114 #define Elf_Half Elf64_Half
61115 +#define elf_dyn Elf64_Dyn
61116
61117 #endif
61118
61119 diff --git a/include/linux/filter.h b/include/linux/filter.h
61120 index 82b0135..917914d 100644
61121 --- a/include/linux/filter.h
61122 +++ b/include/linux/filter.h
61123 @@ -146,6 +146,7 @@ struct compat_sock_fprog {
61124
61125 struct sk_buff;
61126 struct sock;
61127 +struct bpf_jit_work;
61128
61129 struct sk_filter
61130 {
61131 @@ -153,6 +154,9 @@ struct sk_filter
61132 unsigned int len; /* Number of filter blocks */
61133 unsigned int (*bpf_func)(const struct sk_buff *skb,
61134 const struct sock_filter *filter);
61135 +#ifdef CONFIG_BPF_JIT
61136 + struct bpf_jit_work *work;
61137 +#endif
61138 struct rcu_head rcu;
61139 struct sock_filter insns[0];
61140 };
61141 diff --git a/include/linux/firewire.h b/include/linux/firewire.h
61142 index 7edcf10..714d5e8 100644
61143 --- a/include/linux/firewire.h
61144 +++ b/include/linux/firewire.h
61145 @@ -430,7 +430,7 @@ struct fw_iso_context {
61146 union {
61147 fw_iso_callback_t sc;
61148 fw_iso_mc_callback_t mc;
61149 - } callback;
61150 + } __no_const callback;
61151 void *callback_data;
61152 };
61153
61154 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
61155 index 0e4e2ee..4ff4312 100644
61156 --- a/include/linux/frontswap.h
61157 +++ b/include/linux/frontswap.h
61158 @@ -11,7 +11,7 @@ struct frontswap_ops {
61159 int (*load)(unsigned, pgoff_t, struct page *);
61160 void (*invalidate_page)(unsigned, pgoff_t);
61161 void (*invalidate_area)(unsigned);
61162 -};
61163 +} __no_const;
61164
61165 extern bool frontswap_enabled;
61166 extern struct frontswap_ops
61167 diff --git a/include/linux/fs.h b/include/linux/fs.h
61168 index 17fd887..8eebca0 100644
61169 --- a/include/linux/fs.h
61170 +++ b/include/linux/fs.h
61171 @@ -1663,7 +1663,8 @@ struct file_operations {
61172 int (*setlease)(struct file *, long, struct file_lock **);
61173 long (*fallocate)(struct file *file, int mode, loff_t offset,
61174 loff_t len);
61175 -};
61176 +} __do_const;
61177 +typedef struct file_operations __no_const file_operations_no_const;
61178
61179 struct inode_operations {
61180 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
61181 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
61182 index 003dc0f..3c4ea97 100644
61183 --- a/include/linux/fs_struct.h
61184 +++ b/include/linux/fs_struct.h
61185 @@ -6,7 +6,7 @@
61186 #include <linux/seqlock.h>
61187
61188 struct fs_struct {
61189 - int users;
61190 + atomic_t users;
61191 spinlock_t lock;
61192 seqcount_t seq;
61193 int umask;
61194 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
61195 index ce31408..b1ad003 100644
61196 --- a/include/linux/fscache-cache.h
61197 +++ b/include/linux/fscache-cache.h
61198 @@ -102,7 +102,7 @@ struct fscache_operation {
61199 fscache_operation_release_t release;
61200 };
61201
61202 -extern atomic_t fscache_op_debug_id;
61203 +extern atomic_unchecked_t fscache_op_debug_id;
61204 extern void fscache_op_work_func(struct work_struct *work);
61205
61206 extern void fscache_enqueue_operation(struct fscache_operation *);
61207 @@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
61208 {
61209 INIT_WORK(&op->work, fscache_op_work_func);
61210 atomic_set(&op->usage, 1);
61211 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
61212 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
61213 op->processor = processor;
61214 op->release = release;
61215 INIT_LIST_HEAD(&op->pend_link);
61216 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
61217 index a6dfe69..569586df 100644
61218 --- a/include/linux/fsnotify.h
61219 +++ b/include/linux/fsnotify.h
61220 @@ -315,7 +315,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
61221 */
61222 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
61223 {
61224 - return kstrdup(name, GFP_KERNEL);
61225 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
61226 }
61227
61228 /*
61229 diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
61230 index 63d966d..cdcb717 100644
61231 --- a/include/linux/fsnotify_backend.h
61232 +++ b/include/linux/fsnotify_backend.h
61233 @@ -105,6 +105,7 @@ struct fsnotify_ops {
61234 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
61235 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
61236 };
61237 +typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
61238
61239 /*
61240 * A group is a "thing" that wants to receive notification about filesystem
61241 diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
61242 index 176a939..1462211 100644
61243 --- a/include/linux/ftrace_event.h
61244 +++ b/include/linux/ftrace_event.h
61245 @@ -97,7 +97,7 @@ struct trace_event_functions {
61246 trace_print_func raw;
61247 trace_print_func hex;
61248 trace_print_func binary;
61249 -};
61250 +} __no_const;
61251
61252 struct trace_event {
61253 struct hlist_node node;
61254 @@ -263,7 +263,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
61255 extern int trace_add_event_call(struct ftrace_event_call *call);
61256 extern void trace_remove_event_call(struct ftrace_event_call *call);
61257
61258 -#define is_signed_type(type) (((type)(-1)) < 0)
61259 +#define is_signed_type(type) (((type)(-1)) < (type)1)
61260
61261 int trace_set_clr_event(const char *system, const char *event, int set);
61262
61263 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
61264 index 017a7fb..33a8507 100644
61265 --- a/include/linux/genhd.h
61266 +++ b/include/linux/genhd.h
61267 @@ -185,7 +185,7 @@ struct gendisk {
61268 struct kobject *slave_dir;
61269
61270 struct timer_rand_state *random;
61271 - atomic_t sync_io; /* RAID */
61272 + atomic_unchecked_t sync_io; /* RAID */
61273 struct disk_events *ev;
61274 #ifdef CONFIG_BLK_DEV_INTEGRITY
61275 struct blk_integrity *integrity;
61276 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
61277 index 1e49be4..b8a9305 100644
61278 --- a/include/linux/gfp.h
61279 +++ b/include/linux/gfp.h
61280 @@ -38,6 +38,12 @@ struct vm_area_struct;
61281 #define ___GFP_OTHER_NODE 0x800000u
61282 #define ___GFP_WRITE 0x1000000u
61283
61284 +#ifdef CONFIG_PAX_USERCOPY_SLABS
61285 +#define ___GFP_USERCOPY 0x2000000u
61286 +#else
61287 +#define ___GFP_USERCOPY 0
61288 +#endif
61289 +
61290 /*
61291 * GFP bitmasks..
61292 *
61293 @@ -87,6 +93,7 @@ struct vm_area_struct;
61294 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
61295 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
61296 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
61297 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
61298
61299 /*
61300 * This may seem redundant, but it's a way of annotating false positives vs.
61301 @@ -94,7 +101,7 @@ struct vm_area_struct;
61302 */
61303 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
61304
61305 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
61306 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
61307 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
61308
61309 /* This equals 0, but use constants in case they ever change */
61310 @@ -148,6 +155,8 @@ struct vm_area_struct;
61311 /* 4GB DMA on some platforms */
61312 #define GFP_DMA32 __GFP_DMA32
61313
61314 +#define GFP_USERCOPY __GFP_USERCOPY
61315 +
61316 /* Convert GFP flags to their corresponding migrate type */
61317 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
61318 {
61319 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
61320 new file mode 100644
61321 index 0000000..c938b1f
61322 --- /dev/null
61323 +++ b/include/linux/gracl.h
61324 @@ -0,0 +1,319 @@
61325 +#ifndef GR_ACL_H
61326 +#define GR_ACL_H
61327 +
61328 +#include <linux/grdefs.h>
61329 +#include <linux/resource.h>
61330 +#include <linux/capability.h>
61331 +#include <linux/dcache.h>
61332 +#include <asm/resource.h>
61333 +
61334 +/* Major status information */
61335 +
61336 +#define GR_VERSION "grsecurity 2.9.1"
61337 +#define GRSECURITY_VERSION 0x2901
61338 +
61339 +enum {
61340 + GR_SHUTDOWN = 0,
61341 + GR_ENABLE = 1,
61342 + GR_SPROLE = 2,
61343 + GR_RELOAD = 3,
61344 + GR_SEGVMOD = 4,
61345 + GR_STATUS = 5,
61346 + GR_UNSPROLE = 6,
61347 + GR_PASSSET = 7,
61348 + GR_SPROLEPAM = 8,
61349 +};
61350 +
61351 +/* Password setup definitions
61352 + * kernel/grhash.c */
61353 +enum {
61354 + GR_PW_LEN = 128,
61355 + GR_SALT_LEN = 16,
61356 + GR_SHA_LEN = 32,
61357 +};
61358 +
61359 +enum {
61360 + GR_SPROLE_LEN = 64,
61361 +};
61362 +
61363 +enum {
61364 + GR_NO_GLOB = 0,
61365 + GR_REG_GLOB,
61366 + GR_CREATE_GLOB
61367 +};
61368 +
61369 +#define GR_NLIMITS 32
61370 +
61371 +/* Begin Data Structures */
61372 +
61373 +struct sprole_pw {
61374 + unsigned char *rolename;
61375 + unsigned char salt[GR_SALT_LEN];
61376 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
61377 +};
61378 +
61379 +struct name_entry {
61380 + __u32 key;
61381 + ino_t inode;
61382 + dev_t device;
61383 + char *name;
61384 + __u16 len;
61385 + __u8 deleted;
61386 + struct name_entry *prev;
61387 + struct name_entry *next;
61388 +};
61389 +
61390 +struct inodev_entry {
61391 + struct name_entry *nentry;
61392 + struct inodev_entry *prev;
61393 + struct inodev_entry *next;
61394 +};
61395 +
61396 +struct acl_role_db {
61397 + struct acl_role_label **r_hash;
61398 + __u32 r_size;
61399 +};
61400 +
61401 +struct inodev_db {
61402 + struct inodev_entry **i_hash;
61403 + __u32 i_size;
61404 +};
61405 +
61406 +struct name_db {
61407 + struct name_entry **n_hash;
61408 + __u32 n_size;
61409 +};
61410 +
61411 +struct crash_uid {
61412 + uid_t uid;
61413 + unsigned long expires;
61414 +};
61415 +
61416 +struct gr_hash_struct {
61417 + void **table;
61418 + void **nametable;
61419 + void *first;
61420 + __u32 table_size;
61421 + __u32 used_size;
61422 + int type;
61423 +};
61424 +
61425 +/* Userspace Grsecurity ACL data structures */
61426 +
61427 +struct acl_subject_label {
61428 + char *filename;
61429 + ino_t inode;
61430 + dev_t device;
61431 + __u32 mode;
61432 + kernel_cap_t cap_mask;
61433 + kernel_cap_t cap_lower;
61434 + kernel_cap_t cap_invert_audit;
61435 +
61436 + struct rlimit res[GR_NLIMITS];
61437 + __u32 resmask;
61438 +
61439 + __u8 user_trans_type;
61440 + __u8 group_trans_type;
61441 + uid_t *user_transitions;
61442 + gid_t *group_transitions;
61443 + __u16 user_trans_num;
61444 + __u16 group_trans_num;
61445 +
61446 + __u32 sock_families[2];
61447 + __u32 ip_proto[8];
61448 + __u32 ip_type;
61449 + struct acl_ip_label **ips;
61450 + __u32 ip_num;
61451 + __u32 inaddr_any_override;
61452 +
61453 + __u32 crashes;
61454 + unsigned long expires;
61455 +
61456 + struct acl_subject_label *parent_subject;
61457 + struct gr_hash_struct *hash;
61458 + struct acl_subject_label *prev;
61459 + struct acl_subject_label *next;
61460 +
61461 + struct acl_object_label **obj_hash;
61462 + __u32 obj_hash_size;
61463 + __u16 pax_flags;
61464 +};
61465 +
61466 +struct role_allowed_ip {
61467 + __u32 addr;
61468 + __u32 netmask;
61469 +
61470 + struct role_allowed_ip *prev;
61471 + struct role_allowed_ip *next;
61472 +};
61473 +
61474 +struct role_transition {
61475 + char *rolename;
61476 +
61477 + struct role_transition *prev;
61478 + struct role_transition *next;
61479 +};
61480 +
61481 +struct acl_role_label {
61482 + char *rolename;
61483 + uid_t uidgid;
61484 + __u16 roletype;
61485 +
61486 + __u16 auth_attempts;
61487 + unsigned long expires;
61488 +
61489 + struct acl_subject_label *root_label;
61490 + struct gr_hash_struct *hash;
61491 +
61492 + struct acl_role_label *prev;
61493 + struct acl_role_label *next;
61494 +
61495 + struct role_transition *transitions;
61496 + struct role_allowed_ip *allowed_ips;
61497 + uid_t *domain_children;
61498 + __u16 domain_child_num;
61499 +
61500 + umode_t umask;
61501 +
61502 + struct acl_subject_label **subj_hash;
61503 + __u32 subj_hash_size;
61504 +};
61505 +
61506 +struct user_acl_role_db {
61507 + struct acl_role_label **r_table;
61508 + __u32 num_pointers; /* Number of allocations to track */
61509 + __u32 num_roles; /* Number of roles */
61510 + __u32 num_domain_children; /* Number of domain children */
61511 + __u32 num_subjects; /* Number of subjects */
61512 + __u32 num_objects; /* Number of objects */
61513 +};
61514 +
61515 +struct acl_object_label {
61516 + char *filename;
61517 + ino_t inode;
61518 + dev_t device;
61519 + __u32 mode;
61520 +
61521 + struct acl_subject_label *nested;
61522 + struct acl_object_label *globbed;
61523 +
61524 + /* next two structures not used */
61525 +
61526 + struct acl_object_label *prev;
61527 + struct acl_object_label *next;
61528 +};
61529 +
61530 +struct acl_ip_label {
61531 + char *iface;
61532 + __u32 addr;
61533 + __u32 netmask;
61534 + __u16 low, high;
61535 + __u8 mode;
61536 + __u32 type;
61537 + __u32 proto[8];
61538 +
61539 + /* next two structures not used */
61540 +
61541 + struct acl_ip_label *prev;
61542 + struct acl_ip_label *next;
61543 +};
61544 +
61545 +struct gr_arg {
61546 + struct user_acl_role_db role_db;
61547 + unsigned char pw[GR_PW_LEN];
61548 + unsigned char salt[GR_SALT_LEN];
61549 + unsigned char sum[GR_SHA_LEN];
61550 + unsigned char sp_role[GR_SPROLE_LEN];
61551 + struct sprole_pw *sprole_pws;
61552 + dev_t segv_device;
61553 + ino_t segv_inode;
61554 + uid_t segv_uid;
61555 + __u16 num_sprole_pws;
61556 + __u16 mode;
61557 +};
61558 +
61559 +struct gr_arg_wrapper {
61560 + struct gr_arg *arg;
61561 + __u32 version;
61562 + __u32 size;
61563 +};
61564 +
61565 +struct subject_map {
61566 + struct acl_subject_label *user;
61567 + struct acl_subject_label *kernel;
61568 + struct subject_map *prev;
61569 + struct subject_map *next;
61570 +};
61571 +
61572 +struct acl_subj_map_db {
61573 + struct subject_map **s_hash;
61574 + __u32 s_size;
61575 +};
61576 +
61577 +/* End Data Structures Section */
61578 +
61579 +/* Hash functions generated by empirical testing by Brad Spengler
61580 + Makes good use of the low bits of the inode. Generally 0-1 times
61581 + in loop for successful match. 0-3 for unsuccessful match.
61582 + Shift/add algorithm with modulus of table size and an XOR*/
61583 +
61584 +static __inline__ unsigned int
61585 +rhash(const uid_t uid, const __u16 type, const unsigned int sz)
61586 +{
61587 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
61588 +}
61589 +
61590 + static __inline__ unsigned int
61591 +shash(const struct acl_subject_label *userp, const unsigned int sz)
61592 +{
61593 + return ((const unsigned long)userp % sz);
61594 +}
61595 +
61596 +static __inline__ unsigned int
61597 +fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
61598 +{
61599 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
61600 +}
61601 +
61602 +static __inline__ unsigned int
61603 +nhash(const char *name, const __u16 len, const unsigned int sz)
61604 +{
61605 + return full_name_hash((const unsigned char *)name, len) % sz;
61606 +}
61607 +
61608 +#define FOR_EACH_ROLE_START(role) \
61609 + role = role_list; \
61610 + while (role) {
61611 +
61612 +#define FOR_EACH_ROLE_END(role) \
61613 + role = role->prev; \
61614 + }
61615 +
61616 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
61617 + subj = NULL; \
61618 + iter = 0; \
61619 + while (iter < role->subj_hash_size) { \
61620 + if (subj == NULL) \
61621 + subj = role->subj_hash[iter]; \
61622 + if (subj == NULL) { \
61623 + iter++; \
61624 + continue; \
61625 + }
61626 +
61627 +#define FOR_EACH_SUBJECT_END(subj,iter) \
61628 + subj = subj->next; \
61629 + if (subj == NULL) \
61630 + iter++; \
61631 + }
61632 +
61633 +
61634 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
61635 + subj = role->hash->first; \
61636 + while (subj != NULL) {
61637 +
61638 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
61639 + subj = subj->next; \
61640 + }
61641 +
61642 +#endif
61643 +
61644 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
61645 new file mode 100644
61646 index 0000000..323ecf2
61647 --- /dev/null
61648 +++ b/include/linux/gralloc.h
61649 @@ -0,0 +1,9 @@
61650 +#ifndef __GRALLOC_H
61651 +#define __GRALLOC_H
61652 +
61653 +void acl_free_all(void);
61654 +int acl_alloc_stack_init(unsigned long size);
61655 +void *acl_alloc(unsigned long len);
61656 +void *acl_alloc_num(unsigned long num, unsigned long len);
61657 +
61658 +#endif
61659 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
61660 new file mode 100644
61661 index 0000000..b30e9bc
61662 --- /dev/null
61663 +++ b/include/linux/grdefs.h
61664 @@ -0,0 +1,140 @@
61665 +#ifndef GRDEFS_H
61666 +#define GRDEFS_H
61667 +
61668 +/* Begin grsecurity status declarations */
61669 +
61670 +enum {
61671 + GR_READY = 0x01,
61672 + GR_STATUS_INIT = 0x00 // disabled state
61673 +};
61674 +
61675 +/* Begin ACL declarations */
61676 +
61677 +/* Role flags */
61678 +
61679 +enum {
61680 + GR_ROLE_USER = 0x0001,
61681 + GR_ROLE_GROUP = 0x0002,
61682 + GR_ROLE_DEFAULT = 0x0004,
61683 + GR_ROLE_SPECIAL = 0x0008,
61684 + GR_ROLE_AUTH = 0x0010,
61685 + GR_ROLE_NOPW = 0x0020,
61686 + GR_ROLE_GOD = 0x0040,
61687 + GR_ROLE_LEARN = 0x0080,
61688 + GR_ROLE_TPE = 0x0100,
61689 + GR_ROLE_DOMAIN = 0x0200,
61690 + GR_ROLE_PAM = 0x0400,
61691 + GR_ROLE_PERSIST = 0x0800
61692 +};
61693 +
61694 +/* ACL Subject and Object mode flags */
61695 +enum {
61696 + GR_DELETED = 0x80000000
61697 +};
61698 +
61699 +/* ACL Object-only mode flags */
61700 +enum {
61701 + GR_READ = 0x00000001,
61702 + GR_APPEND = 0x00000002,
61703 + GR_WRITE = 0x00000004,
61704 + GR_EXEC = 0x00000008,
61705 + GR_FIND = 0x00000010,
61706 + GR_INHERIT = 0x00000020,
61707 + GR_SETID = 0x00000040,
61708 + GR_CREATE = 0x00000080,
61709 + GR_DELETE = 0x00000100,
61710 + GR_LINK = 0x00000200,
61711 + GR_AUDIT_READ = 0x00000400,
61712 + GR_AUDIT_APPEND = 0x00000800,
61713 + GR_AUDIT_WRITE = 0x00001000,
61714 + GR_AUDIT_EXEC = 0x00002000,
61715 + GR_AUDIT_FIND = 0x00004000,
61716 + GR_AUDIT_INHERIT= 0x00008000,
61717 + GR_AUDIT_SETID = 0x00010000,
61718 + GR_AUDIT_CREATE = 0x00020000,
61719 + GR_AUDIT_DELETE = 0x00040000,
61720 + GR_AUDIT_LINK = 0x00080000,
61721 + GR_PTRACERD = 0x00100000,
61722 + GR_NOPTRACE = 0x00200000,
61723 + GR_SUPPRESS = 0x00400000,
61724 + GR_NOLEARN = 0x00800000,
61725 + GR_INIT_TRANSFER= 0x01000000
61726 +};
61727 +
61728 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
61729 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
61730 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
61731 +
61732 +/* ACL subject-only mode flags */
61733 +enum {
61734 + GR_KILL = 0x00000001,
61735 + GR_VIEW = 0x00000002,
61736 + GR_PROTECTED = 0x00000004,
61737 + GR_LEARN = 0x00000008,
61738 + GR_OVERRIDE = 0x00000010,
61739 + /* just a placeholder, this mode is only used in userspace */
61740 + GR_DUMMY = 0x00000020,
61741 + GR_PROTSHM = 0x00000040,
61742 + GR_KILLPROC = 0x00000080,
61743 + GR_KILLIPPROC = 0x00000100,
61744 + /* just a placeholder, this mode is only used in userspace */
61745 + GR_NOTROJAN = 0x00000200,
61746 + GR_PROTPROCFD = 0x00000400,
61747 + GR_PROCACCT = 0x00000800,
61748 + GR_RELAXPTRACE = 0x00001000,
61749 + GR_NESTED = 0x00002000,
61750 + GR_INHERITLEARN = 0x00004000,
61751 + GR_PROCFIND = 0x00008000,
61752 + GR_POVERRIDE = 0x00010000,
61753 + GR_KERNELAUTH = 0x00020000,
61754 + GR_ATSECURE = 0x00040000,
61755 + GR_SHMEXEC = 0x00080000
61756 +};
61757 +
61758 +enum {
61759 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
61760 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
61761 + GR_PAX_ENABLE_MPROTECT = 0x0004,
61762 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
61763 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
61764 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
61765 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
61766 + GR_PAX_DISABLE_MPROTECT = 0x0400,
61767 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
61768 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
61769 +};
61770 +
61771 +enum {
61772 + GR_ID_USER = 0x01,
61773 + GR_ID_GROUP = 0x02,
61774 +};
61775 +
61776 +enum {
61777 + GR_ID_ALLOW = 0x01,
61778 + GR_ID_DENY = 0x02,
61779 +};
61780 +
61781 +#define GR_CRASH_RES 31
61782 +#define GR_UIDTABLE_MAX 500
61783 +
61784 +/* begin resource learning section */
61785 +enum {
61786 + GR_RLIM_CPU_BUMP = 60,
61787 + GR_RLIM_FSIZE_BUMP = 50000,
61788 + GR_RLIM_DATA_BUMP = 10000,
61789 + GR_RLIM_STACK_BUMP = 1000,
61790 + GR_RLIM_CORE_BUMP = 10000,
61791 + GR_RLIM_RSS_BUMP = 500000,
61792 + GR_RLIM_NPROC_BUMP = 1,
61793 + GR_RLIM_NOFILE_BUMP = 5,
61794 + GR_RLIM_MEMLOCK_BUMP = 50000,
61795 + GR_RLIM_AS_BUMP = 500000,
61796 + GR_RLIM_LOCKS_BUMP = 2,
61797 + GR_RLIM_SIGPENDING_BUMP = 5,
61798 + GR_RLIM_MSGQUEUE_BUMP = 10000,
61799 + GR_RLIM_NICE_BUMP = 1,
61800 + GR_RLIM_RTPRIO_BUMP = 1,
61801 + GR_RLIM_RTTIME_BUMP = 1000000
61802 +};
61803 +
61804 +#endif
61805 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
61806 new file mode 100644
61807 index 0000000..c9292f7
61808 --- /dev/null
61809 +++ b/include/linux/grinternal.h
61810 @@ -0,0 +1,223 @@
61811 +#ifndef __GRINTERNAL_H
61812 +#define __GRINTERNAL_H
61813 +
61814 +#ifdef CONFIG_GRKERNSEC
61815 +
61816 +#include <linux/fs.h>
61817 +#include <linux/mnt_namespace.h>
61818 +#include <linux/nsproxy.h>
61819 +#include <linux/gracl.h>
61820 +#include <linux/grdefs.h>
61821 +#include <linux/grmsg.h>
61822 +
61823 +void gr_add_learn_entry(const char *fmt, ...)
61824 + __attribute__ ((format (printf, 1, 2)));
61825 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
61826 + const struct vfsmount *mnt);
61827 +__u32 gr_check_create(const struct dentry *new_dentry,
61828 + const struct dentry *parent,
61829 + const struct vfsmount *mnt, const __u32 mode);
61830 +int gr_check_protected_task(const struct task_struct *task);
61831 +__u32 to_gr_audit(const __u32 reqmode);
61832 +int gr_set_acls(const int type);
61833 +int gr_apply_subject_to_task(struct task_struct *task);
61834 +int gr_acl_is_enabled(void);
61835 +char gr_roletype_to_char(void);
61836 +
61837 +void gr_handle_alertkill(struct task_struct *task);
61838 +char *gr_to_filename(const struct dentry *dentry,
61839 + const struct vfsmount *mnt);
61840 +char *gr_to_filename1(const struct dentry *dentry,
61841 + const struct vfsmount *mnt);
61842 +char *gr_to_filename2(const struct dentry *dentry,
61843 + const struct vfsmount *mnt);
61844 +char *gr_to_filename3(const struct dentry *dentry,
61845 + const struct vfsmount *mnt);
61846 +
61847 +extern int grsec_enable_ptrace_readexec;
61848 +extern int grsec_enable_harden_ptrace;
61849 +extern int grsec_enable_link;
61850 +extern int grsec_enable_fifo;
61851 +extern int grsec_enable_execve;
61852 +extern int grsec_enable_shm;
61853 +extern int grsec_enable_execlog;
61854 +extern int grsec_enable_signal;
61855 +extern int grsec_enable_audit_ptrace;
61856 +extern int grsec_enable_forkfail;
61857 +extern int grsec_enable_time;
61858 +extern int grsec_enable_rofs;
61859 +extern int grsec_enable_chroot_shmat;
61860 +extern int grsec_enable_chroot_mount;
61861 +extern int grsec_enable_chroot_double;
61862 +extern int grsec_enable_chroot_pivot;
61863 +extern int grsec_enable_chroot_chdir;
61864 +extern int grsec_enable_chroot_chmod;
61865 +extern int grsec_enable_chroot_mknod;
61866 +extern int grsec_enable_chroot_fchdir;
61867 +extern int grsec_enable_chroot_nice;
61868 +extern int grsec_enable_chroot_execlog;
61869 +extern int grsec_enable_chroot_caps;
61870 +extern int grsec_enable_chroot_sysctl;
61871 +extern int grsec_enable_chroot_unix;
61872 +extern int grsec_enable_symlinkown;
61873 +extern int grsec_symlinkown_gid;
61874 +extern int grsec_enable_tpe;
61875 +extern int grsec_tpe_gid;
61876 +extern int grsec_enable_tpe_all;
61877 +extern int grsec_enable_tpe_invert;
61878 +extern int grsec_enable_socket_all;
61879 +extern int grsec_socket_all_gid;
61880 +extern int grsec_enable_socket_client;
61881 +extern int grsec_socket_client_gid;
61882 +extern int grsec_enable_socket_server;
61883 +extern int grsec_socket_server_gid;
61884 +extern int grsec_audit_gid;
61885 +extern int grsec_enable_group;
61886 +extern int grsec_enable_audit_textrel;
61887 +extern int grsec_enable_log_rwxmaps;
61888 +extern int grsec_enable_mount;
61889 +extern int grsec_enable_chdir;
61890 +extern int grsec_resource_logging;
61891 +extern int grsec_enable_blackhole;
61892 +extern int grsec_lastack_retries;
61893 +extern int grsec_enable_brute;
61894 +extern int grsec_lock;
61895 +
61896 +extern spinlock_t grsec_alert_lock;
61897 +extern unsigned long grsec_alert_wtime;
61898 +extern unsigned long grsec_alert_fyet;
61899 +
61900 +extern spinlock_t grsec_audit_lock;
61901 +
61902 +extern rwlock_t grsec_exec_file_lock;
61903 +
61904 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
61905 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
61906 + (tsk)->exec_file->f_vfsmnt) : "/")
61907 +
61908 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
61909 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
61910 + (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61911 +
61912 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
61913 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
61914 + (tsk)->exec_file->f_vfsmnt) : "/")
61915 +
61916 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
61917 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
61918 + (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61919 +
61920 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
61921 +
61922 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
61923 +
61924 +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
61925 + (task)->pid, (cred)->uid, \
61926 + (cred)->euid, (cred)->gid, (cred)->egid, \
61927 + gr_parent_task_fullpath(task), \
61928 + (task)->real_parent->comm, (task)->real_parent->pid, \
61929 + (pcred)->uid, (pcred)->euid, \
61930 + (pcred)->gid, (pcred)->egid
61931 +
61932 +#define GR_CHROOT_CAPS {{ \
61933 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
61934 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
61935 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
61936 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
61937 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
61938 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
61939 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
61940 +
61941 +#define security_learn(normal_msg,args...) \
61942 +({ \
61943 + read_lock(&grsec_exec_file_lock); \
61944 + gr_add_learn_entry(normal_msg "\n", ## args); \
61945 + read_unlock(&grsec_exec_file_lock); \
61946 +})
61947 +
61948 +enum {
61949 + GR_DO_AUDIT,
61950 + GR_DONT_AUDIT,
61951 + /* used for non-audit messages that we shouldn't kill the task on */
61952 + GR_DONT_AUDIT_GOOD
61953 +};
61954 +
61955 +enum {
61956 + GR_TTYSNIFF,
61957 + GR_RBAC,
61958 + GR_RBAC_STR,
61959 + GR_STR_RBAC,
61960 + GR_RBAC_MODE2,
61961 + GR_RBAC_MODE3,
61962 + GR_FILENAME,
61963 + GR_SYSCTL_HIDDEN,
61964 + GR_NOARGS,
61965 + GR_ONE_INT,
61966 + GR_ONE_INT_TWO_STR,
61967 + GR_ONE_STR,
61968 + GR_STR_INT,
61969 + GR_TWO_STR_INT,
61970 + GR_TWO_INT,
61971 + GR_TWO_U64,
61972 + GR_THREE_INT,
61973 + GR_FIVE_INT_TWO_STR,
61974 + GR_TWO_STR,
61975 + GR_THREE_STR,
61976 + GR_FOUR_STR,
61977 + GR_STR_FILENAME,
61978 + GR_FILENAME_STR,
61979 + GR_FILENAME_TWO_INT,
61980 + GR_FILENAME_TWO_INT_STR,
61981 + GR_TEXTREL,
61982 + GR_PTRACE,
61983 + GR_RESOURCE,
61984 + GR_CAP,
61985 + GR_SIG,
61986 + GR_SIG2,
61987 + GR_CRASH1,
61988 + GR_CRASH2,
61989 + GR_PSACCT,
61990 + GR_RWXMAP
61991 +};
61992 +
61993 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
61994 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
61995 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
61996 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
61997 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
61998 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
61999 +#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)
62000 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
62001 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
62002 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
62003 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
62004 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
62005 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
62006 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
62007 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
62008 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
62009 +#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)
62010 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
62011 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
62012 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
62013 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
62014 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
62015 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
62016 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
62017 +#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)
62018 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
62019 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
62020 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
62021 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
62022 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
62023 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
62024 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
62025 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
62026 +#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)
62027 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
62028 +
62029 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
62030 +
62031 +#endif
62032 +
62033 +#endif
62034 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
62035 new file mode 100644
62036 index 0000000..54f4e85
62037 --- /dev/null
62038 +++ b/include/linux/grmsg.h
62039 @@ -0,0 +1,110 @@
62040 +#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"
62041 +#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"
62042 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
62043 +#define GR_STOPMOD_MSG "denied modification of module state by "
62044 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
62045 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
62046 +#define GR_IOPERM_MSG "denied use of ioperm() by "
62047 +#define GR_IOPL_MSG "denied use of iopl() by "
62048 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
62049 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
62050 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
62051 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
62052 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
62053 +#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"
62054 +#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"
62055 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
62056 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
62057 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
62058 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
62059 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
62060 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
62061 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
62062 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
62063 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
62064 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
62065 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
62066 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
62067 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
62068 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
62069 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
62070 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
62071 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
62072 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
62073 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
62074 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
62075 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
62076 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
62077 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
62078 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
62079 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
62080 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
62081 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
62082 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
62083 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
62084 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
62085 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
62086 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
62087 +#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
62088 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
62089 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
62090 +#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"
62091 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
62092 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
62093 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
62094 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
62095 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
62096 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
62097 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
62098 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
62099 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
62100 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
62101 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
62102 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
62103 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
62104 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
62105 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
62106 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
62107 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
62108 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
62109 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
62110 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
62111 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
62112 +#define GR_NICE_CHROOT_MSG "denied priority change by "
62113 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
62114 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
62115 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
62116 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
62117 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
62118 +#define GR_TIME_MSG "time set by "
62119 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
62120 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
62121 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
62122 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
62123 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
62124 +#define GR_BIND_MSG "denied bind() by "
62125 +#define GR_CONNECT_MSG "denied connect() by "
62126 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
62127 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
62128 +#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"
62129 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
62130 +#define GR_CAP_ACL_MSG "use of %s denied for "
62131 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
62132 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
62133 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
62134 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
62135 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
62136 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
62137 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
62138 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
62139 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
62140 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
62141 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
62142 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
62143 +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
62144 +#define GR_VM86_MSG "denied use of vm86 by "
62145 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
62146 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
62147 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
62148 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
62149 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
62150 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
62151 new file mode 100644
62152 index 0000000..38bfb04
62153 --- /dev/null
62154 +++ b/include/linux/grsecurity.h
62155 @@ -0,0 +1,233 @@
62156 +#ifndef GR_SECURITY_H
62157 +#define GR_SECURITY_H
62158 +#include <linux/fs.h>
62159 +#include <linux/fs_struct.h>
62160 +#include <linux/binfmts.h>
62161 +#include <linux/gracl.h>
62162 +
62163 +/* notify of brain-dead configs */
62164 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
62165 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
62166 +#endif
62167 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
62168 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
62169 +#endif
62170 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
62171 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
62172 +#endif
62173 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
62174 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
62175 +#endif
62176 +
62177 +#include <linux/compat.h>
62178 +
62179 +struct user_arg_ptr {
62180 +#ifdef CONFIG_COMPAT
62181 + bool is_compat;
62182 +#endif
62183 + union {
62184 + const char __user *const __user *native;
62185 +#ifdef CONFIG_COMPAT
62186 + compat_uptr_t __user *compat;
62187 +#endif
62188 + } ptr;
62189 +};
62190 +
62191 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
62192 +void gr_handle_brute_check(void);
62193 +void gr_handle_kernel_exploit(void);
62194 +int gr_process_user_ban(void);
62195 +
62196 +char gr_roletype_to_char(void);
62197 +
62198 +int gr_acl_enable_at_secure(void);
62199 +
62200 +int gr_check_user_change(int real, int effective, int fs);
62201 +int gr_check_group_change(int real, int effective, int fs);
62202 +
62203 +void gr_del_task_from_ip_table(struct task_struct *p);
62204 +
62205 +int gr_pid_is_chrooted(struct task_struct *p);
62206 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
62207 +int gr_handle_chroot_nice(void);
62208 +int gr_handle_chroot_sysctl(const int op);
62209 +int gr_handle_chroot_setpriority(struct task_struct *p,
62210 + const int niceval);
62211 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
62212 +int gr_handle_chroot_chroot(const struct dentry *dentry,
62213 + const struct vfsmount *mnt);
62214 +void gr_handle_chroot_chdir(struct path *path);
62215 +int gr_handle_chroot_chmod(const struct dentry *dentry,
62216 + const struct vfsmount *mnt, const int mode);
62217 +int gr_handle_chroot_mknod(const struct dentry *dentry,
62218 + const struct vfsmount *mnt, const int mode);
62219 +int gr_handle_chroot_mount(const struct dentry *dentry,
62220 + const struct vfsmount *mnt,
62221 + const char *dev_name);
62222 +int gr_handle_chroot_pivot(void);
62223 +int gr_handle_chroot_unix(const pid_t pid);
62224 +
62225 +int gr_handle_rawio(const struct inode *inode);
62226 +
62227 +void gr_handle_ioperm(void);
62228 +void gr_handle_iopl(void);
62229 +
62230 +umode_t gr_acl_umask(void);
62231 +
62232 +int gr_tpe_allow(const struct file *file);
62233 +
62234 +void gr_set_chroot_entries(struct task_struct *task, struct path *path);
62235 +void gr_clear_chroot_entries(struct task_struct *task);
62236 +
62237 +void gr_log_forkfail(const int retval);
62238 +void gr_log_timechange(void);
62239 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
62240 +void gr_log_chdir(const struct dentry *dentry,
62241 + const struct vfsmount *mnt);
62242 +void gr_log_chroot_exec(const struct dentry *dentry,
62243 + const struct vfsmount *mnt);
62244 +void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
62245 +void gr_log_remount(const char *devname, const int retval);
62246 +void gr_log_unmount(const char *devname, const int retval);
62247 +void gr_log_mount(const char *from, const char *to, const int retval);
62248 +void gr_log_textrel(struct vm_area_struct *vma);
62249 +void gr_log_rwxmmap(struct file *file);
62250 +void gr_log_rwxmprotect(struct file *file);
62251 +
62252 +int gr_handle_follow_link(const struct inode *parent,
62253 + const struct inode *inode,
62254 + const struct dentry *dentry,
62255 + const struct vfsmount *mnt);
62256 +int gr_handle_fifo(const struct dentry *dentry,
62257 + const struct vfsmount *mnt,
62258 + const struct dentry *dir, const int flag,
62259 + const int acc_mode);
62260 +int gr_handle_hardlink(const struct dentry *dentry,
62261 + const struct vfsmount *mnt,
62262 + struct inode *inode,
62263 + const int mode, const char *to);
62264 +
62265 +int gr_is_capable(const int cap);
62266 +int gr_is_capable_nolog(const int cap);
62267 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
62268 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
62269 +
62270 +void gr_learn_resource(const struct task_struct *task, const int limit,
62271 + const unsigned long wanted, const int gt);
62272 +void gr_copy_label(struct task_struct *tsk);
62273 +void gr_handle_crash(struct task_struct *task, const int sig);
62274 +int gr_handle_signal(const struct task_struct *p, const int sig);
62275 +int gr_check_crash_uid(const uid_t uid);
62276 +int gr_check_protected_task(const struct task_struct *task);
62277 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
62278 +int gr_acl_handle_mmap(const struct file *file,
62279 + const unsigned long prot);
62280 +int gr_acl_handle_mprotect(const struct file *file,
62281 + const unsigned long prot);
62282 +int gr_check_hidden_task(const struct task_struct *tsk);
62283 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
62284 + const struct vfsmount *mnt);
62285 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
62286 + const struct vfsmount *mnt);
62287 +__u32 gr_acl_handle_access(const struct dentry *dentry,
62288 + const struct vfsmount *mnt, const int fmode);
62289 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
62290 + const struct vfsmount *mnt, umode_t *mode);
62291 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
62292 + const struct vfsmount *mnt);
62293 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
62294 + const struct vfsmount *mnt);
62295 +int gr_handle_ptrace(struct task_struct *task, const long request);
62296 +int gr_handle_proc_ptrace(struct task_struct *task);
62297 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
62298 + const struct vfsmount *mnt);
62299 +int gr_check_crash_exec(const struct file *filp);
62300 +int gr_acl_is_enabled(void);
62301 +void gr_set_kernel_label(struct task_struct *task);
62302 +void gr_set_role_label(struct task_struct *task, const uid_t uid,
62303 + const gid_t gid);
62304 +int gr_set_proc_label(const struct dentry *dentry,
62305 + const struct vfsmount *mnt,
62306 + const int unsafe_flags);
62307 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
62308 + const struct vfsmount *mnt);
62309 +__u32 gr_acl_handle_open(const struct dentry *dentry,
62310 + const struct vfsmount *mnt, int acc_mode);
62311 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
62312 + const struct dentry *p_dentry,
62313 + const struct vfsmount *p_mnt,
62314 + int open_flags, int acc_mode, const int imode);
62315 +void gr_handle_create(const struct dentry *dentry,
62316 + const struct vfsmount *mnt);
62317 +void gr_handle_proc_create(const struct dentry *dentry,
62318 + const struct inode *inode);
62319 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
62320 + const struct dentry *parent_dentry,
62321 + const struct vfsmount *parent_mnt,
62322 + const int mode);
62323 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
62324 + const struct dentry *parent_dentry,
62325 + const struct vfsmount *parent_mnt);
62326 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
62327 + const struct vfsmount *mnt);
62328 +void gr_handle_delete(const ino_t ino, const dev_t dev);
62329 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
62330 + const struct vfsmount *mnt);
62331 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
62332 + const struct dentry *parent_dentry,
62333 + const struct vfsmount *parent_mnt,
62334 + const char *from);
62335 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
62336 + const struct dentry *parent_dentry,
62337 + const struct vfsmount *parent_mnt,
62338 + const struct dentry *old_dentry,
62339 + const struct vfsmount *old_mnt, const char *to);
62340 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
62341 +int gr_acl_handle_rename(struct dentry *new_dentry,
62342 + struct dentry *parent_dentry,
62343 + const struct vfsmount *parent_mnt,
62344 + struct dentry *old_dentry,
62345 + struct inode *old_parent_inode,
62346 + struct vfsmount *old_mnt, const char *newname);
62347 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62348 + struct dentry *old_dentry,
62349 + struct dentry *new_dentry,
62350 + struct vfsmount *mnt, const __u8 replace);
62351 +__u32 gr_check_link(const struct dentry *new_dentry,
62352 + const struct dentry *parent_dentry,
62353 + const struct vfsmount *parent_mnt,
62354 + const struct dentry *old_dentry,
62355 + const struct vfsmount *old_mnt);
62356 +int gr_acl_handle_filldir(const struct file *file, const char *name,
62357 + const unsigned int namelen, const ino_t ino);
62358 +
62359 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
62360 + const struct vfsmount *mnt);
62361 +void gr_acl_handle_exit(void);
62362 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
62363 +int gr_acl_handle_procpidmem(const struct task_struct *task);
62364 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
62365 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
62366 +void gr_audit_ptrace(struct task_struct *task);
62367 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
62368 +
62369 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
62370 +
62371 +#ifdef CONFIG_GRKERNSEC
62372 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
62373 +void gr_handle_vm86(void);
62374 +void gr_handle_mem_readwrite(u64 from, u64 to);
62375 +
62376 +void gr_log_badprocpid(const char *entry);
62377 +
62378 +extern int grsec_enable_dmesg;
62379 +extern int grsec_disable_privio;
62380 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62381 +extern int grsec_enable_chroot_findtask;
62382 +#endif
62383 +#ifdef CONFIG_GRKERNSEC_SETXID
62384 +extern int grsec_enable_setxid;
62385 +#endif
62386 +#endif
62387 +
62388 +#endif
62389 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
62390 new file mode 100644
62391 index 0000000..e7ffaaf
62392 --- /dev/null
62393 +++ b/include/linux/grsock.h
62394 @@ -0,0 +1,19 @@
62395 +#ifndef __GRSOCK_H
62396 +#define __GRSOCK_H
62397 +
62398 +extern void gr_attach_curr_ip(const struct sock *sk);
62399 +extern int gr_handle_sock_all(const int family, const int type,
62400 + const int protocol);
62401 +extern int gr_handle_sock_server(const struct sockaddr *sck);
62402 +extern int gr_handle_sock_server_other(const struct sock *sck);
62403 +extern int gr_handle_sock_client(const struct sockaddr *sck);
62404 +extern int gr_search_connect(struct socket * sock,
62405 + struct sockaddr_in * addr);
62406 +extern int gr_search_bind(struct socket * sock,
62407 + struct sockaddr_in * addr);
62408 +extern int gr_search_listen(struct socket * sock);
62409 +extern int gr_search_accept(struct socket * sock);
62410 +extern int gr_search_socket(const int domain, const int type,
62411 + const int protocol);
62412 +
62413 +#endif
62414 diff --git a/include/linux/hid.h b/include/linux/hid.h
62415 index 449fa38..b37c8cc 100644
62416 --- a/include/linux/hid.h
62417 +++ b/include/linux/hid.h
62418 @@ -704,7 +704,7 @@ struct hid_ll_driver {
62419 unsigned int code, int value);
62420
62421 int (*parse)(struct hid_device *hdev);
62422 -};
62423 +} __no_const;
62424
62425 #define PM_HINT_FULLON 1<<5
62426 #define PM_HINT_NORMAL 1<<1
62427 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
62428 index d3999b4..1304cb4 100644
62429 --- a/include/linux/highmem.h
62430 +++ b/include/linux/highmem.h
62431 @@ -221,6 +221,18 @@ static inline void clear_highpage(struct page *page)
62432 kunmap_atomic(kaddr);
62433 }
62434
62435 +static inline void sanitize_highpage(struct page *page)
62436 +{
62437 + void *kaddr;
62438 + unsigned long flags;
62439 +
62440 + local_irq_save(flags);
62441 + kaddr = kmap_atomic(page);
62442 + clear_page(kaddr);
62443 + kunmap_atomic(kaddr);
62444 + local_irq_restore(flags);
62445 +}
62446 +
62447 static inline void zero_user_segments(struct page *page,
62448 unsigned start1, unsigned end1,
62449 unsigned start2, unsigned end2)
62450 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
62451 index ddfa041..a44cfff 100644
62452 --- a/include/linux/i2c.h
62453 +++ b/include/linux/i2c.h
62454 @@ -366,6 +366,7 @@ struct i2c_algorithm {
62455 /* To determine what the adapter supports */
62456 u32 (*functionality) (struct i2c_adapter *);
62457 };
62458 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62459
62460 /*
62461 * i2c_adapter is the structure used to identify a physical i2c bus along
62462 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
62463 index d23c3c2..eb63c81 100644
62464 --- a/include/linux/i2o.h
62465 +++ b/include/linux/i2o.h
62466 @@ -565,7 +565,7 @@ struct i2o_controller {
62467 struct i2o_device *exec; /* Executive */
62468 #if BITS_PER_LONG == 64
62469 spinlock_t context_list_lock; /* lock for context_list */
62470 - atomic_t context_list_counter; /* needed for unique contexts */
62471 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62472 struct list_head context_list; /* list of context id's
62473 and pointers */
62474 #endif
62475 diff --git a/include/linux/if_team.h b/include/linux/if_team.h
62476 index 8185f57..7b2d222 100644
62477 --- a/include/linux/if_team.h
62478 +++ b/include/linux/if_team.h
62479 @@ -74,6 +74,7 @@ struct team_mode_ops {
62480 void (*port_leave)(struct team *team, struct team_port *port);
62481 void (*port_change_mac)(struct team *team, struct team_port *port);
62482 };
62483 +typedef struct team_mode_ops __no_const team_mode_ops_no_const;
62484
62485 enum team_option_type {
62486 TEAM_OPTION_TYPE_U32,
62487 @@ -136,7 +137,7 @@ struct team {
62488 struct list_head option_inst_list; /* list of option instances */
62489
62490 const struct team_mode *mode;
62491 - struct team_mode_ops ops;
62492 + team_mode_ops_no_const ops;
62493 long mode_priv[TEAM_MODE_PRIV_LONGS];
62494 };
62495
62496 diff --git a/include/linux/init.h b/include/linux/init.h
62497 index 6b95109..7616d09 100644
62498 --- a/include/linux/init.h
62499 +++ b/include/linux/init.h
62500 @@ -39,9 +39,15 @@
62501 * Also note, that this data cannot be "const".
62502 */
62503
62504 +#ifdef MODULE
62505 +#define add_latent_entropy
62506 +#else
62507 +#define add_latent_entropy __latent_entropy
62508 +#endif
62509 +
62510 /* These are for everybody (although not all archs will actually
62511 discard it in modules) */
62512 -#define __init __section(.init.text) __cold notrace
62513 +#define __init __section(.init.text) __cold notrace add_latent_entropy
62514 #define __initdata __section(.init.data)
62515 #define __initconst __section(.init.rodata)
62516 #define __exitdata __section(.exit.data)
62517 @@ -83,7 +89,7 @@
62518 #define __exit __section(.exit.text) __exitused __cold notrace
62519
62520 /* Used for HOTPLUG */
62521 -#define __devinit __section(.devinit.text) __cold notrace
62522 +#define __devinit __section(.devinit.text) __cold notrace add_latent_entropy
62523 #define __devinitdata __section(.devinit.data)
62524 #define __devinitconst __section(.devinit.rodata)
62525 #define __devexit __section(.devexit.text) __exitused __cold notrace
62526 @@ -91,7 +97,7 @@
62527 #define __devexitconst __section(.devexit.rodata)
62528
62529 /* Used for HOTPLUG_CPU */
62530 -#define __cpuinit __section(.cpuinit.text) __cold notrace
62531 +#define __cpuinit __section(.cpuinit.text) __cold notrace add_latent_entropy
62532 #define __cpuinitdata __section(.cpuinit.data)
62533 #define __cpuinitconst __section(.cpuinit.rodata)
62534 #define __cpuexit __section(.cpuexit.text) __exitused __cold notrace
62535 @@ -99,7 +105,7 @@
62536 #define __cpuexitconst __section(.cpuexit.rodata)
62537
62538 /* Used for MEMORY_HOTPLUG */
62539 -#define __meminit __section(.meminit.text) __cold notrace
62540 +#define __meminit __section(.meminit.text) __cold notrace add_latent_entropy
62541 #define __meminitdata __section(.meminit.data)
62542 #define __meminitconst __section(.meminit.rodata)
62543 #define __memexit __section(.memexit.text) __exitused __cold notrace
62544 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
62545 index 9e65eff..b131e8b 100644
62546 --- a/include/linux/init_task.h
62547 +++ b/include/linux/init_task.h
62548 @@ -134,6 +134,12 @@ extern struct cred init_cred;
62549
62550 #define INIT_TASK_COMM "swapper"
62551
62552 +#ifdef CONFIG_X86
62553 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62554 +#else
62555 +#define INIT_TASK_THREAD_INFO
62556 +#endif
62557 +
62558 /*
62559 * INIT_TASK is used to set up the first task table, touch at
62560 * your own risk!. Base=0, limit=0x1fffff (=2MB)
62561 @@ -172,6 +178,7 @@ extern struct cred init_cred;
62562 RCU_INIT_POINTER(.cred, &init_cred), \
62563 .comm = INIT_TASK_COMM, \
62564 .thread = INIT_THREAD, \
62565 + INIT_TASK_THREAD_INFO \
62566 .fs = &init_fs, \
62567 .files = &init_files, \
62568 .signal = &init_signals, \
62569 diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
62570 index e6ca56d..8583707 100644
62571 --- a/include/linux/intel-iommu.h
62572 +++ b/include/linux/intel-iommu.h
62573 @@ -296,7 +296,7 @@ struct iommu_flush {
62574 u8 fm, u64 type);
62575 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62576 unsigned int size_order, u64 type);
62577 -};
62578 +} __no_const;
62579
62580 enum {
62581 SR_DMAR_FECTL_REG,
62582 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
62583 index e68a8e5..811b9af 100644
62584 --- a/include/linux/interrupt.h
62585 +++ b/include/linux/interrupt.h
62586 @@ -435,7 +435,7 @@ enum
62587 /* map softirq index to softirq name. update 'softirq_to_name' in
62588 * kernel/softirq.c when adding a new softirq.
62589 */
62590 -extern char *softirq_to_name[NR_SOFTIRQS];
62591 +extern const char * const softirq_to_name[NR_SOFTIRQS];
62592
62593 /* softirq mask and active fields moved to irq_cpustat_t in
62594 * asm/hardirq.h to get better cache usage. KAO
62595 @@ -443,12 +443,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
62596
62597 struct softirq_action
62598 {
62599 - void (*action)(struct softirq_action *);
62600 + void (*action)(void);
62601 };
62602
62603 asmlinkage void do_softirq(void);
62604 asmlinkage void __do_softirq(void);
62605 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62606 +extern void open_softirq(int nr, void (*action)(void));
62607 extern void softirq_init(void);
62608 extern void __raise_softirq_irqoff(unsigned int nr);
62609
62610 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
62611 index 6883e19..06992b1 100644
62612 --- a/include/linux/kallsyms.h
62613 +++ b/include/linux/kallsyms.h
62614 @@ -15,7 +15,8 @@
62615
62616 struct module;
62617
62618 -#ifdef CONFIG_KALLSYMS
62619 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62620 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62621 /* Lookup the address for a symbol. Returns 0 if not found. */
62622 unsigned long kallsyms_lookup_name(const char *name);
62623
62624 @@ -106,6 +107,17 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
62625 /* Stupid that this does nothing, but I didn't create this mess. */
62626 #define __print_symbol(fmt, addr)
62627 #endif /*CONFIG_KALLSYMS*/
62628 +#else /* when included by kallsyms.c, vsnprintf.c, or
62629 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62630 +extern void __print_symbol(const char *fmt, unsigned long address);
62631 +extern int sprint_backtrace(char *buffer, unsigned long address);
62632 +extern int sprint_symbol(char *buffer, unsigned long address);
62633 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
62634 +const char *kallsyms_lookup(unsigned long addr,
62635 + unsigned long *symbolsize,
62636 + unsigned long *offset,
62637 + char **modname, char *namebuf);
62638 +#endif
62639
62640 /* This macro allows us to keep printk typechecking */
62641 static __printf(1, 2)
62642 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
62643 index c4d2fc1..5df9c19 100644
62644 --- a/include/linux/kgdb.h
62645 +++ b/include/linux/kgdb.h
62646 @@ -53,7 +53,7 @@ extern int kgdb_connected;
62647 extern int kgdb_io_module_registered;
62648
62649 extern atomic_t kgdb_setting_breakpoint;
62650 -extern atomic_t kgdb_cpu_doing_single_step;
62651 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62652
62653 extern struct task_struct *kgdb_usethread;
62654 extern struct task_struct *kgdb_contthread;
62655 @@ -252,7 +252,7 @@ struct kgdb_arch {
62656 void (*disable_hw_break)(struct pt_regs *regs);
62657 void (*remove_all_hw_break)(void);
62658 void (*correct_hw_break)(void);
62659 -};
62660 +} __do_const;
62661
62662 /**
62663 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62664 @@ -277,7 +277,7 @@ struct kgdb_io {
62665 void (*pre_exception) (void);
62666 void (*post_exception) (void);
62667 int is_console;
62668 -};
62669 +} __do_const;
62670
62671 extern struct kgdb_arch arch_kgdb_ops;
62672
62673 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
62674 index 5398d58..5883a34 100644
62675 --- a/include/linux/kmod.h
62676 +++ b/include/linux/kmod.h
62677 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
62678 * usually useless though. */
62679 extern __printf(2, 3)
62680 int __request_module(bool wait, const char *name, ...);
62681 +extern __printf(3, 4)
62682 +int ___request_module(bool wait, char *param_name, const char *name, ...);
62683 #define request_module(mod...) __request_module(true, mod)
62684 #define request_module_nowait(mod...) __request_module(false, mod)
62685 #define try_then_request_module(x, mod...) \
62686 diff --git a/include/linux/kref.h b/include/linux/kref.h
62687 index 9c07dce..a92fa71 100644
62688 --- a/include/linux/kref.h
62689 +++ b/include/linux/kref.h
62690 @@ -63,7 +63,7 @@ static inline void kref_get(struct kref *kref)
62691 static inline int kref_sub(struct kref *kref, unsigned int count,
62692 void (*release)(struct kref *kref))
62693 {
62694 - WARN_ON(release == NULL);
62695 + BUG_ON(release == NULL);
62696
62697 if (atomic_sub_and_test((int) count, &kref->refcount)) {
62698 release(kref);
62699 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
62700 index 96c158a..1864db5 100644
62701 --- a/include/linux/kvm_host.h
62702 +++ b/include/linux/kvm_host.h
62703 @@ -345,7 +345,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
62704 void vcpu_load(struct kvm_vcpu *vcpu);
62705 void vcpu_put(struct kvm_vcpu *vcpu);
62706
62707 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62708 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62709 struct module *module);
62710 void kvm_exit(void);
62711
62712 @@ -511,7 +511,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
62713 struct kvm_guest_debug *dbg);
62714 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
62715
62716 -int kvm_arch_init(void *opaque);
62717 +int kvm_arch_init(const void *opaque);
62718 void kvm_arch_exit(void);
62719
62720 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
62721 diff --git a/include/linux/libata.h b/include/linux/libata.h
62722 index 6e887c7..4539601 100644
62723 --- a/include/linux/libata.h
62724 +++ b/include/linux/libata.h
62725 @@ -910,7 +910,7 @@ struct ata_port_operations {
62726 * fields must be pointers.
62727 */
62728 const struct ata_port_operations *inherits;
62729 -};
62730 +} __do_const;
62731
62732 struct ata_port_info {
62733 unsigned long flags;
62734 diff --git a/include/linux/memory.h b/include/linux/memory.h
62735 index 1ac7f6e..a5794d0 100644
62736 --- a/include/linux/memory.h
62737 +++ b/include/linux/memory.h
62738 @@ -143,7 +143,7 @@ struct memory_accessor {
62739 size_t count);
62740 ssize_t (*write)(struct memory_accessor *, const char *buf,
62741 off_t offset, size_t count);
62742 -};
62743 +} __no_const;
62744
62745 /*
62746 * Kernel text modification mutex, used for code patching. Users of this lock
62747 diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
62748 index 1318ca6..7521340 100644
62749 --- a/include/linux/mfd/abx500.h
62750 +++ b/include/linux/mfd/abx500.h
62751 @@ -452,6 +452,7 @@ struct abx500_ops {
62752 int (*event_registers_startup_state_get) (struct device *, u8 *);
62753 int (*startup_irq_enabled) (struct device *, unsigned int);
62754 };
62755 +typedef struct abx500_ops __no_const abx500_ops_no_const;
62756
62757 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
62758 void abx500_remove_ops(struct device *dev);
62759 diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
62760 index 9b07725..3d55001 100644
62761 --- a/include/linux/mfd/abx500/ux500_chargalg.h
62762 +++ b/include/linux/mfd/abx500/ux500_chargalg.h
62763 @@ -19,7 +19,7 @@ struct ux500_charger_ops {
62764 int (*enable) (struct ux500_charger *, int, int, int);
62765 int (*kick_wd) (struct ux500_charger *);
62766 int (*update_curr) (struct ux500_charger *, int);
62767 -};
62768 +} __no_const;
62769
62770 /**
62771 * struct ux500_charger - power supply ux500 charger sub class
62772 diff --git a/include/linux/mm.h b/include/linux/mm.h
62773 index f9f279c..198da78 100644
62774 --- a/include/linux/mm.h
62775 +++ b/include/linux/mm.h
62776 @@ -116,7 +116,14 @@ extern unsigned int kobjsize(const void *objp);
62777
62778 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
62779 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
62780 +
62781 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
62782 +#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
62783 +#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
62784 +#else
62785 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
62786 +#endif
62787 +
62788 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
62789 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
62790
62791 @@ -1009,34 +1016,6 @@ int set_page_dirty(struct page *page);
62792 int set_page_dirty_lock(struct page *page);
62793 int clear_page_dirty_for_io(struct page *page);
62794
62795 -/* Is the vma a continuation of the stack vma above it? */
62796 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
62797 -{
62798 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
62799 -}
62800 -
62801 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
62802 - unsigned long addr)
62803 -{
62804 - return (vma->vm_flags & VM_GROWSDOWN) &&
62805 - (vma->vm_start == addr) &&
62806 - !vma_growsdown(vma->vm_prev, addr);
62807 -}
62808 -
62809 -/* Is the vma a continuation of the stack vma below it? */
62810 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
62811 -{
62812 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
62813 -}
62814 -
62815 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
62816 - unsigned long addr)
62817 -{
62818 - return (vma->vm_flags & VM_GROWSUP) &&
62819 - (vma->vm_end == addr) &&
62820 - !vma_growsup(vma->vm_next, addr);
62821 -}
62822 -
62823 extern pid_t
62824 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
62825
62826 @@ -1135,6 +1114,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
62827 }
62828 #endif
62829
62830 +#ifdef CONFIG_MMU
62831 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
62832 +#else
62833 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
62834 +{
62835 + return __pgprot(0);
62836 +}
62837 +#endif
62838 +
62839 int vma_wants_writenotify(struct vm_area_struct *vma);
62840
62841 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
62842 @@ -1153,8 +1141,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
62843 {
62844 return 0;
62845 }
62846 +
62847 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
62848 + unsigned long address)
62849 +{
62850 + return 0;
62851 +}
62852 #else
62853 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
62854 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
62855 #endif
62856
62857 #ifdef __PAGETABLE_PMD_FOLDED
62858 @@ -1163,8 +1158,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
62859 {
62860 return 0;
62861 }
62862 +
62863 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
62864 + unsigned long address)
62865 +{
62866 + return 0;
62867 +}
62868 #else
62869 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
62870 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
62871 #endif
62872
62873 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
62874 @@ -1182,11 +1184,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
62875 NULL: pud_offset(pgd, address);
62876 }
62877
62878 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
62879 +{
62880 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
62881 + NULL: pud_offset(pgd, address);
62882 +}
62883 +
62884 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
62885 {
62886 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
62887 NULL: pmd_offset(pud, address);
62888 }
62889 +
62890 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
62891 +{
62892 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
62893 + NULL: pmd_offset(pud, address);
62894 +}
62895 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
62896
62897 #if USE_SPLIT_PTLOCKS
62898 @@ -1396,6 +1410,7 @@ extern unsigned long do_mmap_pgoff(struct file *, unsigned long,
62899 unsigned long, unsigned long,
62900 unsigned long, unsigned long);
62901 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
62902 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
62903
62904 /* These take the mm semaphore themselves */
62905 extern unsigned long vm_brk(unsigned long, unsigned long);
62906 @@ -1458,6 +1473,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
62907 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
62908 struct vm_area_struct **pprev);
62909
62910 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
62911 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
62912 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
62913 +
62914 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
62915 NULL if none. Assume start_addr < end_addr. */
62916 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
62917 @@ -1486,15 +1505,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
62918 return vma;
62919 }
62920
62921 -#ifdef CONFIG_MMU
62922 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
62923 -#else
62924 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
62925 -{
62926 - return __pgprot(0);
62927 -}
62928 -#endif
62929 -
62930 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
62931 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
62932 unsigned long pfn, unsigned long size, pgprot_t);
62933 @@ -1599,7 +1609,7 @@ extern int unpoison_memory(unsigned long pfn);
62934 extern int sysctl_memory_failure_early_kill;
62935 extern int sysctl_memory_failure_recovery;
62936 extern void shake_page(struct page *p, int access);
62937 -extern atomic_long_t mce_bad_pages;
62938 +extern atomic_long_unchecked_t mce_bad_pages;
62939 extern int soft_offline_page(struct page *page, int flags);
62940
62941 extern void dump_page(struct page *page);
62942 @@ -1630,5 +1640,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
62943 static inline bool page_is_guard(struct page *page) { return false; }
62944 #endif /* CONFIG_DEBUG_PAGEALLOC */
62945
62946 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
62947 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
62948 +#else
62949 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
62950 +#endif
62951 +
62952 #endif /* __KERNEL__ */
62953 #endif /* _LINUX_MM_H */
62954 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
62955 index 704a626..bb0705a 100644
62956 --- a/include/linux/mm_types.h
62957 +++ b/include/linux/mm_types.h
62958 @@ -263,6 +263,8 @@ struct vm_area_struct {
62959 #ifdef CONFIG_NUMA
62960 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
62961 #endif
62962 +
62963 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
62964 };
62965
62966 struct core_thread {
62967 @@ -337,7 +339,7 @@ struct mm_struct {
62968 unsigned long def_flags;
62969 unsigned long nr_ptes; /* Page table pages */
62970 unsigned long start_code, end_code, start_data, end_data;
62971 - unsigned long start_brk, brk, start_stack;
62972 + unsigned long brk_gap, start_brk, brk, start_stack;
62973 unsigned long arg_start, arg_end, env_start, env_end;
62974
62975 unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
62976 @@ -389,6 +391,24 @@ struct mm_struct {
62977 struct cpumask cpumask_allocation;
62978 #endif
62979 struct uprobes_state uprobes_state;
62980 +
62981 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
62982 + unsigned long pax_flags;
62983 +#endif
62984 +
62985 +#ifdef CONFIG_PAX_DLRESOLVE
62986 + unsigned long call_dl_resolve;
62987 +#endif
62988 +
62989 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
62990 + unsigned long call_syscall;
62991 +#endif
62992 +
62993 +#ifdef CONFIG_PAX_ASLR
62994 + unsigned long delta_mmap; /* randomized offset */
62995 + unsigned long delta_stack; /* randomized offset */
62996 +#endif
62997 +
62998 };
62999
63000 static inline void mm_init_cpumask(struct mm_struct *mm)
63001 diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
63002 index 1d1b1e1..2a13c78 100644
63003 --- a/include/linux/mmu_notifier.h
63004 +++ b/include/linux/mmu_notifier.h
63005 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
63006 */
63007 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
63008 ({ \
63009 - pte_t __pte; \
63010 + pte_t ___pte; \
63011 struct vm_area_struct *___vma = __vma; \
63012 unsigned long ___address = __address; \
63013 - __pte = ptep_clear_flush(___vma, ___address, __ptep); \
63014 + ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
63015 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
63016 - __pte; \
63017 + ___pte; \
63018 })
63019
63020 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
63021 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
63022 index 68c569f..5f43753 100644
63023 --- a/include/linux/mmzone.h
63024 +++ b/include/linux/mmzone.h
63025 @@ -411,7 +411,7 @@ struct zone {
63026 unsigned long flags; /* zone flags, see below */
63027
63028 /* Zone statistics */
63029 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
63030 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
63031
63032 /*
63033 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
63034 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
63035 index 5db9382..50e801d 100644
63036 --- a/include/linux/mod_devicetable.h
63037 +++ b/include/linux/mod_devicetable.h
63038 @@ -12,7 +12,7 @@
63039 typedef unsigned long kernel_ulong_t;
63040 #endif
63041
63042 -#define PCI_ANY_ID (~0)
63043 +#define PCI_ANY_ID ((__u16)~0)
63044
63045 struct pci_device_id {
63046 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
63047 @@ -131,7 +131,7 @@ struct usb_device_id {
63048 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
63049 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
63050
63051 -#define HID_ANY_ID (~0)
63052 +#define HID_ANY_ID (~0U)
63053 #define HID_BUS_ANY 0xffff
63054 #define HID_GROUP_ANY 0x0000
63055
63056 diff --git a/include/linux/module.h b/include/linux/module.h
63057 index fbcafe2..e5d9587 100644
63058 --- a/include/linux/module.h
63059 +++ b/include/linux/module.h
63060 @@ -17,6 +17,7 @@
63061 #include <linux/moduleparam.h>
63062 #include <linux/tracepoint.h>
63063 #include <linux/export.h>
63064 +#include <linux/fs.h>
63065
63066 #include <linux/percpu.h>
63067 #include <asm/module.h>
63068 @@ -273,19 +274,16 @@ struct module
63069 int (*init)(void);
63070
63071 /* If this is non-NULL, vfree after init() returns */
63072 - void *module_init;
63073 + void *module_init_rx, *module_init_rw;
63074
63075 /* Here is the actual code + data, vfree'd on unload. */
63076 - void *module_core;
63077 + void *module_core_rx, *module_core_rw;
63078
63079 /* Here are the sizes of the init and core sections */
63080 - unsigned int init_size, core_size;
63081 + unsigned int init_size_rw, core_size_rw;
63082
63083 /* The size of the executable code in each section. */
63084 - unsigned int init_text_size, core_text_size;
63085 -
63086 - /* Size of RO sections of the module (text+rodata) */
63087 - unsigned int init_ro_size, core_ro_size;
63088 + unsigned int init_size_rx, core_size_rx;
63089
63090 /* Arch-specific module values */
63091 struct mod_arch_specific arch;
63092 @@ -341,6 +339,10 @@ struct module
63093 #ifdef CONFIG_EVENT_TRACING
63094 struct ftrace_event_call **trace_events;
63095 unsigned int num_trace_events;
63096 + struct file_operations trace_id;
63097 + struct file_operations trace_enable;
63098 + struct file_operations trace_format;
63099 + struct file_operations trace_filter;
63100 #endif
63101 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
63102 unsigned int num_ftrace_callsites;
63103 @@ -388,16 +390,46 @@ bool is_module_address(unsigned long addr);
63104 bool is_module_percpu_address(unsigned long addr);
63105 bool is_module_text_address(unsigned long addr);
63106
63107 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
63108 +{
63109 +
63110 +#ifdef CONFIG_PAX_KERNEXEC
63111 + if (ktla_ktva(addr) >= (unsigned long)start &&
63112 + ktla_ktva(addr) < (unsigned long)start + size)
63113 + return 1;
63114 +#endif
63115 +
63116 + return ((void *)addr >= start && (void *)addr < start + size);
63117 +}
63118 +
63119 +static inline int within_module_core_rx(unsigned long addr, struct module *mod)
63120 +{
63121 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
63122 +}
63123 +
63124 +static inline int within_module_core_rw(unsigned long addr, struct module *mod)
63125 +{
63126 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
63127 +}
63128 +
63129 +static inline int within_module_init_rx(unsigned long addr, struct module *mod)
63130 +{
63131 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
63132 +}
63133 +
63134 +static inline int within_module_init_rw(unsigned long addr, struct module *mod)
63135 +{
63136 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
63137 +}
63138 +
63139 static inline int within_module_core(unsigned long addr, struct module *mod)
63140 {
63141 - return (unsigned long)mod->module_core <= addr &&
63142 - addr < (unsigned long)mod->module_core + mod->core_size;
63143 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
63144 }
63145
63146 static inline int within_module_init(unsigned long addr, struct module *mod)
63147 {
63148 - return (unsigned long)mod->module_init <= addr &&
63149 - addr < (unsigned long)mod->module_init + mod->init_size;
63150 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
63151 }
63152
63153 /* Search for module by name: must hold module_mutex. */
63154 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
63155 index b2be02e..72d2f78 100644
63156 --- a/include/linux/moduleloader.h
63157 +++ b/include/linux/moduleloader.h
63158 @@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
63159
63160 /* Allocator used for allocating struct module, core sections and init
63161 sections. Returns NULL on failure. */
63162 -void *module_alloc(unsigned long size);
63163 +void *module_alloc(unsigned long size) __size_overflow(1);
63164 +
63165 +#ifdef CONFIG_PAX_KERNEXEC
63166 +void *module_alloc_exec(unsigned long size) __size_overflow(1);
63167 +#else
63168 +#define module_alloc_exec(x) module_alloc(x)
63169 +#endif
63170
63171 /* Free memory returned from module_alloc. */
63172 void module_free(struct module *mod, void *module_region);
63173
63174 +#ifdef CONFIG_PAX_KERNEXEC
63175 +void module_free_exec(struct module *mod, void *module_region);
63176 +#else
63177 +#define module_free_exec(x, y) module_free((x), (y))
63178 +#endif
63179 +
63180 /* Apply the given relocation to the (simplified) ELF. Return -error
63181 or 0. */
63182 int apply_relocate(Elf_Shdr *sechdrs,
63183 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
63184 index d6a5806..7c13347 100644
63185 --- a/include/linux/moduleparam.h
63186 +++ b/include/linux/moduleparam.h
63187 @@ -286,7 +286,7 @@ static inline void __kernel_param_unlock(void)
63188 * @len is usually just sizeof(string).
63189 */
63190 #define module_param_string(name, string, len, perm) \
63191 - static const struct kparam_string __param_string_##name \
63192 + static const struct kparam_string __param_string_##name __used \
63193 = { len, string }; \
63194 __module_param_call(MODULE_PARAM_PREFIX, name, \
63195 &param_ops_string, \
63196 @@ -425,7 +425,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
63197 */
63198 #define module_param_array_named(name, array, type, nump, perm) \
63199 param_check_##type(name, &(array)[0]); \
63200 - static const struct kparam_array __param_arr_##name \
63201 + static const struct kparam_array __param_arr_##name __used \
63202 = { .max = ARRAY_SIZE(array), .num = nump, \
63203 .ops = &param_ops_##type, \
63204 .elemsize = sizeof(array[0]), .elem = array }; \
63205 diff --git a/include/linux/namei.h b/include/linux/namei.h
63206 index ffc0213..2c1f2cb 100644
63207 --- a/include/linux/namei.h
63208 +++ b/include/linux/namei.h
63209 @@ -24,7 +24,7 @@ struct nameidata {
63210 unsigned seq;
63211 int last_type;
63212 unsigned depth;
63213 - char *saved_names[MAX_NESTED_LINKS + 1];
63214 + const char *saved_names[MAX_NESTED_LINKS + 1];
63215
63216 /* Intent data */
63217 union {
63218 @@ -94,12 +94,12 @@ extern int follow_up(struct path *);
63219 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
63220 extern void unlock_rename(struct dentry *, struct dentry *);
63221
63222 -static inline void nd_set_link(struct nameidata *nd, char *path)
63223 +static inline void nd_set_link(struct nameidata *nd, const char *path)
63224 {
63225 nd->saved_names[nd->depth] = path;
63226 }
63227
63228 -static inline char *nd_get_link(struct nameidata *nd)
63229 +static inline const char *nd_get_link(const struct nameidata *nd)
63230 {
63231 return nd->saved_names[nd->depth];
63232 }
63233 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
63234 index d94cb14..e64c951 100644
63235 --- a/include/linux/netdevice.h
63236 +++ b/include/linux/netdevice.h
63237 @@ -1026,6 +1026,7 @@ struct net_device_ops {
63238 struct net_device *dev,
63239 int idx);
63240 };
63241 +typedef struct net_device_ops __no_const net_device_ops_no_const;
63242
63243 /*
63244 * The DEVICE structure.
63245 @@ -1087,7 +1088,7 @@ struct net_device {
63246 int iflink;
63247
63248 struct net_device_stats stats;
63249 - atomic_long_t rx_dropped; /* dropped packets by core network
63250 + atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
63251 * Do not use this in drivers.
63252 */
63253
63254 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
63255 new file mode 100644
63256 index 0000000..33f4af8
63257 --- /dev/null
63258 +++ b/include/linux/netfilter/xt_gradm.h
63259 @@ -0,0 +1,9 @@
63260 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
63261 +#define _LINUX_NETFILTER_XT_GRADM_H 1
63262 +
63263 +struct xt_gradm_mtinfo {
63264 + __u16 flags;
63265 + __u16 invflags;
63266 +};
63267 +
63268 +#endif
63269 diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
63270 index c65a18a..0c05f3a 100644
63271 --- a/include/linux/of_pdt.h
63272 +++ b/include/linux/of_pdt.h
63273 @@ -32,7 +32,7 @@ struct of_pdt_ops {
63274
63275 /* return 0 on success; fill in 'len' with number of bytes in path */
63276 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
63277 -};
63278 +} __no_const;
63279
63280 extern void *prom_early_alloc(unsigned long size);
63281
63282 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
63283 index a4c5624..79d6d88 100644
63284 --- a/include/linux/oprofile.h
63285 +++ b/include/linux/oprofile.h
63286 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
63287 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
63288 char const * name, ulong * val);
63289
63290 -/** Create a file for read-only access to an atomic_t. */
63291 +/** Create a file for read-only access to an atomic_unchecked_t. */
63292 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
63293 - char const * name, atomic_t * val);
63294 + char const * name, atomic_unchecked_t * val);
63295
63296 /** create a directory */
63297 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
63298 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
63299 index 45db49f..386788e 100644
63300 --- a/include/linux/perf_event.h
63301 +++ b/include/linux/perf_event.h
63302 @@ -879,8 +879,8 @@ struct perf_event {
63303
63304 enum perf_event_active_state state;
63305 unsigned int attach_state;
63306 - local64_t count;
63307 - atomic64_t child_count;
63308 + local64_t count; /* PaX: fix it one day */
63309 + atomic64_unchecked_t child_count;
63310
63311 /*
63312 * These are the total time in nanoseconds that the event
63313 @@ -931,8 +931,8 @@ struct perf_event {
63314 * These accumulate total time (in nanoseconds) that children
63315 * events have been enabled and running, respectively.
63316 */
63317 - atomic64_t child_total_time_enabled;
63318 - atomic64_t child_total_time_running;
63319 + atomic64_unchecked_t child_total_time_enabled;
63320 + atomic64_unchecked_t child_total_time_running;
63321
63322 /*
63323 * Protect attach/detach and child_list:
63324 diff --git a/include/linux/personality.h b/include/linux/personality.h
63325 index 8fc7dd1a..c19d89e 100644
63326 --- a/include/linux/personality.h
63327 +++ b/include/linux/personality.h
63328 @@ -44,6 +44,7 @@ enum {
63329 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
63330 ADDR_NO_RANDOMIZE | \
63331 ADDR_COMPAT_LAYOUT | \
63332 + ADDR_LIMIT_3GB | \
63333 MMAP_PAGE_ZERO)
63334
63335 /*
63336 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
63337 index e1ac1ce..0675fed 100644
63338 --- a/include/linux/pipe_fs_i.h
63339 +++ b/include/linux/pipe_fs_i.h
63340 @@ -45,9 +45,9 @@ struct pipe_buffer {
63341 struct pipe_inode_info {
63342 wait_queue_head_t wait;
63343 unsigned int nrbufs, curbuf, buffers;
63344 - unsigned int readers;
63345 - unsigned int writers;
63346 - unsigned int waiting_writers;
63347 + atomic_t readers;
63348 + atomic_t writers;
63349 + atomic_t waiting_writers;
63350 unsigned int r_counter;
63351 unsigned int w_counter;
63352 struct page *tmp_page;
63353 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
63354 index f271860..6b3bec5 100644
63355 --- a/include/linux/pm_runtime.h
63356 +++ b/include/linux/pm_runtime.h
63357 @@ -97,7 +97,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
63358
63359 static inline void pm_runtime_mark_last_busy(struct device *dev)
63360 {
63361 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
63362 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
63363 }
63364
63365 #else /* !CONFIG_PM_RUNTIME */
63366 diff --git a/include/linux/poison.h b/include/linux/poison.h
63367 index 2110a81..13a11bb 100644
63368 --- a/include/linux/poison.h
63369 +++ b/include/linux/poison.h
63370 @@ -19,8 +19,8 @@
63371 * under normal circumstances, used to verify that nobody uses
63372 * non-initialized list entries.
63373 */
63374 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
63375 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
63376 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
63377 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
63378
63379 /********** include/linux/timer.h **********/
63380 /*
63381 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
63382 index 5a710b9..0b0dab9 100644
63383 --- a/include/linux/preempt.h
63384 +++ b/include/linux/preempt.h
63385 @@ -126,7 +126,7 @@ struct preempt_ops {
63386 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
63387 void (*sched_out)(struct preempt_notifier *notifier,
63388 struct task_struct *next);
63389 -};
63390 +} __no_const;
63391
63392 /**
63393 * preempt_notifier - key for installing preemption notifiers
63394 diff --git a/include/linux/printk.h b/include/linux/printk.h
63395 index 1bec2f7..b66e833 100644
63396 --- a/include/linux/printk.h
63397 +++ b/include/linux/printk.h
63398 @@ -94,6 +94,8 @@ void early_printk(const char *fmt, ...);
63399 extern int printk_needs_cpu(int cpu);
63400 extern void printk_tick(void);
63401
63402 +extern int kptr_restrict;
63403 +
63404 #ifdef CONFIG_PRINTK
63405 asmlinkage __printf(5, 0)
63406 int vprintk_emit(int facility, int level,
63407 @@ -128,7 +130,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
63408
63409 extern int printk_delay_msec;
63410 extern int dmesg_restrict;
63411 -extern int kptr_restrict;
63412
63413 void log_buf_kexec_setup(void);
63414 void __init setup_log_buf(int early);
63415 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
63416 index 3fd2e87..d93a721 100644
63417 --- a/include/linux/proc_fs.h
63418 +++ b/include/linux/proc_fs.h
63419 @@ -155,6 +155,18 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,
63420 return proc_create_data(name, mode, parent, proc_fops, NULL);
63421 }
63422
63423 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
63424 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
63425 +{
63426 +#ifdef CONFIG_GRKERNSEC_PROC_USER
63427 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
63428 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63429 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
63430 +#else
63431 + return proc_create_data(name, mode, parent, proc_fops, NULL);
63432 +#endif
63433 +}
63434 +
63435 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
63436 umode_t mode, struct proc_dir_entry *base,
63437 read_proc_t *read_proc, void * data)
63438 @@ -258,7 +270,7 @@ union proc_op {
63439 int (*proc_show)(struct seq_file *m,
63440 struct pid_namespace *ns, struct pid *pid,
63441 struct task_struct *task);
63442 -};
63443 +} __no_const;
63444
63445 struct ctl_table_header;
63446 struct ctl_table;
63447 diff --git a/include/linux/random.h b/include/linux/random.h
63448 index ac621ce..c1215f3 100644
63449 --- a/include/linux/random.h
63450 +++ b/include/linux/random.h
63451 @@ -53,6 +53,10 @@ extern void add_input_randomness(unsigned int type, unsigned int code,
63452 unsigned int value);
63453 extern void add_interrupt_randomness(int irq, int irq_flags);
63454
63455 +#ifdef CONFIG_PAX_LATENT_ENTROPY
63456 +extern void transfer_latent_entropy(void);
63457 +#endif
63458 +
63459 extern void get_random_bytes(void *buf, int nbytes);
63460 extern void get_random_bytes_arch(void *buf, int nbytes);
63461 void generate_random_uuid(unsigned char uuid_out[16]);
63462 @@ -69,12 +73,17 @@ void srandom32(u32 seed);
63463
63464 u32 prandom32(struct rnd_state *);
63465
63466 +static inline unsigned long pax_get_random_long(void)
63467 +{
63468 + return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
63469 +}
63470 +
63471 /*
63472 * Handle minimum values for seeds
63473 */
63474 static inline u32 __seed(u32 x, u32 m)
63475 {
63476 - return (x < m) ? x + m : x;
63477 + return (x <= m) ? x + m + 1 : x;
63478 }
63479
63480 /**
63481 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
63482 index e0879a7..a12f962 100644
63483 --- a/include/linux/reboot.h
63484 +++ b/include/linux/reboot.h
63485 @@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
63486 * Architecture-specific implementations of sys_reboot commands.
63487 */
63488
63489 -extern void machine_restart(char *cmd);
63490 -extern void machine_halt(void);
63491 -extern void machine_power_off(void);
63492 +extern void machine_restart(char *cmd) __noreturn;
63493 +extern void machine_halt(void) __noreturn;
63494 +extern void machine_power_off(void) __noreturn;
63495
63496 extern void machine_shutdown(void);
63497 struct pt_regs;
63498 @@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
63499 */
63500
63501 extern void kernel_restart_prepare(char *cmd);
63502 -extern void kernel_restart(char *cmd);
63503 -extern void kernel_halt(void);
63504 -extern void kernel_power_off(void);
63505 +extern void kernel_restart(char *cmd) __noreturn;
63506 +extern void kernel_halt(void) __noreturn;
63507 +extern void kernel_power_off(void) __noreturn;
63508
63509 extern int C_A_D; /* for sysctl */
63510 void ctrl_alt_del(void);
63511 @@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
63512 * Emergency restart, callable from an interrupt handler.
63513 */
63514
63515 -extern void emergency_restart(void);
63516 +extern void emergency_restart(void) __noreturn;
63517 #include <asm/emergency-restart.h>
63518
63519 #endif
63520 diff --git a/include/linux/relay.h b/include/linux/relay.h
63521 index 91cacc3..b55ff74 100644
63522 --- a/include/linux/relay.h
63523 +++ b/include/linux/relay.h
63524 @@ -160,7 +160,7 @@ struct rchan_callbacks
63525 * The callback should return 0 if successful, negative if not.
63526 */
63527 int (*remove_buf_file)(struct dentry *dentry);
63528 -};
63529 +} __no_const;
63530
63531 /*
63532 * CONFIG_RELAY kernel API, kernel/relay.c
63533 diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
63534 index 6fdf027..ff72610 100644
63535 --- a/include/linux/rfkill.h
63536 +++ b/include/linux/rfkill.h
63537 @@ -147,6 +147,7 @@ struct rfkill_ops {
63538 void (*query)(struct rfkill *rfkill, void *data);
63539 int (*set_block)(void *data, bool blocked);
63540 };
63541 +typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63542
63543 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63544 /**
63545 diff --git a/include/linux/rio.h b/include/linux/rio.h
63546 index a90ebad..fd87b5d 100644
63547 --- a/include/linux/rio.h
63548 +++ b/include/linux/rio.h
63549 @@ -321,7 +321,7 @@ struct rio_ops {
63550 int mbox, void *buffer, size_t len);
63551 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
63552 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
63553 -};
63554 +} __no_const;
63555
63556 #define RIO_RESOURCE_MEM 0x00000100
63557 #define RIO_RESOURCE_DOORBELL 0x00000200
63558 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
63559 index 3fce545..b4fed6e 100644
63560 --- a/include/linux/rmap.h
63561 +++ b/include/linux/rmap.h
63562 @@ -119,9 +119,9 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
63563 void anon_vma_init(void); /* create anon_vma_cachep */
63564 int anon_vma_prepare(struct vm_area_struct *);
63565 void unlink_anon_vmas(struct vm_area_struct *);
63566 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
63567 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
63568 void anon_vma_moveto_tail(struct vm_area_struct *);
63569 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
63570 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
63571
63572 static inline void anon_vma_merge(struct vm_area_struct *vma,
63573 struct vm_area_struct *next)
63574 diff --git a/include/linux/sched.h b/include/linux/sched.h
63575 index 4a1f493..5812aeb 100644
63576 --- a/include/linux/sched.h
63577 +++ b/include/linux/sched.h
63578 @@ -101,6 +101,7 @@ struct bio_list;
63579 struct fs_struct;
63580 struct perf_event_context;
63581 struct blk_plug;
63582 +struct linux_binprm;
63583
63584 /*
63585 * List of flags we want to share for kernel threads,
63586 @@ -384,10 +385,13 @@ struct user_namespace;
63587 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63588
63589 extern int sysctl_max_map_count;
63590 +extern unsigned long sysctl_heap_stack_gap;
63591
63592 #include <linux/aio.h>
63593
63594 #ifdef CONFIG_MMU
63595 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63596 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63597 extern void arch_pick_mmap_layout(struct mm_struct *mm);
63598 extern unsigned long
63599 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63600 @@ -406,6 +410,11 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
63601 extern void set_dumpable(struct mm_struct *mm, int value);
63602 extern int get_dumpable(struct mm_struct *mm);
63603
63604 +/* get/set_dumpable() values */
63605 +#define SUID_DUMPABLE_DISABLED 0
63606 +#define SUID_DUMPABLE_ENABLED 1
63607 +#define SUID_DUMPABLE_SAFE 2
63608 +
63609 /* mm flags */
63610 /* dumpable bits */
63611 #define MMF_DUMPABLE 0 /* core dump is permitted */
63612 @@ -646,6 +655,17 @@ struct signal_struct {
63613 #ifdef CONFIG_TASKSTATS
63614 struct taskstats *stats;
63615 #endif
63616 +
63617 +#ifdef CONFIG_GRKERNSEC
63618 + u32 curr_ip;
63619 + u32 saved_ip;
63620 + u32 gr_saddr;
63621 + u32 gr_daddr;
63622 + u16 gr_sport;
63623 + u16 gr_dport;
63624 + u8 used_accept:1;
63625 +#endif
63626 +
63627 #ifdef CONFIG_AUDIT
63628 unsigned audit_tty;
63629 struct tty_audit_buf *tty_audit_buf;
63630 @@ -729,6 +749,11 @@ struct user_struct {
63631 struct key *session_keyring; /* UID's default session keyring */
63632 #endif
63633
63634 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63635 + unsigned int banned;
63636 + unsigned long ban_expires;
63637 +#endif
63638 +
63639 /* Hash table maintenance information */
63640 struct hlist_node uidhash_node;
63641 kuid_t uid;
63642 @@ -1348,8 +1373,8 @@ struct task_struct {
63643 struct list_head thread_group;
63644
63645 struct completion *vfork_done; /* for vfork() */
63646 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63647 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63648 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63649 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63650
63651 cputime_t utime, stime, utimescaled, stimescaled;
63652 cputime_t gtime;
63653 @@ -1365,11 +1390,6 @@ struct task_struct {
63654 struct task_cputime cputime_expires;
63655 struct list_head cpu_timers[3];
63656
63657 -/* process credentials */
63658 - const struct cred __rcu *real_cred; /* objective and real subjective task
63659 - * credentials (COW) */
63660 - const struct cred __rcu *cred; /* effective (overridable) subjective task
63661 - * credentials (COW) */
63662 char comm[TASK_COMM_LEN]; /* executable name excluding path
63663 - access with [gs]et_task_comm (which lock
63664 it with task_lock())
63665 @@ -1386,8 +1406,16 @@ struct task_struct {
63666 #endif
63667 /* CPU-specific state of this task */
63668 struct thread_struct thread;
63669 +/* thread_info moved to task_struct */
63670 +#ifdef CONFIG_X86
63671 + struct thread_info tinfo;
63672 +#endif
63673 /* filesystem information */
63674 struct fs_struct *fs;
63675 +
63676 + const struct cred __rcu *cred; /* effective (overridable) subjective task
63677 + * credentials (COW) */
63678 +
63679 /* open file information */
63680 struct files_struct *files;
63681 /* namespaces */
63682 @@ -1431,6 +1459,11 @@ struct task_struct {
63683 struct rt_mutex_waiter *pi_blocked_on;
63684 #endif
63685
63686 +/* process credentials */
63687 + const struct cred __rcu *real_cred; /* objective and real subjective task
63688 + * credentials (COW) */
63689 + struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63690 +
63691 #ifdef CONFIG_DEBUG_MUTEXES
63692 /* mutex deadlock detection */
63693 struct mutex_waiter *blocked_on;
63694 @@ -1547,6 +1580,27 @@ struct task_struct {
63695 unsigned long default_timer_slack_ns;
63696
63697 struct list_head *scm_work_list;
63698 +
63699 +#ifdef CONFIG_GRKERNSEC
63700 + /* grsecurity */
63701 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63702 + u64 exec_id;
63703 +#endif
63704 +#ifdef CONFIG_GRKERNSEC_SETXID
63705 + const struct cred *delayed_cred;
63706 +#endif
63707 + struct dentry *gr_chroot_dentry;
63708 + struct acl_subject_label *acl;
63709 + struct acl_role_label *role;
63710 + struct file *exec_file;
63711 + u16 acl_role_id;
63712 + /* is this the task that authenticated to the special role */
63713 + u8 acl_sp_role;
63714 + u8 is_writable;
63715 + u8 brute;
63716 + u8 gr_is_chrooted;
63717 +#endif
63718 +
63719 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
63720 /* Index of current stored address in ret_stack */
63721 int curr_ret_stack;
63722 @@ -1585,6 +1639,51 @@ struct task_struct {
63723 #endif
63724 };
63725
63726 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
63727 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
63728 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
63729 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
63730 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
63731 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
63732 +
63733 +#ifdef CONFIG_PAX_SOFTMODE
63734 +extern int pax_softmode;
63735 +#endif
63736 +
63737 +extern int pax_check_flags(unsigned long *);
63738 +
63739 +/* if tsk != current then task_lock must be held on it */
63740 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63741 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
63742 +{
63743 + if (likely(tsk->mm))
63744 + return tsk->mm->pax_flags;
63745 + else
63746 + return 0UL;
63747 +}
63748 +
63749 +/* if tsk != current then task_lock must be held on it */
63750 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
63751 +{
63752 + if (likely(tsk->mm)) {
63753 + tsk->mm->pax_flags = flags;
63754 + return 0;
63755 + }
63756 + return -EINVAL;
63757 +}
63758 +#endif
63759 +
63760 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
63761 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
63762 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
63763 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
63764 +#endif
63765 +
63766 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
63767 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
63768 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
63769 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
63770 +
63771 /* Future-safe accessor for struct task_struct's cpus_allowed. */
63772 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
63773
63774 @@ -2112,7 +2211,9 @@ void yield(void);
63775 extern struct exec_domain default_exec_domain;
63776
63777 union thread_union {
63778 +#ifndef CONFIG_X86
63779 struct thread_info thread_info;
63780 +#endif
63781 unsigned long stack[THREAD_SIZE/sizeof(long)];
63782 };
63783
63784 @@ -2145,6 +2246,7 @@ extern struct pid_namespace init_pid_ns;
63785 */
63786
63787 extern struct task_struct *find_task_by_vpid(pid_t nr);
63788 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
63789 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
63790 struct pid_namespace *ns);
63791
63792 @@ -2301,7 +2403,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
63793 extern void exit_itimers(struct signal_struct *);
63794 extern void flush_itimer_signals(void);
63795
63796 -extern void do_group_exit(int);
63797 +extern __noreturn void do_group_exit(int);
63798
63799 extern void daemonize(const char *, ...);
63800 extern int allow_signal(int);
63801 @@ -2502,9 +2604,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
63802
63803 #endif
63804
63805 -static inline int object_is_on_stack(void *obj)
63806 +static inline int object_starts_on_stack(void *obj)
63807 {
63808 - void *stack = task_stack_page(current);
63809 + const void *stack = task_stack_page(current);
63810
63811 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
63812 }
63813 diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
63814 index 899fbb4..1cb4138 100644
63815 --- a/include/linux/screen_info.h
63816 +++ b/include/linux/screen_info.h
63817 @@ -43,7 +43,8 @@ struct screen_info {
63818 __u16 pages; /* 0x32 */
63819 __u16 vesa_attributes; /* 0x34 */
63820 __u32 capabilities; /* 0x36 */
63821 - __u8 _reserved[6]; /* 0x3a */
63822 + __u16 vesapm_size; /* 0x3a */
63823 + __u8 _reserved[4]; /* 0x3c */
63824 } __attribute__((packed));
63825
63826 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
63827 diff --git a/include/linux/security.h b/include/linux/security.h
63828 index 3dea6a9..81fd81f 100644
63829 --- a/include/linux/security.h
63830 +++ b/include/linux/security.h
63831 @@ -26,6 +26,7 @@
63832 #include <linux/capability.h>
63833 #include <linux/slab.h>
63834 #include <linux/err.h>
63835 +#include <linux/grsecurity.h>
63836
63837 struct linux_binprm;
63838 struct cred;
63839 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
63840 index fc61854..d7c490b 100644
63841 --- a/include/linux/seq_file.h
63842 +++ b/include/linux/seq_file.h
63843 @@ -25,6 +25,9 @@ struct seq_file {
63844 struct mutex lock;
63845 const struct seq_operations *op;
63846 int poll_event;
63847 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63848 + u64 exec_id;
63849 +#endif
63850 void *private;
63851 };
63852
63853 @@ -34,6 +37,7 @@ struct seq_operations {
63854 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
63855 int (*show) (struct seq_file *m, void *v);
63856 };
63857 +typedef struct seq_operations __no_const seq_operations_no_const;
63858
63859 #define SEQ_SKIP 1
63860
63861 diff --git a/include/linux/shm.h b/include/linux/shm.h
63862 index 92808b8..c28cac4 100644
63863 --- a/include/linux/shm.h
63864 +++ b/include/linux/shm.h
63865 @@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
63866
63867 /* The task created the shm object. NULL if the task is dead. */
63868 struct task_struct *shm_creator;
63869 +#ifdef CONFIG_GRKERNSEC
63870 + time_t shm_createtime;
63871 + pid_t shm_lapid;
63872 +#endif
63873 };
63874
63875 /* shm_mode upper byte flags */
63876 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
63877 index 642cb73..7ff7f9f 100644
63878 --- a/include/linux/skbuff.h
63879 +++ b/include/linux/skbuff.h
63880 @@ -680,7 +680,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
63881 */
63882 static inline int skb_queue_empty(const struct sk_buff_head *list)
63883 {
63884 - return list->next == (struct sk_buff *)list;
63885 + return list->next == (const struct sk_buff *)list;
63886 }
63887
63888 /**
63889 @@ -693,7 +693,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
63890 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63891 const struct sk_buff *skb)
63892 {
63893 - return skb->next == (struct sk_buff *)list;
63894 + return skb->next == (const struct sk_buff *)list;
63895 }
63896
63897 /**
63898 @@ -706,7 +706,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63899 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
63900 const struct sk_buff *skb)
63901 {
63902 - return skb->prev == (struct sk_buff *)list;
63903 + return skb->prev == (const struct sk_buff *)list;
63904 }
63905
63906 /**
63907 @@ -1605,7 +1605,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
63908 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
63909 */
63910 #ifndef NET_SKB_PAD
63911 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
63912 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
63913 #endif
63914
63915 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
63916 diff --git a/include/linux/slab.h b/include/linux/slab.h
63917 index 67d5d94..bbd740b 100644
63918 --- a/include/linux/slab.h
63919 +++ b/include/linux/slab.h
63920 @@ -11,12 +11,20 @@
63921
63922 #include <linux/gfp.h>
63923 #include <linux/types.h>
63924 +#include <linux/err.h>
63925
63926 /*
63927 * Flags to pass to kmem_cache_create().
63928 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
63929 */
63930 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
63931 +
63932 +#ifdef CONFIG_PAX_USERCOPY_SLABS
63933 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
63934 +#else
63935 +#define SLAB_USERCOPY 0x00000000UL
63936 +#endif
63937 +
63938 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
63939 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
63940 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
63941 @@ -87,10 +95,13 @@
63942 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
63943 * Both make kfree a no-op.
63944 */
63945 -#define ZERO_SIZE_PTR ((void *)16)
63946 +#define ZERO_SIZE_PTR \
63947 +({ \
63948 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
63949 + (void *)(-MAX_ERRNO-1L); \
63950 +})
63951
63952 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
63953 - (unsigned long)ZERO_SIZE_PTR)
63954 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
63955
63956 /*
63957 * struct kmem_cache related prototypes
63958 @@ -161,6 +172,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
63959 void kfree(const void *);
63960 void kzfree(const void *);
63961 size_t ksize(const void *);
63962 +const char *check_heap_object(const void *ptr, unsigned long n, bool to);
63963 +bool is_usercopy_object(const void *ptr);
63964
63965 /*
63966 * Allocator specific definitions. These are mainly used to establish optimized
63967 @@ -298,7 +311,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
63968 */
63969 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63970 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63971 -extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63972 +extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
63973 #define kmalloc_track_caller(size, flags) \
63974 __kmalloc_track_caller(size, flags, _RET_IP_)
63975 #else
63976 @@ -317,7 +330,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63977 */
63978 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63979 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63980 -extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
63981 +extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
63982 #define kmalloc_node_track_caller(size, flags, node) \
63983 __kmalloc_node_track_caller(size, flags, node, \
63984 _RET_IP_)
63985 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
63986 index fbd1117..0a3d314 100644
63987 --- a/include/linux/slab_def.h
63988 +++ b/include/linux/slab_def.h
63989 @@ -66,10 +66,10 @@ struct kmem_cache {
63990 unsigned long node_allocs;
63991 unsigned long node_frees;
63992 unsigned long node_overflow;
63993 - atomic_t allochit;
63994 - atomic_t allocmiss;
63995 - atomic_t freehit;
63996 - atomic_t freemiss;
63997 + atomic_unchecked_t allochit;
63998 + atomic_unchecked_t allocmiss;
63999 + atomic_unchecked_t freehit;
64000 + atomic_unchecked_t freemiss;
64001
64002 /*
64003 * If debugging is enabled, then the allocator can add additional
64004 @@ -103,11 +103,16 @@ struct cache_sizes {
64005 #ifdef CONFIG_ZONE_DMA
64006 struct kmem_cache *cs_dmacachep;
64007 #endif
64008 +
64009 +#ifdef CONFIG_PAX_USERCOPY_SLABS
64010 + struct kmem_cache *cs_usercopycachep;
64011 +#endif
64012 +
64013 };
64014 extern struct cache_sizes malloc_sizes[];
64015
64016 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
64017 -void *__kmalloc(size_t size, gfp_t flags);
64018 +void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
64019
64020 #ifdef CONFIG_TRACING
64021 extern void *kmem_cache_alloc_trace(size_t size,
64022 @@ -150,6 +155,13 @@ found:
64023 cachep = malloc_sizes[i].cs_dmacachep;
64024 else
64025 #endif
64026 +
64027 +#ifdef CONFIG_PAX_USERCOPY_SLABS
64028 + if (flags & GFP_USERCOPY)
64029 + cachep = malloc_sizes[i].cs_usercopycachep;
64030 + else
64031 +#endif
64032 +
64033 cachep = malloc_sizes[i].cs_cachep;
64034
64035 ret = kmem_cache_alloc_trace(size, cachep, flags);
64036 @@ -160,7 +172,7 @@ found:
64037 }
64038
64039 #ifdef CONFIG_NUMA
64040 -extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
64041 +extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64042 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
64043
64044 #ifdef CONFIG_TRACING
64045 @@ -203,6 +215,13 @@ found:
64046 cachep = malloc_sizes[i].cs_dmacachep;
64047 else
64048 #endif
64049 +
64050 +#ifdef CONFIG_PAX_USERCOPY_SLABS
64051 + if (flags & GFP_USERCOPY)
64052 + cachep = malloc_sizes[i].cs_usercopycachep;
64053 + else
64054 +#endif
64055 +
64056 cachep = malloc_sizes[i].cs_cachep;
64057
64058 return kmem_cache_alloc_node_trace(size, cachep, flags, node);
64059 diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
64060 index 0ec00b3..22b4715 100644
64061 --- a/include/linux/slob_def.h
64062 +++ b/include/linux/slob_def.h
64063 @@ -9,7 +9,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
64064 return kmem_cache_alloc_node(cachep, flags, -1);
64065 }
64066
64067 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
64068 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64069
64070 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
64071 {
64072 @@ -29,7 +29,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
64073 return __kmalloc_node(size, flags, -1);
64074 }
64075
64076 -static __always_inline void *__kmalloc(size_t size, gfp_t flags)
64077 +static __always_inline __size_overflow(1) void *__kmalloc(size_t size, gfp_t flags)
64078 {
64079 return kmalloc(size, flags);
64080 }
64081 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
64082 index c2f8c8b..d992a41 100644
64083 --- a/include/linux/slub_def.h
64084 +++ b/include/linux/slub_def.h
64085 @@ -92,7 +92,7 @@ struct kmem_cache {
64086 struct kmem_cache_order_objects max;
64087 struct kmem_cache_order_objects min;
64088 gfp_t allocflags; /* gfp flags to use on each alloc */
64089 - int refcount; /* Refcount for slab cache destroy */
64090 + atomic_t refcount; /* Refcount for slab cache destroy */
64091 void (*ctor)(void *);
64092 int inuse; /* Offset to metadata */
64093 int align; /* Alignment */
64094 @@ -153,7 +153,7 @@ extern struct kmem_cache *kmalloc_caches[SLUB_PAGE_SHIFT];
64095 * Sorry that the following has to be that ugly but some versions of GCC
64096 * have trouble with constant propagation and loops.
64097 */
64098 -static __always_inline int kmalloc_index(size_t size)
64099 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
64100 {
64101 if (!size)
64102 return 0;
64103 @@ -218,7 +218,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
64104 }
64105
64106 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
64107 -void *__kmalloc(size_t size, gfp_t flags);
64108 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
64109
64110 static __always_inline void *
64111 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
64112 @@ -259,7 +259,7 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
64113 }
64114 #endif
64115
64116 -static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
64117 +static __always_inline __size_overflow(1) void *kmalloc_large(size_t size, gfp_t flags)
64118 {
64119 unsigned int order = get_order(size);
64120 return kmalloc_order_trace(size, flags, order);
64121 @@ -284,7 +284,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
64122 }
64123
64124 #ifdef CONFIG_NUMA
64125 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
64126 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
64127 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
64128
64129 #ifdef CONFIG_TRACING
64130 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
64131 index de8832d..0147b46 100644
64132 --- a/include/linux/sonet.h
64133 +++ b/include/linux/sonet.h
64134 @@ -61,7 +61,7 @@ struct sonet_stats {
64135 #include <linux/atomic.h>
64136
64137 struct k_sonet_stats {
64138 -#define __HANDLE_ITEM(i) atomic_t i
64139 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
64140 __SONET_ITEMS
64141 #undef __HANDLE_ITEM
64142 };
64143 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
64144 index 523547e..2cb7140 100644
64145 --- a/include/linux/sunrpc/clnt.h
64146 +++ b/include/linux/sunrpc/clnt.h
64147 @@ -174,9 +174,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
64148 {
64149 switch (sap->sa_family) {
64150 case AF_INET:
64151 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
64152 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
64153 case AF_INET6:
64154 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
64155 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
64156 }
64157 return 0;
64158 }
64159 @@ -209,7 +209,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
64160 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
64161 const struct sockaddr *src)
64162 {
64163 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
64164 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
64165 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
64166
64167 dsin->sin_family = ssin->sin_family;
64168 @@ -312,7 +312,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
64169 if (sa->sa_family != AF_INET6)
64170 return 0;
64171
64172 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
64173 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
64174 }
64175
64176 #endif /* __KERNEL__ */
64177 diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
64178 index dc0c3cc..8503fb6 100644
64179 --- a/include/linux/sunrpc/sched.h
64180 +++ b/include/linux/sunrpc/sched.h
64181 @@ -106,6 +106,7 @@ struct rpc_call_ops {
64182 void (*rpc_count_stats)(struct rpc_task *, void *);
64183 void (*rpc_release)(void *);
64184 };
64185 +typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
64186
64187 struct rpc_task_setup {
64188 struct rpc_task *task;
64189 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
64190 index 0b8e3e6..33e0a01 100644
64191 --- a/include/linux/sunrpc/svc_rdma.h
64192 +++ b/include/linux/sunrpc/svc_rdma.h
64193 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
64194 extern unsigned int svcrdma_max_requests;
64195 extern unsigned int svcrdma_max_req_size;
64196
64197 -extern atomic_t rdma_stat_recv;
64198 -extern atomic_t rdma_stat_read;
64199 -extern atomic_t rdma_stat_write;
64200 -extern atomic_t rdma_stat_sq_starve;
64201 -extern atomic_t rdma_stat_rq_starve;
64202 -extern atomic_t rdma_stat_rq_poll;
64203 -extern atomic_t rdma_stat_rq_prod;
64204 -extern atomic_t rdma_stat_sq_poll;
64205 -extern atomic_t rdma_stat_sq_prod;
64206 +extern atomic_unchecked_t rdma_stat_recv;
64207 +extern atomic_unchecked_t rdma_stat_read;
64208 +extern atomic_unchecked_t rdma_stat_write;
64209 +extern atomic_unchecked_t rdma_stat_sq_starve;
64210 +extern atomic_unchecked_t rdma_stat_rq_starve;
64211 +extern atomic_unchecked_t rdma_stat_rq_poll;
64212 +extern atomic_unchecked_t rdma_stat_rq_prod;
64213 +extern atomic_unchecked_t rdma_stat_sq_poll;
64214 +extern atomic_unchecked_t rdma_stat_sq_prod;
64215
64216 #define RPCRDMA_VERSION 1
64217
64218 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
64219 index c34b4c8..a65b67d 100644
64220 --- a/include/linux/sysctl.h
64221 +++ b/include/linux/sysctl.h
64222 @@ -155,7 +155,11 @@ enum
64223 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
64224 };
64225
64226 -
64227 +#ifdef CONFIG_PAX_SOFTMODE
64228 +enum {
64229 + PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
64230 +};
64231 +#endif
64232
64233 /* CTL_VM names: */
64234 enum
64235 @@ -948,6 +952,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
64236
64237 extern int proc_dostring(struct ctl_table *, int,
64238 void __user *, size_t *, loff_t *);
64239 +extern int proc_dostring_modpriv(struct ctl_table *, int,
64240 + void __user *, size_t *, loff_t *);
64241 extern int proc_dointvec(struct ctl_table *, int,
64242 void __user *, size_t *, loff_t *);
64243 extern int proc_dointvec_minmax(struct ctl_table *, int,
64244 diff --git a/include/linux/tty.h b/include/linux/tty.h
64245 index 9f47ab5..73da944 100644
64246 --- a/include/linux/tty.h
64247 +++ b/include/linux/tty.h
64248 @@ -225,7 +225,7 @@ struct tty_port {
64249 const struct tty_port_operations *ops; /* Port operations */
64250 spinlock_t lock; /* Lock protecting tty field */
64251 int blocked_open; /* Waiting to open */
64252 - int count; /* Usage count */
64253 + atomic_t count; /* Usage count */
64254 wait_queue_head_t open_wait; /* Open waiters */
64255 wait_queue_head_t close_wait; /* Close waiters */
64256 wait_queue_head_t delta_msr_wait; /* Modem status change */
64257 @@ -525,7 +525,7 @@ extern int tty_port_open(struct tty_port *port,
64258 struct tty_struct *tty, struct file *filp);
64259 static inline int tty_port_users(struct tty_port *port)
64260 {
64261 - return port->count + port->blocked_open;
64262 + return atomic_read(&port->count) + port->blocked_open;
64263 }
64264
64265 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
64266 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
64267 index fb79dd8d..07d4773 100644
64268 --- a/include/linux/tty_ldisc.h
64269 +++ b/include/linux/tty_ldisc.h
64270 @@ -149,7 +149,7 @@ struct tty_ldisc_ops {
64271
64272 struct module *owner;
64273
64274 - int refcount;
64275 + atomic_t refcount;
64276 };
64277
64278 struct tty_ldisc {
64279 diff --git a/include/linux/types.h b/include/linux/types.h
64280 index 9c1bd53..c2370f6 100644
64281 --- a/include/linux/types.h
64282 +++ b/include/linux/types.h
64283 @@ -220,10 +220,26 @@ typedef struct {
64284 int counter;
64285 } atomic_t;
64286
64287 +#ifdef CONFIG_PAX_REFCOUNT
64288 +typedef struct {
64289 + int counter;
64290 +} atomic_unchecked_t;
64291 +#else
64292 +typedef atomic_t atomic_unchecked_t;
64293 +#endif
64294 +
64295 #ifdef CONFIG_64BIT
64296 typedef struct {
64297 long counter;
64298 } atomic64_t;
64299 +
64300 +#ifdef CONFIG_PAX_REFCOUNT
64301 +typedef struct {
64302 + long counter;
64303 +} atomic64_unchecked_t;
64304 +#else
64305 +typedef atomic64_t atomic64_unchecked_t;
64306 +#endif
64307 #endif
64308
64309 struct list_head {
64310 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
64311 index 5ca0951..ab496a5 100644
64312 --- a/include/linux/uaccess.h
64313 +++ b/include/linux/uaccess.h
64314 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
64315 long ret; \
64316 mm_segment_t old_fs = get_fs(); \
64317 \
64318 - set_fs(KERNEL_DS); \
64319 pagefault_disable(); \
64320 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
64321 - pagefault_enable(); \
64322 + set_fs(KERNEL_DS); \
64323 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
64324 set_fs(old_fs); \
64325 + pagefault_enable(); \
64326 ret; \
64327 })
64328
64329 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
64330 index 99c1b4d..bb94261 100644
64331 --- a/include/linux/unaligned/access_ok.h
64332 +++ b/include/linux/unaligned/access_ok.h
64333 @@ -6,32 +6,32 @@
64334
64335 static inline u16 get_unaligned_le16(const void *p)
64336 {
64337 - return le16_to_cpup((__le16 *)p);
64338 + return le16_to_cpup((const __le16 *)p);
64339 }
64340
64341 static inline u32 get_unaligned_le32(const void *p)
64342 {
64343 - return le32_to_cpup((__le32 *)p);
64344 + return le32_to_cpup((const __le32 *)p);
64345 }
64346
64347 static inline u64 get_unaligned_le64(const void *p)
64348 {
64349 - return le64_to_cpup((__le64 *)p);
64350 + return le64_to_cpup((const __le64 *)p);
64351 }
64352
64353 static inline u16 get_unaligned_be16(const void *p)
64354 {
64355 - return be16_to_cpup((__be16 *)p);
64356 + return be16_to_cpup((const __be16 *)p);
64357 }
64358
64359 static inline u32 get_unaligned_be32(const void *p)
64360 {
64361 - return be32_to_cpup((__be32 *)p);
64362 + return be32_to_cpup((const __be32 *)p);
64363 }
64364
64365 static inline u64 get_unaligned_be64(const void *p)
64366 {
64367 - return be64_to_cpup((__be64 *)p);
64368 + return be64_to_cpup((const __be64 *)p);
64369 }
64370
64371 static inline void put_unaligned_le16(u16 val, void *p)
64372 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
64373 index 547e59c..db6ad19 100644
64374 --- a/include/linux/usb/renesas_usbhs.h
64375 +++ b/include/linux/usb/renesas_usbhs.h
64376 @@ -39,7 +39,7 @@ enum {
64377 */
64378 struct renesas_usbhs_driver_callback {
64379 int (*notify_hotplug)(struct platform_device *pdev);
64380 -};
64381 +} __no_const;
64382
64383 /*
64384 * callback functions for platform
64385 @@ -97,7 +97,7 @@ struct renesas_usbhs_platform_callback {
64386 * VBUS control is needed for Host
64387 */
64388 int (*set_vbus)(struct platform_device *pdev, int enable);
64389 -};
64390 +} __no_const;
64391
64392 /*
64393 * parameters for renesas usbhs
64394 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
64395 index 6f8fbcf..8259001 100644
64396 --- a/include/linux/vermagic.h
64397 +++ b/include/linux/vermagic.h
64398 @@ -25,9 +25,35 @@
64399 #define MODULE_ARCH_VERMAGIC ""
64400 #endif
64401
64402 +#ifdef CONFIG_PAX_REFCOUNT
64403 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
64404 +#else
64405 +#define MODULE_PAX_REFCOUNT ""
64406 +#endif
64407 +
64408 +#ifdef CONSTIFY_PLUGIN
64409 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
64410 +#else
64411 +#define MODULE_CONSTIFY_PLUGIN ""
64412 +#endif
64413 +
64414 +#ifdef STACKLEAK_PLUGIN
64415 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
64416 +#else
64417 +#define MODULE_STACKLEAK_PLUGIN ""
64418 +#endif
64419 +
64420 +#ifdef CONFIG_GRKERNSEC
64421 +#define MODULE_GRSEC "GRSEC "
64422 +#else
64423 +#define MODULE_GRSEC ""
64424 +#endif
64425 +
64426 #define VERMAGIC_STRING \
64427 UTS_RELEASE " " \
64428 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64429 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64430 - MODULE_ARCH_VERMAGIC
64431 + MODULE_ARCH_VERMAGIC \
64432 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
64433 + MODULE_GRSEC
64434
64435 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
64436 index dcdfc2b..ec79ab5 100644
64437 --- a/include/linux/vmalloc.h
64438 +++ b/include/linux/vmalloc.h
64439 @@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
64440 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64441 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64442 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
64443 +
64444 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64445 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
64446 +#endif
64447 +
64448 /* bits [20..32] reserved for arch specific ioremap internals */
64449
64450 /*
64451 @@ -62,7 +67,7 @@ extern void *vmalloc_32_user(unsigned long size);
64452 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
64453 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64454 unsigned long start, unsigned long end, gfp_t gfp_mask,
64455 - pgprot_t prot, int node, void *caller);
64456 + pgprot_t prot, int node, void *caller) __size_overflow(1);
64457 extern void vfree(const void *addr);
64458
64459 extern void *vmap(struct page **pages, unsigned int count,
64460 @@ -123,8 +128,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
64461 extern void free_vm_area(struct vm_struct *area);
64462
64463 /* for /dev/kmem */
64464 -extern long vread(char *buf, char *addr, unsigned long count);
64465 -extern long vwrite(char *buf, char *addr, unsigned long count);
64466 +extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
64467 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
64468
64469 /*
64470 * Internals. Dont't use..
64471 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
64472 index 65efb92..137adbb 100644
64473 --- a/include/linux/vmstat.h
64474 +++ b/include/linux/vmstat.h
64475 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
64476 /*
64477 * Zone based page accounting with per cpu differentials.
64478 */
64479 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64480 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64481
64482 static inline void zone_page_state_add(long x, struct zone *zone,
64483 enum zone_stat_item item)
64484 {
64485 - atomic_long_add(x, &zone->vm_stat[item]);
64486 - atomic_long_add(x, &vm_stat[item]);
64487 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64488 + atomic_long_add_unchecked(x, &vm_stat[item]);
64489 }
64490
64491 static inline unsigned long global_page_state(enum zone_stat_item item)
64492 {
64493 - long x = atomic_long_read(&vm_stat[item]);
64494 + long x = atomic_long_read_unchecked(&vm_stat[item]);
64495 #ifdef CONFIG_SMP
64496 if (x < 0)
64497 x = 0;
64498 @@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
64499 static inline unsigned long zone_page_state(struct zone *zone,
64500 enum zone_stat_item item)
64501 {
64502 - long x = atomic_long_read(&zone->vm_stat[item]);
64503 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64504 #ifdef CONFIG_SMP
64505 if (x < 0)
64506 x = 0;
64507 @@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
64508 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64509 enum zone_stat_item item)
64510 {
64511 - long x = atomic_long_read(&zone->vm_stat[item]);
64512 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64513
64514 #ifdef CONFIG_SMP
64515 int cpu;
64516 @@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
64517
64518 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64519 {
64520 - atomic_long_inc(&zone->vm_stat[item]);
64521 - atomic_long_inc(&vm_stat[item]);
64522 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
64523 + atomic_long_inc_unchecked(&vm_stat[item]);
64524 }
64525
64526 static inline void __inc_zone_page_state(struct page *page,
64527 @@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
64528
64529 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64530 {
64531 - atomic_long_dec(&zone->vm_stat[item]);
64532 - atomic_long_dec(&vm_stat[item]);
64533 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
64534 + atomic_long_dec_unchecked(&vm_stat[item]);
64535 }
64536
64537 static inline void __dec_zone_page_state(struct page *page,
64538 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
64539 index e5d1220..ef6e406 100644
64540 --- a/include/linux/xattr.h
64541 +++ b/include/linux/xattr.h
64542 @@ -57,6 +57,11 @@
64543 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
64544 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
64545
64546 +/* User namespace */
64547 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
64548 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
64549 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
64550 +
64551 #ifdef __KERNEL__
64552
64553 #include <linux/types.h>
64554 diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
64555 index 944ecdf..a3994fc 100644
64556 --- a/include/media/saa7146_vv.h
64557 +++ b/include/media/saa7146_vv.h
64558 @@ -161,8 +161,8 @@ struct saa7146_ext_vv
64559 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64560
64561 /* the extension can override this */
64562 - struct v4l2_ioctl_ops vid_ops;
64563 - struct v4l2_ioctl_ops vbi_ops;
64564 + v4l2_ioctl_ops_no_const vid_ops;
64565 + v4l2_ioctl_ops_no_const vbi_ops;
64566 /* pointer to the saa7146 core ops */
64567 const struct v4l2_ioctl_ops *core_ops;
64568
64569 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
64570 index a056e6e..31023a5 100644
64571 --- a/include/media/v4l2-dev.h
64572 +++ b/include/media/v4l2-dev.h
64573 @@ -73,7 +73,8 @@ struct v4l2_file_operations {
64574 int (*mmap) (struct file *, struct vm_area_struct *);
64575 int (*open) (struct file *);
64576 int (*release) (struct file *);
64577 -};
64578 +} __do_const;
64579 +typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64580
64581 /*
64582 * Newer version of video_device, handled by videodev2.c
64583 diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
64584 index d8b76f7..7d5aa18 100644
64585 --- a/include/media/v4l2-ioctl.h
64586 +++ b/include/media/v4l2-ioctl.h
64587 @@ -287,7 +287,7 @@ struct v4l2_ioctl_ops {
64588 long (*vidioc_default) (struct file *file, void *fh,
64589 bool valid_prio, int cmd, void *arg);
64590 };
64591 -
64592 +typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64593
64594 /* v4l debugging and diagnostics */
64595
64596 diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
64597 index 439dadc..1c67e3f 100644
64598 --- a/include/net/caif/caif_hsi.h
64599 +++ b/include/net/caif/caif_hsi.h
64600 @@ -98,7 +98,7 @@ struct cfhsi_drv {
64601 void (*rx_done_cb) (struct cfhsi_drv *drv);
64602 void (*wake_up_cb) (struct cfhsi_drv *drv);
64603 void (*wake_down_cb) (struct cfhsi_drv *drv);
64604 -};
64605 +} __no_const;
64606
64607 /* Structure implemented by HSI device. */
64608 struct cfhsi_dev {
64609 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
64610 index 9e5425b..8136ffc 100644
64611 --- a/include/net/caif/cfctrl.h
64612 +++ b/include/net/caif/cfctrl.h
64613 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
64614 void (*radioset_rsp)(void);
64615 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
64616 struct cflayer *client_layer);
64617 -};
64618 +} __no_const;
64619
64620 /* Link Setup Parameters for CAIF-Links. */
64621 struct cfctrl_link_param {
64622 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
64623 struct cfctrl {
64624 struct cfsrvl serv;
64625 struct cfctrl_rsp res;
64626 - atomic_t req_seq_no;
64627 - atomic_t rsp_seq_no;
64628 + atomic_unchecked_t req_seq_no;
64629 + atomic_unchecked_t rsp_seq_no;
64630 struct list_head list;
64631 /* Protects from simultaneous access to first_req list */
64632 spinlock_t info_list_lock;
64633 diff --git a/include/net/flow.h b/include/net/flow.h
64634 index 6c469db..7743b8e 100644
64635 --- a/include/net/flow.h
64636 +++ b/include/net/flow.h
64637 @@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
64638
64639 extern void flow_cache_flush(void);
64640 extern void flow_cache_flush_deferred(void);
64641 -extern atomic_t flow_cache_genid;
64642 +extern atomic_unchecked_t flow_cache_genid;
64643
64644 #endif
64645 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
64646 index 2040bff..f4c0733 100644
64647 --- a/include/net/inetpeer.h
64648 +++ b/include/net/inetpeer.h
64649 @@ -51,8 +51,8 @@ struct inet_peer {
64650 */
64651 union {
64652 struct {
64653 - atomic_t rid; /* Frag reception counter */
64654 - atomic_t ip_id_count; /* IP ID for the next packet */
64655 + atomic_unchecked_t rid; /* Frag reception counter */
64656 + atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
64657 __u32 tcp_ts;
64658 __u32 tcp_ts_stamp;
64659 };
64660 @@ -118,11 +118,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
64661 more++;
64662 inet_peer_refcheck(p);
64663 do {
64664 - old = atomic_read(&p->ip_id_count);
64665 + old = atomic_read_unchecked(&p->ip_id_count);
64666 new = old + more;
64667 if (!new)
64668 new = 1;
64669 - } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
64670 + } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
64671 return new;
64672 }
64673
64674 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
64675 index 78df0866..00e5c9b 100644
64676 --- a/include/net/ip_fib.h
64677 +++ b/include/net/ip_fib.h
64678 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
64679
64680 #define FIB_RES_SADDR(net, res) \
64681 ((FIB_RES_NH(res).nh_saddr_genid == \
64682 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
64683 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
64684 FIB_RES_NH(res).nh_saddr : \
64685 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
64686 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
64687 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
64688 index 95374d1..2300e36 100644
64689 --- a/include/net/ip_vs.h
64690 +++ b/include/net/ip_vs.h
64691 @@ -510,7 +510,7 @@ struct ip_vs_conn {
64692 struct ip_vs_conn *control; /* Master control connection */
64693 atomic_t n_control; /* Number of controlled ones */
64694 struct ip_vs_dest *dest; /* real server */
64695 - atomic_t in_pkts; /* incoming packet counter */
64696 + atomic_unchecked_t in_pkts; /* incoming packet counter */
64697
64698 /* packet transmitter for different forwarding methods. If it
64699 mangles the packet, it must return NF_DROP or better NF_STOLEN,
64700 @@ -648,7 +648,7 @@ struct ip_vs_dest {
64701 __be16 port; /* port number of the server */
64702 union nf_inet_addr addr; /* IP address of the server */
64703 volatile unsigned int flags; /* dest status flags */
64704 - atomic_t conn_flags; /* flags to copy to conn */
64705 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
64706 atomic_t weight; /* server weight */
64707
64708 atomic_t refcnt; /* reference counter */
64709 diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
64710 index 69b610a..fe3962c 100644
64711 --- a/include/net/irda/ircomm_core.h
64712 +++ b/include/net/irda/ircomm_core.h
64713 @@ -51,7 +51,7 @@ typedef struct {
64714 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
64715 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
64716 struct ircomm_info *);
64717 -} call_t;
64718 +} __no_const call_t;
64719
64720 struct ircomm_cb {
64721 irda_queue_t queue;
64722 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
64723 index 59ba38bc..d515662 100644
64724 --- a/include/net/irda/ircomm_tty.h
64725 +++ b/include/net/irda/ircomm_tty.h
64726 @@ -35,6 +35,7 @@
64727 #include <linux/termios.h>
64728 #include <linux/timer.h>
64729 #include <linux/tty.h> /* struct tty_struct */
64730 +#include <asm/local.h>
64731
64732 #include <net/irda/irias_object.h>
64733 #include <net/irda/ircomm_core.h>
64734 @@ -105,8 +106,8 @@ struct ircomm_tty_cb {
64735 unsigned short close_delay;
64736 unsigned short closing_wait; /* time to wait before closing */
64737
64738 - int open_count;
64739 - int blocked_open; /* # of blocked opens */
64740 + local_t open_count;
64741 + local_t blocked_open; /* # of blocked opens */
64742
64743 /* Protect concurent access to :
64744 * o self->open_count
64745 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
64746 index cc7c197..9f2da2a 100644
64747 --- a/include/net/iucv/af_iucv.h
64748 +++ b/include/net/iucv/af_iucv.h
64749 @@ -141,7 +141,7 @@ struct iucv_sock {
64750 struct iucv_sock_list {
64751 struct hlist_head head;
64752 rwlock_t lock;
64753 - atomic_t autobind_name;
64754 + atomic_unchecked_t autobind_name;
64755 };
64756
64757 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
64758 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
64759 index 6cdfeed..55a0256 100644
64760 --- a/include/net/neighbour.h
64761 +++ b/include/net/neighbour.h
64762 @@ -123,7 +123,7 @@ struct neigh_ops {
64763 void (*error_report)(struct neighbour *, struct sk_buff *);
64764 int (*output)(struct neighbour *, struct sk_buff *);
64765 int (*connected_output)(struct neighbour *, struct sk_buff *);
64766 -};
64767 +} __do_const;
64768
64769 struct pneigh_entry {
64770 struct pneigh_entry *next;
64771 diff --git a/include/net/netlink.h b/include/net/netlink.h
64772 index 785f37a..c81dc0c 100644
64773 --- a/include/net/netlink.h
64774 +++ b/include/net/netlink.h
64775 @@ -520,7 +520,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
64776 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
64777 {
64778 if (mark)
64779 - skb_trim(skb, (unsigned char *) mark - skb->data);
64780 + skb_trim(skb, (const unsigned char *) mark - skb->data);
64781 }
64782
64783 /**
64784 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
64785 index bbd023a..97c6d0d 100644
64786 --- a/include/net/netns/ipv4.h
64787 +++ b/include/net/netns/ipv4.h
64788 @@ -57,8 +57,8 @@ struct netns_ipv4 {
64789 unsigned int sysctl_ping_group_range[2];
64790 long sysctl_tcp_mem[3];
64791
64792 - atomic_t rt_genid;
64793 - atomic_t dev_addr_genid;
64794 + atomic_unchecked_t rt_genid;
64795 + atomic_unchecked_t dev_addr_genid;
64796
64797 #ifdef CONFIG_IP_MROUTE
64798 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
64799 diff --git a/include/net/scm.h b/include/net/scm.h
64800 index d456f4c..0c0017c 100644
64801 --- a/include/net/scm.h
64802 +++ b/include/net/scm.h
64803 @@ -71,9 +71,11 @@ static __inline__ void scm_destroy(struct scm_cookie *scm)
64804 }
64805
64806 static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
64807 - struct scm_cookie *scm)
64808 + struct scm_cookie *scm, bool forcecreds)
64809 {
64810 memset(scm, 0, sizeof(*scm));
64811 + if (forcecreds)
64812 + scm_set_cred(scm, task_tgid(current), current_cred());
64813 unix_get_peersec_dgram(sock, scm);
64814 if (msg->msg_controllen <= 0)
64815 return 0;
64816 diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
64817 index a2ef814..31a8e3f 100644
64818 --- a/include/net/sctp/sctp.h
64819 +++ b/include/net/sctp/sctp.h
64820 @@ -318,9 +318,9 @@ do { \
64821
64822 #else /* SCTP_DEBUG */
64823
64824 -#define SCTP_DEBUG_PRINTK(whatever...)
64825 -#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
64826 -#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
64827 +#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
64828 +#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
64829 +#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
64830 #define SCTP_ENABLE_DEBUG
64831 #define SCTP_DISABLE_DEBUG
64832 #define SCTP_ASSERT(expr, str, func)
64833 diff --git a/include/net/sock.h b/include/net/sock.h
64834 index 4a45216..7af2578 100644
64835 --- a/include/net/sock.h
64836 +++ b/include/net/sock.h
64837 @@ -303,7 +303,7 @@ struct sock {
64838 #ifdef CONFIG_RPS
64839 __u32 sk_rxhash;
64840 #endif
64841 - atomic_t sk_drops;
64842 + atomic_unchecked_t sk_drops;
64843 int sk_rcvbuf;
64844
64845 struct sk_filter __rcu *sk_filter;
64846 @@ -1726,7 +1726,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
64847 }
64848
64849 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
64850 - char __user *from, char *to,
64851 + char __user *from, unsigned char *to,
64852 int copy, int offset)
64853 {
64854 if (skb->ip_summed == CHECKSUM_NONE) {
64855 diff --git a/include/net/tcp.h b/include/net/tcp.h
64856 index e79aa48..9929421 100644
64857 --- a/include/net/tcp.h
64858 +++ b/include/net/tcp.h
64859 @@ -1459,7 +1459,7 @@ struct tcp_seq_afinfo {
64860 char *name;
64861 sa_family_t family;
64862 const struct file_operations *seq_fops;
64863 - struct seq_operations seq_ops;
64864 + seq_operations_no_const seq_ops;
64865 };
64866
64867 struct tcp_iter_state {
64868 diff --git a/include/net/udp.h b/include/net/udp.h
64869 index 065f379..b661b40 100644
64870 --- a/include/net/udp.h
64871 +++ b/include/net/udp.h
64872 @@ -244,7 +244,7 @@ struct udp_seq_afinfo {
64873 sa_family_t family;
64874 struct udp_table *udp_table;
64875 const struct file_operations *seq_fops;
64876 - struct seq_operations seq_ops;
64877 + seq_operations_no_const seq_ops;
64878 };
64879
64880 struct udp_iter_state {
64881 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
64882 index e0a55df..5890bca07 100644
64883 --- a/include/net/xfrm.h
64884 +++ b/include/net/xfrm.h
64885 @@ -505,7 +505,7 @@ struct xfrm_policy {
64886 struct timer_list timer;
64887
64888 struct flow_cache_object flo;
64889 - atomic_t genid;
64890 + atomic_unchecked_t genid;
64891 u32 priority;
64892 u32 index;
64893 struct xfrm_mark mark;
64894 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
64895 index 1a046b1..ee0bef0 100644
64896 --- a/include/rdma/iw_cm.h
64897 +++ b/include/rdma/iw_cm.h
64898 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
64899 int backlog);
64900
64901 int (*destroy_listen)(struct iw_cm_id *cm_id);
64902 -};
64903 +} __no_const;
64904
64905 /**
64906 * iw_create_cm_id - Create an IW CM identifier.
64907 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
64908 index 8f9dfba..610ab6c 100644
64909 --- a/include/scsi/libfc.h
64910 +++ b/include/scsi/libfc.h
64911 @@ -756,6 +756,7 @@ struct libfc_function_template {
64912 */
64913 void (*disc_stop_final) (struct fc_lport *);
64914 };
64915 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
64916
64917 /**
64918 * struct fc_disc - Discovery context
64919 @@ -861,7 +862,7 @@ struct fc_lport {
64920 struct fc_vport *vport;
64921
64922 /* Operational Information */
64923 - struct libfc_function_template tt;
64924 + libfc_function_template_no_const tt;
64925 u8 link_up;
64926 u8 qfull;
64927 enum fc_lport_state state;
64928 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
64929 index ba96988..ecf2eb9 100644
64930 --- a/include/scsi/scsi_device.h
64931 +++ b/include/scsi/scsi_device.h
64932 @@ -163,9 +163,9 @@ struct scsi_device {
64933 unsigned int max_device_blocked; /* what device_blocked counts down from */
64934 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
64935
64936 - atomic_t iorequest_cnt;
64937 - atomic_t iodone_cnt;
64938 - atomic_t ioerr_cnt;
64939 + atomic_unchecked_t iorequest_cnt;
64940 + atomic_unchecked_t iodone_cnt;
64941 + atomic_unchecked_t ioerr_cnt;
64942
64943 struct device sdev_gendev,
64944 sdev_dev;
64945 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
64946 index 719faf1..07b6728 100644
64947 --- a/include/scsi/scsi_transport_fc.h
64948 +++ b/include/scsi/scsi_transport_fc.h
64949 @@ -739,7 +739,8 @@ struct fc_function_template {
64950 unsigned long show_host_system_hostname:1;
64951
64952 unsigned long disable_target_scan:1;
64953 -};
64954 +} __do_const;
64955 +typedef struct fc_function_template __no_const fc_function_template_no_const;
64956
64957
64958 /**
64959 diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
64960 index 030b87c..98a6954 100644
64961 --- a/include/sound/ak4xxx-adda.h
64962 +++ b/include/sound/ak4xxx-adda.h
64963 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
64964 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
64965 unsigned char val);
64966 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
64967 -};
64968 +} __no_const;
64969
64970 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
64971
64972 diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
64973 index 8c05e47..2b5df97 100644
64974 --- a/include/sound/hwdep.h
64975 +++ b/include/sound/hwdep.h
64976 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
64977 struct snd_hwdep_dsp_status *status);
64978 int (*dsp_load)(struct snd_hwdep *hw,
64979 struct snd_hwdep_dsp_image *image);
64980 -};
64981 +} __no_const;
64982
64983 struct snd_hwdep {
64984 struct snd_card *card;
64985 diff --git a/include/sound/info.h b/include/sound/info.h
64986 index 9ca1a49..aba1728 100644
64987 --- a/include/sound/info.h
64988 +++ b/include/sound/info.h
64989 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
64990 struct snd_info_buffer *buffer);
64991 void (*write)(struct snd_info_entry *entry,
64992 struct snd_info_buffer *buffer);
64993 -};
64994 +} __no_const;
64995
64996 struct snd_info_entry_ops {
64997 int (*open)(struct snd_info_entry *entry,
64998 diff --git a/include/sound/pcm.h b/include/sound/pcm.h
64999 index 0d11128..814178e 100644
65000 --- a/include/sound/pcm.h
65001 +++ b/include/sound/pcm.h
65002 @@ -81,6 +81,7 @@ struct snd_pcm_ops {
65003 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
65004 int (*ack)(struct snd_pcm_substream *substream);
65005 };
65006 +typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
65007
65008 /*
65009 *
65010 diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
65011 index af1b49e..a5d55a5 100644
65012 --- a/include/sound/sb16_csp.h
65013 +++ b/include/sound/sb16_csp.h
65014 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
65015 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
65016 int (*csp_stop) (struct snd_sb_csp * p);
65017 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
65018 -};
65019 +} __no_const;
65020
65021 /*
65022 * CSP private data
65023 diff --git a/include/sound/soc.h b/include/sound/soc.h
65024 index c703871..f7fbbbd 100644
65025 --- a/include/sound/soc.h
65026 +++ b/include/sound/soc.h
65027 @@ -757,7 +757,7 @@ struct snd_soc_platform_driver {
65028 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
65029 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
65030 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
65031 -};
65032 +} __do_const;
65033
65034 struct snd_soc_platform {
65035 const char *name;
65036 @@ -949,7 +949,7 @@ struct snd_soc_pcm_runtime {
65037 struct snd_soc_dai_link *dai_link;
65038 struct mutex pcm_mutex;
65039 enum snd_soc_pcm_subclass pcm_subclass;
65040 - struct snd_pcm_ops ops;
65041 + snd_pcm_ops_no_const ops;
65042
65043 unsigned int dev_registered:1;
65044
65045 diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
65046 index 0c3c2fb..d9d9990 100644
65047 --- a/include/sound/tea575x-tuner.h
65048 +++ b/include/sound/tea575x-tuner.h
65049 @@ -44,7 +44,7 @@ struct snd_tea575x_ops {
65050
65051 struct snd_tea575x {
65052 struct v4l2_device *v4l2_dev;
65053 - struct v4l2_file_operations fops;
65054 + v4l2_file_operations_no_const fops;
65055 struct video_device vd; /* video device */
65056 int radio_nr; /* radio_nr */
65057 bool tea5759; /* 5759 chip is present */
65058 diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
65059 index 4119966..1a4671c 100644
65060 --- a/include/sound/ymfpci.h
65061 +++ b/include/sound/ymfpci.h
65062 @@ -358,7 +358,7 @@ struct snd_ymfpci {
65063 spinlock_t reg_lock;
65064 spinlock_t voice_lock;
65065 wait_queue_head_t interrupt_sleep;
65066 - atomic_t interrupt_sleep_count;
65067 + atomic_unchecked_t interrupt_sleep_count;
65068 struct snd_info_entry *proc_entry;
65069 const struct firmware *dsp_microcode;
65070 const struct firmware *controller_microcode;
65071 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
65072 index 362e0d9..36b9a83 100644
65073 --- a/include/target/target_core_base.h
65074 +++ b/include/target/target_core_base.h
65075 @@ -441,7 +441,7 @@ struct t10_reservation_ops {
65076 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
65077 int (*t10_pr_register)(struct se_cmd *);
65078 int (*t10_pr_clear)(struct se_cmd *);
65079 -};
65080 +} __no_const;
65081
65082 struct t10_reservation {
65083 /* Reservation effects all target ports */
65084 @@ -780,7 +780,7 @@ struct se_device {
65085 spinlock_t stats_lock;
65086 /* Active commands on this virtual SE device */
65087 atomic_t simple_cmds;
65088 - atomic_t dev_ordered_id;
65089 + atomic_unchecked_t dev_ordered_id;
65090 atomic_t execute_tasks;
65091 atomic_t dev_ordered_sync;
65092 atomic_t dev_qf_count;
65093 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
65094 new file mode 100644
65095 index 0000000..2efe49d
65096 --- /dev/null
65097 +++ b/include/trace/events/fs.h
65098 @@ -0,0 +1,53 @@
65099 +#undef TRACE_SYSTEM
65100 +#define TRACE_SYSTEM fs
65101 +
65102 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
65103 +#define _TRACE_FS_H
65104 +
65105 +#include <linux/fs.h>
65106 +#include <linux/tracepoint.h>
65107 +
65108 +TRACE_EVENT(do_sys_open,
65109 +
65110 + TP_PROTO(char *filename, int flags, int mode),
65111 +
65112 + TP_ARGS(filename, flags, mode),
65113 +
65114 + TP_STRUCT__entry(
65115 + __string( filename, filename )
65116 + __field( int, flags )
65117 + __field( int, mode )
65118 + ),
65119 +
65120 + TP_fast_assign(
65121 + __assign_str(filename, filename);
65122 + __entry->flags = flags;
65123 + __entry->mode = mode;
65124 + ),
65125 +
65126 + TP_printk("\"%s\" %x %o",
65127 + __get_str(filename), __entry->flags, __entry->mode)
65128 +);
65129 +
65130 +TRACE_EVENT(open_exec,
65131 +
65132 + TP_PROTO(const char *filename),
65133 +
65134 + TP_ARGS(filename),
65135 +
65136 + TP_STRUCT__entry(
65137 + __string( filename, filename )
65138 + ),
65139 +
65140 + TP_fast_assign(
65141 + __assign_str(filename, filename);
65142 + ),
65143 +
65144 + TP_printk("\"%s\"",
65145 + __get_str(filename))
65146 +);
65147 +
65148 +#endif /* _TRACE_FS_H */
65149 +
65150 +/* This part must be outside protection */
65151 +#include <trace/define_trace.h>
65152 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
65153 index 1c09820..7f5ec79 100644
65154 --- a/include/trace/events/irq.h
65155 +++ b/include/trace/events/irq.h
65156 @@ -36,7 +36,7 @@ struct softirq_action;
65157 */
65158 TRACE_EVENT(irq_handler_entry,
65159
65160 - TP_PROTO(int irq, struct irqaction *action),
65161 + TP_PROTO(int irq, const struct irqaction *action),
65162
65163 TP_ARGS(irq, action),
65164
65165 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
65166 */
65167 TRACE_EVENT(irq_handler_exit,
65168
65169 - TP_PROTO(int irq, struct irqaction *action, int ret),
65170 + TP_PROTO(int irq, const struct irqaction *action, int ret),
65171
65172 TP_ARGS(irq, action, ret),
65173
65174 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
65175 index f9466fa..f4e2b81 100644
65176 --- a/include/video/udlfb.h
65177 +++ b/include/video/udlfb.h
65178 @@ -53,10 +53,10 @@ struct dlfb_data {
65179 u32 pseudo_palette[256];
65180 int blank_mode; /*one of FB_BLANK_ */
65181 /* blit-only rendering path metrics, exposed through sysfs */
65182 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
65183 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
65184 - atomic_t bytes_sent; /* to usb, after compression including overhead */
65185 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
65186 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
65187 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
65188 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
65189 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
65190 };
65191
65192 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
65193 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
65194 index 0993a22..32ba2fe 100644
65195 --- a/include/video/uvesafb.h
65196 +++ b/include/video/uvesafb.h
65197 @@ -177,6 +177,7 @@ struct uvesafb_par {
65198 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
65199 u8 pmi_setpal; /* PMI for palette changes */
65200 u16 *pmi_base; /* protected mode interface location */
65201 + u8 *pmi_code; /* protected mode code location */
65202 void *pmi_start;
65203 void *pmi_pal;
65204 u8 *vbe_state_orig; /*
65205 diff --git a/init/Kconfig b/init/Kconfig
65206 index d07dcf9..fa47d0e 100644
65207 --- a/init/Kconfig
65208 +++ b/init/Kconfig
65209 @@ -835,6 +835,7 @@ endif # CGROUPS
65210
65211 config CHECKPOINT_RESTORE
65212 bool "Checkpoint/restore support" if EXPERT
65213 + depends on !GRKERNSEC
65214 default n
65215 help
65216 Enables additional kernel features in a sake of checkpoint/restore.
65217 @@ -1014,6 +1015,7 @@ config UIDGID_CONVERTED
65218 # Security modules
65219 depends on SECURITY_TOMOYO = n
65220 depends on SECURITY_APPARMOR = n
65221 + depends on GRKERNSEC = n
65222
65223 config UIDGID_STRICT_TYPE_CHECKS
65224 bool "Require conversions between uid/gids and their internal representation"
65225 @@ -1401,7 +1403,7 @@ config SLUB_DEBUG
65226
65227 config COMPAT_BRK
65228 bool "Disable heap randomization"
65229 - default y
65230 + default n
65231 help
65232 Randomizing heap placement makes heap exploits harder, but it
65233 also breaks ancient binaries (including anything libc5 based).
65234 @@ -1584,7 +1586,7 @@ config INIT_ALL_POSSIBLE
65235 config STOP_MACHINE
65236 bool
65237 default y
65238 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
65239 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
65240 help
65241 Need stop_machine() primitive.
65242
65243 diff --git a/init/Makefile b/init/Makefile
65244 index 7bc47ee..6da2dc7 100644
65245 --- a/init/Makefile
65246 +++ b/init/Makefile
65247 @@ -2,6 +2,9 @@
65248 # Makefile for the linux kernel.
65249 #
65250
65251 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
65252 +asflags-y := $(GCC_PLUGINS_AFLAGS)
65253 +
65254 obj-y := main.o version.o mounts.o
65255 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
65256 obj-y += noinitramfs.o
65257 diff --git a/init/do_mounts.c b/init/do_mounts.c
65258 index d3f0aee..c9322f5 100644
65259 --- a/init/do_mounts.c
65260 +++ b/init/do_mounts.c
65261 @@ -336,11 +336,11 @@ static void __init get_fs_names(char *page)
65262 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
65263 {
65264 struct super_block *s;
65265 - int err = sys_mount(name, "/root", fs, flags, data);
65266 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
65267 if (err)
65268 return err;
65269
65270 - sys_chdir("/root");
65271 + sys_chdir((const char __force_user *)"/root");
65272 s = current->fs->pwd.dentry->d_sb;
65273 ROOT_DEV = s->s_dev;
65274 printk(KERN_INFO
65275 @@ -460,18 +460,18 @@ void __init change_floppy(char *fmt, ...)
65276 va_start(args, fmt);
65277 vsprintf(buf, fmt, args);
65278 va_end(args);
65279 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
65280 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
65281 if (fd >= 0) {
65282 sys_ioctl(fd, FDEJECT, 0);
65283 sys_close(fd);
65284 }
65285 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
65286 - fd = sys_open("/dev/console", O_RDWR, 0);
65287 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
65288 if (fd >= 0) {
65289 sys_ioctl(fd, TCGETS, (long)&termios);
65290 termios.c_lflag &= ~ICANON;
65291 sys_ioctl(fd, TCSETSF, (long)&termios);
65292 - sys_read(fd, &c, 1);
65293 + sys_read(fd, (char __user *)&c, 1);
65294 termios.c_lflag |= ICANON;
65295 sys_ioctl(fd, TCSETSF, (long)&termios);
65296 sys_close(fd);
65297 @@ -565,6 +565,6 @@ void __init prepare_namespace(void)
65298 mount_root();
65299 out:
65300 devtmpfs_mount("dev");
65301 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
65302 - sys_chroot(".");
65303 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65304 + sys_chroot((const char __force_user *)".");
65305 }
65306 diff --git a/init/do_mounts.h b/init/do_mounts.h
65307 index f5b978a..69dbfe8 100644
65308 --- a/init/do_mounts.h
65309 +++ b/init/do_mounts.h
65310 @@ -15,15 +15,15 @@ extern int root_mountflags;
65311
65312 static inline int create_dev(char *name, dev_t dev)
65313 {
65314 - sys_unlink(name);
65315 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
65316 + sys_unlink((char __force_user *)name);
65317 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
65318 }
65319
65320 #if BITS_PER_LONG == 32
65321 static inline u32 bstat(char *name)
65322 {
65323 struct stat64 stat;
65324 - if (sys_stat64(name, &stat) != 0)
65325 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
65326 return 0;
65327 if (!S_ISBLK(stat.st_mode))
65328 return 0;
65329 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
65330 static inline u32 bstat(char *name)
65331 {
65332 struct stat stat;
65333 - if (sys_newstat(name, &stat) != 0)
65334 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
65335 return 0;
65336 if (!S_ISBLK(stat.st_mode))
65337 return 0;
65338 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
65339 index 135959a2..28a3f43 100644
65340 --- a/init/do_mounts_initrd.c
65341 +++ b/init/do_mounts_initrd.c
65342 @@ -53,13 +53,13 @@ static void __init handle_initrd(void)
65343 create_dev("/dev/root.old", Root_RAM0);
65344 /* mount initrd on rootfs' /root */
65345 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
65346 - sys_mkdir("/old", 0700);
65347 - root_fd = sys_open("/", 0, 0);
65348 - old_fd = sys_open("/old", 0, 0);
65349 + sys_mkdir((const char __force_user *)"/old", 0700);
65350 + root_fd = sys_open((const char __force_user *)"/", 0, 0);
65351 + old_fd = sys_open((const char __force_user *)"/old", 0, 0);
65352 /* move initrd over / and chdir/chroot in initrd root */
65353 - sys_chdir("/root");
65354 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
65355 - sys_chroot(".");
65356 + sys_chdir((const char __force_user *)"/root");
65357 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65358 + sys_chroot((const char __force_user *)".");
65359
65360 /*
65361 * In case that a resume from disk is carried out by linuxrc or one of
65362 @@ -76,15 +76,15 @@ static void __init handle_initrd(void)
65363
65364 /* move initrd to rootfs' /old */
65365 sys_fchdir(old_fd);
65366 - sys_mount("/", ".", NULL, MS_MOVE, NULL);
65367 + sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
65368 /* switch root and cwd back to / of rootfs */
65369 sys_fchdir(root_fd);
65370 - sys_chroot(".");
65371 + sys_chroot((const char __force_user *)".");
65372 sys_close(old_fd);
65373 sys_close(root_fd);
65374
65375 if (new_decode_dev(real_root_dev) == Root_RAM0) {
65376 - sys_chdir("/old");
65377 + sys_chdir((const char __force_user *)"/old");
65378 return;
65379 }
65380
65381 @@ -92,17 +92,17 @@ static void __init handle_initrd(void)
65382 mount_root();
65383
65384 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
65385 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
65386 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
65387 if (!error)
65388 printk("okay\n");
65389 else {
65390 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
65391 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
65392 if (error == -ENOENT)
65393 printk("/initrd does not exist. Ignored.\n");
65394 else
65395 printk("failed\n");
65396 printk(KERN_NOTICE "Unmounting old root\n");
65397 - sys_umount("/old", MNT_DETACH);
65398 + sys_umount((char __force_user *)"/old", MNT_DETACH);
65399 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
65400 if (fd < 0) {
65401 error = fd;
65402 @@ -125,11 +125,11 @@ int __init initrd_load(void)
65403 * mounted in the normal path.
65404 */
65405 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
65406 - sys_unlink("/initrd.image");
65407 + sys_unlink((const char __force_user *)"/initrd.image");
65408 handle_initrd();
65409 return 1;
65410 }
65411 }
65412 - sys_unlink("/initrd.image");
65413 + sys_unlink((const char __force_user *)"/initrd.image");
65414 return 0;
65415 }
65416 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
65417 index 8cb6db5..d729f50 100644
65418 --- a/init/do_mounts_md.c
65419 +++ b/init/do_mounts_md.c
65420 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
65421 partitioned ? "_d" : "", minor,
65422 md_setup_args[ent].device_names);
65423
65424 - fd = sys_open(name, 0, 0);
65425 + fd = sys_open((char __force_user *)name, 0, 0);
65426 if (fd < 0) {
65427 printk(KERN_ERR "md: open failed - cannot start "
65428 "array %s\n", name);
65429 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
65430 * array without it
65431 */
65432 sys_close(fd);
65433 - fd = sys_open(name, 0, 0);
65434 + fd = sys_open((char __force_user *)name, 0, 0);
65435 sys_ioctl(fd, BLKRRPART, 0);
65436 }
65437 sys_close(fd);
65438 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
65439
65440 wait_for_device_probe();
65441
65442 - fd = sys_open("/dev/md0", 0, 0);
65443 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
65444 if (fd >= 0) {
65445 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
65446 sys_close(fd);
65447 diff --git a/init/init_task.c b/init/init_task.c
65448 index 8b2f399..f0797c9 100644
65449 --- a/init/init_task.c
65450 +++ b/init/init_task.c
65451 @@ -20,5 +20,9 @@ EXPORT_SYMBOL(init_task);
65452 * Initial thread structure. Alignment of this is handled by a special
65453 * linker map entry.
65454 */
65455 +#ifdef CONFIG_X86
65456 +union thread_union init_thread_union __init_task_data;
65457 +#else
65458 union thread_union init_thread_union __init_task_data =
65459 { INIT_THREAD_INFO(init_task) };
65460 +#endif
65461 diff --git a/init/initramfs.c b/init/initramfs.c
65462 index 84c6bf1..8899338 100644
65463 --- a/init/initramfs.c
65464 +++ b/init/initramfs.c
65465 @@ -84,7 +84,7 @@ static void __init free_hash(void)
65466 }
65467 }
65468
65469 -static long __init do_utime(char *filename, time_t mtime)
65470 +static long __init do_utime(char __force_user *filename, time_t mtime)
65471 {
65472 struct timespec t[2];
65473
65474 @@ -119,7 +119,7 @@ static void __init dir_utime(void)
65475 struct dir_entry *de, *tmp;
65476 list_for_each_entry_safe(de, tmp, &dir_list, list) {
65477 list_del(&de->list);
65478 - do_utime(de->name, de->mtime);
65479 + do_utime((char __force_user *)de->name, de->mtime);
65480 kfree(de->name);
65481 kfree(de);
65482 }
65483 @@ -281,7 +281,7 @@ static int __init maybe_link(void)
65484 if (nlink >= 2) {
65485 char *old = find_link(major, minor, ino, mode, collected);
65486 if (old)
65487 - return (sys_link(old, collected) < 0) ? -1 : 1;
65488 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
65489 }
65490 return 0;
65491 }
65492 @@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
65493 {
65494 struct stat st;
65495
65496 - if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
65497 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
65498 if (S_ISDIR(st.st_mode))
65499 - sys_rmdir(path);
65500 + sys_rmdir((char __force_user *)path);
65501 else
65502 - sys_unlink(path);
65503 + sys_unlink((char __force_user *)path);
65504 }
65505 }
65506
65507 @@ -315,7 +315,7 @@ static int __init do_name(void)
65508 int openflags = O_WRONLY|O_CREAT;
65509 if (ml != 1)
65510 openflags |= O_TRUNC;
65511 - wfd = sys_open(collected, openflags, mode);
65512 + wfd = sys_open((char __force_user *)collected, openflags, mode);
65513
65514 if (wfd >= 0) {
65515 sys_fchown(wfd, uid, gid);
65516 @@ -327,17 +327,17 @@ static int __init do_name(void)
65517 }
65518 }
65519 } else if (S_ISDIR(mode)) {
65520 - sys_mkdir(collected, mode);
65521 - sys_chown(collected, uid, gid);
65522 - sys_chmod(collected, mode);
65523 + sys_mkdir((char __force_user *)collected, mode);
65524 + sys_chown((char __force_user *)collected, uid, gid);
65525 + sys_chmod((char __force_user *)collected, mode);
65526 dir_add(collected, mtime);
65527 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65528 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65529 if (maybe_link() == 0) {
65530 - sys_mknod(collected, mode, rdev);
65531 - sys_chown(collected, uid, gid);
65532 - sys_chmod(collected, mode);
65533 - do_utime(collected, mtime);
65534 + sys_mknod((char __force_user *)collected, mode, rdev);
65535 + sys_chown((char __force_user *)collected, uid, gid);
65536 + sys_chmod((char __force_user *)collected, mode);
65537 + do_utime((char __force_user *)collected, mtime);
65538 }
65539 }
65540 return 0;
65541 @@ -346,15 +346,15 @@ static int __init do_name(void)
65542 static int __init do_copy(void)
65543 {
65544 if (count >= body_len) {
65545 - sys_write(wfd, victim, body_len);
65546 + sys_write(wfd, (char __force_user *)victim, body_len);
65547 sys_close(wfd);
65548 - do_utime(vcollected, mtime);
65549 + do_utime((char __force_user *)vcollected, mtime);
65550 kfree(vcollected);
65551 eat(body_len);
65552 state = SkipIt;
65553 return 0;
65554 } else {
65555 - sys_write(wfd, victim, count);
65556 + sys_write(wfd, (char __force_user *)victim, count);
65557 body_len -= count;
65558 eat(count);
65559 return 1;
65560 @@ -365,9 +365,9 @@ static int __init do_symlink(void)
65561 {
65562 collected[N_ALIGN(name_len) + body_len] = '\0';
65563 clean_path(collected, 0);
65564 - sys_symlink(collected + N_ALIGN(name_len), collected);
65565 - sys_lchown(collected, uid, gid);
65566 - do_utime(collected, mtime);
65567 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65568 + sys_lchown((char __force_user *)collected, uid, gid);
65569 + do_utime((char __force_user *)collected, mtime);
65570 state = SkipIt;
65571 next_state = Reset;
65572 return 0;
65573 diff --git a/init/main.c b/init/main.c
65574 index b5cc0a7..5605c91 100644
65575 --- a/init/main.c
65576 +++ b/init/main.c
65577 @@ -95,6 +95,8 @@ static inline void mark_rodata_ro(void) { }
65578 extern void tc_init(void);
65579 #endif
65580
65581 +extern void grsecurity_init(void);
65582 +
65583 /*
65584 * Debug helper: via this flag we know that we are in 'early bootup code'
65585 * where only the boot processor is running with IRQ disabled. This means
65586 @@ -148,6 +150,49 @@ static int __init set_reset_devices(char *str)
65587
65588 __setup("reset_devices", set_reset_devices);
65589
65590 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65591 +extern char pax_enter_kernel_user[];
65592 +extern char pax_exit_kernel_user[];
65593 +extern pgdval_t clone_pgd_mask;
65594 +#endif
65595 +
65596 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65597 +static int __init setup_pax_nouderef(char *str)
65598 +{
65599 +#ifdef CONFIG_X86_32
65600 + unsigned int cpu;
65601 + struct desc_struct *gdt;
65602 +
65603 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
65604 + gdt = get_cpu_gdt_table(cpu);
65605 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65606 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65607 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65608 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65609 + }
65610 + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65611 +#else
65612 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65613 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65614 + clone_pgd_mask = ~(pgdval_t)0UL;
65615 +#endif
65616 +
65617 + return 0;
65618 +}
65619 +early_param("pax_nouderef", setup_pax_nouderef);
65620 +#endif
65621 +
65622 +#ifdef CONFIG_PAX_SOFTMODE
65623 +int pax_softmode;
65624 +
65625 +static int __init setup_pax_softmode(char *str)
65626 +{
65627 + get_option(&str, &pax_softmode);
65628 + return 1;
65629 +}
65630 +__setup("pax_softmode=", setup_pax_softmode);
65631 +#endif
65632 +
65633 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65634 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65635 static const char *panic_later, *panic_param;
65636 @@ -674,6 +719,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
65637 {
65638 int count = preempt_count();
65639 int ret;
65640 + const char *msg1 = "", *msg2 = "";
65641
65642 if (initcall_debug)
65643 ret = do_one_initcall_debug(fn);
65644 @@ -686,15 +732,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
65645 sprintf(msgbuf, "error code %d ", ret);
65646
65647 if (preempt_count() != count) {
65648 - strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65649 + msg1 = " preemption imbalance";
65650 preempt_count() = count;
65651 }
65652 if (irqs_disabled()) {
65653 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65654 + msg2 = " disabled interrupts";
65655 local_irq_enable();
65656 }
65657 - if (msgbuf[0]) {
65658 - printk("initcall %pF returned with %s\n", fn, msgbuf);
65659 + if (msgbuf[0] || *msg1 || *msg2) {
65660 + printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65661 }
65662
65663 return ret;
65664 @@ -747,8 +793,14 @@ static void __init do_initcall_level(int level)
65665 level, level,
65666 &repair_env_string);
65667
65668 - for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
65669 + for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) {
65670 do_one_initcall(*fn);
65671 +
65672 +#ifdef CONFIG_PAX_LATENT_ENTROPY
65673 + transfer_latent_entropy();
65674 +#endif
65675 +
65676 + }
65677 }
65678
65679 static void __init do_initcalls(void)
65680 @@ -782,8 +834,14 @@ static void __init do_pre_smp_initcalls(void)
65681 {
65682 initcall_t *fn;
65683
65684 - for (fn = __initcall_start; fn < __initcall0_start; fn++)
65685 + for (fn = __initcall_start; fn < __initcall0_start; fn++) {
65686 do_one_initcall(*fn);
65687 +
65688 +#ifdef CONFIG_PAX_LATENT_ENTROPY
65689 + transfer_latent_entropy();
65690 +#endif
65691 +
65692 + }
65693 }
65694
65695 static void run_init_process(const char *init_filename)
65696 @@ -865,7 +923,7 @@ static int __init kernel_init(void * unused)
65697 do_basic_setup();
65698
65699 /* Open the /dev/console on the rootfs, this should never fail */
65700 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
65701 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
65702 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
65703
65704 (void) sys_dup(0);
65705 @@ -878,11 +936,13 @@ static int __init kernel_init(void * unused)
65706 if (!ramdisk_execute_command)
65707 ramdisk_execute_command = "/init";
65708
65709 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65710 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65711 ramdisk_execute_command = NULL;
65712 prepare_namespace();
65713 }
65714
65715 + grsecurity_init();
65716 +
65717 /*
65718 * Ok, we have completed the initial bootup, and
65719 * we're essentially up and running. Get rid of the
65720 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
65721 index 8ce5769..4666884 100644
65722 --- a/ipc/mqueue.c
65723 +++ b/ipc/mqueue.c
65724 @@ -279,6 +279,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
65725 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
65726 info->attr.mq_msgsize);
65727
65728 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65729 spin_lock(&mq_lock);
65730 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65731 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
65732 diff --git a/ipc/msg.c b/ipc/msg.c
65733 index 7385de2..a8180e08 100644
65734 --- a/ipc/msg.c
65735 +++ b/ipc/msg.c
65736 @@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
65737 return security_msg_queue_associate(msq, msgflg);
65738 }
65739
65740 +static struct ipc_ops msg_ops = {
65741 + .getnew = newque,
65742 + .associate = msg_security,
65743 + .more_checks = NULL
65744 +};
65745 +
65746 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65747 {
65748 struct ipc_namespace *ns;
65749 - struct ipc_ops msg_ops;
65750 struct ipc_params msg_params;
65751
65752 ns = current->nsproxy->ipc_ns;
65753
65754 - msg_ops.getnew = newque;
65755 - msg_ops.associate = msg_security;
65756 - msg_ops.more_checks = NULL;
65757 -
65758 msg_params.key = key;
65759 msg_params.flg = msgflg;
65760
65761 diff --git a/ipc/sem.c b/ipc/sem.c
65762 index 5215a81..cfc0cac 100644
65763 --- a/ipc/sem.c
65764 +++ b/ipc/sem.c
65765 @@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
65766 return 0;
65767 }
65768
65769 +static struct ipc_ops sem_ops = {
65770 + .getnew = newary,
65771 + .associate = sem_security,
65772 + .more_checks = sem_more_checks
65773 +};
65774 +
65775 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65776 {
65777 struct ipc_namespace *ns;
65778 - struct ipc_ops sem_ops;
65779 struct ipc_params sem_params;
65780
65781 ns = current->nsproxy->ipc_ns;
65782 @@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65783 if (nsems < 0 || nsems > ns->sc_semmsl)
65784 return -EINVAL;
65785
65786 - sem_ops.getnew = newary;
65787 - sem_ops.associate = sem_security;
65788 - sem_ops.more_checks = sem_more_checks;
65789 -
65790 sem_params.key = key;
65791 sem_params.flg = semflg;
65792 sem_params.u.nsems = nsems;
65793 diff --git a/ipc/shm.c b/ipc/shm.c
65794 index 41c1285..cf6404c 100644
65795 --- a/ipc/shm.c
65796 +++ b/ipc/shm.c
65797 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
65798 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
65799 #endif
65800
65801 +#ifdef CONFIG_GRKERNSEC
65802 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65803 + const time_t shm_createtime, const uid_t cuid,
65804 + const int shmid);
65805 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65806 + const time_t shm_createtime);
65807 +#endif
65808 +
65809 void shm_init_ns(struct ipc_namespace *ns)
65810 {
65811 ns->shm_ctlmax = SHMMAX;
65812 @@ -520,6 +528,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
65813 shp->shm_lprid = 0;
65814 shp->shm_atim = shp->shm_dtim = 0;
65815 shp->shm_ctim = get_seconds();
65816 +#ifdef CONFIG_GRKERNSEC
65817 + {
65818 + struct timespec timeval;
65819 + do_posix_clock_monotonic_gettime(&timeval);
65820 +
65821 + shp->shm_createtime = timeval.tv_sec;
65822 + }
65823 +#endif
65824 shp->shm_segsz = size;
65825 shp->shm_nattch = 0;
65826 shp->shm_file = file;
65827 @@ -571,18 +587,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
65828 return 0;
65829 }
65830
65831 +static struct ipc_ops shm_ops = {
65832 + .getnew = newseg,
65833 + .associate = shm_security,
65834 + .more_checks = shm_more_checks
65835 +};
65836 +
65837 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
65838 {
65839 struct ipc_namespace *ns;
65840 - struct ipc_ops shm_ops;
65841 struct ipc_params shm_params;
65842
65843 ns = current->nsproxy->ipc_ns;
65844
65845 - shm_ops.getnew = newseg;
65846 - shm_ops.associate = shm_security;
65847 - shm_ops.more_checks = shm_more_checks;
65848 -
65849 shm_params.key = key;
65850 shm_params.flg = shmflg;
65851 shm_params.u.size = size;
65852 @@ -1000,6 +1017,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65853 f_mode = FMODE_READ | FMODE_WRITE;
65854 }
65855 if (shmflg & SHM_EXEC) {
65856 +
65857 +#ifdef CONFIG_PAX_MPROTECT
65858 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
65859 + goto out;
65860 +#endif
65861 +
65862 prot |= PROT_EXEC;
65863 acc_mode |= S_IXUGO;
65864 }
65865 @@ -1023,9 +1046,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65866 if (err)
65867 goto out_unlock;
65868
65869 +#ifdef CONFIG_GRKERNSEC
65870 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
65871 + shp->shm_perm.cuid, shmid) ||
65872 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
65873 + err = -EACCES;
65874 + goto out_unlock;
65875 + }
65876 +#endif
65877 +
65878 path = shp->shm_file->f_path;
65879 path_get(&path);
65880 shp->shm_nattch++;
65881 +#ifdef CONFIG_GRKERNSEC
65882 + shp->shm_lapid = current->pid;
65883 +#endif
65884 size = i_size_read(path.dentry->d_inode);
65885 shm_unlock(shp);
65886
65887 diff --git a/kernel/acct.c b/kernel/acct.c
65888 index 02e6167..54824f7 100644
65889 --- a/kernel/acct.c
65890 +++ b/kernel/acct.c
65891 @@ -550,7 +550,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
65892 */
65893 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
65894 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
65895 - file->f_op->write(file, (char *)&ac,
65896 + file->f_op->write(file, (char __force_user *)&ac,
65897 sizeof(acct_t), &file->f_pos);
65898 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
65899 set_fs(fs);
65900 diff --git a/kernel/audit.c b/kernel/audit.c
65901 index 1c7f2c6..9ba5359 100644
65902 --- a/kernel/audit.c
65903 +++ b/kernel/audit.c
65904 @@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
65905 3) suppressed due to audit_rate_limit
65906 4) suppressed due to audit_backlog_limit
65907 */
65908 -static atomic_t audit_lost = ATOMIC_INIT(0);
65909 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
65910
65911 /* The netlink socket. */
65912 static struct sock *audit_sock;
65913 @@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
65914 unsigned long now;
65915 int print;
65916
65917 - atomic_inc(&audit_lost);
65918 + atomic_inc_unchecked(&audit_lost);
65919
65920 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
65921
65922 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
65923 printk(KERN_WARNING
65924 "audit: audit_lost=%d audit_rate_limit=%d "
65925 "audit_backlog_limit=%d\n",
65926 - atomic_read(&audit_lost),
65927 + atomic_read_unchecked(&audit_lost),
65928 audit_rate_limit,
65929 audit_backlog_limit);
65930 audit_panic(message);
65931 @@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
65932 status_set.pid = audit_pid;
65933 status_set.rate_limit = audit_rate_limit;
65934 status_set.backlog_limit = audit_backlog_limit;
65935 - status_set.lost = atomic_read(&audit_lost);
65936 + status_set.lost = atomic_read_unchecked(&audit_lost);
65937 status_set.backlog = skb_queue_len(&audit_skb_queue);
65938 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
65939 &status_set, sizeof(status_set));
65940 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
65941 index 4b96415..d8c16ee 100644
65942 --- a/kernel/auditsc.c
65943 +++ b/kernel/auditsc.c
65944 @@ -2289,7 +2289,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
65945 }
65946
65947 /* global counter which is incremented every time something logs in */
65948 -static atomic_t session_id = ATOMIC_INIT(0);
65949 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
65950
65951 /**
65952 * audit_set_loginuid - set current task's audit_context loginuid
65953 @@ -2313,7 +2313,7 @@ int audit_set_loginuid(uid_t loginuid)
65954 return -EPERM;
65955 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
65956
65957 - sessionid = atomic_inc_return(&session_id);
65958 + sessionid = atomic_inc_return_unchecked(&session_id);
65959 if (context && context->in_syscall) {
65960 struct audit_buffer *ab;
65961
65962 diff --git a/kernel/capability.c b/kernel/capability.c
65963 index 493d972..ea17248 100644
65964 --- a/kernel/capability.c
65965 +++ b/kernel/capability.c
65966 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
65967 * before modification is attempted and the application
65968 * fails.
65969 */
65970 + if (tocopy > ARRAY_SIZE(kdata))
65971 + return -EFAULT;
65972 +
65973 if (copy_to_user(dataptr, kdata, tocopy
65974 * sizeof(struct __user_cap_data_struct))) {
65975 return -EFAULT;
65976 @@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
65977 int ret;
65978
65979 rcu_read_lock();
65980 - ret = security_capable(__task_cred(t), ns, cap);
65981 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
65982 + gr_task_is_capable(t, __task_cred(t), cap);
65983 rcu_read_unlock();
65984
65985 - return (ret == 0);
65986 + return ret;
65987 }
65988
65989 /**
65990 @@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
65991 int ret;
65992
65993 rcu_read_lock();
65994 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
65995 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
65996 rcu_read_unlock();
65997
65998 - return (ret == 0);
65999 + return ret;
66000 }
66001
66002 /**
66003 @@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
66004 BUG();
66005 }
66006
66007 - if (security_capable(current_cred(), ns, cap) == 0) {
66008 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
66009 current->flags |= PF_SUPERPRIV;
66010 return true;
66011 }
66012 @@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
66013 }
66014 EXPORT_SYMBOL(ns_capable);
66015
66016 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
66017 +{
66018 + if (unlikely(!cap_valid(cap))) {
66019 + printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
66020 + BUG();
66021 + }
66022 +
66023 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
66024 + current->flags |= PF_SUPERPRIV;
66025 + return true;
66026 + }
66027 + return false;
66028 +}
66029 +EXPORT_SYMBOL(ns_capable_nolog);
66030 +
66031 /**
66032 * capable - Determine if the current task has a superior capability in effect
66033 * @cap: The capability to be tested for
66034 @@ -408,6 +427,12 @@ bool capable(int cap)
66035 }
66036 EXPORT_SYMBOL(capable);
66037
66038 +bool capable_nolog(int cap)
66039 +{
66040 + return ns_capable_nolog(&init_user_ns, cap);
66041 +}
66042 +EXPORT_SYMBOL(capable_nolog);
66043 +
66044 /**
66045 * nsown_capable - Check superior capability to one's own user_ns
66046 * @cap: The capability in question
66047 @@ -440,3 +465,10 @@ bool inode_capable(const struct inode *inode, int cap)
66048
66049 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
66050 }
66051 +
66052 +bool inode_capable_nolog(const struct inode *inode, int cap)
66053 +{
66054 + struct user_namespace *ns = current_user_ns();
66055 +
66056 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
66057 +}
66058 diff --git a/kernel/compat.c b/kernel/compat.c
66059 index c28a306..b4d0cf3 100644
66060 --- a/kernel/compat.c
66061 +++ b/kernel/compat.c
66062 @@ -13,6 +13,7 @@
66063
66064 #include <linux/linkage.h>
66065 #include <linux/compat.h>
66066 +#include <linux/module.h>
66067 #include <linux/errno.h>
66068 #include <linux/time.h>
66069 #include <linux/signal.h>
66070 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
66071 mm_segment_t oldfs;
66072 long ret;
66073
66074 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
66075 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
66076 oldfs = get_fs();
66077 set_fs(KERNEL_DS);
66078 ret = hrtimer_nanosleep_restart(restart);
66079 @@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
66080 oldfs = get_fs();
66081 set_fs(KERNEL_DS);
66082 ret = hrtimer_nanosleep(&tu,
66083 - rmtp ? (struct timespec __user *)&rmt : NULL,
66084 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
66085 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
66086 set_fs(oldfs);
66087
66088 @@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
66089 mm_segment_t old_fs = get_fs();
66090
66091 set_fs(KERNEL_DS);
66092 - ret = sys_sigpending((old_sigset_t __user *) &s);
66093 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
66094 set_fs(old_fs);
66095 if (ret == 0)
66096 ret = put_user(s, set);
66097 @@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
66098 mm_segment_t old_fs = get_fs();
66099
66100 set_fs(KERNEL_DS);
66101 - ret = sys_old_getrlimit(resource, &r);
66102 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
66103 set_fs(old_fs);
66104
66105 if (!ret) {
66106 @@ -523,7 +524,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
66107 mm_segment_t old_fs = get_fs();
66108
66109 set_fs(KERNEL_DS);
66110 - ret = sys_getrusage(who, (struct rusage __user *) &r);
66111 + ret = sys_getrusage(who, (struct rusage __force_user *) &r);
66112 set_fs(old_fs);
66113
66114 if (ret)
66115 @@ -550,8 +551,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
66116 set_fs (KERNEL_DS);
66117 ret = sys_wait4(pid,
66118 (stat_addr ?
66119 - (unsigned int __user *) &status : NULL),
66120 - options, (struct rusage __user *) &r);
66121 + (unsigned int __force_user *) &status : NULL),
66122 + options, (struct rusage __force_user *) &r);
66123 set_fs (old_fs);
66124
66125 if (ret > 0) {
66126 @@ -576,8 +577,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
66127 memset(&info, 0, sizeof(info));
66128
66129 set_fs(KERNEL_DS);
66130 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
66131 - uru ? (struct rusage __user *)&ru : NULL);
66132 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
66133 + uru ? (struct rusage __force_user *)&ru : NULL);
66134 set_fs(old_fs);
66135
66136 if ((ret < 0) || (info.si_signo == 0))
66137 @@ -707,8 +708,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
66138 oldfs = get_fs();
66139 set_fs(KERNEL_DS);
66140 err = sys_timer_settime(timer_id, flags,
66141 - (struct itimerspec __user *) &newts,
66142 - (struct itimerspec __user *) &oldts);
66143 + (struct itimerspec __force_user *) &newts,
66144 + (struct itimerspec __force_user *) &oldts);
66145 set_fs(oldfs);
66146 if (!err && old && put_compat_itimerspec(old, &oldts))
66147 return -EFAULT;
66148 @@ -725,7 +726,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
66149 oldfs = get_fs();
66150 set_fs(KERNEL_DS);
66151 err = sys_timer_gettime(timer_id,
66152 - (struct itimerspec __user *) &ts);
66153 + (struct itimerspec __force_user *) &ts);
66154 set_fs(oldfs);
66155 if (!err && put_compat_itimerspec(setting, &ts))
66156 return -EFAULT;
66157 @@ -744,7 +745,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
66158 oldfs = get_fs();
66159 set_fs(KERNEL_DS);
66160 err = sys_clock_settime(which_clock,
66161 - (struct timespec __user *) &ts);
66162 + (struct timespec __force_user *) &ts);
66163 set_fs(oldfs);
66164 return err;
66165 }
66166 @@ -759,7 +760,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
66167 oldfs = get_fs();
66168 set_fs(KERNEL_DS);
66169 err = sys_clock_gettime(which_clock,
66170 - (struct timespec __user *) &ts);
66171 + (struct timespec __force_user *) &ts);
66172 set_fs(oldfs);
66173 if (!err && put_compat_timespec(&ts, tp))
66174 return -EFAULT;
66175 @@ -779,7 +780,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
66176
66177 oldfs = get_fs();
66178 set_fs(KERNEL_DS);
66179 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
66180 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
66181 set_fs(oldfs);
66182
66183 err = compat_put_timex(utp, &txc);
66184 @@ -799,7 +800,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
66185 oldfs = get_fs();
66186 set_fs(KERNEL_DS);
66187 err = sys_clock_getres(which_clock,
66188 - (struct timespec __user *) &ts);
66189 + (struct timespec __force_user *) &ts);
66190 set_fs(oldfs);
66191 if (!err && tp && put_compat_timespec(&ts, tp))
66192 return -EFAULT;
66193 @@ -811,9 +812,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
66194 long err;
66195 mm_segment_t oldfs;
66196 struct timespec tu;
66197 - struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
66198 + struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
66199
66200 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
66201 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
66202 oldfs = get_fs();
66203 set_fs(KERNEL_DS);
66204 err = clock_nanosleep_restart(restart);
66205 @@ -845,8 +846,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
66206 oldfs = get_fs();
66207 set_fs(KERNEL_DS);
66208 err = sys_clock_nanosleep(which_clock, flags,
66209 - (struct timespec __user *) &in,
66210 - (struct timespec __user *) &out);
66211 + (struct timespec __force_user *) &in,
66212 + (struct timespec __force_user *) &out);
66213 set_fs(oldfs);
66214
66215 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
66216 diff --git a/kernel/configs.c b/kernel/configs.c
66217 index 42e8fa0..9e7406b 100644
66218 --- a/kernel/configs.c
66219 +++ b/kernel/configs.c
66220 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
66221 struct proc_dir_entry *entry;
66222
66223 /* create the current config file */
66224 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66225 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
66226 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
66227 + &ikconfig_file_ops);
66228 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66229 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
66230 + &ikconfig_file_ops);
66231 +#endif
66232 +#else
66233 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
66234 &ikconfig_file_ops);
66235 +#endif
66236 +
66237 if (!entry)
66238 return -ENOMEM;
66239
66240 diff --git a/kernel/cred.c b/kernel/cred.c
66241 index de728ac..e3c267c 100644
66242 --- a/kernel/cred.c
66243 +++ b/kernel/cred.c
66244 @@ -207,6 +207,16 @@ void exit_creds(struct task_struct *tsk)
66245 validate_creds(cred);
66246 alter_cred_subscribers(cred, -1);
66247 put_cred(cred);
66248 +
66249 +#ifdef CONFIG_GRKERNSEC_SETXID
66250 + cred = (struct cred *) tsk->delayed_cred;
66251 + if (cred != NULL) {
66252 + tsk->delayed_cred = NULL;
66253 + validate_creds(cred);
66254 + alter_cred_subscribers(cred, -1);
66255 + put_cred(cred);
66256 + }
66257 +#endif
66258 }
66259
66260 /**
66261 @@ -469,7 +479,7 @@ error_put:
66262 * Always returns 0 thus allowing this function to be tail-called at the end
66263 * of, say, sys_setgid().
66264 */
66265 -int commit_creds(struct cred *new)
66266 +static int __commit_creds(struct cred *new)
66267 {
66268 struct task_struct *task = current;
66269 const struct cred *old = task->real_cred;
66270 @@ -488,6 +498,8 @@ int commit_creds(struct cred *new)
66271
66272 get_cred(new); /* we will require a ref for the subj creds too */
66273
66274 + gr_set_role_label(task, new->uid, new->gid);
66275 +
66276 /* dumpability changes */
66277 if (!uid_eq(old->euid, new->euid) ||
66278 !gid_eq(old->egid, new->egid) ||
66279 @@ -537,6 +549,101 @@ int commit_creds(struct cred *new)
66280 put_cred(old);
66281 return 0;
66282 }
66283 +#ifdef CONFIG_GRKERNSEC_SETXID
66284 +extern int set_user(struct cred *new);
66285 +
66286 +void gr_delayed_cred_worker(void)
66287 +{
66288 + const struct cred *new = current->delayed_cred;
66289 + struct cred *ncred;
66290 +
66291 + current->delayed_cred = NULL;
66292 +
66293 + if (current_uid() && new != NULL) {
66294 + // from doing get_cred on it when queueing this
66295 + put_cred(new);
66296 + return;
66297 + } else if (new == NULL)
66298 + return;
66299 +
66300 + ncred = prepare_creds();
66301 + if (!ncred)
66302 + goto die;
66303 + // uids
66304 + ncred->uid = new->uid;
66305 + ncred->euid = new->euid;
66306 + ncred->suid = new->suid;
66307 + ncred->fsuid = new->fsuid;
66308 + // gids
66309 + ncred->gid = new->gid;
66310 + ncred->egid = new->egid;
66311 + ncred->sgid = new->sgid;
66312 + ncred->fsgid = new->fsgid;
66313 + // groups
66314 + if (set_groups(ncred, new->group_info) < 0) {
66315 + abort_creds(ncred);
66316 + goto die;
66317 + }
66318 + // caps
66319 + ncred->securebits = new->securebits;
66320 + ncred->cap_inheritable = new->cap_inheritable;
66321 + ncred->cap_permitted = new->cap_permitted;
66322 + ncred->cap_effective = new->cap_effective;
66323 + ncred->cap_bset = new->cap_bset;
66324 +
66325 + if (set_user(ncred)) {
66326 + abort_creds(ncred);
66327 + goto die;
66328 + }
66329 +
66330 + // from doing get_cred on it when queueing this
66331 + put_cred(new);
66332 +
66333 + __commit_creds(ncred);
66334 + return;
66335 +die:
66336 + // from doing get_cred on it when queueing this
66337 + put_cred(new);
66338 + do_group_exit(SIGKILL);
66339 +}
66340 +#endif
66341 +
66342 +int commit_creds(struct cred *new)
66343 +{
66344 +#ifdef CONFIG_GRKERNSEC_SETXID
66345 + int ret;
66346 + int schedule_it = 0;
66347 + struct task_struct *t;
66348 +
66349 + /* we won't get called with tasklist_lock held for writing
66350 + and interrupts disabled as the cred struct in that case is
66351 + init_cred
66352 + */
66353 + if (grsec_enable_setxid && !current_is_single_threaded() &&
66354 + !current_uid() && new->uid) {
66355 + schedule_it = 1;
66356 + }
66357 + ret = __commit_creds(new);
66358 + if (schedule_it) {
66359 + rcu_read_lock();
66360 + read_lock(&tasklist_lock);
66361 + for (t = next_thread(current); t != current;
66362 + t = next_thread(t)) {
66363 + if (t->delayed_cred == NULL) {
66364 + t->delayed_cred = get_cred(new);
66365 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
66366 + set_tsk_need_resched(t);
66367 + }
66368 + }
66369 + read_unlock(&tasklist_lock);
66370 + rcu_read_unlock();
66371 + }
66372 + return ret;
66373 +#else
66374 + return __commit_creds(new);
66375 +#endif
66376 +}
66377 +
66378 EXPORT_SYMBOL(commit_creds);
66379
66380 /**
66381 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
66382 index 0557f24..1a00d9a 100644
66383 --- a/kernel/debug/debug_core.c
66384 +++ b/kernel/debug/debug_core.c
66385 @@ -122,7 +122,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
66386 */
66387 static atomic_t masters_in_kgdb;
66388 static atomic_t slaves_in_kgdb;
66389 -static atomic_t kgdb_break_tasklet_var;
66390 +static atomic_unchecked_t kgdb_break_tasklet_var;
66391 atomic_t kgdb_setting_breakpoint;
66392
66393 struct task_struct *kgdb_usethread;
66394 @@ -132,7 +132,7 @@ int kgdb_single_step;
66395 static pid_t kgdb_sstep_pid;
66396
66397 /* to keep track of the CPU which is doing the single stepping*/
66398 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
66399 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
66400
66401 /*
66402 * If you are debugging a problem where roundup (the collection of
66403 @@ -540,7 +540,7 @@ return_normal:
66404 * kernel will only try for the value of sstep_tries before
66405 * giving up and continuing on.
66406 */
66407 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
66408 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
66409 (kgdb_info[cpu].task &&
66410 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
66411 atomic_set(&kgdb_active, -1);
66412 @@ -634,8 +634,8 @@ cpu_master_loop:
66413 }
66414
66415 kgdb_restore:
66416 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
66417 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
66418 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
66419 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
66420 if (kgdb_info[sstep_cpu].task)
66421 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
66422 else
66423 @@ -861,18 +861,18 @@ static void kgdb_unregister_callbacks(void)
66424 static void kgdb_tasklet_bpt(unsigned long ing)
66425 {
66426 kgdb_breakpoint();
66427 - atomic_set(&kgdb_break_tasklet_var, 0);
66428 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
66429 }
66430
66431 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
66432
66433 void kgdb_schedule_breakpoint(void)
66434 {
66435 - if (atomic_read(&kgdb_break_tasklet_var) ||
66436 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
66437 atomic_read(&kgdb_active) != -1 ||
66438 atomic_read(&kgdb_setting_breakpoint))
66439 return;
66440 - atomic_inc(&kgdb_break_tasklet_var);
66441 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
66442 tasklet_schedule(&kgdb_tasklet_breakpoint);
66443 }
66444 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
66445 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
66446 index 1f91413..362a0a1 100644
66447 --- a/kernel/debug/kdb/kdb_main.c
66448 +++ b/kernel/debug/kdb/kdb_main.c
66449 @@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
66450 list_for_each_entry(mod, kdb_modules, list) {
66451
66452 kdb_printf("%-20s%8u 0x%p ", mod->name,
66453 - mod->core_size, (void *)mod);
66454 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
66455 #ifdef CONFIG_MODULE_UNLOAD
66456 kdb_printf("%4ld ", module_refcount(mod));
66457 #endif
66458 @@ -1994,7 +1994,7 @@ static int kdb_lsmod(int argc, const char **argv)
66459 kdb_printf(" (Loading)");
66460 else
66461 kdb_printf(" (Live)");
66462 - kdb_printf(" 0x%p", mod->module_core);
66463 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
66464
66465 #ifdef CONFIG_MODULE_UNLOAD
66466 {
66467 diff --git a/kernel/events/core.c b/kernel/events/core.c
66468 index d7d71d6..f54b76f 100644
66469 --- a/kernel/events/core.c
66470 +++ b/kernel/events/core.c
66471 @@ -181,7 +181,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
66472 return 0;
66473 }
66474
66475 -static atomic64_t perf_event_id;
66476 +static atomic64_unchecked_t perf_event_id;
66477
66478 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
66479 enum event_type_t event_type);
66480 @@ -2663,7 +2663,7 @@ static void __perf_event_read(void *info)
66481
66482 static inline u64 perf_event_count(struct perf_event *event)
66483 {
66484 - return local64_read(&event->count) + atomic64_read(&event->child_count);
66485 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
66486 }
66487
66488 static u64 perf_event_read(struct perf_event *event)
66489 @@ -2987,9 +2987,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
66490 mutex_lock(&event->child_mutex);
66491 total += perf_event_read(event);
66492 *enabled += event->total_time_enabled +
66493 - atomic64_read(&event->child_total_time_enabled);
66494 + atomic64_read_unchecked(&event->child_total_time_enabled);
66495 *running += event->total_time_running +
66496 - atomic64_read(&event->child_total_time_running);
66497 + atomic64_read_unchecked(&event->child_total_time_running);
66498
66499 list_for_each_entry(child, &event->child_list, child_list) {
66500 total += perf_event_read(child);
66501 @@ -3396,10 +3396,10 @@ void perf_event_update_userpage(struct perf_event *event)
66502 userpg->offset -= local64_read(&event->hw.prev_count);
66503
66504 userpg->time_enabled = enabled +
66505 - atomic64_read(&event->child_total_time_enabled);
66506 + atomic64_read_unchecked(&event->child_total_time_enabled);
66507
66508 userpg->time_running = running +
66509 - atomic64_read(&event->child_total_time_running);
66510 + atomic64_read_unchecked(&event->child_total_time_running);
66511
66512 arch_perf_update_userpage(userpg, now);
66513
66514 @@ -3832,11 +3832,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
66515 values[n++] = perf_event_count(event);
66516 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
66517 values[n++] = enabled +
66518 - atomic64_read(&event->child_total_time_enabled);
66519 + atomic64_read_unchecked(&event->child_total_time_enabled);
66520 }
66521 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
66522 values[n++] = running +
66523 - atomic64_read(&event->child_total_time_running);
66524 + atomic64_read_unchecked(&event->child_total_time_running);
66525 }
66526 if (read_format & PERF_FORMAT_ID)
66527 values[n++] = primary_event_id(event);
66528 @@ -4514,12 +4514,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
66529 * need to add enough zero bytes after the string to handle
66530 * the 64bit alignment we do later.
66531 */
66532 - buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
66533 + buf = kzalloc(PATH_MAX, GFP_KERNEL);
66534 if (!buf) {
66535 name = strncpy(tmp, "//enomem", sizeof(tmp));
66536 goto got_name;
66537 }
66538 - name = d_path(&file->f_path, buf, PATH_MAX);
66539 + name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
66540 if (IS_ERR(name)) {
66541 name = strncpy(tmp, "//toolong", sizeof(tmp));
66542 goto got_name;
66543 @@ -5931,7 +5931,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
66544 event->parent = parent_event;
66545
66546 event->ns = get_pid_ns(current->nsproxy->pid_ns);
66547 - event->id = atomic64_inc_return(&perf_event_id);
66548 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
66549
66550 event->state = PERF_EVENT_STATE_INACTIVE;
66551
66552 @@ -6493,10 +6493,10 @@ static void sync_child_event(struct perf_event *child_event,
66553 /*
66554 * Add back the child's count to the parent's count:
66555 */
66556 - atomic64_add(child_val, &parent_event->child_count);
66557 - atomic64_add(child_event->total_time_enabled,
66558 + atomic64_add_unchecked(child_val, &parent_event->child_count);
66559 + atomic64_add_unchecked(child_event->total_time_enabled,
66560 &parent_event->child_total_time_enabled);
66561 - atomic64_add(child_event->total_time_running,
66562 + atomic64_add_unchecked(child_event->total_time_running,
66563 &parent_event->child_total_time_running);
66564
66565 /*
66566 diff --git a/kernel/exit.c b/kernel/exit.c
66567 index 46ce8da..c648f3a 100644
66568 --- a/kernel/exit.c
66569 +++ b/kernel/exit.c
66570 @@ -59,6 +59,10 @@
66571 #include <asm/pgtable.h>
66572 #include <asm/mmu_context.h>
66573
66574 +#ifdef CONFIG_GRKERNSEC
66575 +extern rwlock_t grsec_exec_file_lock;
66576 +#endif
66577 +
66578 static void exit_mm(struct task_struct * tsk);
66579
66580 static void __unhash_process(struct task_struct *p, bool group_dead)
66581 @@ -182,6 +186,10 @@ void release_task(struct task_struct * p)
66582 struct task_struct *leader;
66583 int zap_leader;
66584 repeat:
66585 +#ifdef CONFIG_NET
66586 + gr_del_task_from_ip_table(p);
66587 +#endif
66588 +
66589 /* don't need to get the RCU readlock here - the process is dead and
66590 * can't be modifying its own credentials. But shut RCU-lockdep up */
66591 rcu_read_lock();
66592 @@ -394,7 +402,7 @@ int allow_signal(int sig)
66593 * know it'll be handled, so that they don't get converted to
66594 * SIGKILL or just silently dropped.
66595 */
66596 - current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66597 + current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66598 recalc_sigpending();
66599 spin_unlock_irq(&current->sighand->siglock);
66600 return 0;
66601 @@ -430,6 +438,17 @@ void daemonize(const char *name, ...)
66602 vsnprintf(current->comm, sizeof(current->comm), name, args);
66603 va_end(args);
66604
66605 +#ifdef CONFIG_GRKERNSEC
66606 + write_lock(&grsec_exec_file_lock);
66607 + if (current->exec_file) {
66608 + fput(current->exec_file);
66609 + current->exec_file = NULL;
66610 + }
66611 + write_unlock(&grsec_exec_file_lock);
66612 +#endif
66613 +
66614 + gr_set_kernel_label(current);
66615 +
66616 /*
66617 * If we were started as result of loading a module, close all of the
66618 * user space pages. We don't need them, and if we didn't close them
66619 @@ -907,6 +926,8 @@ void do_exit(long code)
66620 struct task_struct *tsk = current;
66621 int group_dead;
66622
66623 + set_fs(USER_DS);
66624 +
66625 profile_task_exit(tsk);
66626
66627 WARN_ON(blk_needs_flush_plug(tsk));
66628 @@ -923,7 +944,6 @@ void do_exit(long code)
66629 * mm_release()->clear_child_tid() from writing to a user-controlled
66630 * kernel address.
66631 */
66632 - set_fs(USER_DS);
66633
66634 ptrace_event(PTRACE_EVENT_EXIT, code);
66635
66636 @@ -985,6 +1005,9 @@ void do_exit(long code)
66637 tsk->exit_code = code;
66638 taskstats_exit(tsk, group_dead);
66639
66640 + gr_acl_handle_psacct(tsk, code);
66641 + gr_acl_handle_exit();
66642 +
66643 exit_mm(tsk);
66644
66645 if (group_dead)
66646 @@ -1101,7 +1124,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
66647 * Take down every thread in the group. This is called by fatal signals
66648 * as well as by sys_exit_group (below).
66649 */
66650 -void
66651 +__noreturn void
66652 do_group_exit(int exit_code)
66653 {
66654 struct signal_struct *sig = current->signal;
66655 diff --git a/kernel/fork.c b/kernel/fork.c
66656 index f00e319..c212fbc 100644
66657 --- a/kernel/fork.c
66658 +++ b/kernel/fork.c
66659 @@ -321,7 +321,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
66660 *stackend = STACK_END_MAGIC; /* for overflow detection */
66661
66662 #ifdef CONFIG_CC_STACKPROTECTOR
66663 - tsk->stack_canary = get_random_int();
66664 + tsk->stack_canary = pax_get_random_long();
66665 #endif
66666
66667 /*
66668 @@ -345,13 +345,78 @@ out:
66669 }
66670
66671 #ifdef CONFIG_MMU
66672 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
66673 +{
66674 + struct vm_area_struct *tmp;
66675 + unsigned long charge;
66676 + struct mempolicy *pol;
66677 + struct file *file;
66678 +
66679 + charge = 0;
66680 + if (mpnt->vm_flags & VM_ACCOUNT) {
66681 + unsigned long len;
66682 + len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66683 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
66684 + goto fail_nomem;
66685 + charge = len;
66686 + }
66687 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66688 + if (!tmp)
66689 + goto fail_nomem;
66690 + *tmp = *mpnt;
66691 + tmp->vm_mm = mm;
66692 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
66693 + pol = mpol_dup(vma_policy(mpnt));
66694 + if (IS_ERR(pol))
66695 + goto fail_nomem_policy;
66696 + vma_set_policy(tmp, pol);
66697 + if (anon_vma_fork(tmp, mpnt))
66698 + goto fail_nomem_anon_vma_fork;
66699 + tmp->vm_flags &= ~VM_LOCKED;
66700 + tmp->vm_next = tmp->vm_prev = NULL;
66701 + tmp->vm_mirror = NULL;
66702 + file = tmp->vm_file;
66703 + if (file) {
66704 + struct inode *inode = file->f_path.dentry->d_inode;
66705 + struct address_space *mapping = file->f_mapping;
66706 +
66707 + get_file(file);
66708 + if (tmp->vm_flags & VM_DENYWRITE)
66709 + atomic_dec(&inode->i_writecount);
66710 + mutex_lock(&mapping->i_mmap_mutex);
66711 + if (tmp->vm_flags & VM_SHARED)
66712 + mapping->i_mmap_writable++;
66713 + flush_dcache_mmap_lock(mapping);
66714 + /* insert tmp into the share list, just after mpnt */
66715 + vma_prio_tree_add(tmp, mpnt);
66716 + flush_dcache_mmap_unlock(mapping);
66717 + mutex_unlock(&mapping->i_mmap_mutex);
66718 + }
66719 +
66720 + /*
66721 + * Clear hugetlb-related page reserves for children. This only
66722 + * affects MAP_PRIVATE mappings. Faults generated by the child
66723 + * are not guaranteed to succeed, even if read-only
66724 + */
66725 + if (is_vm_hugetlb_page(tmp))
66726 + reset_vma_resv_huge_pages(tmp);
66727 +
66728 + return tmp;
66729 +
66730 +fail_nomem_anon_vma_fork:
66731 + mpol_put(pol);
66732 +fail_nomem_policy:
66733 + kmem_cache_free(vm_area_cachep, tmp);
66734 +fail_nomem:
66735 + vm_unacct_memory(charge);
66736 + return NULL;
66737 +}
66738 +
66739 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66740 {
66741 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
66742 struct rb_node **rb_link, *rb_parent;
66743 int retval;
66744 - unsigned long charge;
66745 - struct mempolicy *pol;
66746
66747 down_write(&oldmm->mmap_sem);
66748 flush_cache_dup_mm(oldmm);
66749 @@ -363,8 +428,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66750 mm->locked_vm = 0;
66751 mm->mmap = NULL;
66752 mm->mmap_cache = NULL;
66753 - mm->free_area_cache = oldmm->mmap_base;
66754 - mm->cached_hole_size = ~0UL;
66755 + mm->free_area_cache = oldmm->free_area_cache;
66756 + mm->cached_hole_size = oldmm->cached_hole_size;
66757 mm->map_count = 0;
66758 cpumask_clear(mm_cpumask(mm));
66759 mm->mm_rb = RB_ROOT;
66760 @@ -380,8 +445,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66761
66762 prev = NULL;
66763 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
66764 - struct file *file;
66765 -
66766 if (mpnt->vm_flags & VM_DONTCOPY) {
66767 long pages = vma_pages(mpnt);
66768 mm->total_vm -= pages;
66769 @@ -389,54 +452,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66770 -pages);
66771 continue;
66772 }
66773 - charge = 0;
66774 - if (mpnt->vm_flags & VM_ACCOUNT) {
66775 - unsigned long len;
66776 - len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66777 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
66778 - goto fail_nomem;
66779 - charge = len;
66780 + tmp = dup_vma(mm, oldmm, mpnt);
66781 + if (!tmp) {
66782 + retval = -ENOMEM;
66783 + goto out;
66784 }
66785 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66786 - if (!tmp)
66787 - goto fail_nomem;
66788 - *tmp = *mpnt;
66789 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
66790 - pol = mpol_dup(vma_policy(mpnt));
66791 - retval = PTR_ERR(pol);
66792 - if (IS_ERR(pol))
66793 - goto fail_nomem_policy;
66794 - vma_set_policy(tmp, pol);
66795 - tmp->vm_mm = mm;
66796 - if (anon_vma_fork(tmp, mpnt))
66797 - goto fail_nomem_anon_vma_fork;
66798 - tmp->vm_flags &= ~VM_LOCKED;
66799 - tmp->vm_next = tmp->vm_prev = NULL;
66800 - file = tmp->vm_file;
66801 - if (file) {
66802 - struct inode *inode = file->f_path.dentry->d_inode;
66803 - struct address_space *mapping = file->f_mapping;
66804 -
66805 - get_file(file);
66806 - if (tmp->vm_flags & VM_DENYWRITE)
66807 - atomic_dec(&inode->i_writecount);
66808 - mutex_lock(&mapping->i_mmap_mutex);
66809 - if (tmp->vm_flags & VM_SHARED)
66810 - mapping->i_mmap_writable++;
66811 - flush_dcache_mmap_lock(mapping);
66812 - /* insert tmp into the share list, just after mpnt */
66813 - vma_prio_tree_add(tmp, mpnt);
66814 - flush_dcache_mmap_unlock(mapping);
66815 - mutex_unlock(&mapping->i_mmap_mutex);
66816 - }
66817 -
66818 - /*
66819 - * Clear hugetlb-related page reserves for children. This only
66820 - * affects MAP_PRIVATE mappings. Faults generated by the child
66821 - * are not guaranteed to succeed, even if read-only
66822 - */
66823 - if (is_vm_hugetlb_page(tmp))
66824 - reset_vma_resv_huge_pages(tmp);
66825
66826 /*
66827 * Link in the new vma and copy the page table entries.
66828 @@ -459,9 +479,34 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66829 if (retval)
66830 goto out;
66831
66832 - if (file && uprobe_mmap(tmp))
66833 + if (tmp->vm_file && uprobe_mmap(tmp))
66834 goto out;
66835 }
66836 +
66837 +#ifdef CONFIG_PAX_SEGMEXEC
66838 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66839 + struct vm_area_struct *mpnt_m;
66840 +
66841 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66842 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66843 +
66844 + if (!mpnt->vm_mirror)
66845 + continue;
66846 +
66847 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66848 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66849 + mpnt->vm_mirror = mpnt_m;
66850 + } else {
66851 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66852 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66853 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66854 + mpnt->vm_mirror->vm_mirror = mpnt;
66855 + }
66856 + }
66857 + BUG_ON(mpnt_m);
66858 + }
66859 +#endif
66860 +
66861 /* a new mm has just been created */
66862 arch_dup_mmap(oldmm, mm);
66863 retval = 0;
66864 @@ -470,14 +515,6 @@ out:
66865 flush_tlb_mm(oldmm);
66866 up_write(&oldmm->mmap_sem);
66867 return retval;
66868 -fail_nomem_anon_vma_fork:
66869 - mpol_put(pol);
66870 -fail_nomem_policy:
66871 - kmem_cache_free(vm_area_cachep, tmp);
66872 -fail_nomem:
66873 - retval = -ENOMEM;
66874 - vm_unacct_memory(charge);
66875 - goto out;
66876 }
66877
66878 static inline int mm_alloc_pgd(struct mm_struct *mm)
66879 @@ -714,8 +751,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
66880 return ERR_PTR(err);
66881
66882 mm = get_task_mm(task);
66883 - if (mm && mm != current->mm &&
66884 - !ptrace_may_access(task, mode)) {
66885 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
66886 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
66887 mmput(mm);
66888 mm = ERR_PTR(-EACCES);
66889 }
66890 @@ -936,13 +973,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
66891 spin_unlock(&fs->lock);
66892 return -EAGAIN;
66893 }
66894 - fs->users++;
66895 + atomic_inc(&fs->users);
66896 spin_unlock(&fs->lock);
66897 return 0;
66898 }
66899 tsk->fs = copy_fs_struct(fs);
66900 if (!tsk->fs)
66901 return -ENOMEM;
66902 + gr_set_chroot_entries(tsk, &tsk->fs->root);
66903 return 0;
66904 }
66905
66906 @@ -1209,6 +1247,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66907 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66908 #endif
66909 retval = -EAGAIN;
66910 +
66911 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66912 +
66913 if (atomic_read(&p->real_cred->user->processes) >=
66914 task_rlimit(p, RLIMIT_NPROC)) {
66915 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66916 @@ -1431,6 +1472,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66917 /* Need tasklist lock for parent etc handling! */
66918 write_lock_irq(&tasklist_lock);
66919
66920 + /* synchronizes with gr_set_acls() */
66921 + gr_copy_label(p);
66922 +
66923 /* CLONE_PARENT re-uses the old parent */
66924 if (clone_flags & (CLONE_PARENT|CLONE_THREAD)) {
66925 p->real_parent = current->real_parent;
66926 @@ -1541,6 +1585,8 @@ bad_fork_cleanup_count:
66927 bad_fork_free:
66928 free_task(p);
66929 fork_out:
66930 + gr_log_forkfail(retval);
66931 +
66932 return ERR_PTR(retval);
66933 }
66934
66935 @@ -1641,6 +1687,8 @@ long do_fork(unsigned long clone_flags,
66936 if (clone_flags & CLONE_PARENT_SETTID)
66937 put_user(nr, parent_tidptr);
66938
66939 + gr_handle_brute_check();
66940 +
66941 if (clone_flags & CLONE_VFORK) {
66942 p->vfork_done = &vfork;
66943 init_completion(&vfork);
66944 @@ -1739,7 +1787,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
66945 return 0;
66946
66947 /* don't need lock here; in the worst case we'll do useless copy */
66948 - if (fs->users == 1)
66949 + if (atomic_read(&fs->users) == 1)
66950 return 0;
66951
66952 *new_fsp = copy_fs_struct(fs);
66953 @@ -1828,7 +1876,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
66954 fs = current->fs;
66955 spin_lock(&fs->lock);
66956 current->fs = new_fs;
66957 - if (--fs->users)
66958 + gr_set_chroot_entries(current, &current->fs->root);
66959 + if (atomic_dec_return(&fs->users))
66960 new_fs = NULL;
66961 else
66962 new_fs = fs;
66963 diff --git a/kernel/futex.c b/kernel/futex.c
66964 index 3717e7b..473c750 100644
66965 --- a/kernel/futex.c
66966 +++ b/kernel/futex.c
66967 @@ -54,6 +54,7 @@
66968 #include <linux/mount.h>
66969 #include <linux/pagemap.h>
66970 #include <linux/syscalls.h>
66971 +#include <linux/ptrace.h>
66972 #include <linux/signal.h>
66973 #include <linux/export.h>
66974 #include <linux/magic.h>
66975 @@ -239,6 +240,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
66976 struct page *page, *page_head;
66977 int err, ro = 0;
66978
66979 +#ifdef CONFIG_PAX_SEGMEXEC
66980 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66981 + return -EFAULT;
66982 +#endif
66983 +
66984 /*
66985 * The futex address must be "naturally" aligned.
66986 */
66987 @@ -2714,6 +2720,7 @@ static int __init futex_init(void)
66988 {
66989 u32 curval;
66990 int i;
66991 + mm_segment_t oldfs;
66992
66993 /*
66994 * This will fail and we want it. Some arch implementations do
66995 @@ -2725,8 +2732,11 @@ static int __init futex_init(void)
66996 * implementation, the non-functional ones will return
66997 * -ENOSYS.
66998 */
66999 + oldfs = get_fs();
67000 + set_fs(USER_DS);
67001 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
67002 futex_cmpxchg_enabled = 1;
67003 + set_fs(oldfs);
67004
67005 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
67006 plist_head_init(&futex_queues[i].chain);
67007 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
67008 index 9b22d03..6295b62 100644
67009 --- a/kernel/gcov/base.c
67010 +++ b/kernel/gcov/base.c
67011 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
67012 }
67013
67014 #ifdef CONFIG_MODULES
67015 -static inline int within(void *addr, void *start, unsigned long size)
67016 -{
67017 - return ((addr >= start) && (addr < start + size));
67018 -}
67019 -
67020 /* Update list and generate events when modules are unloaded. */
67021 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
67022 void *data)
67023 @@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
67024 prev = NULL;
67025 /* Remove entries located in module from linked list. */
67026 for (info = gcov_info_head; info; info = info->next) {
67027 - if (within(info, mod->module_core, mod->core_size)) {
67028 + if (within_module_core_rw((unsigned long)info, mod)) {
67029 if (prev)
67030 prev->next = info->next;
67031 else
67032 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
67033 index 6db7a5e..25b6648 100644
67034 --- a/kernel/hrtimer.c
67035 +++ b/kernel/hrtimer.c
67036 @@ -1407,7 +1407,7 @@ void hrtimer_peek_ahead_timers(void)
67037 local_irq_restore(flags);
67038 }
67039
67040 -static void run_hrtimer_softirq(struct softirq_action *h)
67041 +static void run_hrtimer_softirq(void)
67042 {
67043 struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases);
67044
67045 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
67046 index 4304919..408c4c0 100644
67047 --- a/kernel/jump_label.c
67048 +++ b/kernel/jump_label.c
67049 @@ -13,6 +13,7 @@
67050 #include <linux/sort.h>
67051 #include <linux/err.h>
67052 #include <linux/static_key.h>
67053 +#include <linux/mm.h>
67054
67055 #ifdef HAVE_JUMP_LABEL
67056
67057 @@ -50,7 +51,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
67058
67059 size = (((unsigned long)stop - (unsigned long)start)
67060 / sizeof(struct jump_entry));
67061 + pax_open_kernel();
67062 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
67063 + pax_close_kernel();
67064 }
67065
67066 static void jump_label_update(struct static_key *key, int enable);
67067 @@ -356,10 +359,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
67068 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
67069 struct jump_entry *iter;
67070
67071 + pax_open_kernel();
67072 for (iter = iter_start; iter < iter_stop; iter++) {
67073 if (within_module_init(iter->code, mod))
67074 iter->code = 0;
67075 }
67076 + pax_close_kernel();
67077 }
67078
67079 static int
67080 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
67081 index 2169fee..45c017a 100644
67082 --- a/kernel/kallsyms.c
67083 +++ b/kernel/kallsyms.c
67084 @@ -11,6 +11,9 @@
67085 * Changed the compression method from stem compression to "table lookup"
67086 * compression (see scripts/kallsyms.c for a more complete description)
67087 */
67088 +#ifdef CONFIG_GRKERNSEC_HIDESYM
67089 +#define __INCLUDED_BY_HIDESYM 1
67090 +#endif
67091 #include <linux/kallsyms.h>
67092 #include <linux/module.h>
67093 #include <linux/init.h>
67094 @@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
67095
67096 static inline int is_kernel_inittext(unsigned long addr)
67097 {
67098 + if (system_state != SYSTEM_BOOTING)
67099 + return 0;
67100 +
67101 if (addr >= (unsigned long)_sinittext
67102 && addr <= (unsigned long)_einittext)
67103 return 1;
67104 return 0;
67105 }
67106
67107 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
67108 +#ifdef CONFIG_MODULES
67109 +static inline int is_module_text(unsigned long addr)
67110 +{
67111 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
67112 + return 1;
67113 +
67114 + addr = ktla_ktva(addr);
67115 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
67116 +}
67117 +#else
67118 +static inline int is_module_text(unsigned long addr)
67119 +{
67120 + return 0;
67121 +}
67122 +#endif
67123 +#endif
67124 +
67125 static inline int is_kernel_text(unsigned long addr)
67126 {
67127 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
67128 @@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
67129
67130 static inline int is_kernel(unsigned long addr)
67131 {
67132 +
67133 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
67134 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
67135 + return 1;
67136 +
67137 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
67138 +#else
67139 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
67140 +#endif
67141 +
67142 return 1;
67143 return in_gate_area_no_mm(addr);
67144 }
67145
67146 static int is_ksym_addr(unsigned long addr)
67147 {
67148 +
67149 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
67150 + if (is_module_text(addr))
67151 + return 0;
67152 +#endif
67153 +
67154 if (all_var)
67155 return is_kernel(addr);
67156
67157 @@ -470,7 +509,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
67158
67159 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
67160 {
67161 - iter->name[0] = '\0';
67162 iter->nameoff = get_symbol_offset(new_pos);
67163 iter->pos = new_pos;
67164 }
67165 @@ -518,6 +556,11 @@ static int s_show(struct seq_file *m, void *p)
67166 {
67167 struct kallsym_iter *iter = m->private;
67168
67169 +#ifdef CONFIG_GRKERNSEC_HIDESYM
67170 + if (current_uid())
67171 + return 0;
67172 +#endif
67173 +
67174 /* Some debugging symbols have no name. Ignore them. */
67175 if (!iter->name[0])
67176 return 0;
67177 @@ -531,6 +574,7 @@ static int s_show(struct seq_file *m, void *p)
67178 */
67179 type = iter->exported ? toupper(iter->type) :
67180 tolower(iter->type);
67181 +
67182 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
67183 type, iter->name, iter->module_name);
67184 } else
67185 @@ -556,7 +600,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
67186 struct kallsym_iter *iter;
67187 int ret;
67188
67189 - iter = kmalloc(sizeof(*iter), GFP_KERNEL);
67190 + iter = kzalloc(sizeof(*iter), GFP_KERNEL);
67191 if (!iter)
67192 return -ENOMEM;
67193 reset_iter(iter, 0);
67194 diff --git a/kernel/kexec.c b/kernel/kexec.c
67195 index 4e2e472..cd0c7ae 100644
67196 --- a/kernel/kexec.c
67197 +++ b/kernel/kexec.c
67198 @@ -1046,7 +1046,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
67199 unsigned long flags)
67200 {
67201 struct compat_kexec_segment in;
67202 - struct kexec_segment out, __user *ksegments;
67203 + struct kexec_segment out;
67204 + struct kexec_segment __user *ksegments;
67205 unsigned long i, result;
67206
67207 /* Don't allow clients that don't understand the native
67208 diff --git a/kernel/kmod.c b/kernel/kmod.c
67209 index ff2c7cb..085d7af 100644
67210 --- a/kernel/kmod.c
67211 +++ b/kernel/kmod.c
67212 @@ -66,7 +66,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
67213 kfree(info->argv);
67214 }
67215
67216 -static int call_modprobe(char *module_name, int wait)
67217 +static int call_modprobe(char *module_name, char *module_param, int wait)
67218 {
67219 static char *envp[] = {
67220 "HOME=/",
67221 @@ -75,7 +75,7 @@ static int call_modprobe(char *module_name, int wait)
67222 NULL
67223 };
67224
67225 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
67226 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
67227 if (!argv)
67228 goto out;
67229
67230 @@ -87,7 +87,8 @@ static int call_modprobe(char *module_name, int wait)
67231 argv[1] = "-q";
67232 argv[2] = "--";
67233 argv[3] = module_name; /* check free_modprobe_argv() */
67234 - argv[4] = NULL;
67235 + argv[4] = module_param;
67236 + argv[5] = NULL;
67237
67238 return call_usermodehelper_fns(modprobe_path, argv, envp,
67239 wait | UMH_KILLABLE, NULL, free_modprobe_argv, NULL);
67240 @@ -112,9 +113,8 @@ out:
67241 * If module auto-loading support is disabled then this function
67242 * becomes a no-operation.
67243 */
67244 -int __request_module(bool wait, const char *fmt, ...)
67245 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
67246 {
67247 - va_list args;
67248 char module_name[MODULE_NAME_LEN];
67249 unsigned int max_modprobes;
67250 int ret;
67251 @@ -122,9 +122,7 @@ int __request_module(bool wait, const char *fmt, ...)
67252 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
67253 static int kmod_loop_msg;
67254
67255 - va_start(args, fmt);
67256 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
67257 - va_end(args);
67258 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
67259 if (ret >= MODULE_NAME_LEN)
67260 return -ENAMETOOLONG;
67261
67262 @@ -132,6 +130,20 @@ int __request_module(bool wait, const char *fmt, ...)
67263 if (ret)
67264 return ret;
67265
67266 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
67267 + if (!current_uid()) {
67268 + /* hack to workaround consolekit/udisks stupidity */
67269 + read_lock(&tasklist_lock);
67270 + if (!strcmp(current->comm, "mount") &&
67271 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
67272 + read_unlock(&tasklist_lock);
67273 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
67274 + return -EPERM;
67275 + }
67276 + read_unlock(&tasklist_lock);
67277 + }
67278 +#endif
67279 +
67280 /* If modprobe needs a service that is in a module, we get a recursive
67281 * loop. Limit the number of running kmod threads to max_threads/2 or
67282 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
67283 @@ -160,11 +172,52 @@ int __request_module(bool wait, const char *fmt, ...)
67284
67285 trace_module_request(module_name, wait, _RET_IP_);
67286
67287 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
67288 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
67289
67290 atomic_dec(&kmod_concurrent);
67291 return ret;
67292 }
67293 +
67294 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
67295 +{
67296 + va_list args;
67297 + int ret;
67298 +
67299 + va_start(args, fmt);
67300 + ret = ____request_module(wait, module_param, fmt, args);
67301 + va_end(args);
67302 +
67303 + return ret;
67304 +}
67305 +
67306 +int __request_module(bool wait, const char *fmt, ...)
67307 +{
67308 + va_list args;
67309 + int ret;
67310 +
67311 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
67312 + if (current_uid()) {
67313 + char module_param[MODULE_NAME_LEN];
67314 +
67315 + memset(module_param, 0, sizeof(module_param));
67316 +
67317 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
67318 +
67319 + va_start(args, fmt);
67320 + ret = ____request_module(wait, module_param, fmt, args);
67321 + va_end(args);
67322 +
67323 + return ret;
67324 + }
67325 +#endif
67326 +
67327 + va_start(args, fmt);
67328 + ret = ____request_module(wait, NULL, fmt, args);
67329 + va_end(args);
67330 +
67331 + return ret;
67332 +}
67333 +
67334 EXPORT_SYMBOL(__request_module);
67335 #endif /* CONFIG_MODULES */
67336
67337 @@ -266,7 +319,7 @@ static int wait_for_helper(void *data)
67338 *
67339 * Thus the __user pointer cast is valid here.
67340 */
67341 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
67342 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
67343
67344 /*
67345 * If ret is 0, either ____call_usermodehelper failed and the
67346 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
67347 index c62b854..cb67968 100644
67348 --- a/kernel/kprobes.c
67349 +++ b/kernel/kprobes.c
67350 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
67351 * kernel image and loaded module images reside. This is required
67352 * so x86_64 can correctly handle the %rip-relative fixups.
67353 */
67354 - kip->insns = module_alloc(PAGE_SIZE);
67355 + kip->insns = module_alloc_exec(PAGE_SIZE);
67356 if (!kip->insns) {
67357 kfree(kip);
67358 return NULL;
67359 @@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
67360 */
67361 if (!list_is_singular(&kip->list)) {
67362 list_del(&kip->list);
67363 - module_free(NULL, kip->insns);
67364 + module_free_exec(NULL, kip->insns);
67365 kfree(kip);
67366 }
67367 return 1;
67368 @@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
67369 {
67370 int i, err = 0;
67371 unsigned long offset = 0, size = 0;
67372 - char *modname, namebuf[128];
67373 + char *modname, namebuf[KSYM_NAME_LEN];
67374 const char *symbol_name;
67375 void *addr;
67376 struct kprobe_blackpoint *kb;
67377 @@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
67378 const char *sym = NULL;
67379 unsigned int i = *(loff_t *) v;
67380 unsigned long offset = 0;
67381 - char *modname, namebuf[128];
67382 + char *modname, namebuf[KSYM_NAME_LEN];
67383
67384 head = &kprobe_table[i];
67385 preempt_disable();
67386 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
67387 index 4e316e1..5501eef 100644
67388 --- a/kernel/ksysfs.c
67389 +++ b/kernel/ksysfs.c
67390 @@ -47,6 +47,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
67391 {
67392 if (count+1 > UEVENT_HELPER_PATH_LEN)
67393 return -ENOENT;
67394 + if (!capable(CAP_SYS_ADMIN))
67395 + return -EPERM;
67396 memcpy(uevent_helper, buf, count);
67397 uevent_helper[count] = '\0';
67398 if (count && uevent_helper[count-1] == '\n')
67399 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
67400 index ea9ee45..67ebc8f 100644
67401 --- a/kernel/lockdep.c
67402 +++ b/kernel/lockdep.c
67403 @@ -590,6 +590,10 @@ static int static_obj(void *obj)
67404 end = (unsigned long) &_end,
67405 addr = (unsigned long) obj;
67406
67407 +#ifdef CONFIG_PAX_KERNEXEC
67408 + start = ktla_ktva(start);
67409 +#endif
67410 +
67411 /*
67412 * static variable?
67413 */
67414 @@ -730,6 +734,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
67415 if (!static_obj(lock->key)) {
67416 debug_locks_off();
67417 printk("INFO: trying to register non-static key.\n");
67418 + printk("lock:%pS key:%pS.\n", lock, lock->key);
67419 printk("the code is fine but needs lockdep annotation.\n");
67420 printk("turning off the locking correctness validator.\n");
67421 dump_stack();
67422 @@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
67423 if (!class)
67424 return 0;
67425 }
67426 - atomic_inc((atomic_t *)&class->ops);
67427 + atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
67428 if (very_verbose(class)) {
67429 printk("\nacquire class [%p] %s", class->key, class->name);
67430 if (class->name_version > 1)
67431 diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
67432 index 91c32a0..b2c71c5 100644
67433 --- a/kernel/lockdep_proc.c
67434 +++ b/kernel/lockdep_proc.c
67435 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
67436
67437 static void print_name(struct seq_file *m, struct lock_class *class)
67438 {
67439 - char str[128];
67440 + char str[KSYM_NAME_LEN];
67441 const char *name = class->name;
67442
67443 if (!name) {
67444 diff --git a/kernel/module.c b/kernel/module.c
67445 index 4edbd9c..165e780 100644
67446 --- a/kernel/module.c
67447 +++ b/kernel/module.c
67448 @@ -58,6 +58,7 @@
67449 #include <linux/jump_label.h>
67450 #include <linux/pfn.h>
67451 #include <linux/bsearch.h>
67452 +#include <linux/grsecurity.h>
67453
67454 #define CREATE_TRACE_POINTS
67455 #include <trace/events/module.h>
67456 @@ -114,7 +115,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
67457
67458 /* Bounds of module allocation, for speeding __module_address.
67459 * Protected by module_mutex. */
67460 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
67461 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
67462 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
67463
67464 int register_module_notifier(struct notifier_block * nb)
67465 {
67466 @@ -278,7 +280,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67467 return true;
67468
67469 list_for_each_entry_rcu(mod, &modules, list) {
67470 - struct symsearch arr[] = {
67471 + struct symsearch modarr[] = {
67472 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
67473 NOT_GPL_ONLY, false },
67474 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
67475 @@ -300,7 +302,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67476 #endif
67477 };
67478
67479 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
67480 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
67481 return true;
67482 }
67483 return false;
67484 @@ -432,7 +434,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
67485 static int percpu_modalloc(struct module *mod,
67486 unsigned long size, unsigned long align)
67487 {
67488 - if (align > PAGE_SIZE) {
67489 + if (align-1 >= PAGE_SIZE) {
67490 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
67491 mod->name, align, PAGE_SIZE);
67492 align = PAGE_SIZE;
67493 @@ -1032,7 +1034,7 @@ struct module_attribute module_uevent =
67494 static ssize_t show_coresize(struct module_attribute *mattr,
67495 struct module_kobject *mk, char *buffer)
67496 {
67497 - return sprintf(buffer, "%u\n", mk->mod->core_size);
67498 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
67499 }
67500
67501 static struct module_attribute modinfo_coresize =
67502 @@ -1041,7 +1043,7 @@ static struct module_attribute modinfo_coresize =
67503 static ssize_t show_initsize(struct module_attribute *mattr,
67504 struct module_kobject *mk, char *buffer)
67505 {
67506 - return sprintf(buffer, "%u\n", mk->mod->init_size);
67507 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
67508 }
67509
67510 static struct module_attribute modinfo_initsize =
67511 @@ -1255,7 +1257,7 @@ resolve_symbol_wait(struct module *mod,
67512 */
67513 #ifdef CONFIG_SYSFS
67514
67515 -#ifdef CONFIG_KALLSYMS
67516 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67517 static inline bool sect_empty(const Elf_Shdr *sect)
67518 {
67519 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
67520 @@ -1721,21 +1723,21 @@ static void set_section_ro_nx(void *base,
67521
67522 static void unset_module_core_ro_nx(struct module *mod)
67523 {
67524 - set_page_attributes(mod->module_core + mod->core_text_size,
67525 - mod->module_core + mod->core_size,
67526 + set_page_attributes(mod->module_core_rw,
67527 + mod->module_core_rw + mod->core_size_rw,
67528 set_memory_x);
67529 - set_page_attributes(mod->module_core,
67530 - mod->module_core + mod->core_ro_size,
67531 + set_page_attributes(mod->module_core_rx,
67532 + mod->module_core_rx + mod->core_size_rx,
67533 set_memory_rw);
67534 }
67535
67536 static void unset_module_init_ro_nx(struct module *mod)
67537 {
67538 - set_page_attributes(mod->module_init + mod->init_text_size,
67539 - mod->module_init + mod->init_size,
67540 + set_page_attributes(mod->module_init_rw,
67541 + mod->module_init_rw + mod->init_size_rw,
67542 set_memory_x);
67543 - set_page_attributes(mod->module_init,
67544 - mod->module_init + mod->init_ro_size,
67545 + set_page_attributes(mod->module_init_rx,
67546 + mod->module_init_rx + mod->init_size_rx,
67547 set_memory_rw);
67548 }
67549
67550 @@ -1746,14 +1748,14 @@ void set_all_modules_text_rw(void)
67551
67552 mutex_lock(&module_mutex);
67553 list_for_each_entry_rcu(mod, &modules, list) {
67554 - if ((mod->module_core) && (mod->core_text_size)) {
67555 - set_page_attributes(mod->module_core,
67556 - mod->module_core + mod->core_text_size,
67557 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
67558 + set_page_attributes(mod->module_core_rx,
67559 + mod->module_core_rx + mod->core_size_rx,
67560 set_memory_rw);
67561 }
67562 - if ((mod->module_init) && (mod->init_text_size)) {
67563 - set_page_attributes(mod->module_init,
67564 - mod->module_init + mod->init_text_size,
67565 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
67566 + set_page_attributes(mod->module_init_rx,
67567 + mod->module_init_rx + mod->init_size_rx,
67568 set_memory_rw);
67569 }
67570 }
67571 @@ -1767,14 +1769,14 @@ void set_all_modules_text_ro(void)
67572
67573 mutex_lock(&module_mutex);
67574 list_for_each_entry_rcu(mod, &modules, list) {
67575 - if ((mod->module_core) && (mod->core_text_size)) {
67576 - set_page_attributes(mod->module_core,
67577 - mod->module_core + mod->core_text_size,
67578 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
67579 + set_page_attributes(mod->module_core_rx,
67580 + mod->module_core_rx + mod->core_size_rx,
67581 set_memory_ro);
67582 }
67583 - if ((mod->module_init) && (mod->init_text_size)) {
67584 - set_page_attributes(mod->module_init,
67585 - mod->module_init + mod->init_text_size,
67586 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
67587 + set_page_attributes(mod->module_init_rx,
67588 + mod->module_init_rx + mod->init_size_rx,
67589 set_memory_ro);
67590 }
67591 }
67592 @@ -1820,16 +1822,19 @@ static void free_module(struct module *mod)
67593
67594 /* This may be NULL, but that's OK */
67595 unset_module_init_ro_nx(mod);
67596 - module_free(mod, mod->module_init);
67597 + module_free(mod, mod->module_init_rw);
67598 + module_free_exec(mod, mod->module_init_rx);
67599 kfree(mod->args);
67600 percpu_modfree(mod);
67601
67602 /* Free lock-classes: */
67603 - lockdep_free_key_range(mod->module_core, mod->core_size);
67604 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
67605 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
67606
67607 /* Finally, free the core (containing the module structure) */
67608 unset_module_core_ro_nx(mod);
67609 - module_free(mod, mod->module_core);
67610 + module_free_exec(mod, mod->module_core_rx);
67611 + module_free(mod, mod->module_core_rw);
67612
67613 #ifdef CONFIG_MPU
67614 update_protections(current->mm);
67615 @@ -1899,9 +1904,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67616 int ret = 0;
67617 const struct kernel_symbol *ksym;
67618
67619 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
67620 + int is_fs_load = 0;
67621 + int register_filesystem_found = 0;
67622 + char *p;
67623 +
67624 + p = strstr(mod->args, "grsec_modharden_fs");
67625 + if (p) {
67626 + char *endptr = p + strlen("grsec_modharden_fs");
67627 + /* copy \0 as well */
67628 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67629 + is_fs_load = 1;
67630 + }
67631 +#endif
67632 +
67633 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
67634 const char *name = info->strtab + sym[i].st_name;
67635
67636 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
67637 + /* it's a real shame this will never get ripped and copied
67638 + upstream! ;(
67639 + */
67640 + if (is_fs_load && !strcmp(name, "register_filesystem"))
67641 + register_filesystem_found = 1;
67642 +#endif
67643 +
67644 switch (sym[i].st_shndx) {
67645 case SHN_COMMON:
67646 /* We compiled with -fno-common. These are not
67647 @@ -1922,7 +1949,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67648 ksym = resolve_symbol_wait(mod, info, name);
67649 /* Ok if resolved. */
67650 if (ksym && !IS_ERR(ksym)) {
67651 + pax_open_kernel();
67652 sym[i].st_value = ksym->value;
67653 + pax_close_kernel();
67654 break;
67655 }
67656
67657 @@ -1941,11 +1970,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67658 secbase = (unsigned long)mod_percpu(mod);
67659 else
67660 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
67661 + pax_open_kernel();
67662 sym[i].st_value += secbase;
67663 + pax_close_kernel();
67664 break;
67665 }
67666 }
67667
67668 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
67669 + if (is_fs_load && !register_filesystem_found) {
67670 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67671 + ret = -EPERM;
67672 + }
67673 +#endif
67674 +
67675 return ret;
67676 }
67677
67678 @@ -2049,22 +2087,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
67679 || s->sh_entsize != ~0UL
67680 || strstarts(sname, ".init"))
67681 continue;
67682 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67683 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67684 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67685 + else
67686 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67687 pr_debug("\t%s\n", sname);
67688 }
67689 - switch (m) {
67690 - case 0: /* executable */
67691 - mod->core_size = debug_align(mod->core_size);
67692 - mod->core_text_size = mod->core_size;
67693 - break;
67694 - case 1: /* RO: text and ro-data */
67695 - mod->core_size = debug_align(mod->core_size);
67696 - mod->core_ro_size = mod->core_size;
67697 - break;
67698 - case 3: /* whole core */
67699 - mod->core_size = debug_align(mod->core_size);
67700 - break;
67701 - }
67702 }
67703
67704 pr_debug("Init section allocation order:\n");
67705 @@ -2078,23 +2106,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
67706 || s->sh_entsize != ~0UL
67707 || !strstarts(sname, ".init"))
67708 continue;
67709 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67710 - | INIT_OFFSET_MASK);
67711 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67712 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67713 + else
67714 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67715 + s->sh_entsize |= INIT_OFFSET_MASK;
67716 pr_debug("\t%s\n", sname);
67717 }
67718 - switch (m) {
67719 - case 0: /* executable */
67720 - mod->init_size = debug_align(mod->init_size);
67721 - mod->init_text_size = mod->init_size;
67722 - break;
67723 - case 1: /* RO: text and ro-data */
67724 - mod->init_size = debug_align(mod->init_size);
67725 - mod->init_ro_size = mod->init_size;
67726 - break;
67727 - case 3: /* whole init */
67728 - mod->init_size = debug_align(mod->init_size);
67729 - break;
67730 - }
67731 }
67732 }
67733
67734 @@ -2266,7 +2284,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67735
67736 /* Put symbol section at end of init part of module. */
67737 symsect->sh_flags |= SHF_ALLOC;
67738 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67739 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67740 info->index.sym) | INIT_OFFSET_MASK;
67741 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
67742
67743 @@ -2281,13 +2299,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67744 }
67745
67746 /* Append room for core symbols at end of core part. */
67747 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67748 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
67749 - mod->core_size += strtab_size;
67750 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67751 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
67752 + mod->core_size_rx += strtab_size;
67753
67754 /* Put string table section at end of init part of module. */
67755 strsect->sh_flags |= SHF_ALLOC;
67756 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67757 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67758 info->index.str) | INIT_OFFSET_MASK;
67759 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
67760 }
67761 @@ -2305,12 +2323,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67762 /* Make sure we get permanent strtab: don't use info->strtab. */
67763 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
67764
67765 + pax_open_kernel();
67766 +
67767 /* Set types up while we still have access to sections. */
67768 for (i = 0; i < mod->num_symtab; i++)
67769 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
67770
67771 - mod->core_symtab = dst = mod->module_core + info->symoffs;
67772 - mod->core_strtab = s = mod->module_core + info->stroffs;
67773 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
67774 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
67775 src = mod->symtab;
67776 *dst = *src;
67777 *s++ = 0;
67778 @@ -2323,6 +2343,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67779 s += strlcpy(s, &mod->strtab[src->st_name], KSYM_NAME_LEN) + 1;
67780 }
67781 mod->core_num_syms = ndst;
67782 +
67783 + pax_close_kernel();
67784 }
67785 #else
67786 static inline void layout_symtab(struct module *mod, struct load_info *info)
67787 @@ -2356,17 +2378,33 @@ void * __weak module_alloc(unsigned long size)
67788 return size == 0 ? NULL : vmalloc_exec(size);
67789 }
67790
67791 -static void *module_alloc_update_bounds(unsigned long size)
67792 +static void *module_alloc_update_bounds_rw(unsigned long size)
67793 {
67794 void *ret = module_alloc(size);
67795
67796 if (ret) {
67797 mutex_lock(&module_mutex);
67798 /* Update module bounds. */
67799 - if ((unsigned long)ret < module_addr_min)
67800 - module_addr_min = (unsigned long)ret;
67801 - if ((unsigned long)ret + size > module_addr_max)
67802 - module_addr_max = (unsigned long)ret + size;
67803 + if ((unsigned long)ret < module_addr_min_rw)
67804 + module_addr_min_rw = (unsigned long)ret;
67805 + if ((unsigned long)ret + size > module_addr_max_rw)
67806 + module_addr_max_rw = (unsigned long)ret + size;
67807 + mutex_unlock(&module_mutex);
67808 + }
67809 + return ret;
67810 +}
67811 +
67812 +static void *module_alloc_update_bounds_rx(unsigned long size)
67813 +{
67814 + void *ret = module_alloc_exec(size);
67815 +
67816 + if (ret) {
67817 + mutex_lock(&module_mutex);
67818 + /* Update module bounds. */
67819 + if ((unsigned long)ret < module_addr_min_rx)
67820 + module_addr_min_rx = (unsigned long)ret;
67821 + if ((unsigned long)ret + size > module_addr_max_rx)
67822 + module_addr_max_rx = (unsigned long)ret + size;
67823 mutex_unlock(&module_mutex);
67824 }
67825 return ret;
67826 @@ -2544,8 +2582,14 @@ static struct module *setup_load_info(struct load_info *info)
67827 static int check_modinfo(struct module *mod, struct load_info *info)
67828 {
67829 const char *modmagic = get_modinfo(info, "vermagic");
67830 + const char *license = get_modinfo(info, "license");
67831 int err;
67832
67833 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
67834 + if (!license || !license_is_gpl_compatible(license))
67835 + return -ENOEXEC;
67836 +#endif
67837 +
67838 /* This is allowed: modprobe --force will invalidate it. */
67839 if (!modmagic) {
67840 err = try_to_force_load(mod, "bad vermagic");
67841 @@ -2568,7 +2612,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
67842 }
67843
67844 /* Set up license info based on the info section */
67845 - set_license(mod, get_modinfo(info, "license"));
67846 + set_license(mod, license);
67847
67848 return 0;
67849 }
67850 @@ -2662,7 +2706,7 @@ static int move_module(struct module *mod, struct load_info *info)
67851 void *ptr;
67852
67853 /* Do the allocs. */
67854 - ptr = module_alloc_update_bounds(mod->core_size);
67855 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67856 /*
67857 * The pointer to this block is stored in the module structure
67858 * which is inside the block. Just mark it as not being a
67859 @@ -2672,23 +2716,50 @@ static int move_module(struct module *mod, struct load_info *info)
67860 if (!ptr)
67861 return -ENOMEM;
67862
67863 - memset(ptr, 0, mod->core_size);
67864 - mod->module_core = ptr;
67865 + memset(ptr, 0, mod->core_size_rw);
67866 + mod->module_core_rw = ptr;
67867
67868 - ptr = module_alloc_update_bounds(mod->init_size);
67869 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67870 /*
67871 * The pointer to this block is stored in the module structure
67872 * which is inside the block. This block doesn't need to be
67873 * scanned as it contains data and code that will be freed
67874 * after the module is initialized.
67875 */
67876 - kmemleak_ignore(ptr);
67877 - if (!ptr && mod->init_size) {
67878 - module_free(mod, mod->module_core);
67879 + kmemleak_not_leak(ptr);
67880 + if (!ptr && mod->init_size_rw) {
67881 + module_free(mod, mod->module_core_rw);
67882 return -ENOMEM;
67883 }
67884 - memset(ptr, 0, mod->init_size);
67885 - mod->module_init = ptr;
67886 + memset(ptr, 0, mod->init_size_rw);
67887 + mod->module_init_rw = ptr;
67888 +
67889 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67890 + kmemleak_not_leak(ptr);
67891 + if (!ptr) {
67892 + module_free(mod, mod->module_init_rw);
67893 + module_free(mod, mod->module_core_rw);
67894 + return -ENOMEM;
67895 + }
67896 +
67897 + pax_open_kernel();
67898 + memset(ptr, 0, mod->core_size_rx);
67899 + pax_close_kernel();
67900 + mod->module_core_rx = ptr;
67901 +
67902 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67903 + kmemleak_not_leak(ptr);
67904 + if (!ptr && mod->init_size_rx) {
67905 + module_free_exec(mod, mod->module_core_rx);
67906 + module_free(mod, mod->module_init_rw);
67907 + module_free(mod, mod->module_core_rw);
67908 + return -ENOMEM;
67909 + }
67910 +
67911 + pax_open_kernel();
67912 + memset(ptr, 0, mod->init_size_rx);
67913 + pax_close_kernel();
67914 + mod->module_init_rx = ptr;
67915
67916 /* Transfer each section which specifies SHF_ALLOC */
67917 pr_debug("final section addresses:\n");
67918 @@ -2699,16 +2770,45 @@ static int move_module(struct module *mod, struct load_info *info)
67919 if (!(shdr->sh_flags & SHF_ALLOC))
67920 continue;
67921
67922 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
67923 - dest = mod->module_init
67924 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67925 - else
67926 - dest = mod->module_core + shdr->sh_entsize;
67927 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
67928 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67929 + dest = mod->module_init_rw
67930 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67931 + else
67932 + dest = mod->module_init_rx
67933 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67934 + } else {
67935 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67936 + dest = mod->module_core_rw + shdr->sh_entsize;
67937 + else
67938 + dest = mod->module_core_rx + shdr->sh_entsize;
67939 + }
67940 +
67941 + if (shdr->sh_type != SHT_NOBITS) {
67942 +
67943 +#ifdef CONFIG_PAX_KERNEXEC
67944 +#ifdef CONFIG_X86_64
67945 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
67946 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67947 +#endif
67948 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
67949 + pax_open_kernel();
67950 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67951 + pax_close_kernel();
67952 + } else
67953 +#endif
67954
67955 - if (shdr->sh_type != SHT_NOBITS)
67956 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67957 + }
67958 /* Update sh_addr to point to copy in image. */
67959 - shdr->sh_addr = (unsigned long)dest;
67960 +
67961 +#ifdef CONFIG_PAX_KERNEXEC
67962 + if (shdr->sh_flags & SHF_EXECINSTR)
67963 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
67964 + else
67965 +#endif
67966 +
67967 + shdr->sh_addr = (unsigned long)dest;
67968 pr_debug("\t0x%lx %s\n",
67969 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
67970 }
67971 @@ -2759,12 +2859,12 @@ static void flush_module_icache(const struct module *mod)
67972 * Do it before processing of module parameters, so the module
67973 * can provide parameter accessor functions of its own.
67974 */
67975 - if (mod->module_init)
67976 - flush_icache_range((unsigned long)mod->module_init,
67977 - (unsigned long)mod->module_init
67978 - + mod->init_size);
67979 - flush_icache_range((unsigned long)mod->module_core,
67980 - (unsigned long)mod->module_core + mod->core_size);
67981 + if (mod->module_init_rx)
67982 + flush_icache_range((unsigned long)mod->module_init_rx,
67983 + (unsigned long)mod->module_init_rx
67984 + + mod->init_size_rx);
67985 + flush_icache_range((unsigned long)mod->module_core_rx,
67986 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
67987
67988 set_fs(old_fs);
67989 }
67990 @@ -2834,8 +2934,10 @@ out:
67991 static void module_deallocate(struct module *mod, struct load_info *info)
67992 {
67993 percpu_modfree(mod);
67994 - module_free(mod, mod->module_init);
67995 - module_free(mod, mod->module_core);
67996 + module_free_exec(mod, mod->module_init_rx);
67997 + module_free_exec(mod, mod->module_core_rx);
67998 + module_free(mod, mod->module_init_rw);
67999 + module_free(mod, mod->module_core_rw);
68000 }
68001
68002 int __weak module_finalize(const Elf_Ehdr *hdr,
68003 @@ -2848,7 +2950,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
68004 static int post_relocation(struct module *mod, const struct load_info *info)
68005 {
68006 /* Sort exception table now relocations are done. */
68007 + pax_open_kernel();
68008 sort_extable(mod->extable, mod->extable + mod->num_exentries);
68009 + pax_close_kernel();
68010
68011 /* Copy relocated percpu area over. */
68012 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
68013 @@ -2899,9 +3003,38 @@ static struct module *load_module(void __user *umod,
68014 if (err)
68015 goto free_unload;
68016
68017 + /* Now copy in args */
68018 + mod->args = strndup_user(uargs, ~0UL >> 1);
68019 + if (IS_ERR(mod->args)) {
68020 + err = PTR_ERR(mod->args);
68021 + goto free_unload;
68022 + }
68023 +
68024 /* Set up MODINFO_ATTR fields */
68025 setup_modinfo(mod, &info);
68026
68027 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
68028 + {
68029 + char *p, *p2;
68030 +
68031 + if (strstr(mod->args, "grsec_modharden_netdev")) {
68032 + 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);
68033 + err = -EPERM;
68034 + goto free_modinfo;
68035 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
68036 + p += strlen("grsec_modharden_normal");
68037 + p2 = strstr(p, "_");
68038 + if (p2) {
68039 + *p2 = '\0';
68040 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
68041 + *p2 = '_';
68042 + }
68043 + err = -EPERM;
68044 + goto free_modinfo;
68045 + }
68046 + }
68047 +#endif
68048 +
68049 /* Fix up syms, so that st_value is a pointer to location. */
68050 err = simplify_symbols(mod, &info);
68051 if (err < 0)
68052 @@ -2917,13 +3050,6 @@ static struct module *load_module(void __user *umod,
68053
68054 flush_module_icache(mod);
68055
68056 - /* Now copy in args */
68057 - mod->args = strndup_user(uargs, ~0UL >> 1);
68058 - if (IS_ERR(mod->args)) {
68059 - err = PTR_ERR(mod->args);
68060 - goto free_arch_cleanup;
68061 - }
68062 -
68063 /* Mark state as coming so strong_try_module_get() ignores us. */
68064 mod->state = MODULE_STATE_COMING;
68065
68066 @@ -2981,11 +3107,10 @@ static struct module *load_module(void __user *umod,
68067 unlock:
68068 mutex_unlock(&module_mutex);
68069 synchronize_sched();
68070 - kfree(mod->args);
68071 - free_arch_cleanup:
68072 module_arch_cleanup(mod);
68073 free_modinfo:
68074 free_modinfo(mod);
68075 + kfree(mod->args);
68076 free_unload:
68077 module_unload_free(mod);
68078 free_module:
68079 @@ -3026,16 +3151,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
68080 MODULE_STATE_COMING, mod);
68081
68082 /* Set RO and NX regions for core */
68083 - set_section_ro_nx(mod->module_core,
68084 - mod->core_text_size,
68085 - mod->core_ro_size,
68086 - mod->core_size);
68087 + set_section_ro_nx(mod->module_core_rx,
68088 + mod->core_size_rx,
68089 + mod->core_size_rx,
68090 + mod->core_size_rx);
68091
68092 /* Set RO and NX regions for init */
68093 - set_section_ro_nx(mod->module_init,
68094 - mod->init_text_size,
68095 - mod->init_ro_size,
68096 - mod->init_size);
68097 + set_section_ro_nx(mod->module_init_rx,
68098 + mod->init_size_rx,
68099 + mod->init_size_rx,
68100 + mod->init_size_rx);
68101
68102 do_mod_ctors(mod);
68103 /* Start the module */
68104 @@ -3081,11 +3206,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
68105 mod->strtab = mod->core_strtab;
68106 #endif
68107 unset_module_init_ro_nx(mod);
68108 - module_free(mod, mod->module_init);
68109 - mod->module_init = NULL;
68110 - mod->init_size = 0;
68111 - mod->init_ro_size = 0;
68112 - mod->init_text_size = 0;
68113 + module_free(mod, mod->module_init_rw);
68114 + module_free_exec(mod, mod->module_init_rx);
68115 + mod->module_init_rw = NULL;
68116 + mod->module_init_rx = NULL;
68117 + mod->init_size_rw = 0;
68118 + mod->init_size_rx = 0;
68119 mutex_unlock(&module_mutex);
68120
68121 return 0;
68122 @@ -3116,10 +3242,16 @@ static const char *get_ksymbol(struct module *mod,
68123 unsigned long nextval;
68124
68125 /* At worse, next value is at end of module */
68126 - if (within_module_init(addr, mod))
68127 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
68128 + if (within_module_init_rx(addr, mod))
68129 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
68130 + else if (within_module_init_rw(addr, mod))
68131 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
68132 + else if (within_module_core_rx(addr, mod))
68133 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
68134 + else if (within_module_core_rw(addr, mod))
68135 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
68136 else
68137 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
68138 + return NULL;
68139
68140 /* Scan for closest preceding symbol, and next symbol. (ELF
68141 starts real symbols at 1). */
68142 @@ -3354,7 +3486,7 @@ static int m_show(struct seq_file *m, void *p)
68143 char buf[8];
68144
68145 seq_printf(m, "%s %u",
68146 - mod->name, mod->init_size + mod->core_size);
68147 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
68148 print_unload_info(m, mod);
68149
68150 /* Informative for users. */
68151 @@ -3363,7 +3495,7 @@ static int m_show(struct seq_file *m, void *p)
68152 mod->state == MODULE_STATE_COMING ? "Loading":
68153 "Live");
68154 /* Used by oprofile and other similar tools. */
68155 - seq_printf(m, " 0x%pK", mod->module_core);
68156 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
68157
68158 /* Taints info */
68159 if (mod->taints)
68160 @@ -3399,7 +3531,17 @@ static const struct file_operations proc_modules_operations = {
68161
68162 static int __init proc_modules_init(void)
68163 {
68164 +#ifndef CONFIG_GRKERNSEC_HIDESYM
68165 +#ifdef CONFIG_GRKERNSEC_PROC_USER
68166 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
68167 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68168 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
68169 +#else
68170 proc_create("modules", 0, NULL, &proc_modules_operations);
68171 +#endif
68172 +#else
68173 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
68174 +#endif
68175 return 0;
68176 }
68177 module_init(proc_modules_init);
68178 @@ -3458,12 +3600,12 @@ struct module *__module_address(unsigned long addr)
68179 {
68180 struct module *mod;
68181
68182 - if (addr < module_addr_min || addr > module_addr_max)
68183 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
68184 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
68185 return NULL;
68186
68187 list_for_each_entry_rcu(mod, &modules, list)
68188 - if (within_module_core(addr, mod)
68189 - || within_module_init(addr, mod))
68190 + if (within_module_init(addr, mod) || within_module_core(addr, mod))
68191 return mod;
68192 return NULL;
68193 }
68194 @@ -3497,11 +3639,20 @@ bool is_module_text_address(unsigned long addr)
68195 */
68196 struct module *__module_text_address(unsigned long addr)
68197 {
68198 - struct module *mod = __module_address(addr);
68199 + struct module *mod;
68200 +
68201 +#ifdef CONFIG_X86_32
68202 + addr = ktla_ktva(addr);
68203 +#endif
68204 +
68205 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
68206 + return NULL;
68207 +
68208 + mod = __module_address(addr);
68209 +
68210 if (mod) {
68211 /* Make sure it's within the text section. */
68212 - if (!within(addr, mod->module_init, mod->init_text_size)
68213 - && !within(addr, mod->module_core, mod->core_text_size))
68214 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
68215 mod = NULL;
68216 }
68217 return mod;
68218 diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
68219 index 7e3443f..b2a1e6b 100644
68220 --- a/kernel/mutex-debug.c
68221 +++ b/kernel/mutex-debug.c
68222 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
68223 }
68224
68225 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68226 - struct thread_info *ti)
68227 + struct task_struct *task)
68228 {
68229 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
68230
68231 /* Mark the current thread as blocked on the lock: */
68232 - ti->task->blocked_on = waiter;
68233 + task->blocked_on = waiter;
68234 }
68235
68236 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68237 - struct thread_info *ti)
68238 + struct task_struct *task)
68239 {
68240 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
68241 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
68242 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
68243 - ti->task->blocked_on = NULL;
68244 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
68245 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
68246 + task->blocked_on = NULL;
68247
68248 list_del_init(&waiter->list);
68249 waiter->task = NULL;
68250 diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
68251 index 0799fd3..d06ae3b 100644
68252 --- a/kernel/mutex-debug.h
68253 +++ b/kernel/mutex-debug.h
68254 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
68255 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
68256 extern void debug_mutex_add_waiter(struct mutex *lock,
68257 struct mutex_waiter *waiter,
68258 - struct thread_info *ti);
68259 + struct task_struct *task);
68260 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
68261 - struct thread_info *ti);
68262 + struct task_struct *task);
68263 extern void debug_mutex_unlock(struct mutex *lock);
68264 extern void debug_mutex_init(struct mutex *lock, const char *name,
68265 struct lock_class_key *key);
68266 diff --git a/kernel/mutex.c b/kernel/mutex.c
68267 index a307cc9..27fd2e9 100644
68268 --- a/kernel/mutex.c
68269 +++ b/kernel/mutex.c
68270 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68271 spin_lock_mutex(&lock->wait_lock, flags);
68272
68273 debug_mutex_lock_common(lock, &waiter);
68274 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
68275 + debug_mutex_add_waiter(lock, &waiter, task);
68276
68277 /* add waiting tasks to the end of the waitqueue (FIFO): */
68278 list_add_tail(&waiter.list, &lock->wait_list);
68279 @@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68280 * TASK_UNINTERRUPTIBLE case.)
68281 */
68282 if (unlikely(signal_pending_state(state, task))) {
68283 - mutex_remove_waiter(lock, &waiter,
68284 - task_thread_info(task));
68285 + mutex_remove_waiter(lock, &waiter, task);
68286 mutex_release(&lock->dep_map, 1, ip);
68287 spin_unlock_mutex(&lock->wait_lock, flags);
68288
68289 @@ -247,7 +246,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
68290 done:
68291 lock_acquired(&lock->dep_map, ip);
68292 /* got the lock - rejoice! */
68293 - mutex_remove_waiter(lock, &waiter, current_thread_info());
68294 + mutex_remove_waiter(lock, &waiter, task);
68295 mutex_set_owner(lock);
68296
68297 /* set it to 0 if there are no waiters left: */
68298 diff --git a/kernel/panic.c b/kernel/panic.c
68299 index d2a5f4e..5edc1d9 100644
68300 --- a/kernel/panic.c
68301 +++ b/kernel/panic.c
68302 @@ -75,6 +75,14 @@ void panic(const char *fmt, ...)
68303 int state = 0;
68304
68305 /*
68306 + * Disable local interrupts. This will prevent panic_smp_self_stop
68307 + * from deadlocking the first cpu that invokes the panic, since
68308 + * there is nothing to prevent an interrupt handler (that runs
68309 + * after the panic_lock is acquired) from invoking panic again.
68310 + */
68311 + local_irq_disable();
68312 +
68313 + /*
68314 * It's possible to come here directly from a panic-assertion and
68315 * not have preempt disabled. Some functions called from here want
68316 * preempt to be disabled. No point enabling it later though...
68317 @@ -402,7 +410,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
68318 const char *board;
68319
68320 printk(KERN_WARNING "------------[ cut here ]------------\n");
68321 - printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
68322 + printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
68323 board = dmi_get_system_info(DMI_PRODUCT_NAME);
68324 if (board)
68325 printk(KERN_WARNING "Hardware name: %s\n", board);
68326 @@ -457,7 +465,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
68327 */
68328 void __stack_chk_fail(void)
68329 {
68330 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
68331 + dump_stack();
68332 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
68333 __builtin_return_address(0));
68334 }
68335 EXPORT_SYMBOL(__stack_chk_fail);
68336 diff --git a/kernel/pid.c b/kernel/pid.c
68337 index e86b291a..e8b0fb5 100644
68338 --- a/kernel/pid.c
68339 +++ b/kernel/pid.c
68340 @@ -33,6 +33,7 @@
68341 #include <linux/rculist.h>
68342 #include <linux/bootmem.h>
68343 #include <linux/hash.h>
68344 +#include <linux/security.h>
68345 #include <linux/pid_namespace.h>
68346 #include <linux/init_task.h>
68347 #include <linux/syscalls.h>
68348 @@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
68349
68350 int pid_max = PID_MAX_DEFAULT;
68351
68352 -#define RESERVED_PIDS 300
68353 +#define RESERVED_PIDS 500
68354
68355 int pid_max_min = RESERVED_PIDS + 1;
68356 int pid_max_max = PID_MAX_LIMIT;
68357 @@ -420,10 +421,18 @@ EXPORT_SYMBOL(pid_task);
68358 */
68359 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
68360 {
68361 + struct task_struct *task;
68362 +
68363 rcu_lockdep_assert(rcu_read_lock_held(),
68364 "find_task_by_pid_ns() needs rcu_read_lock()"
68365 " protection");
68366 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68367 +
68368 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
68369 +
68370 + if (gr_pid_is_chrooted(task))
68371 + return NULL;
68372 +
68373 + return task;
68374 }
68375
68376 struct task_struct *find_task_by_vpid(pid_t vnr)
68377 @@ -431,6 +440,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
68378 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
68379 }
68380
68381 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
68382 +{
68383 + rcu_lockdep_assert(rcu_read_lock_held(),
68384 + "find_task_by_pid_ns() needs rcu_read_lock()"
68385 + " protection");
68386 + return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
68387 +}
68388 +
68389 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
68390 {
68391 struct pid *pid;
68392 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
68393 index 125cb67..a4d1c30 100644
68394 --- a/kernel/posix-cpu-timers.c
68395 +++ b/kernel/posix-cpu-timers.c
68396 @@ -6,6 +6,7 @@
68397 #include <linux/posix-timers.h>
68398 #include <linux/errno.h>
68399 #include <linux/math64.h>
68400 +#include <linux/security.h>
68401 #include <asm/uaccess.h>
68402 #include <linux/kernel_stat.h>
68403 #include <trace/events/timer.h>
68404 @@ -1578,14 +1579,14 @@ struct k_clock clock_posix_cpu = {
68405
68406 static __init int init_posix_cpu_timers(void)
68407 {
68408 - struct k_clock process = {
68409 + static struct k_clock process = {
68410 .clock_getres = process_cpu_clock_getres,
68411 .clock_get = process_cpu_clock_get,
68412 .timer_create = process_cpu_timer_create,
68413 .nsleep = process_cpu_nsleep,
68414 .nsleep_restart = process_cpu_nsleep_restart,
68415 };
68416 - struct k_clock thread = {
68417 + static struct k_clock thread = {
68418 .clock_getres = thread_cpu_clock_getres,
68419 .clock_get = thread_cpu_clock_get,
68420 .timer_create = thread_cpu_timer_create,
68421 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
68422 index 69185ae..cc2847a 100644
68423 --- a/kernel/posix-timers.c
68424 +++ b/kernel/posix-timers.c
68425 @@ -43,6 +43,7 @@
68426 #include <linux/idr.h>
68427 #include <linux/posix-clock.h>
68428 #include <linux/posix-timers.h>
68429 +#include <linux/grsecurity.h>
68430 #include <linux/syscalls.h>
68431 #include <linux/wait.h>
68432 #include <linux/workqueue.h>
68433 @@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
68434 * which we beg off on and pass to do_sys_settimeofday().
68435 */
68436
68437 -static struct k_clock posix_clocks[MAX_CLOCKS];
68438 +static struct k_clock *posix_clocks[MAX_CLOCKS];
68439
68440 /*
68441 * These ones are defined below.
68442 @@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
68443 */
68444 static __init int init_posix_timers(void)
68445 {
68446 - struct k_clock clock_realtime = {
68447 + static struct k_clock clock_realtime = {
68448 .clock_getres = hrtimer_get_res,
68449 .clock_get = posix_clock_realtime_get,
68450 .clock_set = posix_clock_realtime_set,
68451 @@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
68452 .timer_get = common_timer_get,
68453 .timer_del = common_timer_del,
68454 };
68455 - struct k_clock clock_monotonic = {
68456 + static struct k_clock clock_monotonic = {
68457 .clock_getres = hrtimer_get_res,
68458 .clock_get = posix_ktime_get_ts,
68459 .nsleep = common_nsleep,
68460 @@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
68461 .timer_get = common_timer_get,
68462 .timer_del = common_timer_del,
68463 };
68464 - struct k_clock clock_monotonic_raw = {
68465 + static struct k_clock clock_monotonic_raw = {
68466 .clock_getres = hrtimer_get_res,
68467 .clock_get = posix_get_monotonic_raw,
68468 };
68469 - struct k_clock clock_realtime_coarse = {
68470 + static struct k_clock clock_realtime_coarse = {
68471 .clock_getres = posix_get_coarse_res,
68472 .clock_get = posix_get_realtime_coarse,
68473 };
68474 - struct k_clock clock_monotonic_coarse = {
68475 + static struct k_clock clock_monotonic_coarse = {
68476 .clock_getres = posix_get_coarse_res,
68477 .clock_get = posix_get_monotonic_coarse,
68478 };
68479 - struct k_clock clock_boottime = {
68480 + static struct k_clock clock_boottime = {
68481 .clock_getres = hrtimer_get_res,
68482 .clock_get = posix_get_boottime,
68483 .nsleep = common_nsleep,
68484 @@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
68485 return;
68486 }
68487
68488 - posix_clocks[clock_id] = *new_clock;
68489 + posix_clocks[clock_id] = new_clock;
68490 }
68491 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
68492
68493 @@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
68494 return (id & CLOCKFD_MASK) == CLOCKFD ?
68495 &clock_posix_dynamic : &clock_posix_cpu;
68496
68497 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
68498 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
68499 return NULL;
68500 - return &posix_clocks[id];
68501 + return posix_clocks[id];
68502 }
68503
68504 static int common_timer_create(struct k_itimer *new_timer)
68505 @@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
68506 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
68507 return -EFAULT;
68508
68509 + /* only the CLOCK_REALTIME clock can be set, all other clocks
68510 + have their clock_set fptr set to a nosettime dummy function
68511 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
68512 + call common_clock_set, which calls do_sys_settimeofday, which
68513 + we hook
68514 + */
68515 +
68516 return kc->clock_set(which_clock, &new_tp);
68517 }
68518
68519 diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
68520 index d523593..68197a4 100644
68521 --- a/kernel/power/poweroff.c
68522 +++ b/kernel/power/poweroff.c
68523 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
68524 .enable_mask = SYSRQ_ENABLE_BOOT,
68525 };
68526
68527 -static int pm_sysrq_init(void)
68528 +static int __init pm_sysrq_init(void)
68529 {
68530 register_sysrq_key('o', &sysrq_poweroff_op);
68531 return 0;
68532 diff --git a/kernel/power/process.c b/kernel/power/process.c
68533 index 19db29f..33b52b6 100644
68534 --- a/kernel/power/process.c
68535 +++ b/kernel/power/process.c
68536 @@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
68537 u64 elapsed_csecs64;
68538 unsigned int elapsed_csecs;
68539 bool wakeup = false;
68540 + bool timedout = false;
68541
68542 do_gettimeofday(&start);
68543
68544 @@ -43,6 +44,8 @@ static int try_to_freeze_tasks(bool user_only)
68545
68546 while (true) {
68547 todo = 0;
68548 + if (time_after(jiffies, end_time))
68549 + timedout = true;
68550 read_lock(&tasklist_lock);
68551 do_each_thread(g, p) {
68552 if (p == current || !freeze_task(p))
68553 @@ -58,9 +61,13 @@ static int try_to_freeze_tasks(bool user_only)
68554 * guaranteed that TASK_STOPPED/TRACED -> TASK_RUNNING
68555 * transition can't race with task state testing here.
68556 */
68557 - if (!task_is_stopped_or_traced(p) &&
68558 - !freezer_should_skip(p))
68559 + if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
68560 todo++;
68561 + if (timedout) {
68562 + printk(KERN_ERR "Task refusing to freeze:\n");
68563 + sched_show_task(p);
68564 + }
68565 + }
68566 } while_each_thread(g, p);
68567 read_unlock(&tasklist_lock);
68568
68569 @@ -69,7 +76,7 @@ static int try_to_freeze_tasks(bool user_only)
68570 todo += wq_busy;
68571 }
68572
68573 - if (!todo || time_after(jiffies, end_time))
68574 + if (!todo || timedout)
68575 break;
68576
68577 if (pm_wakeup_pending()) {
68578 diff --git a/kernel/printk.c b/kernel/printk.c
68579 index 146827f..a501fec 100644
68580 --- a/kernel/printk.c
68581 +++ b/kernel/printk.c
68582 @@ -782,6 +782,11 @@ static int check_syslog_permissions(int type, bool from_file)
68583 if (from_file && type != SYSLOG_ACTION_OPEN)
68584 return 0;
68585
68586 +#ifdef CONFIG_GRKERNSEC_DMESG
68587 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
68588 + return -EPERM;
68589 +#endif
68590 +
68591 if (syslog_action_restricted(type)) {
68592 if (capable(CAP_SYSLOG))
68593 return 0;
68594 diff --git a/kernel/profile.c b/kernel/profile.c
68595 index 76b8e77..a2930e8 100644
68596 --- a/kernel/profile.c
68597 +++ b/kernel/profile.c
68598 @@ -39,7 +39,7 @@ struct profile_hit {
68599 /* Oprofile timer tick hook */
68600 static int (*timer_hook)(struct pt_regs *) __read_mostly;
68601
68602 -static atomic_t *prof_buffer;
68603 +static atomic_unchecked_t *prof_buffer;
68604 static unsigned long prof_len, prof_shift;
68605
68606 int prof_on __read_mostly;
68607 @@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
68608 hits[i].pc = 0;
68609 continue;
68610 }
68611 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68612 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68613 hits[i].hits = hits[i].pc = 0;
68614 }
68615 }
68616 @@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68617 * Add the current hit(s) and flush the write-queue out
68618 * to the global buffer:
68619 */
68620 - atomic_add(nr_hits, &prof_buffer[pc]);
68621 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68622 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68623 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68624 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68625 hits[i].pc = hits[i].hits = 0;
68626 }
68627 out:
68628 @@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68629 {
68630 unsigned long pc;
68631 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68632 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68633 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68634 }
68635 #endif /* !CONFIG_SMP */
68636
68637 @@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
68638 return -EFAULT;
68639 buf++; p++; count--; read++;
68640 }
68641 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68642 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68643 if (copy_to_user(buf, (void *)pnt, count))
68644 return -EFAULT;
68645 read += count;
68646 @@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
68647 }
68648 #endif
68649 profile_discard_flip_buffers();
68650 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68651 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68652 return count;
68653 }
68654
68655 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
68656 index a232bb5..2a65ef9 100644
68657 --- a/kernel/ptrace.c
68658 +++ b/kernel/ptrace.c
68659 @@ -279,7 +279,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68660
68661 if (seize)
68662 flags |= PT_SEIZED;
68663 - if (ns_capable(task_user_ns(task), CAP_SYS_PTRACE))
68664 + if (ns_capable_nolog(task_user_ns(task), CAP_SYS_PTRACE))
68665 flags |= PT_PTRACE_CAP;
68666 task->ptrace = flags;
68667
68668 @@ -486,7 +486,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
68669 break;
68670 return -EIO;
68671 }
68672 - if (copy_to_user(dst, buf, retval))
68673 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
68674 return -EFAULT;
68675 copied += retval;
68676 src += retval;
68677 @@ -671,7 +671,7 @@ int ptrace_request(struct task_struct *child, long request,
68678 bool seized = child->ptrace & PT_SEIZED;
68679 int ret = -EIO;
68680 siginfo_t siginfo, *si;
68681 - void __user *datavp = (void __user *) data;
68682 + void __user *datavp = (__force void __user *) data;
68683 unsigned long __user *datalp = datavp;
68684 unsigned long flags;
68685
68686 @@ -873,14 +873,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
68687 goto out;
68688 }
68689
68690 + if (gr_handle_ptrace(child, request)) {
68691 + ret = -EPERM;
68692 + goto out_put_task_struct;
68693 + }
68694 +
68695 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68696 ret = ptrace_attach(child, request, addr, data);
68697 /*
68698 * Some architectures need to do book-keeping after
68699 * a ptrace attach.
68700 */
68701 - if (!ret)
68702 + if (!ret) {
68703 arch_ptrace_attach(child);
68704 + gr_audit_ptrace(child);
68705 + }
68706 goto out_put_task_struct;
68707 }
68708
68709 @@ -906,7 +913,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
68710 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
68711 if (copied != sizeof(tmp))
68712 return -EIO;
68713 - return put_user(tmp, (unsigned long __user *)data);
68714 + return put_user(tmp, (__force unsigned long __user *)data);
68715 }
68716
68717 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
68718 @@ -1016,14 +1023,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
68719 goto out;
68720 }
68721
68722 + if (gr_handle_ptrace(child, request)) {
68723 + ret = -EPERM;
68724 + goto out_put_task_struct;
68725 + }
68726 +
68727 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68728 ret = ptrace_attach(child, request, addr, data);
68729 /*
68730 * Some architectures need to do book-keeping after
68731 * a ptrace attach.
68732 */
68733 - if (!ret)
68734 + if (!ret) {
68735 arch_ptrace_attach(child);
68736 + gr_audit_ptrace(child);
68737 + }
68738 goto out_put_task_struct;
68739 }
68740
68741 diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
68742 index 37a5444..eec170a 100644
68743 --- a/kernel/rcutiny.c
68744 +++ b/kernel/rcutiny.c
68745 @@ -46,7 +46,7 @@
68746 struct rcu_ctrlblk;
68747 static void invoke_rcu_callbacks(void);
68748 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
68749 -static void rcu_process_callbacks(struct softirq_action *unused);
68750 +static void rcu_process_callbacks(void);
68751 static void __call_rcu(struct rcu_head *head,
68752 void (*func)(struct rcu_head *rcu),
68753 struct rcu_ctrlblk *rcp);
68754 @@ -307,7 +307,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
68755 rcu_is_callbacks_kthread()));
68756 }
68757
68758 -static void rcu_process_callbacks(struct softirq_action *unused)
68759 +static void rcu_process_callbacks(void)
68760 {
68761 __rcu_process_callbacks(&rcu_sched_ctrlblk);
68762 __rcu_process_callbacks(&rcu_bh_ctrlblk);
68763 diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
68764 index fc31a2d..be2ec04 100644
68765 --- a/kernel/rcutiny_plugin.h
68766 +++ b/kernel/rcutiny_plugin.h
68767 @@ -939,7 +939,7 @@ static int rcu_kthread(void *arg)
68768 have_rcu_kthread_work = morework;
68769 local_irq_restore(flags);
68770 if (work)
68771 - rcu_process_callbacks(NULL);
68772 + rcu_process_callbacks();
68773 schedule_timeout_interruptible(1); /* Leave CPU for others. */
68774 }
68775
68776 diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
68777 index e66b34a..4b8b626 100644
68778 --- a/kernel/rcutorture.c
68779 +++ b/kernel/rcutorture.c
68780 @@ -163,12 +163,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
68781 { 0 };
68782 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
68783 { 0 };
68784 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68785 -static atomic_t n_rcu_torture_alloc;
68786 -static atomic_t n_rcu_torture_alloc_fail;
68787 -static atomic_t n_rcu_torture_free;
68788 -static atomic_t n_rcu_torture_mberror;
68789 -static atomic_t n_rcu_torture_error;
68790 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68791 +static atomic_unchecked_t n_rcu_torture_alloc;
68792 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
68793 +static atomic_unchecked_t n_rcu_torture_free;
68794 +static atomic_unchecked_t n_rcu_torture_mberror;
68795 +static atomic_unchecked_t n_rcu_torture_error;
68796 static long n_rcu_torture_barrier_error;
68797 static long n_rcu_torture_boost_ktrerror;
68798 static long n_rcu_torture_boost_rterror;
68799 @@ -265,11 +265,11 @@ rcu_torture_alloc(void)
68800
68801 spin_lock_bh(&rcu_torture_lock);
68802 if (list_empty(&rcu_torture_freelist)) {
68803 - atomic_inc(&n_rcu_torture_alloc_fail);
68804 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
68805 spin_unlock_bh(&rcu_torture_lock);
68806 return NULL;
68807 }
68808 - atomic_inc(&n_rcu_torture_alloc);
68809 + atomic_inc_unchecked(&n_rcu_torture_alloc);
68810 p = rcu_torture_freelist.next;
68811 list_del_init(p);
68812 spin_unlock_bh(&rcu_torture_lock);
68813 @@ -282,7 +282,7 @@ rcu_torture_alloc(void)
68814 static void
68815 rcu_torture_free(struct rcu_torture *p)
68816 {
68817 - atomic_inc(&n_rcu_torture_free);
68818 + atomic_inc_unchecked(&n_rcu_torture_free);
68819 spin_lock_bh(&rcu_torture_lock);
68820 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
68821 spin_unlock_bh(&rcu_torture_lock);
68822 @@ -403,7 +403,7 @@ rcu_torture_cb(struct rcu_head *p)
68823 i = rp->rtort_pipe_count;
68824 if (i > RCU_TORTURE_PIPE_LEN)
68825 i = RCU_TORTURE_PIPE_LEN;
68826 - atomic_inc(&rcu_torture_wcount[i]);
68827 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
68828 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68829 rp->rtort_mbtest = 0;
68830 rcu_torture_free(rp);
68831 @@ -451,7 +451,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
68832 i = rp->rtort_pipe_count;
68833 if (i > RCU_TORTURE_PIPE_LEN)
68834 i = RCU_TORTURE_PIPE_LEN;
68835 - atomic_inc(&rcu_torture_wcount[i]);
68836 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
68837 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68838 rp->rtort_mbtest = 0;
68839 list_del(&rp->rtort_free);
68840 @@ -983,7 +983,7 @@ rcu_torture_writer(void *arg)
68841 i = old_rp->rtort_pipe_count;
68842 if (i > RCU_TORTURE_PIPE_LEN)
68843 i = RCU_TORTURE_PIPE_LEN;
68844 - atomic_inc(&rcu_torture_wcount[i]);
68845 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
68846 old_rp->rtort_pipe_count++;
68847 cur_ops->deferred_free(old_rp);
68848 }
68849 @@ -1064,7 +1064,7 @@ static void rcu_torture_timer(unsigned long unused)
68850 }
68851 do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu);
68852 if (p->rtort_mbtest == 0)
68853 - atomic_inc(&n_rcu_torture_mberror);
68854 + atomic_inc_unchecked(&n_rcu_torture_mberror);
68855 spin_lock(&rand_lock);
68856 cur_ops->read_delay(&rand);
68857 n_rcu_torture_timers++;
68858 @@ -1128,7 +1128,7 @@ rcu_torture_reader(void *arg)
68859 }
68860 do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu);
68861 if (p->rtort_mbtest == 0)
68862 - atomic_inc(&n_rcu_torture_mberror);
68863 + atomic_inc_unchecked(&n_rcu_torture_mberror);
68864 cur_ops->read_delay(&rand);
68865 preempt_disable();
68866 pipe_count = p->rtort_pipe_count;
68867 @@ -1191,10 +1191,10 @@ rcu_torture_printk(char *page)
68868 rcu_torture_current,
68869 rcu_torture_current_version,
68870 list_empty(&rcu_torture_freelist),
68871 - atomic_read(&n_rcu_torture_alloc),
68872 - atomic_read(&n_rcu_torture_alloc_fail),
68873 - atomic_read(&n_rcu_torture_free),
68874 - atomic_read(&n_rcu_torture_mberror),
68875 + atomic_read_unchecked(&n_rcu_torture_alloc),
68876 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
68877 + atomic_read_unchecked(&n_rcu_torture_free),
68878 + atomic_read_unchecked(&n_rcu_torture_mberror),
68879 n_rcu_torture_boost_ktrerror,
68880 n_rcu_torture_boost_rterror,
68881 n_rcu_torture_boost_failure,
68882 @@ -1208,14 +1208,14 @@ rcu_torture_printk(char *page)
68883 n_barrier_attempts,
68884 n_rcu_torture_barrier_error);
68885 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
68886 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
68887 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
68888 n_rcu_torture_barrier_error != 0 ||
68889 n_rcu_torture_boost_ktrerror != 0 ||
68890 n_rcu_torture_boost_rterror != 0 ||
68891 n_rcu_torture_boost_failure != 0 ||
68892 i > 1) {
68893 cnt += sprintf(&page[cnt], "!!! ");
68894 - atomic_inc(&n_rcu_torture_error);
68895 + atomic_inc_unchecked(&n_rcu_torture_error);
68896 WARN_ON_ONCE(1);
68897 }
68898 cnt += sprintf(&page[cnt], "Reader Pipe: ");
68899 @@ -1229,7 +1229,7 @@ rcu_torture_printk(char *page)
68900 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
68901 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68902 cnt += sprintf(&page[cnt], " %d",
68903 - atomic_read(&rcu_torture_wcount[i]));
68904 + atomic_read_unchecked(&rcu_torture_wcount[i]));
68905 }
68906 cnt += sprintf(&page[cnt], "\n");
68907 if (cur_ops->stats)
68908 @@ -1888,7 +1888,7 @@ rcu_torture_cleanup(void)
68909
68910 if (cur_ops->cleanup)
68911 cur_ops->cleanup();
68912 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
68913 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
68914 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
68915 else if (n_online_successes != n_online_attempts ||
68916 n_offline_successes != n_offline_attempts)
68917 @@ -1958,18 +1958,18 @@ rcu_torture_init(void)
68918
68919 rcu_torture_current = NULL;
68920 rcu_torture_current_version = 0;
68921 - atomic_set(&n_rcu_torture_alloc, 0);
68922 - atomic_set(&n_rcu_torture_alloc_fail, 0);
68923 - atomic_set(&n_rcu_torture_free, 0);
68924 - atomic_set(&n_rcu_torture_mberror, 0);
68925 - atomic_set(&n_rcu_torture_error, 0);
68926 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
68927 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
68928 + atomic_set_unchecked(&n_rcu_torture_free, 0);
68929 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
68930 + atomic_set_unchecked(&n_rcu_torture_error, 0);
68931 n_rcu_torture_barrier_error = 0;
68932 n_rcu_torture_boost_ktrerror = 0;
68933 n_rcu_torture_boost_rterror = 0;
68934 n_rcu_torture_boost_failure = 0;
68935 n_rcu_torture_boosts = 0;
68936 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
68937 - atomic_set(&rcu_torture_wcount[i], 0);
68938 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
68939 for_each_possible_cpu(cpu) {
68940 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68941 per_cpu(rcu_torture_count, cpu)[i] = 0;
68942 diff --git a/kernel/rcutree.c b/kernel/rcutree.c
68943 index 4b97bba..b92c9d2 100644
68944 --- a/kernel/rcutree.c
68945 +++ b/kernel/rcutree.c
68946 @@ -366,9 +366,9 @@ static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval)
68947 rcu_prepare_for_idle(smp_processor_id());
68948 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68949 smp_mb__before_atomic_inc(); /* See above. */
68950 - atomic_inc(&rdtp->dynticks);
68951 + atomic_inc_unchecked(&rdtp->dynticks);
68952 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
68953 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68954 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68955
68956 /*
68957 * The idle task is not permitted to enter the idle loop while
68958 @@ -457,10 +457,10 @@ void rcu_irq_exit(void)
68959 static void rcu_idle_exit_common(struct rcu_dynticks *rdtp, long long oldval)
68960 {
68961 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
68962 - atomic_inc(&rdtp->dynticks);
68963 + atomic_inc_unchecked(&rdtp->dynticks);
68964 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68965 smp_mb__after_atomic_inc(); /* See above. */
68966 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68967 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68968 rcu_cleanup_after_idle(smp_processor_id());
68969 trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
68970 if (!is_idle_task(current)) {
68971 @@ -554,14 +554,14 @@ void rcu_nmi_enter(void)
68972 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
68973
68974 if (rdtp->dynticks_nmi_nesting == 0 &&
68975 - (atomic_read(&rdtp->dynticks) & 0x1))
68976 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
68977 return;
68978 rdtp->dynticks_nmi_nesting++;
68979 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
68980 - atomic_inc(&rdtp->dynticks);
68981 + atomic_inc_unchecked(&rdtp->dynticks);
68982 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68983 smp_mb__after_atomic_inc(); /* See above. */
68984 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68985 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68986 }
68987
68988 /**
68989 @@ -580,9 +580,9 @@ void rcu_nmi_exit(void)
68990 return;
68991 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68992 smp_mb__before_atomic_inc(); /* See above. */
68993 - atomic_inc(&rdtp->dynticks);
68994 + atomic_inc_unchecked(&rdtp->dynticks);
68995 smp_mb__after_atomic_inc(); /* Force delay to next write. */
68996 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68997 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68998 }
68999
69000 #ifdef CONFIG_PROVE_RCU
69001 @@ -598,7 +598,7 @@ int rcu_is_cpu_idle(void)
69002 int ret;
69003
69004 preempt_disable();
69005 - ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
69006 + ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
69007 preempt_enable();
69008 return ret;
69009 }
69010 @@ -668,7 +668,7 @@ int rcu_is_cpu_rrupt_from_idle(void)
69011 */
69012 static int dyntick_save_progress_counter(struct rcu_data *rdp)
69013 {
69014 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
69015 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
69016 return (rdp->dynticks_snap & 0x1) == 0;
69017 }
69018
69019 @@ -683,7 +683,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
69020 unsigned int curr;
69021 unsigned int snap;
69022
69023 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
69024 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
69025 snap = (unsigned int)rdp->dynticks_snap;
69026
69027 /*
69028 @@ -713,10 +713,10 @@ static int jiffies_till_stall_check(void)
69029 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
69030 */
69031 if (till_stall_check < 3) {
69032 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
69033 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
69034 till_stall_check = 3;
69035 } else if (till_stall_check > 300) {
69036 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
69037 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
69038 till_stall_check = 300;
69039 }
69040 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
69041 @@ -1824,7 +1824,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
69042 /*
69043 * Do RCU core processing for the current CPU.
69044 */
69045 -static void rcu_process_callbacks(struct softirq_action *unused)
69046 +static void rcu_process_callbacks(void)
69047 {
69048 trace_rcu_utilization("Start RCU core");
69049 __rcu_process_callbacks(&rcu_sched_state,
69050 @@ -2042,8 +2042,8 @@ void synchronize_rcu_bh(void)
69051 }
69052 EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
69053
69054 -static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
69055 -static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
69056 +static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
69057 +static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
69058
69059 static int synchronize_sched_expedited_cpu_stop(void *data)
69060 {
69061 @@ -2104,7 +2104,7 @@ void synchronize_sched_expedited(void)
69062 int firstsnap, s, snap, trycount = 0;
69063
69064 /* Note that atomic_inc_return() implies full memory barrier. */
69065 - firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
69066 + firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
69067 get_online_cpus();
69068 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
69069
69070 @@ -2126,7 +2126,7 @@ void synchronize_sched_expedited(void)
69071 }
69072
69073 /* Check to see if someone else did our work for us. */
69074 - s = atomic_read(&sync_sched_expedited_done);
69075 + s = atomic_read_unchecked(&sync_sched_expedited_done);
69076 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
69077 smp_mb(); /* ensure test happens before caller kfree */
69078 return;
69079 @@ -2141,7 +2141,7 @@ void synchronize_sched_expedited(void)
69080 * grace period works for us.
69081 */
69082 get_online_cpus();
69083 - snap = atomic_read(&sync_sched_expedited_started);
69084 + snap = atomic_read_unchecked(&sync_sched_expedited_started);
69085 smp_mb(); /* ensure read is before try_stop_cpus(). */
69086 }
69087
69088 @@ -2152,12 +2152,12 @@ void synchronize_sched_expedited(void)
69089 * than we did beat us to the punch.
69090 */
69091 do {
69092 - s = atomic_read(&sync_sched_expedited_done);
69093 + s = atomic_read_unchecked(&sync_sched_expedited_done);
69094 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
69095 smp_mb(); /* ensure test happens before caller kfree */
69096 break;
69097 }
69098 - } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
69099 + } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
69100
69101 put_online_cpus();
69102 }
69103 @@ -2421,7 +2421,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
69104 rdp->qlen = 0;
69105 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
69106 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
69107 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
69108 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
69109 rdp->cpu = cpu;
69110 rdp->rsp = rsp;
69111 raw_spin_unlock_irqrestore(&rnp->lock, flags);
69112 @@ -2449,8 +2449,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
69113 rdp->n_force_qs_snap = rsp->n_force_qs;
69114 rdp->blimit = blimit;
69115 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
69116 - atomic_set(&rdp->dynticks->dynticks,
69117 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
69118 + atomic_set_unchecked(&rdp->dynticks->dynticks,
69119 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
69120 rcu_prepare_for_idle_init(cpu);
69121 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
69122
69123 diff --git a/kernel/rcutree.h b/kernel/rcutree.h
69124 index 19b61ac..5c60a94 100644
69125 --- a/kernel/rcutree.h
69126 +++ b/kernel/rcutree.h
69127 @@ -83,7 +83,7 @@ struct rcu_dynticks {
69128 long long dynticks_nesting; /* Track irq/process nesting level. */
69129 /* Process level is worth LLONG_MAX/2. */
69130 int dynticks_nmi_nesting; /* Track NMI nesting level. */
69131 - atomic_t dynticks; /* Even value for idle, else odd. */
69132 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
69133 #ifdef CONFIG_RCU_FAST_NO_HZ
69134 int dyntick_drain; /* Prepare-for-idle state variable. */
69135 unsigned long dyntick_holdoff;
69136 diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
69137 index 3e48994..d94f03a 100644
69138 --- a/kernel/rcutree_plugin.h
69139 +++ b/kernel/rcutree_plugin.h
69140 @@ -909,7 +909,7 @@ void synchronize_rcu_expedited(void)
69141
69142 /* Clean up and exit. */
69143 smp_mb(); /* ensure expedited GP seen before counter increment. */
69144 - ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
69145 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
69146 unlock_mb_ret:
69147 mutex_unlock(&sync_rcu_preempt_exp_mutex);
69148 mb_ret:
69149 diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
69150 index d4bc16d..c234a5c 100644
69151 --- a/kernel/rcutree_trace.c
69152 +++ b/kernel/rcutree_trace.c
69153 @@ -68,7 +68,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
69154 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
69155 rdp->qs_pending);
69156 seq_printf(m, " dt=%d/%llx/%d df=%lu",
69157 - atomic_read(&rdp->dynticks->dynticks),
69158 + atomic_read_unchecked(&rdp->dynticks->dynticks),
69159 rdp->dynticks->dynticks_nesting,
69160 rdp->dynticks->dynticks_nmi_nesting,
69161 rdp->dynticks_fqs);
69162 @@ -140,7 +140,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
69163 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
69164 rdp->qs_pending);
69165 seq_printf(m, ",%d,%llx,%d,%lu",
69166 - atomic_read(&rdp->dynticks->dynticks),
69167 + atomic_read_unchecked(&rdp->dynticks->dynticks),
69168 rdp->dynticks->dynticks_nesting,
69169 rdp->dynticks->dynticks_nmi_nesting,
69170 rdp->dynticks_fqs);
69171 diff --git a/kernel/resource.c b/kernel/resource.c
69172 index e1d2b8e..24820bb 100644
69173 --- a/kernel/resource.c
69174 +++ b/kernel/resource.c
69175 @@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
69176
69177 static int __init ioresources_init(void)
69178 {
69179 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
69180 +#ifdef CONFIG_GRKERNSEC_PROC_USER
69181 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
69182 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
69183 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69184 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
69185 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
69186 +#endif
69187 +#else
69188 proc_create("ioports", 0, NULL, &proc_ioports_operations);
69189 proc_create("iomem", 0, NULL, &proc_iomem_operations);
69190 +#endif
69191 return 0;
69192 }
69193 __initcall(ioresources_init);
69194 diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
69195 index 98ec494..4241d6d 100644
69196 --- a/kernel/rtmutex-tester.c
69197 +++ b/kernel/rtmutex-tester.c
69198 @@ -20,7 +20,7 @@
69199 #define MAX_RT_TEST_MUTEXES 8
69200
69201 static spinlock_t rttest_lock;
69202 -static atomic_t rttest_event;
69203 +static atomic_unchecked_t rttest_event;
69204
69205 struct test_thread_data {
69206 int opcode;
69207 @@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69208
69209 case RTTEST_LOCKCONT:
69210 td->mutexes[td->opdata] = 1;
69211 - td->event = atomic_add_return(1, &rttest_event);
69212 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69213 return 0;
69214
69215 case RTTEST_RESET:
69216 @@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69217 return 0;
69218
69219 case RTTEST_RESETEVENT:
69220 - atomic_set(&rttest_event, 0);
69221 + atomic_set_unchecked(&rttest_event, 0);
69222 return 0;
69223
69224 default:
69225 @@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69226 return ret;
69227
69228 td->mutexes[id] = 1;
69229 - td->event = atomic_add_return(1, &rttest_event);
69230 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69231 rt_mutex_lock(&mutexes[id]);
69232 - td->event = atomic_add_return(1, &rttest_event);
69233 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69234 td->mutexes[id] = 4;
69235 return 0;
69236
69237 @@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69238 return ret;
69239
69240 td->mutexes[id] = 1;
69241 - td->event = atomic_add_return(1, &rttest_event);
69242 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69243 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
69244 - td->event = atomic_add_return(1, &rttest_event);
69245 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69246 td->mutexes[id] = ret ? 0 : 4;
69247 return ret ? -EINTR : 0;
69248
69249 @@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
69250 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
69251 return ret;
69252
69253 - td->event = atomic_add_return(1, &rttest_event);
69254 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69255 rt_mutex_unlock(&mutexes[id]);
69256 - td->event = atomic_add_return(1, &rttest_event);
69257 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69258 td->mutexes[id] = 0;
69259 return 0;
69260
69261 @@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69262 break;
69263
69264 td->mutexes[dat] = 2;
69265 - td->event = atomic_add_return(1, &rttest_event);
69266 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69267 break;
69268
69269 default:
69270 @@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69271 return;
69272
69273 td->mutexes[dat] = 3;
69274 - td->event = atomic_add_return(1, &rttest_event);
69275 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69276 break;
69277
69278 case RTTEST_LOCKNOWAIT:
69279 @@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
69280 return;
69281
69282 td->mutexes[dat] = 1;
69283 - td->event = atomic_add_return(1, &rttest_event);
69284 + td->event = atomic_add_return_unchecked(1, &rttest_event);
69285 return;
69286
69287 default:
69288 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
69289 index 0984a21..939f183 100644
69290 --- a/kernel/sched/auto_group.c
69291 +++ b/kernel/sched/auto_group.c
69292 @@ -11,7 +11,7 @@
69293
69294 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
69295 static struct autogroup autogroup_default;
69296 -static atomic_t autogroup_seq_nr;
69297 +static atomic_unchecked_t autogroup_seq_nr;
69298
69299 void __init autogroup_init(struct task_struct *init_task)
69300 {
69301 @@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
69302
69303 kref_init(&ag->kref);
69304 init_rwsem(&ag->lock);
69305 - ag->id = atomic_inc_return(&autogroup_seq_nr);
69306 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
69307 ag->tg = tg;
69308 #ifdef CONFIG_RT_GROUP_SCHED
69309 /*
69310 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
69311 index 468bdd4..b941572 100644
69312 --- a/kernel/sched/core.c
69313 +++ b/kernel/sched/core.c
69314 @@ -4097,6 +4097,8 @@ int can_nice(const struct task_struct *p, const int nice)
69315 /* convert nice value [19,-20] to rlimit style value [1,40] */
69316 int nice_rlim = 20 - nice;
69317
69318 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
69319 +
69320 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
69321 capable(CAP_SYS_NICE));
69322 }
69323 @@ -4130,7 +4132,8 @@ SYSCALL_DEFINE1(nice, int, increment)
69324 if (nice > 19)
69325 nice = 19;
69326
69327 - if (increment < 0 && !can_nice(current, nice))
69328 + if (increment < 0 && (!can_nice(current, nice) ||
69329 + gr_handle_chroot_nice()))
69330 return -EPERM;
69331
69332 retval = security_task_setnice(current, nice);
69333 @@ -4284,6 +4287,7 @@ recheck:
69334 unsigned long rlim_rtprio =
69335 task_rlimit(p, RLIMIT_RTPRIO);
69336
69337 + gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
69338 /* can't set/change the rt policy */
69339 if (policy != p->policy && !rlim_rtprio)
69340 return -EPERM;
69341 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
69342 index c099cc6..06aec4f 100644
69343 --- a/kernel/sched/fair.c
69344 +++ b/kernel/sched/fair.c
69345 @@ -4846,7 +4846,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
69346 * run_rebalance_domains is triggered when needed from the scheduler tick.
69347 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
69348 */
69349 -static void run_rebalance_domains(struct softirq_action *h)
69350 +static void run_rebalance_domains(void)
69351 {
69352 int this_cpu = smp_processor_id();
69353 struct rq *this_rq = cpu_rq(this_cpu);
69354 diff --git a/kernel/signal.c b/kernel/signal.c
69355 index 6771027..763e51e 100644
69356 --- a/kernel/signal.c
69357 +++ b/kernel/signal.c
69358 @@ -48,12 +48,12 @@ static struct kmem_cache *sigqueue_cachep;
69359
69360 int print_fatal_signals __read_mostly;
69361
69362 -static void __user *sig_handler(struct task_struct *t, int sig)
69363 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
69364 {
69365 return t->sighand->action[sig - 1].sa.sa_handler;
69366 }
69367
69368 -static int sig_handler_ignored(void __user *handler, int sig)
69369 +static int sig_handler_ignored(__sighandler_t handler, int sig)
69370 {
69371 /* Is it explicitly or implicitly ignored? */
69372 return handler == SIG_IGN ||
69373 @@ -62,7 +62,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
69374
69375 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
69376 {
69377 - void __user *handler;
69378 + __sighandler_t handler;
69379
69380 handler = sig_handler(t, sig);
69381
69382 @@ -366,6 +366,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
69383 atomic_inc(&user->sigpending);
69384 rcu_read_unlock();
69385
69386 + if (!override_rlimit)
69387 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
69388 +
69389 if (override_rlimit ||
69390 atomic_read(&user->sigpending) <=
69391 task_rlimit(t, RLIMIT_SIGPENDING)) {
69392 @@ -490,7 +493,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
69393
69394 int unhandled_signal(struct task_struct *tsk, int sig)
69395 {
69396 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
69397 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
69398 if (is_global_init(tsk))
69399 return 1;
69400 if (handler != SIG_IGN && handler != SIG_DFL)
69401 @@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
69402 }
69403 }
69404
69405 + /* allow glibc communication via tgkill to other threads in our
69406 + thread group */
69407 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
69408 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
69409 + && gr_handle_signal(t, sig))
69410 + return -EPERM;
69411 +
69412 return security_task_kill(t, info, sig, 0);
69413 }
69414
69415 @@ -1197,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69416 return send_signal(sig, info, p, 1);
69417 }
69418
69419 -static int
69420 +int
69421 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69422 {
69423 return send_signal(sig, info, t, 0);
69424 @@ -1234,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69425 unsigned long int flags;
69426 int ret, blocked, ignored;
69427 struct k_sigaction *action;
69428 + int is_unhandled = 0;
69429
69430 spin_lock_irqsave(&t->sighand->siglock, flags);
69431 action = &t->sighand->action[sig-1];
69432 @@ -1248,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69433 }
69434 if (action->sa.sa_handler == SIG_DFL)
69435 t->signal->flags &= ~SIGNAL_UNKILLABLE;
69436 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
69437 + is_unhandled = 1;
69438 ret = specific_send_sig_info(sig, info, t);
69439 spin_unlock_irqrestore(&t->sighand->siglock, flags);
69440
69441 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
69442 + normal operation */
69443 + if (is_unhandled) {
69444 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
69445 + gr_handle_crash(t, sig);
69446 + }
69447 +
69448 return ret;
69449 }
69450
69451 @@ -1317,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69452 ret = check_kill_permission(sig, info, p);
69453 rcu_read_unlock();
69454
69455 - if (!ret && sig)
69456 + if (!ret && sig) {
69457 ret = do_send_sig_info(sig, info, p, true);
69458 + if (!ret)
69459 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
69460 + }
69461
69462 return ret;
69463 }
69464 @@ -2858,7 +2881,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
69465 int error = -ESRCH;
69466
69467 rcu_read_lock();
69468 - p = find_task_by_vpid(pid);
69469 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69470 + /* allow glibc communication via tgkill to other threads in our
69471 + thread group */
69472 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
69473 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
69474 + p = find_task_by_vpid_unrestricted(pid);
69475 + else
69476 +#endif
69477 + p = find_task_by_vpid(pid);
69478 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
69479 error = check_kill_permission(sig, info, p);
69480 /*
69481 diff --git a/kernel/smp.c b/kernel/smp.c
69482 index d0ae5b2..b87c5a8 100644
69483 --- a/kernel/smp.c
69484 +++ b/kernel/smp.c
69485 @@ -582,22 +582,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
69486 }
69487 EXPORT_SYMBOL(smp_call_function);
69488
69489 -void ipi_call_lock(void)
69490 +void ipi_call_lock(void) __acquires(call_function.lock)
69491 {
69492 raw_spin_lock(&call_function.lock);
69493 }
69494
69495 -void ipi_call_unlock(void)
69496 +void ipi_call_unlock(void) __releases(call_function.lock)
69497 {
69498 raw_spin_unlock(&call_function.lock);
69499 }
69500
69501 -void ipi_call_lock_irq(void)
69502 +void ipi_call_lock_irq(void) __acquires(call_function.lock)
69503 {
69504 raw_spin_lock_irq(&call_function.lock);
69505 }
69506
69507 -void ipi_call_unlock_irq(void)
69508 +void ipi_call_unlock_irq(void) __releases(call_function.lock)
69509 {
69510 raw_spin_unlock_irq(&call_function.lock);
69511 }
69512 diff --git a/kernel/softirq.c b/kernel/softirq.c
69513 index 671f959..91c51cb 100644
69514 --- a/kernel/softirq.c
69515 +++ b/kernel/softirq.c
69516 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
69517
69518 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
69519
69520 -char *softirq_to_name[NR_SOFTIRQS] = {
69521 +const char * const softirq_to_name[NR_SOFTIRQS] = {
69522 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
69523 "TASKLET", "SCHED", "HRTIMER", "RCU"
69524 };
69525 @@ -235,7 +235,7 @@ restart:
69526 kstat_incr_softirqs_this_cpu(vec_nr);
69527
69528 trace_softirq_entry(vec_nr);
69529 - h->action(h);
69530 + h->action();
69531 trace_softirq_exit(vec_nr);
69532 if (unlikely(prev_count != preempt_count())) {
69533 printk(KERN_ERR "huh, entered softirq %u %s %p"
69534 @@ -381,9 +381,11 @@ void __raise_softirq_irqoff(unsigned int nr)
69535 or_softirq_pending(1UL << nr);
69536 }
69537
69538 -void open_softirq(int nr, void (*action)(struct softirq_action *))
69539 +void open_softirq(int nr, void (*action)(void))
69540 {
69541 - softirq_vec[nr].action = action;
69542 + pax_open_kernel();
69543 + *(void **)&softirq_vec[nr].action = action;
69544 + pax_close_kernel();
69545 }
69546
69547 /*
69548 @@ -437,7 +439,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
69549
69550 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
69551
69552 -static void tasklet_action(struct softirq_action *a)
69553 +static void tasklet_action(void)
69554 {
69555 struct tasklet_struct *list;
69556
69557 @@ -472,7 +474,7 @@ static void tasklet_action(struct softirq_action *a)
69558 }
69559 }
69560
69561 -static void tasklet_hi_action(struct softirq_action *a)
69562 +static void tasklet_hi_action(void)
69563 {
69564 struct tasklet_struct *list;
69565
69566 diff --git a/kernel/srcu.c b/kernel/srcu.c
69567 index 2095be3..9a5b89d 100644
69568 --- a/kernel/srcu.c
69569 +++ b/kernel/srcu.c
69570 @@ -302,9 +302,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
69571 preempt_disable();
69572 idx = rcu_dereference_index_check(sp->completed,
69573 rcu_read_lock_sched_held()) & 0x1;
69574 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
69575 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
69576 smp_mb(); /* B */ /* Avoid leaking the critical section. */
69577 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
69578 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
69579 preempt_enable();
69580 return idx;
69581 }
69582 @@ -320,7 +320,7 @@ void __srcu_read_unlock(struct srcu_struct *sp, int idx)
69583 {
69584 preempt_disable();
69585 smp_mb(); /* C */ /* Avoid leaking the critical section. */
69586 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) -= 1;
69587 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) -= 1;
69588 preempt_enable();
69589 }
69590 EXPORT_SYMBOL_GPL(__srcu_read_unlock);
69591 diff --git a/kernel/sys.c b/kernel/sys.c
69592 index 2d39a84..f778b49 100644
69593 --- a/kernel/sys.c
69594 +++ b/kernel/sys.c
69595 @@ -157,6 +157,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
69596 error = -EACCES;
69597 goto out;
69598 }
69599 +
69600 + if (gr_handle_chroot_setpriority(p, niceval)) {
69601 + error = -EACCES;
69602 + goto out;
69603 + }
69604 +
69605 no_nice = security_task_setnice(p, niceval);
69606 if (no_nice) {
69607 error = no_nice;
69608 @@ -594,6 +600,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
69609 goto error;
69610 }
69611
69612 + if (gr_check_group_change(new->gid, new->egid, -1))
69613 + goto error;
69614 +
69615 if (rgid != (gid_t) -1 ||
69616 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
69617 new->sgid = new->egid;
69618 @@ -629,6 +638,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
69619 old = current_cred();
69620
69621 retval = -EPERM;
69622 +
69623 + if (gr_check_group_change(kgid, kgid, kgid))
69624 + goto error;
69625 +
69626 if (nsown_capable(CAP_SETGID))
69627 new->gid = new->egid = new->sgid = new->fsgid = kgid;
69628 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
69629 @@ -646,7 +659,7 @@ error:
69630 /*
69631 * change the user struct in a credentials set to match the new UID
69632 */
69633 -static int set_user(struct cred *new)
69634 +int set_user(struct cred *new)
69635 {
69636 struct user_struct *new_user;
69637
69638 @@ -726,6 +739,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
69639 goto error;
69640 }
69641
69642 + if (gr_check_user_change(new->uid, new->euid, -1))
69643 + goto error;
69644 +
69645 if (!uid_eq(new->uid, old->uid)) {
69646 retval = set_user(new);
69647 if (retval < 0)
69648 @@ -776,6 +792,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69649 old = current_cred();
69650
69651 retval = -EPERM;
69652 +
69653 + if (gr_check_crash_uid(kuid))
69654 + goto error;
69655 + if (gr_check_user_change(kuid, kuid, kuid))
69656 + goto error;
69657 +
69658 if (nsown_capable(CAP_SETUID)) {
69659 new->suid = new->uid = kuid;
69660 if (!uid_eq(kuid, old->uid)) {
69661 @@ -845,6 +867,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
69662 goto error;
69663 }
69664
69665 + if (gr_check_user_change(kruid, keuid, -1))
69666 + goto error;
69667 +
69668 if (ruid != (uid_t) -1) {
69669 new->uid = kruid;
69670 if (!uid_eq(kruid, old->uid)) {
69671 @@ -927,6 +952,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
69672 goto error;
69673 }
69674
69675 + if (gr_check_group_change(krgid, kegid, -1))
69676 + goto error;
69677 +
69678 if (rgid != (gid_t) -1)
69679 new->gid = krgid;
69680 if (egid != (gid_t) -1)
69681 @@ -980,6 +1008,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69682 if (!uid_valid(kuid))
69683 return old_fsuid;
69684
69685 + if (gr_check_user_change(-1, -1, kuid))
69686 + goto error;
69687 +
69688 new = prepare_creds();
69689 if (!new)
69690 return old_fsuid;
69691 @@ -994,6 +1025,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69692 }
69693 }
69694
69695 +error:
69696 abort_creds(new);
69697 return old_fsuid;
69698
69699 @@ -1026,12 +1058,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69700 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
69701 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
69702 nsown_capable(CAP_SETGID)) {
69703 + if (gr_check_group_change(-1, -1, kgid))
69704 + goto error;
69705 +
69706 if (!gid_eq(kgid, old->fsgid)) {
69707 new->fsgid = kgid;
69708 goto change_okay;
69709 }
69710 }
69711
69712 +error:
69713 abort_creds(new);
69714 return old_fsgid;
69715
69716 @@ -1283,7 +1319,10 @@ static int override_release(char __user *release, int len)
69717 }
69718 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
69719 snprintf(buf, len, "2.6.%u%s", v, rest);
69720 - ret = copy_to_user(release, buf, len);
69721 + if (len > sizeof(buf))
69722 + ret = -EFAULT;
69723 + else
69724 + ret = copy_to_user(release, buf, len);
69725 }
69726 return ret;
69727 }
69728 @@ -1337,19 +1376,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
69729 return -EFAULT;
69730
69731 down_read(&uts_sem);
69732 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
69733 + error = __copy_to_user(name->sysname, &utsname()->sysname,
69734 __OLD_UTS_LEN);
69735 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
69736 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
69737 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
69738 __OLD_UTS_LEN);
69739 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
69740 - error |= __copy_to_user(&name->release, &utsname()->release,
69741 + error |= __copy_to_user(name->release, &utsname()->release,
69742 __OLD_UTS_LEN);
69743 error |= __put_user(0, name->release + __OLD_UTS_LEN);
69744 - error |= __copy_to_user(&name->version, &utsname()->version,
69745 + error |= __copy_to_user(name->version, &utsname()->version,
69746 __OLD_UTS_LEN);
69747 error |= __put_user(0, name->version + __OLD_UTS_LEN);
69748 - error |= __copy_to_user(&name->machine, &utsname()->machine,
69749 + error |= __copy_to_user(name->machine, &utsname()->machine,
69750 __OLD_UTS_LEN);
69751 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
69752 up_read(&uts_sem);
69753 @@ -2024,7 +2063,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
69754 error = get_dumpable(me->mm);
69755 break;
69756 case PR_SET_DUMPABLE:
69757 - if (arg2 < 0 || arg2 > 1) {
69758 + if (arg2 > 1) {
69759 error = -EINVAL;
69760 break;
69761 }
69762 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
69763 index 4ab1187..33f4f2b 100644
69764 --- a/kernel/sysctl.c
69765 +++ b/kernel/sysctl.c
69766 @@ -91,7 +91,6 @@
69767
69768
69769 #if defined(CONFIG_SYSCTL)
69770 -
69771 /* External variables not in a header file. */
69772 extern int sysctl_overcommit_memory;
69773 extern int sysctl_overcommit_ratio;
69774 @@ -169,10 +168,13 @@ static int proc_taint(struct ctl_table *table, int write,
69775 void __user *buffer, size_t *lenp, loff_t *ppos);
69776 #endif
69777
69778 -#ifdef CONFIG_PRINTK
69779 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
69780 void __user *buffer, size_t *lenp, loff_t *ppos);
69781 -#endif
69782 +
69783 +static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
69784 + void __user *buffer, size_t *lenp, loff_t *ppos);
69785 +static int proc_dostring_coredump(struct ctl_table *table, int write,
69786 + void __user *buffer, size_t *lenp, loff_t *ppos);
69787
69788 #ifdef CONFIG_MAGIC_SYSRQ
69789 /* Note: sysrq code uses it's own private copy */
69790 @@ -196,6 +198,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
69791
69792 #endif
69793
69794 +extern struct ctl_table grsecurity_table[];
69795 +
69796 static struct ctl_table kern_table[];
69797 static struct ctl_table vm_table[];
69798 static struct ctl_table fs_table[];
69799 @@ -210,6 +214,20 @@ extern struct ctl_table epoll_table[];
69800 int sysctl_legacy_va_layout;
69801 #endif
69802
69803 +#ifdef CONFIG_PAX_SOFTMODE
69804 +static ctl_table pax_table[] = {
69805 + {
69806 + .procname = "softmode",
69807 + .data = &pax_softmode,
69808 + .maxlen = sizeof(unsigned int),
69809 + .mode = 0600,
69810 + .proc_handler = &proc_dointvec,
69811 + },
69812 +
69813 + { }
69814 +};
69815 +#endif
69816 +
69817 /* The default sysctl tables: */
69818
69819 static struct ctl_table sysctl_base_table[] = {
69820 @@ -256,6 +274,22 @@ static int max_extfrag_threshold = 1000;
69821 #endif
69822
69823 static struct ctl_table kern_table[] = {
69824 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69825 + {
69826 + .procname = "grsecurity",
69827 + .mode = 0500,
69828 + .child = grsecurity_table,
69829 + },
69830 +#endif
69831 +
69832 +#ifdef CONFIG_PAX_SOFTMODE
69833 + {
69834 + .procname = "pax",
69835 + .mode = 0500,
69836 + .child = pax_table,
69837 + },
69838 +#endif
69839 +
69840 {
69841 .procname = "sched_child_runs_first",
69842 .data = &sysctl_sched_child_runs_first,
69843 @@ -410,7 +444,7 @@ static struct ctl_table kern_table[] = {
69844 .data = core_pattern,
69845 .maxlen = CORENAME_MAX_SIZE,
69846 .mode = 0644,
69847 - .proc_handler = proc_dostring,
69848 + .proc_handler = proc_dostring_coredump,
69849 },
69850 {
69851 .procname = "core_pipe_limit",
69852 @@ -540,7 +574,7 @@ static struct ctl_table kern_table[] = {
69853 .data = &modprobe_path,
69854 .maxlen = KMOD_PATH_LEN,
69855 .mode = 0644,
69856 - .proc_handler = proc_dostring,
69857 + .proc_handler = proc_dostring_modpriv,
69858 },
69859 {
69860 .procname = "modules_disabled",
69861 @@ -707,16 +741,20 @@ static struct ctl_table kern_table[] = {
69862 .extra1 = &zero,
69863 .extra2 = &one,
69864 },
69865 +#endif
69866 {
69867 .procname = "kptr_restrict",
69868 .data = &kptr_restrict,
69869 .maxlen = sizeof(int),
69870 .mode = 0644,
69871 .proc_handler = proc_dointvec_minmax_sysadmin,
69872 +#ifdef CONFIG_GRKERNSEC_HIDESYM
69873 + .extra1 = &two,
69874 +#else
69875 .extra1 = &zero,
69876 +#endif
69877 .extra2 = &two,
69878 },
69879 -#endif
69880 {
69881 .procname = "ngroups_max",
69882 .data = &ngroups_max,
69883 @@ -1215,6 +1253,13 @@ static struct ctl_table vm_table[] = {
69884 .proc_handler = proc_dointvec_minmax,
69885 .extra1 = &zero,
69886 },
69887 + {
69888 + .procname = "heap_stack_gap",
69889 + .data = &sysctl_heap_stack_gap,
69890 + .maxlen = sizeof(sysctl_heap_stack_gap),
69891 + .mode = 0644,
69892 + .proc_handler = proc_doulongvec_minmax,
69893 + },
69894 #else
69895 {
69896 .procname = "nr_trim_pages",
69897 @@ -1498,7 +1543,7 @@ static struct ctl_table fs_table[] = {
69898 .data = &suid_dumpable,
69899 .maxlen = sizeof(int),
69900 .mode = 0644,
69901 - .proc_handler = proc_dointvec_minmax,
69902 + .proc_handler = proc_dointvec_minmax_coredump,
69903 .extra1 = &zero,
69904 .extra2 = &two,
69905 },
69906 @@ -1645,6 +1690,16 @@ int proc_dostring(struct ctl_table *table, int write,
69907 buffer, lenp, ppos);
69908 }
69909
69910 +int proc_dostring_modpriv(struct ctl_table *table, int write,
69911 + void __user *buffer, size_t *lenp, loff_t *ppos)
69912 +{
69913 + if (write && !capable(CAP_SYS_MODULE))
69914 + return -EPERM;
69915 +
69916 + return _proc_do_string(table->data, table->maxlen, write,
69917 + buffer, lenp, ppos);
69918 +}
69919 +
69920 static size_t proc_skip_spaces(char **buf)
69921 {
69922 size_t ret;
69923 @@ -1750,6 +1805,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
69924 len = strlen(tmp);
69925 if (len > *size)
69926 len = *size;
69927 + if (len > sizeof(tmp))
69928 + len = sizeof(tmp);
69929 if (copy_to_user(*buf, tmp, len))
69930 return -EFAULT;
69931 *size -= len;
69932 @@ -1942,7 +1999,6 @@ static int proc_taint(struct ctl_table *table, int write,
69933 return err;
69934 }
69935
69936 -#ifdef CONFIG_PRINTK
69937 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
69938 void __user *buffer, size_t *lenp, loff_t *ppos)
69939 {
69940 @@ -1951,7 +2007,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
69941
69942 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
69943 }
69944 -#endif
69945
69946 struct do_proc_dointvec_minmax_conv_param {
69947 int *min;
69948 @@ -2009,6 +2064,34 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
69949 do_proc_dointvec_minmax_conv, &param);
69950 }
69951
69952 +static void validate_coredump_safety(void)
69953 +{
69954 + if (suid_dumpable == SUID_DUMPABLE_SAFE &&
69955 + core_pattern[0] != '/' && core_pattern[0] != '|') {
69956 + printk(KERN_WARNING "Unsafe core_pattern used with "\
69957 + "suid_dumpable=2. Pipe handler or fully qualified "\
69958 + "core dump path required.\n");
69959 + }
69960 +}
69961 +
69962 +static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
69963 + void __user *buffer, size_t *lenp, loff_t *ppos)
69964 +{
69965 + int error = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
69966 + if (!error)
69967 + validate_coredump_safety();
69968 + return error;
69969 +}
69970 +
69971 +static int proc_dostring_coredump(struct ctl_table *table, int write,
69972 + void __user *buffer, size_t *lenp, loff_t *ppos)
69973 +{
69974 + int error = proc_dostring(table, write, buffer, lenp, ppos);
69975 + if (!error)
69976 + validate_coredump_safety();
69977 + return error;
69978 +}
69979 +
69980 static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int write,
69981 void __user *buffer,
69982 size_t *lenp, loff_t *ppos,
69983 @@ -2066,8 +2149,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
69984 *i = val;
69985 } else {
69986 val = convdiv * (*i) / convmul;
69987 - if (!first)
69988 + if (!first) {
69989 err = proc_put_char(&buffer, &left, '\t');
69990 + if (err)
69991 + break;
69992 + }
69993 err = proc_put_long(&buffer, &left, val, false);
69994 if (err)
69995 break;
69996 @@ -2459,6 +2545,12 @@ int proc_dostring(struct ctl_table *table, int write,
69997 return -ENOSYS;
69998 }
69999
70000 +int proc_dostring_modpriv(struct ctl_table *table, int write,
70001 + void __user *buffer, size_t *lenp, loff_t *ppos)
70002 +{
70003 + return -ENOSYS;
70004 +}
70005 +
70006 int proc_dointvec(struct ctl_table *table, int write,
70007 void __user *buffer, size_t *lenp, loff_t *ppos)
70008 {
70009 @@ -2515,5 +2607,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
70010 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
70011 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
70012 EXPORT_SYMBOL(proc_dostring);
70013 +EXPORT_SYMBOL(proc_dostring_modpriv);
70014 EXPORT_SYMBOL(proc_doulongvec_minmax);
70015 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
70016 diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
70017 index a650694..aaeeb20 100644
70018 --- a/kernel/sysctl_binary.c
70019 +++ b/kernel/sysctl_binary.c
70020 @@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
70021 int i;
70022
70023 set_fs(KERNEL_DS);
70024 - result = vfs_read(file, buffer, BUFSZ - 1, &pos);
70025 + result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
70026 set_fs(old_fs);
70027 if (result < 0)
70028 goto out_kfree;
70029 @@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
70030 }
70031
70032 set_fs(KERNEL_DS);
70033 - result = vfs_write(file, buffer, str - buffer, &pos);
70034 + result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
70035 set_fs(old_fs);
70036 if (result < 0)
70037 goto out_kfree;
70038 @@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
70039 int i;
70040
70041 set_fs(KERNEL_DS);
70042 - result = vfs_read(file, buffer, BUFSZ - 1, &pos);
70043 + result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
70044 set_fs(old_fs);
70045 if (result < 0)
70046 goto out_kfree;
70047 @@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
70048 }
70049
70050 set_fs(KERNEL_DS);
70051 - result = vfs_write(file, buffer, str - buffer, &pos);
70052 + result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
70053 set_fs(old_fs);
70054 if (result < 0)
70055 goto out_kfree;
70056 @@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
70057 int i;
70058
70059 set_fs(KERNEL_DS);
70060 - result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
70061 + result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
70062 set_fs(old_fs);
70063 if (result < 0)
70064 goto out;
70065 @@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
70066 __le16 dnaddr;
70067
70068 set_fs(KERNEL_DS);
70069 - result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
70070 + result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
70071 set_fs(old_fs);
70072 if (result < 0)
70073 goto out;
70074 @@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
70075 le16_to_cpu(dnaddr) & 0x3ff);
70076
70077 set_fs(KERNEL_DS);
70078 - result = vfs_write(file, buf, len, &pos);
70079 + result = vfs_write(file, (const char __force_user *)buf, len, &pos);
70080 set_fs(old_fs);
70081 if (result < 0)
70082 goto out;
70083 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
70084 index e660464..c8b9e67 100644
70085 --- a/kernel/taskstats.c
70086 +++ b/kernel/taskstats.c
70087 @@ -27,9 +27,12 @@
70088 #include <linux/cgroup.h>
70089 #include <linux/fs.h>
70090 #include <linux/file.h>
70091 +#include <linux/grsecurity.h>
70092 #include <net/genetlink.h>
70093 #include <linux/atomic.h>
70094
70095 +extern int gr_is_taskstats_denied(int pid);
70096 +
70097 /*
70098 * Maximum length of a cpumask that can be specified in
70099 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
70100 @@ -556,6 +559,9 @@ err:
70101
70102 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
70103 {
70104 + if (gr_is_taskstats_denied(current->pid))
70105 + return -EACCES;
70106 +
70107 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
70108 return cmd_attr_register_cpumask(info);
70109 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
70110 diff --git a/kernel/time.c b/kernel/time.c
70111 index ba744cf..267b7c5 100644
70112 --- a/kernel/time.c
70113 +++ b/kernel/time.c
70114 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
70115 return error;
70116
70117 if (tz) {
70118 + /* we log in do_settimeofday called below, so don't log twice
70119 + */
70120 + if (!tv)
70121 + gr_log_timechange();
70122 +
70123 sys_tz = *tz;
70124 update_vsyscall_tz();
70125 if (firsttime) {
70126 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
70127 index aa27d39..34d221c 100644
70128 --- a/kernel/time/alarmtimer.c
70129 +++ b/kernel/time/alarmtimer.c
70130 @@ -779,7 +779,7 @@ static int __init alarmtimer_init(void)
70131 struct platform_device *pdev;
70132 int error = 0;
70133 int i;
70134 - struct k_clock alarm_clock = {
70135 + static struct k_clock alarm_clock = {
70136 .clock_getres = alarm_clock_getres,
70137 .clock_get = alarm_clock_get,
70138 .timer_create = alarm_timer_create,
70139 diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
70140 index f113755..ec24223 100644
70141 --- a/kernel/time/tick-broadcast.c
70142 +++ b/kernel/time/tick-broadcast.c
70143 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
70144 * then clear the broadcast bit.
70145 */
70146 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
70147 - int cpu = smp_processor_id();
70148 + cpu = smp_processor_id();
70149
70150 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
70151 tick_broadcast_clear_oneshot(cpu);
70152 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
70153 index 3447cfa..291806b 100644
70154 --- a/kernel/time/timekeeping.c
70155 +++ b/kernel/time/timekeeping.c
70156 @@ -14,6 +14,7 @@
70157 #include <linux/init.h>
70158 #include <linux/mm.h>
70159 #include <linux/sched.h>
70160 +#include <linux/grsecurity.h>
70161 #include <linux/syscore_ops.h>
70162 #include <linux/clocksource.h>
70163 #include <linux/jiffies.h>
70164 @@ -387,6 +388,8 @@ int do_settimeofday(const struct timespec *tv)
70165 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
70166 return -EINVAL;
70167
70168 + gr_log_timechange();
70169 +
70170 write_seqlock_irqsave(&timekeeper.lock, flags);
70171
70172 timekeeping_forward_now();
70173 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
70174 index 3258455..f35227d 100644
70175 --- a/kernel/time/timer_list.c
70176 +++ b/kernel/time/timer_list.c
70177 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
70178
70179 static void print_name_offset(struct seq_file *m, void *sym)
70180 {
70181 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70182 + SEQ_printf(m, "<%p>", NULL);
70183 +#else
70184 char symname[KSYM_NAME_LEN];
70185
70186 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
70187 SEQ_printf(m, "<%pK>", sym);
70188 else
70189 SEQ_printf(m, "%s", symname);
70190 +#endif
70191 }
70192
70193 static void
70194 @@ -112,7 +116,11 @@ next_one:
70195 static void
70196 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
70197 {
70198 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70199 + SEQ_printf(m, " .base: %p\n", NULL);
70200 +#else
70201 SEQ_printf(m, " .base: %pK\n", base);
70202 +#endif
70203 SEQ_printf(m, " .index: %d\n",
70204 base->index);
70205 SEQ_printf(m, " .resolution: %Lu nsecs\n",
70206 @@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
70207 {
70208 struct proc_dir_entry *pe;
70209
70210 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
70211 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
70212 +#else
70213 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
70214 +#endif
70215 if (!pe)
70216 return -ENOMEM;
70217 return 0;
70218 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
70219 index 0b537f2..9e71eca 100644
70220 --- a/kernel/time/timer_stats.c
70221 +++ b/kernel/time/timer_stats.c
70222 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
70223 static unsigned long nr_entries;
70224 static struct entry entries[MAX_ENTRIES];
70225
70226 -static atomic_t overflow_count;
70227 +static atomic_unchecked_t overflow_count;
70228
70229 /*
70230 * The entries are in a hash-table, for fast lookup:
70231 @@ -140,7 +140,7 @@ static void reset_entries(void)
70232 nr_entries = 0;
70233 memset(entries, 0, sizeof(entries));
70234 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
70235 - atomic_set(&overflow_count, 0);
70236 + atomic_set_unchecked(&overflow_count, 0);
70237 }
70238
70239 static struct entry *alloc_entry(void)
70240 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
70241 if (likely(entry))
70242 entry->count++;
70243 else
70244 - atomic_inc(&overflow_count);
70245 + atomic_inc_unchecked(&overflow_count);
70246
70247 out_unlock:
70248 raw_spin_unlock_irqrestore(lock, flags);
70249 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
70250
70251 static void print_name_offset(struct seq_file *m, unsigned long addr)
70252 {
70253 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70254 + seq_printf(m, "<%p>", NULL);
70255 +#else
70256 char symname[KSYM_NAME_LEN];
70257
70258 if (lookup_symbol_name(addr, symname) < 0)
70259 seq_printf(m, "<%p>", (void *)addr);
70260 else
70261 seq_printf(m, "%s", symname);
70262 +#endif
70263 }
70264
70265 static int tstats_show(struct seq_file *m, void *v)
70266 @@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
70267
70268 seq_puts(m, "Timer Stats Version: v0.2\n");
70269 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
70270 - if (atomic_read(&overflow_count))
70271 + if (atomic_read_unchecked(&overflow_count))
70272 seq_printf(m, "Overflow: %d entries\n",
70273 - atomic_read(&overflow_count));
70274 + atomic_read_unchecked(&overflow_count));
70275
70276 for (i = 0; i < nr_entries; i++) {
70277 entry = entries + i;
70278 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
70279 {
70280 struct proc_dir_entry *pe;
70281
70282 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
70283 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
70284 +#else
70285 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
70286 +#endif
70287 if (!pe)
70288 return -ENOMEM;
70289 return 0;
70290 diff --git a/kernel/timer.c b/kernel/timer.c
70291 index 6ec7e7e..cbc448b 100644
70292 --- a/kernel/timer.c
70293 +++ b/kernel/timer.c
70294 @@ -1362,7 +1362,7 @@ void update_process_times(int user_tick)
70295 /*
70296 * This function runs timers and the timer-tq in bottom half context.
70297 */
70298 -static void run_timer_softirq(struct softirq_action *h)
70299 +static void run_timer_softirq(void)
70300 {
70301 struct tvec_base *base = __this_cpu_read(tvec_bases);
70302
70303 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
70304 index c0bd030..62a1927 100644
70305 --- a/kernel/trace/blktrace.c
70306 +++ b/kernel/trace/blktrace.c
70307 @@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
70308 struct blk_trace *bt = filp->private_data;
70309 char buf[16];
70310
70311 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
70312 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
70313
70314 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
70315 }
70316 @@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
70317 return 1;
70318
70319 bt = buf->chan->private_data;
70320 - atomic_inc(&bt->dropped);
70321 + atomic_inc_unchecked(&bt->dropped);
70322 return 0;
70323 }
70324
70325 @@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
70326
70327 bt->dir = dir;
70328 bt->dev = dev;
70329 - atomic_set(&bt->dropped, 0);
70330 + atomic_set_unchecked(&bt->dropped, 0);
70331
70332 ret = -EIO;
70333 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
70334 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
70335 index a008663..30d7429 100644
70336 --- a/kernel/trace/ftrace.c
70337 +++ b/kernel/trace/ftrace.c
70338 @@ -1785,12 +1785,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
70339 if (unlikely(ftrace_disabled))
70340 return 0;
70341
70342 + ret = ftrace_arch_code_modify_prepare();
70343 + FTRACE_WARN_ON(ret);
70344 + if (ret)
70345 + return 0;
70346 +
70347 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
70348 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
70349 if (ret) {
70350 ftrace_bug(ret, ip);
70351 - return 0;
70352 }
70353 - return 1;
70354 + return ret ? 0 : 1;
70355 }
70356
70357 /*
70358 @@ -2885,7 +2890,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
70359
70360 int
70361 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
70362 - void *data)
70363 + void *data)
70364 {
70365 struct ftrace_func_probe *entry;
70366 struct ftrace_page *pg;
70367 @@ -3697,8 +3702,10 @@ static int ftrace_process_locs(struct module *mod,
70368 if (!count)
70369 return 0;
70370
70371 + pax_open_kernel();
70372 sort(start, count, sizeof(*start),
70373 ftrace_cmp_ips, ftrace_swap_ips);
70374 + pax_close_kernel();
70375
70376 start_pg = ftrace_allocate_pages(count);
70377 if (!start_pg)
70378 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
70379 index a7fa070..403bc8d 100644
70380 --- a/kernel/trace/trace.c
70381 +++ b/kernel/trace/trace.c
70382 @@ -4421,10 +4421,9 @@ static const struct file_operations tracing_dyn_info_fops = {
70383 };
70384 #endif
70385
70386 -static struct dentry *d_tracer;
70387 -
70388 struct dentry *tracing_init_dentry(void)
70389 {
70390 + static struct dentry *d_tracer;
70391 static int once;
70392
70393 if (d_tracer)
70394 @@ -4444,10 +4443,9 @@ struct dentry *tracing_init_dentry(void)
70395 return d_tracer;
70396 }
70397
70398 -static struct dentry *d_percpu;
70399 -
70400 struct dentry *tracing_dentry_percpu(void)
70401 {
70402 + static struct dentry *d_percpu;
70403 static int once;
70404 struct dentry *d_tracer;
70405
70406 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
70407 index 29111da..d190fe2 100644
70408 --- a/kernel/trace/trace_events.c
70409 +++ b/kernel/trace/trace_events.c
70410 @@ -1308,10 +1308,6 @@ static LIST_HEAD(ftrace_module_file_list);
70411 struct ftrace_module_file_ops {
70412 struct list_head list;
70413 struct module *mod;
70414 - struct file_operations id;
70415 - struct file_operations enable;
70416 - struct file_operations format;
70417 - struct file_operations filter;
70418 };
70419
70420 static struct ftrace_module_file_ops *
70421 @@ -1332,17 +1328,12 @@ trace_create_file_ops(struct module *mod)
70422
70423 file_ops->mod = mod;
70424
70425 - file_ops->id = ftrace_event_id_fops;
70426 - file_ops->id.owner = mod;
70427 -
70428 - file_ops->enable = ftrace_enable_fops;
70429 - file_ops->enable.owner = mod;
70430 -
70431 - file_ops->filter = ftrace_event_filter_fops;
70432 - file_ops->filter.owner = mod;
70433 -
70434 - file_ops->format = ftrace_event_format_fops;
70435 - file_ops->format.owner = mod;
70436 + pax_open_kernel();
70437 + *(void **)&mod->trace_id.owner = mod;
70438 + *(void **)&mod->trace_enable.owner = mod;
70439 + *(void **)&mod->trace_filter.owner = mod;
70440 + *(void **)&mod->trace_format.owner = mod;
70441 + pax_close_kernel();
70442
70443 list_add(&file_ops->list, &ftrace_module_file_list);
70444
70445 @@ -1366,8 +1357,8 @@ static void trace_module_add_events(struct module *mod)
70446
70447 for_each_event(call, start, end) {
70448 __trace_add_event_call(*call, mod,
70449 - &file_ops->id, &file_ops->enable,
70450 - &file_ops->filter, &file_ops->format);
70451 + &mod->trace_id, &mod->trace_enable,
70452 + &mod->trace_filter, &mod->trace_format);
70453 }
70454 }
70455
70456 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
70457 index fd3c8aa..5f324a6 100644
70458 --- a/kernel/trace/trace_mmiotrace.c
70459 +++ b/kernel/trace/trace_mmiotrace.c
70460 @@ -24,7 +24,7 @@ struct header_iter {
70461 static struct trace_array *mmio_trace_array;
70462 static bool overrun_detected;
70463 static unsigned long prev_overruns;
70464 -static atomic_t dropped_count;
70465 +static atomic_unchecked_t dropped_count;
70466
70467 static void mmio_reset_data(struct trace_array *tr)
70468 {
70469 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
70470
70471 static unsigned long count_overruns(struct trace_iterator *iter)
70472 {
70473 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
70474 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
70475 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
70476
70477 if (over > prev_overruns)
70478 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
70479 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
70480 sizeof(*entry), 0, pc);
70481 if (!event) {
70482 - atomic_inc(&dropped_count);
70483 + atomic_inc_unchecked(&dropped_count);
70484 return;
70485 }
70486 entry = ring_buffer_event_data(event);
70487 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
70488 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
70489 sizeof(*entry), 0, pc);
70490 if (!event) {
70491 - atomic_inc(&dropped_count);
70492 + atomic_inc_unchecked(&dropped_count);
70493 return;
70494 }
70495 entry = ring_buffer_event_data(event);
70496 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
70497 index df611a0..10d8b32 100644
70498 --- a/kernel/trace/trace_output.c
70499 +++ b/kernel/trace/trace_output.c
70500 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
70501
70502 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
70503 if (!IS_ERR(p)) {
70504 - p = mangle_path(s->buffer + s->len, p, "\n");
70505 + p = mangle_path(s->buffer + s->len, p, "\n\\");
70506 if (p) {
70507 s->len = p - s->buffer;
70508 return 1;
70509 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
70510 index d4545f4..a9010a1 100644
70511 --- a/kernel/trace/trace_stack.c
70512 +++ b/kernel/trace/trace_stack.c
70513 @@ -53,7 +53,7 @@ static inline void check_stack(void)
70514 return;
70515
70516 /* we do not handle interrupt stacks yet */
70517 - if (!object_is_on_stack(&this_size))
70518 + if (!object_starts_on_stack(&this_size))
70519 return;
70520
70521 local_irq_save(flags);
70522 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
70523 index ff5bdee..3eaeba6 100644
70524 --- a/lib/Kconfig.debug
70525 +++ b/lib/Kconfig.debug
70526 @@ -1165,6 +1165,7 @@ config LATENCYTOP
70527 depends on DEBUG_KERNEL
70528 depends on STACKTRACE_SUPPORT
70529 depends on PROC_FS
70530 + depends on !GRKERNSEC_HIDESYM
70531 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
70532 select KALLSYMS
70533 select KALLSYMS_ALL
70534 diff --git a/lib/bitmap.c b/lib/bitmap.c
70535 index 06fdfa1..97c5c7d 100644
70536 --- a/lib/bitmap.c
70537 +++ b/lib/bitmap.c
70538 @@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
70539 {
70540 int c, old_c, totaldigits, ndigits, nchunks, nbits;
70541 u32 chunk;
70542 - const char __user __force *ubuf = (const char __user __force *)buf;
70543 + const char __user *ubuf = (const char __force_user *)buf;
70544
70545 bitmap_zero(maskp, nmaskbits);
70546
70547 @@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
70548 {
70549 if (!access_ok(VERIFY_READ, ubuf, ulen))
70550 return -EFAULT;
70551 - return __bitmap_parse((const char __force *)ubuf,
70552 + return __bitmap_parse((const char __force_kernel *)ubuf,
70553 ulen, 1, maskp, nmaskbits);
70554
70555 }
70556 @@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
70557 {
70558 unsigned a, b;
70559 int c, old_c, totaldigits;
70560 - const char __user __force *ubuf = (const char __user __force *)buf;
70561 + const char __user *ubuf = (const char __force_user *)buf;
70562 int exp_digit, in_range;
70563
70564 totaldigits = c = 0;
70565 @@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
70566 {
70567 if (!access_ok(VERIFY_READ, ubuf, ulen))
70568 return -EFAULT;
70569 - return __bitmap_parselist((const char __force *)ubuf,
70570 + return __bitmap_parselist((const char __force_kernel *)ubuf,
70571 ulen, 1, maskp, nmaskbits);
70572 }
70573 EXPORT_SYMBOL(bitmap_parselist_user);
70574 diff --git a/lib/bug.c b/lib/bug.c
70575 index a28c141..2bd3d95 100644
70576 --- a/lib/bug.c
70577 +++ b/lib/bug.c
70578 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
70579 return BUG_TRAP_TYPE_NONE;
70580
70581 bug = find_bug(bugaddr);
70582 + if (!bug)
70583 + return BUG_TRAP_TYPE_NONE;
70584
70585 file = NULL;
70586 line = 0;
70587 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
70588 index d11808c..dc2d6f8 100644
70589 --- a/lib/debugobjects.c
70590 +++ b/lib/debugobjects.c
70591 @@ -287,7 +287,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
70592 if (limit > 4)
70593 return;
70594
70595 - is_on_stack = object_is_on_stack(addr);
70596 + is_on_stack = object_starts_on_stack(addr);
70597 if (is_on_stack == onstack)
70598 return;
70599
70600 diff --git a/lib/devres.c b/lib/devres.c
70601 index 80b9c76..9e32279 100644
70602 --- a/lib/devres.c
70603 +++ b/lib/devres.c
70604 @@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
70605 void devm_iounmap(struct device *dev, void __iomem *addr)
70606 {
70607 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
70608 - (void *)addr));
70609 + (void __force *)addr));
70610 iounmap(addr);
70611 }
70612 EXPORT_SYMBOL(devm_iounmap);
70613 @@ -192,7 +192,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
70614 {
70615 ioport_unmap(addr);
70616 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70617 - devm_ioport_map_match, (void *)addr));
70618 + devm_ioport_map_match, (void __force *)addr));
70619 }
70620 EXPORT_SYMBOL(devm_ioport_unmap);
70621
70622 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
70623 index 66ce414..6f0a0dd 100644
70624 --- a/lib/dma-debug.c
70625 +++ b/lib/dma-debug.c
70626 @@ -924,7 +924,7 @@ out:
70627
70628 static void check_for_stack(struct device *dev, void *addr)
70629 {
70630 - if (object_is_on_stack(addr))
70631 + if (object_starts_on_stack(addr))
70632 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70633 "stack [addr=%p]\n", addr);
70634 }
70635 diff --git a/lib/inflate.c b/lib/inflate.c
70636 index 013a761..c28f3fc 100644
70637 --- a/lib/inflate.c
70638 +++ b/lib/inflate.c
70639 @@ -269,7 +269,7 @@ static void free(void *where)
70640 malloc_ptr = free_mem_ptr;
70641 }
70642 #else
70643 -#define malloc(a) kmalloc(a, GFP_KERNEL)
70644 +#define malloc(a) kmalloc((a), GFP_KERNEL)
70645 #define free(a) kfree(a)
70646 #endif
70647
70648 diff --git a/lib/ioremap.c b/lib/ioremap.c
70649 index 0c9216c..863bd89 100644
70650 --- a/lib/ioremap.c
70651 +++ b/lib/ioremap.c
70652 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
70653 unsigned long next;
70654
70655 phys_addr -= addr;
70656 - pmd = pmd_alloc(&init_mm, pud, addr);
70657 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
70658 if (!pmd)
70659 return -ENOMEM;
70660 do {
70661 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
70662 unsigned long next;
70663
70664 phys_addr -= addr;
70665 - pud = pud_alloc(&init_mm, pgd, addr);
70666 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
70667 if (!pud)
70668 return -ENOMEM;
70669 do {
70670 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
70671 index bd2bea9..6b3c95e 100644
70672 --- a/lib/is_single_threaded.c
70673 +++ b/lib/is_single_threaded.c
70674 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
70675 struct task_struct *p, *t;
70676 bool ret;
70677
70678 + if (!mm)
70679 + return true;
70680 +
70681 if (atomic_read(&task->signal->live) != 1)
70682 return false;
70683
70684 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
70685 index e796429..6e38f9f 100644
70686 --- a/lib/radix-tree.c
70687 +++ b/lib/radix-tree.c
70688 @@ -92,7 +92,7 @@ struct radix_tree_preload {
70689 int nr;
70690 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
70691 };
70692 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70693 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70694
70695 static inline void *ptr_to_indirect(void *ptr)
70696 {
70697 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
70698 index 598a73e..5c5aeb5 100644
70699 --- a/lib/vsprintf.c
70700 +++ b/lib/vsprintf.c
70701 @@ -16,6 +16,9 @@
70702 * - scnprintf and vscnprintf
70703 */
70704
70705 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70706 +#define __INCLUDED_BY_HIDESYM 1
70707 +#endif
70708 #include <stdarg.h>
70709 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
70710 #include <linux/types.h>
70711 @@ -536,7 +539,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
70712 char sym[KSYM_SYMBOL_LEN];
70713 if (ext == 'B')
70714 sprint_backtrace(sym, value);
70715 - else if (ext != 'f' && ext != 's')
70716 + else if (ext != 'f' && ext != 's' && ext != 'a')
70717 sprint_symbol(sym, value);
70718 else
70719 sprint_symbol_no_offset(sym, value);
70720 @@ -912,7 +915,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
70721 return number(buf, end, *(const netdev_features_t *)addr, spec);
70722 }
70723
70724 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70725 +int kptr_restrict __read_mostly = 2;
70726 +#else
70727 int kptr_restrict __read_mostly;
70728 +#endif
70729
70730 /*
70731 * Show a '%p' thing. A kernel extension is that the '%p' is followed
70732 @@ -926,6 +933,8 @@ int kptr_restrict __read_mostly;
70733 * - 'S' For symbolic direct pointers with offset
70734 * - 's' For symbolic direct pointers without offset
70735 * - 'B' For backtraced symbolic direct pointers with offset
70736 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70737 + * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70738 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
70739 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
70740 * - 'M' For a 6-byte MAC address, it prints the address in the
70741 @@ -973,12 +982,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70742
70743 if (!ptr && *fmt != 'K') {
70744 /*
70745 - * Print (null) with the same width as a pointer so it makes
70746 + * Print (nil) with the same width as a pointer so it makes
70747 * tabular output look nice.
70748 */
70749 if (spec.field_width == -1)
70750 spec.field_width = default_width;
70751 - return string(buf, end, "(null)", spec);
70752 + return string(buf, end, "(nil)", spec);
70753 }
70754
70755 switch (*fmt) {
70756 @@ -988,6 +997,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70757 /* Fallthrough */
70758 case 'S':
70759 case 's':
70760 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70761 + break;
70762 +#else
70763 + return symbol_string(buf, end, ptr, spec, *fmt);
70764 +#endif
70765 + case 'A':
70766 + case 'a':
70767 case 'B':
70768 return symbol_string(buf, end, ptr, spec, *fmt);
70769 case 'R':
70770 @@ -1025,6 +1041,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70771 va_end(va);
70772 return buf;
70773 }
70774 + case 'P':
70775 + break;
70776 case 'K':
70777 /*
70778 * %pK cannot be used in IRQ context because its test
70779 @@ -1048,6 +1066,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70780 }
70781 break;
70782 }
70783 +
70784 +#ifdef CONFIG_GRKERNSEC_HIDESYM
70785 + /* 'P' = approved pointers to copy to userland,
70786 + as in the /proc/kallsyms case, as we make it display nothing
70787 + for non-root users, and the real contents for root users
70788 + Also ignore 'K' pointers, since we force their NULLing for non-root users
70789 + above
70790 + */
70791 + if (ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
70792 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
70793 + dump_stack();
70794 + ptr = NULL;
70795 + }
70796 +#endif
70797 +
70798 spec.flags |= SMALL;
70799 if (spec.field_width == -1) {
70800 spec.field_width = default_width;
70801 @@ -1759,11 +1792,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70802 typeof(type) value; \
70803 if (sizeof(type) == 8) { \
70804 args = PTR_ALIGN(args, sizeof(u32)); \
70805 - *(u32 *)&value = *(u32 *)args; \
70806 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70807 + *(u32 *)&value = *(const u32 *)args; \
70808 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70809 } else { \
70810 args = PTR_ALIGN(args, sizeof(type)); \
70811 - value = *(typeof(type) *)args; \
70812 + value = *(const typeof(type) *)args; \
70813 } \
70814 args += sizeof(type); \
70815 value; \
70816 @@ -1826,7 +1859,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70817 case FORMAT_TYPE_STR: {
70818 const char *str_arg = args;
70819 args += strlen(str_arg) + 1;
70820 - str = string(str, end, (char *)str_arg, spec);
70821 + str = string(str, end, str_arg, spec);
70822 break;
70823 }
70824
70825 diff --git a/localversion-grsec b/localversion-grsec
70826 new file mode 100644
70827 index 0000000..7cd6065
70828 --- /dev/null
70829 +++ b/localversion-grsec
70830 @@ -0,0 +1 @@
70831 +-grsec
70832 diff --git a/mm/Kconfig b/mm/Kconfig
70833 index 82fed4e..979e814 100644
70834 --- a/mm/Kconfig
70835 +++ b/mm/Kconfig
70836 @@ -247,10 +247,10 @@ config KSM
70837 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
70838
70839 config DEFAULT_MMAP_MIN_ADDR
70840 - int "Low address space to protect from user allocation"
70841 + int "Low address space to protect from user allocation"
70842 depends on MMU
70843 - default 4096
70844 - help
70845 + default 65536
70846 + help
70847 This is the portion of low virtual memory which should be protected
70848 from userspace allocation. Keeping a user from writing to low pages
70849 can help reduce the impact of kernel NULL pointer bugs.
70850 @@ -280,7 +280,7 @@ config MEMORY_FAILURE
70851
70852 config HWPOISON_INJECT
70853 tristate "HWPoison pages injector"
70854 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
70855 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
70856 select PROC_PAGE_MONITOR
70857
70858 config NOMMU_INITIAL_TRIM_EXCESS
70859 diff --git a/mm/filemap.c b/mm/filemap.c
70860 index a4a5260..6151dc5 100644
70861 --- a/mm/filemap.c
70862 +++ b/mm/filemap.c
70863 @@ -1723,7 +1723,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
70864 struct address_space *mapping = file->f_mapping;
70865
70866 if (!mapping->a_ops->readpage)
70867 - return -ENOEXEC;
70868 + return -ENODEV;
70869 file_accessed(file);
70870 vma->vm_ops = &generic_file_vm_ops;
70871 vma->vm_flags |= VM_CAN_NONLINEAR;
70872 @@ -2064,6 +2064,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
70873 *pos = i_size_read(inode);
70874
70875 if (limit != RLIM_INFINITY) {
70876 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
70877 if (*pos >= limit) {
70878 send_sig(SIGXFSZ, current, 0);
70879 return -EFBIG;
70880 diff --git a/mm/fremap.c b/mm/fremap.c
70881 index 9ed4fd4..c42648d 100644
70882 --- a/mm/fremap.c
70883 +++ b/mm/fremap.c
70884 @@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
70885 retry:
70886 vma = find_vma(mm, start);
70887
70888 +#ifdef CONFIG_PAX_SEGMEXEC
70889 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
70890 + goto out;
70891 +#endif
70892 +
70893 /*
70894 * Make sure the vma is shared, that it supports prefaulting,
70895 * and that the remapped range is valid and fully within
70896 diff --git a/mm/highmem.c b/mm/highmem.c
70897 index 57d82c6..e9e0552 100644
70898 --- a/mm/highmem.c
70899 +++ b/mm/highmem.c
70900 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
70901 * So no dangers, even with speculative execution.
70902 */
70903 page = pte_page(pkmap_page_table[i]);
70904 + pax_open_kernel();
70905 pte_clear(&init_mm, (unsigned long)page_address(page),
70906 &pkmap_page_table[i]);
70907 -
70908 + pax_close_kernel();
70909 set_page_address(page, NULL);
70910 need_flush = 1;
70911 }
70912 @@ -186,9 +187,11 @@ start:
70913 }
70914 }
70915 vaddr = PKMAP_ADDR(last_pkmap_nr);
70916 +
70917 + pax_open_kernel();
70918 set_pte_at(&init_mm, vaddr,
70919 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
70920 -
70921 + pax_close_kernel();
70922 pkmap_count[last_pkmap_nr] = 1;
70923 set_page_address(page, (void *)vaddr);
70924
70925 diff --git a/mm/huge_memory.c b/mm/huge_memory.c
70926 index 57c4b93..24b8f59 100644
70927 --- a/mm/huge_memory.c
70928 +++ b/mm/huge_memory.c
70929 @@ -735,7 +735,7 @@ out:
70930 * run pte_offset_map on the pmd, if an huge pmd could
70931 * materialize from under us from a different thread.
70932 */
70933 - if (unlikely(__pte_alloc(mm, vma, pmd, address)))
70934 + if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
70935 return VM_FAULT_OOM;
70936 /* if an huge pmd materialized from under us just retry later */
70937 if (unlikely(pmd_trans_huge(*pmd)))
70938 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
70939 index 19558df..f7743b3 100644
70940 --- a/mm/hugetlb.c
70941 +++ b/mm/hugetlb.c
70942 @@ -2463,6 +2463,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
70943 return 1;
70944 }
70945
70946 +#ifdef CONFIG_PAX_SEGMEXEC
70947 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
70948 +{
70949 + struct mm_struct *mm = vma->vm_mm;
70950 + struct vm_area_struct *vma_m;
70951 + unsigned long address_m;
70952 + pte_t *ptep_m;
70953 +
70954 + vma_m = pax_find_mirror_vma(vma);
70955 + if (!vma_m)
70956 + return;
70957 +
70958 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70959 + address_m = address + SEGMEXEC_TASK_SIZE;
70960 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
70961 + get_page(page_m);
70962 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
70963 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
70964 +}
70965 +#endif
70966 +
70967 /*
70968 * Hugetlb_cow() should be called with page lock of the original hugepage held.
70969 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
70970 @@ -2575,6 +2596,11 @@ retry_avoidcopy:
70971 make_huge_pte(vma, new_page, 1));
70972 page_remove_rmap(old_page);
70973 hugepage_add_new_anon_rmap(new_page, vma, address);
70974 +
70975 +#ifdef CONFIG_PAX_SEGMEXEC
70976 + pax_mirror_huge_pte(vma, address, new_page);
70977 +#endif
70978 +
70979 /* Make the old page be freed below */
70980 new_page = old_page;
70981 mmu_notifier_invalidate_range_end(mm,
70982 @@ -2729,6 +2755,10 @@ retry:
70983 && (vma->vm_flags & VM_SHARED)));
70984 set_huge_pte_at(mm, address, ptep, new_pte);
70985
70986 +#ifdef CONFIG_PAX_SEGMEXEC
70987 + pax_mirror_huge_pte(vma, address, page);
70988 +#endif
70989 +
70990 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
70991 /* Optimization, do the COW without a second fault */
70992 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
70993 @@ -2758,6 +2788,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70994 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
70995 struct hstate *h = hstate_vma(vma);
70996
70997 +#ifdef CONFIG_PAX_SEGMEXEC
70998 + struct vm_area_struct *vma_m;
70999 +#endif
71000 +
71001 address &= huge_page_mask(h);
71002
71003 ptep = huge_pte_offset(mm, address);
71004 @@ -2771,6 +2805,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71005 VM_FAULT_SET_HINDEX(h - hstates);
71006 }
71007
71008 +#ifdef CONFIG_PAX_SEGMEXEC
71009 + vma_m = pax_find_mirror_vma(vma);
71010 + if (vma_m) {
71011 + unsigned long address_m;
71012 +
71013 + if (vma->vm_start > vma_m->vm_start) {
71014 + address_m = address;
71015 + address -= SEGMEXEC_TASK_SIZE;
71016 + vma = vma_m;
71017 + h = hstate_vma(vma);
71018 + } else
71019 + address_m = address + SEGMEXEC_TASK_SIZE;
71020 +
71021 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
71022 + return VM_FAULT_OOM;
71023 + address_m &= HPAGE_MASK;
71024 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
71025 + }
71026 +#endif
71027 +
71028 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
71029 if (!ptep)
71030 return VM_FAULT_OOM;
71031 diff --git a/mm/internal.h b/mm/internal.h
71032 index 8052379..47029d1 100644
71033 --- a/mm/internal.h
71034 +++ b/mm/internal.h
71035 @@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
71036 * in mm/page_alloc.c
71037 */
71038 extern void __free_pages_bootmem(struct page *page, unsigned int order);
71039 +extern void free_compound_page(struct page *page);
71040 extern void prep_compound_page(struct page *page, unsigned long order);
71041 #ifdef CONFIG_MEMORY_FAILURE
71042 extern bool is_free_buddy_page(struct page *page);
71043 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
71044 index 45eb621..6ccd8ea 100644
71045 --- a/mm/kmemleak.c
71046 +++ b/mm/kmemleak.c
71047 @@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
71048
71049 for (i = 0; i < object->trace_len; i++) {
71050 void *ptr = (void *)object->trace[i];
71051 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
71052 + seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
71053 }
71054 }
71055
71056 diff --git a/mm/maccess.c b/mm/maccess.c
71057 index d53adf9..03a24bf 100644
71058 --- a/mm/maccess.c
71059 +++ b/mm/maccess.c
71060 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
71061 set_fs(KERNEL_DS);
71062 pagefault_disable();
71063 ret = __copy_from_user_inatomic(dst,
71064 - (__force const void __user *)src, size);
71065 + (const void __force_user *)src, size);
71066 pagefault_enable();
71067 set_fs(old_fs);
71068
71069 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
71070
71071 set_fs(KERNEL_DS);
71072 pagefault_disable();
71073 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
71074 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
71075 pagefault_enable();
71076 set_fs(old_fs);
71077
71078 diff --git a/mm/madvise.c b/mm/madvise.c
71079 index 14d260f..b2a80fd 100644
71080 --- a/mm/madvise.c
71081 +++ b/mm/madvise.c
71082 @@ -48,6 +48,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
71083 pgoff_t pgoff;
71084 unsigned long new_flags = vma->vm_flags;
71085
71086 +#ifdef CONFIG_PAX_SEGMEXEC
71087 + struct vm_area_struct *vma_m;
71088 +#endif
71089 +
71090 switch (behavior) {
71091 case MADV_NORMAL:
71092 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
71093 @@ -119,6 +123,13 @@ success:
71094 /*
71095 * vm_flags is protected by the mmap_sem held in write mode.
71096 */
71097 +
71098 +#ifdef CONFIG_PAX_SEGMEXEC
71099 + vma_m = pax_find_mirror_vma(vma);
71100 + if (vma_m)
71101 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
71102 +#endif
71103 +
71104 vma->vm_flags = new_flags;
71105
71106 out:
71107 @@ -177,6 +188,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
71108 struct vm_area_struct ** prev,
71109 unsigned long start, unsigned long end)
71110 {
71111 +
71112 +#ifdef CONFIG_PAX_SEGMEXEC
71113 + struct vm_area_struct *vma_m;
71114 +#endif
71115 +
71116 *prev = vma;
71117 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
71118 return -EINVAL;
71119 @@ -189,6 +205,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
71120 zap_page_range(vma, start, end - start, &details);
71121 } else
71122 zap_page_range(vma, start, end - start, NULL);
71123 +
71124 +#ifdef CONFIG_PAX_SEGMEXEC
71125 + vma_m = pax_find_mirror_vma(vma);
71126 + if (vma_m) {
71127 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
71128 + struct zap_details details = {
71129 + .nonlinear_vma = vma_m,
71130 + .last_index = ULONG_MAX,
71131 + };
71132 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
71133 + } else
71134 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
71135 + }
71136 +#endif
71137 +
71138 return 0;
71139 }
71140
71141 @@ -393,6 +424,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
71142 if (end < start)
71143 goto out;
71144
71145 +#ifdef CONFIG_PAX_SEGMEXEC
71146 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
71147 + if (end > SEGMEXEC_TASK_SIZE)
71148 + goto out;
71149 + } else
71150 +#endif
71151 +
71152 + if (end > TASK_SIZE)
71153 + goto out;
71154 +
71155 error = 0;
71156 if (end == start)
71157 goto out;
71158 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
71159 index 6de0d61..da836cf 100644
71160 --- a/mm/memory-failure.c
71161 +++ b/mm/memory-failure.c
71162 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
71163
71164 int sysctl_memory_failure_recovery __read_mostly = 1;
71165
71166 -atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
71167 +atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
71168
71169 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
71170
71171 @@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
71172 pfn, t->comm, t->pid);
71173 si.si_signo = SIGBUS;
71174 si.si_errno = 0;
71175 - si.si_addr = (void *)addr;
71176 + si.si_addr = (void __user *)addr;
71177 #ifdef __ARCH_SI_TRAPNO
71178 si.si_trapno = trapno;
71179 #endif
71180 @@ -1038,7 +1038,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
71181 }
71182
71183 nr_pages = 1 << compound_trans_order(hpage);
71184 - atomic_long_add(nr_pages, &mce_bad_pages);
71185 + atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
71186
71187 /*
71188 * We need/can do nothing about count=0 pages.
71189 @@ -1068,7 +1068,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
71190 if (!PageHWPoison(hpage)
71191 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
71192 || (p != hpage && TestSetPageHWPoison(hpage))) {
71193 - atomic_long_sub(nr_pages, &mce_bad_pages);
71194 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
71195 return 0;
71196 }
71197 set_page_hwpoison_huge_page(hpage);
71198 @@ -1126,7 +1126,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
71199 }
71200 if (hwpoison_filter(p)) {
71201 if (TestClearPageHWPoison(p))
71202 - atomic_long_sub(nr_pages, &mce_bad_pages);
71203 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
71204 unlock_page(hpage);
71205 put_page(hpage);
71206 return 0;
71207 @@ -1321,7 +1321,7 @@ int unpoison_memory(unsigned long pfn)
71208 return 0;
71209 }
71210 if (TestClearPageHWPoison(p))
71211 - atomic_long_sub(nr_pages, &mce_bad_pages);
71212 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
71213 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
71214 return 0;
71215 }
71216 @@ -1335,7 +1335,7 @@ int unpoison_memory(unsigned long pfn)
71217 */
71218 if (TestClearPageHWPoison(page)) {
71219 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
71220 - atomic_long_sub(nr_pages, &mce_bad_pages);
71221 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
71222 freeit = 1;
71223 if (PageHuge(page))
71224 clear_page_hwpoison_huge_page(page);
71225 @@ -1448,7 +1448,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
71226 }
71227 done:
71228 if (!PageHWPoison(hpage))
71229 - atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
71230 + atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
71231 set_page_hwpoison_huge_page(hpage);
71232 dequeue_hwpoisoned_huge_page(hpage);
71233 /* keep elevated page count for bad page */
71234 @@ -1579,7 +1579,7 @@ int soft_offline_page(struct page *page, int flags)
71235 return ret;
71236
71237 done:
71238 - atomic_long_add(1, &mce_bad_pages);
71239 + atomic_long_add_unchecked(1, &mce_bad_pages);
71240 SetPageHWPoison(page);
71241 /* keep elevated page count for bad page */
71242 return ret;
71243 diff --git a/mm/memory.c b/mm/memory.c
71244 index 2466d12..08be4f6 100644
71245 --- a/mm/memory.c
71246 +++ b/mm/memory.c
71247 @@ -434,8 +434,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
71248 return;
71249
71250 pmd = pmd_offset(pud, start);
71251 +
71252 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
71253 pud_clear(pud);
71254 pmd_free_tlb(tlb, pmd, start);
71255 +#endif
71256 +
71257 }
71258
71259 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71260 @@ -466,9 +470,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
71261 if (end - 1 > ceiling - 1)
71262 return;
71263
71264 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
71265 pud = pud_offset(pgd, start);
71266 pgd_clear(pgd);
71267 pud_free_tlb(tlb, pud, start);
71268 +#endif
71269 +
71270 }
71271
71272 /*
71273 @@ -1602,12 +1609,6 @@ no_page_table:
71274 return page;
71275 }
71276
71277 -static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
71278 -{
71279 - return stack_guard_page_start(vma, addr) ||
71280 - stack_guard_page_end(vma, addr+PAGE_SIZE);
71281 -}
71282 -
71283 /**
71284 * __get_user_pages() - pin user pages in memory
71285 * @tsk: task_struct of target task
71286 @@ -1680,10 +1681,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71287 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
71288 i = 0;
71289
71290 - do {
71291 + while (nr_pages) {
71292 struct vm_area_struct *vma;
71293
71294 - vma = find_extend_vma(mm, start);
71295 + vma = find_vma(mm, start);
71296 if (!vma && in_gate_area(mm, start)) {
71297 unsigned long pg = start & PAGE_MASK;
71298 pgd_t *pgd;
71299 @@ -1731,7 +1732,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71300 goto next_page;
71301 }
71302
71303 - if (!vma ||
71304 + if (!vma || start < vma->vm_start ||
71305 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
71306 !(vm_flags & vma->vm_flags))
71307 return i ? : -EFAULT;
71308 @@ -1758,11 +1759,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
71309 int ret;
71310 unsigned int fault_flags = 0;
71311
71312 - /* For mlock, just skip the stack guard page. */
71313 - if (foll_flags & FOLL_MLOCK) {
71314 - if (stack_guard_page(vma, start))
71315 - goto next_page;
71316 - }
71317 if (foll_flags & FOLL_WRITE)
71318 fault_flags |= FAULT_FLAG_WRITE;
71319 if (nonblocking)
71320 @@ -1836,7 +1832,7 @@ next_page:
71321 start += PAGE_SIZE;
71322 nr_pages--;
71323 } while (nr_pages && start < vma->vm_end);
71324 - } while (nr_pages);
71325 + }
71326 return i;
71327 }
71328 EXPORT_SYMBOL(__get_user_pages);
71329 @@ -2043,6 +2039,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
71330 page_add_file_rmap(page);
71331 set_pte_at(mm, addr, pte, mk_pte(page, prot));
71332
71333 +#ifdef CONFIG_PAX_SEGMEXEC
71334 + pax_mirror_file_pte(vma, addr, page, ptl);
71335 +#endif
71336 +
71337 retval = 0;
71338 pte_unmap_unlock(pte, ptl);
71339 return retval;
71340 @@ -2077,10 +2077,22 @@ out:
71341 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
71342 struct page *page)
71343 {
71344 +
71345 +#ifdef CONFIG_PAX_SEGMEXEC
71346 + struct vm_area_struct *vma_m;
71347 +#endif
71348 +
71349 if (addr < vma->vm_start || addr >= vma->vm_end)
71350 return -EFAULT;
71351 if (!page_count(page))
71352 return -EINVAL;
71353 +
71354 +#ifdef CONFIG_PAX_SEGMEXEC
71355 + vma_m = pax_find_mirror_vma(vma);
71356 + if (vma_m)
71357 + vma_m->vm_flags |= VM_INSERTPAGE;
71358 +#endif
71359 +
71360 vma->vm_flags |= VM_INSERTPAGE;
71361 return insert_page(vma, addr, page, vma->vm_page_prot);
71362 }
71363 @@ -2166,6 +2178,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
71364 unsigned long pfn)
71365 {
71366 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
71367 + BUG_ON(vma->vm_mirror);
71368
71369 if (addr < vma->vm_start || addr >= vma->vm_end)
71370 return -EFAULT;
71371 @@ -2373,7 +2386,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
71372
71373 BUG_ON(pud_huge(*pud));
71374
71375 - pmd = pmd_alloc(mm, pud, addr);
71376 + pmd = (mm == &init_mm) ?
71377 + pmd_alloc_kernel(mm, pud, addr) :
71378 + pmd_alloc(mm, pud, addr);
71379 if (!pmd)
71380 return -ENOMEM;
71381 do {
71382 @@ -2393,7 +2408,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
71383 unsigned long next;
71384 int err;
71385
71386 - pud = pud_alloc(mm, pgd, addr);
71387 + pud = (mm == &init_mm) ?
71388 + pud_alloc_kernel(mm, pgd, addr) :
71389 + pud_alloc(mm, pgd, addr);
71390 if (!pud)
71391 return -ENOMEM;
71392 do {
71393 @@ -2481,6 +2498,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
71394 copy_user_highpage(dst, src, va, vma);
71395 }
71396
71397 +#ifdef CONFIG_PAX_SEGMEXEC
71398 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
71399 +{
71400 + struct mm_struct *mm = vma->vm_mm;
71401 + spinlock_t *ptl;
71402 + pte_t *pte, entry;
71403 +
71404 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
71405 + entry = *pte;
71406 + if (!pte_present(entry)) {
71407 + if (!pte_none(entry)) {
71408 + BUG_ON(pte_file(entry));
71409 + free_swap_and_cache(pte_to_swp_entry(entry));
71410 + pte_clear_not_present_full(mm, address, pte, 0);
71411 + }
71412 + } else {
71413 + struct page *page;
71414 +
71415 + flush_cache_page(vma, address, pte_pfn(entry));
71416 + entry = ptep_clear_flush(vma, address, pte);
71417 + BUG_ON(pte_dirty(entry));
71418 + page = vm_normal_page(vma, address, entry);
71419 + if (page) {
71420 + update_hiwater_rss(mm);
71421 + if (PageAnon(page))
71422 + dec_mm_counter_fast(mm, MM_ANONPAGES);
71423 + else
71424 + dec_mm_counter_fast(mm, MM_FILEPAGES);
71425 + page_remove_rmap(page);
71426 + page_cache_release(page);
71427 + }
71428 + }
71429 + pte_unmap_unlock(pte, ptl);
71430 +}
71431 +
71432 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
71433 + *
71434 + * the ptl of the lower mapped page is held on entry and is not released on exit
71435 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
71436 + */
71437 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71438 +{
71439 + struct mm_struct *mm = vma->vm_mm;
71440 + unsigned long address_m;
71441 + spinlock_t *ptl_m;
71442 + struct vm_area_struct *vma_m;
71443 + pmd_t *pmd_m;
71444 + pte_t *pte_m, entry_m;
71445 +
71446 + BUG_ON(!page_m || !PageAnon(page_m));
71447 +
71448 + vma_m = pax_find_mirror_vma(vma);
71449 + if (!vma_m)
71450 + return;
71451 +
71452 + BUG_ON(!PageLocked(page_m));
71453 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71454 + address_m = address + SEGMEXEC_TASK_SIZE;
71455 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71456 + pte_m = pte_offset_map(pmd_m, address_m);
71457 + ptl_m = pte_lockptr(mm, pmd_m);
71458 + if (ptl != ptl_m) {
71459 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71460 + if (!pte_none(*pte_m))
71461 + goto out;
71462 + }
71463 +
71464 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71465 + page_cache_get(page_m);
71466 + page_add_anon_rmap(page_m, vma_m, address_m);
71467 + inc_mm_counter_fast(mm, MM_ANONPAGES);
71468 + set_pte_at(mm, address_m, pte_m, entry_m);
71469 + update_mmu_cache(vma_m, address_m, entry_m);
71470 +out:
71471 + if (ptl != ptl_m)
71472 + spin_unlock(ptl_m);
71473 + pte_unmap(pte_m);
71474 + unlock_page(page_m);
71475 +}
71476 +
71477 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71478 +{
71479 + struct mm_struct *mm = vma->vm_mm;
71480 + unsigned long address_m;
71481 + spinlock_t *ptl_m;
71482 + struct vm_area_struct *vma_m;
71483 + pmd_t *pmd_m;
71484 + pte_t *pte_m, entry_m;
71485 +
71486 + BUG_ON(!page_m || PageAnon(page_m));
71487 +
71488 + vma_m = pax_find_mirror_vma(vma);
71489 + if (!vma_m)
71490 + return;
71491 +
71492 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71493 + address_m = address + SEGMEXEC_TASK_SIZE;
71494 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71495 + pte_m = pte_offset_map(pmd_m, address_m);
71496 + ptl_m = pte_lockptr(mm, pmd_m);
71497 + if (ptl != ptl_m) {
71498 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71499 + if (!pte_none(*pte_m))
71500 + goto out;
71501 + }
71502 +
71503 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71504 + page_cache_get(page_m);
71505 + page_add_file_rmap(page_m);
71506 + inc_mm_counter_fast(mm, MM_FILEPAGES);
71507 + set_pte_at(mm, address_m, pte_m, entry_m);
71508 + update_mmu_cache(vma_m, address_m, entry_m);
71509 +out:
71510 + if (ptl != ptl_m)
71511 + spin_unlock(ptl_m);
71512 + pte_unmap(pte_m);
71513 +}
71514 +
71515 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
71516 +{
71517 + struct mm_struct *mm = vma->vm_mm;
71518 + unsigned long address_m;
71519 + spinlock_t *ptl_m;
71520 + struct vm_area_struct *vma_m;
71521 + pmd_t *pmd_m;
71522 + pte_t *pte_m, entry_m;
71523 +
71524 + vma_m = pax_find_mirror_vma(vma);
71525 + if (!vma_m)
71526 + return;
71527 +
71528 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71529 + address_m = address + SEGMEXEC_TASK_SIZE;
71530 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71531 + pte_m = pte_offset_map(pmd_m, address_m);
71532 + ptl_m = pte_lockptr(mm, pmd_m);
71533 + if (ptl != ptl_m) {
71534 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71535 + if (!pte_none(*pte_m))
71536 + goto out;
71537 + }
71538 +
71539 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
71540 + set_pte_at(mm, address_m, pte_m, entry_m);
71541 +out:
71542 + if (ptl != ptl_m)
71543 + spin_unlock(ptl_m);
71544 + pte_unmap(pte_m);
71545 +}
71546 +
71547 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
71548 +{
71549 + struct page *page_m;
71550 + pte_t entry;
71551 +
71552 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
71553 + goto out;
71554 +
71555 + entry = *pte;
71556 + page_m = vm_normal_page(vma, address, entry);
71557 + if (!page_m)
71558 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
71559 + else if (PageAnon(page_m)) {
71560 + if (pax_find_mirror_vma(vma)) {
71561 + pte_unmap_unlock(pte, ptl);
71562 + lock_page(page_m);
71563 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
71564 + if (pte_same(entry, *pte))
71565 + pax_mirror_anon_pte(vma, address, page_m, ptl);
71566 + else
71567 + unlock_page(page_m);
71568 + }
71569 + } else
71570 + pax_mirror_file_pte(vma, address, page_m, ptl);
71571 +
71572 +out:
71573 + pte_unmap_unlock(pte, ptl);
71574 +}
71575 +#endif
71576 +
71577 /*
71578 * This routine handles present pages, when users try to write
71579 * to a shared page. It is done by copying the page to a new address
71580 @@ -2692,6 +2889,12 @@ gotten:
71581 */
71582 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71583 if (likely(pte_same(*page_table, orig_pte))) {
71584 +
71585 +#ifdef CONFIG_PAX_SEGMEXEC
71586 + if (pax_find_mirror_vma(vma))
71587 + BUG_ON(!trylock_page(new_page));
71588 +#endif
71589 +
71590 if (old_page) {
71591 if (!PageAnon(old_page)) {
71592 dec_mm_counter_fast(mm, MM_FILEPAGES);
71593 @@ -2743,6 +2946,10 @@ gotten:
71594 page_remove_rmap(old_page);
71595 }
71596
71597 +#ifdef CONFIG_PAX_SEGMEXEC
71598 + pax_mirror_anon_pte(vma, address, new_page, ptl);
71599 +#endif
71600 +
71601 /* Free the old page.. */
71602 new_page = old_page;
71603 ret |= VM_FAULT_WRITE;
71604 @@ -3022,6 +3229,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71605 swap_free(entry);
71606 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
71607 try_to_free_swap(page);
71608 +
71609 +#ifdef CONFIG_PAX_SEGMEXEC
71610 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
71611 +#endif
71612 +
71613 unlock_page(page);
71614 if (swapcache) {
71615 /*
71616 @@ -3045,6 +3257,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71617
71618 /* No need to invalidate - it was non-present before */
71619 update_mmu_cache(vma, address, page_table);
71620 +
71621 +#ifdef CONFIG_PAX_SEGMEXEC
71622 + pax_mirror_anon_pte(vma, address, page, ptl);
71623 +#endif
71624 +
71625 unlock:
71626 pte_unmap_unlock(page_table, ptl);
71627 out:
71628 @@ -3064,40 +3281,6 @@ out_release:
71629 }
71630
71631 /*
71632 - * This is like a special single-page "expand_{down|up}wards()",
71633 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
71634 - * doesn't hit another vma.
71635 - */
71636 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
71637 -{
71638 - address &= PAGE_MASK;
71639 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
71640 - struct vm_area_struct *prev = vma->vm_prev;
71641 -
71642 - /*
71643 - * Is there a mapping abutting this one below?
71644 - *
71645 - * That's only ok if it's the same stack mapping
71646 - * that has gotten split..
71647 - */
71648 - if (prev && prev->vm_end == address)
71649 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
71650 -
71651 - expand_downwards(vma, address - PAGE_SIZE);
71652 - }
71653 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
71654 - struct vm_area_struct *next = vma->vm_next;
71655 -
71656 - /* As VM_GROWSDOWN but s/below/above/ */
71657 - if (next && next->vm_start == address + PAGE_SIZE)
71658 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
71659 -
71660 - expand_upwards(vma, address + PAGE_SIZE);
71661 - }
71662 - return 0;
71663 -}
71664 -
71665 -/*
71666 * We enter with non-exclusive mmap_sem (to exclude vma changes,
71667 * but allow concurrent faults), and pte mapped but not yet locked.
71668 * We return with mmap_sem still held, but pte unmapped and unlocked.
71669 @@ -3106,27 +3289,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71670 unsigned long address, pte_t *page_table, pmd_t *pmd,
71671 unsigned int flags)
71672 {
71673 - struct page *page;
71674 + struct page *page = NULL;
71675 spinlock_t *ptl;
71676 pte_t entry;
71677
71678 - pte_unmap(page_table);
71679 -
71680 - /* Check if we need to add a guard page to the stack */
71681 - if (check_stack_guard_page(vma, address) < 0)
71682 - return VM_FAULT_SIGBUS;
71683 -
71684 - /* Use the zero-page for reads */
71685 if (!(flags & FAULT_FLAG_WRITE)) {
71686 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71687 vma->vm_page_prot));
71688 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71689 + ptl = pte_lockptr(mm, pmd);
71690 + spin_lock(ptl);
71691 if (!pte_none(*page_table))
71692 goto unlock;
71693 goto setpte;
71694 }
71695
71696 /* Allocate our own private page. */
71697 + pte_unmap(page_table);
71698 +
71699 if (unlikely(anon_vma_prepare(vma)))
71700 goto oom;
71701 page = alloc_zeroed_user_highpage_movable(vma, address);
71702 @@ -3145,6 +3324,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71703 if (!pte_none(*page_table))
71704 goto release;
71705
71706 +#ifdef CONFIG_PAX_SEGMEXEC
71707 + if (pax_find_mirror_vma(vma))
71708 + BUG_ON(!trylock_page(page));
71709 +#endif
71710 +
71711 inc_mm_counter_fast(mm, MM_ANONPAGES);
71712 page_add_new_anon_rmap(page, vma, address);
71713 setpte:
71714 @@ -3152,6 +3336,12 @@ setpte:
71715
71716 /* No need to invalidate - it was non-present before */
71717 update_mmu_cache(vma, address, page_table);
71718 +
71719 +#ifdef CONFIG_PAX_SEGMEXEC
71720 + if (page)
71721 + pax_mirror_anon_pte(vma, address, page, ptl);
71722 +#endif
71723 +
71724 unlock:
71725 pte_unmap_unlock(page_table, ptl);
71726 return 0;
71727 @@ -3295,6 +3485,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71728 */
71729 /* Only go through if we didn't race with anybody else... */
71730 if (likely(pte_same(*page_table, orig_pte))) {
71731 +
71732 +#ifdef CONFIG_PAX_SEGMEXEC
71733 + if (anon && pax_find_mirror_vma(vma))
71734 + BUG_ON(!trylock_page(page));
71735 +#endif
71736 +
71737 flush_icache_page(vma, page);
71738 entry = mk_pte(page, vma->vm_page_prot);
71739 if (flags & FAULT_FLAG_WRITE)
71740 @@ -3314,6 +3510,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71741
71742 /* no need to invalidate: a not-present page won't be cached */
71743 update_mmu_cache(vma, address, page_table);
71744 +
71745 +#ifdef CONFIG_PAX_SEGMEXEC
71746 + if (anon)
71747 + pax_mirror_anon_pte(vma, address, page, ptl);
71748 + else
71749 + pax_mirror_file_pte(vma, address, page, ptl);
71750 +#endif
71751 +
71752 } else {
71753 if (cow_page)
71754 mem_cgroup_uncharge_page(cow_page);
71755 @@ -3467,6 +3671,12 @@ int handle_pte_fault(struct mm_struct *mm,
71756 if (flags & FAULT_FLAG_WRITE)
71757 flush_tlb_fix_spurious_fault(vma, address);
71758 }
71759 +
71760 +#ifdef CONFIG_PAX_SEGMEXEC
71761 + pax_mirror_pte(vma, address, pte, pmd, ptl);
71762 + return 0;
71763 +#endif
71764 +
71765 unlock:
71766 pte_unmap_unlock(pte, ptl);
71767 return 0;
71768 @@ -3483,6 +3693,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71769 pmd_t *pmd;
71770 pte_t *pte;
71771
71772 +#ifdef CONFIG_PAX_SEGMEXEC
71773 + struct vm_area_struct *vma_m;
71774 +#endif
71775 +
71776 __set_current_state(TASK_RUNNING);
71777
71778 count_vm_event(PGFAULT);
71779 @@ -3494,6 +3708,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71780 if (unlikely(is_vm_hugetlb_page(vma)))
71781 return hugetlb_fault(mm, vma, address, flags);
71782
71783 +#ifdef CONFIG_PAX_SEGMEXEC
71784 + vma_m = pax_find_mirror_vma(vma);
71785 + if (vma_m) {
71786 + unsigned long address_m;
71787 + pgd_t *pgd_m;
71788 + pud_t *pud_m;
71789 + pmd_t *pmd_m;
71790 +
71791 + if (vma->vm_start > vma_m->vm_start) {
71792 + address_m = address;
71793 + address -= SEGMEXEC_TASK_SIZE;
71794 + vma = vma_m;
71795 + } else
71796 + address_m = address + SEGMEXEC_TASK_SIZE;
71797 +
71798 + pgd_m = pgd_offset(mm, address_m);
71799 + pud_m = pud_alloc(mm, pgd_m, address_m);
71800 + if (!pud_m)
71801 + return VM_FAULT_OOM;
71802 + pmd_m = pmd_alloc(mm, pud_m, address_m);
71803 + if (!pmd_m)
71804 + return VM_FAULT_OOM;
71805 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
71806 + return VM_FAULT_OOM;
71807 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71808 + }
71809 +#endif
71810 +
71811 retry:
71812 pgd = pgd_offset(mm, address);
71813 pud = pud_alloc(mm, pgd, address);
71814 @@ -3535,7 +3777,7 @@ retry:
71815 * run pte_offset_map on the pmd, if an huge pmd could
71816 * materialize from under us from a different thread.
71817 */
71818 - if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
71819 + if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
71820 return VM_FAULT_OOM;
71821 /* if an huge pmd materialized from under us just retry later */
71822 if (unlikely(pmd_trans_huge(*pmd)))
71823 @@ -3572,6 +3814,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
71824 spin_unlock(&mm->page_table_lock);
71825 return 0;
71826 }
71827 +
71828 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
71829 +{
71830 + pud_t *new = pud_alloc_one(mm, address);
71831 + if (!new)
71832 + return -ENOMEM;
71833 +
71834 + smp_wmb(); /* See comment in __pte_alloc */
71835 +
71836 + spin_lock(&mm->page_table_lock);
71837 + if (pgd_present(*pgd)) /* Another has populated it */
71838 + pud_free(mm, new);
71839 + else
71840 + pgd_populate_kernel(mm, pgd, new);
71841 + spin_unlock(&mm->page_table_lock);
71842 + return 0;
71843 +}
71844 #endif /* __PAGETABLE_PUD_FOLDED */
71845
71846 #ifndef __PAGETABLE_PMD_FOLDED
71847 @@ -3602,6 +3861,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
71848 spin_unlock(&mm->page_table_lock);
71849 return 0;
71850 }
71851 +
71852 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
71853 +{
71854 + pmd_t *new = pmd_alloc_one(mm, address);
71855 + if (!new)
71856 + return -ENOMEM;
71857 +
71858 + smp_wmb(); /* See comment in __pte_alloc */
71859 +
71860 + spin_lock(&mm->page_table_lock);
71861 +#ifndef __ARCH_HAS_4LEVEL_HACK
71862 + if (pud_present(*pud)) /* Another has populated it */
71863 + pmd_free(mm, new);
71864 + else
71865 + pud_populate_kernel(mm, pud, new);
71866 +#else
71867 + if (pgd_present(*pud)) /* Another has populated it */
71868 + pmd_free(mm, new);
71869 + else
71870 + pgd_populate_kernel(mm, pud, new);
71871 +#endif /* __ARCH_HAS_4LEVEL_HACK */
71872 + spin_unlock(&mm->page_table_lock);
71873 + return 0;
71874 +}
71875 #endif /* __PAGETABLE_PMD_FOLDED */
71876
71877 int make_pages_present(unsigned long addr, unsigned long end)
71878 @@ -3639,7 +3922,7 @@ static int __init gate_vma_init(void)
71879 gate_vma.vm_start = FIXADDR_USER_START;
71880 gate_vma.vm_end = FIXADDR_USER_END;
71881 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
71882 - gate_vma.vm_page_prot = __P101;
71883 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
71884
71885 return 0;
71886 }
71887 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
71888 index 1d771e4..f9a6808 100644
71889 --- a/mm/mempolicy.c
71890 +++ b/mm/mempolicy.c
71891 @@ -619,6 +619,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71892 unsigned long vmstart;
71893 unsigned long vmend;
71894
71895 +#ifdef CONFIG_PAX_SEGMEXEC
71896 + struct vm_area_struct *vma_m;
71897 +#endif
71898 +
71899 vma = find_vma(mm, start);
71900 if (!vma || vma->vm_start > start)
71901 return -EFAULT;
71902 @@ -672,6 +676,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71903 if (err)
71904 goto out;
71905 }
71906 +
71907 +#ifdef CONFIG_PAX_SEGMEXEC
71908 + vma_m = pax_find_mirror_vma(vma);
71909 + if (vma_m && vma_m->vm_ops && vma_m->vm_ops->set_policy) {
71910 + err = vma_m->vm_ops->set_policy(vma_m, new_pol);
71911 + if (err)
71912 + goto out;
71913 + }
71914 +#endif
71915 +
71916 }
71917
71918 out:
71919 @@ -1125,6 +1139,17 @@ static long do_mbind(unsigned long start, unsigned long len,
71920
71921 if (end < start)
71922 return -EINVAL;
71923 +
71924 +#ifdef CONFIG_PAX_SEGMEXEC
71925 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
71926 + if (end > SEGMEXEC_TASK_SIZE)
71927 + return -EINVAL;
71928 + } else
71929 +#endif
71930 +
71931 + if (end > TASK_SIZE)
71932 + return -EINVAL;
71933 +
71934 if (end == start)
71935 return 0;
71936
71937 @@ -1348,8 +1373,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71938 */
71939 tcred = __task_cred(task);
71940 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
71941 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
71942 - !capable(CAP_SYS_NICE)) {
71943 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
71944 rcu_read_unlock();
71945 err = -EPERM;
71946 goto out_put;
71947 @@ -1380,6 +1404,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71948 goto out;
71949 }
71950
71951 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71952 + if (mm != current->mm &&
71953 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71954 + mmput(mm);
71955 + err = -EPERM;
71956 + goto out;
71957 + }
71958 +#endif
71959 +
71960 err = do_migrate_pages(mm, old, new,
71961 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
71962
71963 diff --git a/mm/mlock.c b/mm/mlock.c
71964 index ef726e8..cd7f1ec 100644
71965 --- a/mm/mlock.c
71966 +++ b/mm/mlock.c
71967 @@ -13,6 +13,7 @@
71968 #include <linux/pagemap.h>
71969 #include <linux/mempolicy.h>
71970 #include <linux/syscalls.h>
71971 +#include <linux/security.h>
71972 #include <linux/sched.h>
71973 #include <linux/export.h>
71974 #include <linux/rmap.h>
71975 @@ -376,7 +377,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
71976 {
71977 unsigned long nstart, end, tmp;
71978 struct vm_area_struct * vma, * prev;
71979 - int error;
71980 + int error = 0;
71981
71982 VM_BUG_ON(start & ~PAGE_MASK);
71983 VM_BUG_ON(len != PAGE_ALIGN(len));
71984 @@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
71985 return -EINVAL;
71986 if (end == start)
71987 return 0;
71988 + if (end > TASK_SIZE)
71989 + return -EINVAL;
71990 +
71991 vma = find_vma(current->mm, start);
71992 if (!vma || vma->vm_start > start)
71993 return -ENOMEM;
71994 @@ -396,6 +400,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
71995 for (nstart = start ; ; ) {
71996 vm_flags_t newflags;
71997
71998 +#ifdef CONFIG_PAX_SEGMEXEC
71999 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
72000 + break;
72001 +#endif
72002 +
72003 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
72004
72005 newflags = vma->vm_flags | VM_LOCKED;
72006 @@ -501,6 +510,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
72007 lock_limit >>= PAGE_SHIFT;
72008
72009 /* check against resource limits */
72010 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
72011 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
72012 error = do_mlock(start, len, 1);
72013 up_write(&current->mm->mmap_sem);
72014 @@ -524,17 +534,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
72015 static int do_mlockall(int flags)
72016 {
72017 struct vm_area_struct * vma, * prev = NULL;
72018 - unsigned int def_flags = 0;
72019
72020 if (flags & MCL_FUTURE)
72021 - def_flags = VM_LOCKED;
72022 - current->mm->def_flags = def_flags;
72023 + current->mm->def_flags |= VM_LOCKED;
72024 + else
72025 + current->mm->def_flags &= ~VM_LOCKED;
72026 if (flags == MCL_FUTURE)
72027 goto out;
72028
72029 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
72030 vm_flags_t newflags;
72031
72032 +#ifdef CONFIG_PAX_SEGMEXEC
72033 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
72034 + break;
72035 +#endif
72036 +
72037 + BUG_ON(vma->vm_end > TASK_SIZE);
72038 newflags = vma->vm_flags | VM_LOCKED;
72039 if (!(flags & MCL_CURRENT))
72040 newflags &= ~VM_LOCKED;
72041 @@ -567,6 +583,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
72042 lock_limit >>= PAGE_SHIFT;
72043
72044 ret = -ENOMEM;
72045 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
72046 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
72047 capable(CAP_IPC_LOCK))
72048 ret = do_mlockall(flags);
72049 diff --git a/mm/mmap.c b/mm/mmap.c
72050 index 3edfcdf..4a27ae9 100644
72051 --- a/mm/mmap.c
72052 +++ b/mm/mmap.c
72053 @@ -47,6 +47,16 @@
72054 #define arch_rebalance_pgtables(addr, len) (addr)
72055 #endif
72056
72057 +static inline void verify_mm_writelocked(struct mm_struct *mm)
72058 +{
72059 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
72060 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72061 + up_read(&mm->mmap_sem);
72062 + BUG();
72063 + }
72064 +#endif
72065 +}
72066 +
72067 static void unmap_region(struct mm_struct *mm,
72068 struct vm_area_struct *vma, struct vm_area_struct *prev,
72069 unsigned long start, unsigned long end);
72070 @@ -72,22 +82,32 @@ static void unmap_region(struct mm_struct *mm,
72071 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
72072 *
72073 */
72074 -pgprot_t protection_map[16] = {
72075 +pgprot_t protection_map[16] __read_only = {
72076 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
72077 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
72078 };
72079
72080 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
72081 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
72082 {
72083 - return __pgprot(pgprot_val(protection_map[vm_flags &
72084 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
72085 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
72086 pgprot_val(arch_vm_get_page_prot(vm_flags)));
72087 +
72088 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72089 + if (!(__supported_pte_mask & _PAGE_NX) &&
72090 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
72091 + (vm_flags & (VM_READ | VM_WRITE)))
72092 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
72093 +#endif
72094 +
72095 + return prot;
72096 }
72097 EXPORT_SYMBOL(vm_get_page_prot);
72098
72099 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
72100 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
72101 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
72102 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
72103 /*
72104 * Make sure vm_committed_as in one cacheline and not cacheline shared with
72105 * other variables. It can be updated by several CPUs frequently.
72106 @@ -229,6 +249,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
72107 struct vm_area_struct *next = vma->vm_next;
72108
72109 might_sleep();
72110 + BUG_ON(vma->vm_mirror);
72111 if (vma->vm_ops && vma->vm_ops->close)
72112 vma->vm_ops->close(vma);
72113 if (vma->vm_file) {
72114 @@ -275,6 +296,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
72115 * not page aligned -Ram Gupta
72116 */
72117 rlim = rlimit(RLIMIT_DATA);
72118 + gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
72119 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
72120 (mm->end_data - mm->start_data) > rlim)
72121 goto out;
72122 @@ -708,6 +730,12 @@ static int
72123 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
72124 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
72125 {
72126 +
72127 +#ifdef CONFIG_PAX_SEGMEXEC
72128 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
72129 + return 0;
72130 +#endif
72131 +
72132 if (is_mergeable_vma(vma, file, vm_flags) &&
72133 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
72134 if (vma->vm_pgoff == vm_pgoff)
72135 @@ -727,6 +755,12 @@ static int
72136 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
72137 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
72138 {
72139 +
72140 +#ifdef CONFIG_PAX_SEGMEXEC
72141 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
72142 + return 0;
72143 +#endif
72144 +
72145 if (is_mergeable_vma(vma, file, vm_flags) &&
72146 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
72147 pgoff_t vm_pglen;
72148 @@ -769,13 +803,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
72149 struct vm_area_struct *vma_merge(struct mm_struct *mm,
72150 struct vm_area_struct *prev, unsigned long addr,
72151 unsigned long end, unsigned long vm_flags,
72152 - struct anon_vma *anon_vma, struct file *file,
72153 + struct anon_vma *anon_vma, struct file *file,
72154 pgoff_t pgoff, struct mempolicy *policy)
72155 {
72156 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
72157 struct vm_area_struct *area, *next;
72158 int err;
72159
72160 +#ifdef CONFIG_PAX_SEGMEXEC
72161 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
72162 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
72163 +
72164 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
72165 +#endif
72166 +
72167 /*
72168 * We later require that vma->vm_flags == vm_flags,
72169 * so this tests vma->vm_flags & VM_SPECIAL, too.
72170 @@ -791,6 +832,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
72171 if (next && next->vm_end == end) /* cases 6, 7, 8 */
72172 next = next->vm_next;
72173
72174 +#ifdef CONFIG_PAX_SEGMEXEC
72175 + if (prev)
72176 + prev_m = pax_find_mirror_vma(prev);
72177 + if (area)
72178 + area_m = pax_find_mirror_vma(area);
72179 + if (next)
72180 + next_m = pax_find_mirror_vma(next);
72181 +#endif
72182 +
72183 /*
72184 * Can it merge with the predecessor?
72185 */
72186 @@ -810,9 +860,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
72187 /* cases 1, 6 */
72188 err = vma_adjust(prev, prev->vm_start,
72189 next->vm_end, prev->vm_pgoff, NULL);
72190 - } else /* cases 2, 5, 7 */
72191 +
72192 +#ifdef CONFIG_PAX_SEGMEXEC
72193 + if (!err && prev_m)
72194 + err = vma_adjust(prev_m, prev_m->vm_start,
72195 + next_m->vm_end, prev_m->vm_pgoff, NULL);
72196 +#endif
72197 +
72198 + } else { /* cases 2, 5, 7 */
72199 err = vma_adjust(prev, prev->vm_start,
72200 end, prev->vm_pgoff, NULL);
72201 +
72202 +#ifdef CONFIG_PAX_SEGMEXEC
72203 + if (!err && prev_m)
72204 + err = vma_adjust(prev_m, prev_m->vm_start,
72205 + end_m, prev_m->vm_pgoff, NULL);
72206 +#endif
72207 +
72208 + }
72209 if (err)
72210 return NULL;
72211 khugepaged_enter_vma_merge(prev);
72212 @@ -826,12 +891,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
72213 mpol_equal(policy, vma_policy(next)) &&
72214 can_vma_merge_before(next, vm_flags,
72215 anon_vma, file, pgoff+pglen)) {
72216 - if (prev && addr < prev->vm_end) /* case 4 */
72217 + if (prev && addr < prev->vm_end) { /* case 4 */
72218 err = vma_adjust(prev, prev->vm_start,
72219 addr, prev->vm_pgoff, NULL);
72220 - else /* cases 3, 8 */
72221 +
72222 +#ifdef CONFIG_PAX_SEGMEXEC
72223 + if (!err && prev_m)
72224 + err = vma_adjust(prev_m, prev_m->vm_start,
72225 + addr_m, prev_m->vm_pgoff, NULL);
72226 +#endif
72227 +
72228 + } else { /* cases 3, 8 */
72229 err = vma_adjust(area, addr, next->vm_end,
72230 next->vm_pgoff - pglen, NULL);
72231 +
72232 +#ifdef CONFIG_PAX_SEGMEXEC
72233 + if (!err && area_m)
72234 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
72235 + next_m->vm_pgoff - pglen, NULL);
72236 +#endif
72237 +
72238 + }
72239 if (err)
72240 return NULL;
72241 khugepaged_enter_vma_merge(area);
72242 @@ -940,14 +1020,11 @@ none:
72243 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
72244 struct file *file, long pages)
72245 {
72246 - const unsigned long stack_flags
72247 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
72248 -
72249 if (file) {
72250 mm->shared_vm += pages;
72251 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
72252 mm->exec_vm += pages;
72253 - } else if (flags & stack_flags)
72254 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
72255 mm->stack_vm += pages;
72256 if (flags & (VM_RESERVED|VM_IO))
72257 mm->reserved_vm += pages;
72258 @@ -985,7 +1062,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72259 * (the exception is when the underlying filesystem is noexec
72260 * mounted, in which case we dont add PROT_EXEC.)
72261 */
72262 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
72263 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
72264 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
72265 prot |= PROT_EXEC;
72266
72267 @@ -1011,7 +1088,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72268 /* Obtain the address to map to. we verify (or select) it and ensure
72269 * that it represents a valid section of the address space.
72270 */
72271 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
72272 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
72273 if (addr & ~PAGE_MASK)
72274 return addr;
72275
72276 @@ -1022,6 +1099,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72277 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
72278 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
72279
72280 +#ifdef CONFIG_PAX_MPROTECT
72281 + if (mm->pax_flags & MF_PAX_MPROTECT) {
72282 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
72283 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
72284 + gr_log_rwxmmap(file);
72285 +
72286 +#ifdef CONFIG_PAX_EMUPLT
72287 + vm_flags &= ~VM_EXEC;
72288 +#else
72289 + return -EPERM;
72290 +#endif
72291 +
72292 + }
72293 +
72294 + if (!(vm_flags & VM_EXEC))
72295 + vm_flags &= ~VM_MAYEXEC;
72296 +#else
72297 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72298 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72299 +#endif
72300 + else
72301 + vm_flags &= ~VM_MAYWRITE;
72302 + }
72303 +#endif
72304 +
72305 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72306 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
72307 + vm_flags &= ~VM_PAGEEXEC;
72308 +#endif
72309 +
72310 if (flags & MAP_LOCKED)
72311 if (!can_do_mlock())
72312 return -EPERM;
72313 @@ -1033,6 +1140,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72314 locked += mm->locked_vm;
72315 lock_limit = rlimit(RLIMIT_MEMLOCK);
72316 lock_limit >>= PAGE_SHIFT;
72317 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72318 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
72319 return -EAGAIN;
72320 }
72321 @@ -1099,6 +1207,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
72322 }
72323 }
72324
72325 + if (!gr_acl_handle_mmap(file, prot))
72326 + return -EACCES;
72327 +
72328 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
72329 }
72330
72331 @@ -1175,7 +1286,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
72332 vm_flags_t vm_flags = vma->vm_flags;
72333
72334 /* If it was private or non-writable, the write bit is already clear */
72335 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
72336 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
72337 return 0;
72338
72339 /* The backer wishes to know when pages are first written to? */
72340 @@ -1224,14 +1335,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
72341 unsigned long charged = 0;
72342 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
72343
72344 +#ifdef CONFIG_PAX_SEGMEXEC
72345 + struct vm_area_struct *vma_m = NULL;
72346 +#endif
72347 +
72348 + /*
72349 + * mm->mmap_sem is required to protect against another thread
72350 + * changing the mappings in case we sleep.
72351 + */
72352 + verify_mm_writelocked(mm);
72353 +
72354 /* Clear old maps */
72355 error = -ENOMEM;
72356 -munmap_back:
72357 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72358 if (vma && vma->vm_start < addr + len) {
72359 if (do_munmap(mm, addr, len))
72360 return -ENOMEM;
72361 - goto munmap_back;
72362 + vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72363 + BUG_ON(vma && vma->vm_start < addr + len);
72364 }
72365
72366 /* Check against address space limit. */
72367 @@ -1280,6 +1401,16 @@ munmap_back:
72368 goto unacct_error;
72369 }
72370
72371 +#ifdef CONFIG_PAX_SEGMEXEC
72372 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
72373 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72374 + if (!vma_m) {
72375 + error = -ENOMEM;
72376 + goto free_vma;
72377 + }
72378 + }
72379 +#endif
72380 +
72381 vma->vm_mm = mm;
72382 vma->vm_start = addr;
72383 vma->vm_end = addr + len;
72384 @@ -1304,6 +1435,19 @@ munmap_back:
72385 error = file->f_op->mmap(file, vma);
72386 if (error)
72387 goto unmap_and_free_vma;
72388 +
72389 +#ifdef CONFIG_PAX_SEGMEXEC
72390 + if (vma_m && (vm_flags & VM_EXECUTABLE))
72391 + added_exe_file_vma(mm);
72392 +#endif
72393 +
72394 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
72395 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
72396 + vma->vm_flags |= VM_PAGEEXEC;
72397 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72398 + }
72399 +#endif
72400 +
72401 if (vm_flags & VM_EXECUTABLE)
72402 added_exe_file_vma(mm);
72403
72404 @@ -1341,6 +1485,11 @@ munmap_back:
72405 vma_link(mm, vma, prev, rb_link, rb_parent);
72406 file = vma->vm_file;
72407
72408 +#ifdef CONFIG_PAX_SEGMEXEC
72409 + if (vma_m)
72410 + BUG_ON(pax_mirror_vma(vma_m, vma));
72411 +#endif
72412 +
72413 /* Once vma denies write, undo our temporary denial count */
72414 if (correct_wcount)
72415 atomic_inc(&inode->i_writecount);
72416 @@ -1349,6 +1498,7 @@ out:
72417
72418 mm->total_vm += len >> PAGE_SHIFT;
72419 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
72420 + track_exec_limit(mm, addr, addr + len, vm_flags);
72421 if (vm_flags & VM_LOCKED) {
72422 if (!mlock_vma_pages_range(vma, addr, addr + len))
72423 mm->locked_vm += (len >> PAGE_SHIFT);
72424 @@ -1371,6 +1521,12 @@ unmap_and_free_vma:
72425 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
72426 charged = 0;
72427 free_vma:
72428 +
72429 +#ifdef CONFIG_PAX_SEGMEXEC
72430 + if (vma_m)
72431 + kmem_cache_free(vm_area_cachep, vma_m);
72432 +#endif
72433 +
72434 kmem_cache_free(vm_area_cachep, vma);
72435 unacct_error:
72436 if (charged)
72437 @@ -1378,6 +1534,44 @@ unacct_error:
72438 return error;
72439 }
72440
72441 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
72442 +{
72443 + if (!vma) {
72444 +#ifdef CONFIG_STACK_GROWSUP
72445 + if (addr > sysctl_heap_stack_gap)
72446 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
72447 + else
72448 + vma = find_vma(current->mm, 0);
72449 + if (vma && (vma->vm_flags & VM_GROWSUP))
72450 + return false;
72451 +#endif
72452 + return true;
72453 + }
72454 +
72455 + if (addr + len > vma->vm_start)
72456 + return false;
72457 +
72458 + if (vma->vm_flags & VM_GROWSDOWN)
72459 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
72460 +#ifdef CONFIG_STACK_GROWSUP
72461 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
72462 + return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
72463 +#endif
72464 +
72465 + return true;
72466 +}
72467 +
72468 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
72469 +{
72470 + if (vma->vm_start < len)
72471 + return -ENOMEM;
72472 + if (!(vma->vm_flags & VM_GROWSDOWN))
72473 + return vma->vm_start - len;
72474 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
72475 + return vma->vm_start - len - sysctl_heap_stack_gap;
72476 + return -ENOMEM;
72477 +}
72478 +
72479 /* Get an address range which is currently unmapped.
72480 * For shmat() with addr=0.
72481 *
72482 @@ -1404,18 +1598,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
72483 if (flags & MAP_FIXED)
72484 return addr;
72485
72486 +#ifdef CONFIG_PAX_RANDMMAP
72487 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72488 +#endif
72489 +
72490 if (addr) {
72491 addr = PAGE_ALIGN(addr);
72492 - vma = find_vma(mm, addr);
72493 - if (TASK_SIZE - len >= addr &&
72494 - (!vma || addr + len <= vma->vm_start))
72495 - return addr;
72496 + if (TASK_SIZE - len >= addr) {
72497 + vma = find_vma(mm, addr);
72498 + if (check_heap_stack_gap(vma, addr, len))
72499 + return addr;
72500 + }
72501 }
72502 if (len > mm->cached_hole_size) {
72503 - start_addr = addr = mm->free_area_cache;
72504 + start_addr = addr = mm->free_area_cache;
72505 } else {
72506 - start_addr = addr = TASK_UNMAPPED_BASE;
72507 - mm->cached_hole_size = 0;
72508 + start_addr = addr = mm->mmap_base;
72509 + mm->cached_hole_size = 0;
72510 }
72511
72512 full_search:
72513 @@ -1426,34 +1625,40 @@ full_search:
72514 * Start a new search - just in case we missed
72515 * some holes.
72516 */
72517 - if (start_addr != TASK_UNMAPPED_BASE) {
72518 - addr = TASK_UNMAPPED_BASE;
72519 - start_addr = addr;
72520 + if (start_addr != mm->mmap_base) {
72521 + start_addr = addr = mm->mmap_base;
72522 mm->cached_hole_size = 0;
72523 goto full_search;
72524 }
72525 return -ENOMEM;
72526 }
72527 - if (!vma || addr + len <= vma->vm_start) {
72528 - /*
72529 - * Remember the place where we stopped the search:
72530 - */
72531 - mm->free_area_cache = addr + len;
72532 - return addr;
72533 - }
72534 + if (check_heap_stack_gap(vma, addr, len))
72535 + break;
72536 if (addr + mm->cached_hole_size < vma->vm_start)
72537 mm->cached_hole_size = vma->vm_start - addr;
72538 addr = vma->vm_end;
72539 }
72540 +
72541 + /*
72542 + * Remember the place where we stopped the search:
72543 + */
72544 + mm->free_area_cache = addr + len;
72545 + return addr;
72546 }
72547 #endif
72548
72549 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
72550 {
72551 +
72552 +#ifdef CONFIG_PAX_SEGMEXEC
72553 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72554 + return;
72555 +#endif
72556 +
72557 /*
72558 * Is this a new hole at the lowest possible address?
72559 */
72560 - if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache)
72561 + if (addr >= mm->mmap_base && addr < mm->free_area_cache)
72562 mm->free_area_cache = addr;
72563 }
72564
72565 @@ -1469,7 +1674,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72566 {
72567 struct vm_area_struct *vma;
72568 struct mm_struct *mm = current->mm;
72569 - unsigned long addr = addr0, start_addr;
72570 + unsigned long base = mm->mmap_base, addr = addr0, start_addr;
72571
72572 /* requested length too big for entire address space */
72573 if (len > TASK_SIZE)
72574 @@ -1478,13 +1683,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72575 if (flags & MAP_FIXED)
72576 return addr;
72577
72578 +#ifdef CONFIG_PAX_RANDMMAP
72579 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72580 +#endif
72581 +
72582 /* requesting a specific address */
72583 if (addr) {
72584 addr = PAGE_ALIGN(addr);
72585 - vma = find_vma(mm, addr);
72586 - if (TASK_SIZE - len >= addr &&
72587 - (!vma || addr + len <= vma->vm_start))
72588 - return addr;
72589 + if (TASK_SIZE - len >= addr) {
72590 + vma = find_vma(mm, addr);
72591 + if (check_heap_stack_gap(vma, addr, len))
72592 + return addr;
72593 + }
72594 }
72595
72596 /* check if free_area_cache is useful for us */
72597 @@ -1508,7 +1718,7 @@ try_again:
72598 * return with success:
72599 */
72600 vma = find_vma(mm, addr);
72601 - if (!vma || addr+len <= vma->vm_start)
72602 + if (check_heap_stack_gap(vma, addr, len))
72603 /* remember the address as a hint for next time */
72604 return (mm->free_area_cache = addr);
72605
72606 @@ -1517,8 +1727,8 @@ try_again:
72607 mm->cached_hole_size = vma->vm_start - addr;
72608
72609 /* try just below the current vma->vm_start */
72610 - addr = vma->vm_start-len;
72611 - } while (len < vma->vm_start);
72612 + addr = skip_heap_stack_gap(vma, len);
72613 + } while (!IS_ERR_VALUE(addr));
72614
72615 fail:
72616 /*
72617 @@ -1541,13 +1751,21 @@ fail:
72618 * can happen with large stack limits and large mmap()
72619 * allocations.
72620 */
72621 + mm->mmap_base = TASK_UNMAPPED_BASE;
72622 +
72623 +#ifdef CONFIG_PAX_RANDMMAP
72624 + if (mm->pax_flags & MF_PAX_RANDMMAP)
72625 + mm->mmap_base += mm->delta_mmap;
72626 +#endif
72627 +
72628 + mm->free_area_cache = mm->mmap_base;
72629 mm->cached_hole_size = ~0UL;
72630 - mm->free_area_cache = TASK_UNMAPPED_BASE;
72631 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
72632 /*
72633 * Restore the topdown base:
72634 */
72635 - mm->free_area_cache = mm->mmap_base;
72636 + mm->mmap_base = base;
72637 + mm->free_area_cache = base;
72638 mm->cached_hole_size = ~0UL;
72639
72640 return addr;
72641 @@ -1556,6 +1774,12 @@ fail:
72642
72643 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72644 {
72645 +
72646 +#ifdef CONFIG_PAX_SEGMEXEC
72647 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72648 + return;
72649 +#endif
72650 +
72651 /*
72652 * Is this a new hole at the highest possible address?
72653 */
72654 @@ -1563,8 +1787,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72655 mm->free_area_cache = addr;
72656
72657 /* dont allow allocations above current base */
72658 - if (mm->free_area_cache > mm->mmap_base)
72659 + if (mm->free_area_cache > mm->mmap_base) {
72660 mm->free_area_cache = mm->mmap_base;
72661 + mm->cached_hole_size = ~0UL;
72662 + }
72663 }
72664
72665 unsigned long
72666 @@ -1663,6 +1889,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
72667 return vma;
72668 }
72669
72670 +#ifdef CONFIG_PAX_SEGMEXEC
72671 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
72672 +{
72673 + struct vm_area_struct *vma_m;
72674 +
72675 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
72676 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
72677 + BUG_ON(vma->vm_mirror);
72678 + return NULL;
72679 + }
72680 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
72681 + vma_m = vma->vm_mirror;
72682 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
72683 + BUG_ON(vma->vm_file != vma_m->vm_file);
72684 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
72685 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
72686 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
72687 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
72688 + return vma_m;
72689 +}
72690 +#endif
72691 +
72692 /*
72693 * Verify that the stack growth is acceptable and
72694 * update accounting. This is shared with both the
72695 @@ -1679,6 +1927,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72696 return -ENOMEM;
72697
72698 /* Stack limit test */
72699 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
72700 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
72701 return -ENOMEM;
72702
72703 @@ -1689,6 +1938,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72704 locked = mm->locked_vm + grow;
72705 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
72706 limit >>= PAGE_SHIFT;
72707 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72708 if (locked > limit && !capable(CAP_IPC_LOCK))
72709 return -ENOMEM;
72710 }
72711 @@ -1719,37 +1969,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72712 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72713 * vma is the last one with address > vma->vm_end. Have to extend vma.
72714 */
72715 +#ifndef CONFIG_IA64
72716 +static
72717 +#endif
72718 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72719 {
72720 int error;
72721 + bool locknext;
72722
72723 if (!(vma->vm_flags & VM_GROWSUP))
72724 return -EFAULT;
72725
72726 + /* Also guard against wrapping around to address 0. */
72727 + if (address < PAGE_ALIGN(address+1))
72728 + address = PAGE_ALIGN(address+1);
72729 + else
72730 + return -ENOMEM;
72731 +
72732 /*
72733 * We must make sure the anon_vma is allocated
72734 * so that the anon_vma locking is not a noop.
72735 */
72736 if (unlikely(anon_vma_prepare(vma)))
72737 return -ENOMEM;
72738 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72739 + if (locknext && anon_vma_prepare(vma->vm_next))
72740 + return -ENOMEM;
72741 vma_lock_anon_vma(vma);
72742 + if (locknext)
72743 + vma_lock_anon_vma(vma->vm_next);
72744
72745 /*
72746 * vma->vm_start/vm_end cannot change under us because the caller
72747 * is required to hold the mmap_sem in read mode. We need the
72748 - * anon_vma lock to serialize against concurrent expand_stacks.
72749 - * Also guard against wrapping around to address 0.
72750 + * anon_vma locks to serialize against concurrent expand_stacks
72751 + * and expand_upwards.
72752 */
72753 - if (address < PAGE_ALIGN(address+4))
72754 - address = PAGE_ALIGN(address+4);
72755 - else {
72756 - vma_unlock_anon_vma(vma);
72757 - return -ENOMEM;
72758 - }
72759 error = 0;
72760
72761 /* Somebody else might have raced and expanded it already */
72762 - if (address > vma->vm_end) {
72763 + 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)
72764 + error = -ENOMEM;
72765 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72766 unsigned long size, grow;
72767
72768 size = address - vma->vm_start;
72769 @@ -1764,6 +2025,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72770 }
72771 }
72772 }
72773 + if (locknext)
72774 + vma_unlock_anon_vma(vma->vm_next);
72775 vma_unlock_anon_vma(vma);
72776 khugepaged_enter_vma_merge(vma);
72777 return error;
72778 @@ -1777,6 +2040,8 @@ int expand_downwards(struct vm_area_struct *vma,
72779 unsigned long address)
72780 {
72781 int error;
72782 + bool lockprev = false;
72783 + struct vm_area_struct *prev;
72784
72785 /*
72786 * We must make sure the anon_vma is allocated
72787 @@ -1790,6 +2055,15 @@ int expand_downwards(struct vm_area_struct *vma,
72788 if (error)
72789 return error;
72790
72791 + prev = vma->vm_prev;
72792 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
72793 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
72794 +#endif
72795 + if (lockprev && anon_vma_prepare(prev))
72796 + return -ENOMEM;
72797 + if (lockprev)
72798 + vma_lock_anon_vma(prev);
72799 +
72800 vma_lock_anon_vma(vma);
72801
72802 /*
72803 @@ -1799,9 +2073,17 @@ int expand_downwards(struct vm_area_struct *vma,
72804 */
72805
72806 /* Somebody else might have raced and expanded it already */
72807 - if (address < vma->vm_start) {
72808 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
72809 + error = -ENOMEM;
72810 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
72811 unsigned long size, grow;
72812
72813 +#ifdef CONFIG_PAX_SEGMEXEC
72814 + struct vm_area_struct *vma_m;
72815 +
72816 + vma_m = pax_find_mirror_vma(vma);
72817 +#endif
72818 +
72819 size = vma->vm_end - address;
72820 grow = (vma->vm_start - address) >> PAGE_SHIFT;
72821
72822 @@ -1811,11 +2093,22 @@ int expand_downwards(struct vm_area_struct *vma,
72823 if (!error) {
72824 vma->vm_start = address;
72825 vma->vm_pgoff -= grow;
72826 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
72827 +
72828 +#ifdef CONFIG_PAX_SEGMEXEC
72829 + if (vma_m) {
72830 + vma_m->vm_start -= grow << PAGE_SHIFT;
72831 + vma_m->vm_pgoff -= grow;
72832 + }
72833 +#endif
72834 +
72835 perf_event_mmap(vma);
72836 }
72837 }
72838 }
72839 vma_unlock_anon_vma(vma);
72840 + if (lockprev)
72841 + vma_unlock_anon_vma(prev);
72842 khugepaged_enter_vma_merge(vma);
72843 return error;
72844 }
72845 @@ -1887,6 +2180,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
72846 do {
72847 long nrpages = vma_pages(vma);
72848
72849 +#ifdef CONFIG_PAX_SEGMEXEC
72850 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
72851 + vma = remove_vma(vma);
72852 + continue;
72853 + }
72854 +#endif
72855 +
72856 if (vma->vm_flags & VM_ACCOUNT)
72857 nr_accounted += nrpages;
72858 mm->total_vm -= nrpages;
72859 @@ -1933,6 +2233,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
72860 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
72861 vma->vm_prev = NULL;
72862 do {
72863 +
72864 +#ifdef CONFIG_PAX_SEGMEXEC
72865 + if (vma->vm_mirror) {
72866 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
72867 + vma->vm_mirror->vm_mirror = NULL;
72868 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
72869 + vma->vm_mirror = NULL;
72870 + }
72871 +#endif
72872 +
72873 rb_erase(&vma->vm_rb, &mm->mm_rb);
72874 mm->map_count--;
72875 tail_vma = vma;
72876 @@ -1961,14 +2271,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72877 struct vm_area_struct *new;
72878 int err = -ENOMEM;
72879
72880 +#ifdef CONFIG_PAX_SEGMEXEC
72881 + struct vm_area_struct *vma_m, *new_m = NULL;
72882 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
72883 +#endif
72884 +
72885 if (is_vm_hugetlb_page(vma) && (addr &
72886 ~(huge_page_mask(hstate_vma(vma)))))
72887 return -EINVAL;
72888
72889 +#ifdef CONFIG_PAX_SEGMEXEC
72890 + vma_m = pax_find_mirror_vma(vma);
72891 +#endif
72892 +
72893 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72894 if (!new)
72895 goto out_err;
72896
72897 +#ifdef CONFIG_PAX_SEGMEXEC
72898 + if (vma_m) {
72899 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72900 + if (!new_m) {
72901 + kmem_cache_free(vm_area_cachep, new);
72902 + goto out_err;
72903 + }
72904 + }
72905 +#endif
72906 +
72907 /* most fields are the same, copy all, and then fixup */
72908 *new = *vma;
72909
72910 @@ -1981,6 +2310,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72911 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
72912 }
72913
72914 +#ifdef CONFIG_PAX_SEGMEXEC
72915 + if (vma_m) {
72916 + *new_m = *vma_m;
72917 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
72918 + new_m->vm_mirror = new;
72919 + new->vm_mirror = new_m;
72920 +
72921 + if (new_below)
72922 + new_m->vm_end = addr_m;
72923 + else {
72924 + new_m->vm_start = addr_m;
72925 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
72926 + }
72927 + }
72928 +#endif
72929 +
72930 pol = mpol_dup(vma_policy(vma));
72931 if (IS_ERR(pol)) {
72932 err = PTR_ERR(pol);
72933 @@ -2006,6 +2351,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72934 else
72935 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
72936
72937 +#ifdef CONFIG_PAX_SEGMEXEC
72938 + if (!err && vma_m) {
72939 + if (anon_vma_clone(new_m, vma_m))
72940 + goto out_free_mpol;
72941 +
72942 + mpol_get(pol);
72943 + vma_set_policy(new_m, pol);
72944 +
72945 + if (new_m->vm_file) {
72946 + get_file(new_m->vm_file);
72947 + if (vma_m->vm_flags & VM_EXECUTABLE)
72948 + added_exe_file_vma(mm);
72949 + }
72950 +
72951 + if (new_m->vm_ops && new_m->vm_ops->open)
72952 + new_m->vm_ops->open(new_m);
72953 +
72954 + if (new_below)
72955 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
72956 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
72957 + else
72958 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
72959 +
72960 + if (err) {
72961 + if (new_m->vm_ops && new_m->vm_ops->close)
72962 + new_m->vm_ops->close(new_m);
72963 + if (new_m->vm_file) {
72964 + if (vma_m->vm_flags & VM_EXECUTABLE)
72965 + removed_exe_file_vma(mm);
72966 + fput(new_m->vm_file);
72967 + }
72968 + mpol_put(pol);
72969 + }
72970 + }
72971 +#endif
72972 +
72973 /* Success. */
72974 if (!err)
72975 return 0;
72976 @@ -2018,10 +2399,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72977 removed_exe_file_vma(mm);
72978 fput(new->vm_file);
72979 }
72980 - unlink_anon_vmas(new);
72981 out_free_mpol:
72982 mpol_put(pol);
72983 out_free_vma:
72984 +
72985 +#ifdef CONFIG_PAX_SEGMEXEC
72986 + if (new_m) {
72987 + unlink_anon_vmas(new_m);
72988 + kmem_cache_free(vm_area_cachep, new_m);
72989 + }
72990 +#endif
72991 +
72992 + unlink_anon_vmas(new);
72993 kmem_cache_free(vm_area_cachep, new);
72994 out_err:
72995 return err;
72996 @@ -2034,6 +2423,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72997 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72998 unsigned long addr, int new_below)
72999 {
73000 +
73001 +#ifdef CONFIG_PAX_SEGMEXEC
73002 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
73003 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
73004 + if (mm->map_count >= sysctl_max_map_count-1)
73005 + return -ENOMEM;
73006 + } else
73007 +#endif
73008 +
73009 if (mm->map_count >= sysctl_max_map_count)
73010 return -ENOMEM;
73011
73012 @@ -2045,11 +2443,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
73013 * work. This now handles partial unmappings.
73014 * Jeremy Fitzhardinge <jeremy@goop.org>
73015 */
73016 +#ifdef CONFIG_PAX_SEGMEXEC
73017 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73018 {
73019 + int ret = __do_munmap(mm, start, len);
73020 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
73021 + return ret;
73022 +
73023 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
73024 +}
73025 +
73026 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73027 +#else
73028 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73029 +#endif
73030 +{
73031 unsigned long end;
73032 struct vm_area_struct *vma, *prev, *last;
73033
73034 + /*
73035 + * mm->mmap_sem is required to protect against another thread
73036 + * changing the mappings in case we sleep.
73037 + */
73038 + verify_mm_writelocked(mm);
73039 +
73040 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
73041 return -EINVAL;
73042
73043 @@ -2124,6 +2541,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
73044 /* Fix up all other VM information */
73045 remove_vma_list(mm, vma);
73046
73047 + track_exec_limit(mm, start, end, 0UL);
73048 +
73049 return 0;
73050 }
73051
73052 @@ -2132,6 +2551,13 @@ int vm_munmap(unsigned long start, size_t len)
73053 int ret;
73054 struct mm_struct *mm = current->mm;
73055
73056 +
73057 +#ifdef CONFIG_PAX_SEGMEXEC
73058 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
73059 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
73060 + return -EINVAL;
73061 +#endif
73062 +
73063 down_write(&mm->mmap_sem);
73064 ret = do_munmap(mm, start, len);
73065 up_write(&mm->mmap_sem);
73066 @@ -2145,16 +2571,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
73067 return vm_munmap(addr, len);
73068 }
73069
73070 -static inline void verify_mm_writelocked(struct mm_struct *mm)
73071 -{
73072 -#ifdef CONFIG_DEBUG_VM
73073 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
73074 - WARN_ON(1);
73075 - up_read(&mm->mmap_sem);
73076 - }
73077 -#endif
73078 -}
73079 -
73080 /*
73081 * this is really a simplified "do_mmap". it only handles
73082 * anonymous maps. eventually we may be able to do some
73083 @@ -2168,6 +2584,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
73084 struct rb_node ** rb_link, * rb_parent;
73085 pgoff_t pgoff = addr >> PAGE_SHIFT;
73086 int error;
73087 + unsigned long charged;
73088
73089 len = PAGE_ALIGN(len);
73090 if (!len)
73091 @@ -2175,16 +2592,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
73092
73093 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
73094
73095 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
73096 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73097 + flags &= ~VM_EXEC;
73098 +
73099 +#ifdef CONFIG_PAX_MPROTECT
73100 + if (mm->pax_flags & MF_PAX_MPROTECT)
73101 + flags &= ~VM_MAYEXEC;
73102 +#endif
73103 +
73104 + }
73105 +#endif
73106 +
73107 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
73108 if (error & ~PAGE_MASK)
73109 return error;
73110
73111 + charged = len >> PAGE_SHIFT;
73112 +
73113 /*
73114 * mlock MCL_FUTURE?
73115 */
73116 if (mm->def_flags & VM_LOCKED) {
73117 unsigned long locked, lock_limit;
73118 - locked = len >> PAGE_SHIFT;
73119 + locked = charged;
73120 locked += mm->locked_vm;
73121 lock_limit = rlimit(RLIMIT_MEMLOCK);
73122 lock_limit >>= PAGE_SHIFT;
73123 @@ -2201,22 +2632,22 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
73124 /*
73125 * Clear old maps. this also does some error checking for us
73126 */
73127 - munmap_back:
73128 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
73129 if (vma && vma->vm_start < addr + len) {
73130 if (do_munmap(mm, addr, len))
73131 return -ENOMEM;
73132 - goto munmap_back;
73133 - }
73134 + vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
73135 + BUG_ON(vma && vma->vm_start < addr + len);
73136 + }
73137
73138 /* Check against address space limits *after* clearing old maps... */
73139 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
73140 + if (!may_expand_vm(mm, charged))
73141 return -ENOMEM;
73142
73143 if (mm->map_count > sysctl_max_map_count)
73144 return -ENOMEM;
73145
73146 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
73147 + if (security_vm_enough_memory_mm(mm, charged))
73148 return -ENOMEM;
73149
73150 /* Can we just expand an old private anonymous mapping? */
73151 @@ -2230,7 +2661,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
73152 */
73153 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73154 if (!vma) {
73155 - vm_unacct_memory(len >> PAGE_SHIFT);
73156 + vm_unacct_memory(charged);
73157 return -ENOMEM;
73158 }
73159
73160 @@ -2244,11 +2675,12 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
73161 vma_link(mm, vma, prev, rb_link, rb_parent);
73162 out:
73163 perf_event_mmap(vma);
73164 - mm->total_vm += len >> PAGE_SHIFT;
73165 + mm->total_vm += charged;
73166 if (flags & VM_LOCKED) {
73167 if (!mlock_vma_pages_range(vma, addr, addr + len))
73168 - mm->locked_vm += (len >> PAGE_SHIFT);
73169 + mm->locked_vm += charged;
73170 }
73171 + track_exec_limit(mm, addr, addr + len, flags);
73172 return addr;
73173 }
73174
73175 @@ -2306,6 +2738,7 @@ void exit_mmap(struct mm_struct *mm)
73176 while (vma) {
73177 if (vma->vm_flags & VM_ACCOUNT)
73178 nr_accounted += vma_pages(vma);
73179 + vma->vm_mirror = NULL;
73180 vma = remove_vma(vma);
73181 }
73182 vm_unacct_memory(nr_accounted);
73183 @@ -2322,6 +2755,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
73184 struct vm_area_struct * __vma, * prev;
73185 struct rb_node ** rb_link, * rb_parent;
73186
73187 +#ifdef CONFIG_PAX_SEGMEXEC
73188 + struct vm_area_struct *vma_m = NULL;
73189 +#endif
73190 +
73191 + if (security_mmap_addr(vma->vm_start))
73192 + return -EPERM;
73193 +
73194 /*
73195 * The vm_pgoff of a purely anonymous vma should be irrelevant
73196 * until its first write fault, when page's anon_vma and index
73197 @@ -2348,7 +2788,21 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
73198 if (vma->vm_file && uprobe_mmap(vma))
73199 return -EINVAL;
73200
73201 +#ifdef CONFIG_PAX_SEGMEXEC
73202 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
73203 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73204 + if (!vma_m)
73205 + return -ENOMEM;
73206 + }
73207 +#endif
73208 +
73209 vma_link(mm, vma, prev, rb_link, rb_parent);
73210 +
73211 +#ifdef CONFIG_PAX_SEGMEXEC
73212 + if (vma_m)
73213 + BUG_ON(pax_mirror_vma(vma_m, vma));
73214 +#endif
73215 +
73216 return 0;
73217 }
73218
73219 @@ -2367,6 +2821,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
73220 struct mempolicy *pol;
73221 bool faulted_in_anon_vma = true;
73222
73223 + BUG_ON(vma->vm_mirror);
73224 +
73225 /*
73226 * If anonymous vma has not yet been faulted, update new pgoff
73227 * to match new location, to increase its chance of merging.
73228 @@ -2438,6 +2894,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
73229 return NULL;
73230 }
73231
73232 +#ifdef CONFIG_PAX_SEGMEXEC
73233 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
73234 +{
73235 + struct vm_area_struct *prev_m;
73236 + struct rb_node **rb_link_m, *rb_parent_m;
73237 + struct mempolicy *pol_m;
73238 +
73239 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
73240 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
73241 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
73242 + *vma_m = *vma;
73243 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
73244 + if (anon_vma_clone(vma_m, vma))
73245 + return -ENOMEM;
73246 + pol_m = vma_policy(vma_m);
73247 + mpol_get(pol_m);
73248 + vma_set_policy(vma_m, pol_m);
73249 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
73250 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
73251 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
73252 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
73253 + if (vma_m->vm_file)
73254 + get_file(vma_m->vm_file);
73255 + if (vma_m->vm_ops && vma_m->vm_ops->open)
73256 + vma_m->vm_ops->open(vma_m);
73257 + find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
73258 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
73259 + vma_m->vm_mirror = vma;
73260 + vma->vm_mirror = vma_m;
73261 + return 0;
73262 +}
73263 +#endif
73264 +
73265 /*
73266 * Return true if the calling process may expand its vm space by the passed
73267 * number of pages
73268 @@ -2449,6 +2938,12 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
73269
73270 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
73271
73272 +#ifdef CONFIG_PAX_RANDMMAP
73273 + if (mm->pax_flags & MF_PAX_RANDMMAP)
73274 + cur -= mm->brk_gap;
73275 +#endif
73276 +
73277 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
73278 if (cur + npages > lim)
73279 return 0;
73280 return 1;
73281 @@ -2519,6 +3014,22 @@ int install_special_mapping(struct mm_struct *mm,
73282 vma->vm_start = addr;
73283 vma->vm_end = addr + len;
73284
73285 +#ifdef CONFIG_PAX_MPROTECT
73286 + if (mm->pax_flags & MF_PAX_MPROTECT) {
73287 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
73288 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
73289 + return -EPERM;
73290 + if (!(vm_flags & VM_EXEC))
73291 + vm_flags &= ~VM_MAYEXEC;
73292 +#else
73293 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
73294 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
73295 +#endif
73296 + else
73297 + vm_flags &= ~VM_MAYWRITE;
73298 + }
73299 +#endif
73300 +
73301 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
73302 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
73303
73304 diff --git a/mm/mprotect.c b/mm/mprotect.c
73305 index a409926..8b32e6d 100644
73306 --- a/mm/mprotect.c
73307 +++ b/mm/mprotect.c
73308 @@ -23,10 +23,17 @@
73309 #include <linux/mmu_notifier.h>
73310 #include <linux/migrate.h>
73311 #include <linux/perf_event.h>
73312 +
73313 +#ifdef CONFIG_PAX_MPROTECT
73314 +#include <linux/elf.h>
73315 +#include <linux/binfmts.h>
73316 +#endif
73317 +
73318 #include <asm/uaccess.h>
73319 #include <asm/pgtable.h>
73320 #include <asm/cacheflush.h>
73321 #include <asm/tlbflush.h>
73322 +#include <asm/mmu_context.h>
73323
73324 #ifndef pgprot_modify
73325 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
73326 @@ -141,6 +148,48 @@ static void change_protection(struct vm_area_struct *vma,
73327 flush_tlb_range(vma, start, end);
73328 }
73329
73330 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73331 +/* called while holding the mmap semaphor for writing except stack expansion */
73332 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
73333 +{
73334 + unsigned long oldlimit, newlimit = 0UL;
73335 +
73336 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
73337 + return;
73338 +
73339 + spin_lock(&mm->page_table_lock);
73340 + oldlimit = mm->context.user_cs_limit;
73341 + if ((prot & VM_EXEC) && oldlimit < end)
73342 + /* USER_CS limit moved up */
73343 + newlimit = end;
73344 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
73345 + /* USER_CS limit moved down */
73346 + newlimit = start;
73347 +
73348 + if (newlimit) {
73349 + mm->context.user_cs_limit = newlimit;
73350 +
73351 +#ifdef CONFIG_SMP
73352 + wmb();
73353 + cpus_clear(mm->context.cpu_user_cs_mask);
73354 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
73355 +#endif
73356 +
73357 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
73358 + }
73359 + spin_unlock(&mm->page_table_lock);
73360 + if (newlimit == end) {
73361 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
73362 +
73363 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
73364 + if (is_vm_hugetlb_page(vma))
73365 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
73366 + else
73367 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
73368 + }
73369 +}
73370 +#endif
73371 +
73372 int
73373 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73374 unsigned long start, unsigned long end, unsigned long newflags)
73375 @@ -153,11 +202,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73376 int error;
73377 int dirty_accountable = 0;
73378
73379 +#ifdef CONFIG_PAX_SEGMEXEC
73380 + struct vm_area_struct *vma_m = NULL;
73381 + unsigned long start_m, end_m;
73382 +
73383 + start_m = start + SEGMEXEC_TASK_SIZE;
73384 + end_m = end + SEGMEXEC_TASK_SIZE;
73385 +#endif
73386 +
73387 if (newflags == oldflags) {
73388 *pprev = vma;
73389 return 0;
73390 }
73391
73392 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
73393 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
73394 +
73395 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
73396 + return -ENOMEM;
73397 +
73398 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
73399 + return -ENOMEM;
73400 + }
73401 +
73402 /*
73403 * If we make a private mapping writable we increase our commit;
73404 * but (without finer accounting) cannot reduce our commit if we
73405 @@ -174,6 +241,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73406 }
73407 }
73408
73409 +#ifdef CONFIG_PAX_SEGMEXEC
73410 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
73411 + if (start != vma->vm_start) {
73412 + error = split_vma(mm, vma, start, 1);
73413 + if (error)
73414 + goto fail;
73415 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
73416 + *pprev = (*pprev)->vm_next;
73417 + }
73418 +
73419 + if (end != vma->vm_end) {
73420 + error = split_vma(mm, vma, end, 0);
73421 + if (error)
73422 + goto fail;
73423 + }
73424 +
73425 + if (pax_find_mirror_vma(vma)) {
73426 + error = __do_munmap(mm, start_m, end_m - start_m);
73427 + if (error)
73428 + goto fail;
73429 + } else {
73430 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73431 + if (!vma_m) {
73432 + error = -ENOMEM;
73433 + goto fail;
73434 + }
73435 + vma->vm_flags = newflags;
73436 + error = pax_mirror_vma(vma_m, vma);
73437 + if (error) {
73438 + vma->vm_flags = oldflags;
73439 + goto fail;
73440 + }
73441 + }
73442 + }
73443 +#endif
73444 +
73445 /*
73446 * First try to merge with previous and/or next vma.
73447 */
73448 @@ -204,9 +307,21 @@ success:
73449 * vm_flags and vm_page_prot are protected by the mmap_sem
73450 * held in write mode.
73451 */
73452 +
73453 +#ifdef CONFIG_PAX_SEGMEXEC
73454 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
73455 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
73456 +#endif
73457 +
73458 vma->vm_flags = newflags;
73459 +
73460 +#ifdef CONFIG_PAX_MPROTECT
73461 + if (mm->binfmt && mm->binfmt->handle_mprotect)
73462 + mm->binfmt->handle_mprotect(vma, newflags);
73463 +#endif
73464 +
73465 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
73466 - vm_get_page_prot(newflags));
73467 + vm_get_page_prot(vma->vm_flags));
73468
73469 if (vma_wants_writenotify(vma)) {
73470 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
73471 @@ -248,6 +363,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73472 end = start + len;
73473 if (end <= start)
73474 return -ENOMEM;
73475 +
73476 +#ifdef CONFIG_PAX_SEGMEXEC
73477 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73478 + if (end > SEGMEXEC_TASK_SIZE)
73479 + return -EINVAL;
73480 + } else
73481 +#endif
73482 +
73483 + if (end > TASK_SIZE)
73484 + return -EINVAL;
73485 +
73486 if (!arch_validate_prot(prot))
73487 return -EINVAL;
73488
73489 @@ -255,7 +381,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73490 /*
73491 * Does the application expect PROT_READ to imply PROT_EXEC:
73492 */
73493 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73494 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73495 prot |= PROT_EXEC;
73496
73497 vm_flags = calc_vm_prot_bits(prot);
73498 @@ -288,6 +414,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73499 if (start > vma->vm_start)
73500 prev = vma;
73501
73502 +#ifdef CONFIG_PAX_MPROTECT
73503 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
73504 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
73505 +#endif
73506 +
73507 for (nstart = start ; ; ) {
73508 unsigned long newflags;
73509
73510 @@ -297,6 +428,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73511
73512 /* newflags >> 4 shift VM_MAY% in place of VM_% */
73513 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
73514 + if (prot & (PROT_WRITE | PROT_EXEC))
73515 + gr_log_rwxmprotect(vma->vm_file);
73516 +
73517 + error = -EACCES;
73518 + goto out;
73519 + }
73520 +
73521 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
73522 error = -EACCES;
73523 goto out;
73524 }
73525 @@ -311,6 +450,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73526 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
73527 if (error)
73528 goto out;
73529 +
73530 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
73531 +
73532 nstart = tmp;
73533
73534 if (nstart < prev->vm_end)
73535 diff --git a/mm/mremap.c b/mm/mremap.c
73536 index 21fed20..6822658 100644
73537 --- a/mm/mremap.c
73538 +++ b/mm/mremap.c
73539 @@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
73540 continue;
73541 pte = ptep_get_and_clear(mm, old_addr, old_pte);
73542 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
73543 +
73544 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73545 + if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
73546 + pte = pte_exprotect(pte);
73547 +#endif
73548 +
73549 set_pte_at(mm, new_addr, new_pte, pte);
73550 }
73551
73552 @@ -299,6 +305,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
73553 if (is_vm_hugetlb_page(vma))
73554 goto Einval;
73555
73556 +#ifdef CONFIG_PAX_SEGMEXEC
73557 + if (pax_find_mirror_vma(vma))
73558 + goto Einval;
73559 +#endif
73560 +
73561 /* We can't remap across vm area boundaries */
73562 if (old_len > vma->vm_end - addr)
73563 goto Efault;
73564 @@ -355,20 +366,25 @@ static unsigned long mremap_to(unsigned long addr,
73565 unsigned long ret = -EINVAL;
73566 unsigned long charged = 0;
73567 unsigned long map_flags;
73568 + unsigned long pax_task_size = TASK_SIZE;
73569
73570 if (new_addr & ~PAGE_MASK)
73571 goto out;
73572
73573 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
73574 +#ifdef CONFIG_PAX_SEGMEXEC
73575 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
73576 + pax_task_size = SEGMEXEC_TASK_SIZE;
73577 +#endif
73578 +
73579 + pax_task_size -= PAGE_SIZE;
73580 +
73581 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
73582 goto out;
73583
73584 /* Check if the location we're moving into overlaps the
73585 * old location at all, and fail if it does.
73586 */
73587 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
73588 - goto out;
73589 -
73590 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
73591 + if (addr + old_len > new_addr && new_addr + new_len > addr)
73592 goto out;
73593
73594 ret = do_munmap(mm, new_addr, new_len);
73595 @@ -436,6 +452,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
73596 struct vm_area_struct *vma;
73597 unsigned long ret = -EINVAL;
73598 unsigned long charged = 0;
73599 + unsigned long pax_task_size = TASK_SIZE;
73600
73601 down_write(&current->mm->mmap_sem);
73602
73603 @@ -456,6 +473,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
73604 if (!new_len)
73605 goto out;
73606
73607 +#ifdef CONFIG_PAX_SEGMEXEC
73608 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
73609 + pax_task_size = SEGMEXEC_TASK_SIZE;
73610 +#endif
73611 +
73612 + pax_task_size -= PAGE_SIZE;
73613 +
73614 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
73615 + old_len > pax_task_size || addr > pax_task_size-old_len)
73616 + goto out;
73617 +
73618 if (flags & MREMAP_FIXED) {
73619 if (flags & MREMAP_MAYMOVE)
73620 ret = mremap_to(addr, old_len, new_addr, new_len);
73621 @@ -505,6 +533,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
73622 addr + new_len);
73623 }
73624 ret = addr;
73625 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
73626 goto out;
73627 }
73628 }
73629 @@ -528,7 +557,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
73630 goto out;
73631 }
73632
73633 + map_flags = vma->vm_flags;
73634 ret = move_vma(vma, addr, old_len, new_len, new_addr);
73635 + if (!(ret & ~PAGE_MASK)) {
73636 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
73637 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
73638 + }
73639 }
73640 out:
73641 if (ret & ~PAGE_MASK)
73642 diff --git a/mm/nommu.c b/mm/nommu.c
73643 index d4b0c10..ed421b5 100644
73644 --- a/mm/nommu.c
73645 +++ b/mm/nommu.c
73646 @@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
73647 int sysctl_overcommit_ratio = 50; /* default is 50% */
73648 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
73649 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
73650 -int heap_stack_gap = 0;
73651
73652 atomic_long_t mmap_pages_allocated;
73653
73654 @@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
73655 EXPORT_SYMBOL(find_vma);
73656
73657 /*
73658 - * find a VMA
73659 - * - we don't extend stack VMAs under NOMMU conditions
73660 - */
73661 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
73662 -{
73663 - return find_vma(mm, addr);
73664 -}
73665 -
73666 -/*
73667 * expand a stack to a given address
73668 * - not supported under NOMMU conditions
73669 */
73670 @@ -1551,6 +1541,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
73671
73672 /* most fields are the same, copy all, and then fixup */
73673 *new = *vma;
73674 + INIT_LIST_HEAD(&new->anon_vma_chain);
73675 *region = *vma->vm_region;
73676 new->vm_region = region;
73677
73678 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
73679 index 201b508..1fb51ca 100644
73680 --- a/mm/page_alloc.c
73681 +++ b/mm/page_alloc.c
73682 @@ -336,7 +336,7 @@ out:
73683 * This usage means that zero-order pages may not be compound.
73684 */
73685
73686 -static void free_compound_page(struct page *page)
73687 +void free_compound_page(struct page *page)
73688 {
73689 __free_pages_ok(page, compound_order(page));
73690 }
73691 @@ -693,6 +693,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73692 int i;
73693 int bad = 0;
73694
73695 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
73696 + unsigned long index = 1UL << order;
73697 +#endif
73698 +
73699 trace_mm_page_free(page, order);
73700 kmemcheck_free_shadow(page, order);
73701
73702 @@ -708,6 +712,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73703 debug_check_no_obj_freed(page_address(page),
73704 PAGE_SIZE << order);
73705 }
73706 +
73707 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
73708 + for (; index; --index)
73709 + sanitize_highpage(page + index - 1);
73710 +#endif
73711 +
73712 arch_free_page(page, order);
73713 kernel_map_pages(page, 1 << order, 0);
73714
73715 @@ -849,8 +859,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
73716 arch_alloc_page(page, order);
73717 kernel_map_pages(page, 1 << order, 1);
73718
73719 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
73720 if (gfp_flags & __GFP_ZERO)
73721 prep_zero_page(page, order, gfp_flags);
73722 +#endif
73723
73724 if (order && (gfp_flags & __GFP_COMP))
73725 prep_compound_page(page, order);
73726 @@ -3579,7 +3591,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
73727 unsigned long pfn;
73728
73729 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
73730 +#ifdef CONFIG_X86_32
73731 + /* boot failures in VMware 8 on 32bit vanilla since
73732 + this change */
73733 + if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
73734 +#else
73735 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
73736 +#endif
73737 return 1;
73738 }
73739 return 0;
73740 diff --git a/mm/percpu.c b/mm/percpu.c
73741 index bb4be74..a43ea85 100644
73742 --- a/mm/percpu.c
73743 +++ b/mm/percpu.c
73744 @@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
73745 static unsigned int pcpu_high_unit_cpu __read_mostly;
73746
73747 /* the address of the first chunk which starts with the kernel static area */
73748 -void *pcpu_base_addr __read_mostly;
73749 +void *pcpu_base_addr __read_only;
73750 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73751
73752 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73753 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
73754 index 926b466..b23df53 100644
73755 --- a/mm/process_vm_access.c
73756 +++ b/mm/process_vm_access.c
73757 @@ -13,6 +13,7 @@
73758 #include <linux/uio.h>
73759 #include <linux/sched.h>
73760 #include <linux/highmem.h>
73761 +#include <linux/security.h>
73762 #include <linux/ptrace.h>
73763 #include <linux/slab.h>
73764 #include <linux/syscalls.h>
73765 @@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73766 size_t iov_l_curr_offset = 0;
73767 ssize_t iov_len;
73768
73769 + return -ENOSYS; // PaX: until properly audited
73770 +
73771 /*
73772 * Work out how many pages of struct pages we're going to need
73773 * when eventually calling get_user_pages
73774 */
73775 for (i = 0; i < riovcnt; i++) {
73776 iov_len = rvec[i].iov_len;
73777 - if (iov_len > 0) {
73778 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
73779 - + iov_len)
73780 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
73781 - / PAGE_SIZE + 1;
73782 - nr_pages = max(nr_pages, nr_pages_iov);
73783 - }
73784 + if (iov_len <= 0)
73785 + continue;
73786 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
73787 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
73788 + nr_pages = max(nr_pages, nr_pages_iov);
73789 }
73790
73791 if (nr_pages == 0)
73792 @@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73793 goto free_proc_pages;
73794 }
73795
73796 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
73797 + rc = -EPERM;
73798 + goto put_task_struct;
73799 + }
73800 +
73801 mm = mm_access(task, PTRACE_MODE_ATTACH);
73802 if (!mm || IS_ERR(mm)) {
73803 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
73804 diff --git a/mm/rmap.c b/mm/rmap.c
73805 index 0f3b7cd..c5652b6 100644
73806 --- a/mm/rmap.c
73807 +++ b/mm/rmap.c
73808 @@ -167,6 +167,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73809 struct anon_vma *anon_vma = vma->anon_vma;
73810 struct anon_vma_chain *avc;
73811
73812 +#ifdef CONFIG_PAX_SEGMEXEC
73813 + struct anon_vma_chain *avc_m = NULL;
73814 +#endif
73815 +
73816 might_sleep();
73817 if (unlikely(!anon_vma)) {
73818 struct mm_struct *mm = vma->vm_mm;
73819 @@ -176,6 +180,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73820 if (!avc)
73821 goto out_enomem;
73822
73823 +#ifdef CONFIG_PAX_SEGMEXEC
73824 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
73825 + if (!avc_m)
73826 + goto out_enomem_free_avc;
73827 +#endif
73828 +
73829 anon_vma = find_mergeable_anon_vma(vma);
73830 allocated = NULL;
73831 if (!anon_vma) {
73832 @@ -189,6 +199,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73833 /* page_table_lock to protect against threads */
73834 spin_lock(&mm->page_table_lock);
73835 if (likely(!vma->anon_vma)) {
73836 +
73837 +#ifdef CONFIG_PAX_SEGMEXEC
73838 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73839 +
73840 + if (vma_m) {
73841 + BUG_ON(vma_m->anon_vma);
73842 + vma_m->anon_vma = anon_vma;
73843 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
73844 + avc_m = NULL;
73845 + }
73846 +#endif
73847 +
73848 vma->anon_vma = anon_vma;
73849 anon_vma_chain_link(vma, avc, anon_vma);
73850 allocated = NULL;
73851 @@ -199,12 +221,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73852
73853 if (unlikely(allocated))
73854 put_anon_vma(allocated);
73855 +
73856 +#ifdef CONFIG_PAX_SEGMEXEC
73857 + if (unlikely(avc_m))
73858 + anon_vma_chain_free(avc_m);
73859 +#endif
73860 +
73861 if (unlikely(avc))
73862 anon_vma_chain_free(avc);
73863 }
73864 return 0;
73865
73866 out_enomem_free_avc:
73867 +
73868 +#ifdef CONFIG_PAX_SEGMEXEC
73869 + if (avc_m)
73870 + anon_vma_chain_free(avc_m);
73871 +#endif
73872 +
73873 anon_vma_chain_free(avc);
73874 out_enomem:
73875 return -ENOMEM;
73876 @@ -240,7 +274,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
73877 * Attach the anon_vmas from src to dst.
73878 * Returns 0 on success, -ENOMEM on failure.
73879 */
73880 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73881 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
73882 {
73883 struct anon_vma_chain *avc, *pavc;
73884 struct anon_vma *root = NULL;
73885 @@ -318,7 +352,7 @@ void anon_vma_moveto_tail(struct vm_area_struct *dst)
73886 * the corresponding VMA in the parent process is attached to.
73887 * Returns 0 on success, non-zero on failure.
73888 */
73889 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
73890 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
73891 {
73892 struct anon_vma_chain *avc;
73893 struct anon_vma *anon_vma;
73894 diff --git a/mm/shmem.c b/mm/shmem.c
73895 index bd10636..5c16d49 100644
73896 --- a/mm/shmem.c
73897 +++ b/mm/shmem.c
73898 @@ -31,7 +31,7 @@
73899 #include <linux/export.h>
73900 #include <linux/swap.h>
73901
73902 -static struct vfsmount *shm_mnt;
73903 +struct vfsmount *shm_mnt;
73904
73905 #ifdef CONFIG_SHMEM
73906 /*
73907 @@ -75,7 +75,7 @@ static struct vfsmount *shm_mnt;
73908 #define BOGO_DIRENT_SIZE 20
73909
73910 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
73911 -#define SHORT_SYMLINK_LEN 128
73912 +#define SHORT_SYMLINK_LEN 64
73913
73914 struct shmem_xattr {
73915 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
73916 @@ -2590,8 +2590,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
73917 int err = -ENOMEM;
73918
73919 /* Round up to L1_CACHE_BYTES to resist false sharing */
73920 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
73921 - L1_CACHE_BYTES), GFP_KERNEL);
73922 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
73923 if (!sbinfo)
73924 return -ENOMEM;
73925
73926 diff --git a/mm/slab.c b/mm/slab.c
73927 index e901a36..ca479fc 100644
73928 --- a/mm/slab.c
73929 +++ b/mm/slab.c
73930 @@ -153,7 +153,7 @@
73931
73932 /* Legal flag mask for kmem_cache_create(). */
73933 #if DEBUG
73934 -# define CREATE_MASK (SLAB_RED_ZONE | \
73935 +# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
73936 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
73937 SLAB_CACHE_DMA | \
73938 SLAB_STORE_USER | \
73939 @@ -161,7 +161,7 @@
73940 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73941 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
73942 #else
73943 -# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
73944 +# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
73945 SLAB_CACHE_DMA | \
73946 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
73947 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73948 @@ -290,7 +290,7 @@ struct kmem_list3 {
73949 * Need this for bootstrapping a per node allocator.
73950 */
73951 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
73952 -static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
73953 +static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
73954 #define CACHE_CACHE 0
73955 #define SIZE_AC MAX_NUMNODES
73956 #define SIZE_L3 (2 * MAX_NUMNODES)
73957 @@ -391,10 +391,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
73958 if ((x)->max_freeable < i) \
73959 (x)->max_freeable = i; \
73960 } while (0)
73961 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
73962 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
73963 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
73964 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
73965 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
73966 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
73967 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
73968 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
73969 #else
73970 #define STATS_INC_ACTIVE(x) do { } while (0)
73971 #define STATS_DEC_ACTIVE(x) do { } while (0)
73972 @@ -542,7 +542,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
73973 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
73974 */
73975 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
73976 - const struct slab *slab, void *obj)
73977 + const struct slab *slab, const void *obj)
73978 {
73979 u32 offset = (obj - slab->s_mem);
73980 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
73981 @@ -563,12 +563,13 @@ EXPORT_SYMBOL(malloc_sizes);
73982 struct cache_names {
73983 char *name;
73984 char *name_dma;
73985 + char *name_usercopy;
73986 };
73987
73988 static struct cache_names __initdata cache_names[] = {
73989 -#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
73990 +#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)", .name_usercopy = "size-" #x "(USERCOPY)" },
73991 #include <linux/kmalloc_sizes.h>
73992 - {NULL,}
73993 + {NULL}
73994 #undef CACHE
73995 };
73996
73997 @@ -756,6 +757,12 @@ static inline struct kmem_cache *__find_general_cachep(size_t size,
73998 if (unlikely(gfpflags & GFP_DMA))
73999 return csizep->cs_dmacachep;
74000 #endif
74001 +
74002 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74003 + if (unlikely(gfpflags & GFP_USERCOPY))
74004 + return csizep->cs_usercopycachep;
74005 +#endif
74006 +
74007 return csizep->cs_cachep;
74008 }
74009
74010 @@ -1588,7 +1595,7 @@ void __init kmem_cache_init(void)
74011 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
74012 sizes[INDEX_AC].cs_size,
74013 ARCH_KMALLOC_MINALIGN,
74014 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
74015 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74016 NULL);
74017
74018 if (INDEX_AC != INDEX_L3) {
74019 @@ -1596,7 +1603,7 @@ void __init kmem_cache_init(void)
74020 kmem_cache_create(names[INDEX_L3].name,
74021 sizes[INDEX_L3].cs_size,
74022 ARCH_KMALLOC_MINALIGN,
74023 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
74024 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74025 NULL);
74026 }
74027
74028 @@ -1614,7 +1621,7 @@ void __init kmem_cache_init(void)
74029 sizes->cs_cachep = kmem_cache_create(names->name,
74030 sizes->cs_size,
74031 ARCH_KMALLOC_MINALIGN,
74032 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
74033 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74034 NULL);
74035 }
74036 #ifdef CONFIG_ZONE_DMA
74037 @@ -1626,6 +1633,16 @@ void __init kmem_cache_init(void)
74038 SLAB_PANIC,
74039 NULL);
74040 #endif
74041 +
74042 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74043 + sizes->cs_usercopycachep = kmem_cache_create(
74044 + names->name_usercopy,
74045 + sizes->cs_size,
74046 + ARCH_KMALLOC_MINALIGN,
74047 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
74048 + NULL);
74049 +#endif
74050 +
74051 sizes++;
74052 names++;
74053 }
74054 @@ -4390,10 +4407,10 @@ static int s_show(struct seq_file *m, void *p)
74055 }
74056 /* cpu stats */
74057 {
74058 - unsigned long allochit = atomic_read(&cachep->allochit);
74059 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
74060 - unsigned long freehit = atomic_read(&cachep->freehit);
74061 - unsigned long freemiss = atomic_read(&cachep->freemiss);
74062 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
74063 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
74064 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
74065 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
74066
74067 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
74068 allochit, allocmiss, freehit, freemiss);
74069 @@ -4652,13 +4669,68 @@ static int __init slab_proc_init(void)
74070 {
74071 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
74072 #ifdef CONFIG_DEBUG_SLAB_LEAK
74073 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
74074 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
74075 #endif
74076 return 0;
74077 }
74078 module_init(slab_proc_init);
74079 #endif
74080
74081 +bool is_usercopy_object(const void *ptr)
74082 +{
74083 + struct page *page;
74084 + struct kmem_cache *cachep;
74085 +
74086 + if (ZERO_OR_NULL_PTR(ptr))
74087 + return false;
74088 +
74089 + if (!virt_addr_valid(ptr))
74090 + return false;
74091 +
74092 + page = virt_to_head_page(ptr);
74093 +
74094 + if (!PageSlab(page))
74095 + return false;
74096 +
74097 + cachep = page_get_cache(page);
74098 + return cachep->flags & SLAB_USERCOPY;
74099 +}
74100 +
74101 +#ifdef CONFIG_PAX_USERCOPY
74102 +const char *check_heap_object(const void *ptr, unsigned long n, bool to)
74103 +{
74104 + struct page *page;
74105 + struct kmem_cache *cachep;
74106 + struct slab *slabp;
74107 + unsigned int objnr;
74108 + unsigned long offset;
74109 +
74110 + if (ZERO_OR_NULL_PTR(ptr))
74111 + return "<null>";
74112 +
74113 + if (!virt_addr_valid(ptr))
74114 + return NULL;
74115 +
74116 + page = virt_to_head_page(ptr);
74117 +
74118 + if (!PageSlab(page))
74119 + return NULL;
74120 +
74121 + cachep = page_get_cache(page);
74122 + if (!(cachep->flags & SLAB_USERCOPY))
74123 + return cachep->name;
74124 +
74125 + slabp = page_get_slab(page);
74126 + objnr = obj_to_index(cachep, slabp, ptr);
74127 + BUG_ON(objnr >= cachep->num);
74128 + offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
74129 + if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
74130 + return NULL;
74131 +
74132 + return cachep->name;
74133 +}
74134 +#endif
74135 +
74136 /**
74137 * ksize - get the actual amount of memory allocated for a given object
74138 * @objp: Pointer to the object
74139 diff --git a/mm/slob.c b/mm/slob.c
74140 index 8105be4..3c15e57 100644
74141 --- a/mm/slob.c
74142 +++ b/mm/slob.c
74143 @@ -29,7 +29,7 @@
74144 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
74145 * alloc_pages() directly, allocating compound pages so the page order
74146 * does not have to be separately tracked, and also stores the exact
74147 - * allocation size in page->private so that it can be used to accurately
74148 + * allocation size in slob_page->size so that it can be used to accurately
74149 * provide ksize(). These objects are detected in kfree() because slob_page()
74150 * is false for them.
74151 *
74152 @@ -58,6 +58,7 @@
74153 */
74154
74155 #include <linux/kernel.h>
74156 +#include <linux/sched.h>
74157 #include <linux/slab.h>
74158 #include <linux/mm.h>
74159 #include <linux/swap.h> /* struct reclaim_state */
74160 @@ -102,7 +103,8 @@ struct slob_page {
74161 unsigned long flags; /* mandatory */
74162 atomic_t _count; /* mandatory */
74163 slobidx_t units; /* free units left in page */
74164 - unsigned long pad[2];
74165 + unsigned long pad[1];
74166 + unsigned long size; /* size when >=PAGE_SIZE */
74167 slob_t *free; /* first free slob_t in page */
74168 struct list_head list; /* linked list of free pages */
74169 };
74170 @@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
74171 */
74172 static inline int is_slob_page(struct slob_page *sp)
74173 {
74174 - return PageSlab((struct page *)sp);
74175 + return PageSlab((struct page *)sp) && !sp->size;
74176 }
74177
74178 static inline void set_slob_page(struct slob_page *sp)
74179 @@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
74180
74181 static inline struct slob_page *slob_page(const void *addr)
74182 {
74183 - return (struct slob_page *)virt_to_page(addr);
74184 + return (struct slob_page *)virt_to_head_page(addr);
74185 }
74186
74187 /*
74188 @@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
74189 /*
74190 * Return the size of a slob block.
74191 */
74192 -static slobidx_t slob_units(slob_t *s)
74193 +static slobidx_t slob_units(const slob_t *s)
74194 {
74195 if (s->units > 0)
74196 return s->units;
74197 @@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
74198 /*
74199 * Return the next free slob block pointer after this one.
74200 */
74201 -static slob_t *slob_next(slob_t *s)
74202 +static slob_t *slob_next(const slob_t *s)
74203 {
74204 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
74205 slobidx_t next;
74206 @@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
74207 /*
74208 * Returns true if s is the last free block in its page.
74209 */
74210 -static int slob_last(slob_t *s)
74211 +static int slob_last(const slob_t *s)
74212 {
74213 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
74214 }
74215 @@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
74216 if (!page)
74217 return NULL;
74218
74219 + set_slob_page(page);
74220 return page_address(page);
74221 }
74222
74223 @@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
74224 if (!b)
74225 return NULL;
74226 sp = slob_page(b);
74227 - set_slob_page(sp);
74228
74229 spin_lock_irqsave(&slob_lock, flags);
74230 sp->units = SLOB_UNITS(PAGE_SIZE);
74231 sp->free = b;
74232 + sp->size = 0;
74233 INIT_LIST_HEAD(&sp->list);
74234 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
74235 set_slob_page_free(sp, slob_list);
74236 @@ -476,10 +479,9 @@ out:
74237 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
74238 */
74239
74240 -void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74241 +static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
74242 {
74243 - unsigned int *m;
74244 - int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74245 + slob_t *m;
74246 void *ret;
74247
74248 gfp &= gfp_allowed_mask;
74249 @@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74250
74251 if (!m)
74252 return NULL;
74253 - *m = size;
74254 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
74255 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
74256 + m[0].units = size;
74257 + m[1].units = align;
74258 ret = (void *)m + align;
74259
74260 trace_kmalloc_node(_RET_IP_, ret,
74261 @@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74262 gfp |= __GFP_COMP;
74263 ret = slob_new_pages(gfp, order, node);
74264 if (ret) {
74265 - struct page *page;
74266 - page = virt_to_page(ret);
74267 - page->private = size;
74268 + struct slob_page *sp;
74269 + sp = slob_page(ret);
74270 + sp->size = size;
74271 }
74272
74273 trace_kmalloc_node(_RET_IP_, ret,
74274 size, PAGE_SIZE << order, gfp, node);
74275 }
74276
74277 - kmemleak_alloc(ret, size, 1, gfp);
74278 + return ret;
74279 +}
74280 +
74281 +void *__kmalloc_node(size_t size, gfp_t gfp, int node)
74282 +{
74283 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74284 + void *ret = __kmalloc_node_align(size, gfp, node, align);
74285 +
74286 + if (!ZERO_OR_NULL_PTR(ret))
74287 + kmemleak_alloc(ret, size, 1, gfp);
74288 return ret;
74289 }
74290 EXPORT_SYMBOL(__kmalloc_node);
74291 @@ -533,13 +547,83 @@ void kfree(const void *block)
74292 sp = slob_page(block);
74293 if (is_slob_page(sp)) {
74294 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74295 - unsigned int *m = (unsigned int *)(block - align);
74296 - slob_free(m, *m + align);
74297 - } else
74298 + slob_t *m = (slob_t *)(block - align);
74299 + slob_free(m, m[0].units + align);
74300 + } else {
74301 + clear_slob_page(sp);
74302 + free_slob_page(sp);
74303 + sp->size = 0;
74304 put_page(&sp->page);
74305 + }
74306 }
74307 EXPORT_SYMBOL(kfree);
74308
74309 +bool is_usercopy_object(const void *ptr)
74310 +{
74311 + return false;
74312 +}
74313 +
74314 +#ifdef CONFIG_PAX_USERCOPY
74315 +const char *check_heap_object(const void *ptr, unsigned long n, bool to)
74316 +{
74317 + struct slob_page *sp;
74318 + const slob_t *free;
74319 + const void *base;
74320 + unsigned long flags;
74321 +
74322 + if (ZERO_OR_NULL_PTR(ptr))
74323 + return "<null>";
74324 +
74325 + if (!virt_addr_valid(ptr))
74326 + return NULL;
74327 +
74328 + sp = slob_page(ptr);
74329 + if (!PageSlab((struct page *)sp))
74330 + return NULL;
74331 +
74332 + if (sp->size) {
74333 + base = page_address(&sp->page);
74334 + if (base <= ptr && n <= sp->size - (ptr - base))
74335 + return NULL;
74336 + return "<slob>";
74337 + }
74338 +
74339 + /* some tricky double walking to find the chunk */
74340 + spin_lock_irqsave(&slob_lock, flags);
74341 + base = (void *)((unsigned long)ptr & PAGE_MASK);
74342 + free = sp->free;
74343 +
74344 + while (!slob_last(free) && (void *)free <= ptr) {
74345 + base = free + slob_units(free);
74346 + free = slob_next(free);
74347 + }
74348 +
74349 + while (base < (void *)free) {
74350 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
74351 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
74352 + int offset;
74353 +
74354 + if (ptr < base + align)
74355 + break;
74356 +
74357 + offset = ptr - base - align;
74358 + if (offset >= m) {
74359 + base += size;
74360 + continue;
74361 + }
74362 +
74363 + if (n > m - offset)
74364 + break;
74365 +
74366 + spin_unlock_irqrestore(&slob_lock, flags);
74367 + return NULL;
74368 + }
74369 +
74370 + spin_unlock_irqrestore(&slob_lock, flags);
74371 + return "<slob>";
74372 +}
74373 +#endif
74374 +
74375 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
74376 size_t ksize(const void *block)
74377 {
74378 @@ -552,10 +636,10 @@ size_t ksize(const void *block)
74379 sp = slob_page(block);
74380 if (is_slob_page(sp)) {
74381 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74382 - unsigned int *m = (unsigned int *)(block - align);
74383 - return SLOB_UNITS(*m) * SLOB_UNIT;
74384 + slob_t *m = (slob_t *)(block - align);
74385 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
74386 } else
74387 - return sp->page.private;
74388 + return sp->size;
74389 }
74390 EXPORT_SYMBOL(ksize);
74391
74392 @@ -571,8 +655,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74393 {
74394 struct kmem_cache *c;
74395
74396 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74397 + c = __kmalloc_node_align(sizeof(struct kmem_cache),
74398 + GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
74399 +#else
74400 c = slob_alloc(sizeof(struct kmem_cache),
74401 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
74402 +#endif
74403
74404 if (c) {
74405 c->name = name;
74406 @@ -614,17 +703,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
74407
74408 lockdep_trace_alloc(flags);
74409
74410 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74411 + b = __kmalloc_node_align(c->size, flags, node, c->align);
74412 +#else
74413 if (c->size < PAGE_SIZE) {
74414 b = slob_alloc(c->size, flags, c->align, node);
74415 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74416 SLOB_UNITS(c->size) * SLOB_UNIT,
74417 flags, node);
74418 } else {
74419 + struct slob_page *sp;
74420 +
74421 b = slob_new_pages(flags, get_order(c->size), node);
74422 + sp = slob_page(b);
74423 + sp->size = c->size;
74424 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74425 PAGE_SIZE << get_order(c->size),
74426 flags, node);
74427 }
74428 +#endif
74429
74430 if (c->ctor)
74431 c->ctor(b);
74432 @@ -636,10 +733,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
74433
74434 static void __kmem_cache_free(void *b, int size)
74435 {
74436 - if (size < PAGE_SIZE)
74437 + struct slob_page *sp = slob_page(b);
74438 +
74439 + if (is_slob_page(sp))
74440 slob_free(b, size);
74441 - else
74442 + else {
74443 + clear_slob_page(sp);
74444 + free_slob_page(sp);
74445 + sp->size = 0;
74446 slob_free_pages(b, get_order(size));
74447 + }
74448 }
74449
74450 static void kmem_rcu_free(struct rcu_head *head)
74451 @@ -652,17 +755,31 @@ static void kmem_rcu_free(struct rcu_head *head)
74452
74453 void kmem_cache_free(struct kmem_cache *c, void *b)
74454 {
74455 + int size = c->size;
74456 +
74457 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74458 + if (size + c->align < PAGE_SIZE) {
74459 + size += c->align;
74460 + b -= c->align;
74461 + }
74462 +#endif
74463 +
74464 kmemleak_free_recursive(b, c->flags);
74465 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
74466 struct slob_rcu *slob_rcu;
74467 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
74468 - slob_rcu->size = c->size;
74469 + slob_rcu = b + (size - sizeof(struct slob_rcu));
74470 + slob_rcu->size = size;
74471 call_rcu(&slob_rcu->head, kmem_rcu_free);
74472 } else {
74473 - __kmem_cache_free(b, c->size);
74474 + __kmem_cache_free(b, size);
74475 }
74476
74477 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74478 + trace_kfree(_RET_IP_, b);
74479 +#else
74480 trace_kmem_cache_free(_RET_IP_, b);
74481 +#endif
74482 +
74483 }
74484 EXPORT_SYMBOL(kmem_cache_free);
74485
74486 diff --git a/mm/slub.c b/mm/slub.c
74487 index 8c691fa..ff23a85 100644
74488 --- a/mm/slub.c
74489 +++ b/mm/slub.c
74490 @@ -209,7 +209,7 @@ struct track {
74491
74492 enum track_item { TRACK_ALLOC, TRACK_FREE };
74493
74494 -#ifdef CONFIG_SYSFS
74495 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74496 static int sysfs_slab_add(struct kmem_cache *);
74497 static int sysfs_slab_alias(struct kmem_cache *, const char *);
74498 static void sysfs_slab_remove(struct kmem_cache *);
74499 @@ -538,7 +538,7 @@ static void print_track(const char *s, struct track *t)
74500 if (!t->addr)
74501 return;
74502
74503 - printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
74504 + printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
74505 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
74506 #ifdef CONFIG_STACKTRACE
74507 {
74508 @@ -2603,6 +2603,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
74509
74510 page = virt_to_head_page(x);
74511
74512 + BUG_ON(!PageSlab(page));
74513 +
74514 slab_free(s, page, x, _RET_IP_);
74515
74516 trace_kmem_cache_free(_RET_IP_, x);
74517 @@ -2636,7 +2638,7 @@ static int slub_min_objects;
74518 * Merge control. If this is set then no merging of slab caches will occur.
74519 * (Could be removed. This was introduced to pacify the merge skeptics.)
74520 */
74521 -static int slub_nomerge;
74522 +static int slub_nomerge = 1;
74523
74524 /*
74525 * Calculate the order of allocation given an slab object size.
74526 @@ -3089,7 +3091,7 @@ static int kmem_cache_open(struct kmem_cache *s,
74527 else
74528 s->cpu_partial = 30;
74529
74530 - s->refcount = 1;
74531 + atomic_set(&s->refcount, 1);
74532 #ifdef CONFIG_NUMA
74533 s->remote_node_defrag_ratio = 1000;
74534 #endif
74535 @@ -3193,8 +3195,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
74536 void kmem_cache_destroy(struct kmem_cache *s)
74537 {
74538 down_write(&slub_lock);
74539 - s->refcount--;
74540 - if (!s->refcount) {
74541 + if (atomic_dec_and_test(&s->refcount)) {
74542 list_del(&s->list);
74543 up_write(&slub_lock);
74544 if (kmem_cache_close(s)) {
74545 @@ -3223,6 +3224,10 @@ static struct kmem_cache *kmem_cache;
74546 static struct kmem_cache *kmalloc_dma_caches[SLUB_PAGE_SHIFT];
74547 #endif
74548
74549 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74550 +static struct kmem_cache *kmalloc_usercopy_caches[SLUB_PAGE_SHIFT];
74551 +#endif
74552 +
74553 static int __init setup_slub_min_order(char *str)
74554 {
74555 get_option(&str, &slub_min_order);
74556 @@ -3337,6 +3342,13 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
74557 return kmalloc_dma_caches[index];
74558
74559 #endif
74560 +
74561 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74562 + if (flags & SLAB_USERCOPY)
74563 + return kmalloc_usercopy_caches[index];
74564 +
74565 +#endif
74566 +
74567 return kmalloc_caches[index];
74568 }
74569
74570 @@ -3405,6 +3417,56 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
74571 EXPORT_SYMBOL(__kmalloc_node);
74572 #endif
74573
74574 +bool is_usercopy_object(const void *ptr)
74575 +{
74576 + struct page *page;
74577 + struct kmem_cache *s;
74578 +
74579 + if (ZERO_OR_NULL_PTR(ptr))
74580 + return false;
74581 +
74582 + if (!virt_addr_valid(ptr))
74583 + return false;
74584 +
74585 + page = virt_to_head_page(ptr);
74586 +
74587 + if (!PageSlab(page))
74588 + return false;
74589 +
74590 + s = page->slab;
74591 + return s->flags & SLAB_USERCOPY;
74592 +}
74593 +
74594 +#ifdef CONFIG_PAX_USERCOPY
74595 +const char *check_heap_object(const void *ptr, unsigned long n, bool to)
74596 +{
74597 + struct page *page;
74598 + struct kmem_cache *s;
74599 + unsigned long offset;
74600 +
74601 + if (ZERO_OR_NULL_PTR(ptr))
74602 + return "<null>";
74603 +
74604 + if (!virt_addr_valid(ptr))
74605 + return NULL;
74606 +
74607 + page = virt_to_head_page(ptr);
74608 +
74609 + if (!PageSlab(page))
74610 + return NULL;
74611 +
74612 + s = page->slab;
74613 + if (!(s->flags & SLAB_USERCOPY))
74614 + return s->name;
74615 +
74616 + offset = (ptr - page_address(page)) % s->size;
74617 + if (offset <= s->objsize && n <= s->objsize - offset)
74618 + return NULL;
74619 +
74620 + return s->name;
74621 +}
74622 +#endif
74623 +
74624 size_t ksize(const void *object)
74625 {
74626 struct page *page;
74627 @@ -3679,7 +3741,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
74628 int node;
74629
74630 list_add(&s->list, &slab_caches);
74631 - s->refcount = -1;
74632 + atomic_set(&s->refcount, -1);
74633
74634 for_each_node_state(node, N_NORMAL_MEMORY) {
74635 struct kmem_cache_node *n = get_node(s, node);
74636 @@ -3799,17 +3861,17 @@ void __init kmem_cache_init(void)
74637
74638 /* Caches that are not of the two-to-the-power-of size */
74639 if (KMALLOC_MIN_SIZE <= 32) {
74640 - kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
74641 + kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
74642 caches++;
74643 }
74644
74645 if (KMALLOC_MIN_SIZE <= 64) {
74646 - kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
74647 + kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
74648 caches++;
74649 }
74650
74651 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
74652 - kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
74653 + kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
74654 caches++;
74655 }
74656
74657 @@ -3851,6 +3913,22 @@ void __init kmem_cache_init(void)
74658 }
74659 }
74660 #endif
74661 +
74662 +#ifdef CONFIG_PAX_USERCOPY_SLABS
74663 + for (i = 0; i < SLUB_PAGE_SHIFT; i++) {
74664 + struct kmem_cache *s = kmalloc_caches[i];
74665 +
74666 + if (s && s->size) {
74667 + char *name = kasprintf(GFP_NOWAIT,
74668 + "usercopy-kmalloc-%d", s->objsize);
74669 +
74670 + BUG_ON(!name);
74671 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(name,
74672 + s->objsize, SLAB_USERCOPY);
74673 + }
74674 + }
74675 +#endif
74676 +
74677 printk(KERN_INFO
74678 "SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"
74679 " CPUs=%d, Nodes=%d\n",
74680 @@ -3877,7 +3955,7 @@ static int slab_unmergeable(struct kmem_cache *s)
74681 /*
74682 * We may have set a slab to be unmergeable during bootstrap.
74683 */
74684 - if (s->refcount < 0)
74685 + if (atomic_read(&s->refcount) < 0)
74686 return 1;
74687
74688 return 0;
74689 @@ -3936,7 +4014,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74690 down_write(&slub_lock);
74691 s = find_mergeable(size, align, flags, name, ctor);
74692 if (s) {
74693 - s->refcount++;
74694 + atomic_inc(&s->refcount);
74695 /*
74696 * Adjust the object sizes so that we clear
74697 * the complete object on kzalloc.
74698 @@ -3945,7 +4023,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74699 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
74700
74701 if (sysfs_slab_alias(s, name)) {
74702 - s->refcount--;
74703 + atomic_dec(&s->refcount);
74704 goto err;
74705 }
74706 up_write(&slub_lock);
74707 @@ -4074,7 +4152,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
74708 }
74709 #endif
74710
74711 -#ifdef CONFIG_SYSFS
74712 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74713 static int count_inuse(struct page *page)
74714 {
74715 return page->inuse;
74716 @@ -4461,12 +4539,12 @@ static void resiliency_test(void)
74717 validate_slab_cache(kmalloc_caches[9]);
74718 }
74719 #else
74720 -#ifdef CONFIG_SYSFS
74721 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74722 static void resiliency_test(void) {};
74723 #endif
74724 #endif
74725
74726 -#ifdef CONFIG_SYSFS
74727 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74728 enum slab_stat_type {
74729 SL_ALL, /* All slabs */
74730 SL_PARTIAL, /* Only partially allocated slabs */
74731 @@ -4709,7 +4787,7 @@ SLAB_ATTR_RO(ctor);
74732
74733 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
74734 {
74735 - return sprintf(buf, "%d\n", s->refcount - 1);
74736 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
74737 }
74738 SLAB_ATTR_RO(aliases);
74739
74740 @@ -5280,6 +5358,7 @@ static char *create_unique_id(struct kmem_cache *s)
74741 return name;
74742 }
74743
74744 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74745 static int sysfs_slab_add(struct kmem_cache *s)
74746 {
74747 int err;
74748 @@ -5342,6 +5421,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
74749 kobject_del(&s->kobj);
74750 kobject_put(&s->kobj);
74751 }
74752 +#endif
74753
74754 /*
74755 * Need to buffer aliases during bootup until sysfs becomes
74756 @@ -5355,6 +5435,7 @@ struct saved_alias {
74757
74758 static struct saved_alias *alias_list;
74759
74760 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74761 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74762 {
74763 struct saved_alias *al;
74764 @@ -5377,6 +5458,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74765 alias_list = al;
74766 return 0;
74767 }
74768 +#endif
74769
74770 static int __init slab_sysfs_init(void)
74771 {
74772 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
74773 index 1b7e22a..3fcd4f3 100644
74774 --- a/mm/sparse-vmemmap.c
74775 +++ b/mm/sparse-vmemmap.c
74776 @@ -128,7 +128,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
74777 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
74778 if (!p)
74779 return NULL;
74780 - pud_populate(&init_mm, pud, p);
74781 + pud_populate_kernel(&init_mm, pud, p);
74782 }
74783 return pud;
74784 }
74785 @@ -140,7 +140,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
74786 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
74787 if (!p)
74788 return NULL;
74789 - pgd_populate(&init_mm, pgd, p);
74790 + pgd_populate_kernel(&init_mm, pgd, p);
74791 }
74792 return pgd;
74793 }
74794 diff --git a/mm/swap.c b/mm/swap.c
74795 index 4e7e2ec..0c57830 100644
74796 --- a/mm/swap.c
74797 +++ b/mm/swap.c
74798 @@ -30,6 +30,7 @@
74799 #include <linux/backing-dev.h>
74800 #include <linux/memcontrol.h>
74801 #include <linux/gfp.h>
74802 +#include <linux/hugetlb.h>
74803
74804 #include "internal.h"
74805
74806 @@ -72,6 +73,8 @@ static void __put_compound_page(struct page *page)
74807
74808 __page_cache_release(page);
74809 dtor = get_compound_page_dtor(page);
74810 + if (!PageHuge(page))
74811 + BUG_ON(dtor != free_compound_page);
74812 (*dtor)(page);
74813 }
74814
74815 diff --git a/mm/swapfile.c b/mm/swapfile.c
74816 index 71373d0..11fa7d9 100644
74817 --- a/mm/swapfile.c
74818 +++ b/mm/swapfile.c
74819 @@ -63,7 +63,7 @@ static DEFINE_MUTEX(swapon_mutex);
74820
74821 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
74822 /* Activity counter to indicate that a swapon or swapoff has occurred */
74823 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
74824 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
74825
74826 static inline unsigned char swap_count(unsigned char ent)
74827 {
74828 @@ -1663,7 +1663,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
74829 }
74830 filp_close(swap_file, NULL);
74831 err = 0;
74832 - atomic_inc(&proc_poll_event);
74833 + atomic_inc_unchecked(&proc_poll_event);
74834 wake_up_interruptible(&proc_poll_wait);
74835
74836 out_dput:
74837 @@ -1679,8 +1679,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
74838
74839 poll_wait(file, &proc_poll_wait, wait);
74840
74841 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
74842 - seq->poll_event = atomic_read(&proc_poll_event);
74843 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
74844 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74845 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
74846 }
74847
74848 @@ -1778,7 +1778,7 @@ static int swaps_open(struct inode *inode, struct file *file)
74849 return ret;
74850
74851 seq = file->private_data;
74852 - seq->poll_event = atomic_read(&proc_poll_event);
74853 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74854 return 0;
74855 }
74856
74857 @@ -2120,7 +2120,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
74858 (frontswap_map) ? "FS" : "");
74859
74860 mutex_unlock(&swapon_mutex);
74861 - atomic_inc(&proc_poll_event);
74862 + atomic_inc_unchecked(&proc_poll_event);
74863 wake_up_interruptible(&proc_poll_wait);
74864
74865 if (S_ISREG(inode->i_mode))
74866 diff --git a/mm/util.c b/mm/util.c
74867 index 8c7265a..c96d884 100644
74868 --- a/mm/util.c
74869 +++ b/mm/util.c
74870 @@ -285,6 +285,12 @@ done:
74871 void arch_pick_mmap_layout(struct mm_struct *mm)
74872 {
74873 mm->mmap_base = TASK_UNMAPPED_BASE;
74874 +
74875 +#ifdef CONFIG_PAX_RANDMMAP
74876 + if (mm->pax_flags & MF_PAX_RANDMMAP)
74877 + mm->mmap_base += mm->delta_mmap;
74878 +#endif
74879 +
74880 mm->get_unmapped_area = arch_get_unmapped_area;
74881 mm->unmap_area = arch_unmap_area;
74882 }
74883 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
74884 index 2aad499..4006a74 100644
74885 --- a/mm/vmalloc.c
74886 +++ b/mm/vmalloc.c
74887 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
74888
74889 pte = pte_offset_kernel(pmd, addr);
74890 do {
74891 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74892 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74893 +
74894 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74895 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74896 + BUG_ON(!pte_exec(*pte));
74897 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74898 + continue;
74899 + }
74900 +#endif
74901 +
74902 + {
74903 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74904 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74905 + }
74906 } while (pte++, addr += PAGE_SIZE, addr != end);
74907 }
74908
74909 @@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74910 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74911 {
74912 pte_t *pte;
74913 + int ret = -ENOMEM;
74914
74915 /*
74916 * nr is a running index into the array which helps higher level
74917 @@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74918 pte = pte_alloc_kernel(pmd, addr);
74919 if (!pte)
74920 return -ENOMEM;
74921 +
74922 + pax_open_kernel();
74923 do {
74924 struct page *page = pages[*nr];
74925
74926 - if (WARN_ON(!pte_none(*pte)))
74927 - return -EBUSY;
74928 - if (WARN_ON(!page))
74929 - return -ENOMEM;
74930 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74931 + if (pgprot_val(prot) & _PAGE_NX)
74932 +#endif
74933 +
74934 + if (WARN_ON(!pte_none(*pte))) {
74935 + ret = -EBUSY;
74936 + goto out;
74937 + }
74938 + if (WARN_ON(!page)) {
74939 + ret = -ENOMEM;
74940 + goto out;
74941 + }
74942 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74943 (*nr)++;
74944 } while (pte++, addr += PAGE_SIZE, addr != end);
74945 - return 0;
74946 + ret = 0;
74947 +out:
74948 + pax_close_kernel();
74949 + return ret;
74950 }
74951
74952 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74953 @@ -119,7 +144,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74954 pmd_t *pmd;
74955 unsigned long next;
74956
74957 - pmd = pmd_alloc(&init_mm, pud, addr);
74958 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
74959 if (!pmd)
74960 return -ENOMEM;
74961 do {
74962 @@ -136,7 +161,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
74963 pud_t *pud;
74964 unsigned long next;
74965
74966 - pud = pud_alloc(&init_mm, pgd, addr);
74967 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
74968 if (!pud)
74969 return -ENOMEM;
74970 do {
74971 @@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
74972 * and fall back on vmalloc() if that fails. Others
74973 * just put it in the vmalloc space.
74974 */
74975 -#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74976 +#ifdef CONFIG_MODULES
74977 +#ifdef MODULES_VADDR
74978 unsigned long addr = (unsigned long)x;
74979 if (addr >= MODULES_VADDR && addr < MODULES_END)
74980 return 1;
74981 #endif
74982 +
74983 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74984 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74985 + return 1;
74986 +#endif
74987 +
74988 +#endif
74989 +
74990 return is_vmalloc_addr(x);
74991 }
74992
74993 @@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
74994
74995 if (!pgd_none(*pgd)) {
74996 pud_t *pud = pud_offset(pgd, addr);
74997 +#ifdef CONFIG_X86
74998 + if (!pud_large(*pud))
74999 +#endif
75000 if (!pud_none(*pud)) {
75001 pmd_t *pmd = pmd_offset(pud, addr);
75002 +#ifdef CONFIG_X86
75003 + if (!pmd_large(*pmd))
75004 +#endif
75005 if (!pmd_none(*pmd)) {
75006 pte_t *ptep, pte;
75007
75008 @@ -329,7 +369,7 @@ static void purge_vmap_area_lazy(void);
75009 * Allocate a region of KVA of the specified size and alignment, within the
75010 * vstart and vend.
75011 */
75012 -static struct vmap_area *alloc_vmap_area(unsigned long size,
75013 +static __size_overflow(1) struct vmap_area *alloc_vmap_area(unsigned long size,
75014 unsigned long align,
75015 unsigned long vstart, unsigned long vend,
75016 int node, gfp_t gfp_mask)
75017 @@ -1320,6 +1360,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
75018 struct vm_struct *area;
75019
75020 BUG_ON(in_interrupt());
75021 +
75022 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
75023 + if (flags & VM_KERNEXEC) {
75024 + if (start != VMALLOC_START || end != VMALLOC_END)
75025 + return NULL;
75026 + start = (unsigned long)MODULES_EXEC_VADDR;
75027 + end = (unsigned long)MODULES_EXEC_END;
75028 + }
75029 +#endif
75030 +
75031 if (flags & VM_IOREMAP) {
75032 int bit = fls(size);
75033
75034 @@ -1552,6 +1602,11 @@ void *vmap(struct page **pages, unsigned int count,
75035 if (count > totalram_pages)
75036 return NULL;
75037
75038 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
75039 + if (!(pgprot_val(prot) & _PAGE_NX))
75040 + flags |= VM_KERNEXEC;
75041 +#endif
75042 +
75043 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
75044 __builtin_return_address(0));
75045 if (!area)
75046 @@ -1653,6 +1708,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
75047 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
75048 goto fail;
75049
75050 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
75051 + if (!(pgprot_val(prot) & _PAGE_NX))
75052 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
75053 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
75054 + else
75055 +#endif
75056 +
75057 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
75058 start, end, node, gfp_mask, caller);
75059 if (!area)
75060 @@ -1826,10 +1888,9 @@ EXPORT_SYMBOL(vzalloc_node);
75061 * For tight control over page level allocator and protection flags
75062 * use __vmalloc() instead.
75063 */
75064 -
75065 void *vmalloc_exec(unsigned long size)
75066 {
75067 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
75068 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
75069 -1, __builtin_return_address(0));
75070 }
75071
75072 @@ -2124,6 +2185,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
75073 unsigned long uaddr = vma->vm_start;
75074 unsigned long usize = vma->vm_end - vma->vm_start;
75075
75076 + BUG_ON(vma->vm_mirror);
75077 +
75078 if ((PAGE_SIZE-1) & (unsigned long)addr)
75079 return -EINVAL;
75080
75081 diff --git a/mm/vmstat.c b/mm/vmstat.c
75082 index 1bbbbd9..ff35669 100644
75083 --- a/mm/vmstat.c
75084 +++ b/mm/vmstat.c
75085 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
75086 *
75087 * vm_stat contains the global counters
75088 */
75089 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
75090 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
75091 EXPORT_SYMBOL(vm_stat);
75092
75093 #ifdef CONFIG_SMP
75094 @@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
75095 v = p->vm_stat_diff[i];
75096 p->vm_stat_diff[i] = 0;
75097 local_irq_restore(flags);
75098 - atomic_long_add(v, &zone->vm_stat[i]);
75099 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
75100 global_diff[i] += v;
75101 #ifdef CONFIG_NUMA
75102 /* 3 seconds idle till flush */
75103 @@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
75104
75105 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
75106 if (global_diff[i])
75107 - atomic_long_add(global_diff[i], &vm_stat[i]);
75108 + atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
75109 }
75110
75111 #endif
75112 @@ -1211,10 +1211,20 @@ static int __init setup_vmstat(void)
75113 start_cpu_timer(cpu);
75114 #endif
75115 #ifdef CONFIG_PROC_FS
75116 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
75117 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
75118 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
75119 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
75120 + {
75121 + mode_t gr_mode = S_IRUGO;
75122 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
75123 + gr_mode = S_IRUSR;
75124 +#endif
75125 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
75126 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
75127 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
75128 + proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
75129 +#else
75130 + proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
75131 +#endif
75132 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
75133 + }
75134 #endif
75135 return 0;
75136 }
75137 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
75138 index 9096bcb..43ed7bb 100644
75139 --- a/net/8021q/vlan.c
75140 +++ b/net/8021q/vlan.c
75141 @@ -557,8 +557,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
75142 err = -EPERM;
75143 if (!capable(CAP_NET_ADMIN))
75144 break;
75145 - if ((args.u.name_type >= 0) &&
75146 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
75147 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
75148 struct vlan_net *vn;
75149
75150 vn = net_generic(net, vlan_net_id);
75151 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
75152 index 6449bae..8c1f454 100644
75153 --- a/net/9p/trans_fd.c
75154 +++ b/net/9p/trans_fd.c
75155 @@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
75156 oldfs = get_fs();
75157 set_fs(get_ds());
75158 /* The cast to a user pointer is valid due to the set_fs() */
75159 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
75160 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
75161 set_fs(oldfs);
75162
75163 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
75164 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
75165 index 876fbe8..8bbea9f 100644
75166 --- a/net/atm/atm_misc.c
75167 +++ b/net/atm/atm_misc.c
75168 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
75169 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
75170 return 1;
75171 atm_return(vcc, truesize);
75172 - atomic_inc(&vcc->stats->rx_drop);
75173 + atomic_inc_unchecked(&vcc->stats->rx_drop);
75174 return 0;
75175 }
75176 EXPORT_SYMBOL(atm_charge);
75177 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
75178 }
75179 }
75180 atm_return(vcc, guess);
75181 - atomic_inc(&vcc->stats->rx_drop);
75182 + atomic_inc_unchecked(&vcc->stats->rx_drop);
75183 return NULL;
75184 }
75185 EXPORT_SYMBOL(atm_alloc_charge);
75186 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
75187
75188 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
75189 {
75190 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
75191 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
75192 __SONET_ITEMS
75193 #undef __HANDLE_ITEM
75194 }
75195 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
75196
75197 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
75198 {
75199 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
75200 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
75201 __SONET_ITEMS
75202 #undef __HANDLE_ITEM
75203 }
75204 diff --git a/net/atm/common.c b/net/atm/common.c
75205 index b4b44db..0c0ad93 100644
75206 --- a/net/atm/common.c
75207 +++ b/net/atm/common.c
75208 @@ -812,6 +812,7 @@ int vcc_getsockopt(struct socket *sock, int level, int optname,
75209
75210 if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags))
75211 return -ENOTCONN;
75212 + memset(&pvc, 0, sizeof(pvc));
75213 pvc.sap_family = AF_ATMPVC;
75214 pvc.sap_addr.itf = vcc->dev->number;
75215 pvc.sap_addr.vpi = vcc->vpi;
75216 diff --git a/net/atm/lec.h b/net/atm/lec.h
75217 index a86aff9..3a0d6f6 100644
75218 --- a/net/atm/lec.h
75219 +++ b/net/atm/lec.h
75220 @@ -48,7 +48,7 @@ struct lane2_ops {
75221 const u8 *tlvs, u32 sizeoftlvs);
75222 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
75223 const u8 *tlvs, u32 sizeoftlvs);
75224 -};
75225 +} __no_const;
75226
75227 /*
75228 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
75229 diff --git a/net/atm/mpc.h b/net/atm/mpc.h
75230 index 0919a88..a23d54e 100644
75231 --- a/net/atm/mpc.h
75232 +++ b/net/atm/mpc.h
75233 @@ -33,7 +33,7 @@ struct mpoa_client {
75234 struct mpc_parameters parameters; /* parameters for this client */
75235
75236 const struct net_device_ops *old_ops;
75237 - struct net_device_ops new_ops;
75238 + net_device_ops_no_const new_ops;
75239 };
75240
75241
75242 diff --git a/net/atm/proc.c b/net/atm/proc.c
75243 index 0d020de..011c7bb 100644
75244 --- a/net/atm/proc.c
75245 +++ b/net/atm/proc.c
75246 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
75247 const struct k_atm_aal_stats *stats)
75248 {
75249 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
75250 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
75251 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
75252 - atomic_read(&stats->rx_drop));
75253 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
75254 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
75255 + atomic_read_unchecked(&stats->rx_drop));
75256 }
75257
75258 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
75259 diff --git a/net/atm/pvc.c b/net/atm/pvc.c
75260 index 3a73491..ae03240 100644
75261 --- a/net/atm/pvc.c
75262 +++ b/net/atm/pvc.c
75263 @@ -95,6 +95,7 @@ static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr,
75264 return -ENOTCONN;
75265 *sockaddr_len = sizeof(struct sockaddr_atmpvc);
75266 addr = (struct sockaddr_atmpvc *)sockaddr;
75267 + memset(addr, 0, sizeof(*addr));
75268 addr->sap_family = AF_ATMPVC;
75269 addr->sap_addr.itf = vcc->dev->number;
75270 addr->sap_addr.vpi = vcc->vpi;
75271 diff --git a/net/atm/resources.c b/net/atm/resources.c
75272 index 23f45ce..c748f1a 100644
75273 --- a/net/atm/resources.c
75274 +++ b/net/atm/resources.c
75275 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
75276 static void copy_aal_stats(struct k_atm_aal_stats *from,
75277 struct atm_aal_stats *to)
75278 {
75279 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
75280 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
75281 __AAL_STAT_ITEMS
75282 #undef __HANDLE_ITEM
75283 }
75284 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
75285 static void subtract_aal_stats(struct k_atm_aal_stats *from,
75286 struct atm_aal_stats *to)
75287 {
75288 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
75289 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
75290 __AAL_STAT_ITEMS
75291 #undef __HANDLE_ITEM
75292 }
75293 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
75294 index dc53798..dc66333 100644
75295 --- a/net/batman-adv/bat_iv_ogm.c
75296 +++ b/net/batman-adv/bat_iv_ogm.c
75297 @@ -63,7 +63,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)
75298
75299 /* randomize initial seqno to avoid collision */
75300 get_random_bytes(&random_seqno, sizeof(random_seqno));
75301 - atomic_set(&hard_iface->seqno, random_seqno);
75302 + atomic_set_unchecked(&hard_iface->seqno, random_seqno);
75303
75304 hard_iface->packet_len = BATMAN_OGM_HLEN;
75305 hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);
75306 @@ -572,7 +572,7 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface,
75307
75308 /* change sequence number to network order */
75309 batman_ogm_packet->seqno =
75310 - htonl((uint32_t)atomic_read(&hard_iface->seqno));
75311 + htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
75312
75313 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
75314 batman_ogm_packet->tt_crc = htons((uint16_t)
75315 @@ -592,7 +592,7 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface,
75316 else
75317 batman_ogm_packet->gw_flags = NO_FLAGS;
75318
75319 - atomic_inc(&hard_iface->seqno);
75320 + atomic_inc_unchecked(&hard_iface->seqno);
75321
75322 slide_own_bcast_window(hard_iface);
75323 bat_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff,
75324 @@ -956,7 +956,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
75325 return;
75326
75327 /* could be changed by schedule_own_packet() */
75328 - if_incoming_seqno = atomic_read(&if_incoming->seqno);
75329 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
75330
75331 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
75332
75333 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
75334 index dc334fa..766a01a 100644
75335 --- a/net/batman-adv/hard-interface.c
75336 +++ b/net/batman-adv/hard-interface.c
75337 @@ -321,7 +321,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
75338 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
75339 dev_add_pack(&hard_iface->batman_adv_ptype);
75340
75341 - atomic_set(&hard_iface->frag_seqno, 1);
75342 + atomic_set_unchecked(&hard_iface->frag_seqno, 1);
75343 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
75344 hard_iface->net_dev->name);
75345
75346 @@ -444,7 +444,7 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
75347 * This can't be called via a bat_priv callback because
75348 * we have no bat_priv yet.
75349 */
75350 - atomic_set(&hard_iface->seqno, 1);
75351 + atomic_set_unchecked(&hard_iface->seqno, 1);
75352 hard_iface->packet_buff = NULL;
75353
75354 return hard_iface;
75355 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
75356 index a0ec0e4..7beb587 100644
75357 --- a/net/batman-adv/soft-interface.c
75358 +++ b/net/batman-adv/soft-interface.c
75359 @@ -214,7 +214,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
75360
75361 /* set broadcast sequence number */
75362 bcast_packet->seqno =
75363 - htonl(atomic_inc_return(&bat_priv->bcast_seqno));
75364 + htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
75365
75366 add_bcast_packet_to_list(bat_priv, skb, 1);
75367
75368 @@ -390,7 +390,7 @@ struct net_device *softif_create(const char *name)
75369 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
75370
75371 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
75372 - atomic_set(&bat_priv->bcast_seqno, 1);
75373 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
75374 atomic_set(&bat_priv->ttvn, 0);
75375 atomic_set(&bat_priv->tt_local_changes, 0);
75376 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
75377 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
75378 index 61308e8..2e142b2 100644
75379 --- a/net/batman-adv/types.h
75380 +++ b/net/batman-adv/types.h
75381 @@ -38,8 +38,8 @@ struct hard_iface {
75382 int16_t if_num;
75383 char if_status;
75384 struct net_device *net_dev;
75385 - atomic_t seqno;
75386 - atomic_t frag_seqno;
75387 + atomic_unchecked_t seqno;
75388 + atomic_unchecked_t frag_seqno;
75389 unsigned char *packet_buff;
75390 int packet_len;
75391 struct kobject *hardif_obj;
75392 @@ -163,7 +163,7 @@ struct bat_priv {
75393 atomic_t orig_interval; /* uint */
75394 atomic_t hop_penalty; /* uint */
75395 atomic_t log_level; /* uint */
75396 - atomic_t bcast_seqno;
75397 + atomic_unchecked_t bcast_seqno;
75398 atomic_t bcast_queue_left;
75399 atomic_t batman_queue_left;
75400 atomic_t ttvn; /* translation table version number */
75401 diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
75402 index 74175c2..32f8901 100644
75403 --- a/net/batman-adv/unicast.c
75404 +++ b/net/batman-adv/unicast.c
75405 @@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
75406 frag1->flags = UNI_FRAG_HEAD | large_tail;
75407 frag2->flags = large_tail;
75408
75409 - seqno = atomic_add_return(2, &hard_iface->frag_seqno);
75410 + seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
75411 frag1->seqno = htons(seqno - 1);
75412 frag2->seqno = htons(seqno);
75413
75414 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
75415 index 5914623..bedc768 100644
75416 --- a/net/bluetooth/hci_sock.c
75417 +++ b/net/bluetooth/hci_sock.c
75418 @@ -706,6 +706,7 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *add
75419 *addr_len = sizeof(*haddr);
75420 haddr->hci_family = AF_BLUETOOTH;
75421 haddr->hci_dev = hdev->id;
75422 + haddr->hci_channel= 0;
75423
75424 release_sock(sk);
75425 return 0;
75426 @@ -1016,6 +1017,7 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname, char
75427 {
75428 struct hci_filter *f = &hci_pi(sk)->filter;
75429
75430 + memset(&uf, 0, sizeof(uf));
75431 uf.type_mask = f->type_mask;
75432 uf.opcode = f->opcode;
75433 uf.event_mask[0] = *((u32 *) f->event_mask + 0);
75434 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
75435 index 4554e80..b778671 100644
75436 --- a/net/bluetooth/l2cap_core.c
75437 +++ b/net/bluetooth/l2cap_core.c
75438 @@ -2798,8 +2798,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
75439 break;
75440
75441 case L2CAP_CONF_RFC:
75442 - if (olen == sizeof(rfc))
75443 - memcpy(&rfc, (void *)val, olen);
75444 + if (olen != sizeof(rfc))
75445 + break;
75446 +
75447 + memcpy(&rfc, (void *)val, olen);
75448
75449 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
75450 rfc.mode != chan->mode)
75451 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
75452 index 3bb1611..fcf656b 100644
75453 --- a/net/bluetooth/l2cap_sock.c
75454 +++ b/net/bluetooth/l2cap_sock.c
75455 @@ -246,6 +246,7 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *l
75456
75457 BT_DBG("sock %p, sk %p", sock, sk);
75458
75459 + memset(la, 0, sizeof(struct sockaddr_l2));
75460 addr->sa_family = AF_BLUETOOTH;
75461 *len = sizeof(struct sockaddr_l2);
75462
75463 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
75464 index e8707de..2df6956 100644
75465 --- a/net/bluetooth/rfcomm/sock.c
75466 +++ b/net/bluetooth/rfcomm/sock.c
75467 @@ -547,6 +547,7 @@ static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, int *
75468
75469 BT_DBG("sock %p, sk %p", sock, sk);
75470
75471 + memset(sa, 0, sizeof(*sa));
75472 sa->rc_family = AF_BLUETOOTH;
75473 sa->rc_channel = rfcomm_pi(sk)->channel;
75474 if (peer)
75475 @@ -841,6 +842,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
75476 }
75477
75478 sec.level = rfcomm_pi(sk)->sec_level;
75479 + sec.key_size = 0;
75480
75481 len = min_t(unsigned int, len, sizeof(sec));
75482 if (copy_to_user(optval, (char *) &sec, len))
75483 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
75484 index d1820ff..4f8c8f6 100644
75485 --- a/net/bluetooth/rfcomm/tty.c
75486 +++ b/net/bluetooth/rfcomm/tty.c
75487 @@ -314,7 +314,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev)
75488 BUG_ON(test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags));
75489
75490 spin_lock_irqsave(&dev->port.lock, flags);
75491 - if (dev->port.count > 0) {
75492 + if (atomic_read(&dev->port.count) > 0) {
75493 spin_unlock_irqrestore(&dev->port.lock, flags);
75494 return;
75495 }
75496 @@ -461,7 +461,7 @@ static int rfcomm_get_dev_list(void __user *arg)
75497
75498 size = sizeof(*dl) + dev_num * sizeof(*di);
75499
75500 - dl = kmalloc(size, GFP_KERNEL);
75501 + dl = kzalloc(size, GFP_KERNEL);
75502 if (!dl)
75503 return -ENOMEM;
75504
75505 @@ -669,10 +669,10 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
75506 return -ENODEV;
75507
75508 BT_DBG("dev %p dst %s channel %d opened %d", dev, batostr(&dev->dst),
75509 - dev->channel, dev->port.count);
75510 + dev->channel, atomic_read(&dev->port.count));
75511
75512 spin_lock_irqsave(&dev->port.lock, flags);
75513 - if (++dev->port.count > 1) {
75514 + if (atomic_inc_return(&dev->port.count) > 1) {
75515 spin_unlock_irqrestore(&dev->port.lock, flags);
75516 return 0;
75517 }
75518 @@ -737,10 +737,10 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
75519 return;
75520
75521 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
75522 - dev->port.count);
75523 + atomic_read(&dev->port.count));
75524
75525 spin_lock_irqsave(&dev->port.lock, flags);
75526 - if (!--dev->port.count) {
75527 + if (!atomic_dec_return(&dev->port.count)) {
75528 spin_unlock_irqrestore(&dev->port.lock, flags);
75529 if (dev->tty_dev->parent)
75530 device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST);
75531 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
75532 index 5fe2ff3..10968b5 100644
75533 --- a/net/bridge/netfilter/ebtables.c
75534 +++ b/net/bridge/netfilter/ebtables.c
75535 @@ -1523,7 +1523,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
75536 tmp.valid_hooks = t->table->valid_hooks;
75537 }
75538 mutex_unlock(&ebt_mutex);
75539 - if (copy_to_user(user, &tmp, *len) != 0){
75540 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
75541 BUGPRINT("c2u Didn't work\n");
75542 ret = -EFAULT;
75543 break;
75544 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
75545 index 047cd0e..461fd28 100644
75546 --- a/net/caif/cfctrl.c
75547 +++ b/net/caif/cfctrl.c
75548 @@ -10,6 +10,7 @@
75549 #include <linux/spinlock.h>
75550 #include <linux/slab.h>
75551 #include <linux/pkt_sched.h>
75552 +#include <linux/sched.h>
75553 #include <net/caif/caif_layer.h>
75554 #include <net/caif/cfpkt.h>
75555 #include <net/caif/cfctrl.h>
75556 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
75557 memset(&dev_info, 0, sizeof(dev_info));
75558 dev_info.id = 0xff;
75559 cfsrvl_init(&this->serv, 0, &dev_info, false);
75560 - atomic_set(&this->req_seq_no, 1);
75561 - atomic_set(&this->rsp_seq_no, 1);
75562 + atomic_set_unchecked(&this->req_seq_no, 1);
75563 + atomic_set_unchecked(&this->rsp_seq_no, 1);
75564 this->serv.layer.receive = cfctrl_recv;
75565 sprintf(this->serv.layer.name, "ctrl");
75566 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
75567 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
75568 struct cfctrl_request_info *req)
75569 {
75570 spin_lock_bh(&ctrl->info_list_lock);
75571 - atomic_inc(&ctrl->req_seq_no);
75572 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
75573 + atomic_inc_unchecked(&ctrl->req_seq_no);
75574 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
75575 list_add_tail(&req->list, &ctrl->list);
75576 spin_unlock_bh(&ctrl->info_list_lock);
75577 }
75578 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
75579 if (p != first)
75580 pr_warn("Requests are not received in order\n");
75581
75582 - atomic_set(&ctrl->rsp_seq_no,
75583 + atomic_set_unchecked(&ctrl->rsp_seq_no,
75584 p->sequence_no);
75585 list_del(&p->list);
75586 goto out;
75587 diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
75588 index 69771c0..e597733 100644
75589 --- a/net/caif/chnl_net.c
75590 +++ b/net/caif/chnl_net.c
75591 @@ -94,6 +94,10 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
75592
75593 /* check the version of IP */
75594 ip_version = skb_header_pointer(skb, 0, 1, &buf);
75595 + if (!ip_version) {
75596 + kfree_skb(skb);
75597 + return -EINVAL;
75598 + }
75599
75600 switch (*ip_version >> 4) {
75601 case 4:
75602 diff --git a/net/can/gw.c b/net/can/gw.c
75603 index b41acf2..3affb3a 100644
75604 --- a/net/can/gw.c
75605 +++ b/net/can/gw.c
75606 @@ -96,7 +96,7 @@ struct cf_mod {
75607 struct {
75608 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
75609 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
75610 - } csumfunc;
75611 + } __no_const csumfunc;
75612 };
75613
75614
75615 diff --git a/net/compat.c b/net/compat.c
75616 index 74ed1d7..62f7ea6 100644
75617 --- a/net/compat.c
75618 +++ b/net/compat.c
75619 @@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
75620 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
75621 __get_user(kmsg->msg_flags, &umsg->msg_flags))
75622 return -EFAULT;
75623 - kmsg->msg_name = compat_ptr(tmp1);
75624 - kmsg->msg_iov = compat_ptr(tmp2);
75625 - kmsg->msg_control = compat_ptr(tmp3);
75626 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
75627 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
75628 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
75629 return 0;
75630 }
75631
75632 @@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75633
75634 if (kern_msg->msg_namelen) {
75635 if (mode == VERIFY_READ) {
75636 - int err = move_addr_to_kernel(kern_msg->msg_name,
75637 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
75638 kern_msg->msg_namelen,
75639 kern_address);
75640 if (err < 0)
75641 @@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75642 kern_msg->msg_name = NULL;
75643
75644 tot_len = iov_from_user_compat_to_kern(kern_iov,
75645 - (struct compat_iovec __user *)kern_msg->msg_iov,
75646 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
75647 kern_msg->msg_iovlen);
75648 if (tot_len >= 0)
75649 kern_msg->msg_iov = kern_iov;
75650 @@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75651
75652 #define CMSG_COMPAT_FIRSTHDR(msg) \
75653 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
75654 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
75655 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
75656 (struct compat_cmsghdr __user *)NULL)
75657
75658 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
75659 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
75660 (ucmlen) <= (unsigned long) \
75661 ((mhdr)->msg_controllen - \
75662 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
75663 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
75664
75665 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
75666 struct compat_cmsghdr __user *cmsg, int cmsg_len)
75667 {
75668 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
75669 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
75670 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
75671 msg->msg_controllen)
75672 return NULL;
75673 return (struct compat_cmsghdr __user *)ptr;
75674 @@ -219,7 +219,7 @@ Efault:
75675
75676 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
75677 {
75678 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75679 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75680 struct compat_cmsghdr cmhdr;
75681 struct compat_timeval ctv;
75682 struct compat_timespec cts[3];
75683 @@ -275,7 +275,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75684
75685 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
75686 {
75687 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75688 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75689 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
75690 int fdnum = scm->fp->count;
75691 struct file **fp = scm->fp->fp;
75692 @@ -364,7 +364,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
75693 return -EFAULT;
75694 old_fs = get_fs();
75695 set_fs(KERNEL_DS);
75696 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
75697 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
75698 set_fs(old_fs);
75699
75700 return err;
75701 @@ -425,7 +425,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
75702 len = sizeof(ktime);
75703 old_fs = get_fs();
75704 set_fs(KERNEL_DS);
75705 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
75706 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
75707 set_fs(old_fs);
75708
75709 if (!err) {
75710 @@ -568,7 +568,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75711 case MCAST_JOIN_GROUP:
75712 case MCAST_LEAVE_GROUP:
75713 {
75714 - struct compat_group_req __user *gr32 = (void *)optval;
75715 + struct compat_group_req __user *gr32 = (void __user *)optval;
75716 struct group_req __user *kgr =
75717 compat_alloc_user_space(sizeof(struct group_req));
75718 u32 interface;
75719 @@ -589,7 +589,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75720 case MCAST_BLOCK_SOURCE:
75721 case MCAST_UNBLOCK_SOURCE:
75722 {
75723 - struct compat_group_source_req __user *gsr32 = (void *)optval;
75724 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
75725 struct group_source_req __user *kgsr = compat_alloc_user_space(
75726 sizeof(struct group_source_req));
75727 u32 interface;
75728 @@ -610,7 +610,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75729 }
75730 case MCAST_MSFILTER:
75731 {
75732 - struct compat_group_filter __user *gf32 = (void *)optval;
75733 + struct compat_group_filter __user *gf32 = (void __user *)optval;
75734 struct group_filter __user *kgf;
75735 u32 interface, fmode, numsrc;
75736
75737 @@ -648,7 +648,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
75738 char __user *optval, int __user *optlen,
75739 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
75740 {
75741 - struct compat_group_filter __user *gf32 = (void *)optval;
75742 + struct compat_group_filter __user *gf32 = (void __user *)optval;
75743 struct group_filter __user *kgf;
75744 int __user *koptlen;
75745 u32 interface, fmode, numsrc;
75746 diff --git a/net/core/datagram.c b/net/core/datagram.c
75747 index ae6acf6..d5c8f66 100644
75748 --- a/net/core/datagram.c
75749 +++ b/net/core/datagram.c
75750 @@ -290,7 +290,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
75751 }
75752
75753 kfree_skb(skb);
75754 - atomic_inc(&sk->sk_drops);
75755 + atomic_inc_unchecked(&sk->sk_drops);
75756 sk_mem_reclaim_partial(sk);
75757
75758 return err;
75759 diff --git a/net/core/dev.c b/net/core/dev.c
75760 index a000840..566cee1 100644
75761 --- a/net/core/dev.c
75762 +++ b/net/core/dev.c
75763 @@ -1135,9 +1135,13 @@ void dev_load(struct net *net, const char *name)
75764 if (no_module && capable(CAP_NET_ADMIN))
75765 no_module = request_module("netdev-%s", name);
75766 if (no_module && capable(CAP_SYS_MODULE)) {
75767 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
75768 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
75769 +#else
75770 if (!request_module("%s", name))
75771 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
75772 name);
75773 +#endif
75774 }
75775 }
75776 EXPORT_SYMBOL(dev_load);
75777 @@ -1602,7 +1606,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75778 {
75779 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
75780 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
75781 - atomic_long_inc(&dev->rx_dropped);
75782 + atomic_long_inc_unchecked(&dev->rx_dropped);
75783 kfree_skb(skb);
75784 return NET_RX_DROP;
75785 }
75786 @@ -1612,7 +1616,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75787 nf_reset(skb);
75788
75789 if (unlikely(!is_skb_forwardable(dev, skb))) {
75790 - atomic_long_inc(&dev->rx_dropped);
75791 + atomic_long_inc_unchecked(&dev->rx_dropped);
75792 kfree_skb(skb);
75793 return NET_RX_DROP;
75794 }
75795 @@ -2041,7 +2045,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
75796
75797 struct dev_gso_cb {
75798 void (*destructor)(struct sk_buff *skb);
75799 -};
75800 +} __no_const;
75801
75802 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
75803
75804 @@ -2876,7 +2880,7 @@ enqueue:
75805
75806 local_irq_restore(flags);
75807
75808 - atomic_long_inc(&skb->dev->rx_dropped);
75809 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75810 kfree_skb(skb);
75811 return NET_RX_DROP;
75812 }
75813 @@ -2948,7 +2952,7 @@ int netif_rx_ni(struct sk_buff *skb)
75814 }
75815 EXPORT_SYMBOL(netif_rx_ni);
75816
75817 -static void net_tx_action(struct softirq_action *h)
75818 +static void net_tx_action(void)
75819 {
75820 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75821
75822 @@ -3235,7 +3239,7 @@ ncls:
75823 if (pt_prev) {
75824 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
75825 } else {
75826 - atomic_long_inc(&skb->dev->rx_dropped);
75827 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75828 kfree_skb(skb);
75829 /* Jamal, now you will not able to escape explaining
75830 * me how you were going to use this. :-)
75831 @@ -3800,7 +3804,7 @@ void netif_napi_del(struct napi_struct *napi)
75832 }
75833 EXPORT_SYMBOL(netif_napi_del);
75834
75835 -static void net_rx_action(struct softirq_action *h)
75836 +static void net_rx_action(void)
75837 {
75838 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75839 unsigned long time_limit = jiffies + 2;
75840 @@ -4270,8 +4274,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
75841 else
75842 seq_printf(seq, "%04x", ntohs(pt->type));
75843
75844 +#ifdef CONFIG_GRKERNSEC_HIDESYM
75845 + seq_printf(seq, " %-8s %p\n",
75846 + pt->dev ? pt->dev->name : "", NULL);
75847 +#else
75848 seq_printf(seq, " %-8s %pF\n",
75849 pt->dev ? pt->dev->name : "", pt->func);
75850 +#endif
75851 }
75852
75853 return 0;
75854 @@ -5823,7 +5832,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
75855 } else {
75856 netdev_stats_to_stats64(storage, &dev->stats);
75857 }
75858 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
75859 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
75860 return storage;
75861 }
75862 EXPORT_SYMBOL(dev_get_stats);
75863 diff --git a/net/core/flow.c b/net/core/flow.c
75864 index e318c7e..168b1d0 100644
75865 --- a/net/core/flow.c
75866 +++ b/net/core/flow.c
75867 @@ -61,7 +61,7 @@ struct flow_cache {
75868 struct timer_list rnd_timer;
75869 };
75870
75871 -atomic_t flow_cache_genid = ATOMIC_INIT(0);
75872 +atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75873 EXPORT_SYMBOL(flow_cache_genid);
75874 static struct flow_cache flow_cache_global;
75875 static struct kmem_cache *flow_cachep __read_mostly;
75876 @@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
75877
75878 static int flow_entry_valid(struct flow_cache_entry *fle)
75879 {
75880 - if (atomic_read(&flow_cache_genid) != fle->genid)
75881 + if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
75882 return 0;
75883 if (fle->object && !fle->object->ops->check(fle->object))
75884 return 0;
75885 @@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
75886 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
75887 fcp->hash_count++;
75888 }
75889 - } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
75890 + } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
75891 flo = fle->object;
75892 if (!flo)
75893 goto ret_object;
75894 @@ -280,7 +280,7 @@ nocache:
75895 }
75896 flo = resolver(net, key, family, dir, flo, ctx);
75897 if (fle) {
75898 - fle->genid = atomic_read(&flow_cache_genid);
75899 + fle->genid = atomic_read_unchecked(&flow_cache_genid);
75900 if (!IS_ERR(flo))
75901 fle->object = flo;
75902 else
75903 diff --git a/net/core/iovec.c b/net/core/iovec.c
75904 index 7e7aeb0..2a998cb 100644
75905 --- a/net/core/iovec.c
75906 +++ b/net/core/iovec.c
75907 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
75908 if (m->msg_namelen) {
75909 if (mode == VERIFY_READ) {
75910 void __user *namep;
75911 - namep = (void __user __force *) m->msg_name;
75912 + namep = (void __force_user *) m->msg_name;
75913 err = move_addr_to_kernel(namep, m->msg_namelen,
75914 address);
75915 if (err < 0)
75916 @@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
75917 }
75918
75919 size = m->msg_iovlen * sizeof(struct iovec);
75920 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
75921 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
75922 return -EFAULT;
75923
75924 m->msg_iov = iov;
75925 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
75926 index 6c50ac0..6b4c038 100644
75927 --- a/net/core/rtnetlink.c
75928 +++ b/net/core/rtnetlink.c
75929 @@ -58,7 +58,7 @@ struct rtnl_link {
75930 rtnl_doit_func doit;
75931 rtnl_dumpit_func dumpit;
75932 rtnl_calcit_func calcit;
75933 -};
75934 +} __no_const;
75935
75936 static DEFINE_MUTEX(rtnl_mutex);
75937
75938 diff --git a/net/core/scm.c b/net/core/scm.c
75939 index 611c5ef..88f6d6d 100644
75940 --- a/net/core/scm.c
75941 +++ b/net/core/scm.c
75942 @@ -219,7 +219,7 @@ EXPORT_SYMBOL(__scm_send);
75943 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75944 {
75945 struct cmsghdr __user *cm
75946 - = (__force struct cmsghdr __user *)msg->msg_control;
75947 + = (struct cmsghdr __force_user *)msg->msg_control;
75948 struct cmsghdr cmhdr;
75949 int cmlen = CMSG_LEN(len);
75950 int err;
75951 @@ -242,7 +242,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75952 err = -EFAULT;
75953 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75954 goto out;
75955 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75956 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75957 goto out;
75958 cmlen = CMSG_SPACE(len);
75959 if (msg->msg_controllen < cmlen)
75960 @@ -258,7 +258,7 @@ EXPORT_SYMBOL(put_cmsg);
75961 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75962 {
75963 struct cmsghdr __user *cm
75964 - = (__force struct cmsghdr __user*)msg->msg_control;
75965 + = (struct cmsghdr __force_user *)msg->msg_control;
75966
75967 int fdmax = 0;
75968 int fdnum = scm->fp->count;
75969 @@ -278,7 +278,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75970 if (fdnum < fdmax)
75971 fdmax = fdnum;
75972
75973 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75974 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75975 i++, cmfptr++)
75976 {
75977 int new_fd;
75978 diff --git a/net/core/sock.c b/net/core/sock.c
75979 index 9e5b71f..66dec30 100644
75980 --- a/net/core/sock.c
75981 +++ b/net/core/sock.c
75982 @@ -344,7 +344,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75983 struct sk_buff_head *list = &sk->sk_receive_queue;
75984
75985 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
75986 - atomic_inc(&sk->sk_drops);
75987 + atomic_inc_unchecked(&sk->sk_drops);
75988 trace_sock_rcvqueue_full(sk, skb);
75989 return -ENOMEM;
75990 }
75991 @@ -354,7 +354,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75992 return err;
75993
75994 if (!sk_rmem_schedule(sk, skb->truesize)) {
75995 - atomic_inc(&sk->sk_drops);
75996 + atomic_inc_unchecked(&sk->sk_drops);
75997 return -ENOBUFS;
75998 }
75999
76000 @@ -374,7 +374,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76001 skb_dst_force(skb);
76002
76003 spin_lock_irqsave(&list->lock, flags);
76004 - skb->dropcount = atomic_read(&sk->sk_drops);
76005 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
76006 __skb_queue_tail(list, skb);
76007 spin_unlock_irqrestore(&list->lock, flags);
76008
76009 @@ -394,7 +394,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
76010 skb->dev = NULL;
76011
76012 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
76013 - atomic_inc(&sk->sk_drops);
76014 + atomic_inc_unchecked(&sk->sk_drops);
76015 goto discard_and_relse;
76016 }
76017 if (nested)
76018 @@ -412,7 +412,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
76019 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
76020 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
76021 bh_unlock_sock(sk);
76022 - atomic_inc(&sk->sk_drops);
76023 + atomic_inc_unchecked(&sk->sk_drops);
76024 goto discard_and_relse;
76025 }
76026
76027 @@ -976,7 +976,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
76028 if (len > sizeof(peercred))
76029 len = sizeof(peercred);
76030 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
76031 - if (copy_to_user(optval, &peercred, len))
76032 + if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
76033 return -EFAULT;
76034 goto lenout;
76035 }
76036 @@ -989,7 +989,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
76037 return -ENOTCONN;
76038 if (lv < len)
76039 return -EINVAL;
76040 - if (copy_to_user(optval, address, len))
76041 + if (len > sizeof(address) || copy_to_user(optval, address, len))
76042 return -EFAULT;
76043 goto lenout;
76044 }
76045 @@ -1035,7 +1035,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
76046
76047 if (len > lv)
76048 len = lv;
76049 - if (copy_to_user(optval, &v, len))
76050 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
76051 return -EFAULT;
76052 lenout:
76053 if (put_user(len, optlen))
76054 @@ -2124,7 +2124,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
76055 */
76056 smp_wmb();
76057 atomic_set(&sk->sk_refcnt, 1);
76058 - atomic_set(&sk->sk_drops, 0);
76059 + atomic_set_unchecked(&sk->sk_drops, 0);
76060 }
76061 EXPORT_SYMBOL(sock_init_data);
76062
76063 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
76064 index 5fd1467..8b70900 100644
76065 --- a/net/core/sock_diag.c
76066 +++ b/net/core/sock_diag.c
76067 @@ -16,20 +16,27 @@ static DEFINE_MUTEX(sock_diag_table_mutex);
76068
76069 int sock_diag_check_cookie(void *sk, __u32 *cookie)
76070 {
76071 +#ifndef CONFIG_GRKERNSEC_HIDESYM
76072 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
76073 cookie[1] != INET_DIAG_NOCOOKIE) &&
76074 ((u32)(unsigned long)sk != cookie[0] ||
76075 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
76076 return -ESTALE;
76077 else
76078 +#endif
76079 return 0;
76080 }
76081 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
76082
76083 void sock_diag_save_cookie(void *sk, __u32 *cookie)
76084 {
76085 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76086 + cookie[0] = 0;
76087 + cookie[1] = 0;
76088 +#else
76089 cookie[0] = (u32)(unsigned long)sk;
76090 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
76091 +#endif
76092 }
76093 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
76094
76095 diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h
76096 index 75c3582..fb85d37 100644
76097 --- a/net/dccp/ccid.h
76098 +++ b/net/dccp/ccid.h
76099 @@ -246,7 +246,7 @@ static inline int ccid_hc_rx_getsockopt(struct ccid *ccid, struct sock *sk,
76100 u32 __user *optval, int __user *optlen)
76101 {
76102 int rc = -ENOPROTOOPT;
76103 - if (ccid->ccid_ops->ccid_hc_rx_getsockopt != NULL)
76104 + if (ccid != NULL && ccid->ccid_ops->ccid_hc_rx_getsockopt != NULL)
76105 rc = ccid->ccid_ops->ccid_hc_rx_getsockopt(sk, optname, len,
76106 optval, optlen);
76107 return rc;
76108 @@ -257,7 +257,7 @@ static inline int ccid_hc_tx_getsockopt(struct ccid *ccid, struct sock *sk,
76109 u32 __user *optval, int __user *optlen)
76110 {
76111 int rc = -ENOPROTOOPT;
76112 - if (ccid->ccid_ops->ccid_hc_tx_getsockopt != NULL)
76113 + if (ccid != NULL && ccid->ccid_ops->ccid_hc_tx_getsockopt != NULL)
76114 rc = ccid->ccid_ops->ccid_hc_tx_getsockopt(sk, optname, len,
76115 optval, optlen);
76116 return rc;
76117 diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
76118 index 8c67bed..ce0d140 100644
76119 --- a/net/dccp/ccids/ccid3.c
76120 +++ b/net/dccp/ccids/ccid3.c
76121 @@ -531,6 +531,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
76122 case DCCP_SOCKOPT_CCID_TX_INFO:
76123 if (len < sizeof(tfrc))
76124 return -EINVAL;
76125 + memset(&tfrc, 0, sizeof(tfrc));
76126 tfrc.tfrctx_x = hc->tx_x;
76127 tfrc.tfrctx_x_recv = hc->tx_x_recv;
76128 tfrc.tfrctx_x_calc = hc->tx_x_calc;
76129 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
76130 index a55eecc..dd8428c 100644
76131 --- a/net/decnet/sysctl_net_decnet.c
76132 +++ b/net/decnet/sysctl_net_decnet.c
76133 @@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
76134
76135 if (len > *lenp) len = *lenp;
76136
76137 - if (copy_to_user(buffer, addr, len))
76138 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
76139 return -EFAULT;
76140
76141 *lenp = len;
76142 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
76143
76144 if (len > *lenp) len = *lenp;
76145
76146 - if (copy_to_user(buffer, devname, len))
76147 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
76148 return -EFAULT;
76149
76150 *lenp = len;
76151 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
76152 index 3854411..2201a94 100644
76153 --- a/net/ipv4/fib_frontend.c
76154 +++ b/net/ipv4/fib_frontend.c
76155 @@ -969,12 +969,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
76156 #ifdef CONFIG_IP_ROUTE_MULTIPATH
76157 fib_sync_up(dev);
76158 #endif
76159 - atomic_inc(&net->ipv4.dev_addr_genid);
76160 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
76161 rt_cache_flush(dev_net(dev), -1);
76162 break;
76163 case NETDEV_DOWN:
76164 fib_del_ifaddr(ifa, NULL);
76165 - atomic_inc(&net->ipv4.dev_addr_genid);
76166 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
76167 if (ifa->ifa_dev->ifa_list == NULL) {
76168 /* Last address was deleted from this interface.
76169 * Disable IP.
76170 @@ -1010,7 +1010,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
76171 #ifdef CONFIG_IP_ROUTE_MULTIPATH
76172 fib_sync_up(dev);
76173 #endif
76174 - atomic_inc(&net->ipv4.dev_addr_genid);
76175 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
76176 rt_cache_flush(dev_net(dev), -1);
76177 break;
76178 case NETDEV_DOWN:
76179 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
76180 index e5b7182..570a90e 100644
76181 --- a/net/ipv4/fib_semantics.c
76182 +++ b/net/ipv4/fib_semantics.c
76183 @@ -698,7 +698,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
76184 nh->nh_saddr = inet_select_addr(nh->nh_dev,
76185 nh->nh_gw,
76186 nh->nh_parent->fib_scope);
76187 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
76188 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
76189
76190 return nh->nh_saddr;
76191 }
76192 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
76193 index 7880af9..70f92a3 100644
76194 --- a/net/ipv4/inet_hashtables.c
76195 +++ b/net/ipv4/inet_hashtables.c
76196 @@ -18,12 +18,15 @@
76197 #include <linux/sched.h>
76198 #include <linux/slab.h>
76199 #include <linux/wait.h>
76200 +#include <linux/security.h>
76201
76202 #include <net/inet_connection_sock.h>
76203 #include <net/inet_hashtables.h>
76204 #include <net/secure_seq.h>
76205 #include <net/ip.h>
76206
76207 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
76208 +
76209 /*
76210 * Allocate and initialize a new local port bind bucket.
76211 * The bindhash mutex for snum's hash chain must be held here.
76212 @@ -530,6 +533,8 @@ ok:
76213 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
76214 spin_unlock(&head->lock);
76215
76216 + gr_update_task_in_ip_table(current, inet_sk(sk));
76217 +
76218 if (tw) {
76219 inet_twsk_deschedule(tw, death_row);
76220 while (twrefcnt) {
76221 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
76222 index dfba343..c827d50 100644
76223 --- a/net/ipv4/inetpeer.c
76224 +++ b/net/ipv4/inetpeer.c
76225 @@ -487,8 +487,8 @@ relookup:
76226 if (p) {
76227 p->daddr = *daddr;
76228 atomic_set(&p->refcnt, 1);
76229 - atomic_set(&p->rid, 0);
76230 - atomic_set(&p->ip_id_count,
76231 + atomic_set_unchecked(&p->rid, 0);
76232 + atomic_set_unchecked(&p->ip_id_count,
76233 (daddr->family == AF_INET) ?
76234 secure_ip_id(daddr->addr.a4) :
76235 secure_ipv6_id(daddr->addr.a6));
76236 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
76237 index 9dbd3dd..0c59fb2 100644
76238 --- a/net/ipv4/ip_fragment.c
76239 +++ b/net/ipv4/ip_fragment.c
76240 @@ -318,7 +318,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
76241 return 0;
76242
76243 start = qp->rid;
76244 - end = atomic_inc_return(&peer->rid);
76245 + end = atomic_inc_return_unchecked(&peer->rid);
76246 qp->rid = end;
76247
76248 rc = qp->q.fragments && (end - start) > max;
76249 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
76250 index 0d11f23..2bb3f64 100644
76251 --- a/net/ipv4/ip_sockglue.c
76252 +++ b/net/ipv4/ip_sockglue.c
76253 @@ -1142,7 +1142,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
76254 len = min_t(unsigned int, len, opt->optlen);
76255 if (put_user(len, optlen))
76256 return -EFAULT;
76257 - if (copy_to_user(optval, opt->__data, len))
76258 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
76259 + copy_to_user(optval, opt->__data, len))
76260 return -EFAULT;
76261 return 0;
76262 }
76263 @@ -1273,7 +1274,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
76264 if (sk->sk_type != SOCK_STREAM)
76265 return -ENOPROTOOPT;
76266
76267 - msg.msg_control = optval;
76268 + msg.msg_control = (void __force_kernel *)optval;
76269 msg.msg_controllen = len;
76270 msg.msg_flags = flags;
76271
76272 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
76273 index 67e8a6b..386764d 100644
76274 --- a/net/ipv4/ipconfig.c
76275 +++ b/net/ipv4/ipconfig.c
76276 @@ -321,7 +321,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
76277
76278 mm_segment_t oldfs = get_fs();
76279 set_fs(get_ds());
76280 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
76281 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
76282 set_fs(oldfs);
76283 return res;
76284 }
76285 @@ -332,7 +332,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
76286
76287 mm_segment_t oldfs = get_fs();
76288 set_fs(get_ds());
76289 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
76290 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
76291 set_fs(oldfs);
76292 return res;
76293 }
76294 @@ -343,7 +343,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
76295
76296 mm_segment_t oldfs = get_fs();
76297 set_fs(get_ds());
76298 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
76299 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
76300 set_fs(oldfs);
76301 return res;
76302 }
76303 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
76304 index 2c00e8b..45b3bdd 100644
76305 --- a/net/ipv4/ping.c
76306 +++ b/net/ipv4/ping.c
76307 @@ -845,7 +845,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
76308 sk_rmem_alloc_get(sp),
76309 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76310 atomic_read(&sp->sk_refcnt), sp,
76311 - atomic_read(&sp->sk_drops), len);
76312 + atomic_read_unchecked(&sp->sk_drops), len);
76313 }
76314
76315 static int ping_seq_show(struct seq_file *seq, void *v)
76316 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
76317 index 4032b81..625143c 100644
76318 --- a/net/ipv4/raw.c
76319 +++ b/net/ipv4/raw.c
76320 @@ -304,7 +304,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
76321 int raw_rcv(struct sock *sk, struct sk_buff *skb)
76322 {
76323 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
76324 - atomic_inc(&sk->sk_drops);
76325 + atomic_inc_unchecked(&sk->sk_drops);
76326 kfree_skb(skb);
76327 return NET_RX_DROP;
76328 }
76329 @@ -740,16 +740,20 @@ static int raw_init(struct sock *sk)
76330
76331 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
76332 {
76333 + struct icmp_filter filter;
76334 +
76335 if (optlen > sizeof(struct icmp_filter))
76336 optlen = sizeof(struct icmp_filter);
76337 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
76338 + if (copy_from_user(&filter, optval, optlen))
76339 return -EFAULT;
76340 + raw_sk(sk)->filter = filter;
76341 return 0;
76342 }
76343
76344 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
76345 {
76346 int len, ret = -EFAULT;
76347 + struct icmp_filter filter;
76348
76349 if (get_user(len, optlen))
76350 goto out;
76351 @@ -759,8 +763,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
76352 if (len > sizeof(struct icmp_filter))
76353 len = sizeof(struct icmp_filter);
76354 ret = -EFAULT;
76355 - if (put_user(len, optlen) ||
76356 - copy_to_user(optval, &raw_sk(sk)->filter, len))
76357 + filter = raw_sk(sk)->filter;
76358 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
76359 goto out;
76360 ret = 0;
76361 out: return ret;
76362 @@ -988,7 +992,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76363 sk_wmem_alloc_get(sp),
76364 sk_rmem_alloc_get(sp),
76365 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76366 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76367 + atomic_read(&sp->sk_refcnt),
76368 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76369 + NULL,
76370 +#else
76371 + sp,
76372 +#endif
76373 + atomic_read_unchecked(&sp->sk_drops));
76374 }
76375
76376 static int raw_seq_show(struct seq_file *seq, void *v)
76377 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
76378 index 98b30d0..cfa3cf7 100644
76379 --- a/net/ipv4/route.c
76380 +++ b/net/ipv4/route.c
76381 @@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
76382
76383 static inline int rt_genid(struct net *net)
76384 {
76385 - return atomic_read(&net->ipv4.rt_genid);
76386 + return atomic_read_unchecked(&net->ipv4.rt_genid);
76387 }
76388
76389 #ifdef CONFIG_PROC_FS
76390 @@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
76391 unsigned char shuffle;
76392
76393 get_random_bytes(&shuffle, sizeof(shuffle));
76394 - atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
76395 + atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
76396 inetpeer_invalidate_tree(AF_INET);
76397 }
76398
76399 @@ -3011,7 +3011,7 @@ static int rt_fill_info(struct net *net,
76400 error = rt->dst.error;
76401 if (peer) {
76402 inet_peer_refcheck(rt->peer);
76403 - id = atomic_read(&peer->ip_id_count) & 0xffff;
76404 + id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
76405 if (peer->tcp_ts_stamp) {
76406 ts = peer->tcp_ts;
76407 tsage = get_seconds() - peer->tcp_ts_stamp;
76408 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
76409 index c8d28c4..e40f75a 100644
76410 --- a/net/ipv4/tcp_ipv4.c
76411 +++ b/net/ipv4/tcp_ipv4.c
76412 @@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly;
76413 EXPORT_SYMBOL(sysctl_tcp_low_latency);
76414
76415
76416 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76417 +extern int grsec_enable_blackhole;
76418 +#endif
76419 +
76420 #ifdef CONFIG_TCP_MD5SIG
76421 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
76422 __be32 daddr, __be32 saddr, const struct tcphdr *th);
76423 @@ -1656,6 +1660,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
76424 return 0;
76425
76426 reset:
76427 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76428 + if (!grsec_enable_blackhole)
76429 +#endif
76430 tcp_v4_send_reset(rsk, skb);
76431 discard:
76432 kfree_skb(skb);
76433 @@ -1718,12 +1725,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
76434 TCP_SKB_CB(skb)->sacked = 0;
76435
76436 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76437 - if (!sk)
76438 + if (!sk) {
76439 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76440 + ret = 1;
76441 +#endif
76442 goto no_tcp_socket;
76443 -
76444 + }
76445 process:
76446 - if (sk->sk_state == TCP_TIME_WAIT)
76447 + if (sk->sk_state == TCP_TIME_WAIT) {
76448 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76449 + ret = 2;
76450 +#endif
76451 goto do_time_wait;
76452 + }
76453
76454 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
76455 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76456 @@ -1774,6 +1788,10 @@ no_tcp_socket:
76457 bad_packet:
76458 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76459 } else {
76460 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76461 + if (!grsec_enable_blackhole || (ret == 1 &&
76462 + (skb->dev->flags & IFF_LOOPBACK)))
76463 +#endif
76464 tcp_v4_send_reset(NULL, skb);
76465 }
76466
76467 @@ -2386,7 +2404,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
76468 0, /* non standard timer */
76469 0, /* open_requests have no inode */
76470 atomic_read(&sk->sk_refcnt),
76471 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76472 + NULL,
76473 +#else
76474 req,
76475 +#endif
76476 len);
76477 }
76478
76479 @@ -2436,7 +2458,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
76480 sock_i_uid(sk),
76481 icsk->icsk_probes_out,
76482 sock_i_ino(sk),
76483 - atomic_read(&sk->sk_refcnt), sk,
76484 + atomic_read(&sk->sk_refcnt),
76485 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76486 + NULL,
76487 +#else
76488 + sk,
76489 +#endif
76490 jiffies_to_clock_t(icsk->icsk_rto),
76491 jiffies_to_clock_t(icsk->icsk_ack.ato),
76492 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
76493 @@ -2464,7 +2491,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
76494 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
76495 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
76496 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76497 - atomic_read(&tw->tw_refcnt), tw, len);
76498 + atomic_read(&tw->tw_refcnt),
76499 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76500 + NULL,
76501 +#else
76502 + tw,
76503 +#endif
76504 + len);
76505 }
76506
76507 #define TMPSZ 150
76508 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
76509 index b85d9fe..4b0eed9 100644
76510 --- a/net/ipv4/tcp_minisocks.c
76511 +++ b/net/ipv4/tcp_minisocks.c
76512 @@ -27,6 +27,10 @@
76513 #include <net/inet_common.h>
76514 #include <net/xfrm.h>
76515
76516 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76517 +extern int grsec_enable_blackhole;
76518 +#endif
76519 +
76520 int sysctl_tcp_syncookies __read_mostly = 1;
76521 EXPORT_SYMBOL(sysctl_tcp_syncookies);
76522
76523 @@ -754,6 +758,10 @@ listen_overflow:
76524
76525 embryonic_reset:
76526 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
76527 +
76528 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76529 + if (!grsec_enable_blackhole)
76530 +#endif
76531 if (!(flg & TCP_FLAG_RST))
76532 req->rsk_ops->send_reset(sk, skb);
76533
76534 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
76535 index 4526fe6..1a34e43 100644
76536 --- a/net/ipv4/tcp_probe.c
76537 +++ b/net/ipv4/tcp_probe.c
76538 @@ -204,7 +204,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
76539 if (cnt + width >= len)
76540 break;
76541
76542 - if (copy_to_user(buf + cnt, tbuf, width))
76543 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
76544 return -EFAULT;
76545 cnt += width;
76546 }
76547 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
76548 index e911e6c..d0a9356 100644
76549 --- a/net/ipv4/tcp_timer.c
76550 +++ b/net/ipv4/tcp_timer.c
76551 @@ -22,6 +22,10 @@
76552 #include <linux/gfp.h>
76553 #include <net/tcp.h>
76554
76555 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76556 +extern int grsec_lastack_retries;
76557 +#endif
76558 +
76559 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
76560 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
76561 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
76562 @@ -196,6 +200,13 @@ static int tcp_write_timeout(struct sock *sk)
76563 }
76564 }
76565
76566 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76567 + if ((sk->sk_state == TCP_LAST_ACK) &&
76568 + (grsec_lastack_retries > 0) &&
76569 + (grsec_lastack_retries < retry_until))
76570 + retry_until = grsec_lastack_retries;
76571 +#endif
76572 +
76573 if (retransmits_timed_out(sk, retry_until,
76574 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
76575 /* Has it gone just too far? */
76576 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
76577 index eaca736..60488ae 100644
76578 --- a/net/ipv4/udp.c
76579 +++ b/net/ipv4/udp.c
76580 @@ -87,6 +87,7 @@
76581 #include <linux/types.h>
76582 #include <linux/fcntl.h>
76583 #include <linux/module.h>
76584 +#include <linux/security.h>
76585 #include <linux/socket.h>
76586 #include <linux/sockios.h>
76587 #include <linux/igmp.h>
76588 @@ -110,6 +111,10 @@
76589 #include <linux/static_key.h>
76590 #include "udp_impl.h"
76591
76592 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76593 +extern int grsec_enable_blackhole;
76594 +#endif
76595 +
76596 struct udp_table udp_table __read_mostly;
76597 EXPORT_SYMBOL(udp_table);
76598
76599 @@ -568,6 +573,9 @@ found:
76600 return s;
76601 }
76602
76603 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
76604 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
76605 +
76606 /*
76607 * This routine is called by the ICMP module when it gets some
76608 * sort of error condition. If err < 0 then the socket should
76609 @@ -859,9 +867,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
76610 dport = usin->sin_port;
76611 if (dport == 0)
76612 return -EINVAL;
76613 +
76614 + err = gr_search_udp_sendmsg(sk, usin);
76615 + if (err)
76616 + return err;
76617 } else {
76618 if (sk->sk_state != TCP_ESTABLISHED)
76619 return -EDESTADDRREQ;
76620 +
76621 + err = gr_search_udp_sendmsg(sk, NULL);
76622 + if (err)
76623 + return err;
76624 +
76625 daddr = inet->inet_daddr;
76626 dport = inet->inet_dport;
76627 /* Open fast path for connected socket.
76628 @@ -1103,7 +1120,7 @@ static unsigned int first_packet_length(struct sock *sk)
76629 udp_lib_checksum_complete(skb)) {
76630 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76631 IS_UDPLITE(sk));
76632 - atomic_inc(&sk->sk_drops);
76633 + atomic_inc_unchecked(&sk->sk_drops);
76634 __skb_unlink(skb, rcvq);
76635 __skb_queue_tail(&list_kill, skb);
76636 }
76637 @@ -1189,6 +1206,10 @@ try_again:
76638 if (!skb)
76639 goto out;
76640
76641 + err = gr_search_udp_recvmsg(sk, skb);
76642 + if (err)
76643 + goto out_free;
76644 +
76645 ulen = skb->len - sizeof(struct udphdr);
76646 copied = len;
76647 if (copied > ulen)
76648 @@ -1498,7 +1519,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76649
76650 drop:
76651 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76652 - atomic_inc(&sk->sk_drops);
76653 + atomic_inc_unchecked(&sk->sk_drops);
76654 kfree_skb(skb);
76655 return -1;
76656 }
76657 @@ -1517,7 +1538,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76658 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
76659
76660 if (!skb1) {
76661 - atomic_inc(&sk->sk_drops);
76662 + atomic_inc_unchecked(&sk->sk_drops);
76663 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76664 IS_UDPLITE(sk));
76665 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76666 @@ -1686,6 +1707,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76667 goto csum_error;
76668
76669 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76670 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76671 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76672 +#endif
76673 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
76674
76675 /*
76676 @@ -2104,8 +2128,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
76677 sk_wmem_alloc_get(sp),
76678 sk_rmem_alloc_get(sp),
76679 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76680 - atomic_read(&sp->sk_refcnt), sp,
76681 - atomic_read(&sp->sk_drops), len);
76682 + atomic_read(&sp->sk_refcnt),
76683 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76684 + NULL,
76685 +#else
76686 + sp,
76687 +#endif
76688 + atomic_read_unchecked(&sp->sk_drops), len);
76689 }
76690
76691 int udp4_seq_show(struct seq_file *seq, void *v)
76692 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
76693 index 8f6411c..5767579 100644
76694 --- a/net/ipv6/addrconf.c
76695 +++ b/net/ipv6/addrconf.c
76696 @@ -2145,7 +2145,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
76697 p.iph.ihl = 5;
76698 p.iph.protocol = IPPROTO_IPV6;
76699 p.iph.ttl = 64;
76700 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
76701 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
76702
76703 if (ops->ndo_do_ioctl) {
76704 mm_segment_t oldfs = get_fs();
76705 diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
76706 index e6cee52..cf47476 100644
76707 --- a/net/ipv6/inet6_connection_sock.c
76708 +++ b/net/ipv6/inet6_connection_sock.c
76709 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
76710 #ifdef CONFIG_XFRM
76711 {
76712 struct rt6_info *rt = (struct rt6_info *)dst;
76713 - rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
76714 + rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
76715 }
76716 #endif
76717 }
76718 @@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
76719 #ifdef CONFIG_XFRM
76720 if (dst) {
76721 struct rt6_info *rt = (struct rt6_info *)dst;
76722 - if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
76723 + if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
76724 __sk_dst_reset(sk);
76725 dst = NULL;
76726 }
76727 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
76728 index ba6d13d..6899122 100644
76729 --- a/net/ipv6/ipv6_sockglue.c
76730 +++ b/net/ipv6/ipv6_sockglue.c
76731 @@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
76732 if (sk->sk_type != SOCK_STREAM)
76733 return -ENOPROTOOPT;
76734
76735 - msg.msg_control = optval;
76736 + msg.msg_control = (void __force_kernel *)optval;
76737 msg.msg_controllen = len;
76738 msg.msg_flags = flags;
76739
76740 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
76741 index 93d6983..8e54c4d 100644
76742 --- a/net/ipv6/raw.c
76743 +++ b/net/ipv6/raw.c
76744 @@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
76745 {
76746 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
76747 skb_checksum_complete(skb)) {
76748 - atomic_inc(&sk->sk_drops);
76749 + atomic_inc_unchecked(&sk->sk_drops);
76750 kfree_skb(skb);
76751 return NET_RX_DROP;
76752 }
76753 @@ -405,7 +405,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76754 struct raw6_sock *rp = raw6_sk(sk);
76755
76756 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76757 - atomic_inc(&sk->sk_drops);
76758 + atomic_inc_unchecked(&sk->sk_drops);
76759 kfree_skb(skb);
76760 return NET_RX_DROP;
76761 }
76762 @@ -429,7 +429,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76763
76764 if (inet->hdrincl) {
76765 if (skb_checksum_complete(skb)) {
76766 - atomic_inc(&sk->sk_drops);
76767 + atomic_inc_unchecked(&sk->sk_drops);
76768 kfree_skb(skb);
76769 return NET_RX_DROP;
76770 }
76771 @@ -602,7 +602,7 @@ out:
76772 return err;
76773 }
76774
76775 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76776 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76777 struct flowi6 *fl6, struct dst_entry **dstp,
76778 unsigned int flags)
76779 {
76780 @@ -914,12 +914,15 @@ do_confirm:
76781 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76782 char __user *optval, int optlen)
76783 {
76784 + struct icmp6_filter filter;
76785 +
76786 switch (optname) {
76787 case ICMPV6_FILTER:
76788 if (optlen > sizeof(struct icmp6_filter))
76789 optlen = sizeof(struct icmp6_filter);
76790 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76791 + if (copy_from_user(&filter, optval, optlen))
76792 return -EFAULT;
76793 + raw6_sk(sk)->filter = filter;
76794 return 0;
76795 default:
76796 return -ENOPROTOOPT;
76797 @@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76798 char __user *optval, int __user *optlen)
76799 {
76800 int len;
76801 + struct icmp6_filter filter;
76802
76803 switch (optname) {
76804 case ICMPV6_FILTER:
76805 @@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76806 len = sizeof(struct icmp6_filter);
76807 if (put_user(len, optlen))
76808 return -EFAULT;
76809 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76810 + filter = raw6_sk(sk)->filter;
76811 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
76812 return -EFAULT;
76813 return 0;
76814 default:
76815 @@ -1250,7 +1255,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76816 0, 0L, 0,
76817 sock_i_uid(sp), 0,
76818 sock_i_ino(sp),
76819 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76820 + atomic_read(&sp->sk_refcnt),
76821 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76822 + NULL,
76823 +#else
76824 + sp,
76825 +#endif
76826 + atomic_read_unchecked(&sp->sk_drops));
76827 }
76828
76829 static int raw6_seq_show(struct seq_file *seq, void *v)
76830 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
76831 index 9df64a5..39875da 100644
76832 --- a/net/ipv6/tcp_ipv6.c
76833 +++ b/net/ipv6/tcp_ipv6.c
76834 @@ -94,6 +94,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
76835 }
76836 #endif
76837
76838 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76839 +extern int grsec_enable_blackhole;
76840 +#endif
76841 +
76842 static void tcp_v6_hash(struct sock *sk)
76843 {
76844 if (sk->sk_state != TCP_CLOSE) {
76845 @@ -1544,6 +1548,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
76846 return 0;
76847
76848 reset:
76849 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76850 + if (!grsec_enable_blackhole)
76851 +#endif
76852 tcp_v6_send_reset(sk, skb);
76853 discard:
76854 if (opt_skb)
76855 @@ -1625,12 +1632,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
76856 TCP_SKB_CB(skb)->sacked = 0;
76857
76858 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76859 - if (!sk)
76860 + if (!sk) {
76861 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76862 + ret = 1;
76863 +#endif
76864 goto no_tcp_socket;
76865 + }
76866
76867 process:
76868 - if (sk->sk_state == TCP_TIME_WAIT)
76869 + if (sk->sk_state == TCP_TIME_WAIT) {
76870 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76871 + ret = 2;
76872 +#endif
76873 goto do_time_wait;
76874 + }
76875
76876 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
76877 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76878 @@ -1679,6 +1694,10 @@ no_tcp_socket:
76879 bad_packet:
76880 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76881 } else {
76882 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76883 + if (!grsec_enable_blackhole || (ret == 1 &&
76884 + (skb->dev->flags & IFF_LOOPBACK)))
76885 +#endif
76886 tcp_v6_send_reset(NULL, skb);
76887 }
76888
76889 @@ -1885,7 +1904,13 @@ static void get_openreq6(struct seq_file *seq,
76890 uid,
76891 0, /* non standard timer */
76892 0, /* open_requests have no inode */
76893 - 0, req);
76894 + 0,
76895 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76896 + NULL
76897 +#else
76898 + req
76899 +#endif
76900 + );
76901 }
76902
76903 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76904 @@ -1935,7 +1960,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76905 sock_i_uid(sp),
76906 icsk->icsk_probes_out,
76907 sock_i_ino(sp),
76908 - atomic_read(&sp->sk_refcnt), sp,
76909 + atomic_read(&sp->sk_refcnt),
76910 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76911 + NULL,
76912 +#else
76913 + sp,
76914 +#endif
76915 jiffies_to_clock_t(icsk->icsk_rto),
76916 jiffies_to_clock_t(icsk->icsk_ack.ato),
76917 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76918 @@ -1970,7 +2000,13 @@ static void get_timewait6_sock(struct seq_file *seq,
76919 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76920 tw->tw_substate, 0, 0,
76921 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76922 - atomic_read(&tw->tw_refcnt), tw);
76923 + atomic_read(&tw->tw_refcnt),
76924 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76925 + NULL
76926 +#else
76927 + tw
76928 +#endif
76929 + );
76930 }
76931
76932 static int tcp6_seq_show(struct seq_file *seq, void *v)
76933 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
76934 index f05099f..ea613f0 100644
76935 --- a/net/ipv6/udp.c
76936 +++ b/net/ipv6/udp.c
76937 @@ -50,6 +50,10 @@
76938 #include <linux/seq_file.h>
76939 #include "udp_impl.h"
76940
76941 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76942 +extern int grsec_enable_blackhole;
76943 +#endif
76944 +
76945 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76946 {
76947 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76948 @@ -615,7 +619,7 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76949 return rc;
76950 drop:
76951 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76952 - atomic_inc(&sk->sk_drops);
76953 + atomic_inc_unchecked(&sk->sk_drops);
76954 kfree_skb(skb);
76955 return -1;
76956 }
76957 @@ -673,7 +677,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76958 if (likely(skb1 == NULL))
76959 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
76960 if (!skb1) {
76961 - atomic_inc(&sk->sk_drops);
76962 + atomic_inc_unchecked(&sk->sk_drops);
76963 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76964 IS_UDPLITE(sk));
76965 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76966 @@ -844,6 +848,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76967 goto discard;
76968
76969 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76970 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76971 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76972 +#endif
76973 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
76974
76975 kfree_skb(skb);
76976 @@ -1453,8 +1460,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
76977 0, 0L, 0,
76978 sock_i_uid(sp), 0,
76979 sock_i_ino(sp),
76980 - atomic_read(&sp->sk_refcnt), sp,
76981 - atomic_read(&sp->sk_drops));
76982 + atomic_read(&sp->sk_refcnt),
76983 +#ifdef CONFIG_GRKERNSEC_HIDESYM
76984 + NULL,
76985 +#else
76986 + sp,
76987 +#endif
76988 + atomic_read_unchecked(&sp->sk_drops));
76989 }
76990
76991 int udp6_seq_show(struct seq_file *seq, void *v)
76992 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
76993 index 6b9d5a0..4dffaf1 100644
76994 --- a/net/irda/ircomm/ircomm_tty.c
76995 +++ b/net/irda/ircomm/ircomm_tty.c
76996 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76997 add_wait_queue(&self->open_wait, &wait);
76998
76999 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
77000 - __FILE__,__LINE__, tty->driver->name, self->open_count );
77001 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
77002
77003 /* As far as I can see, we protect open_count - Jean II */
77004 spin_lock_irqsave(&self->spinlock, flags);
77005 if (!tty_hung_up_p(filp)) {
77006 extra_count = 1;
77007 - self->open_count--;
77008 + local_dec(&self->open_count);
77009 }
77010 spin_unlock_irqrestore(&self->spinlock, flags);
77011 - self->blocked_open++;
77012 + local_inc(&self->blocked_open);
77013
77014 while (1) {
77015 if (tty->termios->c_cflag & CBAUD) {
77016 @@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
77017 }
77018
77019 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
77020 - __FILE__,__LINE__, tty->driver->name, self->open_count );
77021 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
77022
77023 schedule();
77024 }
77025 @@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
77026 if (extra_count) {
77027 /* ++ is not atomic, so this should be protected - Jean II */
77028 spin_lock_irqsave(&self->spinlock, flags);
77029 - self->open_count++;
77030 + local_inc(&self->open_count);
77031 spin_unlock_irqrestore(&self->spinlock, flags);
77032 }
77033 - self->blocked_open--;
77034 + local_dec(&self->blocked_open);
77035
77036 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
77037 - __FILE__,__LINE__, tty->driver->name, self->open_count);
77038 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
77039
77040 if (!retval)
77041 self->flags |= ASYNC_NORMAL_ACTIVE;
77042 @@ -412,14 +412,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
77043 }
77044 /* ++ is not atomic, so this should be protected - Jean II */
77045 spin_lock_irqsave(&self->spinlock, flags);
77046 - self->open_count++;
77047 + local_inc(&self->open_count);
77048
77049 tty->driver_data = self;
77050 self->tty = tty;
77051 spin_unlock_irqrestore(&self->spinlock, flags);
77052
77053 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
77054 - self->line, self->open_count);
77055 + self->line, local_read(&self->open_count));
77056
77057 /* Not really used by us, but lets do it anyway */
77058 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
77059 @@ -505,7 +505,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
77060 return;
77061 }
77062
77063 - if ((tty->count == 1) && (self->open_count != 1)) {
77064 + if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
77065 /*
77066 * Uh, oh. tty->count is 1, which means that the tty
77067 * structure will be freed. state->count should always
77068 @@ -515,16 +515,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
77069 */
77070 IRDA_DEBUG(0, "%s(), bad serial port count; "
77071 "tty->count is 1, state->count is %d\n", __func__ ,
77072 - self->open_count);
77073 - self->open_count = 1;
77074 + local_read(&self->open_count));
77075 + local_set(&self->open_count, 1);
77076 }
77077
77078 - if (--self->open_count < 0) {
77079 + if (local_dec_return(&self->open_count) < 0) {
77080 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
77081 - __func__, self->line, self->open_count);
77082 - self->open_count = 0;
77083 + __func__, self->line, local_read(&self->open_count));
77084 + local_set(&self->open_count, 0);
77085 }
77086 - if (self->open_count) {
77087 + if (local_read(&self->open_count)) {
77088 spin_unlock_irqrestore(&self->spinlock, flags);
77089
77090 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
77091 @@ -556,7 +556,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
77092 tty->closing = 0;
77093 self->tty = NULL;
77094
77095 - if (self->blocked_open) {
77096 + if (local_read(&self->blocked_open)) {
77097 if (self->close_delay)
77098 schedule_timeout_interruptible(self->close_delay);
77099 wake_up_interruptible(&self->open_wait);
77100 @@ -1008,7 +1008,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
77101 spin_lock_irqsave(&self->spinlock, flags);
77102 self->flags &= ~ASYNC_NORMAL_ACTIVE;
77103 self->tty = NULL;
77104 - self->open_count = 0;
77105 + local_set(&self->open_count, 0);
77106 spin_unlock_irqrestore(&self->spinlock, flags);
77107
77108 wake_up_interruptible(&self->open_wait);
77109 @@ -1355,7 +1355,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
77110 seq_putc(m, '\n');
77111
77112 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
77113 - seq_printf(m, "Open count: %d\n", self->open_count);
77114 + seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
77115 seq_printf(m, "Max data size: %d\n", self->max_data_size);
77116 seq_printf(m, "Max header size: %d\n", self->max_header_size);
77117
77118 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
77119 index cd6f7a9..e63fe89 100644
77120 --- a/net/iucv/af_iucv.c
77121 +++ b/net/iucv/af_iucv.c
77122 @@ -782,10 +782,10 @@ static int iucv_sock_autobind(struct sock *sk)
77123
77124 write_lock_bh(&iucv_sk_list.lock);
77125
77126 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
77127 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
77128 while (__iucv_get_sock_by_name(name)) {
77129 sprintf(name, "%08x",
77130 - atomic_inc_return(&iucv_sk_list.autobind_name));
77131 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
77132 }
77133
77134 write_unlock_bh(&iucv_sk_list.lock);
77135 diff --git a/net/key/af_key.c b/net/key/af_key.c
77136 index 34e4185..8823368 100644
77137 --- a/net/key/af_key.c
77138 +++ b/net/key/af_key.c
77139 @@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
77140 static u32 get_acqseq(void)
77141 {
77142 u32 res;
77143 - static atomic_t acqseq;
77144 + static atomic_unchecked_t acqseq;
77145
77146 do {
77147 - res = atomic_inc_return(&acqseq);
77148 + res = atomic_inc_return_unchecked(&acqseq);
77149 } while (!res);
77150 return res;
77151 }
77152 diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
77153 index 35e1e4b..9275471 100644
77154 --- a/net/l2tp/l2tp_ip6.c
77155 +++ b/net/l2tp/l2tp_ip6.c
77156 @@ -410,6 +410,7 @@ static int l2tp_ip6_getname(struct socket *sock, struct sockaddr *uaddr,
77157 lsa->l2tp_family = AF_INET6;
77158 lsa->l2tp_flowinfo = 0;
77159 lsa->l2tp_scope_id = 0;
77160 + lsa->l2tp_unused = 0;
77161 if (peer) {
77162 if (!lsk->peer_conn_id)
77163 return -ENOTCONN;
77164 diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
77165 index fe5453c..a13c3e23 100644
77166 --- a/net/llc/af_llc.c
77167 +++ b/net/llc/af_llc.c
77168 @@ -969,14 +969,13 @@ static int llc_ui_getname(struct socket *sock, struct sockaddr *uaddr,
77169 struct sockaddr_llc sllc;
77170 struct sock *sk = sock->sk;
77171 struct llc_sock *llc = llc_sk(sk);
77172 - int rc = 0;
77173 + int rc = -EBADF;
77174
77175 memset(&sllc, 0, sizeof(sllc));
77176 lock_sock(sk);
77177 if (sock_flag(sk, SOCK_ZAPPED))
77178 goto out;
77179 *uaddrlen = sizeof(sllc);
77180 - memset(uaddr, 0, *uaddrlen);
77181 if (peer) {
77182 rc = -ENOTCONN;
77183 if (sk->sk_state != TCP_ESTABLISHED)
77184 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
77185 index 3f3cd50..d2cf249 100644
77186 --- a/net/mac80211/ieee80211_i.h
77187 +++ b/net/mac80211/ieee80211_i.h
77188 @@ -28,6 +28,7 @@
77189 #include <net/ieee80211_radiotap.h>
77190 #include <net/cfg80211.h>
77191 #include <net/mac80211.h>
77192 +#include <asm/local.h>
77193 #include "key.h"
77194 #include "sta_info.h"
77195
77196 @@ -863,7 +864,7 @@ struct ieee80211_local {
77197 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
77198 spinlock_t queue_stop_reason_lock;
77199
77200 - int open_count;
77201 + local_t open_count;
77202 int monitors, cooked_mntrs;
77203 /* number of interfaces with corresponding FIF_ flags */
77204 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
77205 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
77206 index 8664111..1d6a065 100644
77207 --- a/net/mac80211/iface.c
77208 +++ b/net/mac80211/iface.c
77209 @@ -328,7 +328,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77210 break;
77211 }
77212
77213 - if (local->open_count == 0) {
77214 + if (local_read(&local->open_count) == 0) {
77215 res = drv_start(local);
77216 if (res)
77217 goto err_del_bss;
77218 @@ -371,7 +371,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77219 break;
77220 }
77221
77222 - if (local->monitors == 0 && local->open_count == 0) {
77223 + if (local->monitors == 0 && local_read(&local->open_count) == 0) {
77224 res = ieee80211_add_virtual_monitor(local);
77225 if (res)
77226 goto err_stop;
77227 @@ -468,7 +468,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77228 mutex_unlock(&local->mtx);
77229
77230 if (coming_up)
77231 - local->open_count++;
77232 + local_inc(&local->open_count);
77233
77234 if (hw_reconf_flags)
77235 ieee80211_hw_config(local, hw_reconf_flags);
77236 @@ -481,7 +481,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
77237 err_del_interface:
77238 drv_remove_interface(local, sdata);
77239 err_stop:
77240 - if (!local->open_count)
77241 + if (!local_read(&local->open_count))
77242 drv_stop(local);
77243 err_del_bss:
77244 sdata->bss = NULL;
77245 @@ -613,7 +613,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77246 }
77247
77248 if (going_down)
77249 - local->open_count--;
77250 + local_dec(&local->open_count);
77251
77252 switch (sdata->vif.type) {
77253 case NL80211_IFTYPE_AP_VLAN:
77254 @@ -685,7 +685,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77255
77256 ieee80211_recalc_ps(local, -1);
77257
77258 - if (local->open_count == 0) {
77259 + if (local_read(&local->open_count) == 0) {
77260 if (local->ops->napi_poll)
77261 napi_disable(&local->napi);
77262 ieee80211_clear_tx_pending(local);
77263 @@ -717,7 +717,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
77264 }
77265 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
77266
77267 - if (local->monitors == local->open_count && local->monitors > 0)
77268 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
77269 ieee80211_add_virtual_monitor(local);
77270 }
77271
77272 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
77273 index f5548e9..474a15f 100644
77274 --- a/net/mac80211/main.c
77275 +++ b/net/mac80211/main.c
77276 @@ -166,7 +166,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
77277 local->hw.conf.power_level = power;
77278 }
77279
77280 - if (changed && local->open_count) {
77281 + if (changed && local_read(&local->open_count)) {
77282 ret = drv_config(local, changed);
77283 /*
77284 * Goal:
77285 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
77286 index af1c4e2..24dbbe3 100644
77287 --- a/net/mac80211/pm.c
77288 +++ b/net/mac80211/pm.c
77289 @@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77290 struct ieee80211_sub_if_data *sdata;
77291 struct sta_info *sta;
77292
77293 - if (!local->open_count)
77294 + if (!local_read(&local->open_count))
77295 goto suspend;
77296
77297 ieee80211_scan_cancel(local);
77298 @@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77299 cancel_work_sync(&local->dynamic_ps_enable_work);
77300 del_timer_sync(&local->dynamic_ps_timer);
77301
77302 - local->wowlan = wowlan && local->open_count;
77303 + local->wowlan = wowlan && local_read(&local->open_count);
77304 if (local->wowlan) {
77305 int err = drv_suspend(local, wowlan);
77306 if (err < 0) {
77307 @@ -132,7 +132,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77308 drv_remove_interface(local, sdata);
77309
77310 /* stop hardware - this must stop RX */
77311 - if (local->open_count)
77312 + if (local_read(&local->open_count))
77313 ieee80211_stop_device(local);
77314
77315 suspend:
77316 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
77317 index 3313c11..bec9f17 100644
77318 --- a/net/mac80211/rate.c
77319 +++ b/net/mac80211/rate.c
77320 @@ -494,7 +494,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
77321
77322 ASSERT_RTNL();
77323
77324 - if (local->open_count)
77325 + if (local_read(&local->open_count))
77326 return -EBUSY;
77327
77328 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
77329 diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
77330 index c97a065..ff61928 100644
77331 --- a/net/mac80211/rc80211_pid_debugfs.c
77332 +++ b/net/mac80211/rc80211_pid_debugfs.c
77333 @@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
77334
77335 spin_unlock_irqrestore(&events->lock, status);
77336
77337 - if (copy_to_user(buf, pb, p))
77338 + if (p > sizeof(pb) || copy_to_user(buf, pb, p))
77339 return -EFAULT;
77340
77341 return p;
77342 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
77343 index f564b5e..22fee47 100644
77344 --- a/net/mac80211/util.c
77345 +++ b/net/mac80211/util.c
77346 @@ -1224,7 +1224,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
77347 }
77348 #endif
77349 /* everything else happens only if HW was up & running */
77350 - if (!local->open_count)
77351 + if (!local_read(&local->open_count))
77352 goto wake_up;
77353
77354 /*
77355 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
77356 index 209c1ed..39484dc 100644
77357 --- a/net/netfilter/Kconfig
77358 +++ b/net/netfilter/Kconfig
77359 @@ -851,6 +851,16 @@ config NETFILTER_XT_MATCH_ESP
77360
77361 To compile it as a module, choose M here. If unsure, say N.
77362
77363 +config NETFILTER_XT_MATCH_GRADM
77364 + tristate '"gradm" match support'
77365 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
77366 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
77367 + ---help---
77368 + The gradm match allows to match on grsecurity RBAC being enabled.
77369 + It is useful when iptables rules are applied early on bootup to
77370 + prevent connections to the machine (except from a trusted host)
77371 + while the RBAC system is disabled.
77372 +
77373 config NETFILTER_XT_MATCH_HASHLIMIT
77374 tristate '"hashlimit" match support'
77375 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
77376 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
77377 index 4e7960c..89e48d4 100644
77378 --- a/net/netfilter/Makefile
77379 +++ b/net/netfilter/Makefile
77380 @@ -87,6 +87,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
77381 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
77382 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
77383 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
77384 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
77385 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
77386 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
77387 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
77388 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
77389 index 1548df9..98ad9b4 100644
77390 --- a/net/netfilter/ipvs/ip_vs_conn.c
77391 +++ b/net/netfilter/ipvs/ip_vs_conn.c
77392 @@ -557,7 +557,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
77393 /* Increase the refcnt counter of the dest */
77394 atomic_inc(&dest->refcnt);
77395
77396 - conn_flags = atomic_read(&dest->conn_flags);
77397 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
77398 if (cp->protocol != IPPROTO_UDP)
77399 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
77400 flags = cp->flags;
77401 @@ -902,7 +902,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
77402 atomic_set(&cp->refcnt, 1);
77403
77404 atomic_set(&cp->n_control, 0);
77405 - atomic_set(&cp->in_pkts, 0);
77406 + atomic_set_unchecked(&cp->in_pkts, 0);
77407
77408 atomic_inc(&ipvs->conn_count);
77409 if (flags & IP_VS_CONN_F_NO_CPORT)
77410 @@ -1183,7 +1183,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
77411
77412 /* Don't drop the entry if its number of incoming packets is not
77413 located in [0, 8] */
77414 - i = atomic_read(&cp->in_pkts);
77415 + i = atomic_read_unchecked(&cp->in_pkts);
77416 if (i > 8 || i < 0) return 0;
77417
77418 if (!todrop_rate[i]) return 0;
77419 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
77420 index a54b018c..07e0120 100644
77421 --- a/net/netfilter/ipvs/ip_vs_core.c
77422 +++ b/net/netfilter/ipvs/ip_vs_core.c
77423 @@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
77424 ret = cp->packet_xmit(skb, cp, pd->pp);
77425 /* do not touch skb anymore */
77426
77427 - atomic_inc(&cp->in_pkts);
77428 + atomic_inc_unchecked(&cp->in_pkts);
77429 ip_vs_conn_put(cp);
77430 return ret;
77431 }
77432 @@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
77433 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
77434 pkts = sysctl_sync_threshold(ipvs);
77435 else
77436 - pkts = atomic_add_return(1, &cp->in_pkts);
77437 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77438
77439 if (ipvs->sync_state & IP_VS_STATE_MASTER)
77440 ip_vs_sync_conn(net, cp, pkts);
77441 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
77442 index 84444dd..f91c066 100644
77443 --- a/net/netfilter/ipvs/ip_vs_ctl.c
77444 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
77445 @@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
77446 ip_vs_rs_hash(ipvs, dest);
77447 write_unlock_bh(&ipvs->rs_lock);
77448 }
77449 - atomic_set(&dest->conn_flags, conn_flags);
77450 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
77451
77452 /* bind the service */
77453 if (!dest->svc) {
77454 @@ -2074,7 +2074,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77455 " %-7s %-6d %-10d %-10d\n",
77456 &dest->addr.in6,
77457 ntohs(dest->port),
77458 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77459 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77460 atomic_read(&dest->weight),
77461 atomic_read(&dest->activeconns),
77462 atomic_read(&dest->inactconns));
77463 @@ -2085,7 +2085,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77464 "%-7s %-6d %-10d %-10d\n",
77465 ntohl(dest->addr.ip),
77466 ntohs(dest->port),
77467 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77468 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77469 atomic_read(&dest->weight),
77470 atomic_read(&dest->activeconns),
77471 atomic_read(&dest->inactconns));
77472 @@ -2555,7 +2555,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
77473
77474 entry.addr = dest->addr.ip;
77475 entry.port = dest->port;
77476 - entry.conn_flags = atomic_read(&dest->conn_flags);
77477 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
77478 entry.weight = atomic_read(&dest->weight);
77479 entry.u_threshold = dest->u_threshold;
77480 entry.l_threshold = dest->l_threshold;
77481 @@ -2759,6 +2759,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
77482 {
77483 struct ip_vs_timeout_user t;
77484
77485 + memset(&t, 0, sizeof(t));
77486 __ip_vs_get_timeouts(net, &t);
77487 if (copy_to_user(user, &t, sizeof(t)) != 0)
77488 ret = -EFAULT;
77489 @@ -3089,7 +3090,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
77490 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
77491 nla_put_u16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
77492 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
77493 - (atomic_read(&dest->conn_flags) &
77494 + (atomic_read_unchecked(&dest->conn_flags) &
77495 IP_VS_CONN_F_FWD_MASK)) ||
77496 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
77497 atomic_read(&dest->weight)) ||
77498 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
77499 index effa10c..9058928 100644
77500 --- a/net/netfilter/ipvs/ip_vs_sync.c
77501 +++ b/net/netfilter/ipvs/ip_vs_sync.c
77502 @@ -596,7 +596,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
77503 cp = cp->control;
77504 if (cp) {
77505 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
77506 - pkts = atomic_add_return(1, &cp->in_pkts);
77507 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77508 else
77509 pkts = sysctl_sync_threshold(ipvs);
77510 ip_vs_sync_conn(net, cp->control, pkts);
77511 @@ -758,7 +758,7 @@ control:
77512 if (!cp)
77513 return;
77514 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
77515 - pkts = atomic_add_return(1, &cp->in_pkts);
77516 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77517 else
77518 pkts = sysctl_sync_threshold(ipvs);
77519 goto sloop;
77520 @@ -885,7 +885,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
77521
77522 if (opt)
77523 memcpy(&cp->in_seq, opt, sizeof(*opt));
77524 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77525 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77526 cp->state = state;
77527 cp->old_state = cp->state;
77528 /*
77529 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
77530 index 7fd66de..e6fb361 100644
77531 --- a/net/netfilter/ipvs/ip_vs_xmit.c
77532 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
77533 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
77534 else
77535 rc = NF_ACCEPT;
77536 /* do not touch skb anymore */
77537 - atomic_inc(&cp->in_pkts);
77538 + atomic_inc_unchecked(&cp->in_pkts);
77539 goto out;
77540 }
77541
77542 @@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
77543 else
77544 rc = NF_ACCEPT;
77545 /* do not touch skb anymore */
77546 - atomic_inc(&cp->in_pkts);
77547 + atomic_inc_unchecked(&cp->in_pkts);
77548 goto out;
77549 }
77550
77551 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
77552 index ac3af97..c134c21 100644
77553 --- a/net/netfilter/nf_conntrack_core.c
77554 +++ b/net/netfilter/nf_conntrack_core.c
77555 @@ -1530,6 +1530,10 @@ err_proto:
77556 #define UNCONFIRMED_NULLS_VAL ((1<<30)+0)
77557 #define DYING_NULLS_VAL ((1<<30)+1)
77558
77559 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77560 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
77561 +#endif
77562 +
77563 static int nf_conntrack_init_net(struct net *net)
77564 {
77565 int ret;
77566 @@ -1543,7 +1547,11 @@ static int nf_conntrack_init_net(struct net *net)
77567 goto err_stat;
77568 }
77569
77570 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77571 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
77572 +#else
77573 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
77574 +#endif
77575 if (!net->ct.slabname) {
77576 ret = -ENOMEM;
77577 goto err_slabname;
77578 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
77579 index 3c3cfc0..7a6ea1a 100644
77580 --- a/net/netfilter/nfnetlink_log.c
77581 +++ b/net/netfilter/nfnetlink_log.c
77582 @@ -70,7 +70,7 @@ struct nfulnl_instance {
77583 };
77584
77585 static DEFINE_SPINLOCK(instances_lock);
77586 -static atomic_t global_seq;
77587 +static atomic_unchecked_t global_seq;
77588
77589 #define INSTANCE_BUCKETS 16
77590 static struct hlist_head instance_table[INSTANCE_BUCKETS];
77591 @@ -517,7 +517,7 @@ __build_packet_message(struct nfulnl_instance *inst,
77592 /* global sequence number */
77593 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
77594 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
77595 - htonl(atomic_inc_return(&global_seq))))
77596 + htonl(atomic_inc_return_unchecked(&global_seq))))
77597 goto nla_put_failure;
77598
77599 if (data_len) {
77600 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
77601 new file mode 100644
77602 index 0000000..6905327
77603 --- /dev/null
77604 +++ b/net/netfilter/xt_gradm.c
77605 @@ -0,0 +1,51 @@
77606 +/*
77607 + * gradm match for netfilter
77608 + * Copyright © Zbigniew Krzystolik, 2010
77609 + *
77610 + * This program is free software; you can redistribute it and/or modify
77611 + * it under the terms of the GNU General Public License; either version
77612 + * 2 or 3 as published by the Free Software Foundation.
77613 + */
77614 +#include <linux/module.h>
77615 +#include <linux/moduleparam.h>
77616 +#include <linux/skbuff.h>
77617 +#include <linux/netfilter/x_tables.h>
77618 +#include <linux/grsecurity.h>
77619 +#include <linux/netfilter/xt_gradm.h>
77620 +
77621 +static bool
77622 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
77623 +{
77624 + const struct xt_gradm_mtinfo *info = par->matchinfo;
77625 + bool retval = false;
77626 + if (gr_acl_is_enabled())
77627 + retval = true;
77628 + return retval ^ info->invflags;
77629 +}
77630 +
77631 +static struct xt_match gradm_mt_reg __read_mostly = {
77632 + .name = "gradm",
77633 + .revision = 0,
77634 + .family = NFPROTO_UNSPEC,
77635 + .match = gradm_mt,
77636 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
77637 + .me = THIS_MODULE,
77638 +};
77639 +
77640 +static int __init gradm_mt_init(void)
77641 +{
77642 + return xt_register_match(&gradm_mt_reg);
77643 +}
77644 +
77645 +static void __exit gradm_mt_exit(void)
77646 +{
77647 + xt_unregister_match(&gradm_mt_reg);
77648 +}
77649 +
77650 +module_init(gradm_mt_init);
77651 +module_exit(gradm_mt_exit);
77652 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
77653 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
77654 +MODULE_LICENSE("GPL");
77655 +MODULE_ALIAS("ipt_gradm");
77656 +MODULE_ALIAS("ip6t_gradm");
77657 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
77658 index 4fe4fb4..87a89e5 100644
77659 --- a/net/netfilter/xt_statistic.c
77660 +++ b/net/netfilter/xt_statistic.c
77661 @@ -19,7 +19,7 @@
77662 #include <linux/module.h>
77663
77664 struct xt_statistic_priv {
77665 - atomic_t count;
77666 + atomic_unchecked_t count;
77667 } ____cacheline_aligned_in_smp;
77668
77669 MODULE_LICENSE("GPL");
77670 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
77671 break;
77672 case XT_STATISTIC_MODE_NTH:
77673 do {
77674 - oval = atomic_read(&info->master->count);
77675 + oval = atomic_read_unchecked(&info->master->count);
77676 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
77677 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
77678 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
77679 if (nval == 0)
77680 ret = !ret;
77681 break;
77682 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
77683 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
77684 if (info->master == NULL)
77685 return -ENOMEM;
77686 - atomic_set(&info->master->count, info->u.nth.count);
77687 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
77688
77689 return 0;
77690 }
77691 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
77692 index b3025a6..e21e5297 100644
77693 --- a/net/netlink/af_netlink.c
77694 +++ b/net/netlink/af_netlink.c
77695 @@ -753,7 +753,7 @@ static void netlink_overrun(struct sock *sk)
77696 sk->sk_error_report(sk);
77697 }
77698 }
77699 - atomic_inc(&sk->sk_drops);
77700 + atomic_inc_unchecked(&sk->sk_drops);
77701 }
77702
77703 static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
77704 @@ -1344,7 +1344,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
77705 if (NULL == siocb->scm)
77706 siocb->scm = &scm;
77707
77708 - err = scm_send(sock, msg, siocb->scm);
77709 + err = scm_send(sock, msg, siocb->scm, true);
77710 if (err < 0)
77711 return err;
77712
77713 @@ -2022,7 +2022,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
77714 sk_wmem_alloc_get(s),
77715 nlk->cb,
77716 atomic_read(&s->sk_refcnt),
77717 - atomic_read(&s->sk_drops),
77718 + atomic_read_unchecked(&s->sk_drops),
77719 sock_i_ino(s)
77720 );
77721
77722 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
77723 index 06592d8..64860f6 100644
77724 --- a/net/netrom/af_netrom.c
77725 +++ b/net/netrom/af_netrom.c
77726 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
77727 struct sock *sk = sock->sk;
77728 struct nr_sock *nr = nr_sk(sk);
77729
77730 + memset(sax, 0, sizeof(*sax));
77731 lock_sock(sk);
77732 if (peer != 0) {
77733 if (sk->sk_state != TCP_ESTABLISHED) {
77734 @@ -852,7 +853,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
77735 *uaddr_len = sizeof(struct full_sockaddr_ax25);
77736 } else {
77737 sax->fsa_ax25.sax25_family = AF_NETROM;
77738 - sax->fsa_ax25.sax25_ndigis = 0;
77739 sax->fsa_ax25.sax25_call = nr->source_addr;
77740 *uaddr_len = sizeof(struct sockaddr_ax25);
77741 }
77742 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
77743 index 0f66174..e7cb04c 100644
77744 --- a/net/packet/af_packet.c
77745 +++ b/net/packet/af_packet.c
77746 @@ -1687,7 +1687,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
77747
77748 spin_lock(&sk->sk_receive_queue.lock);
77749 po->stats.tp_packets++;
77750 - skb->dropcount = atomic_read(&sk->sk_drops);
77751 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
77752 __skb_queue_tail(&sk->sk_receive_queue, skb);
77753 spin_unlock(&sk->sk_receive_queue.lock);
77754 sk->sk_data_ready(sk, skb->len);
77755 @@ -1696,7 +1696,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
77756 drop_n_acct:
77757 spin_lock(&sk->sk_receive_queue.lock);
77758 po->stats.tp_drops++;
77759 - atomic_inc(&sk->sk_drops);
77760 + atomic_inc_unchecked(&sk->sk_drops);
77761 spin_unlock(&sk->sk_receive_queue.lock);
77762
77763 drop_n_restore:
77764 @@ -2641,6 +2641,7 @@ out:
77765
77766 static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
77767 {
77768 + struct sock_extended_err ee;
77769 struct sock_exterr_skb *serr;
77770 struct sk_buff *skb, *skb2;
77771 int copied, err;
77772 @@ -2662,8 +2663,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
77773 sock_recv_timestamp(msg, sk, skb);
77774
77775 serr = SKB_EXT_ERR(skb);
77776 + ee = serr->ee;
77777 put_cmsg(msg, SOL_PACKET, PACKET_TX_TIMESTAMP,
77778 - sizeof(serr->ee), &serr->ee);
77779 + sizeof ee, &ee);
77780
77781 msg->msg_flags |= MSG_ERRQUEUE;
77782 err = copied;
77783 @@ -3275,7 +3277,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
77784 case PACKET_HDRLEN:
77785 if (len > sizeof(int))
77786 len = sizeof(int);
77787 - if (copy_from_user(&val, optval, len))
77788 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
77789 return -EFAULT;
77790 switch (val) {
77791 case TPACKET_V1:
77792 @@ -3314,7 +3316,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
77793 len = lv;
77794 if (put_user(len, optlen))
77795 return -EFAULT;
77796 - if (copy_to_user(optval, data, len))
77797 + if (len > sizeof(st) || copy_to_user(optval, data, len))
77798 return -EFAULT;
77799 return 0;
77800 }
77801 diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
77802 index 5a940db..f0b9c12 100644
77803 --- a/net/phonet/af_phonet.c
77804 +++ b/net/phonet/af_phonet.c
77805 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_proto_get(unsigned int protocol)
77806 {
77807 struct phonet_protocol *pp;
77808
77809 - if (protocol >= PHONET_NPROTO)
77810 + if (protocol < 0 || protocol >= PHONET_NPROTO)
77811 return NULL;
77812
77813 rcu_read_lock();
77814 @@ -469,7 +469,7 @@ int __init_or_module phonet_proto_register(unsigned int protocol,
77815 {
77816 int err = 0;
77817
77818 - if (protocol >= PHONET_NPROTO)
77819 + if (protocol < 0 || protocol >= PHONET_NPROTO)
77820 return -EINVAL;
77821
77822 err = proto_register(pp->prot, 1);
77823 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
77824 index 576f22c..bc7a71b 100644
77825 --- a/net/phonet/pep.c
77826 +++ b/net/phonet/pep.c
77827 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
77828
77829 case PNS_PEP_CTRL_REQ:
77830 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
77831 - atomic_inc(&sk->sk_drops);
77832 + atomic_inc_unchecked(&sk->sk_drops);
77833 break;
77834 }
77835 __skb_pull(skb, 4);
77836 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
77837 }
77838
77839 if (pn->rx_credits == 0) {
77840 - atomic_inc(&sk->sk_drops);
77841 + atomic_inc_unchecked(&sk->sk_drops);
77842 err = -ENOBUFS;
77843 break;
77844 }
77845 @@ -580,7 +580,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
77846 }
77847
77848 if (pn->rx_credits == 0) {
77849 - atomic_inc(&sk->sk_drops);
77850 + atomic_inc_unchecked(&sk->sk_drops);
77851 err = NET_RX_DROP;
77852 break;
77853 }
77854 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
77855 index 0acc943..c727611 100644
77856 --- a/net/phonet/socket.c
77857 +++ b/net/phonet/socket.c
77858 @@ -613,8 +613,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
77859 pn->resource, sk->sk_state,
77860 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
77861 sock_i_uid(sk), sock_i_ino(sk),
77862 - atomic_read(&sk->sk_refcnt), sk,
77863 - atomic_read(&sk->sk_drops), &len);
77864 + atomic_read(&sk->sk_refcnt),
77865 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77866 + NULL,
77867 +#else
77868 + sk,
77869 +#endif
77870 + atomic_read_unchecked(&sk->sk_drops), &len);
77871 }
77872 seq_printf(seq, "%*s\n", 127 - len, "");
77873 return 0;
77874 diff --git a/net/rds/cong.c b/net/rds/cong.c
77875 index e5b65ac..f3b6fb7 100644
77876 --- a/net/rds/cong.c
77877 +++ b/net/rds/cong.c
77878 @@ -78,7 +78,7 @@
77879 * finds that the saved generation number is smaller than the global generation
77880 * number, it wakes up the process.
77881 */
77882 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
77883 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
77884
77885 /*
77886 * Congestion monitoring
77887 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
77888 rdsdebug("waking map %p for %pI4\n",
77889 map, &map->m_addr);
77890 rds_stats_inc(s_cong_update_received);
77891 - atomic_inc(&rds_cong_generation);
77892 + atomic_inc_unchecked(&rds_cong_generation);
77893 if (waitqueue_active(&map->m_waitq))
77894 wake_up(&map->m_waitq);
77895 if (waitqueue_active(&rds_poll_waitq))
77896 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
77897
77898 int rds_cong_updated_since(unsigned long *recent)
77899 {
77900 - unsigned long gen = atomic_read(&rds_cong_generation);
77901 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
77902
77903 if (likely(*recent == gen))
77904 return 0;
77905 diff --git a/net/rds/ib.h b/net/rds/ib.h
77906 index 8d2b3d5..227ec5b 100644
77907 --- a/net/rds/ib.h
77908 +++ b/net/rds/ib.h
77909 @@ -128,7 +128,7 @@ struct rds_ib_connection {
77910 /* sending acks */
77911 unsigned long i_ack_flags;
77912 #ifdef KERNEL_HAS_ATOMIC64
77913 - atomic64_t i_ack_next; /* next ACK to send */
77914 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
77915 #else
77916 spinlock_t i_ack_lock; /* protect i_ack_next */
77917 u64 i_ack_next; /* next ACK to send */
77918 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
77919 index a1e1162..265e129 100644
77920 --- a/net/rds/ib_cm.c
77921 +++ b/net/rds/ib_cm.c
77922 @@ -718,7 +718,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
77923 /* Clear the ACK state */
77924 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
77925 #ifdef KERNEL_HAS_ATOMIC64
77926 - atomic64_set(&ic->i_ack_next, 0);
77927 + atomic64_set_unchecked(&ic->i_ack_next, 0);
77928 #else
77929 ic->i_ack_next = 0;
77930 #endif
77931 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
77932 index 8d19491..05a3e65 100644
77933 --- a/net/rds/ib_recv.c
77934 +++ b/net/rds/ib_recv.c
77935 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
77936 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
77937 int ack_required)
77938 {
77939 - atomic64_set(&ic->i_ack_next, seq);
77940 + atomic64_set_unchecked(&ic->i_ack_next, seq);
77941 if (ack_required) {
77942 smp_mb__before_clear_bit();
77943 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
77944 @@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
77945 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
77946 smp_mb__after_clear_bit();
77947
77948 - return atomic64_read(&ic->i_ack_next);
77949 + return atomic64_read_unchecked(&ic->i_ack_next);
77950 }
77951 #endif
77952
77953 diff --git a/net/rds/iw.h b/net/rds/iw.h
77954 index 04ce3b1..48119a6 100644
77955 --- a/net/rds/iw.h
77956 +++ b/net/rds/iw.h
77957 @@ -134,7 +134,7 @@ struct rds_iw_connection {
77958 /* sending acks */
77959 unsigned long i_ack_flags;
77960 #ifdef KERNEL_HAS_ATOMIC64
77961 - atomic64_t i_ack_next; /* next ACK to send */
77962 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
77963 #else
77964 spinlock_t i_ack_lock; /* protect i_ack_next */
77965 u64 i_ack_next; /* next ACK to send */
77966 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
77967 index a91e1db..cf3053f 100644
77968 --- a/net/rds/iw_cm.c
77969 +++ b/net/rds/iw_cm.c
77970 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
77971 /* Clear the ACK state */
77972 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
77973 #ifdef KERNEL_HAS_ATOMIC64
77974 - atomic64_set(&ic->i_ack_next, 0);
77975 + atomic64_set_unchecked(&ic->i_ack_next, 0);
77976 #else
77977 ic->i_ack_next = 0;
77978 #endif
77979 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
77980 index 4503335..db566b4 100644
77981 --- a/net/rds/iw_recv.c
77982 +++ b/net/rds/iw_recv.c
77983 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
77984 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
77985 int ack_required)
77986 {
77987 - atomic64_set(&ic->i_ack_next, seq);
77988 + atomic64_set_unchecked(&ic->i_ack_next, seq);
77989 if (ack_required) {
77990 smp_mb__before_clear_bit();
77991 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
77992 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
77993 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
77994 smp_mb__after_clear_bit();
77995
77996 - return atomic64_read(&ic->i_ack_next);
77997 + return atomic64_read_unchecked(&ic->i_ack_next);
77998 }
77999 #endif
78000
78001 diff --git a/net/rds/recv.c b/net/rds/recv.c
78002 index 5c6e9f1..9f0f17c 100644
78003 --- a/net/rds/recv.c
78004 +++ b/net/rds/recv.c
78005 @@ -410,6 +410,8 @@ int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
78006
78007 rdsdebug("size %zu flags 0x%x timeo %ld\n", size, msg_flags, timeo);
78008
78009 + msg->msg_namelen = 0;
78010 +
78011 if (msg_flags & MSG_OOB)
78012 goto out;
78013
78014 @@ -485,6 +487,7 @@ int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
78015 sin->sin_port = inc->i_hdr.h_sport;
78016 sin->sin_addr.s_addr = inc->i_saddr;
78017 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
78018 + msg->msg_namelen = sizeof(*sin);
78019 }
78020 break;
78021 }
78022 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
78023 index edac9ef..16bcb98 100644
78024 --- a/net/rds/tcp.c
78025 +++ b/net/rds/tcp.c
78026 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
78027 int val = 1;
78028
78029 set_fs(KERNEL_DS);
78030 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
78031 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
78032 sizeof(val));
78033 set_fs(oldfs);
78034 }
78035 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
78036 index 1b4fd68..2234175 100644
78037 --- a/net/rds/tcp_send.c
78038 +++ b/net/rds/tcp_send.c
78039 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
78040
78041 oldfs = get_fs();
78042 set_fs(KERNEL_DS);
78043 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
78044 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
78045 sizeof(val));
78046 set_fs(oldfs);
78047 }
78048 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
78049 index 05996d0..5a1dfe0 100644
78050 --- a/net/rxrpc/af_rxrpc.c
78051 +++ b/net/rxrpc/af_rxrpc.c
78052 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ops;
78053 __be32 rxrpc_epoch;
78054
78055 /* current debugging ID */
78056 -atomic_t rxrpc_debug_id;
78057 +atomic_unchecked_t rxrpc_debug_id;
78058
78059 /* count of skbs currently in use */
78060 atomic_t rxrpc_n_skbs;
78061 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
78062 index e4d9cbc..b229649 100644
78063 --- a/net/rxrpc/ar-ack.c
78064 +++ b/net/rxrpc/ar-ack.c
78065 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
78066
78067 _enter("{%d,%d,%d,%d},",
78068 call->acks_hard, call->acks_unacked,
78069 - atomic_read(&call->sequence),
78070 + atomic_read_unchecked(&call->sequence),
78071 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
78072
78073 stop = 0;
78074 @@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
78075
78076 /* each Tx packet has a new serial number */
78077 sp->hdr.serial =
78078 - htonl(atomic_inc_return(&call->conn->serial));
78079 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
78080
78081 hdr = (struct rxrpc_header *) txb->head;
78082 hdr->serial = sp->hdr.serial;
78083 @@ -403,7 +403,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
78084 */
78085 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
78086 {
78087 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
78088 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
78089 }
78090
78091 /*
78092 @@ -629,7 +629,7 @@ process_further:
78093
78094 latest = ntohl(sp->hdr.serial);
78095 hard = ntohl(ack.firstPacket);
78096 - tx = atomic_read(&call->sequence);
78097 + tx = atomic_read_unchecked(&call->sequence);
78098
78099 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
78100 latest,
78101 @@ -1161,7 +1161,7 @@ void rxrpc_process_call(struct work_struct *work)
78102 goto maybe_reschedule;
78103
78104 send_ACK_with_skew:
78105 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
78106 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
78107 ntohl(ack.serial));
78108 send_ACK:
78109 mtu = call->conn->trans->peer->if_mtu;
78110 @@ -1173,7 +1173,7 @@ send_ACK:
78111 ackinfo.rxMTU = htonl(5692);
78112 ackinfo.jumbo_max = htonl(4);
78113
78114 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
78115 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
78116 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
78117 ntohl(hdr.serial),
78118 ntohs(ack.maxSkew),
78119 @@ -1191,7 +1191,7 @@ send_ACK:
78120 send_message:
78121 _debug("send message");
78122
78123 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
78124 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
78125 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
78126 send_message_2:
78127
78128 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
78129 index a3bbb36..3341fb9 100644
78130 --- a/net/rxrpc/ar-call.c
78131 +++ b/net/rxrpc/ar-call.c
78132 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
78133 spin_lock_init(&call->lock);
78134 rwlock_init(&call->state_lock);
78135 atomic_set(&call->usage, 1);
78136 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
78137 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
78138 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
78139
78140 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
78141 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
78142 index 4106ca9..a338d7a 100644
78143 --- a/net/rxrpc/ar-connection.c
78144 +++ b/net/rxrpc/ar-connection.c
78145 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
78146 rwlock_init(&conn->lock);
78147 spin_lock_init(&conn->state_lock);
78148 atomic_set(&conn->usage, 1);
78149 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
78150 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
78151 conn->avail_calls = RXRPC_MAXCALLS;
78152 conn->size_align = 4;
78153 conn->header_size = sizeof(struct rxrpc_header);
78154 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
78155 index e7ed43a..6afa140 100644
78156 --- a/net/rxrpc/ar-connevent.c
78157 +++ b/net/rxrpc/ar-connevent.c
78158 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
78159
78160 len = iov[0].iov_len + iov[1].iov_len;
78161
78162 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
78163 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
78164 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
78165
78166 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
78167 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
78168 index 529572f..c758ca7 100644
78169 --- a/net/rxrpc/ar-input.c
78170 +++ b/net/rxrpc/ar-input.c
78171 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
78172 /* track the latest serial number on this connection for ACK packet
78173 * information */
78174 serial = ntohl(sp->hdr.serial);
78175 - hi_serial = atomic_read(&call->conn->hi_serial);
78176 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
78177 while (serial > hi_serial)
78178 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
78179 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
78180 serial);
78181
78182 /* request ACK generation for any ACK or DATA packet that requests
78183 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
78184 index a693aca..81e7293 100644
78185 --- a/net/rxrpc/ar-internal.h
78186 +++ b/net/rxrpc/ar-internal.h
78187 @@ -272,8 +272,8 @@ struct rxrpc_connection {
78188 int error; /* error code for local abort */
78189 int debug_id; /* debug ID for printks */
78190 unsigned int call_counter; /* call ID counter */
78191 - atomic_t serial; /* packet serial number counter */
78192 - atomic_t hi_serial; /* highest serial number received */
78193 + atomic_unchecked_t serial; /* packet serial number counter */
78194 + atomic_unchecked_t hi_serial; /* highest serial number received */
78195 u8 avail_calls; /* number of calls available */
78196 u8 size_align; /* data size alignment (for security) */
78197 u8 header_size; /* rxrpc + security header size */
78198 @@ -346,7 +346,7 @@ struct rxrpc_call {
78199 spinlock_t lock;
78200 rwlock_t state_lock; /* lock for state transition */
78201 atomic_t usage;
78202 - atomic_t sequence; /* Tx data packet sequence counter */
78203 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
78204 u32 abort_code; /* local/remote abort code */
78205 enum { /* current state of call */
78206 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
78207 @@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
78208 */
78209 extern atomic_t rxrpc_n_skbs;
78210 extern __be32 rxrpc_epoch;
78211 -extern atomic_t rxrpc_debug_id;
78212 +extern atomic_unchecked_t rxrpc_debug_id;
78213 extern struct workqueue_struct *rxrpc_workqueue;
78214
78215 /*
78216 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
78217 index 87f7135..74d3703 100644
78218 --- a/net/rxrpc/ar-local.c
78219 +++ b/net/rxrpc/ar-local.c
78220 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
78221 spin_lock_init(&local->lock);
78222 rwlock_init(&local->services_lock);
78223 atomic_set(&local->usage, 1);
78224 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
78225 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
78226 memcpy(&local->srx, srx, sizeof(*srx));
78227 }
78228
78229 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
78230 index 16ae887..d24f12b 100644
78231 --- a/net/rxrpc/ar-output.c
78232 +++ b/net/rxrpc/ar-output.c
78233 @@ -682,9 +682,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
78234 sp->hdr.cid = call->cid;
78235 sp->hdr.callNumber = call->call_id;
78236 sp->hdr.seq =
78237 - htonl(atomic_inc_return(&call->sequence));
78238 + htonl(atomic_inc_return_unchecked(&call->sequence));
78239 sp->hdr.serial =
78240 - htonl(atomic_inc_return(&conn->serial));
78241 + htonl(atomic_inc_return_unchecked(&conn->serial));
78242 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
78243 sp->hdr.userStatus = 0;
78244 sp->hdr.securityIndex = conn->security_ix;
78245 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
78246 index bebaa43..2644591 100644
78247 --- a/net/rxrpc/ar-peer.c
78248 +++ b/net/rxrpc/ar-peer.c
78249 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
78250 INIT_LIST_HEAD(&peer->error_targets);
78251 spin_lock_init(&peer->lock);
78252 atomic_set(&peer->usage, 1);
78253 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
78254 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
78255 memcpy(&peer->srx, srx, sizeof(*srx));
78256
78257 rxrpc_assess_MTU_size(peer);
78258 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
78259 index 38047f7..9f48511 100644
78260 --- a/net/rxrpc/ar-proc.c
78261 +++ b/net/rxrpc/ar-proc.c
78262 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
78263 atomic_read(&conn->usage),
78264 rxrpc_conn_states[conn->state],
78265 key_serial(conn->key),
78266 - atomic_read(&conn->serial),
78267 - atomic_read(&conn->hi_serial));
78268 + atomic_read_unchecked(&conn->serial),
78269 + atomic_read_unchecked(&conn->hi_serial));
78270
78271 return 0;
78272 }
78273 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
78274 index 92df566..87ec1bf 100644
78275 --- a/net/rxrpc/ar-transport.c
78276 +++ b/net/rxrpc/ar-transport.c
78277 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
78278 spin_lock_init(&trans->client_lock);
78279 rwlock_init(&trans->conn_lock);
78280 atomic_set(&trans->usage, 1);
78281 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
78282 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
78283
78284 if (peer->srx.transport.family == AF_INET) {
78285 switch (peer->srx.transport_type) {
78286 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
78287 index f226709..0e735a8 100644
78288 --- a/net/rxrpc/rxkad.c
78289 +++ b/net/rxrpc/rxkad.c
78290 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
78291
78292 len = iov[0].iov_len + iov[1].iov_len;
78293
78294 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
78295 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
78296 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
78297
78298 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
78299 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
78300
78301 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
78302
78303 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
78304 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
78305 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
78306
78307 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
78308 diff --git a/net/sctp/proc.c b/net/sctp/proc.c
78309 index 1e2eee8..ce3967e 100644
78310 --- a/net/sctp/proc.c
78311 +++ b/net/sctp/proc.c
78312 @@ -319,7 +319,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
78313 seq_printf(seq,
78314 "%8pK %8pK %-3d %-3d %-2d %-4d "
78315 "%4d %8d %8d %7d %5lu %-5d %5d ",
78316 - assoc, sk, sctp_sk(sk)->type, sk->sk_state,
78317 + assoc, sk,
78318 + sctp_sk(sk)->type, sk->sk_state,
78319 assoc->state, hash,
78320 assoc->assoc_id,
78321 assoc->sndbuf_used,
78322 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
78323 index 31c7bfc..bc380ae 100644
78324 --- a/net/sctp/socket.c
78325 +++ b/net/sctp/socket.c
78326 @@ -4577,7 +4577,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
78327 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
78328 if (space_left < addrlen)
78329 return -ENOMEM;
78330 - if (copy_to_user(to, &temp, addrlen))
78331 + if (addrlen > sizeof(temp) || copy_to_user(to, &temp, addrlen))
78332 return -EFAULT;
78333 to += addrlen;
78334 cnt++;
78335 diff --git a/net/socket.c b/net/socket.c
78336 index 0452dca..0d601e0 100644
78337 --- a/net/socket.c
78338 +++ b/net/socket.c
78339 @@ -88,6 +88,7 @@
78340 #include <linux/nsproxy.h>
78341 #include <linux/magic.h>
78342 #include <linux/slab.h>
78343 +#include <linux/in.h>
78344
78345 #include <asm/uaccess.h>
78346 #include <asm/unistd.h>
78347 @@ -105,6 +106,8 @@
78348 #include <linux/sockios.h>
78349 #include <linux/atalk.h>
78350
78351 +#include <linux/grsock.h>
78352 +
78353 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
78354 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
78355 unsigned long nr_segs, loff_t pos);
78356 @@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
78357 &sockfs_dentry_operations, SOCKFS_MAGIC);
78358 }
78359
78360 -static struct vfsmount *sock_mnt __read_mostly;
78361 +struct vfsmount *sock_mnt __read_mostly;
78362
78363 static struct file_system_type sock_fs_type = {
78364 .name = "sockfs",
78365 @@ -1210,6 +1213,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
78366 return -EAFNOSUPPORT;
78367 if (type < 0 || type >= SOCK_MAX)
78368 return -EINVAL;
78369 + if (protocol < 0)
78370 + return -EINVAL;
78371
78372 /* Compatibility.
78373
78374 @@ -1341,6 +1346,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
78375 if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
78376 flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
78377
78378 + if(!gr_search_socket(family, type, protocol)) {
78379 + retval = -EACCES;
78380 + goto out;
78381 + }
78382 +
78383 + if (gr_handle_sock_all(family, type, protocol)) {
78384 + retval = -EACCES;
78385 + goto out;
78386 + }
78387 +
78388 retval = sock_create(family, type, protocol, &sock);
78389 if (retval < 0)
78390 goto out;
78391 @@ -1453,6 +1468,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
78392 if (sock) {
78393 err = move_addr_to_kernel(umyaddr, addrlen, &address);
78394 if (err >= 0) {
78395 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
78396 + err = -EACCES;
78397 + goto error;
78398 + }
78399 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
78400 + if (err)
78401 + goto error;
78402 +
78403 err = security_socket_bind(sock,
78404 (struct sockaddr *)&address,
78405 addrlen);
78406 @@ -1461,6 +1484,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
78407 (struct sockaddr *)
78408 &address, addrlen);
78409 }
78410 +error:
78411 fput_light(sock->file, fput_needed);
78412 }
78413 return err;
78414 @@ -1484,10 +1508,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
78415 if ((unsigned int)backlog > somaxconn)
78416 backlog = somaxconn;
78417
78418 + if (gr_handle_sock_server_other(sock->sk)) {
78419 + err = -EPERM;
78420 + goto error;
78421 + }
78422 +
78423 + err = gr_search_listen(sock);
78424 + if (err)
78425 + goto error;
78426 +
78427 err = security_socket_listen(sock, backlog);
78428 if (!err)
78429 err = sock->ops->listen(sock, backlog);
78430
78431 +error:
78432 fput_light(sock->file, fput_needed);
78433 }
78434 return err;
78435 @@ -1531,6 +1565,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
78436 newsock->type = sock->type;
78437 newsock->ops = sock->ops;
78438
78439 + if (gr_handle_sock_server_other(sock->sk)) {
78440 + err = -EPERM;
78441 + sock_release(newsock);
78442 + goto out_put;
78443 + }
78444 +
78445 + err = gr_search_accept(sock);
78446 + if (err) {
78447 + sock_release(newsock);
78448 + goto out_put;
78449 + }
78450 +
78451 /*
78452 * We don't need try_module_get here, as the listening socket (sock)
78453 * has the protocol module (sock->ops->owner) held.
78454 @@ -1569,6 +1615,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
78455 fd_install(newfd, newfile);
78456 err = newfd;
78457
78458 + gr_attach_curr_ip(newsock->sk);
78459 +
78460 out_put:
78461 fput_light(sock->file, fput_needed);
78462 out:
78463 @@ -1601,6 +1649,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
78464 int, addrlen)
78465 {
78466 struct socket *sock;
78467 + struct sockaddr *sck;
78468 struct sockaddr_storage address;
78469 int err, fput_needed;
78470
78471 @@ -1611,6 +1660,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
78472 if (err < 0)
78473 goto out_put;
78474
78475 + sck = (struct sockaddr *)&address;
78476 +
78477 + if (gr_handle_sock_client(sck)) {
78478 + err = -EACCES;
78479 + goto out_put;
78480 + }
78481 +
78482 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
78483 + if (err)
78484 + goto out_put;
78485 +
78486 err =
78487 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
78488 if (err)
78489 @@ -1965,7 +2025,7 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
78490 * checking falls down on this.
78491 */
78492 if (copy_from_user(ctl_buf,
78493 - (void __user __force *)msg_sys->msg_control,
78494 + (void __force_user *)msg_sys->msg_control,
78495 ctl_len))
78496 goto out_freectl;
78497 msg_sys->msg_control = ctl_buf;
78498 @@ -2133,7 +2193,7 @@ static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
78499 * kernel msghdr to use the kernel address space)
78500 */
78501
78502 - uaddr = (__force void __user *)msg_sys->msg_name;
78503 + uaddr = (void __force_user *)msg_sys->msg_name;
78504 uaddr_len = COMPAT_NAMELEN(msg);
78505 if (MSG_CMSG_COMPAT & flags) {
78506 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
78507 @@ -2658,6 +2718,7 @@ static int dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32)
78508 if (copy_from_user(&ifc32, uifc32, sizeof(struct compat_ifconf)))
78509 return -EFAULT;
78510
78511 + memset(&ifc, 0, sizeof(ifc));
78512 if (ifc32.ifcbuf == 0) {
78513 ifc32.ifc_len = 0;
78514 ifc.ifc_len = 0;
78515 @@ -2761,7 +2822,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
78516 }
78517
78518 ifr = compat_alloc_user_space(buf_size);
78519 - rxnfc = (void *)ifr + ALIGN(sizeof(struct ifreq), 8);
78520 + rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
78521
78522 if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
78523 return -EFAULT;
78524 @@ -2785,12 +2846,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
78525 offsetof(struct ethtool_rxnfc, fs.ring_cookie));
78526
78527 if (copy_in_user(rxnfc, compat_rxnfc,
78528 - (void *)(&rxnfc->fs.m_ext + 1) -
78529 - (void *)rxnfc) ||
78530 + (void __user *)(&rxnfc->fs.m_ext + 1) -
78531 + (void __user *)rxnfc) ||
78532 copy_in_user(&rxnfc->fs.ring_cookie,
78533 &compat_rxnfc->fs.ring_cookie,
78534 - (void *)(&rxnfc->fs.location + 1) -
78535 - (void *)&rxnfc->fs.ring_cookie) ||
78536 + (void __user *)(&rxnfc->fs.location + 1) -
78537 + (void __user *)&rxnfc->fs.ring_cookie) ||
78538 copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
78539 sizeof(rxnfc->rule_cnt)))
78540 return -EFAULT;
78541 @@ -2802,12 +2863,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
78542
78543 if (convert_out) {
78544 if (copy_in_user(compat_rxnfc, rxnfc,
78545 - (const void *)(&rxnfc->fs.m_ext + 1) -
78546 - (const void *)rxnfc) ||
78547 + (const void __user *)(&rxnfc->fs.m_ext + 1) -
78548 + (const void __user *)rxnfc) ||
78549 copy_in_user(&compat_rxnfc->fs.ring_cookie,
78550 &rxnfc->fs.ring_cookie,
78551 - (const void *)(&rxnfc->fs.location + 1) -
78552 - (const void *)&rxnfc->fs.ring_cookie) ||
78553 + (const void __user *)(&rxnfc->fs.location + 1) -
78554 + (const void __user *)&rxnfc->fs.ring_cookie) ||
78555 copy_in_user(&compat_rxnfc->rule_cnt, &rxnfc->rule_cnt,
78556 sizeof(rxnfc->rule_cnt)))
78557 return -EFAULT;
78558 @@ -2877,7 +2938,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
78559 old_fs = get_fs();
78560 set_fs(KERNEL_DS);
78561 err = dev_ioctl(net, cmd,
78562 - (struct ifreq __user __force *) &kifr);
78563 + (struct ifreq __force_user *) &kifr);
78564 set_fs(old_fs);
78565
78566 return err;
78567 @@ -2986,7 +3047,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
78568
78569 old_fs = get_fs();
78570 set_fs(KERNEL_DS);
78571 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
78572 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
78573 set_fs(old_fs);
78574
78575 if (cmd == SIOCGIFMAP && !err) {
78576 @@ -3091,7 +3152,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
78577 ret |= __get_user(rtdev, &(ur4->rt_dev));
78578 if (rtdev) {
78579 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
78580 - r4.rt_dev = (char __user __force *)devname;
78581 + r4.rt_dev = (char __force_user *)devname;
78582 devname[15] = 0;
78583 } else
78584 r4.rt_dev = NULL;
78585 @@ -3317,8 +3378,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
78586 int __user *uoptlen;
78587 int err;
78588
78589 - uoptval = (char __user __force *) optval;
78590 - uoptlen = (int __user __force *) optlen;
78591 + uoptval = (char __force_user *) optval;
78592 + uoptlen = (int __force_user *) optlen;
78593
78594 set_fs(KERNEL_DS);
78595 if (level == SOL_SOCKET)
78596 @@ -3338,7 +3399,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
78597 char __user *uoptval;
78598 int err;
78599
78600 - uoptval = (char __user __force *) optval;
78601 + uoptval = (char __force_user *) optval;
78602
78603 set_fs(KERNEL_DS);
78604 if (level == SOL_SOCKET)
78605 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
78606 index eda32ae..1c9fa7c 100644
78607 --- a/net/sunrpc/sched.c
78608 +++ b/net/sunrpc/sched.c
78609 @@ -240,9 +240,9 @@ static int rpc_wait_bit_killable(void *word)
78610 #ifdef RPC_DEBUG
78611 static void rpc_task_set_debuginfo(struct rpc_task *task)
78612 {
78613 - static atomic_t rpc_pid;
78614 + static atomic_unchecked_t rpc_pid;
78615
78616 - task->tk_pid = atomic_inc_return(&rpc_pid);
78617 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
78618 }
78619 #else
78620 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
78621 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
78622 index 8343737..677025e 100644
78623 --- a/net/sunrpc/xprtrdma/svc_rdma.c
78624 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
78625 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
78626 static unsigned int min_max_inline = 4096;
78627 static unsigned int max_max_inline = 65536;
78628
78629 -atomic_t rdma_stat_recv;
78630 -atomic_t rdma_stat_read;
78631 -atomic_t rdma_stat_write;
78632 -atomic_t rdma_stat_sq_starve;
78633 -atomic_t rdma_stat_rq_starve;
78634 -atomic_t rdma_stat_rq_poll;
78635 -atomic_t rdma_stat_rq_prod;
78636 -atomic_t rdma_stat_sq_poll;
78637 -atomic_t rdma_stat_sq_prod;
78638 +atomic_unchecked_t rdma_stat_recv;
78639 +atomic_unchecked_t rdma_stat_read;
78640 +atomic_unchecked_t rdma_stat_write;
78641 +atomic_unchecked_t rdma_stat_sq_starve;
78642 +atomic_unchecked_t rdma_stat_rq_starve;
78643 +atomic_unchecked_t rdma_stat_rq_poll;
78644 +atomic_unchecked_t rdma_stat_rq_prod;
78645 +atomic_unchecked_t rdma_stat_sq_poll;
78646 +atomic_unchecked_t rdma_stat_sq_prod;
78647
78648 /* Temporary NFS request map and context caches */
78649 struct kmem_cache *svc_rdma_map_cachep;
78650 @@ -110,7 +110,7 @@ static int read_reset_stat(ctl_table *table, int write,
78651 len -= *ppos;
78652 if (len > *lenp)
78653 len = *lenp;
78654 - if (len && copy_to_user(buffer, str_buf, len))
78655 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
78656 return -EFAULT;
78657 *lenp = len;
78658 *ppos += len;
78659 @@ -151,63 +151,63 @@ static ctl_table svcrdma_parm_table[] = {
78660 {
78661 .procname = "rdma_stat_read",
78662 .data = &rdma_stat_read,
78663 - .maxlen = sizeof(atomic_t),
78664 + .maxlen = sizeof(atomic_unchecked_t),
78665 .mode = 0644,
78666 .proc_handler = read_reset_stat,
78667 },
78668 {
78669 .procname = "rdma_stat_recv",
78670 .data = &rdma_stat_recv,
78671 - .maxlen = sizeof(atomic_t),
78672 + .maxlen = sizeof(atomic_unchecked_t),
78673 .mode = 0644,
78674 .proc_handler = read_reset_stat,
78675 },
78676 {
78677 .procname = "rdma_stat_write",
78678 .data = &rdma_stat_write,
78679 - .maxlen = sizeof(atomic_t),
78680 + .maxlen = sizeof(atomic_unchecked_t),
78681 .mode = 0644,
78682 .proc_handler = read_reset_stat,
78683 },
78684 {
78685 .procname = "rdma_stat_sq_starve",
78686 .data = &rdma_stat_sq_starve,
78687 - .maxlen = sizeof(atomic_t),
78688 + .maxlen = sizeof(atomic_unchecked_t),
78689 .mode = 0644,
78690 .proc_handler = read_reset_stat,
78691 },
78692 {
78693 .procname = "rdma_stat_rq_starve",
78694 .data = &rdma_stat_rq_starve,
78695 - .maxlen = sizeof(atomic_t),
78696 + .maxlen = sizeof(atomic_unchecked_t),
78697 .mode = 0644,
78698 .proc_handler = read_reset_stat,
78699 },
78700 {
78701 .procname = "rdma_stat_rq_poll",
78702 .data = &rdma_stat_rq_poll,
78703 - .maxlen = sizeof(atomic_t),
78704 + .maxlen = sizeof(atomic_unchecked_t),
78705 .mode = 0644,
78706 .proc_handler = read_reset_stat,
78707 },
78708 {
78709 .procname = "rdma_stat_rq_prod",
78710 .data = &rdma_stat_rq_prod,
78711 - .maxlen = sizeof(atomic_t),
78712 + .maxlen = sizeof(atomic_unchecked_t),
78713 .mode = 0644,
78714 .proc_handler = read_reset_stat,
78715 },
78716 {
78717 .procname = "rdma_stat_sq_poll",
78718 .data = &rdma_stat_sq_poll,
78719 - .maxlen = sizeof(atomic_t),
78720 + .maxlen = sizeof(atomic_unchecked_t),
78721 .mode = 0644,
78722 .proc_handler = read_reset_stat,
78723 },
78724 {
78725 .procname = "rdma_stat_sq_prod",
78726 .data = &rdma_stat_sq_prod,
78727 - .maxlen = sizeof(atomic_t),
78728 + .maxlen = sizeof(atomic_unchecked_t),
78729 .mode = 0644,
78730 .proc_handler = read_reset_stat,
78731 },
78732 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
78733 index 41cb63b..c4a1489 100644
78734 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
78735 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
78736 @@ -501,7 +501,7 @@ next_sge:
78737 svc_rdma_put_context(ctxt, 0);
78738 goto out;
78739 }
78740 - atomic_inc(&rdma_stat_read);
78741 + atomic_inc_unchecked(&rdma_stat_read);
78742
78743 if (read_wr.num_sge < chl_map->ch[ch_no].count) {
78744 chl_map->ch[ch_no].count -= read_wr.num_sge;
78745 @@ -611,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
78746 dto_q);
78747 list_del_init(&ctxt->dto_q);
78748 } else {
78749 - atomic_inc(&rdma_stat_rq_starve);
78750 + atomic_inc_unchecked(&rdma_stat_rq_starve);
78751 clear_bit(XPT_DATA, &xprt->xpt_flags);
78752 ctxt = NULL;
78753 }
78754 @@ -631,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
78755 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
78756 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
78757 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
78758 - atomic_inc(&rdma_stat_recv);
78759 + atomic_inc_unchecked(&rdma_stat_recv);
78760
78761 /* Build up the XDR from the receive buffers. */
78762 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
78763 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
78764 index 42eb7ba..c887c45 100644
78765 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
78766 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
78767 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
78768 write_wr.wr.rdma.remote_addr = to;
78769
78770 /* Post It */
78771 - atomic_inc(&rdma_stat_write);
78772 + atomic_inc_unchecked(&rdma_stat_write);
78773 if (svc_rdma_send(xprt, &write_wr))
78774 goto err;
78775 return 0;
78776 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
78777 index 73b428b..5f3f8f3 100644
78778 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
78779 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
78780 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
78781 return;
78782
78783 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
78784 - atomic_inc(&rdma_stat_rq_poll);
78785 + atomic_inc_unchecked(&rdma_stat_rq_poll);
78786
78787 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
78788 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
78789 @@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
78790 }
78791
78792 if (ctxt)
78793 - atomic_inc(&rdma_stat_rq_prod);
78794 + atomic_inc_unchecked(&rdma_stat_rq_prod);
78795
78796 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
78797 /*
78798 @@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
78799 return;
78800
78801 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
78802 - atomic_inc(&rdma_stat_sq_poll);
78803 + atomic_inc_unchecked(&rdma_stat_sq_poll);
78804 while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
78805 if (wc.status != IB_WC_SUCCESS)
78806 /* Close the transport */
78807 @@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
78808 }
78809
78810 if (ctxt)
78811 - atomic_inc(&rdma_stat_sq_prod);
78812 + atomic_inc_unchecked(&rdma_stat_sq_prod);
78813 }
78814
78815 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
78816 @@ -1266,7 +1266,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
78817 spin_lock_bh(&xprt->sc_lock);
78818 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
78819 spin_unlock_bh(&xprt->sc_lock);
78820 - atomic_inc(&rdma_stat_sq_starve);
78821 + atomic_inc_unchecked(&rdma_stat_sq_starve);
78822
78823 /* See if we can opportunistically reap SQ WR to make room */
78824 sq_cq_reap(xprt);
78825 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
78826 index e3a6e37..be2ea77 100644
78827 --- a/net/sysctl_net.c
78828 +++ b/net/sysctl_net.c
78829 @@ -43,7 +43,7 @@ static int net_ctl_permissions(struct ctl_table_root *root,
78830 struct ctl_table *table)
78831 {
78832 /* Allow network administrator to have same access as root. */
78833 - if (capable(CAP_NET_ADMIN)) {
78834 + if (capable_nolog(CAP_NET_ADMIN)) {
78835 int mode = (table->mode >> 6) & 7;
78836 return (mode << 6) | (mode << 3) | mode;
78837 }
78838 diff --git a/net/tipc/link.c b/net/tipc/link.c
78839 index 7a614f4..b14dbd2 100644
78840 --- a/net/tipc/link.c
78841 +++ b/net/tipc/link.c
78842 @@ -1164,7 +1164,7 @@ static int link_send_sections_long(struct tipc_port *sender,
78843 struct tipc_msg fragm_hdr;
78844 struct sk_buff *buf, *buf_chain, *prev;
78845 u32 fragm_crs, fragm_rest, hsz, sect_rest;
78846 - const unchar *sect_crs;
78847 + const unchar __user *sect_crs;
78848 int curr_sect;
78849 u32 fragm_no;
78850
78851 @@ -1205,7 +1205,7 @@ again:
78852
78853 if (!sect_rest) {
78854 sect_rest = msg_sect[++curr_sect].iov_len;
78855 - sect_crs = (const unchar *)msg_sect[curr_sect].iov_base;
78856 + sect_crs = (const unchar __user *)msg_sect[curr_sect].iov_base;
78857 }
78858
78859 if (sect_rest < fragm_rest)
78860 @@ -1224,7 +1224,7 @@ error:
78861 }
78862 } else
78863 skb_copy_to_linear_data_offset(buf, fragm_crs,
78864 - sect_crs, sz);
78865 + (const void __force_kernel *)sect_crs, sz);
78866 sect_crs += sz;
78867 sect_rest -= sz;
78868 fragm_crs += sz;
78869 diff --git a/net/tipc/msg.c b/net/tipc/msg.c
78870 index deea0d2..fa13bd7 100644
78871 --- a/net/tipc/msg.c
78872 +++ b/net/tipc/msg.c
78873 @@ -98,7 +98,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
78874 msg_sect[cnt].iov_len);
78875 else
78876 skb_copy_to_linear_data_offset(*buf, pos,
78877 - msg_sect[cnt].iov_base,
78878 + (const void __force_kernel *)msg_sect[cnt].iov_base,
78879 msg_sect[cnt].iov_len);
78880 pos += msg_sect[cnt].iov_len;
78881 }
78882 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
78883 index f976e9cd..560d055 100644
78884 --- a/net/tipc/subscr.c
78885 +++ b/net/tipc/subscr.c
78886 @@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub,
78887 {
78888 struct iovec msg_sect;
78889
78890 - msg_sect.iov_base = (void *)&sub->evt;
78891 + msg_sect.iov_base = (void __force_user *)&sub->evt;
78892 msg_sect.iov_len = sizeof(struct tipc_event);
78893
78894 sub->evt.event = htohl(event, sub->swap);
78895 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
78896 index 641f2e4..590bb48 100644
78897 --- a/net/unix/af_unix.c
78898 +++ b/net/unix/af_unix.c
78899 @@ -780,6 +780,12 @@ static struct sock *unix_find_other(struct net *net,
78900 err = -ECONNREFUSED;
78901 if (!S_ISSOCK(inode->i_mode))
78902 goto put_fail;
78903 +
78904 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
78905 + err = -EACCES;
78906 + goto put_fail;
78907 + }
78908 +
78909 u = unix_find_socket_byinode(inode);
78910 if (!u)
78911 goto put_fail;
78912 @@ -800,6 +806,13 @@ static struct sock *unix_find_other(struct net *net,
78913 if (u) {
78914 struct dentry *dentry;
78915 dentry = unix_sk(u)->path.dentry;
78916 +
78917 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
78918 + err = -EPERM;
78919 + sock_put(u);
78920 + goto fail;
78921 + }
78922 +
78923 if (dentry)
78924 touch_atime(&unix_sk(u)->path);
78925 } else
78926 @@ -882,11 +895,18 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
78927 err = security_path_mknod(&path, dentry, mode, 0);
78928 if (err)
78929 goto out_mknod_drop_write;
78930 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
78931 + err = -EACCES;
78932 + goto out_mknod_drop_write;
78933 + }
78934 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
78935 out_mknod_drop_write:
78936 mnt_drop_write(path.mnt);
78937 if (err)
78938 goto out_mknod_dput;
78939 +
78940 + gr_handle_create(dentry, path.mnt);
78941 +
78942 mutex_unlock(&path.dentry->d_inode->i_mutex);
78943 dput(path.dentry);
78944 path.dentry = dentry;
78945 @@ -1448,7 +1468,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
78946 if (NULL == siocb->scm)
78947 siocb->scm = &tmp_scm;
78948 wait_for_unix_gc();
78949 - err = scm_send(sock, msg, siocb->scm);
78950 + err = scm_send(sock, msg, siocb->scm, false);
78951 if (err < 0)
78952 return err;
78953
78954 @@ -1617,7 +1637,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
78955 if (NULL == siocb->scm)
78956 siocb->scm = &tmp_scm;
78957 wait_for_unix_gc();
78958 - err = scm_send(sock, msg, siocb->scm);
78959 + err = scm_send(sock, msg, siocb->scm, false);
78960 if (err < 0)
78961 return err;
78962
78963 diff --git a/net/wireless/core.h b/net/wireless/core.h
78964 index bc686ef..27845e6 100644
78965 --- a/net/wireless/core.h
78966 +++ b/net/wireless/core.h
78967 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
78968 struct mutex mtx;
78969
78970 /* rfkill support */
78971 - struct rfkill_ops rfkill_ops;
78972 + rfkill_ops_no_const rfkill_ops;
78973 struct rfkill *rfkill;
78974 struct work_struct rfkill_sync;
78975
78976 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
78977 index b0eb7aa..7d73e82 100644
78978 --- a/net/wireless/wext-core.c
78979 +++ b/net/wireless/wext-core.c
78980 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
78981 */
78982
78983 /* Support for very large requests */
78984 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
78985 - (user_length > descr->max_tokens)) {
78986 + if (user_length > descr->max_tokens) {
78987 /* Allow userspace to GET more than max so
78988 * we can support any size GET requests.
78989 * There is still a limit : -ENOMEM.
78990 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
78991 }
78992 }
78993
78994 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
78995 - /*
78996 - * If this is a GET, but not NOMAX, it means that the extra
78997 - * data is not bounded by userspace, but by max_tokens. Thus
78998 - * set the length to max_tokens. This matches the extra data
78999 - * allocation.
79000 - * The driver should fill it with the number of tokens it
79001 - * provided, and it may check iwp->length rather than having
79002 - * knowledge of max_tokens. If the driver doesn't change the
79003 - * iwp->length, this ioctl just copies back max_token tokens
79004 - * filled with zeroes. Hopefully the driver isn't claiming
79005 - * them to be valid data.
79006 - */
79007 - iwp->length = descr->max_tokens;
79008 - }
79009 -
79010 err = handler(dev, info, (union iwreq_data *) iwp, extra);
79011
79012 iwp->length += essid_compat;
79013 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
79014 index ccfbd32..9b61cf9f 100644
79015 --- a/net/xfrm/xfrm_policy.c
79016 +++ b/net/xfrm/xfrm_policy.c
79017 @@ -300,7 +300,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
79018 {
79019 policy->walk.dead = 1;
79020
79021 - atomic_inc(&policy->genid);
79022 + atomic_inc_unchecked(&policy->genid);
79023
79024 if (del_timer(&policy->timer))
79025 xfrm_pol_put(policy);
79026 @@ -584,7 +584,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
79027 hlist_add_head(&policy->bydst, chain);
79028 xfrm_pol_hold(policy);
79029 net->xfrm.policy_count[dir]++;
79030 - atomic_inc(&flow_cache_genid);
79031 + atomic_inc_unchecked(&flow_cache_genid);
79032 if (delpol)
79033 __xfrm_policy_unlink(delpol, dir);
79034 policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
79035 @@ -1532,7 +1532,7 @@ free_dst:
79036 goto out;
79037 }
79038
79039 -static int inline
79040 +static inline int
79041 xfrm_dst_alloc_copy(void **target, const void *src, int size)
79042 {
79043 if (!*target) {
79044 @@ -1544,7 +1544,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
79045 return 0;
79046 }
79047
79048 -static int inline
79049 +static inline int
79050 xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
79051 {
79052 #ifdef CONFIG_XFRM_SUB_POLICY
79053 @@ -1556,7 +1556,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
79054 #endif
79055 }
79056
79057 -static int inline
79058 +static inline int
79059 xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
79060 {
79061 #ifdef CONFIG_XFRM_SUB_POLICY
79062 @@ -1650,7 +1650,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
79063
79064 xdst->num_pols = num_pols;
79065 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
79066 - xdst->policy_genid = atomic_read(&pols[0]->genid);
79067 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
79068
79069 return xdst;
79070 }
79071 @@ -2350,7 +2350,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
79072 if (xdst->xfrm_genid != dst->xfrm->genid)
79073 return 0;
79074 if (xdst->num_pols > 0 &&
79075 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
79076 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
79077 return 0;
79078
79079 mtu = dst_mtu(dst->child);
79080 @@ -2887,7 +2887,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
79081 sizeof(pol->xfrm_vec[i].saddr));
79082 pol->xfrm_vec[i].encap_family = mp->new_family;
79083 /* flush bundles */
79084 - atomic_inc(&pol->genid);
79085 + atomic_inc_unchecked(&pol->genid);
79086 }
79087 }
79088
79089 diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
79090 index 44293b3..be1d3e58 100644
79091 --- a/net/xfrm/xfrm_user.c
79092 +++ b/net/xfrm/xfrm_user.c
79093 @@ -1413,6 +1413,7 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb)
79094 struct xfrm_user_tmpl *up = &vec[i];
79095 struct xfrm_tmpl *kp = &xp->xfrm_vec[i];
79096
79097 + memset(up, 0, sizeof(*up));
79098 memcpy(&up->id, &kp->id, sizeof(up->id));
79099 up->family = kp->encap_family;
79100 memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr));
79101 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
79102 index ff1720d..ed8475e 100644
79103 --- a/scripts/Makefile.build
79104 +++ b/scripts/Makefile.build
79105 @@ -111,7 +111,7 @@ endif
79106 endif
79107
79108 # Do not include host rules unless needed
79109 -ifneq ($(hostprogs-y)$(hostprogs-m),)
79110 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
79111 include scripts/Makefile.host
79112 endif
79113
79114 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
79115 index 686cb0d..9d653bf 100644
79116 --- a/scripts/Makefile.clean
79117 +++ b/scripts/Makefile.clean
79118 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
79119 __clean-files := $(extra-y) $(always) \
79120 $(targets) $(clean-files) \
79121 $(host-progs) \
79122 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
79123 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
79124 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
79125
79126 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
79127
79128 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
79129 index 1ac414f..38575f7 100644
79130 --- a/scripts/Makefile.host
79131 +++ b/scripts/Makefile.host
79132 @@ -31,6 +31,8 @@
79133 # Note: Shared libraries consisting of C++ files are not supported
79134
79135 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
79136 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
79137 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
79138
79139 # C code
79140 # Executables compiled from a single .c file
79141 @@ -54,11 +56,15 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
79142 # Shared libaries (only .c supported)
79143 # Shared libraries (.so) - all .so files referenced in "xxx-objs"
79144 host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
79145 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
79146 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
79147 # Remove .so files from "xxx-objs"
79148 host-cobjs := $(filter-out %.so,$(host-cobjs))
79149 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
79150
79151 -#Object (.o) files used by the shared libaries
79152 +# Object (.o) files used by the shared libaries
79153 host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
79154 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
79155
79156 # output directory for programs/.o files
79157 # hostprogs-y := tools/build may have been specified. Retrieve directory
79158 @@ -82,7 +88,9 @@ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
79159 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
79160 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
79161 host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
79162 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
79163 host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
79164 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
79165 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
79166
79167 obj-dirs += $(host-objdirs)
79168 @@ -156,6 +164,13 @@ quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
79169 $(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
79170 $(call if_changed_dep,host-cshobjs)
79171
79172 +# Compile .c file, create position independent .o file
79173 +# host-cxxshobjs -> .o
79174 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
79175 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
79176 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
79177 + $(call if_changed_dep,host-cxxshobjs)
79178 +
79179 # Link a shared library, based on position independent .o files
79180 # *.o -> .so shared library (host-cshlib)
79181 quiet_cmd_host-cshlib = HOSTLLD -shared $@
79182 @@ -165,6 +180,15 @@ quiet_cmd_host-cshlib = HOSTLLD -shared $@
79183 $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
79184 $(call if_changed,host-cshlib)
79185
79186 +# Link a shared library, based on position independent .o files
79187 +# *.o -> .so shared library (host-cxxshlib)
79188 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
79189 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
79190 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
79191 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
79192 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
79193 + $(call if_changed,host-cxxshlib)
79194 +
79195 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
79196 - $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
79197 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
79198
79199 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
79200 index cb1f50c..cef2a7c 100644
79201 --- a/scripts/basic/fixdep.c
79202 +++ b/scripts/basic/fixdep.c
79203 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
79204 /*
79205 * Lookup a value in the configuration string.
79206 */
79207 -static int is_defined_config(const char *name, int len, unsigned int hash)
79208 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
79209 {
79210 struct item *aux;
79211
79212 @@ -211,10 +211,10 @@ static void clear_config(void)
79213 /*
79214 * Record the use of a CONFIG_* word.
79215 */
79216 -static void use_config(const char *m, int slen)
79217 +static void use_config(const char *m, unsigned int slen)
79218 {
79219 unsigned int hash = strhash(m, slen);
79220 - int c, i;
79221 + unsigned int c, i;
79222
79223 if (is_defined_config(m, slen, hash))
79224 return;
79225 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
79226
79227 static void parse_config_file(const char *map, size_t len)
79228 {
79229 - const int *end = (const int *) (map + len);
79230 + const unsigned int *end = (const unsigned int *) (map + len);
79231 /* start at +1, so that p can never be < map */
79232 - const int *m = (const int *) map + 1;
79233 + const unsigned int *m = (const unsigned int *) map + 1;
79234 const char *p, *q;
79235
79236 for (; m < end; m++) {
79237 @@ -406,7 +406,7 @@ static void print_deps(void)
79238 static void traps(void)
79239 {
79240 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
79241 - int *p = (int *)test;
79242 + unsigned int *p = (unsigned int *)test;
79243
79244 if (*p != INT_CONF) {
79245 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
79246 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
79247 new file mode 100644
79248 index 0000000..008ac1a
79249 --- /dev/null
79250 +++ b/scripts/gcc-plugin.sh
79251 @@ -0,0 +1,17 @@
79252 +#!/bin/bash
79253 +plugincc=`$1 -x c -shared - -o /dev/null -I\`$3 -print-file-name=plugin\`/include 2>&1 <<EOF
79254 +#include "gcc-plugin.h"
79255 +#include "tree.h"
79256 +#include "tm.h"
79257 +#include "rtl.h"
79258 +#ifdef ENABLE_BUILD_WITH_CXX
79259 +#warning $2
79260 +#else
79261 +#warning $1
79262 +#endif
79263 +EOF`
79264 +if [ $? -eq 0 ]
79265 +then
79266 + [[ "$plugincc" =~ "$1" ]] && echo "$1"
79267 + [[ "$plugincc" =~ "$2" ]] && echo "$2"
79268 +fi
79269 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
79270 index cd9c6c6..0c8f0fa 100644
79271 --- a/scripts/link-vmlinux.sh
79272 +++ b/scripts/link-vmlinux.sh
79273 @@ -147,7 +147,7 @@ else
79274 fi;
79275
79276 # final build of init/
79277 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
79278 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
79279
79280 kallsymso=""
79281 kallsyms_vmlinux=""
79282 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
79283 index 5759751..b170367 100644
79284 --- a/scripts/mod/file2alias.c
79285 +++ b/scripts/mod/file2alias.c
79286 @@ -128,7 +128,7 @@ static void device_id_check(const char *modname, const char *device_id,
79287 unsigned long size, unsigned long id_size,
79288 void *symval)
79289 {
79290 - int i;
79291 + unsigned int i;
79292
79293 if (size % id_size || size < id_size) {
79294 if (cross_build != 0)
79295 @@ -158,7 +158,7 @@ static void device_id_check(const char *modname, const char *device_id,
79296 /* USB is special because the bcdDevice can be matched against a numeric range */
79297 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
79298 static void do_usb_entry(struct usb_device_id *id,
79299 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
79300 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
79301 unsigned char range_lo, unsigned char range_hi,
79302 unsigned char max, struct module *mod)
79303 {
79304 @@ -259,7 +259,7 @@ static void do_usb_entry_multi(struct usb_device_id *id, struct module *mod)
79305 {
79306 unsigned int devlo, devhi;
79307 unsigned char chi, clo, max;
79308 - int ndigits;
79309 + unsigned int ndigits;
79310
79311 id->match_flags = TO_NATIVE(id->match_flags);
79312 id->idVendor = TO_NATIVE(id->idVendor);
79313 @@ -504,7 +504,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
79314 for (i = 0; i < count; i++) {
79315 const char *id = (char *)devs[i].id;
79316 char acpi_id[sizeof(devs[0].id)];
79317 - int j;
79318 + unsigned int j;
79319
79320 buf_printf(&mod->dev_table_buf,
79321 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
79322 @@ -534,7 +534,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
79323
79324 for (j = 0; j < PNP_MAX_DEVICES; j++) {
79325 const char *id = (char *)card->devs[j].id;
79326 - int i2, j2;
79327 + unsigned int i2, j2;
79328 int dup = 0;
79329
79330 if (!id[0])
79331 @@ -560,7 +560,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
79332 /* add an individual alias for every device entry */
79333 if (!dup) {
79334 char acpi_id[sizeof(card->devs[0].id)];
79335 - int k;
79336 + unsigned int k;
79337
79338 buf_printf(&mod->dev_table_buf,
79339 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
79340 @@ -885,7 +885,7 @@ static void dmi_ascii_filter(char *d, const char *s)
79341 static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
79342 char *alias)
79343 {
79344 - int i, j;
79345 + unsigned int i, j;
79346
79347 sprintf(alias, "dmi*");
79348
79349 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
79350 index 0f84bb3..2d42035 100644
79351 --- a/scripts/mod/modpost.c
79352 +++ b/scripts/mod/modpost.c
79353 @@ -925,6 +925,7 @@ enum mismatch {
79354 ANY_INIT_TO_ANY_EXIT,
79355 ANY_EXIT_TO_ANY_INIT,
79356 EXPORT_TO_INIT_EXIT,
79357 + DATA_TO_TEXT
79358 };
79359
79360 struct sectioncheck {
79361 @@ -1033,6 +1034,12 @@ const struct sectioncheck sectioncheck[] = {
79362 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
79363 .mismatch = EXPORT_TO_INIT_EXIT,
79364 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
79365 +},
79366 +/* Do not reference code from writable data */
79367 +{
79368 + .fromsec = { DATA_SECTIONS, NULL },
79369 + .tosec = { TEXT_SECTIONS, NULL },
79370 + .mismatch = DATA_TO_TEXT
79371 }
79372 };
79373
79374 @@ -1155,10 +1162,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
79375 continue;
79376 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
79377 continue;
79378 - if (sym->st_value == addr)
79379 - return sym;
79380 /* Find a symbol nearby - addr are maybe negative */
79381 d = sym->st_value - addr;
79382 + if (d == 0)
79383 + return sym;
79384 if (d < 0)
79385 d = addr - sym->st_value;
79386 if (d < distance) {
79387 @@ -1437,6 +1444,14 @@ static void report_sec_mismatch(const char *modname,
79388 tosym, prl_to, prl_to, tosym);
79389 free(prl_to);
79390 break;
79391 + case DATA_TO_TEXT:
79392 +#if 0
79393 + fprintf(stderr,
79394 + "The %s %s:%s references\n"
79395 + "the %s %s:%s%s\n",
79396 + from, fromsec, fromsym, to, tosec, tosym, to_p);
79397 +#endif
79398 + break;
79399 }
79400 fprintf(stderr, "\n");
79401 }
79402 @@ -1671,7 +1686,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
79403 static void check_sec_ref(struct module *mod, const char *modname,
79404 struct elf_info *elf)
79405 {
79406 - int i;
79407 + unsigned int i;
79408 Elf_Shdr *sechdrs = elf->sechdrs;
79409
79410 /* Walk through all sections */
79411 @@ -1769,7 +1784,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
79412 va_end(ap);
79413 }
79414
79415 -void buf_write(struct buffer *buf, const char *s, int len)
79416 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
79417 {
79418 if (buf->size - buf->pos < len) {
79419 buf->size += len + SZ;
79420 @@ -1987,7 +2002,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
79421 if (fstat(fileno(file), &st) < 0)
79422 goto close_write;
79423
79424 - if (st.st_size != b->pos)
79425 + if (st.st_size != (off_t)b->pos)
79426 goto close_write;
79427
79428 tmp = NOFAIL(malloc(b->pos));
79429 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
79430 index 51207e4..f7d603d 100644
79431 --- a/scripts/mod/modpost.h
79432 +++ b/scripts/mod/modpost.h
79433 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
79434
79435 struct buffer {
79436 char *p;
79437 - int pos;
79438 - int size;
79439 + unsigned int pos;
79440 + unsigned int size;
79441 };
79442
79443 void __attribute__((format(printf, 2, 3)))
79444 buf_printf(struct buffer *buf, const char *fmt, ...);
79445
79446 void
79447 -buf_write(struct buffer *buf, const char *s, int len);
79448 +buf_write(struct buffer *buf, const char *s, unsigned int len);
79449
79450 struct module {
79451 struct module *next;
79452 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
79453 index 9dfcd6d..099068e 100644
79454 --- a/scripts/mod/sumversion.c
79455 +++ b/scripts/mod/sumversion.c
79456 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
79457 goto out;
79458 }
79459
79460 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
79461 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
79462 warn("writing sum in %s failed: %s\n",
79463 filename, strerror(errno));
79464 goto out;
79465 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
79466 index 5c11312..72742b5 100644
79467 --- a/scripts/pnmtologo.c
79468 +++ b/scripts/pnmtologo.c
79469 @@ -237,14 +237,14 @@ static void write_header(void)
79470 fprintf(out, " * Linux logo %s\n", logoname);
79471 fputs(" */\n\n", out);
79472 fputs("#include <linux/linux_logo.h>\n\n", out);
79473 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
79474 + fprintf(out, "static unsigned char %s_data[] = {\n",
79475 logoname);
79476 }
79477
79478 static void write_footer(void)
79479 {
79480 fputs("\n};\n\n", out);
79481 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
79482 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
79483 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
79484 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
79485 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
79486 @@ -374,7 +374,7 @@ static void write_logo_clut224(void)
79487 fputs("\n};\n\n", out);
79488
79489 /* write logo clut */
79490 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
79491 + fprintf(out, "static unsigned char %s_clut[] = {\n",
79492 logoname);
79493 write_hex_cnt = 0;
79494 for (i = 0; i < logo_clutsize; i++) {
79495 diff --git a/security/Kconfig b/security/Kconfig
79496 index e9c6ac7..58348f4 100644
79497 --- a/security/Kconfig
79498 +++ b/security/Kconfig
79499 @@ -4,6 +4,888 @@
79500
79501 menu "Security options"
79502
79503 +menu "Grsecurity"
79504 +
79505 + config ARCH_TRACK_EXEC_LIMIT
79506 + bool
79507 +
79508 + config PAX_KERNEXEC_PLUGIN
79509 + bool
79510 +
79511 + config PAX_PER_CPU_PGD
79512 + bool
79513 +
79514 + config TASK_SIZE_MAX_SHIFT
79515 + int
79516 + depends on X86_64
79517 + default 47 if !PAX_PER_CPU_PGD
79518 + default 42 if PAX_PER_CPU_PGD
79519 +
79520 + config PAX_ENABLE_PAE
79521 + bool
79522 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
79523 +
79524 + config PAX_USERCOPY_SLABS
79525 + bool
79526 +
79527 +config GRKERNSEC
79528 + bool "Grsecurity"
79529 + select CRYPTO
79530 + select CRYPTO_SHA256
79531 + select PROC_FS
79532 + select STOP_MACHINE
79533 + help
79534 + If you say Y here, you will be able to configure many features
79535 + that will enhance the security of your system. It is highly
79536 + recommended that you say Y here and read through the help
79537 + for each option so that you fully understand the features and
79538 + can evaluate their usefulness for your machine.
79539 +
79540 +choice
79541 + prompt "Configuration Method"
79542 + depends on GRKERNSEC
79543 + default GRKERNSEC_CONFIG_CUSTOM
79544 + help
79545 +
79546 +config GRKERNSEC_CONFIG_AUTO
79547 + bool "Automatic"
79548 + help
79549 + If you choose this configuration method, you'll be able to answer a small
79550 + number of simple questions about how you plan to use this kernel.
79551 + The settings of grsecurity and PaX will be automatically configured for
79552 + the highest commonly-used settings within the provided constraints.
79553 +
79554 + If you require additional configuration, custom changes can still be made
79555 + from the "custom configuration" menu.
79556 +
79557 +config GRKERNSEC_CONFIG_CUSTOM
79558 + bool "Custom"
79559 + help
79560 + If you choose this configuration method, you'll be able to configure all
79561 + grsecurity and PaX settings manually. Via this method, no options are
79562 + automatically enabled.
79563 +
79564 +endchoice
79565 +
79566 +choice
79567 + prompt "Usage Type"
79568 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
79569 + default GRKERNSEC_CONFIG_SERVER
79570 + help
79571 +
79572 +config GRKERNSEC_CONFIG_SERVER
79573 + bool "Server"
79574 + help
79575 + Choose this option if you plan to use this kernel on a server.
79576 +
79577 +config GRKERNSEC_CONFIG_DESKTOP
79578 + bool "Desktop"
79579 + help
79580 + Choose this option if you plan to use this kernel on a desktop.
79581 +
79582 +endchoice
79583 +
79584 +choice
79585 + prompt "Virtualization Type"
79586 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
79587 + default GRKERNSEC_CONFIG_VIRT_NONE
79588 + help
79589 +
79590 +config GRKERNSEC_CONFIG_VIRT_NONE
79591 + bool "None"
79592 + help
79593 + Choose this option if this kernel will be run on bare metal.
79594 +
79595 +config GRKERNSEC_CONFIG_VIRT_GUEST
79596 + bool "Guest"
79597 + help
79598 + Choose this option if this kernel will be run as a VM guest.
79599 +
79600 +config GRKERNSEC_CONFIG_VIRT_HOST
79601 + bool "Host"
79602 + help
79603 + Choose this option if this kernel will be run as a VM host.
79604 +
79605 +endchoice
79606 +
79607 +choice
79608 + prompt "Virtualization Hardware"
79609 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
79610 + help
79611 +
79612 +config GRKERNSEC_CONFIG_VIRT_EPT
79613 + bool "EPT/RVI Processor Support"
79614 + depends on X86
79615 + help
79616 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
79617 + hardware virtualization. This allows for additional kernel hardening protections
79618 + to operate without additional performance impact.
79619 +
79620 + To see if your Intel processor supports EPT, see:
79621 + http://ark.intel.com/Products/VirtualizationTechnology
79622 + (Most Core i3/5/7 support EPT)
79623 +
79624 + To see if your AMD processor supports RVI, see:
79625 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
79626 +
79627 +config GRKERNSEC_CONFIG_VIRT_SOFT
79628 + bool "First-gen/No Hardware Virtualization"
79629 + help
79630 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
79631 + support hardware virtualization or doesn't support the EPT/RVI extensions.
79632 +
79633 +endchoice
79634 +
79635 +choice
79636 + prompt "Virtualization Software"
79637 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
79638 + help
79639 +
79640 +config GRKERNSEC_CONFIG_VIRT_XEN
79641 + bool "Xen"
79642 + help
79643 + Choose this option if this kernel is running as a Xen guest or host.
79644 +
79645 +config GRKERNSEC_CONFIG_VIRT_VMWARE
79646 + bool "VMWare"
79647 + help
79648 + Choose this option if this kernel is running as a VMWare guest or host.
79649 +
79650 +config GRKERNSEC_CONFIG_VIRT_KVM
79651 + bool "KVM"
79652 + help
79653 + Choose this option if this kernel is running as a KVM guest or host.
79654 +
79655 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
79656 + bool "VirtualBox"
79657 + help
79658 + Choose this option if this kernel is running as a VirtualBox guest or host.
79659 +
79660 +endchoice
79661 +
79662 +choice
79663 + prompt "Required Priorities"
79664 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
79665 + default GRKERNSEC_CONFIG_PRIORITY_PERF
79666 + help
79667 +
79668 +config GRKERNSEC_CONFIG_PRIORITY_PERF
79669 + bool "Performance"
79670 + help
79671 + Choose this option if performance is of highest priority for this deployment
79672 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
79673 + and freed memory sanitizing will be disabled.
79674 +
79675 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
79676 + bool "Security"
79677 + help
79678 + Choose this option if security is of highest priority for this deployment of
79679 + grsecurity. UDEREF, kernel stack clearing, and freed memory sanitizing will
79680 + be enabled for this kernel. In a worst-case scenario, these features can
79681 + introduce a 20% performance hit (UDEREF on x64 contributing half of this hit).
79682 +
79683 +endchoice
79684 +
79685 +menu "Default Special Groups"
79686 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
79687 +
79688 +config GRKERNSEC_PROC_GID
79689 + int "GID exempted from /proc restrictions"
79690 + default 1001
79691 + help
79692 + Setting this GID determines which group will be exempted from
79693 + grsecurity's /proc restrictions, allowing users of the specified
79694 + group to view network statistics and the existence of other users'
79695 + processes on the system.
79696 +
79697 +config GRKERNSEC_TPE_GID
79698 + int "GID for untrusted users"
79699 + depends on GRKERNSEC_CONFIG_SERVER
79700 + default 1005
79701 + help
79702 + Setting this GID determines which group untrusted users should
79703 + be added to. These users will be placed under grsecurity's Trusted Path
79704 + Execution mechanism, preventing them from executing their own binaries.
79705 + The users will only be able to execute binaries in directories owned and
79706 + writable only by the root user.
79707 +
79708 +config GRKERNSEC_SYMLINKOWN_GID
79709 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
79710 + depends on GRKERNSEC_CONFIG_SERVER
79711 + default 1006
79712 + help
79713 + Setting this GID determines what group kernel-enforced
79714 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
79715 + is enabled, a sysctl option with name "symlinkown_gid" is created.
79716 +
79717 +
79718 +endmenu
79719 +
79720 +menu "Customize Configuration"
79721 +depends on GRKERNSEC
79722 +
79723 +menu "PaX"
79724 +
79725 +config PAX
79726 + bool "Enable various PaX features"
79727 + default y if GRKERNSEC_CONFIG_AUTO
79728 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
79729 + help
79730 + This allows you to enable various PaX features. PaX adds
79731 + intrusion prevention mechanisms to the kernel that reduce
79732 + the risks posed by exploitable memory corruption bugs.
79733 +
79734 +menu "PaX Control"
79735 + depends on PAX
79736 +
79737 +config PAX_SOFTMODE
79738 + bool 'Support soft mode'
79739 + help
79740 + Enabling this option will allow you to run PaX in soft mode, that
79741 + is, PaX features will not be enforced by default, only on executables
79742 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
79743 + support as they are the only way to mark executables for soft mode use.
79744 +
79745 + Soft mode can be activated by using the "pax_softmode=1" kernel command
79746 + line option on boot. Furthermore you can control various PaX features
79747 + at runtime via the entries in /proc/sys/kernel/pax.
79748 +
79749 +config PAX_EI_PAX
79750 + bool 'Use legacy ELF header marking'
79751 + default y if GRKERNSEC_CONFIG_AUTO
79752 + help
79753 + Enabling this option will allow you to control PaX features on
79754 + a per executable basis via the 'chpax' utility available at
79755 + http://pax.grsecurity.net/. The control flags will be read from
79756 + an otherwise reserved part of the ELF header. This marking has
79757 + numerous drawbacks (no support for soft-mode, toolchain does not
79758 + know about the non-standard use of the ELF header) therefore it
79759 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
79760 + support.
79761 +
79762 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
79763 + support as well, they will override the legacy EI_PAX marks.
79764 +
79765 + If you enable none of the marking options then all applications
79766 + will run with PaX enabled on them by default.
79767 +
79768 +config PAX_PT_PAX_FLAGS
79769 + bool 'Use ELF program header marking'
79770 + default y if GRKERNSEC_CONFIG_AUTO
79771 + help
79772 + Enabling this option will allow you to control PaX features on
79773 + a per executable basis via the 'paxctl' utility available at
79774 + http://pax.grsecurity.net/. The control flags will be read from
79775 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
79776 + has the benefits of supporting both soft mode and being fully
79777 + integrated into the toolchain (the binutils patch is available
79778 + from http://pax.grsecurity.net).
79779 +
79780 + Note that if you enable the legacy EI_PAX marking support as well,
79781 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
79782 +
79783 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
79784 + must make sure that the marks are the same if a binary has both marks.
79785 +
79786 + If you enable none of the marking options then all applications
79787 + will run with PaX enabled on them by default.
79788 +
79789 +config PAX_XATTR_PAX_FLAGS
79790 + bool 'Use filesystem extended attributes marking'
79791 + default y if GRKERNSEC_CONFIG_AUTO
79792 + select CIFS_XATTR if CIFS
79793 + select EXT2_FS_XATTR if EXT2_FS
79794 + select EXT3_FS_XATTR if EXT3_FS
79795 + select EXT4_FS_XATTR if EXT4_FS
79796 + select JFFS2_FS_XATTR if JFFS2_FS
79797 + select REISERFS_FS_XATTR if REISERFS_FS
79798 + select SQUASHFS_XATTR if SQUASHFS
79799 + select TMPFS_XATTR if TMPFS
79800 + select UBIFS_FS_XATTR if UBIFS_FS
79801 + help
79802 + Enabling this option will allow you to control PaX features on
79803 + a per executable basis via the 'setfattr' utility. The control
79804 + flags will be read from the user.pax.flags extended attribute of
79805 + the file. This marking has the benefit of supporting binary-only
79806 + applications that self-check themselves (e.g., skype) and would
79807 + not tolerate chpax/paxctl changes. The main drawback is that
79808 + extended attributes are not supported by some filesystems (e.g.,
79809 + isofs, udf, vfat) so copying files through such filesystems will
79810 + lose the extended attributes and these PaX markings.
79811 +
79812 + Note that if you enable the legacy EI_PAX marking support as well,
79813 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
79814 +
79815 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
79816 + must make sure that the marks are the same if a binary has both marks.
79817 +
79818 + If you enable none of the marking options then all applications
79819 + will run with PaX enabled on them by default.
79820 +
79821 +choice
79822 + prompt 'MAC system integration'
79823 + default PAX_HAVE_ACL_FLAGS
79824 + help
79825 + Mandatory Access Control systems have the option of controlling
79826 + PaX flags on a per executable basis, choose the method supported
79827 + by your particular system.
79828 +
79829 + - "none": if your MAC system does not interact with PaX,
79830 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
79831 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
79832 +
79833 + NOTE: this option is for developers/integrators only.
79834 +
79835 + config PAX_NO_ACL_FLAGS
79836 + bool 'none'
79837 +
79838 + config PAX_HAVE_ACL_FLAGS
79839 + bool 'direct'
79840 +
79841 + config PAX_HOOK_ACL_FLAGS
79842 + bool 'hook'
79843 +endchoice
79844 +
79845 +endmenu
79846 +
79847 +menu "Non-executable pages"
79848 + depends on PAX
79849 +
79850 +config PAX_NOEXEC
79851 + bool "Enforce non-executable pages"
79852 + default y if GRKERNSEC_CONFIG_AUTO
79853 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
79854 + help
79855 + By design some architectures do not allow for protecting memory
79856 + pages against execution or even if they do, Linux does not make
79857 + use of this feature. In practice this means that if a page is
79858 + readable (such as the stack or heap) it is also executable.
79859 +
79860 + There is a well known exploit technique that makes use of this
79861 + fact and a common programming mistake where an attacker can
79862 + introduce code of his choice somewhere in the attacked program's
79863 + memory (typically the stack or the heap) and then execute it.
79864 +
79865 + If the attacked program was running with different (typically
79866 + higher) privileges than that of the attacker, then he can elevate
79867 + his own privilege level (e.g. get a root shell, write to files for
79868 + which he does not have write access to, etc).
79869 +
79870 + Enabling this option will let you choose from various features
79871 + that prevent the injection and execution of 'foreign' code in
79872 + a program.
79873 +
79874 + This will also break programs that rely on the old behaviour and
79875 + expect that dynamically allocated memory via the malloc() family
79876 + of functions is executable (which it is not). Notable examples
79877 + are the XFree86 4.x server, the java runtime and wine.
79878 +
79879 +config PAX_PAGEEXEC
79880 + bool "Paging based non-executable pages"
79881 + default y if GRKERNSEC_CONFIG_AUTO
79882 + 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)
79883 + select S390_SWITCH_AMODE if S390
79884 + select S390_EXEC_PROTECT if S390
79885 + select ARCH_TRACK_EXEC_LIMIT if X86_32
79886 + help
79887 + This implementation is based on the paging feature of the CPU.
79888 + On i386 without hardware non-executable bit support there is a
79889 + variable but usually low performance impact, however on Intel's
79890 + P4 core based CPUs it is very high so you should not enable this
79891 + for kernels meant to be used on such CPUs.
79892 +
79893 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
79894 + with hardware non-executable bit support there is no performance
79895 + impact, on ppc the impact is negligible.
79896 +
79897 + Note that several architectures require various emulations due to
79898 + badly designed userland ABIs, this will cause a performance impact
79899 + but will disappear as soon as userland is fixed. For example, ppc
79900 + userland MUST have been built with secure-plt by a recent toolchain.
79901 +
79902 +config PAX_SEGMEXEC
79903 + bool "Segmentation based non-executable pages"
79904 + default y if GRKERNSEC_CONFIG_AUTO
79905 + depends on PAX_NOEXEC && X86_32
79906 + help
79907 + This implementation is based on the segmentation feature of the
79908 + CPU and has a very small performance impact, however applications
79909 + will be limited to a 1.5 GB address space instead of the normal
79910 + 3 GB.
79911 +
79912 +config PAX_EMUTRAMP
79913 + bool "Emulate trampolines" if (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
79914 + default y if PARISC
79915 + help
79916 + There are some programs and libraries that for one reason or
79917 + another attempt to execute special small code snippets from
79918 + non-executable memory pages. Most notable examples are the
79919 + signal handler return code generated by the kernel itself and
79920 + the GCC trampolines.
79921 +
79922 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
79923 + such programs will no longer work under your kernel.
79924 +
79925 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
79926 + utilities to enable trampoline emulation for the affected programs
79927 + yet still have the protection provided by the non-executable pages.
79928 +
79929 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
79930 + your system will not even boot.
79931 +
79932 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
79933 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
79934 + for the affected files.
79935 +
79936 + NOTE: enabling this feature *may* open up a loophole in the
79937 + protection provided by non-executable pages that an attacker
79938 + could abuse. Therefore the best solution is to not have any
79939 + files on your system that would require this option. This can
79940 + be achieved by not using libc5 (which relies on the kernel
79941 + signal handler return code) and not using or rewriting programs
79942 + that make use of the nested function implementation of GCC.
79943 + Skilled users can just fix GCC itself so that it implements
79944 + nested function calls in a way that does not interfere with PaX.
79945 +
79946 +config PAX_EMUSIGRT
79947 + bool "Automatically emulate sigreturn trampolines"
79948 + depends on PAX_EMUTRAMP && PARISC
79949 + default y
79950 + help
79951 + Enabling this option will have the kernel automatically detect
79952 + and emulate signal return trampolines executing on the stack
79953 + that would otherwise lead to task termination.
79954 +
79955 + This solution is intended as a temporary one for users with
79956 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
79957 + Modula-3 runtime, etc) or executables linked to such, basically
79958 + everything that does not specify its own SA_RESTORER function in
79959 + normal executable memory like glibc 2.1+ does.
79960 +
79961 + On parisc you MUST enable this option, otherwise your system will
79962 + not even boot.
79963 +
79964 + NOTE: this feature cannot be disabled on a per executable basis
79965 + and since it *does* open up a loophole in the protection provided
79966 + by non-executable pages, the best solution is to not have any
79967 + files on your system that would require this option.
79968 +
79969 +config PAX_MPROTECT
79970 + bool "Restrict mprotect()"
79971 + default y if GRKERNSEC_CONFIG_AUTO
79972 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
79973 + help
79974 + Enabling this option will prevent programs from
79975 + - changing the executable status of memory pages that were
79976 + not originally created as executable,
79977 + - making read-only executable pages writable again,
79978 + - creating executable pages from anonymous memory,
79979 + - making read-only-after-relocations (RELRO) data pages writable again.
79980 +
79981 + You should say Y here to complete the protection provided by
79982 + the enforcement of non-executable pages.
79983 +
79984 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
79985 + this feature on a per file basis.
79986 +
79987 +config PAX_MPROTECT_COMPAT
79988 + bool "Use legacy/compat protection demoting (read help)"
79989 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
79990 + depends on PAX_MPROTECT
79991 + help
79992 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
79993 + by sending the proper error code to the application. For some broken
79994 + userland, this can cause problems with Python or other applications. The
79995 + current implementation however allows for applications like clamav to
79996 + detect if JIT compilation/execution is allowed and to fall back gracefully
79997 + to an interpreter-based mode if it does not. While we encourage everyone
79998 + to use the current implementation as-is and push upstream to fix broken
79999 + userland (note that the RWX logging option can assist with this), in some
80000 + environments this may not be possible. Having to disable MPROTECT
80001 + completely on certain binaries reduces the security benefit of PaX,
80002 + so this option is provided for those environments to revert to the old
80003 + behavior.
80004 +
80005 +config PAX_ELFRELOCS
80006 + bool "Allow ELF text relocations (read help)"
80007 + depends on PAX_MPROTECT
80008 + default n
80009 + help
80010 + Non-executable pages and mprotect() restrictions are effective
80011 + in preventing the introduction of new executable code into an
80012 + attacked task's address space. There remain only two venues
80013 + for this kind of attack: if the attacker can execute already
80014 + existing code in the attacked task then he can either have it
80015 + create and mmap() a file containing his code or have it mmap()
80016 + an already existing ELF library that does not have position
80017 + independent code in it and use mprotect() on it to make it
80018 + writable and copy his code there. While protecting against
80019 + the former approach is beyond PaX, the latter can be prevented
80020 + by having only PIC ELF libraries on one's system (which do not
80021 + need to relocate their code). If you are sure this is your case,
80022 + as is the case with all modern Linux distributions, then leave
80023 + this option disabled. You should say 'n' here.
80024 +
80025 +config PAX_ETEXECRELOCS
80026 + bool "Allow ELF ET_EXEC text relocations"
80027 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
80028 + select PAX_ELFRELOCS
80029 + default y
80030 + help
80031 + On some architectures there are incorrectly created applications
80032 + that require text relocations and would not work without enabling
80033 + this option. If you are an alpha, ia64 or parisc user, you should
80034 + enable this option and disable it once you have made sure that
80035 + none of your applications need it.
80036 +
80037 +config PAX_EMUPLT
80038 + bool "Automatically emulate ELF PLT"
80039 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
80040 + default y
80041 + help
80042 + Enabling this option will have the kernel automatically detect
80043 + and emulate the Procedure Linkage Table entries in ELF files.
80044 + On some architectures such entries are in writable memory, and
80045 + become non-executable leading to task termination. Therefore
80046 + it is mandatory that you enable this option on alpha, parisc,
80047 + sparc and sparc64, otherwise your system would not even boot.
80048 +
80049 + NOTE: this feature *does* open up a loophole in the protection
80050 + provided by the non-executable pages, therefore the proper
80051 + solution is to modify the toolchain to produce a PLT that does
80052 + not need to be writable.
80053 +
80054 +config PAX_DLRESOLVE
80055 + bool 'Emulate old glibc resolver stub'
80056 + depends on PAX_EMUPLT && SPARC
80057 + default n
80058 + help
80059 + This option is needed if userland has an old glibc (before 2.4)
80060 + that puts a 'save' instruction into the runtime generated resolver
80061 + stub that needs special emulation.
80062 +
80063 +config PAX_KERNEXEC
80064 + bool "Enforce non-executable kernel pages"
80065 + default y if GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_NONE || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_GUEST) || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_KVM))
80066 + depends on (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
80067 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
80068 + select PAX_KERNEXEC_PLUGIN if X86_64
80069 + help
80070 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
80071 + that is, enabling this option will make it harder to inject
80072 + and execute 'foreign' code in kernel memory itself.
80073 +
80074 + Note that on x86_64 kernels there is a known regression when
80075 + this feature and KVM/VMX are both enabled in the host kernel.
80076 +
80077 +choice
80078 + prompt "Return Address Instrumentation Method"
80079 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
80080 + depends on PAX_KERNEXEC_PLUGIN
80081 + help
80082 + Select the method used to instrument function pointer dereferences.
80083 + Note that binary modules cannot be instrumented by this approach.
80084 +
80085 + Note that the implementation requires a gcc with plugin support,
80086 + i.e., gcc 4.5 or newer. You may need to install the supporting
80087 + headers explicitly in addition to the normal gcc package.
80088 +
80089 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
80090 + bool "bts"
80091 + help
80092 + This method is compatible with binary only modules but has
80093 + a higher runtime overhead.
80094 +
80095 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
80096 + bool "or"
80097 + depends on !PARAVIRT
80098 + help
80099 + This method is incompatible with binary only modules but has
80100 + a lower runtime overhead.
80101 +endchoice
80102 +
80103 +config PAX_KERNEXEC_PLUGIN_METHOD
80104 + string
80105 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
80106 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
80107 + default ""
80108 +
80109 +config PAX_KERNEXEC_MODULE_TEXT
80110 + int "Minimum amount of memory reserved for module code"
80111 + default "4" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
80112 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
80113 + depends on PAX_KERNEXEC && X86_32 && MODULES
80114 + help
80115 + Due to implementation details the kernel must reserve a fixed
80116 + amount of memory for module code at compile time that cannot be
80117 + changed at runtime. Here you can specify the minimum amount
80118 + in MB that will be reserved. Due to the same implementation
80119 + details this size will always be rounded up to the next 2/4 MB
80120 + boundary (depends on PAE) so the actually available memory for
80121 + module code will usually be more than this minimum.
80122 +
80123 + The default 4 MB should be enough for most users but if you have
80124 + an excessive number of modules (e.g., most distribution configs
80125 + compile many drivers as modules) or use huge modules such as
80126 + nvidia's kernel driver, you will need to adjust this amount.
80127 + A good rule of thumb is to look at your currently loaded kernel
80128 + modules and add up their sizes.
80129 +
80130 +endmenu
80131 +
80132 +menu "Address Space Layout Randomization"
80133 + depends on PAX
80134 +
80135 +config PAX_ASLR
80136 + bool "Address Space Layout Randomization"
80137 + default y if GRKERNSEC_CONFIG_AUTO
80138 + help
80139 + Many if not most exploit techniques rely on the knowledge of
80140 + certain addresses in the attacked program. The following options
80141 + will allow the kernel to apply a certain amount of randomization
80142 + to specific parts of the program thereby forcing an attacker to
80143 + guess them in most cases. Any failed guess will most likely crash
80144 + the attacked program which allows the kernel to detect such attempts
80145 + and react on them. PaX itself provides no reaction mechanisms,
80146 + instead it is strongly encouraged that you make use of Nergal's
80147 + segvguard (ftp://ftp.pl.openwall.com/misc/segvguard/) or grsecurity's
80148 + (http://www.grsecurity.net/) built-in crash detection features or
80149 + develop one yourself.
80150 +
80151 + By saying Y here you can choose to randomize the following areas:
80152 + - top of the task's kernel stack
80153 + - top of the task's userland stack
80154 + - base address for mmap() requests that do not specify one
80155 + (this includes all libraries)
80156 + - base address of the main executable
80157 +
80158 + It is strongly recommended to say Y here as address space layout
80159 + randomization has negligible impact on performance yet it provides
80160 + a very effective protection.
80161 +
80162 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
80163 + this feature on a per file basis.
80164 +
80165 +config PAX_RANDKSTACK
80166 + bool "Randomize kernel stack base"
80167 + default y if GRKERNSEC_CONFIG_AUTO
80168 + depends on X86_TSC && X86
80169 + help
80170 + By saying Y here the kernel will randomize every task's kernel
80171 + stack on every system call. This will not only force an attacker
80172 + to guess it but also prevent him from making use of possible
80173 + leaked information about it.
80174 +
80175 + Since the kernel stack is a rather scarce resource, randomization
80176 + may cause unexpected stack overflows, therefore you should very
80177 + carefully test your system. Note that once enabled in the kernel
80178 + configuration, this feature cannot be disabled on a per file basis.
80179 +
80180 +config PAX_RANDUSTACK
80181 + bool "Randomize user stack base"
80182 + default y if GRKERNSEC_CONFIG_AUTO
80183 + depends on PAX_ASLR
80184 + help
80185 + By saying Y here the kernel will randomize every task's userland
80186 + stack. The randomization is done in two steps where the second
80187 + one may apply a big amount of shift to the top of the stack and
80188 + cause problems for programs that want to use lots of memory (more
80189 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
80190 + For this reason the second step can be controlled by 'chpax' or
80191 + 'paxctl' on a per file basis.
80192 +
80193 +config PAX_RANDMMAP
80194 + bool "Randomize mmap() base"
80195 + default y if GRKERNSEC_CONFIG_AUTO
80196 + depends on PAX_ASLR
80197 + help
80198 + By saying Y here the kernel will use a randomized base address for
80199 + mmap() requests that do not specify one themselves. As a result
80200 + all dynamically loaded libraries will appear at random addresses
80201 + and therefore be harder to exploit by a technique where an attacker
80202 + attempts to execute library code for his purposes (e.g. spawn a
80203 + shell from an exploited program that is running at an elevated
80204 + privilege level).
80205 +
80206 + Furthermore, if a program is relinked as a dynamic ELF file, its
80207 + base address will be randomized as well, completing the full
80208 + randomization of the address space layout. Attacking such programs
80209 + becomes a guess game. You can find an example of doing this at
80210 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
80211 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
80212 +
80213 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
80214 + feature on a per file basis.
80215 +
80216 +endmenu
80217 +
80218 +menu "Miscellaneous hardening features"
80219 +
80220 +config PAX_MEMORY_SANITIZE
80221 + bool "Sanitize all freed memory"
80222 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
80223 + depends on !HIBERNATION
80224 + help
80225 + By saying Y here the kernel will erase memory pages as soon as they
80226 + are freed. This in turn reduces the lifetime of data stored in the
80227 + pages, making it less likely that sensitive information such as
80228 + passwords, cryptographic secrets, etc stay in memory for too long.
80229 +
80230 + This is especially useful for programs whose runtime is short, long
80231 + lived processes and the kernel itself benefit from this as long as
80232 + they operate on whole memory pages and ensure timely freeing of pages
80233 + that may hold sensitive information.
80234 +
80235 + The tradeoff is performance impact, on a single CPU system kernel
80236 + compilation sees a 3% slowdown, other systems and workloads may vary
80237 + and you are advised to test this feature on your expected workload
80238 + before deploying it.
80239 +
80240 + Note that this feature does not protect data stored in live pages,
80241 + e.g., process memory swapped to disk may stay there for a long time.
80242 +
80243 +config PAX_MEMORY_STACKLEAK
80244 + bool "Sanitize kernel stack"
80245 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
80246 + depends on X86
80247 + help
80248 + By saying Y here the kernel will erase the kernel stack before it
80249 + returns from a system call. This in turn reduces the information
80250 + that a kernel stack leak bug can reveal.
80251 +
80252 + Note that such a bug can still leak information that was put on
80253 + the stack by the current system call (the one eventually triggering
80254 + the bug) but traces of earlier system calls on the kernel stack
80255 + cannot leak anymore.
80256 +
80257 + The tradeoff is performance impact: on a single CPU system kernel
80258 + compilation sees a 1% slowdown, other systems and workloads may vary
80259 + and you are advised to test this feature on your expected workload
80260 + before deploying it.
80261 +
80262 + Note that the full feature requires a gcc with plugin support,
80263 + i.e., gcc 4.5 or newer. You may need to install the supporting
80264 + headers explicitly in addition to the normal gcc package. Using
80265 + older gcc versions means that functions with large enough stack
80266 + frames may leave uninitialized memory behind that may be exposed
80267 + to a later syscall leaking the stack.
80268 +
80269 +config PAX_MEMORY_UDEREF
80270 + bool "Prevent invalid userland pointer dereference"
80271 + default y if GRKERNSEC_CONFIG_AUTO && (X86_32 || (X86_64 && GRKERNSEC_CONFIG_PRIORITY_SECURITY)) && (GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
80272 + depends on X86 && !UML_X86 && !XEN
80273 + select PAX_PER_CPU_PGD if X86_64
80274 + help
80275 + By saying Y here the kernel will be prevented from dereferencing
80276 + userland pointers in contexts where the kernel expects only kernel
80277 + pointers. This is both a useful runtime debugging feature and a
80278 + security measure that prevents exploiting a class of kernel bugs.
80279 +
80280 + The tradeoff is that some virtualization solutions may experience
80281 + a huge slowdown and therefore you should not enable this feature
80282 + for kernels meant to run in such environments. Whether a given VM
80283 + solution is affected or not is best determined by simply trying it
80284 + out, the performance impact will be obvious right on boot as this
80285 + mechanism engages from very early on. A good rule of thumb is that
80286 + VMs running on CPUs without hardware virtualization support (i.e.,
80287 + the majority of IA-32 CPUs) will likely experience the slowdown.
80288 +
80289 +config PAX_REFCOUNT
80290 + bool "Prevent various kernel object reference counter overflows"
80291 + default y if GRKERNSEC_CONFIG_AUTO
80292 + depends on GRKERNSEC && ((ARM && (CPU_32v6 || CPU_32v6K || CPU_32v7)) || SPARC64 || X86)
80293 + help
80294 + By saying Y here the kernel will detect and prevent overflowing
80295 + various (but not all) kinds of object reference counters. Such
80296 + overflows can normally occur due to bugs only and are often, if
80297 + not always, exploitable.
80298 +
80299 + The tradeoff is that data structures protected by an overflowed
80300 + refcount will never be freed and therefore will leak memory. Note
80301 + that this leak also happens even without this protection but in
80302 + that case the overflow can eventually trigger the freeing of the
80303 + data structure while it is still being used elsewhere, resulting
80304 + in the exploitable situation that this feature prevents.
80305 +
80306 + Since this has a negligible performance impact, you should enable
80307 + this feature.
80308 +
80309 +config PAX_USERCOPY
80310 + bool "Harden heap object copies between kernel and userland"
80311 + default y if GRKERNSEC_CONFIG_AUTO
80312 + depends on X86 || PPC || SPARC || ARM
80313 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
80314 + select PAX_USERCOPY_SLABS
80315 + help
80316 + By saying Y here the kernel will enforce the size of heap objects
80317 + when they are copied in either direction between the kernel and
80318 + userland, even if only a part of the heap object is copied.
80319 +
80320 + Specifically, this checking prevents information leaking from the
80321 + kernel heap during kernel to userland copies (if the kernel heap
80322 + object is otherwise fully initialized) and prevents kernel heap
80323 + overflows during userland to kernel copies.
80324 +
80325 + Note that the current implementation provides the strictest bounds
80326 + checks for the SLUB allocator.
80327 +
80328 + Enabling this option also enables per-slab cache protection against
80329 + data in a given cache being copied into/out of via userland
80330 + accessors. Though the whitelist of regions will be reduced over
80331 + time, it notably protects important data structures like task structs.
80332 +
80333 + If frame pointers are enabled on x86, this option will also restrict
80334 + copies into and out of the kernel stack to local variables within a
80335 + single frame.
80336 +
80337 + Since this has a negligible performance impact, you should enable
80338 + this feature.
80339 +
80340 +config PAX_SIZE_OVERFLOW
80341 + bool "Prevent various integer overflows in function size parameters"
80342 + default y if GRKERNSEC_CONFIG_AUTO
80343 + depends on X86
80344 + help
80345 + By saying Y here the kernel recomputes expressions of function
80346 + arguments marked by a size_overflow attribute with double integer
80347 + precision (DImode/TImode for 32/64 bit integer types).
80348 +
80349 + The recomputed argument is checked against TYPE_MAX and an event
80350 + is logged on overflow and the triggering process is killed.
80351 +
80352 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
80353 +
80354 + Note that the implementation requires a gcc with plugin support,
80355 + i.e., gcc 4.5 or newer. You may need to install the supporting
80356 + headers explicitly in addition to the normal gcc package.
80357 +
80358 +config PAX_LATENT_ENTROPY
80359 + bool "Generate some entropy during boot"
80360 + default y if GRKERNSEC_CONFIG_AUTO
80361 + help
80362 + By saying Y here the kernel will instrument early boot code to
80363 + extract some entropy from both original and artificially created
80364 + program state. This will help especially embedded systems where
80365 + there is little 'natural' source of entropy normally. The cost
80366 + is some slowdown of the boot process.
80367 +
80368 + Note that the implementation requires a gcc with plugin support,
80369 + i.e., gcc 4.5 or newer. You may need to install the supporting
80370 + headers explicitly in addition to the normal gcc package.
80371 +
80372 + Note that entropy extracted this way is not cryptographically
80373 + secure!
80374 +
80375 +endmenu
80376 +
80377 +endmenu
80378 +
80379 +source grsecurity/Kconfig
80380 +
80381 +endmenu
80382 +
80383 +endmenu
80384 +
80385 source security/keys/Kconfig
80386
80387 config SECURITY_DMESG_RESTRICT
80388 @@ -103,7 +985,7 @@ config INTEL_TXT
80389 config LSM_MMAP_MIN_ADDR
80390 int "Low address space for LSM to protect from user allocation"
80391 depends on SECURITY && SECURITY_SELINUX
80392 - default 32768 if ARM
80393 + default 32768 if ALPHA || ARM || PARISC || SPARC32
80394 default 65536
80395 help
80396 This is the portion of low virtual memory which should be protected
80397 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
80398 index 8ea39aa..8569ac5 100644
80399 --- a/security/apparmor/lsm.c
80400 +++ b/security/apparmor/lsm.c
80401 @@ -614,7 +614,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
80402 return error;
80403 }
80404
80405 -static struct security_operations apparmor_ops = {
80406 +static struct security_operations apparmor_ops __read_only = {
80407 .name = "apparmor",
80408
80409 .ptrace_access_check = apparmor_ptrace_access_check,
80410 diff --git a/security/commoncap.c b/security/commoncap.c
80411 index 6dbae46..d5611fd 100644
80412 --- a/security/commoncap.c
80413 +++ b/security/commoncap.c
80414 @@ -415,6 +415,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
80415 return 0;
80416 }
80417
80418 +/* returns:
80419 + 1 for suid privilege
80420 + 2 for sgid privilege
80421 + 3 for fscap privilege
80422 +*/
80423 +int is_privileged_binary(const struct dentry *dentry)
80424 +{
80425 + struct cpu_vfs_cap_data capdata;
80426 + struct inode *inode = dentry->d_inode;
80427 +
80428 + if (!inode || S_ISDIR(inode->i_mode))
80429 + return 0;
80430 +
80431 + if (inode->i_mode & S_ISUID)
80432 + return 1;
80433 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
80434 + return 2;
80435 +
80436 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
80437 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
80438 + return 3;
80439 + }
80440 +
80441 + return 0;
80442 +}
80443 +
80444 /*
80445 * Attempt to get the on-exec apply capability sets for an executable file from
80446 * its xattrs and, if present, apply them to the proposed credentials being
80447 @@ -583,6 +609,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
80448 const struct cred *cred = current_cred();
80449 kuid_t root_uid = make_kuid(cred->user_ns, 0);
80450
80451 + if (gr_acl_enable_at_secure())
80452 + return 1;
80453 +
80454 if (!uid_eq(cred->uid, root_uid)) {
80455 if (bprm->cap_effective)
80456 return 1;
80457 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
80458 index 3ccf7ac..d73ad64 100644
80459 --- a/security/integrity/ima/ima.h
80460 +++ b/security/integrity/ima/ima.h
80461 @@ -86,8 +86,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
80462 extern spinlock_t ima_queue_lock;
80463
80464 struct ima_h_table {
80465 - atomic_long_t len; /* number of stored measurements in the list */
80466 - atomic_long_t violations;
80467 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
80468 + atomic_long_unchecked_t violations;
80469 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
80470 };
80471 extern struct ima_h_table ima_htable;
80472 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
80473 index 88a2788..581ab92 100644
80474 --- a/security/integrity/ima/ima_api.c
80475 +++ b/security/integrity/ima/ima_api.c
80476 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
80477 int result;
80478
80479 /* can overflow, only indicator */
80480 - atomic_long_inc(&ima_htable.violations);
80481 + atomic_long_inc_unchecked(&ima_htable.violations);
80482
80483 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
80484 if (!entry) {
80485 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
80486 index e1aa2b4..52027bf 100644
80487 --- a/security/integrity/ima/ima_fs.c
80488 +++ b/security/integrity/ima/ima_fs.c
80489 @@ -28,12 +28,12 @@
80490 static int valid_policy = 1;
80491 #define TMPBUFLEN 12
80492 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
80493 - loff_t *ppos, atomic_long_t *val)
80494 + loff_t *ppos, atomic_long_unchecked_t *val)
80495 {
80496 char tmpbuf[TMPBUFLEN];
80497 ssize_t len;
80498
80499 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
80500 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
80501 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
80502 }
80503
80504 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
80505 index 55a6271..ad829c3 100644
80506 --- a/security/integrity/ima/ima_queue.c
80507 +++ b/security/integrity/ima/ima_queue.c
80508 @@ -81,7 +81,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
80509 INIT_LIST_HEAD(&qe->later);
80510 list_add_tail_rcu(&qe->later, &ima_measurements);
80511
80512 - atomic_long_inc(&ima_htable.len);
80513 + atomic_long_inc_unchecked(&ima_htable.len);
80514 key = ima_hash_key(entry->digest);
80515 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
80516 return 0;
80517 diff --git a/security/keys/compat.c b/security/keys/compat.c
80518 index c92d42b..341e7ea 100644
80519 --- a/security/keys/compat.c
80520 +++ b/security/keys/compat.c
80521 @@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
80522 if (ret == 0)
80523 goto no_payload_free;
80524
80525 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
80526 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
80527
80528 if (iov != iovstack)
80529 kfree(iov);
80530 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
80531 index 0f5b3f0..b8d47c1 100644
80532 --- a/security/keys/keyctl.c
80533 +++ b/security/keys/keyctl.c
80534 @@ -966,7 +966,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
80535 /*
80536 * Copy the iovec data from userspace
80537 */
80538 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
80539 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
80540 unsigned ioc)
80541 {
80542 for (; ioc > 0; ioc--) {
80543 @@ -988,7 +988,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
80544 * If successful, 0 will be returned.
80545 */
80546 long keyctl_instantiate_key_common(key_serial_t id,
80547 - const struct iovec *payload_iov,
80548 + const struct iovec __user *payload_iov,
80549 unsigned ioc,
80550 size_t plen,
80551 key_serial_t ringid)
80552 @@ -1083,7 +1083,7 @@ long keyctl_instantiate_key(key_serial_t id,
80553 [0].iov_len = plen
80554 };
80555
80556 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
80557 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
80558 }
80559
80560 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
80561 @@ -1116,7 +1116,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
80562 if (ret == 0)
80563 goto no_payload_free;
80564
80565 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
80566 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
80567
80568 if (iov != iovstack)
80569 kfree(iov);
80570 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
80571 index 7445875..262834f 100644
80572 --- a/security/keys/keyring.c
80573 +++ b/security/keys/keyring.c
80574 @@ -227,16 +227,16 @@ static long keyring_read(const struct key *keyring,
80575 ret = -EFAULT;
80576
80577 for (loop = 0; loop < klist->nkeys; loop++) {
80578 + key_serial_t serial;
80579 key = rcu_deref_link_locked(klist, loop,
80580 keyring);
80581 + serial = key->serial;
80582
80583 tmp = sizeof(key_serial_t);
80584 if (tmp > buflen)
80585 tmp = buflen;
80586
80587 - if (copy_to_user(buffer,
80588 - &key->serial,
80589 - tmp) != 0)
80590 + if (copy_to_user(buffer, &serial, tmp))
80591 goto error;
80592
80593 buflen -= tmp;
80594 diff --git a/security/min_addr.c b/security/min_addr.c
80595 index f728728..6457a0c 100644
80596 --- a/security/min_addr.c
80597 +++ b/security/min_addr.c
80598 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
80599 */
80600 static void update_mmap_min_addr(void)
80601 {
80602 +#ifndef SPARC
80603 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
80604 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
80605 mmap_min_addr = dac_mmap_min_addr;
80606 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
80607 #else
80608 mmap_min_addr = dac_mmap_min_addr;
80609 #endif
80610 +#endif
80611 }
80612
80613 /*
80614 diff --git a/security/security.c b/security/security.c
80615 index 860aeb3..45765c0 100644
80616 --- a/security/security.c
80617 +++ b/security/security.c
80618 @@ -20,6 +20,7 @@
80619 #include <linux/ima.h>
80620 #include <linux/evm.h>
80621 #include <linux/fsnotify.h>
80622 +#include <linux/mm.h>
80623 #include <linux/mman.h>
80624 #include <linux/mount.h>
80625 #include <linux/personality.h>
80626 @@ -32,8 +33,8 @@
80627 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
80628 CONFIG_DEFAULT_SECURITY;
80629
80630 -static struct security_operations *security_ops;
80631 -static struct security_operations default_security_ops = {
80632 +static struct security_operations *security_ops __read_only;
80633 +static struct security_operations default_security_ops __read_only = {
80634 .name = "default",
80635 };
80636
80637 @@ -74,7 +75,9 @@ int __init security_init(void)
80638
80639 void reset_security_ops(void)
80640 {
80641 + pax_open_kernel();
80642 security_ops = &default_security_ops;
80643 + pax_close_kernel();
80644 }
80645
80646 /* Save user chosen LSM */
80647 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
80648 index db10db2..99a640f 100644
80649 --- a/security/selinux/hooks.c
80650 +++ b/security/selinux/hooks.c
80651 @@ -95,8 +95,6 @@
80652
80653 #define NUM_SEL_MNT_OPTS 5
80654
80655 -extern struct security_operations *security_ops;
80656 -
80657 /* SECMARK reference count */
80658 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
80659
80660 @@ -5511,7 +5509,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
80661
80662 #endif
80663
80664 -static struct security_operations selinux_ops = {
80665 +static struct security_operations selinux_ops __read_only = {
80666 .name = "selinux",
80667
80668 .ptrace_access_check = selinux_ptrace_access_check,
80669 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
80670 index c220f31..89fab3f 100644
80671 --- a/security/selinux/include/xfrm.h
80672 +++ b/security/selinux/include/xfrm.h
80673 @@ -50,7 +50,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
80674
80675 static inline void selinux_xfrm_notify_policyload(void)
80676 {
80677 - atomic_inc(&flow_cache_genid);
80678 + atomic_inc_unchecked(&flow_cache_genid);
80679 }
80680 #else
80681 static inline int selinux_xfrm_enabled(void)
80682 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
80683 index ee0bb57..57fcd43 100644
80684 --- a/security/smack/smack_lsm.c
80685 +++ b/security/smack/smack_lsm.c
80686 @@ -3432,7 +3432,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
80687 return 0;
80688 }
80689
80690 -struct security_operations smack_ops = {
80691 +struct security_operations smack_ops __read_only = {
80692 .name = "smack",
80693
80694 .ptrace_access_check = smack_ptrace_access_check,
80695 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
80696 index c2d04a5..e6a1aeb 100644
80697 --- a/security/tomoyo/tomoyo.c
80698 +++ b/security/tomoyo/tomoyo.c
80699 @@ -501,7 +501,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
80700 * tomoyo_security_ops is a "struct security_operations" which is used for
80701 * registering TOMOYO.
80702 */
80703 -static struct security_operations tomoyo_security_ops = {
80704 +static struct security_operations tomoyo_security_ops __read_only = {
80705 .name = "tomoyo",
80706 .cred_alloc_blank = tomoyo_cred_alloc_blank,
80707 .cred_prepare = tomoyo_cred_prepare,
80708 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
80709 index 51d6709..1f3dbe2 100644
80710 --- a/security/yama/Kconfig
80711 +++ b/security/yama/Kconfig
80712 @@ -1,6 +1,6 @@
80713 config SECURITY_YAMA
80714 bool "Yama support"
80715 - depends on SECURITY
80716 + depends on SECURITY && !GRKERNSEC
80717 select SECURITYFS
80718 select SECURITY_PATH
80719 default n
80720 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
80721 index 270790d..c67dfcb 100644
80722 --- a/sound/aoa/codecs/onyx.c
80723 +++ b/sound/aoa/codecs/onyx.c
80724 @@ -54,7 +54,7 @@ struct onyx {
80725 spdif_locked:1,
80726 analog_locked:1,
80727 original_mute:2;
80728 - int open_count;
80729 + local_t open_count;
80730 struct codec_info *codec_info;
80731
80732 /* mutex serializes concurrent access to the device
80733 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
80734 struct onyx *onyx = cii->codec_data;
80735
80736 mutex_lock(&onyx->mutex);
80737 - onyx->open_count++;
80738 + local_inc(&onyx->open_count);
80739 mutex_unlock(&onyx->mutex);
80740
80741 return 0;
80742 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
80743 struct onyx *onyx = cii->codec_data;
80744
80745 mutex_lock(&onyx->mutex);
80746 - onyx->open_count--;
80747 - if (!onyx->open_count)
80748 + if (local_dec_and_test(&onyx->open_count))
80749 onyx->spdif_locked = onyx->analog_locked = 0;
80750 mutex_unlock(&onyx->mutex);
80751
80752 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
80753 index ffd2025..df062c9 100644
80754 --- a/sound/aoa/codecs/onyx.h
80755 +++ b/sound/aoa/codecs/onyx.h
80756 @@ -11,6 +11,7 @@
80757 #include <linux/i2c.h>
80758 #include <asm/pmac_low_i2c.h>
80759 #include <asm/prom.h>
80760 +#include <asm/local.h>
80761
80762 /* PCM3052 register definitions */
80763
80764 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
80765 index 08fde00..0bf641a 100644
80766 --- a/sound/core/oss/pcm_oss.c
80767 +++ b/sound/core/oss/pcm_oss.c
80768 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
80769 if (in_kernel) {
80770 mm_segment_t fs;
80771 fs = snd_enter_user();
80772 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
80773 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
80774 snd_leave_user(fs);
80775 } else {
80776 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
80777 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
80778 }
80779 if (ret != -EPIPE && ret != -ESTRPIPE)
80780 break;
80781 @@ -1234,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
80782 if (in_kernel) {
80783 mm_segment_t fs;
80784 fs = snd_enter_user();
80785 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
80786 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
80787 snd_leave_user(fs);
80788 } else {
80789 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
80790 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
80791 }
80792 if (ret == -EPIPE) {
80793 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
80794 @@ -1337,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
80795 struct snd_pcm_plugin_channel *channels;
80796 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
80797 if (!in_kernel) {
80798 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
80799 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
80800 return -EFAULT;
80801 buf = runtime->oss.buffer;
80802 }
80803 @@ -1407,7 +1407,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
80804 }
80805 } else {
80806 tmp = snd_pcm_oss_write2(substream,
80807 - (const char __force *)buf,
80808 + (const char __force_kernel *)buf,
80809 runtime->oss.period_bytes, 0);
80810 if (tmp <= 0)
80811 goto err;
80812 @@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
80813 struct snd_pcm_runtime *runtime = substream->runtime;
80814 snd_pcm_sframes_t frames, frames1;
80815 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
80816 - char __user *final_dst = (char __force __user *)buf;
80817 + char __user *final_dst = (char __force_user *)buf;
80818 if (runtime->oss.plugin_first) {
80819 struct snd_pcm_plugin_channel *channels;
80820 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
80821 @@ -1495,7 +1495,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
80822 xfer += tmp;
80823 runtime->oss.buffer_used -= tmp;
80824 } else {
80825 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
80826 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
80827 runtime->oss.period_bytes, 0);
80828 if (tmp <= 0)
80829 goto err;
80830 @@ -1663,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
80831 size1);
80832 size1 /= runtime->channels; /* frames */
80833 fs = snd_enter_user();
80834 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
80835 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
80836 snd_leave_user(fs);
80837 }
80838 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
80839 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
80840 index 91cdf94..4085161 100644
80841 --- a/sound/core/pcm_compat.c
80842 +++ b/sound/core/pcm_compat.c
80843 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
80844 int err;
80845
80846 fs = snd_enter_user();
80847 - err = snd_pcm_delay(substream, &delay);
80848 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
80849 snd_leave_user(fs);
80850 if (err < 0)
80851 return err;
80852 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
80853 index 53b5ada..2db94c8 100644
80854 --- a/sound/core/pcm_native.c
80855 +++ b/sound/core/pcm_native.c
80856 @@ -2780,11 +2780,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
80857 switch (substream->stream) {
80858 case SNDRV_PCM_STREAM_PLAYBACK:
80859 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
80860 - (void __user *)arg);
80861 + (void __force_user *)arg);
80862 break;
80863 case SNDRV_PCM_STREAM_CAPTURE:
80864 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
80865 - (void __user *)arg);
80866 + (void __force_user *)arg);
80867 break;
80868 default:
80869 result = -EINVAL;
80870 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
80871 index 5cf8d65..912a79c 100644
80872 --- a/sound/core/seq/seq_device.c
80873 +++ b/sound/core/seq/seq_device.c
80874 @@ -64,7 +64,7 @@ struct ops_list {
80875 int argsize; /* argument size */
80876
80877 /* operators */
80878 - struct snd_seq_dev_ops ops;
80879 + struct snd_seq_dev_ops *ops;
80880
80881 /* registred devices */
80882 struct list_head dev_list; /* list of devices */
80883 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
80884
80885 mutex_lock(&ops->reg_mutex);
80886 /* copy driver operators */
80887 - ops->ops = *entry;
80888 + ops->ops = entry;
80889 ops->driver |= DRIVER_LOADED;
80890 ops->argsize = argsize;
80891
80892 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
80893 dev->name, ops->id, ops->argsize, dev->argsize);
80894 return -EINVAL;
80895 }
80896 - if (ops->ops.init_device(dev) >= 0) {
80897 + if (ops->ops->init_device(dev) >= 0) {
80898 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
80899 ops->num_init_devices++;
80900 } else {
80901 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
80902 dev->name, ops->id, ops->argsize, dev->argsize);
80903 return -EINVAL;
80904 }
80905 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
80906 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
80907 dev->status = SNDRV_SEQ_DEVICE_FREE;
80908 dev->driver_data = NULL;
80909 ops->num_init_devices--;
80910 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
80911 index 621e60e..f4543f5 100644
80912 --- a/sound/drivers/mts64.c
80913 +++ b/sound/drivers/mts64.c
80914 @@ -29,6 +29,7 @@
80915 #include <sound/initval.h>
80916 #include <sound/rawmidi.h>
80917 #include <sound/control.h>
80918 +#include <asm/local.h>
80919
80920 #define CARD_NAME "Miditerminal 4140"
80921 #define DRIVER_NAME "MTS64"
80922 @@ -67,7 +68,7 @@ struct mts64 {
80923 struct pardevice *pardev;
80924 int pardev_claimed;
80925
80926 - int open_count;
80927 + local_t open_count;
80928 int current_midi_output_port;
80929 int current_midi_input_port;
80930 u8 mode[MTS64_NUM_INPUT_PORTS];
80931 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
80932 {
80933 struct mts64 *mts = substream->rmidi->private_data;
80934
80935 - if (mts->open_count == 0) {
80936 + if (local_read(&mts->open_count) == 0) {
80937 /* We don't need a spinlock here, because this is just called
80938 if the device has not been opened before.
80939 So there aren't any IRQs from the device */
80940 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
80941
80942 msleep(50);
80943 }
80944 - ++(mts->open_count);
80945 + local_inc(&mts->open_count);
80946
80947 return 0;
80948 }
80949 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
80950 struct mts64 *mts = substream->rmidi->private_data;
80951 unsigned long flags;
80952
80953 - --(mts->open_count);
80954 - if (mts->open_count == 0) {
80955 + if (local_dec_return(&mts->open_count) == 0) {
80956 /* We need the spinlock_irqsave here because we can still
80957 have IRQs at this point */
80958 spin_lock_irqsave(&mts->lock, flags);
80959 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
80960
80961 msleep(500);
80962
80963 - } else if (mts->open_count < 0)
80964 - mts->open_count = 0;
80965 + } else if (local_read(&mts->open_count) < 0)
80966 + local_set(&mts->open_count, 0);
80967
80968 return 0;
80969 }
80970 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
80971 index b953fb4..1999c01 100644
80972 --- a/sound/drivers/opl4/opl4_lib.c
80973 +++ b/sound/drivers/opl4/opl4_lib.c
80974 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
80975 MODULE_DESCRIPTION("OPL4 driver");
80976 MODULE_LICENSE("GPL");
80977
80978 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
80979 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
80980 {
80981 int timeout = 10;
80982 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
80983 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
80984 index 3e32bd3..46fc152 100644
80985 --- a/sound/drivers/portman2x4.c
80986 +++ b/sound/drivers/portman2x4.c
80987 @@ -48,6 +48,7 @@
80988 #include <sound/initval.h>
80989 #include <sound/rawmidi.h>
80990 #include <sound/control.h>
80991 +#include <asm/local.h>
80992
80993 #define CARD_NAME "Portman 2x4"
80994 #define DRIVER_NAME "portman"
80995 @@ -85,7 +86,7 @@ struct portman {
80996 struct pardevice *pardev;
80997 int pardev_claimed;
80998
80999 - int open_count;
81000 + local_t open_count;
81001 int mode[PORTMAN_NUM_INPUT_PORTS];
81002 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
81003 };
81004 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
81005 index ea995af..f1bfa37 100644
81006 --- a/sound/firewire/amdtp.c
81007 +++ b/sound/firewire/amdtp.c
81008 @@ -389,7 +389,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
81009 ptr = s->pcm_buffer_pointer + data_blocks;
81010 if (ptr >= pcm->runtime->buffer_size)
81011 ptr -= pcm->runtime->buffer_size;
81012 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
81013 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
81014
81015 s->pcm_period_pointer += data_blocks;
81016 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
81017 @@ -557,7 +557,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
81018 */
81019 void amdtp_out_stream_update(struct amdtp_out_stream *s)
81020 {
81021 - ACCESS_ONCE(s->source_node_id_field) =
81022 + ACCESS_ONCE_RW(s->source_node_id_field) =
81023 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
81024 }
81025 EXPORT_SYMBOL(amdtp_out_stream_update);
81026 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
81027 index b680c5e..061b7a0 100644
81028 --- a/sound/firewire/amdtp.h
81029 +++ b/sound/firewire/amdtp.h
81030 @@ -139,7 +139,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
81031 static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
81032 struct snd_pcm_substream *pcm)
81033 {
81034 - ACCESS_ONCE(s->pcm) = pcm;
81035 + ACCESS_ONCE_RW(s->pcm) = pcm;
81036 }
81037
81038 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
81039 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
81040 index d428ffe..751ef78 100644
81041 --- a/sound/firewire/isight.c
81042 +++ b/sound/firewire/isight.c
81043 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
81044 ptr += count;
81045 if (ptr >= runtime->buffer_size)
81046 ptr -= runtime->buffer_size;
81047 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
81048 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
81049
81050 isight->period_counter += count;
81051 if (isight->period_counter >= runtime->period_size) {
81052 @@ -307,7 +307,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
81053 if (err < 0)
81054 return err;
81055
81056 - ACCESS_ONCE(isight->pcm_active) = true;
81057 + ACCESS_ONCE_RW(isight->pcm_active) = true;
81058
81059 return 0;
81060 }
81061 @@ -340,7 +340,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
81062 {
81063 struct isight *isight = substream->private_data;
81064
81065 - ACCESS_ONCE(isight->pcm_active) = false;
81066 + ACCESS_ONCE_RW(isight->pcm_active) = false;
81067
81068 mutex_lock(&isight->mutex);
81069 isight_stop_streaming(isight);
81070 @@ -433,10 +433,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
81071
81072 switch (cmd) {
81073 case SNDRV_PCM_TRIGGER_START:
81074 - ACCESS_ONCE(isight->pcm_running) = true;
81075 + ACCESS_ONCE_RW(isight->pcm_running) = true;
81076 break;
81077 case SNDRV_PCM_TRIGGER_STOP:
81078 - ACCESS_ONCE(isight->pcm_running) = false;
81079 + ACCESS_ONCE_RW(isight->pcm_running) = false;
81080 break;
81081 default:
81082 return -EINVAL;
81083 diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
81084 index 7bd5e33..1fcab12 100644
81085 --- a/sound/isa/cmi8330.c
81086 +++ b/sound/isa/cmi8330.c
81087 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
81088
81089 struct snd_pcm *pcm;
81090 struct snd_cmi8330_stream {
81091 - struct snd_pcm_ops ops;
81092 + snd_pcm_ops_no_const ops;
81093 snd_pcm_open_callback_t open;
81094 void *private_data; /* sb or wss */
81095 } streams[2];
81096 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
81097 index 733b014..56ce96f 100644
81098 --- a/sound/oss/sb_audio.c
81099 +++ b/sound/oss/sb_audio.c
81100 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
81101 buf16 = (signed short *)(localbuf + localoffs);
81102 while (c)
81103 {
81104 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
81105 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
81106 if (copy_from_user(lbuf8,
81107 userbuf+useroffs + p,
81108 locallen))
81109 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
81110 index 09d4648..cf234c7 100644
81111 --- a/sound/oss/swarm_cs4297a.c
81112 +++ b/sound/oss/swarm_cs4297a.c
81113 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
81114 {
81115 struct cs4297a_state *s;
81116 u32 pwr, id;
81117 - mm_segment_t fs;
81118 int rval;
81119 #ifndef CONFIG_BCM_CS4297A_CSWARM
81120 u64 cfg;
81121 @@ -2696,22 +2695,23 @@ static int __init cs4297a_init(void)
81122 if (!rval) {
81123 char *sb1250_duart_present;
81124
81125 +#if 0
81126 + mm_segment_t fs;
81127 fs = get_fs();
81128 set_fs(KERNEL_DS);
81129 -#if 0
81130 val = SOUND_MASK_LINE;
81131 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
81132 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
81133 val = initvol[i].vol;
81134 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
81135 }
81136 + set_fs(fs);
81137 // cs4297a_write_ac97(s, 0x18, 0x0808);
81138 #else
81139 // cs4297a_write_ac97(s, 0x5e, 0x180);
81140 cs4297a_write_ac97(s, 0x02, 0x0808);
81141 cs4297a_write_ac97(s, 0x18, 0x0808);
81142 #endif
81143 - set_fs(fs);
81144
81145 list_add(&s->list, &cs4297a_devs);
81146
81147 diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
81148 index 2fdaadb..7df8fc6 100644
81149 --- a/sound/pci/hda/hda_codec.h
81150 +++ b/sound/pci/hda/hda_codec.h
81151 @@ -611,7 +611,7 @@ struct hda_bus_ops {
81152 /* notify power-up/down from codec to controller */
81153 void (*pm_notify)(struct hda_bus *bus);
81154 #endif
81155 -};
81156 +} __no_const;
81157
81158 /* template to pass to the bus constructor */
81159 struct hda_bus_template {
81160 @@ -711,6 +711,7 @@ struct hda_codec_ops {
81161 #endif
81162 void (*reboot_notify)(struct hda_codec *codec);
81163 };
81164 +typedef struct hda_codec_ops __no_const hda_codec_ops_no_const;
81165
81166 /* record for amp information cache */
81167 struct hda_cache_head {
81168 @@ -741,7 +742,7 @@ struct hda_pcm_ops {
81169 struct snd_pcm_substream *substream);
81170 int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
81171 struct snd_pcm_substream *substream);
81172 -};
81173 +} __no_const;
81174
81175 /* PCM information for each substream */
81176 struct hda_pcm_stream {
81177 @@ -799,7 +800,7 @@ struct hda_codec {
81178 const char *modelname; /* model name for preset */
81179
81180 /* set by patch */
81181 - struct hda_codec_ops patch_ops;
81182 + hda_codec_ops_no_const patch_ops;
81183
81184 /* PCM to create, set by patch_ops.build_pcms callback */
81185 unsigned int num_pcms;
81186 diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
81187 index 0da778a..bc38b84 100644
81188 --- a/sound/pci/ice1712/ice1712.h
81189 +++ b/sound/pci/ice1712/ice1712.h
81190 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
81191 unsigned int mask_flags; /* total mask bits */
81192 struct snd_akm4xxx_ops {
81193 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
81194 - } ops;
81195 + } __no_const ops;
81196 };
81197
81198 struct snd_ice1712_spdif {
81199 @@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
81200 int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
81201 void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
81202 int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
81203 - } ops;
81204 + } __no_const ops;
81205 };
81206
81207
81208 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
81209 index a8159b81..5f006a5 100644
81210 --- a/sound/pci/ymfpci/ymfpci_main.c
81211 +++ b/sound/pci/ymfpci/ymfpci_main.c
81212 @@ -203,8 +203,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
81213 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
81214 break;
81215 }
81216 - if (atomic_read(&chip->interrupt_sleep_count)) {
81217 - atomic_set(&chip->interrupt_sleep_count, 0);
81218 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
81219 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
81220 wake_up(&chip->interrupt_sleep);
81221 }
81222 __end:
81223 @@ -788,7 +788,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
81224 continue;
81225 init_waitqueue_entry(&wait, current);
81226 add_wait_queue(&chip->interrupt_sleep, &wait);
81227 - atomic_inc(&chip->interrupt_sleep_count);
81228 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
81229 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
81230 remove_wait_queue(&chip->interrupt_sleep, &wait);
81231 }
81232 @@ -826,8 +826,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
81233 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
81234 spin_unlock(&chip->reg_lock);
81235
81236 - if (atomic_read(&chip->interrupt_sleep_count)) {
81237 - atomic_set(&chip->interrupt_sleep_count, 0);
81238 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
81239 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
81240 wake_up(&chip->interrupt_sleep);
81241 }
81242 }
81243 @@ -2398,7 +2398,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
81244 spin_lock_init(&chip->reg_lock);
81245 spin_lock_init(&chip->voice_lock);
81246 init_waitqueue_head(&chip->interrupt_sleep);
81247 - atomic_set(&chip->interrupt_sleep_count, 0);
81248 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
81249 chip->card = card;
81250 chip->pci = pci;
81251 chip->irq = -1;
81252 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
81253 new file mode 100644
81254 index 0000000..50f2f2f
81255 --- /dev/null
81256 +++ b/tools/gcc/.gitignore
81257 @@ -0,0 +1 @@
81258 +size_overflow_hash.h
81259 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
81260 new file mode 100644
81261 index 0000000..1d09b7e
81262 --- /dev/null
81263 +++ b/tools/gcc/Makefile
81264 @@ -0,0 +1,43 @@
81265 +#CC := gcc
81266 +#PLUGIN_SOURCE_FILES := pax_plugin.c
81267 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
81268 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
81269 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
81270 +
81271 +ifeq ($(PLUGINCC),$(HOSTCC))
81272 +HOSTLIBS := hostlibs
81273 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(GCCPLUGINS_DIR)/include/c-family -std=gnu99 -ggdb
81274 +else
81275 +HOSTLIBS := hostcxxlibs
81276 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(GCCPLUGINS_DIR)/include/c-family -std=gnu++98 -ggdb -Wno-unused-parameter
81277 +endif
81278 +
81279 +$(HOSTLIBS)-y := constify_plugin.so
81280 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
81281 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
81282 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
81283 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
81284 +$(HOSTLIBS)-y += colorize_plugin.so
81285 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
81286 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
81287 +
81288 +always := $($(HOSTLIBS)-y)
81289 +
81290 +constify_plugin-objs := constify_plugin.o
81291 +stackleak_plugin-objs := stackleak_plugin.o
81292 +kallocstat_plugin-objs := kallocstat_plugin.o
81293 +kernexec_plugin-objs := kernexec_plugin.o
81294 +checker_plugin-objs := checker_plugin.o
81295 +colorize_plugin-objs := colorize_plugin.o
81296 +size_overflow_plugin-objs := size_overflow_plugin.o
81297 +latent_entropy_plugin-objs := latent_entropy_plugin.o
81298 +
81299 +$(obj)/size_overflow_plugin.o: $(objtree)/$(obj)/size_overflow_hash.h
81300 +
81301 +quiet_cmd_build_size_overflow_hash = GENHASH $@
81302 + cmd_build_size_overflow_hash = \
81303 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -d $< -o $@
81304 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
81305 + $(call if_changed,build_size_overflow_hash)
81306 +
81307 +targets += size_overflow_hash.h
81308 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
81309 new file mode 100644
81310 index 0000000..d41b5af
81311 --- /dev/null
81312 +++ b/tools/gcc/checker_plugin.c
81313 @@ -0,0 +1,171 @@
81314 +/*
81315 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
81316 + * Licensed under the GPL v2
81317 + *
81318 + * Note: the choice of the license means that the compilation process is
81319 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
81320 + * but for the kernel it doesn't matter since it doesn't link against
81321 + * any of the gcc libraries
81322 + *
81323 + * gcc plugin to implement various sparse (source code checker) features
81324 + *
81325 + * TODO:
81326 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
81327 + *
81328 + * BUGS:
81329 + * - none known
81330 + */
81331 +#include "gcc-plugin.h"
81332 +#include "config.h"
81333 +#include "system.h"
81334 +#include "coretypes.h"
81335 +#include "tree.h"
81336 +#include "tree-pass.h"
81337 +#include "flags.h"
81338 +#include "intl.h"
81339 +#include "toplev.h"
81340 +#include "plugin.h"
81341 +//#include "expr.h" where are you...
81342 +#include "diagnostic.h"
81343 +#include "plugin-version.h"
81344 +#include "tm.h"
81345 +#include "function.h"
81346 +#include "basic-block.h"
81347 +#include "gimple.h"
81348 +#include "rtl.h"
81349 +#include "emit-rtl.h"
81350 +#include "tree-flow.h"
81351 +#include "target.h"
81352 +
81353 +extern void c_register_addr_space (const char *str, addr_space_t as);
81354 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
81355 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
81356 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
81357 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
81358 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
81359 +
81360 +extern void print_gimple_stmt(FILE *, gimple, int, int);
81361 +extern rtx emit_move_insn(rtx x, rtx y);
81362 +
81363 +int plugin_is_GPL_compatible;
81364 +
81365 +static struct plugin_info checker_plugin_info = {
81366 + .version = "201111150100",
81367 +};
81368 +
81369 +#define ADDR_SPACE_KERNEL 0
81370 +#define ADDR_SPACE_FORCE_KERNEL 1
81371 +#define ADDR_SPACE_USER 2
81372 +#define ADDR_SPACE_FORCE_USER 3
81373 +#define ADDR_SPACE_IOMEM 0
81374 +#define ADDR_SPACE_FORCE_IOMEM 0
81375 +#define ADDR_SPACE_PERCPU 0
81376 +#define ADDR_SPACE_FORCE_PERCPU 0
81377 +#define ADDR_SPACE_RCU 0
81378 +#define ADDR_SPACE_FORCE_RCU 0
81379 +
81380 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
81381 +{
81382 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
81383 +}
81384 +
81385 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
81386 +{
81387 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
81388 +}
81389 +
81390 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
81391 +{
81392 + return default_addr_space_valid_pointer_mode(mode, as);
81393 +}
81394 +
81395 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
81396 +{
81397 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
81398 +}
81399 +
81400 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
81401 +{
81402 + return default_addr_space_legitimize_address(x, oldx, mode, as);
81403 +}
81404 +
81405 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
81406 +{
81407 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
81408 + return true;
81409 +
81410 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
81411 + return true;
81412 +
81413 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
81414 + return true;
81415 +
81416 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
81417 + return true;
81418 +
81419 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
81420 + return true;
81421 +
81422 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
81423 + return true;
81424 +
81425 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
81426 + return true;
81427 +
81428 + return subset == superset;
81429 +}
81430 +
81431 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
81432 +{
81433 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
81434 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
81435 +
81436 + return op;
81437 +}
81438 +
81439 +static void register_checker_address_spaces(void *event_data, void *data)
81440 +{
81441 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
81442 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
81443 + c_register_addr_space("__user", ADDR_SPACE_USER);
81444 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
81445 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
81446 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
81447 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
81448 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
81449 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
81450 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
81451 +
81452 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
81453 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
81454 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
81455 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
81456 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
81457 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
81458 + targetm.addr_space.convert = checker_addr_space_convert;
81459 +}
81460 +
81461 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
81462 +{
81463 + const char * const plugin_name = plugin_info->base_name;
81464 + const int argc = plugin_info->argc;
81465 + const struct plugin_argument * const argv = plugin_info->argv;
81466 + int i;
81467 +
81468 + if (!plugin_default_version_check(version, &gcc_version)) {
81469 + error(G_("incompatible gcc/plugin versions"));
81470 + return 1;
81471 + }
81472 +
81473 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
81474 +
81475 + for (i = 0; i < argc; ++i)
81476 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
81477 +
81478 + if (TARGET_64BIT == 0)
81479 + return 0;
81480 +
81481 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
81482 +
81483 + return 0;
81484 +}
81485 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
81486 new file mode 100644
81487 index 0000000..846aeb0
81488 --- /dev/null
81489 +++ b/tools/gcc/colorize_plugin.c
81490 @@ -0,0 +1,148 @@
81491 +/*
81492 + * Copyright 2012 by PaX Team <pageexec@freemail.hu>
81493 + * Licensed under the GPL v2
81494 + *
81495 + * Note: the choice of the license means that the compilation process is
81496 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
81497 + * but for the kernel it doesn't matter since it doesn't link against
81498 + * any of the gcc libraries
81499 + *
81500 + * gcc plugin to colorize diagnostic output
81501 + *
81502 + */
81503 +
81504 +#include "gcc-plugin.h"
81505 +#include "config.h"
81506 +#include "system.h"
81507 +#include "coretypes.h"
81508 +#include "tree.h"
81509 +#include "tree-pass.h"
81510 +#include "flags.h"
81511 +#include "intl.h"
81512 +#include "toplev.h"
81513 +#include "plugin.h"
81514 +#include "diagnostic.h"
81515 +#include "plugin-version.h"
81516 +#include "tm.h"
81517 +
81518 +int plugin_is_GPL_compatible;
81519 +
81520 +static struct plugin_info colorize_plugin_info = {
81521 + .version = "201203092200",
81522 + .help = NULL,
81523 +};
81524 +
81525 +#define GREEN "\033[32m\033[2m"
81526 +#define LIGHTGREEN "\033[32m\033[1m"
81527 +#define YELLOW "\033[33m\033[2m"
81528 +#define LIGHTYELLOW "\033[33m\033[1m"
81529 +#define RED "\033[31m\033[2m"
81530 +#define LIGHTRED "\033[31m\033[1m"
81531 +#define BLUE "\033[34m\033[2m"
81532 +#define LIGHTBLUE "\033[34m\033[1m"
81533 +#define BRIGHT "\033[m\033[1m"
81534 +#define NORMAL "\033[m"
81535 +
81536 +static diagnostic_starter_fn old_starter;
81537 +static diagnostic_finalizer_fn old_finalizer;
81538 +
81539 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
81540 +{
81541 + const char *color;
81542 + char *newprefix;
81543 +
81544 + switch (diagnostic->kind) {
81545 + case DK_NOTE:
81546 + color = LIGHTBLUE;
81547 + break;
81548 +
81549 + case DK_PEDWARN:
81550 + case DK_WARNING:
81551 + color = LIGHTYELLOW;
81552 + break;
81553 +
81554 + case DK_ERROR:
81555 + case DK_FATAL:
81556 + case DK_ICE:
81557 + case DK_PERMERROR:
81558 + case DK_SORRY:
81559 + color = LIGHTRED;
81560 + break;
81561 +
81562 + default:
81563 + color = NORMAL;
81564 + }
81565 +
81566 + old_starter(context, diagnostic);
81567 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
81568 + return;
81569 + pp_destroy_prefix(context->printer);
81570 + pp_set_prefix(context->printer, newprefix);
81571 +}
81572 +
81573 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
81574 +{
81575 + old_finalizer(context, diagnostic);
81576 +}
81577 +
81578 +static void colorize_arm(void)
81579 +{
81580 + old_starter = diagnostic_starter(global_dc);
81581 + old_finalizer = diagnostic_finalizer(global_dc);
81582 +
81583 + diagnostic_starter(global_dc) = start_colorize;
81584 + diagnostic_finalizer(global_dc) = finalize_colorize;
81585 +}
81586 +
81587 +static unsigned int execute_colorize_rearm(void)
81588 +{
81589 + if (diagnostic_starter(global_dc) == start_colorize)
81590 + return 0;
81591 +
81592 + colorize_arm();
81593 + return 0;
81594 +}
81595 +
81596 +struct simple_ipa_opt_pass pass_ipa_colorize_rearm = {
81597 + .pass = {
81598 + .type = SIMPLE_IPA_PASS,
81599 + .name = "colorize_rearm",
81600 + .gate = NULL,
81601 + .execute = execute_colorize_rearm,
81602 + .sub = NULL,
81603 + .next = NULL,
81604 + .static_pass_number = 0,
81605 + .tv_id = TV_NONE,
81606 + .properties_required = 0,
81607 + .properties_provided = 0,
81608 + .properties_destroyed = 0,
81609 + .todo_flags_start = 0,
81610 + .todo_flags_finish = 0
81611 + }
81612 +};
81613 +
81614 +static void colorize_start_unit(void *gcc_data, void *user_data)
81615 +{
81616 + colorize_arm();
81617 +}
81618 +
81619 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
81620 +{
81621 + const char * const plugin_name = plugin_info->base_name;
81622 + struct register_pass_info colorize_rearm_pass_info = {
81623 + .pass = &pass_ipa_colorize_rearm.pass,
81624 + .reference_pass_name = "*free_lang_data",
81625 + .ref_pass_instance_number = 1,
81626 + .pos_op = PASS_POS_INSERT_AFTER
81627 + };
81628 +
81629 + if (!plugin_default_version_check(version, &gcc_version)) {
81630 + error(G_("incompatible gcc/plugin versions"));
81631 + return 1;
81632 + }
81633 +
81634 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
81635 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
81636 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
81637 + return 0;
81638 +}
81639 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
81640 new file mode 100644
81641 index 0000000..048d4ff
81642 --- /dev/null
81643 +++ b/tools/gcc/constify_plugin.c
81644 @@ -0,0 +1,328 @@
81645 +/*
81646 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
81647 + * Copyright 2011 by PaX Team <pageexec@freemail.hu>
81648 + * Licensed under the GPL v2, or (at your option) v3
81649 + *
81650 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
81651 + *
81652 + * Homepage:
81653 + * http://www.grsecurity.net/~ephox/const_plugin/
81654 + *
81655 + * Usage:
81656 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
81657 + * $ gcc -fplugin=constify_plugin.so test.c -O2
81658 + */
81659 +
81660 +#include "gcc-plugin.h"
81661 +#include "config.h"
81662 +#include "system.h"
81663 +#include "coretypes.h"
81664 +#include "tree.h"
81665 +#include "tree-pass.h"
81666 +#include "flags.h"
81667 +#include "intl.h"
81668 +#include "toplev.h"
81669 +#include "plugin.h"
81670 +#include "diagnostic.h"
81671 +#include "plugin-version.h"
81672 +#include "tm.h"
81673 +#include "function.h"
81674 +#include "basic-block.h"
81675 +#include "gimple.h"
81676 +#include "rtl.h"
81677 +#include "emit-rtl.h"
81678 +#include "tree-flow.h"
81679 +
81680 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
81681 +
81682 +int plugin_is_GPL_compatible;
81683 +
81684 +static struct plugin_info const_plugin_info = {
81685 + .version = "201205300030",
81686 + .help = "no-constify\tturn off constification\n",
81687 +};
81688 +
81689 +static void deconstify_tree(tree node);
81690 +
81691 +static void deconstify_type(tree type)
81692 +{
81693 + tree field;
81694 +
81695 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
81696 + tree type = TREE_TYPE(field);
81697 +
81698 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
81699 + continue;
81700 + if (!TYPE_READONLY(type))
81701 + continue;
81702 +
81703 + deconstify_tree(field);
81704 + }
81705 + TYPE_READONLY(type) = 0;
81706 + C_TYPE_FIELDS_READONLY(type) = 0;
81707 +}
81708 +
81709 +static void deconstify_tree(tree node)
81710 +{
81711 + tree old_type, new_type, field;
81712 +
81713 + old_type = TREE_TYPE(node);
81714 +
81715 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
81716 +
81717 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
81718 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
81719 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
81720 + DECL_FIELD_CONTEXT(field) = new_type;
81721 +
81722 + deconstify_type(new_type);
81723 +
81724 + TREE_READONLY(node) = 0;
81725 + TREE_TYPE(node) = new_type;
81726 +}
81727 +
81728 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
81729 +{
81730 + tree type;
81731 +
81732 + *no_add_attrs = true;
81733 + if (TREE_CODE(*node) == FUNCTION_DECL) {
81734 + error("%qE attribute does not apply to functions", name);
81735 + return NULL_TREE;
81736 + }
81737 +
81738 + if (TREE_CODE(*node) == VAR_DECL) {
81739 + error("%qE attribute does not apply to variables", name);
81740 + return NULL_TREE;
81741 + }
81742 +
81743 + if (TYPE_P(*node)) {
81744 + if (TREE_CODE(*node) == RECORD_TYPE || TREE_CODE(*node) == UNION_TYPE)
81745 + *no_add_attrs = false;
81746 + else
81747 + error("%qE attribute applies to struct and union types only", name);
81748 + return NULL_TREE;
81749 + }
81750 +
81751 + type = TREE_TYPE(*node);
81752 +
81753 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
81754 + error("%qE attribute applies to struct and union types only", name);
81755 + return NULL_TREE;
81756 + }
81757 +
81758 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
81759 + error("%qE attribute is already applied to the type", name);
81760 + return NULL_TREE;
81761 + }
81762 +
81763 + if (TREE_CODE(*node) == TYPE_DECL && !TYPE_READONLY(type)) {
81764 + error("%qE attribute used on type that is not constified", name);
81765 + return NULL_TREE;
81766 + }
81767 +
81768 + if (TREE_CODE(*node) == TYPE_DECL) {
81769 + deconstify_tree(*node);
81770 + return NULL_TREE;
81771 + }
81772 +
81773 + return NULL_TREE;
81774 +}
81775 +
81776 +static void constify_type(tree type)
81777 +{
81778 + TYPE_READONLY(type) = 1;
81779 + C_TYPE_FIELDS_READONLY(type) = 1;
81780 +}
81781 +
81782 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
81783 +{
81784 + *no_add_attrs = true;
81785 + if (!TYPE_P(*node)) {
81786 + error("%qE attribute applies to types only", name);
81787 + return NULL_TREE;
81788 + }
81789 +
81790 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
81791 + error("%qE attribute applies to struct and union types only", name);
81792 + return NULL_TREE;
81793 + }
81794 +
81795 + *no_add_attrs = false;
81796 + constify_type(*node);
81797 + return NULL_TREE;
81798 +}
81799 +
81800 +static struct attribute_spec no_const_attr = {
81801 + .name = "no_const",
81802 + .min_length = 0,
81803 + .max_length = 0,
81804 + .decl_required = false,
81805 + .type_required = false,
81806 + .function_type_required = false,
81807 + .handler = handle_no_const_attribute,
81808 +#if BUILDING_GCC_VERSION >= 4007
81809 + .affects_type_identity = true
81810 +#endif
81811 +};
81812 +
81813 +static struct attribute_spec do_const_attr = {
81814 + .name = "do_const",
81815 + .min_length = 0,
81816 + .max_length = 0,
81817 + .decl_required = false,
81818 + .type_required = false,
81819 + .function_type_required = false,
81820 + .handler = handle_do_const_attribute,
81821 +#if BUILDING_GCC_VERSION >= 4007
81822 + .affects_type_identity = true
81823 +#endif
81824 +};
81825 +
81826 +static void register_attributes(void *event_data, void *data)
81827 +{
81828 + register_attribute(&no_const_attr);
81829 + register_attribute(&do_const_attr);
81830 +}
81831 +
81832 +static bool is_fptr(tree field)
81833 +{
81834 + tree ptr = TREE_TYPE(field);
81835 +
81836 + if (TREE_CODE(ptr) != POINTER_TYPE)
81837 + return false;
81838 +
81839 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
81840 +}
81841 +
81842 +static bool walk_struct(tree node)
81843 +{
81844 + tree field;
81845 +
81846 + if (TYPE_FIELDS(node) == NULL_TREE)
81847 + return false;
81848 +
81849 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
81850 + gcc_assert(!TYPE_READONLY(node));
81851 + deconstify_type(node);
81852 + return false;
81853 + }
81854 +
81855 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
81856 + tree type = TREE_TYPE(field);
81857 + enum tree_code code = TREE_CODE(type);
81858 + if (code == RECORD_TYPE || code == UNION_TYPE) {
81859 + if (!(walk_struct(type)))
81860 + return false;
81861 + } else if (!is_fptr(field) && !TREE_READONLY(field))
81862 + return false;
81863 + }
81864 + return true;
81865 +}
81866 +
81867 +static void finish_type(void *event_data, void *data)
81868 +{
81869 + tree type = (tree)event_data;
81870 +
81871 + if (type == NULL_TREE)
81872 + return;
81873 +
81874 + if (TYPE_READONLY(type))
81875 + return;
81876 +
81877 + if (walk_struct(type))
81878 + constify_type(type);
81879 +}
81880 +
81881 +static unsigned int check_local_variables(void);
81882 +
81883 +struct gimple_opt_pass pass_local_variable = {
81884 + {
81885 + .type = GIMPLE_PASS,
81886 + .name = "check_local_variables",
81887 + .gate = NULL,
81888 + .execute = check_local_variables,
81889 + .sub = NULL,
81890 + .next = NULL,
81891 + .static_pass_number = 0,
81892 + .tv_id = TV_NONE,
81893 + .properties_required = 0,
81894 + .properties_provided = 0,
81895 + .properties_destroyed = 0,
81896 + .todo_flags_start = 0,
81897 + .todo_flags_finish = 0
81898 + }
81899 +};
81900 +
81901 +static unsigned int check_local_variables(void)
81902 +{
81903 + tree var;
81904 + referenced_var_iterator rvi;
81905 +
81906 +#if BUILDING_GCC_VERSION == 4005
81907 + FOR_EACH_REFERENCED_VAR(var, rvi) {
81908 +#else
81909 + FOR_EACH_REFERENCED_VAR(cfun, var, rvi) {
81910 +#endif
81911 + tree type = TREE_TYPE(var);
81912 +
81913 + if (!DECL_P(var) || TREE_STATIC(var) || DECL_EXTERNAL(var))
81914 + continue;
81915 +
81916 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
81917 + continue;
81918 +
81919 + if (!TYPE_READONLY(type))
81920 + continue;
81921 +
81922 +// if (lookup_attribute("no_const", DECL_ATTRIBUTES(var)))
81923 +// continue;
81924 +
81925 +// if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
81926 +// continue;
81927 +
81928 + if (walk_struct(type)) {
81929 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
81930 + return 1;
81931 + }
81932 + }
81933 + return 0;
81934 +}
81935 +
81936 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
81937 +{
81938 + const char * const plugin_name = plugin_info->base_name;
81939 + const int argc = plugin_info->argc;
81940 + const struct plugin_argument * const argv = plugin_info->argv;
81941 + int i;
81942 + bool constify = true;
81943 +
81944 + struct register_pass_info local_variable_pass_info = {
81945 + .pass = &pass_local_variable.pass,
81946 + .reference_pass_name = "*referenced_vars",
81947 + .ref_pass_instance_number = 1,
81948 + .pos_op = PASS_POS_INSERT_AFTER
81949 + };
81950 +
81951 + if (!plugin_default_version_check(version, &gcc_version)) {
81952 + error(G_("incompatible gcc/plugin versions"));
81953 + return 1;
81954 + }
81955 +
81956 + for (i = 0; i < argc; ++i) {
81957 + if (!(strcmp(argv[i].key, "no-constify"))) {
81958 + constify = false;
81959 + continue;
81960 + }
81961 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
81962 + }
81963 +
81964 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
81965 + if (constify) {
81966 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
81967 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &local_variable_pass_info);
81968 + }
81969 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
81970 +
81971 + return 0;
81972 +}
81973 diff --git a/tools/gcc/generate_size_overflow_hash.sh b/tools/gcc/generate_size_overflow_hash.sh
81974 new file mode 100644
81975 index 0000000..68b646e
81976 --- /dev/null
81977 +++ b/tools/gcc/generate_size_overflow_hash.sh
81978 @@ -0,0 +1,94 @@
81979 +#!/bin/bash
81980 +
81981 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
81982 +
81983 +header1="size_overflow_hash.h"
81984 +database="size_overflow_hash.data"
81985 +n=65536
81986 +
81987 +usage() {
81988 +cat <<EOF
81989 +usage: $0 options
81990 +OPTIONS:
81991 + -h|--help help
81992 + -o header file
81993 + -d database file
81994 + -n hash array size
81995 +EOF
81996 + return 0
81997 +}
81998 +
81999 +while true
82000 +do
82001 + case "$1" in
82002 + -h|--help) usage && exit 0;;
82003 + -n) n=$2; shift 2;;
82004 + -o) header1="$2"; shift 2;;
82005 + -d) database="$2"; shift 2;;
82006 + --) shift 1; break ;;
82007 + *) break ;;
82008 + esac
82009 +done
82010 +
82011 +create_defines() {
82012 + for i in `seq 1 10`
82013 + do
82014 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
82015 + done
82016 + echo >> "$header1"
82017 +}
82018 +
82019 +create_structs () {
82020 + rm -f "$header1"
82021 +
82022 + create_defines
82023 +
82024 + cat "$database" | while read data
82025 + do
82026 + data_array=($data)
82027 + struct_hash_name="${data_array[0]}"
82028 + funcn="${data_array[1]}"
82029 + params="${data_array[2]}"
82030 + next="${data_array[5]}"
82031 +
82032 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
82033 +
82034 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
82035 + echo -en "\t.param\t= " >> "$header1"
82036 + line=
82037 + for param_num in ${params//-/ };
82038 + do
82039 + line="${line}PARAM"$param_num"|"
82040 + done
82041 +
82042 + echo -e "${line%?},\n};\n" >> "$header1"
82043 + done
82044 +}
82045 +
82046 +create_headers () {
82047 + echo "const struct size_overflow_hash * const size_overflow_hash[$n] = {" >> "$header1"
82048 +}
82049 +
82050 +create_array_elements () {
82051 + index=0
82052 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
82053 + do
82054 + data_array=($data)
82055 + i="${data_array[3]}"
82056 + hash="${data_array[4]}"
82057 + while [[ $index -lt $i ]]
82058 + do
82059 + echo -e "\t["$index"]\t= NULL," >> "$header1"
82060 + index=$(($index + 1))
82061 + done
82062 + index=$(($index + 1))
82063 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
82064 + done
82065 + echo '};' >> $header1
82066 +}
82067 +
82068 +create_structs
82069 +create_headers
82070 +create_array_elements
82071 +
82072 +exit 0
82073 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
82074 new file mode 100644
82075 index 0000000..a86e422
82076 --- /dev/null
82077 +++ b/tools/gcc/kallocstat_plugin.c
82078 @@ -0,0 +1,167 @@
82079 +/*
82080 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
82081 + * Licensed under the GPL v2
82082 + *
82083 + * Note: the choice of the license means that the compilation process is
82084 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
82085 + * but for the kernel it doesn't matter since it doesn't link against
82086 + * any of the gcc libraries
82087 + *
82088 + * gcc plugin to find the distribution of k*alloc sizes
82089 + *
82090 + * TODO:
82091 + *
82092 + * BUGS:
82093 + * - none known
82094 + */
82095 +#include "gcc-plugin.h"
82096 +#include "config.h"
82097 +#include "system.h"
82098 +#include "coretypes.h"
82099 +#include "tree.h"
82100 +#include "tree-pass.h"
82101 +#include "flags.h"
82102 +#include "intl.h"
82103 +#include "toplev.h"
82104 +#include "plugin.h"
82105 +//#include "expr.h" where are you...
82106 +#include "diagnostic.h"
82107 +#include "plugin-version.h"
82108 +#include "tm.h"
82109 +#include "function.h"
82110 +#include "basic-block.h"
82111 +#include "gimple.h"
82112 +#include "rtl.h"
82113 +#include "emit-rtl.h"
82114 +
82115 +extern void print_gimple_stmt(FILE *, gimple, int, int);
82116 +
82117 +int plugin_is_GPL_compatible;
82118 +
82119 +static const char * const kalloc_functions[] = {
82120 + "__kmalloc",
82121 + "kmalloc",
82122 + "kmalloc_large",
82123 + "kmalloc_node",
82124 + "kmalloc_order",
82125 + "kmalloc_order_trace",
82126 + "kmalloc_slab",
82127 + "kzalloc",
82128 + "kzalloc_node",
82129 +};
82130 +
82131 +static struct plugin_info kallocstat_plugin_info = {
82132 + .version = "201111150100",
82133 +};
82134 +
82135 +static unsigned int execute_kallocstat(void);
82136 +
82137 +static struct gimple_opt_pass kallocstat_pass = {
82138 + .pass = {
82139 + .type = GIMPLE_PASS,
82140 + .name = "kallocstat",
82141 + .gate = NULL,
82142 + .execute = execute_kallocstat,
82143 + .sub = NULL,
82144 + .next = NULL,
82145 + .static_pass_number = 0,
82146 + .tv_id = TV_NONE,
82147 + .properties_required = 0,
82148 + .properties_provided = 0,
82149 + .properties_destroyed = 0,
82150 + .todo_flags_start = 0,
82151 + .todo_flags_finish = 0
82152 + }
82153 +};
82154 +
82155 +static bool is_kalloc(const char *fnname)
82156 +{
82157 + size_t i;
82158 +
82159 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
82160 + if (!strcmp(fnname, kalloc_functions[i]))
82161 + return true;
82162 + return false;
82163 +}
82164 +
82165 +static unsigned int execute_kallocstat(void)
82166 +{
82167 + basic_block bb;
82168 +
82169 + // 1. loop through BBs and GIMPLE statements
82170 + FOR_EACH_BB(bb) {
82171 + gimple_stmt_iterator gsi;
82172 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
82173 + // gimple match:
82174 + tree fndecl, size;
82175 + gimple call_stmt;
82176 + const char *fnname;
82177 +
82178 + // is it a call
82179 + call_stmt = gsi_stmt(gsi);
82180 + if (!is_gimple_call(call_stmt))
82181 + continue;
82182 + fndecl = gimple_call_fndecl(call_stmt);
82183 + if (fndecl == NULL_TREE)
82184 + continue;
82185 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
82186 + continue;
82187 +
82188 + // is it a call to k*alloc
82189 + fnname = IDENTIFIER_POINTER(DECL_NAME(fndecl));
82190 + if (!is_kalloc(fnname))
82191 + continue;
82192 +
82193 + // is the size arg the result of a simple const assignment
82194 + size = gimple_call_arg(call_stmt, 0);
82195 + while (true) {
82196 + gimple def_stmt;
82197 + expanded_location xloc;
82198 + size_t size_val;
82199 +
82200 + if (TREE_CODE(size) != SSA_NAME)
82201 + break;
82202 + def_stmt = SSA_NAME_DEF_STMT(size);
82203 + if (!def_stmt || !is_gimple_assign(def_stmt))
82204 + break;
82205 + if (gimple_num_ops(def_stmt) != 2)
82206 + break;
82207 + size = gimple_assign_rhs1(def_stmt);
82208 + if (!TREE_CONSTANT(size))
82209 + continue;
82210 + xloc = expand_location(gimple_location(def_stmt));
82211 + if (!xloc.file)
82212 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
82213 + size_val = TREE_INT_CST_LOW(size);
82214 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
82215 + break;
82216 + }
82217 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
82218 +//debug_tree(gimple_call_fn(call_stmt));
82219 +//print_node(stderr, "pax", fndecl, 4);
82220 + }
82221 + }
82222 +
82223 + return 0;
82224 +}
82225 +
82226 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
82227 +{
82228 + const char * const plugin_name = plugin_info->base_name;
82229 + struct register_pass_info kallocstat_pass_info = {
82230 + .pass = &kallocstat_pass.pass,
82231 + .reference_pass_name = "ssa",
82232 + .ref_pass_instance_number = 1,
82233 + .pos_op = PASS_POS_INSERT_AFTER
82234 + };
82235 +
82236 + if (!plugin_default_version_check(version, &gcc_version)) {
82237 + error(G_("incompatible gcc/plugin versions"));
82238 + return 1;
82239 + }
82240 +
82241 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
82242 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
82243 +
82244 + return 0;
82245 +}
82246 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
82247 new file mode 100644
82248 index 0000000..98011fa
82249 --- /dev/null
82250 +++ b/tools/gcc/kernexec_plugin.c
82251 @@ -0,0 +1,427 @@
82252 +/*
82253 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
82254 + * Licensed under the GPL v2
82255 + *
82256 + * Note: the choice of the license means that the compilation process is
82257 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
82258 + * but for the kernel it doesn't matter since it doesn't link against
82259 + * any of the gcc libraries
82260 + *
82261 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
82262 + *
82263 + * TODO:
82264 + *
82265 + * BUGS:
82266 + * - none known
82267 + */
82268 +#include "gcc-plugin.h"
82269 +#include "config.h"
82270 +#include "system.h"
82271 +#include "coretypes.h"
82272 +#include "tree.h"
82273 +#include "tree-pass.h"
82274 +#include "flags.h"
82275 +#include "intl.h"
82276 +#include "toplev.h"
82277 +#include "plugin.h"
82278 +//#include "expr.h" where are you...
82279 +#include "diagnostic.h"
82280 +#include "plugin-version.h"
82281 +#include "tm.h"
82282 +#include "function.h"
82283 +#include "basic-block.h"
82284 +#include "gimple.h"
82285 +#include "rtl.h"
82286 +#include "emit-rtl.h"
82287 +#include "tree-flow.h"
82288 +
82289 +extern void print_gimple_stmt(FILE *, gimple, int, int);
82290 +extern rtx emit_move_insn(rtx x, rtx y);
82291 +
82292 +int plugin_is_GPL_compatible;
82293 +
82294 +static struct plugin_info kernexec_plugin_info = {
82295 + .version = "201111291120",
82296 + .help = "method=[bts|or]\tinstrumentation method\n"
82297 +};
82298 +
82299 +static unsigned int execute_kernexec_reload(void);
82300 +static unsigned int execute_kernexec_fptr(void);
82301 +static unsigned int execute_kernexec_retaddr(void);
82302 +static bool kernexec_cmodel_check(void);
82303 +
82304 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
82305 +static void (*kernexec_instrument_retaddr)(rtx);
82306 +
82307 +static struct gimple_opt_pass kernexec_reload_pass = {
82308 + .pass = {
82309 + .type = GIMPLE_PASS,
82310 + .name = "kernexec_reload",
82311 + .gate = kernexec_cmodel_check,
82312 + .execute = execute_kernexec_reload,
82313 + .sub = NULL,
82314 + .next = NULL,
82315 + .static_pass_number = 0,
82316 + .tv_id = TV_NONE,
82317 + .properties_required = 0,
82318 + .properties_provided = 0,
82319 + .properties_destroyed = 0,
82320 + .todo_flags_start = 0,
82321 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
82322 + }
82323 +};
82324 +
82325 +static struct gimple_opt_pass kernexec_fptr_pass = {
82326 + .pass = {
82327 + .type = GIMPLE_PASS,
82328 + .name = "kernexec_fptr",
82329 + .gate = kernexec_cmodel_check,
82330 + .execute = execute_kernexec_fptr,
82331 + .sub = NULL,
82332 + .next = NULL,
82333 + .static_pass_number = 0,
82334 + .tv_id = TV_NONE,
82335 + .properties_required = 0,
82336 + .properties_provided = 0,
82337 + .properties_destroyed = 0,
82338 + .todo_flags_start = 0,
82339 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
82340 + }
82341 +};
82342 +
82343 +static struct rtl_opt_pass kernexec_retaddr_pass = {
82344 + .pass = {
82345 + .type = RTL_PASS,
82346 + .name = "kernexec_retaddr",
82347 + .gate = kernexec_cmodel_check,
82348 + .execute = execute_kernexec_retaddr,
82349 + .sub = NULL,
82350 + .next = NULL,
82351 + .static_pass_number = 0,
82352 + .tv_id = TV_NONE,
82353 + .properties_required = 0,
82354 + .properties_provided = 0,
82355 + .properties_destroyed = 0,
82356 + .todo_flags_start = 0,
82357 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
82358 + }
82359 +};
82360 +
82361 +static bool kernexec_cmodel_check(void)
82362 +{
82363 + tree section;
82364 +
82365 + if (ix86_cmodel != CM_KERNEL)
82366 + return false;
82367 +
82368 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
82369 + if (!section || !TREE_VALUE(section))
82370 + return true;
82371 +
82372 + section = TREE_VALUE(TREE_VALUE(section));
82373 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
82374 + return true;
82375 +
82376 + return false;
82377 +}
82378 +
82379 +/*
82380 + * add special KERNEXEC instrumentation: reload %r10 after it has been clobbered
82381 + */
82382 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
82383 +{
82384 + gimple asm_movabs_stmt;
82385 +
82386 + // build asm volatile("movabs $0x8000000000000000, %%r10\n\t" : : : );
82387 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r10\n\t", NULL, NULL, NULL, NULL);
82388 + gimple_asm_set_volatile(asm_movabs_stmt, true);
82389 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
82390 + update_stmt(asm_movabs_stmt);
82391 +}
82392 +
82393 +/*
82394 + * find all asm() stmts that clobber r10 and add a reload of r10
82395 + */
82396 +static unsigned int execute_kernexec_reload(void)
82397 +{
82398 + basic_block bb;
82399 +
82400 + // 1. loop through BBs and GIMPLE statements
82401 + FOR_EACH_BB(bb) {
82402 + gimple_stmt_iterator gsi;
82403 +
82404 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
82405 + // gimple match: __asm__ ("" : : : "r10");
82406 + gimple asm_stmt;
82407 + size_t nclobbers;
82408 +
82409 + // is it an asm ...
82410 + asm_stmt = gsi_stmt(gsi);
82411 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
82412 + continue;
82413 +
82414 + // ... clobbering r10
82415 + nclobbers = gimple_asm_nclobbers(asm_stmt);
82416 + while (nclobbers--) {
82417 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
82418 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r10"))
82419 + continue;
82420 + kernexec_reload_fptr_mask(&gsi);
82421 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
82422 + break;
82423 + }
82424 + }
82425 + }
82426 +
82427 + return 0;
82428 +}
82429 +
82430 +/*
82431 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
82432 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
82433 + */
82434 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
82435 +{
82436 + gimple assign_intptr, assign_new_fptr, call_stmt;
82437 + tree intptr, old_fptr, new_fptr, kernexec_mask;
82438 +
82439 + call_stmt = gsi_stmt(*gsi);
82440 + old_fptr = gimple_call_fn(call_stmt);
82441 +
82442 + // create temporary unsigned long variable used for bitops and cast fptr to it
82443 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
82444 + add_referenced_var(intptr);
82445 + mark_sym_for_renaming(intptr);
82446 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
82447 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
82448 + update_stmt(assign_intptr);
82449 +
82450 + // apply logical or to temporary unsigned long and bitmask
82451 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
82452 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
82453 + assign_intptr = gimple_build_assign(intptr, fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask));
82454 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
82455 + update_stmt(assign_intptr);
82456 +
82457 + // cast temporary unsigned long back to a temporary fptr variable
82458 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
82459 + add_referenced_var(new_fptr);
82460 + mark_sym_for_renaming(new_fptr);
82461 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
82462 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
82463 + update_stmt(assign_new_fptr);
82464 +
82465 + // replace call stmt fn with the new fptr
82466 + gimple_call_set_fn(call_stmt, new_fptr);
82467 + update_stmt(call_stmt);
82468 +}
82469 +
82470 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
82471 +{
82472 + gimple asm_or_stmt, call_stmt;
82473 + tree old_fptr, new_fptr, input, output;
82474 + VEC(tree, gc) *inputs = NULL;
82475 + VEC(tree, gc) *outputs = NULL;
82476 +
82477 + call_stmt = gsi_stmt(*gsi);
82478 + old_fptr = gimple_call_fn(call_stmt);
82479 +
82480 + // create temporary fptr variable
82481 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
82482 + add_referenced_var(new_fptr);
82483 + mark_sym_for_renaming(new_fptr);
82484 +
82485 + // build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
82486 + input = build_tree_list(NULL_TREE, build_string(2, "0"));
82487 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
82488 + output = build_tree_list(NULL_TREE, build_string(3, "=r"));
82489 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
82490 + VEC_safe_push(tree, gc, inputs, input);
82491 + VEC_safe_push(tree, gc, outputs, output);
82492 + asm_or_stmt = gimple_build_asm_vec("orq %%r10, %0\n\t", inputs, outputs, NULL, NULL);
82493 + gimple_asm_set_volatile(asm_or_stmt, true);
82494 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
82495 + update_stmt(asm_or_stmt);
82496 +
82497 + // replace call stmt fn with the new fptr
82498 + gimple_call_set_fn(call_stmt, new_fptr);
82499 + update_stmt(call_stmt);
82500 +}
82501 +
82502 +/*
82503 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
82504 + */
82505 +static unsigned int execute_kernexec_fptr(void)
82506 +{
82507 + basic_block bb;
82508 +
82509 + // 1. loop through BBs and GIMPLE statements
82510 + FOR_EACH_BB(bb) {
82511 + gimple_stmt_iterator gsi;
82512 +
82513 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
82514 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
82515 + tree fn;
82516 + gimple call_stmt;
82517 +
82518 + // is it a call ...
82519 + call_stmt = gsi_stmt(gsi);
82520 + if (!is_gimple_call(call_stmt))
82521 + continue;
82522 + fn = gimple_call_fn(call_stmt);
82523 + if (TREE_CODE(fn) == ADDR_EXPR)
82524 + continue;
82525 + if (TREE_CODE(fn) != SSA_NAME)
82526 + gcc_unreachable();
82527 +
82528 + // ... through a function pointer
82529 + fn = SSA_NAME_VAR(fn);
82530 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL)
82531 + continue;
82532 + fn = TREE_TYPE(fn);
82533 + if (TREE_CODE(fn) != POINTER_TYPE)
82534 + continue;
82535 + fn = TREE_TYPE(fn);
82536 + if (TREE_CODE(fn) != FUNCTION_TYPE)
82537 + continue;
82538 +
82539 + kernexec_instrument_fptr(&gsi);
82540 +
82541 +//debug_tree(gimple_call_fn(call_stmt));
82542 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
82543 + }
82544 + }
82545 +
82546 + return 0;
82547 +}
82548 +
82549 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
82550 +static void kernexec_instrument_retaddr_bts(rtx insn)
82551 +{
82552 + rtx btsq;
82553 + rtvec argvec, constraintvec, labelvec;
82554 + int line;
82555 +
82556 + // create asm volatile("btsq $63,(%%rsp)":::)
82557 + argvec = rtvec_alloc(0);
82558 + constraintvec = rtvec_alloc(0);
82559 + labelvec = rtvec_alloc(0);
82560 + line = expand_location(RTL_LOCATION(insn)).line;
82561 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
82562 + MEM_VOLATILE_P(btsq) = 1;
82563 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
82564 + emit_insn_before(btsq, insn);
82565 +}
82566 +
82567 +// add special KERNEXEC instrumentation: orq %r10,(%rsp) just before retn
82568 +static void kernexec_instrument_retaddr_or(rtx insn)
82569 +{
82570 + rtx orq;
82571 + rtvec argvec, constraintvec, labelvec;
82572 + int line;
82573 +
82574 + // create asm volatile("orq %%r10,(%%rsp)":::)
82575 + argvec = rtvec_alloc(0);
82576 + constraintvec = rtvec_alloc(0);
82577 + labelvec = rtvec_alloc(0);
82578 + line = expand_location(RTL_LOCATION(insn)).line;
82579 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r10,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
82580 + MEM_VOLATILE_P(orq) = 1;
82581 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
82582 + emit_insn_before(orq, insn);
82583 +}
82584 +
82585 +/*
82586 + * find all asm level function returns and forcibly set the highest bit of the return address
82587 + */
82588 +static unsigned int execute_kernexec_retaddr(void)
82589 +{
82590 + rtx insn;
82591 +
82592 + // 1. find function returns
82593 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
82594 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
82595 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
82596 + rtx body;
82597 +
82598 + // is it a retn
82599 + if (!JUMP_P(insn))
82600 + continue;
82601 + body = PATTERN(insn);
82602 + if (GET_CODE(body) == PARALLEL)
82603 + body = XVECEXP(body, 0, 0);
82604 + if (GET_CODE(body) != RETURN)
82605 + continue;
82606 + kernexec_instrument_retaddr(insn);
82607 + }
82608 +
82609 +// print_simple_rtl(stderr, get_insns());
82610 +// print_rtl(stderr, get_insns());
82611 +
82612 + return 0;
82613 +}
82614 +
82615 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
82616 +{
82617 + const char * const plugin_name = plugin_info->base_name;
82618 + const int argc = plugin_info->argc;
82619 + const struct plugin_argument * const argv = plugin_info->argv;
82620 + int i;
82621 + struct register_pass_info kernexec_reload_pass_info = {
82622 + .pass = &kernexec_reload_pass.pass,
82623 + .reference_pass_name = "ssa",
82624 + .ref_pass_instance_number = 1,
82625 + .pos_op = PASS_POS_INSERT_AFTER
82626 + };
82627 + struct register_pass_info kernexec_fptr_pass_info = {
82628 + .pass = &kernexec_fptr_pass.pass,
82629 + .reference_pass_name = "ssa",
82630 + .ref_pass_instance_number = 1,
82631 + .pos_op = PASS_POS_INSERT_AFTER
82632 + };
82633 + struct register_pass_info kernexec_retaddr_pass_info = {
82634 + .pass = &kernexec_retaddr_pass.pass,
82635 + .reference_pass_name = "pro_and_epilogue",
82636 + .ref_pass_instance_number = 1,
82637 + .pos_op = PASS_POS_INSERT_AFTER
82638 + };
82639 +
82640 + if (!plugin_default_version_check(version, &gcc_version)) {
82641 + error(G_("incompatible gcc/plugin versions"));
82642 + return 1;
82643 + }
82644 +
82645 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
82646 +
82647 + if (TARGET_64BIT == 0)
82648 + return 0;
82649 +
82650 + for (i = 0; i < argc; ++i) {
82651 + if (!strcmp(argv[i].key, "method")) {
82652 + if (!argv[i].value) {
82653 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
82654 + continue;
82655 + }
82656 + if (!strcmp(argv[i].value, "bts")) {
82657 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
82658 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
82659 + } else if (!strcmp(argv[i].value, "or")) {
82660 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
82661 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
82662 + fix_register("r10", 1, 1);
82663 + } else
82664 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
82665 + continue;
82666 + }
82667 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
82668 + }
82669 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
82670 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
82671 +
82672 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
82673 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
82674 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
82675 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
82676 +
82677 + return 0;
82678 +}
82679 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
82680 new file mode 100644
82681 index 0000000..b8008f7
82682 --- /dev/null
82683 +++ b/tools/gcc/latent_entropy_plugin.c
82684 @@ -0,0 +1,295 @@
82685 +/*
82686 + * Copyright 2012 by the PaX Team <pageexec@freemail.hu>
82687 + * Licensed under the GPL v2
82688 + *
82689 + * Note: the choice of the license means that the compilation process is
82690 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
82691 + * but for the kernel it doesn't matter since it doesn't link against
82692 + * any of the gcc libraries
82693 + *
82694 + * gcc plugin to help generate a little bit of entropy from program state,
82695 + * used during boot in the kernel
82696 + *
82697 + * TODO:
82698 + * - add ipa pass to identify not explicitly marked candidate functions
82699 + * - mix in more program state (function arguments/return values, loop variables, etc)
82700 + * - more instrumentation control via attribute parameters
82701 + *
82702 + * BUGS:
82703 + * - LTO needs -flto-partition=none for now
82704 + */
82705 +#include "gcc-plugin.h"
82706 +#include "config.h"
82707 +#include "system.h"
82708 +#include "coretypes.h"
82709 +#include "tree.h"
82710 +#include "tree-pass.h"
82711 +#include "flags.h"
82712 +#include "intl.h"
82713 +#include "toplev.h"
82714 +#include "plugin.h"
82715 +//#include "expr.h" where are you...
82716 +#include "diagnostic.h"
82717 +#include "plugin-version.h"
82718 +#include "tm.h"
82719 +#include "function.h"
82720 +#include "basic-block.h"
82721 +#include "gimple.h"
82722 +#include "rtl.h"
82723 +#include "emit-rtl.h"
82724 +#include "tree-flow.h"
82725 +
82726 +int plugin_is_GPL_compatible;
82727 +
82728 +static tree latent_entropy_decl;
82729 +
82730 +static struct plugin_info latent_entropy_plugin_info = {
82731 + .version = "201207271820",
82732 + .help = NULL
82733 +};
82734 +
82735 +static unsigned int execute_latent_entropy(void);
82736 +static bool gate_latent_entropy(void);
82737 +
82738 +static struct gimple_opt_pass latent_entropy_pass = {
82739 + .pass = {
82740 + .type = GIMPLE_PASS,
82741 + .name = "latent_entropy",
82742 + .gate = gate_latent_entropy,
82743 + .execute = execute_latent_entropy,
82744 + .sub = NULL,
82745 + .next = NULL,
82746 + .static_pass_number = 0,
82747 + .tv_id = TV_NONE,
82748 + .properties_required = PROP_gimple_leh | PROP_cfg,
82749 + .properties_provided = 0,
82750 + .properties_destroyed = 0,
82751 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
82752 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
82753 + }
82754 +};
82755 +
82756 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
82757 +{
82758 + if (TREE_CODE(*node) != FUNCTION_DECL) {
82759 + *no_add_attrs = true;
82760 + error("%qE attribute only applies to functions", name);
82761 + }
82762 + return NULL_TREE;
82763 +}
82764 +
82765 +static struct attribute_spec latent_entropy_attr = {
82766 + .name = "latent_entropy",
82767 + .min_length = 0,
82768 + .max_length = 0,
82769 + .decl_required = true,
82770 + .type_required = false,
82771 + .function_type_required = false,
82772 + .handler = handle_latent_entropy_attribute,
82773 +#if BUILDING_GCC_VERSION >= 4007
82774 + .affects_type_identity = false
82775 +#endif
82776 +};
82777 +
82778 +static void register_attributes(void *event_data, void *data)
82779 +{
82780 + register_attribute(&latent_entropy_attr);
82781 +}
82782 +
82783 +static bool gate_latent_entropy(void)
82784 +{
82785 + tree latent_entropy_attr;
82786 +
82787 + latent_entropy_attr = lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl));
82788 + return latent_entropy_attr != NULL_TREE;
82789 +}
82790 +
82791 +static unsigned HOST_WIDE_INT seed;
82792 +static unsigned HOST_WIDE_INT get_random_const(void)
82793 +{
82794 + seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL);
82795 + return seed;
82796 +}
82797 +
82798 +static enum tree_code get_op(tree *rhs)
82799 +{
82800 + static enum tree_code op;
82801 + unsigned HOST_WIDE_INT random_const;
82802 +
82803 + random_const = get_random_const();
82804 +
82805 + switch (op) {
82806 + case BIT_XOR_EXPR:
82807 + op = PLUS_EXPR;
82808 + break;
82809 +
82810 + case PLUS_EXPR:
82811 + if (rhs) {
82812 + op = LROTATE_EXPR;
82813 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
82814 + break;
82815 + }
82816 +
82817 + case LROTATE_EXPR:
82818 + default:
82819 + op = BIT_XOR_EXPR;
82820 + break;
82821 + }
82822 + if (rhs)
82823 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
82824 + return op;
82825 +}
82826 +
82827 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
82828 +{
82829 + gimple_stmt_iterator gsi;
82830 + gimple assign;
82831 + tree addxorrol, rhs;
82832 + enum tree_code op;
82833 +
82834 + op = get_op(&rhs);
82835 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
82836 + assign = gimple_build_assign(local_entropy, addxorrol);
82837 + find_referenced_vars_in(assign);
82838 +//debug_bb(bb);
82839 + gsi = gsi_after_labels(bb);
82840 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
82841 + update_stmt(assign);
82842 +}
82843 +
82844 +static void perturb_latent_entropy(basic_block bb, tree rhs)
82845 +{
82846 + gimple_stmt_iterator gsi;
82847 + gimple assign;
82848 + tree addxorrol, temp;
82849 +
82850 + // 1. create temporary copy of latent_entropy
82851 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
82852 + add_referenced_var(temp);
82853 + mark_sym_for_renaming(temp);
82854 +
82855 + // 2. read...
82856 + assign = gimple_build_assign(temp, latent_entropy_decl);
82857 + find_referenced_vars_in(assign);
82858 + gsi = gsi_after_labels(bb);
82859 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
82860 + update_stmt(assign);
82861 +
82862 + // 3. ...modify...
82863 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
82864 + assign = gimple_build_assign(temp, addxorrol);
82865 + find_referenced_vars_in(assign);
82866 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
82867 + update_stmt(assign);
82868 +
82869 + // 4. ...write latent_entropy
82870 + assign = gimple_build_assign(latent_entropy_decl, temp);
82871 + find_referenced_vars_in(assign);
82872 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
82873 + update_stmt(assign);
82874 +}
82875 +
82876 +static unsigned int execute_latent_entropy(void)
82877 +{
82878 + basic_block bb;
82879 + gimple assign;
82880 + gimple_stmt_iterator gsi;
82881 + tree local_entropy;
82882 +
82883 + if (!latent_entropy_decl) {
82884 + struct varpool_node *node;
82885 +
82886 + for (node = varpool_nodes; node; node = node->next) {
82887 + tree var = node->decl;
82888 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
82889 + continue;
82890 + latent_entropy_decl = var;
82891 +// debug_tree(var);
82892 + break;
82893 + }
82894 + if (!latent_entropy_decl) {
82895 +// debug_tree(current_function_decl);
82896 + return 0;
82897 + }
82898 + }
82899 +
82900 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
82901 +
82902 + // 1. create local entropy variable
82903 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
82904 + add_referenced_var(local_entropy);
82905 + mark_sym_for_renaming(local_entropy);
82906 +
82907 + // 2. initialize local entropy variable
82908 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
82909 + if (dom_info_available_p(CDI_DOMINATORS))
82910 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
82911 + gsi = gsi_start_bb(bb);
82912 +
82913 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
82914 +// gimple_set_location(assign, loc);
82915 + find_referenced_vars_in(assign);
82916 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
82917 + update_stmt(assign);
82918 + bb = bb->next_bb;
82919 +
82920 + // 3. instrument each BB with an operation on the local entropy variable
82921 + while (bb != EXIT_BLOCK_PTR) {
82922 + perturb_local_entropy(bb, local_entropy);
82923 + bb = bb->next_bb;
82924 + };
82925 +
82926 + // 4. mix local entropy into the global entropy variable
82927 + perturb_latent_entropy(EXIT_BLOCK_PTR->prev_bb, local_entropy);
82928 + return 0;
82929 +}
82930 +
82931 +static void start_unit_callback(void *gcc_data, void *user_data)
82932 +{
82933 +#if BUILDING_GCC_VERSION >= 4007
82934 + seed = get_random_seed(false);
82935 +#else
82936 + sscanf(get_random_seed(false), "%" HOST_WIDE_INT_PRINT "x", &seed);
82937 + seed *= seed;
82938 +#endif
82939 +
82940 + if (in_lto_p)
82941 + return;
82942 +
82943 + // extern u64 latent_entropy
82944 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), unsigned_intDI_type_node);
82945 +
82946 + TREE_STATIC(latent_entropy_decl) = 1;
82947 + TREE_PUBLIC(latent_entropy_decl) = 1;
82948 + TREE_USED(latent_entropy_decl) = 1;
82949 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
82950 + DECL_EXTERNAL(latent_entropy_decl) = 1;
82951 + DECL_ARTIFICIAL(latent_entropy_decl) = 0;
82952 + DECL_INITIAL(latent_entropy_decl) = NULL;
82953 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
82954 +// varpool_finalize_decl(latent_entropy_decl);
82955 +// varpool_mark_needed_node(latent_entropy_decl);
82956 +}
82957 +
82958 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
82959 +{
82960 + const char * const plugin_name = plugin_info->base_name;
82961 + struct register_pass_info latent_entropy_pass_info = {
82962 + .pass = &latent_entropy_pass.pass,
82963 + .reference_pass_name = "optimized",
82964 + .ref_pass_instance_number = 1,
82965 + .pos_op = PASS_POS_INSERT_BEFORE
82966 + };
82967 +
82968 + if (!plugin_default_version_check(version, &gcc_version)) {
82969 + error(G_("incompatible gcc/plugin versions"));
82970 + return 1;
82971 + }
82972 +
82973 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
82974 + register_callback ("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
82975 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
82976 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
82977 +
82978 + return 0;
82979 +}
82980 diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
82981 new file mode 100644
82982 index 0000000..036c9c6
82983 --- /dev/null
82984 +++ b/tools/gcc/size_overflow_hash.data
82985 @@ -0,0 +1,3057 @@
82986 +_000001_hash alloc_dr 2 65495 _000001_hash NULL
82987 +_000002_hash __copy_from_user 3 10918 _000002_hash NULL
82988 +_000003_hash copy_from_user 3 17559 _000003_hash NULL
82989 +_000004_hash __copy_from_user_inatomic 3 4365 _000004_hash NULL
82990 +_000005_hash __copy_from_user_nocache 3 39351 _000005_hash NULL
82991 +_000006_hash __copy_to_user_inatomic 3 19214 _000006_hash NULL
82992 +_000007_hash do_xip_mapping_read 5 60297 _000007_hash NULL
82993 +_000008_hash hugetlbfs_read 3 11268 _000008_hash NULL
82994 +_000009_hash kmalloc 1 60432 _002597_hash NULL nohasharray
82995 +_000010_hash kmalloc_array 1-2 9444 _000010_hash NULL
82996 +_000012_hash kmalloc_slab 1 11917 _000012_hash NULL
82997 +_000013_hash kmemdup 2 64015 _000013_hash NULL
82998 +_000014_hash __krealloc 2 14857 _000331_hash NULL nohasharray
82999 +_000015_hash memdup_user 2 59590 _000015_hash NULL
83000 +_000016_hash module_alloc 1 63630 _000016_hash NULL
83001 +_000017_hash read_default_ldt 2 14302 _000017_hash NULL
83002 +_000018_hash read_kcore 3 63488 _000018_hash NULL
83003 +_000019_hash read_ldt 2 47570 _000019_hash NULL
83004 +_000020_hash read_zero 3 19366 _000020_hash NULL
83005 +_000021_hash __vmalloc_node 1 39308 _000021_hash NULL
83006 +_000022_hash vm_map_ram 2 23078 _001054_hash NULL nohasharray
83007 +_000023_hash aa_simple_write_to_buffer 4-3 49683 _000023_hash NULL
83008 +_000024_hash ablkcipher_copy_iv 3 64140 _000024_hash NULL
83009 +_000025_hash ablkcipher_next_slow 4 47274 _000025_hash NULL
83010 +_000026_hash acpi_battery_write_alarm 3 1240 _000026_hash NULL
83011 +_000027_hash acpi_os_allocate 1 14892 _000027_hash NULL
83012 +_000028_hash acpi_system_write_wakeup_device 3 34853 _000028_hash NULL
83013 +_000029_hash adu_write 3 30487 _000029_hash NULL
83014 +_000030_hash aer_inject_write 3 52399 _000030_hash NULL
83015 +_000031_hash afs_alloc_flat_call 2-3 36399 _000031_hash NULL
83016 +_000033_hash afs_proc_cells_write 3 61139 _000033_hash NULL
83017 +_000034_hash afs_proc_rootcell_write 3 15822 _000034_hash NULL
83018 +_000035_hash agp_3_5_isochronous_node_enable 3 49465 _000035_hash NULL
83019 +_000036_hash agp_alloc_page_array 1 22554 _000036_hash NULL
83020 +_000037_hash ah_alloc_tmp 2 54378 _000037_hash NULL
83021 +_000038_hash ahash_setkey_unaligned 3 33521 _000038_hash NULL
83022 +_000039_hash alg_setkey 3 31485 _000039_hash NULL
83023 +_000040_hash aligned_kmalloc 1 3628 _000040_hash NULL
83024 +_000041_hash alloc_context 1 3194 _000041_hash NULL
83025 +_000042_hash alloc_ep_req 2 54860 _000042_hash NULL
83026 +_000043_hash alloc_fdmem 1 27083 _000043_hash NULL
83027 +_000044_hash alloc_flex_gd 1 57259 _000044_hash NULL
83028 +_000045_hash alloc_sglist 1-3-2 22960 _000045_hash NULL
83029 +_000046_hash aoedev_flush 2 44398 _000046_hash NULL
83030 +_000047_hash append_to_buffer 3 63550 _000047_hash NULL
83031 +_000048_hash asix_read_cmd 5 13245 _000048_hash NULL
83032 +_000049_hash asix_write_cmd 5 58192 _000049_hash NULL
83033 +_000050_hash asn1_octets_decode 2 9991 _000050_hash NULL
83034 +_000051_hash asn1_oid_decode 2 4999 _000051_hash NULL
83035 +_000052_hash at76_set_card_command 4 4471 _000052_hash NULL
83036 +_000053_hash ath6kl_add_bss_if_needed 6 24317 _000053_hash NULL
83037 +_000054_hash ath6kl_debug_roam_tbl_event 3 5224 _000054_hash NULL
83038 +_000055_hash ath6kl_mgmt_powersave_ap 6 13791 _000055_hash NULL
83039 +_000056_hash ath6kl_send_go_probe_resp 3 21113 _000056_hash NULL
83040 +_000057_hash ath6kl_set_ap_probe_resp_ies 3 50539 _000057_hash NULL
83041 +_000058_hash ath6kl_set_assoc_req_ies 3 43185 _000058_hash NULL
83042 +_000059_hash ath6kl_wmi_bssinfo_event_rx 3 2275 _000059_hash NULL
83043 +_000060_hash ath6kl_wmi_send_action_cmd 7 58860 _000060_hash NULL
83044 +_000061_hash __ath6kl_wmi_send_mgmt_cmd 7 38971 _000061_hash NULL
83045 +_000062_hash attach_hdlc_protocol 3 19986 _000062_hash NULL
83046 +_000063_hash audio_write 4 54261 _001597_hash NULL nohasharray
83047 +_000064_hash audit_unpack_string 3 13748 _000064_hash NULL
83048 +_000065_hash av7110_vbi_write 3 34384 _000065_hash NULL
83049 +_000066_hash ax25_setsockopt 5 42740 _000066_hash NULL
83050 +_000067_hash b43_debugfs_write 3 34838 _000067_hash NULL
83051 +_000068_hash b43legacy_debugfs_write 3 28556 _000068_hash NULL
83052 +_000069_hash bch_alloc 1 4593 _000069_hash NULL
83053 +_000070_hash befs_nls2utf 3 17163 _000070_hash NULL
83054 +_000071_hash befs_utf2nls 3 25628 _000071_hash NULL
83055 +_000072_hash bfad_debugfs_write_regrd 3 15218 _000072_hash NULL
83056 +_000073_hash bfad_debugfs_write_regwr 3 61841 _000073_hash NULL
83057 +_000074_hash bio_alloc_map_data 1-2 50782 _000074_hash NULL
83058 +_000076_hash bio_kmalloc 2 54672 _000076_hash NULL
83059 +_000077_hash blkcipher_copy_iv 3 24075 _000077_hash NULL
83060 +_000078_hash blkcipher_next_slow 4 52733 _000078_hash NULL
83061 +_000079_hash bl_pipe_downcall 3 34264 _000079_hash NULL
83062 +_000080_hash bnad_debugfs_write_regrd 3 6706 _000080_hash NULL
83063 +_000081_hash bnad_debugfs_write_regwr 3 57500 _000081_hash NULL
83064 +_000082_hash bnx2fc_cmd_mgr_alloc 2-3 24873 _000082_hash NULL
83065 +_000084_hash bnx2_nvram_write 4 7790 _000084_hash NULL
83066 +_000085_hash brcmf_sdbrcm_downloadvars 3 42064 _000085_hash NULL
83067 +_000086_hash btmrvl_gpiogap_write 3 35053 _000086_hash NULL
83068 +_000087_hash btmrvl_hscfgcmd_write 3 27143 _000087_hash NULL
83069 +_000088_hash btmrvl_hscmd_write 3 27089 _000088_hash NULL
83070 +_000089_hash btmrvl_hsmode_write 3 42252 _000089_hash NULL
83071 +_000090_hash btmrvl_pscmd_write 3 29504 _000090_hash NULL
83072 +_000091_hash btmrvl_psmode_write 3 3703 _000091_hash NULL
83073 +_000092_hash btrfs_alloc_delayed_item 1 11678 _000092_hash NULL
83074 +_000093_hash cache_do_downcall 3 6926 _000093_hash NULL
83075 +_000094_hash cachefiles_cook_key 2 33274 _000094_hash NULL
83076 +_000095_hash cachefiles_daemon_write 3 43535 _000095_hash NULL
83077 +_000096_hash capi_write 3 35104 _000096_hash NULL
83078 +_000097_hash carl9170_debugfs_write 3 50857 _000097_hash NULL
83079 +_000098_hash cciss_allocate_sg_chain_blocks 2-3 5368 _000098_hash NULL
83080 +_000100_hash cciss_proc_write 3 10259 _000100_hash NULL
83081 +_000101_hash cdrom_read_cdda_old 4 27664 _000101_hash NULL
83082 +_000102_hash ceph_alloc_page_vector 1 18710 _000102_hash NULL
83083 +_000103_hash ceph_buffer_new 1 35974 _000103_hash NULL
83084 +_000104_hash ceph_copy_user_to_page_vector 4 656 _000104_hash NULL
83085 +_000105_hash ceph_get_direct_page_vector 2 41917 _000105_hash NULL
83086 +_000106_hash ceph_msg_new 2 5846 _000106_hash NULL
83087 +_000107_hash ceph_setxattr 4 18913 _000107_hash NULL
83088 +_000108_hash cfi_read_pri 3 24366 _000108_hash NULL
83089 +_000109_hash cgroup_write_string 5 10900 _000109_hash NULL
83090 +_000110_hash cgroup_write_X64 5 54514 _000110_hash NULL
83091 +_000111_hash change_xattr 5 61390 _000111_hash NULL
83092 +_000112_hash check_load_and_stores 2 2143 _000112_hash NULL
83093 +_000113_hash cifs_idmap_key_instantiate 3 54503 _000113_hash NULL
83094 +_000114_hash cifs_security_flags_proc_write 3 5484 _000114_hash NULL
83095 +_000115_hash cifs_setxattr 4 23957 _000115_hash NULL
83096 +_000116_hash cifs_spnego_key_instantiate 3 23588 _000116_hash NULL
83097 +_000117_hash ci_ll_write 4 3740 _000117_hash NULL
83098 +_000118_hash cld_pipe_downcall 3 15058 _000118_hash NULL
83099 +_000119_hash clear_refs_write 3 61904 _000119_hash NULL
83100 +_000120_hash clusterip_proc_write 3 44729 _000120_hash NULL
83101 +_000121_hash cm4040_write 3 58079 _000121_hash NULL
83102 +_000122_hash cm_copy_private_data 2 3649 _000122_hash NULL
83103 +_000123_hash cmm_write 3 2896 _000123_hash NULL
83104 +_000124_hash cm_write 3 36858 _000124_hash NULL
83105 +_000125_hash coda_psdev_write 3 1711 _000125_hash NULL
83106 +_000126_hash codec_reg_read_file 3 36280 _000126_hash NULL
83107 +_000127_hash command_file_write 3 31318 _000127_hash NULL
83108 +_000128_hash command_write 3 58841 _000128_hash NULL
83109 +_000129_hash comm_write 3 44537 _001532_hash NULL nohasharray
83110 +_000130_hash concat_writev 3 21451 _000130_hash NULL
83111 +_000131_hash copy_and_check 3 19089 _000131_hash NULL
83112 +_000132_hash copy_from_user_toio 3 31966 _000132_hash NULL
83113 +_000133_hash copy_items 6 50140 _000133_hash NULL
83114 +_000134_hash copy_macs 4 45534 _000134_hash NULL
83115 +_000135_hash __copy_to_user 3 17551 _000135_hash NULL
83116 +_000136_hash copy_vm86_regs_from_user 3 45340 _000136_hash NULL
83117 +_000137_hash cosa_write 3 1774 _000137_hash NULL
83118 +_000138_hash create_entry 2 33479 _000138_hash NULL
83119 +_000139_hash create_queues 2-3 9088 _000139_hash NULL
83120 +_000141_hash create_xattr 5 54106 _000141_hash NULL
83121 +_000142_hash create_xattr_datum 5 33356 _000142_hash NULL
83122 +_000143_hash csum_partial_copy_fromiovecend 3-4 9957 _000143_hash NULL
83123 +_000145_hash ctrl_out 3-5 8712 _000145_hash NULL
83124 +_000147_hash cx24116_writeregN 4 41975 _000147_hash NULL
83125 +_000148_hash cxacru_cm_get_array 4 4412 _000148_hash NULL
83126 +_000149_hash cxgbi_alloc_big_mem 1 4707 _000149_hash NULL
83127 +_000150_hash dac960_user_command_proc_write 3 3071 _000150_hash NULL
83128 +_000151_hash datablob_format 2 39571 _002156_hash NULL nohasharray
83129 +_000152_hash dccp_feat_clone_sp_val 3 11942 _000152_hash NULL
83130 +_000153_hash dccp_setsockopt_ccid 4 30701 _000153_hash NULL
83131 +_000154_hash dccp_setsockopt_cscov 2 37766 _000154_hash NULL
83132 +_000155_hash dccp_setsockopt_service 4 65336 _000155_hash NULL
83133 +_000156_hash ddb_output_write 3 31902 _000156_hash NULL
83134 +_000157_hash ddebug_proc_write 3 18055 _000157_hash NULL
83135 +_000158_hash dev_config 3 8506 _000158_hash NULL
83136 +_000159_hash device_write 3 45156 _000159_hash NULL
83137 +_000160_hash devm_kzalloc 2 4966 _000160_hash NULL
83138 +_000161_hash devres_alloc 2 551 _000161_hash NULL
83139 +_000162_hash dfs_file_write 3 41196 _000162_hash NULL
83140 +_000163_hash direct_entry 3 38836 _000163_hash NULL
83141 +_000164_hash dispatch_proc_write 3 44320 _000164_hash NULL
83142 +_000165_hash diva_os_copy_from_user 4 7792 _000165_hash NULL
83143 +_000166_hash dlm_alloc_pagevec 1 54296 _000166_hash NULL
83144 +_000167_hash dlmfs_file_read 3 28385 _000167_hash NULL
83145 +_000168_hash dlmfs_file_write 3 6892 _000168_hash NULL
83146 +_000169_hash dm_read 3 15674 _000169_hash NULL
83147 +_000170_hash dm_write 3 2513 _000170_hash NULL
83148 +_000171_hash __dn_setsockopt 5 13060 _000171_hash NULL
83149 +_000172_hash dns_query 3 9676 _000172_hash NULL
83150 +_000173_hash dns_resolver_instantiate 3 63314 _000173_hash NULL
83151 +_000174_hash do_add_counters 3 3992 _000174_hash NULL
83152 +_000175_hash __do_config_autodelink 3 58763 _000175_hash NULL
83153 +_000176_hash do_ip_setsockopt 5 41852 _000176_hash NULL
83154 +_000177_hash do_ipv6_setsockopt 5 18215 _000177_hash NULL
83155 +_000178_hash do_ip_vs_set_ctl 4 48641 _000178_hash NULL
83156 +_000179_hash do_kimage_alloc 3 64827 _000179_hash NULL
83157 +_000180_hash do_register_entry 4 29478 _000180_hash NULL
83158 +_000181_hash do_tty_write 5 44896 _000181_hash NULL
83159 +_000182_hash do_update_counters 4 2259 _000182_hash NULL
83160 +_000183_hash dsp_write 2 46218 _000183_hash NULL
83161 +_000184_hash dup_to_netobj 3 26363 _000184_hash NULL
83162 +_000185_hash dvb_aplay 3 56296 _000185_hash NULL
83163 +_000186_hash dvb_ca_en50221_io_write 3 43533 _000186_hash NULL
83164 +_000187_hash dvbdmx_write 3 19423 _000187_hash NULL
83165 +_000188_hash dvb_play 3 50814 _000188_hash NULL
83166 +_000189_hash dw210x_op_rw 6 39915 _000189_hash NULL
83167 +_000190_hash dwc3_link_state_write 3 12641 _000190_hash NULL
83168 +_000191_hash dwc3_mode_write 3 51997 _000191_hash NULL
83169 +_000192_hash dwc3_testmode_write 3 30516 _000192_hash NULL
83170 +_000193_hash ecryptfs_copy_filename 4 11868 _000193_hash NULL
83171 +_000194_hash ecryptfs_miscdev_write 3 26847 _000194_hash NULL
83172 +_000195_hash ecryptfs_send_miscdev 2 64816 _000195_hash NULL
83173 +_000196_hash efx_tsoh_heap_alloc 2 58545 _000196_hash NULL
83174 +_000197_hash emi26_writememory 4 57908 _000197_hash NULL
83175 +_000198_hash emi62_writememory 4 29731 _000198_hash NULL
83176 +_000199_hash encrypted_instantiate 3 3168 _000199_hash NULL
83177 +_000200_hash encrypted_update 3 13414 _000200_hash NULL
83178 +_000201_hash ep0_write 3 14536 _001328_hash NULL nohasharray
83179 +_000202_hash ep_read 3 58813 _000202_hash NULL
83180 +_000203_hash ep_write 3 59008 _000203_hash NULL
83181 +_000204_hash erst_dbg_write 3 46715 _000204_hash NULL
83182 +_000205_hash esp_alloc_tmp 2 40558 _000205_hash NULL
83183 +_000206_hash exofs_read_lookup_dev_table 3 17733 _000206_hash NULL
83184 +_000207_hash ext4_kvmalloc 1 14796 _000207_hash NULL
83185 +_000208_hash ezusb_writememory 4 45976 _000208_hash NULL
83186 +_000209_hash fanotify_write 3 64623 _000209_hash NULL
83187 +_000210_hash fd_copyin 3 56247 _000210_hash NULL
83188 +_000211_hash ffs_epfile_io 3 64886 _000211_hash NULL
83189 +_000212_hash ffs_prepare_buffer 2 59892 _000212_hash NULL
83190 +_000213_hash f_hidg_write 3 7932 _000213_hash NULL
83191 +_000214_hash file_read_actor 4 1401 _000214_hash NULL
83192 +_000215_hash fill_write_buffer 3 3142 _000215_hash NULL
83193 +_000216_hash fl_create 5 56435 _000216_hash NULL
83194 +_000217_hash ftdi_elan_write 3 57309 _000217_hash NULL
83195 +_000218_hash fuse_conn_limit_write 3 30777 _000218_hash NULL
83196 +_000219_hash fw_iso_buffer_init 3 54582 _000219_hash NULL
83197 +_000220_hash garmin_write_bulk 3 58191 _000220_hash NULL
83198 +_000221_hash garp_attr_create 3 3883 _000221_hash NULL
83199 +_000222_hash get_arg 3 5694 _000222_hash NULL
83200 +_000223_hash getdqbuf 1 62908 _000223_hash NULL
83201 +_000224_hash get_fdb_entries 3 41916 _000224_hash NULL
83202 +_000225_hash get_indirect_ea 4 51869 _000225_hash NULL
83203 +_000226_hash get_registers 3 26187 _000226_hash NULL
83204 +_000227_hash get_scq 2 10897 _000227_hash NULL
83205 +_000228_hash get_server_iovec 2 16804 _000228_hash NULL
83206 +_000229_hash get_ucode_user 3 38202 _000229_hash NULL
83207 +_000230_hash get_user_cpu_mask 2 14861 _000230_hash NULL
83208 +_000231_hash gfs2_alloc_sort_buffer 1 18275 _000231_hash NULL
83209 +_000232_hash gfs2_glock_nq_m 1 20347 _000232_hash NULL
83210 +_000233_hash gigaset_initcs 2 43753 _000233_hash NULL
83211 +_000234_hash gigaset_initdriver 2 1060 _000234_hash NULL
83212 +_000235_hash gs_alloc_req 2 58883 _000235_hash NULL
83213 +_000236_hash gs_buf_alloc 2 25067 _000236_hash NULL
83214 +_000237_hash gsm_data_alloc 3 42437 _000237_hash NULL
83215 +_000238_hash gss_pipe_downcall 3 23182 _000238_hash NULL
83216 +_000239_hash handle_request 9 10024 _000239_hash NULL
83217 +_000240_hash hash_new 1 62224 _000240_hash NULL
83218 +_000241_hash hashtab_create 3 33769 _000241_hash NULL
83219 +_000242_hash hcd_buffer_alloc 2 27495 _000242_hash NULL
83220 +_000243_hash hci_sock_setsockopt 5 28993 _000243_hash NULL
83221 +_000244_hash heap_init 2 49617 _000244_hash NULL
83222 +_000245_hash hest_ghes_dev_register 1 46766 _000245_hash NULL
83223 +_000246_hash hidraw_get_report 3 45609 _000246_hash NULL
83224 +_000247_hash hidraw_report_event 3 49578 _000509_hash NULL nohasharray
83225 +_000248_hash hidraw_send_report 3 23449 _000248_hash NULL
83226 +_000249_hash hpfs_translate_name 3 41497 _000249_hash NULL
83227 +_000250_hash hysdn_conf_write 3 52145 _000250_hash NULL
83228 +_000251_hash hysdn_log_write 3 48694 _000251_hash NULL
83229 +_000252_hash __i2400mu_send_barker 3 23652 _000252_hash NULL
83230 +_000253_hash i2cdev_read 3 1206 _000253_hash NULL
83231 +_000254_hash i2cdev_write 3 23310 _000254_hash NULL
83232 +_000255_hash i2o_parm_field_get 5 34477 _000255_hash NULL
83233 +_000256_hash i2o_parm_table_get 6 61635 _000256_hash NULL
83234 +_000257_hash ib_copy_from_udata 3 59502 _000257_hash NULL
83235 +_000258_hash ib_ucm_alloc_data 3 36885 _000258_hash NULL
83236 +_000259_hash ib_umad_write 3 47993 _000259_hash NULL
83237 +_000260_hash ib_uverbs_unmarshall_recv 5 12251 _000260_hash NULL
83238 +_000261_hash icn_writecmd 2 38629 _000261_hash NULL
83239 +_000262_hash ide_driver_proc_write 3 32493 _000262_hash NULL
83240 +_000263_hash ide_settings_proc_write 3 35110 _000263_hash NULL
83241 +_000264_hash idetape_chrdev_write 3 53976 _000264_hash NULL
83242 +_000265_hash idmap_pipe_downcall 3 14591 _000265_hash NULL
83243 +_000266_hash ieee80211_build_probe_req 7-5 27660 _000266_hash NULL
83244 +_000267_hash ieee80211_if_write 3 34894 _000267_hash NULL
83245 +_000268_hash if_write 3 51756 _000268_hash NULL
83246 +_000269_hash ilo_write 3 64378 _000269_hash NULL
83247 +_000270_hash ima_write_policy 3 40548 _000270_hash NULL
83248 +_000271_hash init_data_container 1 60709 _000271_hash NULL
83249 +_000272_hash init_send_hfcd 1 34586 _000272_hash NULL
83250 +_000273_hash insert_dent 7 65034 _000273_hash NULL
83251 +_000274_hash interpret_user_input 2 19393 _000274_hash NULL
83252 +_000275_hash int_proc_write 3 39542 _000275_hash NULL
83253 +_000276_hash ioctl_private_iw_point 7 1273 _000276_hash NULL
83254 +_000277_hash iov_iter_copy_from_user 4 31942 _000277_hash NULL
83255 +_000278_hash iov_iter_copy_from_user_atomic 4 56368 _000278_hash NULL
83256 +_000279_hash iowarrior_write 3 18604 _000279_hash NULL
83257 +_000280_hash ipc_alloc 1 1192 _000280_hash NULL
83258 +_000281_hash ipc_rcu_alloc 1 21208 _000281_hash NULL
83259 +_000282_hash ip_options_get_from_user 4 64958 _000282_hash NULL
83260 +_000283_hash ipv6_renew_option 3 38813 _000283_hash NULL
83261 +_000284_hash ip_vs_conn_fill_param_sync 6 29771 _002404_hash NULL nohasharray
83262 +_000285_hash ip_vs_create_timeout_table 2 64478 _000285_hash NULL
83263 +_000286_hash ipw_queue_tx_init 3 49161 _000286_hash NULL
83264 +_000287_hash irda_setsockopt 5 19824 _000287_hash NULL
83265 +_000288_hash irias_new_octseq_value 2 13596 _000288_hash NULL
83266 +_000289_hash ir_lirc_transmit_ir 3 64403 _000289_hash NULL
83267 +_000290_hash irnet_ctrl_write 3 24139 _000290_hash NULL
83268 +_000291_hash isdn_add_channels 3 40905 _000291_hash NULL
83269 +_000292_hash isdn_ppp_fill_rq 2 41428 _000292_hash NULL
83270 +_000293_hash isdn_ppp_write 4 29109 _000293_hash NULL
83271 +_000294_hash isdn_read 3 50021 _000294_hash NULL
83272 +_000295_hash isdn_v110_open 3 2418 _000295_hash NULL
83273 +_000296_hash isdn_writebuf_stub 4 52383 _000296_hash NULL
83274 +_000297_hash islpci_mgt_transmit 5 34133 _000297_hash NULL
83275 +_000298_hash iso_callback 3 43208 _000298_hash NULL
83276 +_000299_hash iso_packets_buffer_init 3 29061 _000299_hash NULL
83277 +_000300_hash it821x_firmware_command 3 8628 _000300_hash NULL
83278 +_000301_hash ivtv_buf_copy_from_user 4 25502 _000301_hash NULL
83279 +_000302_hash iwch_alloc_fastreg_pbl 2 40153 _000302_hash NULL
83280 +_000303_hash iwl_calib_set 3 34400 _002188_hash NULL nohasharray
83281 +_000304_hash jbd2_journal_init_revoke_table 1 36336 _000304_hash NULL
83282 +_000305_hash jffs2_alloc_full_dirent 1 60179 _001111_hash NULL nohasharray
83283 +_000306_hash journal_init_revoke_table 1 56331 _000306_hash NULL
83284 +_000307_hash kcalloc 1-2 27770 _000307_hash NULL
83285 +_000309_hash keyctl_instantiate_key_common 4 47889 _000309_hash NULL
83286 +_000310_hash keyctl_update_key 3 26061 _000310_hash NULL
83287 +_000311_hash __kfifo_alloc 2-3 22173 _000311_hash NULL
83288 +_000313_hash kfifo_copy_from_user 3 5091 _000313_hash NULL
83289 +_000314_hash kmalloc_node 1 50163 _000314_hash NULL
83290 +_000315_hash kmalloc_parameter 1 65279 _000315_hash NULL
83291 +_000316_hash kmem_alloc 1 31920 _000316_hash NULL
83292 +_000317_hash kobj_map 2-3 9566 _000317_hash NULL
83293 +_000319_hash kone_receive 4 4690 _000319_hash NULL
83294 +_000320_hash kone_send 4 63435 _000320_hash NULL
83295 +_000321_hash krealloc 2 14908 _000321_hash NULL
83296 +_000322_hash kvmalloc 1 32646 _000322_hash NULL
83297 +_000323_hash kvm_read_guest_atomic 4 10765 _000323_hash NULL
83298 +_000324_hash kvm_read_guest_cached 4 39666 _000324_hash NULL
83299 +_000325_hash kvm_read_guest_page 5 18074 _000325_hash NULL
83300 +_000326_hash kzalloc 1 54740 _000326_hash NULL
83301 +_000327_hash l2cap_sock_setsockopt 5 50207 _000327_hash NULL
83302 +_000328_hash l2cap_sock_setsockopt_old 4 29346 _000328_hash NULL
83303 +_000329_hash lane2_associate_req 4 45398 _000329_hash NULL
83304 +_000330_hash lbs_debugfs_write 3 48413 _000330_hash NULL
83305 +_000331_hash lcd_write 3 14857 _000331_hash &_000014_hash
83306 +_000332_hash ldm_frag_add 2 5611 _000332_hash NULL
83307 +_000333_hash __lgread 4 31668 _000333_hash NULL
83308 +_000334_hash libipw_alloc_txb 1-3-2 27579 _000334_hash NULL
83309 +_000335_hash link_send_sections_long 4 46556 _000335_hash NULL
83310 +_000336_hash listxattr 3 12769 _000336_hash NULL
83311 +_000337_hash LoadBitmap 2 19658 _000337_hash NULL
83312 +_000338_hash load_msg 2 95 _000338_hash NULL
83313 +_000339_hash lpfc_debugfs_dif_err_write 3 17424 _000339_hash NULL
83314 +_000340_hash lp_write 3 9511 _000340_hash NULL
83315 +_000341_hash mb_cache_create 2 17307 _000341_hash NULL
83316 +_000342_hash mce_write 3 26201 _000342_hash NULL
83317 +_000343_hash mcs7830_get_reg 3 33308 _000343_hash NULL
83318 +_000344_hash mcs7830_set_reg 3 31413 _000344_hash NULL
83319 +_000345_hash memcpy_fromiovec 3 55247 _000345_hash NULL
83320 +_000346_hash memcpy_fromiovecend 3-4 2707 _000346_hash NULL
83321 +_000348_hash mempool_kmalloc 2 53831 _000348_hash NULL
83322 +_000349_hash mempool_resize 2 47983 _001821_hash NULL nohasharray
83323 +_000350_hash mem_rw 3 22085 _000350_hash NULL
83324 +_000351_hash mgmt_control 3 7349 _000351_hash NULL
83325 +_000352_hash mgmt_pending_add 5 46976 _000352_hash NULL
83326 +_000353_hash mlx4_ib_alloc_fast_reg_page_list 2 46119 _000353_hash NULL
83327 +_000354_hash mmc_alloc_sg 1 21504 _000354_hash NULL
83328 +_000355_hash mmc_send_bus_test 4 18285 _000355_hash NULL
83329 +_000356_hash mmc_send_cxd_data 5 38655 _000356_hash NULL
83330 +_000357_hash module_alloc_update_bounds 1 47205 _000357_hash NULL
83331 +_000358_hash move_addr_to_kernel 2 32673 _000358_hash NULL
83332 +_000359_hash mpi_alloc_limb_space 1 23190 _000359_hash NULL
83333 +_000360_hash mpi_resize 2 44674 _000360_hash NULL
83334 +_000361_hash mptctl_getiocinfo 2 28545 _000361_hash NULL
83335 +_000362_hash mtdchar_readoob 4 31200 _000362_hash NULL
83336 +_000363_hash mtdchar_write 3 56831 _002688_hash NULL nohasharray
83337 +_000364_hash mtdchar_writeoob 4 3393 _000364_hash NULL
83338 +_000365_hash mtd_device_parse_register 5 5024 _000365_hash NULL
83339 +_000366_hash mtf_test_write 3 18844 _000366_hash NULL
83340 +_000367_hash mtrr_write 3 59622 _000367_hash NULL
83341 +_000368_hash musb_test_mode_write 3 33518 _000368_hash NULL
83342 +_000369_hash mwifiex_get_common_rates 3 17131 _000369_hash NULL
83343 +_000370_hash mwifiex_update_curr_bss_params 5 16908 _000370_hash NULL
83344 +_000371_hash nand_bch_init 2-3 16280 _001341_hash NULL nohasharray
83345 +_000373_hash ncp_file_write 3 3813 _000373_hash NULL
83346 +_000374_hash ncp__vol2io 5 4804 _000374_hash NULL
83347 +_000375_hash nes_alloc_fast_reg_page_list 2 33523 _000375_hash NULL
83348 +_000376_hash nfc_targets_found 3 29886 _000376_hash NULL
83349 +_000377_hash nfs4_acl_new 1 49806 _000377_hash NULL
83350 +_000378_hash nfs4_write_cached_acl 4 15070 _000378_hash NULL
83351 +_000379_hash nfsd_cache_update 3 59574 _000379_hash NULL
83352 +_000380_hash nfsd_symlink 6 63442 _000380_hash NULL
83353 +_000381_hash nfs_idmap_get_desc 2-4 42990 _000381_hash NULL
83354 +_000383_hash nfs_readdir_make_qstr 3 12509 _000383_hash NULL
83355 +_000384_hash note_last_dentry 3 12285 _000384_hash NULL
83356 +_000385_hash ntfs_copy_from_user 3-5 15072 _000385_hash NULL
83357 +_000387_hash __ntfs_copy_from_user_iovec_inatomic 3-4 38153 _000387_hash NULL
83358 +_000389_hash ntfs_ucstonls 3 23097 _000389_hash NULL
83359 +_000390_hash nvme_alloc_iod 1 56027 _000390_hash NULL
83360 +_000391_hash nvram_write 3 3894 _000391_hash NULL
83361 +_000392_hash o2hb_debug_create 4 18744 _000392_hash NULL
83362 +_000393_hash o2net_send_message_vec 4 879 _001792_hash NULL nohasharray
83363 +_000394_hash ocfs2_control_cfu 2 37750 _000394_hash NULL
83364 +_000395_hash oom_adjust_write 3 41116 _000395_hash NULL
83365 +_000396_hash oom_score_adj_write 3 42594 _000396_hash NULL
83366 +_000397_hash opera1_xilinx_rw 5 31453 _000397_hash NULL
83367 +_000398_hash oprofilefs_ulong_from_user 3 57251 _000398_hash NULL
83368 +_000399_hash opticon_write 4 60775 _000399_hash NULL
83369 +_000400_hash orig_node_add_if 2 32833 _000400_hash NULL
83370 +_000401_hash orig_node_del_if 2 28371 _000401_hash NULL
83371 +_000402_hash p9_check_zc_errors 4 15534 _000402_hash NULL
83372 +_000403_hash packet_buffer_init 2 1607 _000403_hash NULL
83373 +_000404_hash packet_setsockopt 5 17662 _000404_hash NULL
83374 +_000405_hash parse_command 2 37079 _000405_hash NULL
83375 +_000406_hash pcbit_writecmd 2 12332 _000406_hash NULL
83376 +_000407_hash pcmcia_replace_cis 3 57066 _000407_hash NULL
83377 +_000408_hash pgctrl_write 3 50453 _000408_hash NULL
83378 +_000409_hash pg_write 3 40766 _000409_hash NULL
83379 +_000410_hash pidlist_allocate 1 64404 _000410_hash NULL
83380 +_000411_hash pipe_iov_copy_from_user 3 23102 _000411_hash NULL
83381 +_000412_hash pipe_iov_copy_to_user 3 3447 _000412_hash NULL
83382 +_000413_hash pkt_add 3 39897 _000413_hash NULL
83383 +_000414_hash pktgen_if_write 3 55628 _000414_hash NULL
83384 +_000415_hash platform_device_add_data 3 310 _000415_hash NULL
83385 +_000416_hash platform_device_add_resources 3 13289 _000416_hash NULL
83386 +_000417_hash pm_qos_power_write 3 52513 _000417_hash NULL
83387 +_000418_hash pnpbios_proc_write 3 19758 _000418_hash NULL
83388 +_000419_hash pool_allocate 3 42012 _000419_hash NULL
83389 +_000420_hash posix_acl_alloc 1 48063 _000420_hash NULL
83390 +_000421_hash ppp_cp_parse_cr 4 5214 _000421_hash NULL
83391 +_000422_hash ppp_write 3 34034 _000422_hash NULL
83392 +_000423_hash pp_read 3 33210 _000423_hash NULL
83393 +_000424_hash pp_write 3 39554 _000424_hash NULL
83394 +_000425_hash printer_req_alloc 2 62687 _001807_hash NULL nohasharray
83395 +_000426_hash printer_write 3 60276 _000426_hash NULL
83396 +_000427_hash prism2_set_genericelement 3 29277 _000427_hash NULL
83397 +_000428_hash __probe_kernel_read 3 61119 _000428_hash NULL
83398 +_000429_hash __probe_kernel_write 3 29842 _000429_hash NULL
83399 +_000430_hash proc_coredump_filter_write 3 25625 _000430_hash NULL
83400 +_000431_hash _proc_do_string 2 6376 _000431_hash NULL
83401 +_000432_hash process_vm_rw_pages 5-6 15954 _000432_hash NULL
83402 +_000434_hash proc_loginuid_write 3 63648 _000434_hash NULL
83403 +_000435_hash proc_pid_attr_write 3 63845 _000435_hash NULL
83404 +_000436_hash proc_scsi_devinfo_write 3 32064 _000436_hash NULL
83405 +_000437_hash proc_scsi_write 3 29142 _000437_hash NULL
83406 +_000438_hash proc_scsi_write_proc 3 267 _000438_hash NULL
83407 +_000439_hash pstore_mkfile 5 50830 _000439_hash NULL
83408 +_000440_hash pti_char_write 3 60960 _000440_hash NULL
83409 +_000441_hash ptrace_writedata 4 45021 _000441_hash NULL
83410 +_000442_hash pt_write 3 40159 _000442_hash NULL
83411 +_000443_hash pvr2_ioread_set_sync_key 3 59882 _000443_hash NULL
83412 +_000444_hash pvr2_stream_buffer_count 2 33719 _000444_hash NULL
83413 +_000445_hash qdisc_class_hash_alloc 1 18262 _000445_hash NULL
83414 +_000446_hash r3964_write 4 57662 _000446_hash NULL
83415 +_000447_hash raw_seticmpfilter 3 6888 _000447_hash NULL
83416 +_000448_hash raw_setsockopt 5 45800 _000448_hash NULL
83417 +_000449_hash rawv6_seticmpfilter 5 12137 _000449_hash NULL
83418 +_000450_hash ray_cs_essid_proc_write 3 17875 _000450_hash NULL
83419 +_000451_hash rbd_add 3 16366 _000451_hash NULL
83420 +_000452_hash rbd_snap_add 4 19678 _000452_hash NULL
83421 +_000453_hash rdma_set_ib_paths 3 45592 _000453_hash NULL
83422 +_000454_hash rds_page_copy_user 4 35691 _000454_hash NULL
83423 +_000455_hash read 3 9397 _000455_hash NULL
83424 +_000456_hash read_buf 2 20469 _000456_hash NULL
83425 +_000457_hash read_cis_cache 4 29735 _000457_hash NULL
83426 +_000458_hash realloc_buffer 2 25816 _000458_hash NULL
83427 +_000459_hash realloc_packet_buffer 2 25569 _000459_hash NULL
83428 +_000460_hash receive_DataRequest 3 9904 _000460_hash NULL
83429 +_000461_hash recent_mt_proc_write 3 8206 _000461_hash NULL
83430 +_000462_hash regmap_access_read_file 3 37223 _000462_hash NULL
83431 +_000463_hash regmap_bulk_write 4 59049 _000463_hash NULL
83432 +_000464_hash regmap_map_read_file 3 37685 _000464_hash NULL
83433 +_000465_hash regset_tls_set 4 18459 _000465_hash NULL
83434 +_000466_hash reg_w_buf 3 27724 _000466_hash NULL
83435 +_000467_hash reg_w_ixbuf 4 34736 _000467_hash NULL
83436 +_000468_hash remote_settings_file_write 3 22987 _000468_hash NULL
83437 +_000469_hash request_key_auth_new 3 38092 _000469_hash NULL
83438 +_000470_hash restore_i387_fxsave 2 17528 _000470_hash NULL
83439 +_000471_hash revalidate 2 19043 _000471_hash NULL
83440 +_000472_hash rfcomm_sock_setsockopt 5 18254 _000472_hash NULL
83441 +_000473_hash rndis_add_response 2 58544 _000473_hash NULL
83442 +_000474_hash rndis_set_oid 4 6547 _000474_hash NULL
83443 +_000475_hash rngapi_reset 3 34366 _002911_hash NULL nohasharray
83444 +_000476_hash roccat_common_receive 4 53407 _000476_hash NULL
83445 +_000477_hash roccat_common_send 4 12284 _000477_hash NULL
83446 +_000478_hash rpc_malloc 2 43573 _000478_hash NULL
83447 +_000479_hash rt2x00debug_write_bbp 3 8212 _000479_hash NULL
83448 +_000480_hash rt2x00debug_write_csr 3 64753 _000480_hash NULL
83449 +_000481_hash rt2x00debug_write_eeprom 3 23091 _000481_hash NULL
83450 +_000482_hash rt2x00debug_write_rf 3 38195 _000482_hash NULL
83451 +_000483_hash rts51x_read_mem 4 26577 _000483_hash NULL
83452 +_000484_hash rts51x_read_status 4 11830 _000484_hash NULL
83453 +_000485_hash rts51x_write_mem 4 17598 _000485_hash NULL
83454 +_000486_hash rw_copy_check_uvector 3 34271 _000486_hash NULL
83455 +_000487_hash rxrpc_request_key 3 27235 _000487_hash NULL
83456 +_000488_hash rxrpc_server_keyring 3 16431 _000488_hash NULL
83457 +_000489_hash savemem 3 58129 _000489_hash NULL
83458 +_000490_hash sb16_copy_from_user 10-7-6 55836 _000490_hash NULL
83459 +_000493_hash sched_autogroup_write 3 10984 _000493_hash NULL
83460 +_000494_hash scsi_mode_select 6 37330 _000494_hash NULL
83461 +_000495_hash scsi_tgt_copy_sense 3 26933 _000495_hash NULL
83462 +_000496_hash sctp_auth_create_key 1 51641 _000496_hash NULL
83463 +_000497_hash sctp_getsockopt_delayed_ack 2 9232 _000497_hash NULL
83464 +_000498_hash sctp_getsockopt_local_addrs 2 25178 _000498_hash NULL
83465 +_000499_hash sctp_make_abort_user 3 29654 _000499_hash NULL
83466 +_000500_hash sctp_setsockopt_active_key 3 43755 _000500_hash NULL
83467 +_000501_hash sctp_setsockopt_adaptation_layer 3 26935 _001925_hash NULL nohasharray
83468 +_000502_hash sctp_setsockopt_associnfo 3 51684 _000502_hash NULL
83469 +_000503_hash sctp_setsockopt_auth_chunk 3 30843 _000503_hash NULL
83470 +_000504_hash sctp_setsockopt_auth_key 3 3793 _000504_hash NULL
83471 +_000505_hash sctp_setsockopt_autoclose 3 5775 _000505_hash NULL
83472 +_000506_hash sctp_setsockopt_bindx 3 49870 _000506_hash NULL
83473 +_000507_hash __sctp_setsockopt_connectx 3 46949 _000507_hash NULL
83474 +_000508_hash sctp_setsockopt_context 3 31091 _000508_hash NULL
83475 +_000509_hash sctp_setsockopt_default_send_param 3 49578 _000509_hash &_000247_hash
83476 +_000510_hash sctp_setsockopt_delayed_ack 3 40129 _000510_hash NULL
83477 +_000511_hash sctp_setsockopt_del_key 3 42304 _002281_hash NULL nohasharray
83478 +_000512_hash sctp_setsockopt_events 3 18862 _000512_hash NULL
83479 +_000513_hash sctp_setsockopt_hmac_ident 3 11687 _000513_hash NULL
83480 +_000514_hash sctp_setsockopt_initmsg 3 1383 _000514_hash NULL
83481 +_000515_hash sctp_setsockopt_maxburst 3 28041 _000515_hash NULL
83482 +_000516_hash sctp_setsockopt_maxseg 3 11829 _000516_hash NULL
83483 +_000517_hash sctp_setsockopt_peer_addr_params 3 734 _000517_hash NULL
83484 +_000518_hash sctp_setsockopt_peer_primary_addr 3 13440 _000518_hash NULL
83485 +_000519_hash sctp_setsockopt_rtoinfo 3 30941 _000519_hash NULL
83486 +_000520_hash security_context_to_sid_core 2 29248 _000520_hash NULL
83487 +_000521_hash sel_commit_bools_write 3 46077 _000521_hash NULL
83488 +_000522_hash sel_write_avc_cache_threshold 3 2256 _000522_hash NULL
83489 +_000523_hash sel_write_bool 3 46996 _000523_hash NULL
83490 +_000524_hash sel_write_checkreqprot 3 60774 _000524_hash NULL
83491 +_000525_hash sel_write_disable 3 10511 _000525_hash NULL
83492 +_000526_hash sel_write_enforce 3 48998 _000526_hash NULL
83493 +_000527_hash sel_write_load 3 63830 _000527_hash NULL
83494 +_000528_hash send_bulk_static_data 3 61932 _000528_hash NULL
83495 +_000529_hash send_control_msg 6 48498 _000529_hash NULL
83496 +_000530_hash set_aoe_iflist 2 42737 _000530_hash NULL
83497 +_000531_hash setkey_unaligned 3 39474 _000531_hash NULL
83498 +_000532_hash set_registers 3 53582 _000532_hash NULL
83499 +_000533_hash setsockopt 5 54539 _000533_hash NULL
83500 +_000534_hash setup_req 3 5848 _000534_hash NULL
83501 +_000535_hash setup_window 7 59178 _000535_hash NULL
83502 +_000536_hash setxattr 4 37006 _000536_hash NULL
83503 +_000537_hash sfq_alloc 1 2861 _000537_hash NULL
83504 +_000538_hash sg_kmalloc 1 50240 _000538_hash NULL
83505 +_000539_hash sgl_map_user_pages 2 30610 _000539_hash NULL
83506 +_000540_hash shash_setkey_unaligned 3 8620 _000540_hash NULL
83507 +_000541_hash shmem_xattr_alloc 2 61190 _000541_hash NULL
83508 +_000542_hash sierra_setup_urb 5 46029 _000542_hash NULL
83509 +_000543_hash simple_transaction_get 3 50633 _000543_hash NULL
83510 +_000544_hash simple_write_to_buffer 2-5 3122 _000544_hash NULL
83511 +_000546_hash sisusb_send_bulk_msg 3 17864 _000546_hash NULL
83512 +_000547_hash skb_add_data 3 48363 _000547_hash NULL
83513 +_000548_hash skb_do_copy_data_nocache 5 12465 _000548_hash NULL
83514 +_000549_hash sl_alloc_bufs 2 50380 _000549_hash NULL
83515 +_000550_hash sl_realloc_bufs 2 64086 _000550_hash NULL
83516 +_000551_hash smk_write_ambient 3 45691 _000551_hash NULL
83517 +_000552_hash smk_write_cipso 3 17989 _000552_hash NULL
83518 +_000553_hash smk_write_direct 3 46363 _000553_hash NULL
83519 +_000554_hash smk_write_doi 3 49621 _000554_hash NULL
83520 +_000555_hash smk_write_load_list 3 52280 _000555_hash NULL
83521 +_000556_hash smk_write_logging 3 2618 _000556_hash NULL
83522 +_000557_hash smk_write_netlbladdr 3 42525 _000557_hash NULL
83523 +_000558_hash smk_write_onlycap 3 14400 _000558_hash NULL
83524 +_000559_hash snd_ctl_elem_user_tlv 3 11695 _000559_hash NULL
83525 +_000560_hash snd_emu10k1_fx8010_read 5 9605 _000560_hash NULL
83526 +_000561_hash snd_emu10k1_synth_copy_from_user 3-5 9061 _000561_hash NULL
83527 +_000563_hash snd_gus_dram_poke 4 18525 _000563_hash NULL
83528 +_000564_hash snd_hdsp_playback_copy 5 20676 _000564_hash NULL
83529 +_000565_hash snd_info_entry_write 3 63474 _000565_hash NULL
83530 +_000566_hash snd_korg1212_copy_from 6 36169 _000566_hash NULL
83531 +_000567_hash snd_mem_proc_write 3 9786 _000567_hash NULL
83532 +_000568_hash snd_midi_channel_init_set 1 30092 _000568_hash NULL
83533 +_000569_hash snd_midi_event_new 1 9893 _000750_hash NULL nohasharray
83534 +_000570_hash snd_opl4_mem_proc_write 5 9670 _000570_hash NULL
83535 +_000571_hash snd_pcm_aio_read 3 13900 _000571_hash NULL
83536 +_000572_hash snd_pcm_aio_write 3 28738 _000572_hash NULL
83537 +_000573_hash snd_pcm_oss_write1 3 10872 _000573_hash NULL
83538 +_000574_hash snd_pcm_oss_write2 3 27332 _000574_hash NULL
83539 +_000575_hash snd_rawmidi_kernel_write1 4 56847 _000575_hash NULL
83540 +_000576_hash snd_rme9652_playback_copy 5 20970 _000576_hash NULL
83541 +_000577_hash snd_sb_csp_load_user 3 45190 _000577_hash NULL
83542 +_000578_hash snd_usb_ctl_msg 8 8436 _000578_hash NULL
83543 +_000579_hash sock_bindtodevice 3 50942 _000579_hash NULL
83544 +_000580_hash sock_kmalloc 2 62205 _000580_hash NULL
83545 +_000581_hash spidev_write 3 44510 _000581_hash NULL
83546 +_000582_hash squashfs_read_table 3 16945 _000582_hash NULL
83547 +_000583_hash srpt_alloc_ioctx 2-3 51042 _000583_hash NULL
83548 +_000585_hash srpt_alloc_ioctx_ring 2 49330 _000585_hash NULL
83549 +_000586_hash st5481_setup_isocpipes 6-4 61340 _000586_hash NULL
83550 +_000587_hash sta_agg_status_write 3 45164 _000587_hash NULL
83551 +_000588_hash svc_setsockopt 5 36876 _000588_hash NULL
83552 +_000589_hash sys_add_key 4 61288 _000589_hash NULL
83553 +_000590_hash sys_modify_ldt 3 18824 _000590_hash NULL
83554 +_000591_hash sys_semtimedop 3 4486 _000591_hash NULL
83555 +_000592_hash sys_setdomainname 2 4373 _000592_hash NULL
83556 +_000593_hash sys_sethostname 2 42962 _000593_hash NULL
83557 +_000594_hash tda10048_writeregbulk 4 11050 _000594_hash NULL
83558 +_000595_hash tipc_log_resize 1 34803 _000595_hash NULL
83559 +_000596_hash tomoyo_write_self 3 45161 _000596_hash NULL
83560 +_000597_hash tower_write 3 8580 _000597_hash NULL
83561 +_000598_hash tpm_write 3 50798 _000598_hash NULL
83562 +_000599_hash trusted_instantiate 3 4710 _000599_hash NULL
83563 +_000600_hash trusted_update 3 12664 _000600_hash NULL
83564 +_000601_hash tt_changes_fill_buffer 3 62649 _000601_hash NULL
83565 +_000602_hash tty_buffer_alloc 2 45437 _000602_hash NULL
83566 +_000603_hash __tun_chr_ioctl 4 22300 _000603_hash NULL
83567 +_000604_hash ubi_more_leb_change_data 4 63534 _000604_hash NULL
83568 +_000605_hash ubi_more_update_data 4 39189 _000605_hash NULL
83569 +_000606_hash ubi_resize_volume 2 50172 _000606_hash NULL
83570 +_000607_hash udf_alloc_i_data 2 35786 _000607_hash NULL
83571 +_000608_hash uea_idma_write 3 64139 _000608_hash NULL
83572 +_000609_hash uea_request 4 47613 _000609_hash NULL
83573 +_000610_hash uea_send_modem_cmd 3 3888 _000610_hash NULL
83574 +_000611_hash uio_write 3 43202 _000611_hash NULL
83575 +_000612_hash um_idi_write 3 18293 _000612_hash NULL
83576 +_000613_hash us122l_ctl_msg 8 13330 _000613_hash NULL
83577 +_000614_hash usb_alloc_urb 1 43436 _000614_hash NULL
83578 +_000615_hash usblp_new_writeurb 2 22894 _000615_hash NULL
83579 +_000616_hash usblp_write 3 23178 _000616_hash NULL
83580 +_000617_hash usbtest_alloc_urb 3-5 34446 _000617_hash NULL
83581 +_000619_hash usbtmc_write 3 64340 _000619_hash NULL
83582 +_000620_hash user_instantiate 3 26131 _000620_hash NULL
83583 +_000621_hash user_update 3 41332 _000621_hash NULL
83584 +_000622_hash uvc_simplify_fraction 3 31303 _000622_hash NULL
83585 +_000623_hash uwb_rc_cmd_done 4 35892 _000623_hash NULL
83586 +_000624_hash uwb_rc_neh_grok_event 3 55799 _000624_hash NULL
83587 +_000625_hash v9fs_alloc_rdir_buf 2 42150 _000625_hash NULL
83588 +_000626_hash __vb2_perform_fileio 3 63033 _000626_hash NULL
83589 +_000627_hash vc_do_resize 3-4 48842 _000627_hash NULL
83590 +_000629_hash vcs_write 3 3910 _000629_hash NULL
83591 +_000630_hash vfd_write 3 14717 _000630_hash NULL
83592 +_000631_hash vga_arb_write 3 36112 _000631_hash NULL
83593 +_000632_hash vga_switcheroo_debugfs_write 3 33984 _000632_hash NULL
83594 +_000633_hash vhci_get_user 3 45039 _000633_hash NULL
83595 +_000634_hash video_proc_write 3 6724 _000634_hash NULL
83596 +_000635_hash vlsi_alloc_ring 3-4 57003 _000635_hash NULL
83597 +_000637_hash __vmalloc 1 61168 _000637_hash NULL
83598 +_000638_hash vmalloc_32 1 1135 _000638_hash NULL
83599 +_000639_hash vmalloc_32_user 1 37519 _000639_hash NULL
83600 +_000640_hash vmalloc_exec 1 36132 _000640_hash NULL
83601 +_000641_hash vmalloc_node 1 58700 _000641_hash NULL
83602 +_000642_hash __vmalloc_node_flags 1 30352 _000642_hash NULL
83603 +_000643_hash vmalloc_user 1 32308 _000643_hash NULL
83604 +_000644_hash vol_cdev_direct_write 3 20751 _000644_hash NULL
83605 +_000645_hash vp_request_msix_vectors 2 28849 _000645_hash NULL
83606 +_000646_hash vring_add_indirect 3-4 20737 _000646_hash NULL
83607 +_000648_hash vring_new_virtqueue 1 9671 _000648_hash NULL
83608 +_000649_hash vxge_os_dma_malloc 2 46184 _000649_hash NULL
83609 +_000650_hash vxge_os_dma_malloc_async 3 56348 _000650_hash NULL
83610 +_000651_hash wdm_write 3 53735 _000651_hash NULL
83611 +_000652_hash wiimote_hid_send 3 48528 _000652_hash NULL
83612 +_000653_hash wl1273_fm_fops_write 3 60621 _000653_hash NULL
83613 +_000654_hash wlc_phy_loadsampletable_nphy 3 64367 _000654_hash NULL
83614 +_000655_hash write 3 62671 _000655_hash NULL
83615 +_000656_hash write_flush 3 50803 _000656_hash NULL
83616 +_000657_hash write_rio 3 54837 _000657_hash NULL
83617 +_000658_hash x25_asy_change_mtu 2 26928 _000658_hash NULL
83618 +_000659_hash xdi_copy_from_user 4 8395 _000659_hash NULL
83619 +_000660_hash xfrm_dst_alloc_copy 3 3034 _000660_hash NULL
83620 +_000661_hash xfrm_user_policy 4 62573 _000661_hash NULL
83621 +_000662_hash xfs_attrmulti_attr_set 4 59346 _000662_hash NULL
83622 +_000663_hash xfs_handle_to_dentry 3 12135 _000663_hash NULL
83623 +_000664_hash __xip_file_write 3 2733 _000664_hash NULL
83624 +_000665_hash xprt_rdma_allocate 2 31372 _000665_hash NULL
83625 +_000666_hash zd_usb_iowrite16v_async 3 23984 _000666_hash NULL
83626 +_000667_hash zd_usb_read_fw 4 22049 _000667_hash NULL
83627 +_000668_hash zerocopy_sg_from_iovec 3 11828 _000668_hash NULL
83628 +_000669_hash zoran_write 3 22404 _000669_hash NULL
83629 +_000671_hash acpi_ex_allocate_name_string 2 7685 _002855_hash NULL nohasharray
83630 +_000672_hash acpi_os_allocate_zeroed 1 37422 _000672_hash NULL
83631 +_000673_hash acpi_ut_initialize_buffer 2 47143 _002314_hash NULL nohasharray
83632 +_000674_hash ad7879_spi_xfer 3 36311 _000674_hash NULL
83633 +_000675_hash add_new_gdb 3 27643 _000675_hash NULL
83634 +_000676_hash add_numbered_child 5 14273 _000676_hash NULL
83635 +_000677_hash add_res_range 4 21310 _000677_hash NULL
83636 +_000678_hash addtgt 3 54703 _000678_hash NULL
83637 +_000679_hash add_uuid 4 49831 _000679_hash NULL
83638 +_000680_hash afs_cell_alloc 2 24052 _000680_hash NULL
83639 +_000681_hash aggr_recv_addba_req_evt 4 38037 _000681_hash NULL
83640 +_000682_hash agp_create_memory 1 1075 _000682_hash NULL
83641 +_000683_hash agp_create_user_memory 1 62955 _000683_hash NULL
83642 +_000684_hash alg_setsockopt 5 20985 _000684_hash NULL
83643 +_000685_hash alloc_async 1 14208 _000685_hash NULL
83644 +_000686_hash ___alloc_bootmem_nopanic 1 53626 _000686_hash NULL
83645 +_000687_hash alloc_buf 1 34532 _000687_hash NULL
83646 +_000688_hash alloc_chunk 1 49575 _000688_hash NULL
83647 +_000689_hash alloc_context 1 41283 _000689_hash NULL
83648 +_000690_hash alloc_ctrl_packet 1 44667 _000690_hash NULL
83649 +_000691_hash alloc_data_packet 1 46698 _000691_hash NULL
83650 +_000692_hash alloc_dca_provider 2 59670 _000692_hash NULL
83651 +_000693_hash __alloc_dev_table 2 54343 _000693_hash NULL
83652 +_000694_hash alloc_ep 1 17269 _000694_hash NULL
83653 +_000695_hash __alloc_extent_buffer 3 15093 _000695_hash NULL
83654 +_000696_hash alloc_group_attrs 2 9194 _000719_hash NULL nohasharray
83655 +_000697_hash alloc_large_system_hash 2 64490 _000697_hash NULL
83656 +_000698_hash alloc_netdev_mqs 1 30030 _000698_hash NULL
83657 +_000699_hash __alloc_objio_seg 1 7203 _000699_hash NULL
83658 +_000700_hash alloc_ring 2-4 15345 _000700_hash NULL
83659 +_000701_hash alloc_ring 2-4 39151 _000701_hash NULL
83660 +_000704_hash alloc_session 1-2 64171 _000704_hash NULL
83661 +_000708_hash alloc_smp_req 1 51337 _000708_hash NULL
83662 +_000709_hash alloc_smp_resp 1 3566 _000709_hash NULL
83663 +_000710_hash alloc_ts_config 1 45775 _000710_hash NULL
83664 +_000711_hash alloc_upcall 2 62186 _000711_hash NULL
83665 +_000712_hash altera_drscan 2 48698 _000712_hash NULL
83666 +_000713_hash altera_irscan 2 62396 _000713_hash NULL
83667 +_000714_hash altera_set_dr_post 2 54291 _000714_hash NULL
83668 +_000715_hash altera_set_dr_pre 2 64862 _000715_hash NULL
83669 +_000716_hash altera_set_ir_post 2 20948 _000716_hash NULL
83670 +_000717_hash altera_set_ir_pre 2 54103 _000717_hash NULL
83671 +_000718_hash altera_swap_dr 2 50090 _000718_hash NULL
83672 +_000719_hash altera_swap_ir 2 9194 _000719_hash &_000696_hash
83673 +_000720_hash amd_create_gatt_pages 1 20537 _000720_hash NULL
83674 +_000721_hash aoechr_write 3 62883 _001352_hash NULL nohasharray
83675 +_000722_hash applesmc_create_nodes 2 49392 _000722_hash NULL
83676 +_000723_hash array_zalloc 1-2 7519 _000723_hash NULL
83677 +_000725_hash arvo_sysfs_read 6 31617 _000725_hash NULL
83678 +_000726_hash arvo_sysfs_write 6 3311 _000726_hash NULL
83679 +_000727_hash asd_store_update_bios 4 10165 _000727_hash NULL
83680 +_000728_hash ata_host_alloc 2 46094 _000728_hash NULL
83681 +_000729_hash atalk_sendmsg 4 21677 _000729_hash NULL
83682 +_000730_hash ath6kl_cfg80211_connect_event 7-9-8 13443 _000730_hash NULL
83683 +_000731_hash ath6kl_mgmt_tx 9 21153 _000731_hash NULL
83684 +_000732_hash ath6kl_wmi_roam_tbl_event_rx 3 43440 _000732_hash NULL
83685 +_000733_hash ath6kl_wmi_send_mgmt_cmd 7 17347 _000733_hash NULL
83686 +_000734_hash ath_descdma_setup 5 12257 _000734_hash NULL
83687 +_000735_hash ath_rx_edma_init 2 65483 _000735_hash NULL
83688 +_000736_hash ati_create_gatt_pages 1 4722 _003185_hash NULL nohasharray
83689 +_000737_hash au0828_init_isoc 2-3 61917 _000737_hash NULL
83690 +_000739_hash audit_init_entry 1 38644 _000739_hash NULL
83691 +_000740_hash ax25_sendmsg 4 62770 _000740_hash NULL
83692 +_000741_hash b1_alloc_card 1 36155 _000741_hash NULL
83693 +_000742_hash b43_nphy_load_samples 3 36481 _000742_hash NULL
83694 +_000743_hash bio_copy_user_iov 4 37660 _000743_hash NULL
83695 +_000744_hash __bio_map_kern 2-3 47379 _000744_hash NULL
83696 +_000746_hash blk_register_region 1-2 51424 _000746_hash NULL
83697 +_000748_hash bm_entry_write 3 28338 _000748_hash NULL
83698 +_000749_hash bm_realloc_pages 2 9431 _000749_hash NULL
83699 +_000750_hash bm_register_write 3 9893 _000750_hash &_000569_hash
83700 +_000751_hash bm_status_write 3 12964 _000751_hash NULL
83701 +_000752_hash br_mdb_rehash 2 42643 _000752_hash NULL
83702 +_000753_hash btrfs_copy_from_user 3 43806 _000753_hash NULL
83703 +_000754_hash btrfs_insert_delayed_dir_index 4 63720 _000754_hash NULL
83704 +_000755_hash __btrfs_map_block 3 49839 _000755_hash NULL
83705 +_000756_hash __c4iw_init_resource_fifo 3 8334 _000756_hash NULL
83706 +_000757_hash cache_downcall 3 13666 _000757_hash NULL
83707 +_000758_hash cache_slow_downcall 2 8570 _000758_hash NULL
83708 +_000759_hash ca_extend 2 64541 _000759_hash NULL
83709 +_000760_hash caif_seqpkt_sendmsg 4 22961 _000760_hash NULL
83710 +_000761_hash caif_stream_sendmsg 4 9110 _000761_hash NULL
83711 +_000762_hash carl9170_cmd_buf 3 950 _000762_hash NULL
83712 +_000763_hash cdev_add 2-3 38176 _000763_hash NULL
83713 +_000765_hash cdrom_read_cdda 4 50478 _000765_hash NULL
83714 +_000766_hash ceph_dns_resolve_name 1 62488 _000766_hash NULL
83715 +_000767_hash ceph_msgpool_get 2 54258 _000767_hash NULL
83716 +_000768_hash cfg80211_connect_result 4-6 56515 _000768_hash NULL
83717 +_000770_hash cfg80211_disconnected 4 57 _000770_hash NULL
83718 +_000771_hash cfg80211_inform_bss 8 19332 _000771_hash NULL
83719 +_000772_hash cfg80211_inform_bss_frame 4 41078 _000772_hash NULL
83720 +_000773_hash cfg80211_mlme_register_mgmt 5 19852 _000773_hash NULL
83721 +_000774_hash cfg80211_roamed_bss 4-6 50198 _000774_hash NULL
83722 +_000776_hash cifs_readdata_alloc 1 50318 _000776_hash NULL
83723 +_000777_hash cifs_readv_from_socket 3 19109 _000777_hash NULL
83724 +_000778_hash cifs_writedata_alloc 1 32880 _003119_hash NULL nohasharray
83725 +_000779_hash cnic_alloc_dma 3 34641 _000779_hash NULL
83726 +_000780_hash configfs_write_file 3 61621 _000780_hash NULL
83727 +_000781_hash construct_key 3 11329 _000781_hash NULL
83728 +_000782_hash context_alloc 3 24645 _000782_hash NULL
83729 +_000783_hash copy_to_user 3 57835 _000783_hash NULL
83730 +_000784_hash create_attr_set 1 22861 _000784_hash NULL
83731 +_000785_hash create_bounce_buffer 3 39155 _000785_hash NULL
83732 +_000786_hash create_gpadl_header 2 19064 _000786_hash NULL
83733 +_000787_hash _create_sg_bios 4 31244 _000787_hash NULL
83734 +_000788_hash cryptd_alloc_instance 2-3 18048 _000788_hash NULL
83735 +_000790_hash crypto_ahash_setkey 3 55134 _000790_hash NULL
83736 +_000791_hash crypto_alloc_instance2 3 25277 _000791_hash NULL
83737 +_000792_hash crypto_shash_setkey 3 60483 _000792_hash NULL
83738 +_000793_hash cx231xx_init_bulk 3-2 47024 _000793_hash NULL
83739 +_000794_hash cx231xx_init_isoc 2-3 56453 _000794_hash NULL
83740 +_000796_hash cx231xx_init_vbi_isoc 2-3 28053 _000796_hash NULL
83741 +_000798_hash cxgb_alloc_mem 1 24007 _000798_hash NULL
83742 +_000799_hash cxgbi_device_portmap_create 3 25747 _000799_hash NULL
83743 +_000800_hash cxgbi_device_register 1-2 36746 _000800_hash NULL
83744 +_000802_hash __cxio_init_resource_fifo 3 23447 _000802_hash NULL
83745 +_000803_hash dccp_sendmsg 4 56058 _000803_hash NULL
83746 +_000804_hash ddp_make_gl 1 12179 _000804_hash NULL
83747 +_000805_hash depth_write 3 3021 _000805_hash NULL
83748 +_000806_hash dev_irnet_write 3 11398 _000806_hash NULL
83749 +_000807_hash dev_set_alias 3 50084 _000807_hash NULL
83750 +_000808_hash dev_write 3 7708 _000808_hash NULL
83751 +_000809_hash dfs_global_file_write 3 6112 _000809_hash NULL
83752 +_000810_hash dgram_sendmsg 4 45679 _000810_hash NULL
83753 +_000811_hash disconnect 4 32521 _000811_hash NULL
83754 +_000812_hash dma_attach 6-7 50831 _000812_hash NULL
83755 +_000814_hash dn_sendmsg 4 38390 _000814_hash NULL
83756 +_000815_hash do_dccp_setsockopt 5 54377 _003160_hash NULL nohasharray
83757 +_000816_hash do_jffs2_setxattr 5 25910 _000816_hash NULL
83758 +_000817_hash do_msgsnd 4 1387 _000817_hash NULL
83759 +_000818_hash do_raw_setsockopt 5 55215 _000818_hash NULL
83760 +_000819_hash do_readv_writev 4 51849 _000819_hash NULL
83761 +_000820_hash do_sync 1 9604 _000820_hash NULL
83762 +_000821_hash dup_array 3 33551 _000821_hash NULL
83763 +_000822_hash dvb_audio_write 3 51275 _000822_hash NULL
83764 +_000823_hash dvb_ca_en50221_init 4 45718 _000823_hash NULL
83765 +_000824_hash dvb_video_write 3 754 _000824_hash NULL
83766 +_000825_hash econet_sendmsg 4 51430 _000825_hash NULL
83767 +_000826_hash ecryptfs_decode_and_decrypt_filename 5 10379 _000826_hash NULL
83768 +_000827_hash ecryptfs_encrypt_and_encode_filename 6 2109 _000827_hash NULL
83769 +_000828_hash ecryptfs_send_message_locked 2 31801 _000828_hash NULL
83770 +_000829_hash edac_device_alloc_ctl_info 1 5941 _000829_hash NULL
83771 +_000830_hash edac_mc_alloc 1 54846 _000830_hash NULL
83772 +_000831_hash edac_pci_alloc_ctl_info 1 63388 _000831_hash NULL
83773 +_000832_hash efivar_create_sysfs_entry 2 19485 _000832_hash NULL
83774 +_000833_hash em28xx_alloc_isoc 4 46892 _000833_hash NULL
83775 +_000834_hash enable_write 3 30456 _000834_hash NULL
83776 +_000835_hash enclosure_register 3 57412 _000835_hash NULL
83777 +_000836_hash ext4_kvzalloc 1 47605 _000836_hash NULL
83778 +_000837_hash extend_netdev_table 2 31680 _000837_hash NULL
83779 +_000838_hash __feat_register_sp 6 64712 _000838_hash NULL
83780 +_000839_hash __ffs_ep0_read_events 3 48868 _000839_hash NULL
83781 +_000840_hash ffs_ep0_write 3 9438 _000840_hash NULL
83782 +_000841_hash ffs_epfile_read 3 18775 _000841_hash NULL
83783 +_000842_hash ffs_epfile_write 3 48014 _000842_hash NULL
83784 +_000843_hash fib_info_hash_alloc 1 9075 _000843_hash NULL
83785 +_000844_hash fillonedir 3 41746 _000844_hash NULL
83786 +_000845_hash flexcop_device_kmalloc 1 54793 _000845_hash NULL
83787 +_000846_hash frame_alloc 4 15981 _000846_hash NULL
83788 +_000847_hash fw_node_create 2 9559 _000847_hash NULL
83789 +_000848_hash garmin_read_process 3 27509 _000848_hash NULL
83790 +_000849_hash garp_request_join 4 7471 _000849_hash NULL
83791 +_000850_hash get_derived_key 4 61100 _000850_hash NULL
83792 +_000851_hash get_entry 4 16003 _000851_hash NULL
83793 +_000852_hash get_free_de 2 33714 _000852_hash NULL
83794 +_000853_hash get_new_cssid 2 51665 _000853_hash NULL
83795 +_000854_hash getxattr 4 24398 _000854_hash NULL
83796 +_000855_hash gspca_dev_probe2 4 59833 _000855_hash NULL
83797 +_000856_hash hcd_alloc_coherent 5 55862 _000856_hash NULL
83798 +_000857_hash hci_sock_sendmsg 4 37420 _000857_hash NULL
83799 +_000858_hash hid_register_field 2-3 4874 _000858_hash NULL
83800 +_000860_hash hid_report_raw_event 4 7024 _000860_hash NULL
83801 +_000861_hash hpi_alloc_control_cache 1 35351 _000861_hash NULL
83802 +_000862_hash hugetlbfs_read_actor 2-5-4 34547 _000862_hash NULL
83803 +_000865_hash hvc_alloc 4 12579 _000865_hash NULL
83804 +_000866_hash __hwahc_dev_set_key 5 46328 _000866_hash NULL
83805 +_000867_hash i2400m_zrealloc_2x 3 54166 _001430_hash NULL nohasharray
83806 +_000868_hash ib_alloc_device 1 26483 _000868_hash NULL
83807 +_000869_hash ib_create_send_mad 5 1196 _000869_hash NULL
83808 +_000870_hash ibmasm_new_command 2 25714 _000870_hash NULL
83809 +_000871_hash ib_send_cm_drep 3 50186 _000871_hash NULL
83810 +_000872_hash ib_send_cm_mra 4 60202 _000872_hash NULL
83811 +_000873_hash ib_send_cm_rtu 3 63138 _000873_hash NULL
83812 +_000874_hash ieee80211_key_alloc 3 19065 _000874_hash NULL
83813 +_000875_hash ieee80211_mgmt_tx 9 46860 _000875_hash NULL
83814 +_000876_hash ieee80211_send_probe_req 6-4 6924 _000876_hash NULL
83815 +_000877_hash if_writecmd 2 815 _000877_hash NULL
83816 +_000878_hash init_bch 1-2 64130 _000878_hash NULL
83817 +_000880_hash init_ipath 1 48187 _000880_hash NULL
83818 +_000881_hash init_list_set 2-3 39188 _000881_hash NULL
83819 +_000883_hash init_q 4 132 _000883_hash NULL
83820 +_000884_hash init_state 2 60165 _000884_hash NULL
83821 +_000885_hash init_tag_map 3 57515 _000885_hash NULL
83822 +_000886_hash input_ff_create 2 21240 _000886_hash NULL
83823 +_000887_hash input_mt_init_slots 2 31183 _000887_hash NULL
83824 +_000888_hash interfaces 2 38859 _000888_hash NULL
83825 +_000889_hash ioat2_alloc_ring 2 11172 _000889_hash NULL
83826 +_000890_hash ip_generic_getfrag 3-4 12187 _000890_hash NULL
83827 +_000892_hash ipr_alloc_ucode_buffer 1 40199 _000892_hash NULL
83828 +_000893_hash ip_set_alloc 1 57953 _000893_hash NULL
83829 +_000894_hash ipv6_flowlabel_opt 3 58135 _001125_hash NULL nohasharray
83830 +_000895_hash ipv6_renew_options 5 28867 _000895_hash NULL
83831 +_000896_hash ipxrtr_route_packet 4 54036 _000896_hash NULL
83832 +_000897_hash irda_sendmsg 4 4388 _000897_hash NULL
83833 +_000898_hash irda_sendmsg_dgram 4 38563 _000898_hash NULL
83834 +_000899_hash irda_sendmsg_ultra 4 42047 _000899_hash NULL
83835 +_000900_hash irias_add_octseq_attrib 4 29983 _000900_hash NULL
83836 +_000901_hash irq_alloc_generic_chip 2 26650 _000901_hash NULL
83837 +_000902_hash irq_domain_add_linear 2 29236 _000902_hash NULL
83838 +_000903_hash iscsi_alloc_session 3 49390 _000903_hash NULL
83839 +_000904_hash iscsi_create_conn 2 50425 _000904_hash NULL
83840 +_000905_hash iscsi_create_endpoint 1 15193 _000905_hash NULL
83841 +_000906_hash iscsi_create_iface 5 38510 _000906_hash NULL
83842 +_000907_hash iscsi_decode_text_input 4 58292 _000907_hash NULL
83843 +_000908_hash iscsi_pool_init 2-4 54913 _000908_hash NULL
83844 +_000910_hash iscsit_dump_data_payload 2 38683 _000910_hash NULL
83845 +_000911_hash isdn_write 3 45863 _000911_hash NULL
83846 +_000912_hash isku_receive 4 54130 _000912_hash NULL
83847 +_000913_hash isku_send 4 41542 _000913_hash NULL
83848 +_000914_hash islpci_mgt_transaction 5 23610 _000914_hash NULL
83849 +_000915_hash iso_sched_alloc 1 13377 _002079_hash NULL nohasharray
83850 +_000916_hash ivtv_v4l2_write 3 39226 _000916_hash NULL
83851 +_000917_hash iwl_trans_txq_alloc 3 36147 _000917_hash NULL
83852 +_000918_hash iwmct_fw_parser_init 4 37876 _000918_hash NULL
83853 +_000919_hash iwm_notif_send 6 12295 _000919_hash NULL
83854 +_000920_hash iwm_ntf_calib_res 3 11686 _000920_hash NULL
83855 +_000921_hash iwm_umac_set_config_var 4 17320 _000921_hash NULL
83856 +_000922_hash ixgbe_alloc_q_vector 3-5 45428 _000922_hash NULL
83857 +_000924_hash jbd2_journal_init_revoke 2 51088 _000924_hash NULL
83858 +_000925_hash jffs2_write_dirent 5 37311 _000925_hash NULL
83859 +_000926_hash journal_init_revoke 2 56933 _000926_hash NULL
83860 +_000927_hash keyctl_instantiate_key 3 41855 _000927_hash NULL
83861 +_000928_hash keyctl_instantiate_key_iov 3 16969 _000928_hash NULL
83862 +_000929_hash __kfifo_from_user 3 20399 _000929_hash NULL
83863 +_000930_hash kimage_crash_alloc 3 3233 _000930_hash NULL
83864 +_000931_hash kimage_normal_alloc 3 31140 _000931_hash NULL
83865 +_000932_hash kmem_realloc 2 37489 _000932_hash NULL
83866 +_000933_hash kmem_zalloc 1 11510 _000933_hash NULL
83867 +_000934_hash koneplus_send 4 18226 _000934_hash NULL
83868 +_000935_hash koneplus_sysfs_read 6 42792 _000935_hash NULL
83869 +_000936_hash kovaplus_send 4 10009 _000936_hash NULL
83870 +_000937_hash kvm_read_guest_page_mmu 6 37611 _000937_hash NULL
83871 +_000938_hash kvm_set_irq_routing 3 48704 _000938_hash NULL
83872 +_000939_hash kvm_write_guest_cached 4 11106 _000939_hash NULL
83873 +_000940_hash kvm_write_guest_page 5 63555 _002809_hash NULL nohasharray
83874 +_000941_hash l2cap_skbuff_fromiovec 3-4 35003 _000941_hash NULL
83875 +_000943_hash l2tp_ip_sendmsg 4 50411 _000943_hash NULL
83876 +_000944_hash l2tp_session_create 1 25286 _000944_hash NULL
83877 +_000945_hash lc_create 3 48662 _000945_hash NULL
83878 +_000946_hash leaf_dealloc 3 29566 _000946_hash NULL
83879 +_000947_hash linear_conf 2 23485 _000947_hash NULL
83880 +_000948_hash lirc_buffer_init 2-3 53282 _000948_hash NULL
83881 +_000950_hash llc_ui_sendmsg 4 24987 _000950_hash NULL
83882 +_000951_hash lpfc_sli4_queue_alloc 3 62646 _000951_hash NULL
83883 +_000952_hash mce_request_packet 3 1073 _000952_hash NULL
83884 +_000953_hash mdiobus_alloc_size 1 52259 _000953_hash NULL
83885 +_000954_hash media_entity_init 2-4 15870 _001556_hash NULL nohasharray
83886 +_000956_hash memstick_alloc_host 1 142 _000956_hash NULL
83887 +_000957_hash mesh_table_alloc 1 22305 _000957_hash NULL
83888 +_000958_hash mfd_add_devices 4 56753 _000958_hash NULL
83889 +_000959_hash mISDN_sock_sendmsg 4 41035 _000959_hash NULL
83890 +_000960_hash mmc_alloc_host 1 48097 _000960_hash NULL
83891 +_000961_hash mmc_test_alloc_mem 3 28102 _000961_hash NULL
83892 +_000962_hash mpi_alloc 1 18094 _000962_hash NULL
83893 +_000963_hash mpihelp_mul_karatsuba_case 5-3 23918 _000963_hash NULL
83894 +_000964_hash mpihelp_mul_n 4 16405 _000964_hash NULL
83895 +_000965_hash mpi_set_bit 2 15104 _000965_hash NULL
83896 +_000966_hash mpi_set_highbit 2 37327 _001420_hash NULL nohasharray
83897 +_000967_hash mtd_concat_create 2 14416 _000967_hash NULL
83898 +_000968_hash mvumi_alloc_mem_resource 3 47750 _000968_hash NULL
83899 +_000969_hash mwifiex_11n_create_rx_reorder_tbl 4 63806 _000969_hash NULL
83900 +_000970_hash mwifiex_alloc_sdio_mpa_buffers 2-3 60961 _000970_hash NULL
83901 +_000972_hash mwl8k_cmd_set_beacon 4 23110 _000972_hash NULL
83902 +_000973_hash neigh_hash_alloc 1 17595 _000973_hash NULL
83903 +_000974_hash netlink_sendmsg 4 33708 _001172_hash NULL nohasharray
83904 +_000975_hash netxen_alloc_sds_rings 2 13417 _000975_hash NULL
83905 +_000976_hash new_bind_ctl 2 35324 _000976_hash NULL
83906 +_000977_hash new_dir 3 31919 _000977_hash NULL
83907 +_000978_hash new_tape_buffer 2 32866 _000978_hash NULL
83908 +_000979_hash nfc_llcp_build_tlv 3 19536 _000979_hash NULL
83909 +_000980_hash nfc_llcp_send_i_frame 3 59130 _000980_hash NULL
83910 +_000981_hash nfs4_alloc_slots 1 2454 _000981_hash NULL
83911 +_000982_hash nfsctl_transaction_write 3 64800 _000982_hash NULL
83912 +_000983_hash nfs_idmap_request_key 3 30208 _000983_hash NULL
83913 +_000984_hash nfs_readdata_alloc 1 9990 _000984_hash NULL
83914 +_000985_hash nfs_writedata_alloc 1 62868 _000985_hash NULL
83915 +_000986_hash nl_pid_hash_zalloc 1 23314 _000986_hash NULL
83916 +_000987_hash nr_sendmsg 4 53656 _000987_hash NULL
83917 +_000988_hash nsm_create_handle 4 38060 _000988_hash NULL
83918 +_000989_hash ntfs_copy_from_user_iovec 3-6 49829 _000989_hash NULL
83919 +_000991_hash ntfs_file_buffered_write 4-6 41442 _000991_hash NULL
83920 +_000993_hash __ntfs_malloc 1 34022 _000993_hash NULL
83921 +_000994_hash nvme_alloc_queue 3 46865 _000994_hash NULL
83922 +_000995_hash ocfs2_acl_from_xattr 2 21604 _000995_hash NULL
83923 +_000996_hash ocfs2_control_message 3 19564 _000996_hash NULL
83924 +_000997_hash opera1_usb_i2c_msgxfer 4 64521 _000997_hash NULL
83925 +_000998_hash _ore_get_io_state 3 2166 _000998_hash NULL
83926 +_000999_hash orig_hash_add_if 2 53676 _000999_hash NULL
83927 +_001000_hash orig_hash_del_if 2 45080 _001000_hash NULL
83928 +_001001_hash orinoco_set_key 5-7 17878 _001001_hash NULL
83929 +_001003_hash osdmap_set_max_osd 2 57630 _001003_hash NULL
83930 +_001004_hash _osd_realloc_seg 3 54352 _001004_hash NULL
83931 +_001005_hash OSDSetBlock 2-4 38986 _001005_hash NULL
83932 +_001007_hash osst_execute 7-6 17607 _001007_hash NULL
83933 +_001008_hash osst_write 3 31581 _001008_hash NULL
83934 +_001009_hash otp_read 2-5-4 10594 _001009_hash NULL
83935 +_001012_hash ovs_vport_alloc 1 33475 _001012_hash NULL
83936 +_001013_hash packet_sendmsg_spkt 4 28885 _001013_hash NULL
83937 +_001014_hash pair_device 4 61175 _001708_hash NULL nohasharray
83938 +_001015_hash pccard_store_cis 6 18176 _001015_hash NULL
83939 +_001016_hash pci_add_cap_save_buffer 3 3426 _001016_hash NULL
83940 +_001017_hash pcnet32_realloc_rx_ring 3 36598 _001017_hash NULL
83941 +_001018_hash pcnet32_realloc_tx_ring 3 38428 _001018_hash NULL
83942 +_001019_hash pcpu_mem_zalloc 1 22948 _001019_hash NULL
83943 +_001020_hash pep_sendmsg 4 62524 _001020_hash NULL
83944 +_001021_hash pfkey_sendmsg 4 47394 _001021_hash NULL
83945 +_001022_hash pidlist_resize 2 496 _001022_hash NULL
83946 +_001023_hash pin_code_reply 4 46510 _001023_hash NULL
83947 +_001024_hash ping_getfrag 3-4 8360 _001024_hash NULL
83948 +_001026_hash pipe_set_size 2 5204 _001026_hash NULL
83949 +_001027_hash pkt_bio_alloc 1 48284 _001027_hash NULL
83950 +_001028_hash platform_create_bundle 4-6 12785 _001028_hash NULL
83951 +_001030_hash play_iframe 3 8219 _001030_hash NULL
83952 +_001031_hash pm8001_store_update_fw 4 55716 _001031_hash NULL
83953 +_001032_hash pmcraid_alloc_sglist 1 9864 _001032_hash NULL
83954 +_001033_hash pn533_dep_link_up 5 7659 _001033_hash NULL
83955 +_001034_hash pnp_alloc 1 24869 _001419_hash NULL nohasharray
83956 +_001035_hash pn_sendmsg 4 12640 _001035_hash NULL
83957 +_001036_hash pppoe_sendmsg 4 48039 _001036_hash NULL
83958 +_001037_hash pppol2tp_sendmsg 4 56420 _001037_hash NULL
83959 +_001038_hash process_vm_rw 3-5 47533 _001038_hash NULL
83960 +_001040_hash process_vm_rw_single_vec 1-2 26213 _001040_hash NULL
83961 +_001042_hash proc_write 3 51003 _001042_hash NULL
83962 +_001043_hash profile_load 3 58267 _001043_hash NULL
83963 +_001044_hash profile_remove 3 8556 _001044_hash NULL
83964 +_001045_hash profile_replace 3 14652 _001045_hash NULL
83965 +_001046_hash pscsi_get_bio 1 56103 _001046_hash NULL
83966 +_001047_hash pyra_send 4 12061 _001047_hash NULL
83967 +_001048_hash qc_capture 3 19298 _001048_hash NULL
83968 +_001049_hash qla4xxx_alloc_work 2 44813 _001049_hash NULL
83969 +_001050_hash qlcnic_alloc_msix_entries 2 46160 _001050_hash NULL
83970 +_001051_hash qlcnic_alloc_sds_rings 2 26795 _001051_hash NULL
83971 +_001052_hash queue_received_packet 5 9657 _001052_hash NULL
83972 +_001053_hash raw_send_hdrinc 4 58803 _001053_hash NULL
83973 +_001054_hash raw_sendmsg 4 23078 _001054_hash &_000022_hash
83974 +_001055_hash rawsock_sendmsg 4 60010 _001055_hash NULL
83975 +_001056_hash rawv6_send_hdrinc 3 35425 _001056_hash NULL
83976 +_001057_hash rb_alloc 1 3102 _001057_hash NULL
83977 +_001058_hash rbd_alloc_coll 1 33678 _001058_hash NULL
83978 +_001059_hash rbd_create_rw_ops 2 4605 _001059_hash NULL
83979 +_001060_hash rds_ib_inc_copy_to_user 3 55007 _001060_hash NULL
83980 +_001061_hash rds_iw_inc_copy_to_user 3 29214 _001061_hash NULL
83981 +_001062_hash rds_message_alloc 1 10517 _001062_hash NULL
83982 +_001063_hash rds_message_copy_from_user 3 45510 _001063_hash NULL
83983 +_001064_hash rds_message_inc_copy_to_user 3 26540 _001064_hash NULL
83984 +_001065_hash redrat3_transmit_ir 3 64244 _001065_hash NULL
83985 +_001066_hash regcache_rbtree_insert_to_block 5 58009 _001066_hash NULL
83986 +_001067_hash _regmap_raw_write 4 42652 _001067_hash NULL
83987 +_001068_hash regmap_register_patch 3 21681 _001068_hash NULL
83988 +_001069_hash relay_alloc_page_array 1 52735 _001069_hash NULL
83989 +_001070_hash remove_uuid 4 64505 _001070_hash NULL
83990 +_001071_hash reshape_ring 2 29147 _001071_hash NULL
83991 +_001072_hash RESIZE_IF_NEEDED 2 56286 _001072_hash NULL
83992 +_001073_hash resize_stripes 2 61650 _001073_hash NULL
83993 +_001074_hash rfcomm_sock_sendmsg 4 37661 _001074_hash NULL
83994 +_001075_hash rose_sendmsg 4 20249 _001075_hash NULL
83995 +_001076_hash rxrpc_send_data 5 21553 _001076_hash NULL
83996 +_001077_hash rxrpc_setsockopt 5 50286 _001077_hash NULL
83997 +_001078_hash saa7146_vmalloc_build_pgtable 2 19780 _001078_hash NULL
83998 +_001079_hash saa7164_buffer_alloc_user 2 9627 _001079_hash NULL
83999 +_001081_hash sco_send_frame 3 41815 _001081_hash NULL
84000 +_001082_hash scsi_host_alloc 2 63041 _001082_hash NULL
84001 +_001083_hash scsi_tgt_kspace_exec 8 9522 _001083_hash NULL
84002 +_001084_hash sctp_sendmsg 4 61919 _001084_hash NULL
84003 +_001085_hash sctp_setsockopt 5 44788 _001085_hash NULL
84004 +_001086_hash sctp_setsockopt_connectx 3 6073 _001086_hash NULL
84005 +_001087_hash sctp_setsockopt_connectx_old 3 22631 _001087_hash NULL
84006 +_001088_hash sctp_tsnmap_init 2 36446 _001088_hash NULL
84007 +_001089_hash sctp_user_addto_chunk 2-3 62047 _001089_hash NULL
84008 +_001091_hash security_context_to_sid 2 19839 _001091_hash NULL
84009 +_001092_hash security_context_to_sid_default 2 3492 _001092_hash NULL
84010 +_001093_hash security_context_to_sid_force 2 20724 _001093_hash NULL
84011 +_001094_hash selinux_transaction_write 3 59038 _001094_hash NULL
84012 +_001095_hash sel_write_access 3 51704 _001095_hash NULL
84013 +_001096_hash sel_write_create 3 11353 _001096_hash NULL
84014 +_001097_hash sel_write_member 3 28800 _001097_hash NULL
84015 +_001098_hash sel_write_relabel 3 55195 _001098_hash NULL
84016 +_001099_hash sel_write_user 3 45060 _001099_hash NULL
84017 +_001100_hash __seq_open_private 3 40715 _001100_hash NULL
84018 +_001101_hash serverworks_create_gatt_pages 1 46582 _001101_hash NULL
84019 +_001102_hash set_connectable 4 56458 _001102_hash NULL
84020 +_001103_hash set_dev_class 4 39645 _001697_hash NULL nohasharray
84021 +_001104_hash set_discoverable 4 48141 _001104_hash NULL
84022 +_001105_hash setkey 3 14987 _001105_hash NULL
84023 +_001106_hash set_le 4 30581 _001106_hash NULL
84024 +_001107_hash set_link_security 4 4502 _001107_hash NULL
84025 +_001108_hash set_local_name 4 55757 _001108_hash NULL
84026 +_001109_hash set_powered 4 12129 _001109_hash NULL
84027 +_001110_hash set_ssp 4 62411 _001110_hash NULL
84028 +_001111_hash sg_build_sgat 3 60179 _001111_hash &_000305_hash
84029 +_001112_hash sg_read_oxfer 3 51724 _001112_hash NULL
84030 +_001113_hash shmem_xattr_set 4 11843 _001113_hash NULL
84031 +_001114_hash simple_alloc_urb 3 60420 _001114_hash NULL
84032 +_001115_hash sisusb_send_bridge_packet 2 11649 _001115_hash NULL
84033 +_001116_hash sisusb_send_packet 2 20891 _001116_hash NULL
84034 +_001117_hash skb_add_data_nocache 4 4682 _001117_hash NULL
84035 +_001118_hash skb_copy_datagram_from_iovec 2-5-4 52014 _001118_hash NULL
84036 +_001121_hash skb_copy_to_page_nocache 6 58624 _001121_hash NULL
84037 +_001122_hash sk_chk_filter 2 42095 _001122_hash NULL
84038 +_001123_hash skcipher_sendmsg 4 30290 _001123_hash NULL
84039 +_001124_hash sl_change_mtu 2 7396 _001124_hash NULL
84040 +_001125_hash slhc_init 1-2 58135 _001125_hash &_000894_hash
84041 +_001127_hash sm501_create_subdev 3-4 48668 _001127_hash NULL
84042 +_001129_hash smk_write_access 3 49561 _001129_hash NULL
84043 +_001130_hash snapshot_write 3 28351 _001130_hash NULL
84044 +_001131_hash snd_ac97_pcm_assign 2 30218 _001131_hash NULL
84045 +_001132_hash snd_card_create 4 64418 _001411_hash NULL nohasharray
84046 +_001133_hash snd_emux_create_port 3 42533 _001133_hash NULL
84047 +_001134_hash snd_gus_dram_write 4 38784 _001134_hash NULL
84048 +_001135_hash snd_midi_channel_alloc_set 1 28153 _001135_hash NULL
84049 +_001136_hash _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 _001136_hash NULL
84050 +_001137_hash snd_pcm_oss_sync1 2 45298 _001137_hash NULL
84051 +_001138_hash snd_pcm_oss_write 3 38108 _001138_hash NULL
84052 +_001139_hash snd_pcm_plugin_build 5 25505 _001139_hash NULL
84053 +_001140_hash snd_rawmidi_kernel_write 3 25106 _001140_hash NULL
84054 +_001141_hash snd_rawmidi_write 3 28008 _001141_hash NULL
84055 +_001142_hash snd_rme32_playback_copy 5 43732 _001142_hash NULL
84056 +_001143_hash snd_rme96_playback_copy 5 13111 _001143_hash NULL
84057 +_001144_hash snd_seq_device_new 4 31753 _001144_hash NULL
84058 +_001145_hash snd_seq_oss_readq_new 2 14283 _001145_hash NULL
84059 +_001146_hash snd_vx_create 4 40948 _001146_hash NULL
84060 +_001147_hash sock_setsockopt 5 50088 _001147_hash NULL
84061 +_001148_hash sound_write 3 5102 _001148_hash NULL
84062 +_001149_hash _sp2d_alloc 1 16944 _001149_hash NULL
84063 +_001150_hash spi_alloc_master 2 45223 _001150_hash NULL
84064 +_001151_hash spidev_message 3 5518 _001151_hash NULL
84065 +_001152_hash spi_register_board_info 2 35651 _001152_hash NULL
84066 +_001153_hash squashfs_cache_init 2 41656 _001153_hash NULL
84067 +_001154_hash squashfs_read_data 6 59440 _001154_hash NULL
84068 +_001155_hash srp_alloc_iu 2 44227 _001155_hash NULL
84069 +_001156_hash srp_iu_pool_alloc 2 17920 _001156_hash NULL
84070 +_001157_hash srp_ring_alloc 2 26760 _001157_hash NULL
84071 +_001159_hash start_isoc_chain 2 565 _001159_hash NULL
84072 +_001160_hash stk_prepare_sio_buffers 2 57168 _001160_hash NULL
84073 +_001161_hash store_iwmct_log_level 4 60209 _001161_hash NULL
84074 +_001162_hash store_iwmct_log_level_fw 4 1974 _001162_hash NULL
84075 +_001163_hash st_write 3 16874 _001163_hash NULL
84076 +_001164_hash svc_pool_map_alloc_arrays 2 47181 _001164_hash NULL
84077 +_001165_hash symtab_init 2 61050 _001165_hash NULL
84078 +_001166_hash sys_bind 3 10799 _001166_hash NULL
84079 +_001167_hash sys_connect 3 15291 _001167_hash NULL
84080 +_001168_hash sys_flistxattr 3 41407 _001168_hash NULL
84081 +_001169_hash sys_fsetxattr 4 49736 _001169_hash NULL
84082 +_001170_hash sysfs_write_file 3 57116 _001170_hash NULL
84083 +_001171_hash sys_ipc 3 4889 _001171_hash NULL
84084 +_001172_hash sys_keyctl 4 33708 _001172_hash &_000974_hash
84085 +_001173_hash sys_listxattr 3 27833 _001173_hash NULL
84086 +_001174_hash sys_llistxattr 3 4532 _001174_hash NULL
84087 +_001175_hash sys_lsetxattr 4 61177 _001175_hash NULL
84088 +_001176_hash sys_mq_timedsend 3 57661 _001176_hash NULL
84089 +_001177_hash sys_sched_setaffinity 2 32046 _001177_hash NULL
84090 +_001178_hash sys_semop 3 39457 _001178_hash NULL
84091 +_001179_hash sys_sendto 6 20809 _001179_hash NULL
84092 +_001180_hash sys_setxattr 4 37880 _001180_hash NULL
84093 +_001181_hash t4_alloc_mem 1 32342 _001181_hash NULL
84094 +_001182_hash tcf_hash_create 4 54360 _001182_hash NULL
84095 +_001183_hash __team_options_register 3 63941 _001183_hash NULL
84096 +_001184_hash test_unaligned_bulk 3 52333 _001184_hash NULL
84097 +_001185_hash tifm_alloc_adapter 1 10903 _001185_hash NULL
84098 +_001186_hash timeout_write 3 50991 _001186_hash NULL
84099 +_001187_hash tipc_link_send_sections_fast 4 37920 _001187_hash NULL
84100 +_001188_hash tipc_subseq_alloc 1 5957 _001188_hash NULL
84101 +_001189_hash tm6000_read_write_usb 7 50774 _002917_hash NULL nohasharray
84102 +_001190_hash tnode_alloc 1 49407 _001190_hash NULL
84103 +_001191_hash tomoyo_commit_ok 2 20167 _001191_hash NULL
84104 +_001192_hash tomoyo_scan_bprm 2-4 15642 _001192_hash NULL
84105 +_001194_hash tps65910_i2c_write 3 39531 _001194_hash NULL
84106 +_001195_hash ts_write 3 64336 _001195_hash NULL
84107 +_001196_hash ttusb2_msg 4 3100 _001196_hash NULL
84108 +_001197_hash tty_write 3 5494 _001197_hash NULL
84109 +_001198_hash ubi_dbg_check_all_ff 4 59810 _001198_hash NULL
84110 +_001199_hash ubi_dbg_check_write 5 48525 _001199_hash NULL
84111 +_001200_hash ubifs_setxattr 4 59650 _001370_hash NULL nohasharray
84112 +_001201_hash udf_sb_alloc_partition_maps 2 62313 _001201_hash NULL
84113 +_001202_hash udplite_getfrag 3-4 14479 _001202_hash NULL
84114 +_001204_hash ulong_write_file 3 26485 _001204_hash NULL
84115 +_001205_hash unix_dgram_sendmsg 4 45699 _001205_hash NULL
84116 +_001206_hash unix_stream_sendmsg 4 61455 _001206_hash NULL
84117 +_001207_hash unlink_queued 3-4 645 _001207_hash NULL
84118 +_001208_hash update_pmkid 4 2481 _001208_hash NULL
84119 +_001209_hash usb_alloc_coherent 2 65444 _001209_hash NULL
84120 +_001210_hash uvc_alloc_buffers 2 9656 _001210_hash NULL
84121 +_001211_hash uvc_alloc_entity 3-4 20836 _001211_hash NULL
84122 +_001212_hash v4l2_ctrl_new 7 38725 _001212_hash NULL
84123 +_001213_hash v4l2_event_subscribe 3 19510 _001213_hash NULL
84124 +_001214_hash vb2_read 3 42703 _001214_hash NULL
84125 +_001215_hash vb2_write 3 31948 _001215_hash NULL
84126 +_001216_hash vc_resize 2-3 3585 _001216_hash NULL
84127 +_001218_hash __vhost_add_used_n 3 26554 _001218_hash NULL
84128 +_001219_hash __videobuf_alloc_vb 1 27062 _001219_hash NULL
84129 +_001220_hash videobuf_dma_init_kernel 3 6963 _001220_hash NULL
84130 +_001221_hash virtqueue_add_buf 3-4 59470 _001221_hash NULL
84131 +_001223_hash vmalloc 1 15464 _001223_hash NULL
84132 +_001224_hash vmalloc_to_sg 2 58354 _001224_hash NULL
84133 +_001225_hash vol_cdev_write 3 40915 _001225_hash NULL
84134 +_001226_hash vxge_device_register 4 7752 _001226_hash NULL
84135 +_001227_hash __vxge_hw_channel_allocate 3 55462 _001227_hash NULL
84136 +_001228_hash vzalloc 1 47421 _001228_hash NULL
84137 +_001229_hash vzalloc_node 1 23424 _001229_hash NULL
84138 +_001230_hash wa_nep_queue 2 8858 _001230_hash NULL
84139 +_001231_hash __wa_xfer_setup_segs 2 56725 _001231_hash NULL
84140 +_001232_hash wiphy_new 2 2482 _001232_hash NULL
84141 +_001233_hash wpan_phy_alloc 1 48056 _001233_hash NULL
84142 +_001234_hash wusb_ccm_mac 7 32199 _001234_hash NULL
84143 +_001235_hash x25_sendmsg 4 12487 _001235_hash NULL
84144 +_001236_hash xfrm_hash_alloc 1 10997 _001236_hash NULL
84145 +_001237_hash _xfs_buf_get_pages 2 46811 _001237_hash NULL
84146 +_001238_hash xfs_da_buf_make 1 55845 _001238_hash NULL
84147 +_001239_hash xfs_da_grow_inode_int 3 21785 _001239_hash NULL
84148 +_001240_hash xfs_dir_cilookup_result 3 64288 _003139_hash NULL nohasharray
84149 +_001241_hash xfs_iext_add_indirect_multi 3 32400 _001241_hash NULL
84150 +_001242_hash xfs_iext_inline_to_direct 2 12384 _001242_hash NULL
84151 +_001243_hash xfs_iroot_realloc 2 46826 _001243_hash NULL
84152 +_001244_hash xhci_alloc_stream_info 3 63902 _001244_hash NULL
84153 +_001245_hash xlog_recover_add_to_trans 4 62839 _001245_hash NULL
84154 +_001246_hash xprt_alloc 2 1475 _001246_hash NULL
84155 +_001247_hash xt_alloc_table_info 1 57903 _001247_hash NULL
84156 +_001248_hash _zd_iowrite32v_async_locked 3 39034 _001248_hash NULL
84157 +_001249_hash zd_usb_iowrite16v 3 49744 _001249_hash NULL
84158 +_001250_hash acpi_ds_build_internal_package_obj 3 58271 _001250_hash NULL
84159 +_001251_hash acpi_system_read_event 3 55362 _001251_hash NULL
84160 +_001252_hash acpi_ut_create_buffer_object 1 42030 _001252_hash NULL
84161 +_001253_hash acpi_ut_create_package_object 1 17594 _001253_hash NULL
84162 +_001254_hash acpi_ut_create_string_object 1 15360 _001254_hash NULL
84163 +_001255_hash ad7879_spi_multi_read 3 8218 _001255_hash NULL
84164 +_001256_hash add_child 4 45201 _001256_hash NULL
84165 +_001257_hash add_port 2 54941 _001257_hash NULL
84166 +_001258_hash adu_read 3 24177 _001258_hash NULL
84167 +_001259_hash afs_cell_create 2 27346 _001259_hash NULL
84168 +_001260_hash agp_generic_alloc_user 1 9470 _001260_hash NULL
84169 +_001261_hash alloc_agpphysmem_i8xx 1 39427 _001261_hash NULL
84170 +_001262_hash allocate_cnodes 1 5329 _001262_hash NULL
84171 +_001263_hash ___alloc_bootmem 1 11410 _001263_hash NULL
84172 +_001264_hash __alloc_bootmem_nopanic 1 65397 _001264_hash NULL
84173 +_001265_hash alloc_bulk_urbs_generic 5 12127 _001265_hash NULL
84174 +_001266_hash alloc_candev 1-2 7776 _001266_hash NULL
84175 +_001268_hash ____alloc_ei_netdev 1 51475 _001268_hash NULL
84176 +_001269_hash alloc_etherdev_mqs 1 36450 _001269_hash NULL
84177 +_001270_hash alloc_extent_buffer 3 52824 _001270_hash NULL
84178 +_001271_hash alloc_fcdev 1 18780 _001271_hash NULL
84179 +_001272_hash alloc_fddidev 1 15382 _001272_hash NULL
84180 +_001273_hash alloc_hippi_dev 1 51320 _001273_hash NULL
84181 +_001274_hash alloc_irdadev 1 19140 _001274_hash NULL
84182 +_001275_hash alloc_ltalkdev 1 38071 _001275_hash NULL
84183 +_001276_hash alloc_one_pg_vec_page 1 10747 _001276_hash NULL
84184 +_001277_hash alloc_orinocodev 1 21371 _001277_hash NULL
84185 +_001279_hash alloc_trdev 1 16399 _001279_hash NULL
84186 +_001280_hash async_setkey 3 35521 _001280_hash NULL
84187 +_001281_hash ata_host_alloc_pinfo 3 17325 _001281_hash NULL
84188 +_001284_hash ath6kl_connect_event 7-9-8 14267 _001284_hash NULL
84189 +_001285_hash ath6kl_fwlog_block_read 3 49836 _001285_hash NULL
84190 +_001286_hash ath6kl_fwlog_read 3 32101 _001286_hash NULL
84191 +_001287_hash ath_rx_init 2 43564 _001287_hash NULL
84192 +_001288_hash ath_tx_init 2 60515 _001288_hash NULL
84193 +_001289_hash atm_get_addr 3 31221 _001289_hash NULL
84194 +_001290_hash av7110_ipack_init 2 46655 _001290_hash NULL
84195 +_001291_hash bdx_rxdb_create 1 46525 _001291_hash NULL
84196 +_001292_hash bdx_tx_db_init 2 41719 _001292_hash NULL
84197 +_001293_hash bio_map_kern 3 64751 _001293_hash NULL
84198 +_001294_hash bits_to_user 3 47733 _001294_hash NULL
84199 +_001295_hash __blk_queue_init_tags 2 9778 _001295_hash NULL
84200 +_001296_hash blk_queue_resize_tags 2 28670 _001296_hash NULL
84201 +_001297_hash blk_rq_map_user_iov 5 16772 _001297_hash NULL
84202 +_001298_hash bm_init 2 13529 _001298_hash NULL
84203 +_001299_hash brcmf_alloc_wdev 1 60347 _001299_hash NULL
84204 +_001300_hash btrfs_insert_dir_item 4 59304 _001300_hash NULL
84205 +_001301_hash btrfs_map_block 3 64379 _001301_hash NULL
84206 +_001302_hash c4_add_card 3 54968 _001302_hash NULL
84207 +_001303_hash cache_read 3 24790 _001303_hash NULL
84208 +_001304_hash cache_write 3 13589 _001304_hash NULL
84209 +_001305_hash calc_hmac 3 32010 _001305_hash NULL
84210 +_001306_hash ccid_getsockopt_builtin_ccids 2 53634 _001306_hash NULL
84211 +_001307_hash ceph_copy_page_vector_to_user 4 31270 _001307_hash NULL
84212 +_001308_hash ceph_read_dir 3 17005 _001308_hash NULL
84213 +_001309_hash cfg80211_roamed 5-7 32632 _001309_hash NULL
84214 +_001311_hash ci_ll_init 3 12930 _001311_hash NULL
84215 +_001312_hash coda_psdev_read 3 35029 _001312_hash NULL
84216 +_001313_hash construct_key_and_link 4 8321 _001313_hash NULL
84217 +_001314_hash copy_counters_to_user 5 17027 _001824_hash NULL nohasharray
84218 +_001315_hash copy_entries_to_user 1 52367 _001315_hash NULL
84219 +_001316_hash copy_from_buf 4 27308 _001316_hash NULL
84220 +_001317_hash copy_oldmem_page 3 26164 _001317_hash NULL
84221 +_001318_hash copy_to_user_fromio 3 57432 _001318_hash NULL
84222 +_001319_hash cryptd_hash_setkey 3 42781 _001319_hash NULL
84223 +_001320_hash crypto_authenc_esn_setkey 3 6985 _001320_hash NULL
84224 +_001321_hash crypto_authenc_setkey 3 80 _001321_hash NULL
84225 +_001322_hash cx18_copy_buf_to_user 4 22735 _001322_hash NULL
84226 +_001324_hash cxgbi_ddp_reserve 4 30091 _001324_hash NULL
84227 +_001325_hash datablob_hmac_append 3 40038 _001325_hash NULL
84228 +_001326_hash datablob_hmac_verify 4 24786 _001326_hash NULL
84229 +_001327_hash dataflash_read_fact_otp 3-2 33204 _001327_hash NULL
84230 +_001328_hash dataflash_read_user_otp 3-2 14536 _001328_hash &_000201_hash
84231 +_001329_hash dccp_feat_register_sp 5 17914 _001329_hash NULL
84232 +_001330_hash ddb_input_read 3 9743 _001330_hash NULL
84233 +_001331_hash dev_read 3 56369 _001331_hash NULL
84234 +_001332_hash diva_os_copy_to_user 4 48508 _001332_hash NULL
84235 +_001333_hash diva_os_malloc 2 16406 _001333_hash NULL
84236 +_001334_hash dlm_dir_lookup 4 56662 _001334_hash NULL
84237 +_001335_hash dm_vcalloc 1-2 16814 _001335_hash NULL
84238 +_001337_hash do_proc_readlink 3 14096 _001337_hash NULL
84239 +_001338_hash do_readlink 2 43518 _001338_hash NULL
84240 +_001339_hash __do_replace 5 37227 _001339_hash NULL
84241 +_001340_hash do_sigpending 2 9766 _001340_hash NULL
84242 +_001341_hash drbd_setsockopt 5 16280 _001341_hash &_000371_hash
84243 +_001342_hash dsp_buffer_alloc 2 11684 _001342_hash NULL
84244 +_001343_hash dump_midi 3 51040 _001343_hash NULL
84245 +_001344_hash dvb_dmxdev_set_buffer_size 2 55643 _001344_hash NULL
84246 +_001345_hash dvb_dvr_set_buffer_size 2 9840 _001345_hash NULL
84247 +_001346_hash dvb_ringbuffer_pkt_read_user 3-5-2 4303 _001346_hash NULL
84248 +_001348_hash dvb_ringbuffer_read_user 3 56702 _001348_hash NULL
84249 +_001349_hash ecryptfs_filldir 3 6622 _001349_hash NULL
84250 +_001350_hash ecryptfs_readlink 3 40775 _001350_hash NULL
84251 +_001351_hash ecryptfs_send_message 2 18322 _001351_hash NULL
84252 +_001352_hash em28xx_init_isoc 4 62883 _001352_hash &_000721_hash
84253 +_001353_hash et61x251_read 3 25420 _001353_hash NULL
84254 +_001354_hash ext4_add_new_descs 3 19509 _001354_hash NULL
84255 +_001355_hash fat_ioctl_filldir 3 36621 _001355_hash NULL
84256 +_001356_hash fd_copyout 3 59323 _001356_hash NULL
84257 +_001357_hash f_hidg_read 3 6238 _001357_hash NULL
84258 +_001358_hash filldir 3 55137 _001358_hash NULL
84259 +_001359_hash filldir64 3 46469 _001359_hash NULL
84260 +_001360_hash fops_read 3 40672 _001360_hash NULL
84261 +_001361_hash from_buffer 3 18625 _001361_hash NULL
84262 +_001362_hash fsm_init 2 16134 _001362_hash NULL
84263 +_001363_hash get_subdir 3 62581 _001363_hash NULL
84264 +_001364_hash gspca_dev_probe 4 2570 _001364_hash NULL
84265 +_001365_hash handle_received_packet 3 22457 _001365_hash NULL
84266 +_001366_hash hash_setkey 3 48310 _001366_hash NULL
84267 +_001367_hash hdlcdrv_register 2 6792 _001367_hash NULL
84268 +_001368_hash hdpvr_read 3 9273 _001368_hash NULL
84269 +_001369_hash hid_input_report 4 32458 _001369_hash NULL
84270 +_001370_hash hidraw_read 3 59650 _001370_hash &_001200_hash
84271 +_001371_hash HiSax_readstatus 2 15752 _001371_hash NULL
84272 +_001373_hash __hwahc_op_set_gtk 4 42038 _001373_hash NULL
84273 +_001374_hash __hwahc_op_set_ptk 5 36510 _001374_hash NULL
84274 +_001375_hash ib_copy_to_udata 3 27525 _001375_hash NULL
84275 +_001376_hash idetape_chrdev_read 3 2097 _001376_hash NULL
84276 +_001377_hash ieee80211_alloc_hw 1 43829 _001377_hash NULL
84277 +_001378_hash ieee80211_bss_info_update 4 13991 _001378_hash NULL
84278 +_001379_hash ilo_read 3 32531 _001379_hash NULL
84279 +_001380_hash init_map_ipmac 3-4 63896 _001380_hash NULL
84280 +_001382_hash init_tid_tabs 2-4-3 13252 _001382_hash NULL
84281 +_001385_hash iowarrior_read 3 53483 _001385_hash NULL
84282 +_001386_hash ipv6_getsockopt_sticky 5 56711 _001386_hash NULL
84283 +_001387_hash ipwireless_send_packet 4 8328 _001387_hash NULL
84284 +_001388_hash ipx_sendmsg 4 1362 _001388_hash NULL
84285 +_001389_hash iscsi_conn_setup 2 35159 _001389_hash NULL
84286 +_001390_hash iscsi_create_session 3 51647 _001390_hash NULL
84287 +_001391_hash iscsi_host_alloc 2 36671 _001391_hash NULL
84288 +_001392_hash iscsi_session_setup 4-5 196 _001392_hash NULL
84289 +_001394_hash iscsit_find_cmd_from_itt_or_dump 3 17194 _001701_hash NULL nohasharray
84290 +_001395_hash isdn_ppp_read 4 50356 _001395_hash NULL
84291 +_001396_hash isku_sysfs_read 6 58806 _001396_hash NULL
84292 +_001397_hash isku_sysfs_write 6 49767 _001397_hash NULL
84293 +_001398_hash iso_alloc_urb 4-5 45206 _001398_hash NULL
84294 +_001400_hash ivtv_copy_buf_to_user 4 6159 _001400_hash NULL
84295 +_001401_hash iwm_rx_handle 3 24899 _001401_hash NULL
84296 +_001402_hash iwm_wdev_alloc 1 38415 _001402_hash NULL
84297 +_001403_hash jbd2_alloc 1 41359 _001403_hash NULL
84298 +_001404_hash jffs2_do_link 6 42048 _001404_hash NULL
84299 +_001405_hash jffs2_do_unlink 4 62020 _001405_hash NULL
84300 +_001406_hash jffs2_security_setxattr 4 62107 _001406_hash NULL
84301 +_001407_hash jffs2_trusted_setxattr 4 17048 _001407_hash NULL
84302 +_001408_hash jffs2_user_setxattr 4 10182 _001408_hash NULL
84303 +_001409_hash kernel_setsockopt 5 35913 _001409_hash NULL
84304 +_001410_hash keyctl_describe_key 3 36853 _001410_hash NULL
84305 +_001411_hash keyctl_get_security 3 64418 _001411_hash &_001132_hash
84306 +_001412_hash keyring_read 3 13438 _001412_hash NULL
84307 +_001413_hash kfifo_copy_to_user 3 20646 _001413_hash NULL
84308 +_001414_hash kmem_zalloc_large 1 56128 _001414_hash NULL
84309 +_001415_hash kmp_init 2 41373 _001415_hash NULL
84310 +_001416_hash koneplus_sysfs_write 6 35993 _001416_hash NULL
84311 +_001417_hash kvm_clear_guest_page 4 2308 _001417_hash NULL
84312 +_001418_hash kvm_read_nested_guest_page 5 13337 _001418_hash NULL
84313 +_001419_hash l2cap_create_basic_pdu 3 24869 _001419_hash &_001034_hash
84314 +_001420_hash l2cap_create_connless_pdu 3 37327 _001420_hash &_000966_hash
84315 +_001421_hash l2cap_create_iframe_pdu 3 51801 _001421_hash NULL
84316 +_001422_hash __lgwrite 4 57669 _001422_hash NULL
84317 +_001423_hash libfc_host_alloc 2 7917 _001423_hash NULL
84318 +_001424_hash llcp_sock_sendmsg 4 1092 _001424_hash NULL
84319 +_001425_hash macvtap_get_user 4 28185 _001425_hash NULL
84320 +_001426_hash mcam_v4l_read 3 36513 _001426_hash NULL
84321 +_001427_hash mce_async_out 3 58056 _001427_hash NULL
84322 +_001428_hash mce_flush_rx_buffer 2 14976 _001428_hash NULL
84323 +_001429_hash mdc800_device_read 3 22896 _001429_hash NULL
84324 +_001430_hash memcpy_toiovec 3 54166 _001430_hash &_000867_hash
84325 +_001431_hash memcpy_toiovecend 3-4 19736 _001431_hash NULL
84326 +_001433_hash mgt_set_varlen 4 60916 _001433_hash NULL
84327 +_001434_hash mlx4_en_create_rx_ring 3 62498 _001434_hash NULL
84328 +_001435_hash mlx4_en_create_tx_ring 4 48501 _001435_hash NULL
84329 +_001436_hash mon_bin_get_event 4 52863 _001436_hash NULL
84330 +_001437_hash mousedev_read 3 47123 _001437_hash NULL
84331 +_001438_hash move_addr_to_user 2 2868 _001438_hash NULL
84332 +_001439_hash mpihelp_mul 5-3 27805 _001439_hash NULL
84333 +_001441_hash mpi_lshift_limbs 2 9337 _001441_hash NULL
84334 +_001442_hash msnd_fifo_alloc 2 23179 _001442_hash NULL
84335 +_001443_hash mtdswap_init 2 55719 _001443_hash NULL
84336 +_001444_hash neigh_hash_grow 2 17283 _001444_hash NULL
84337 +_001445_hash nfs4_realloc_slot_table 2 22859 _001445_hash NULL
84338 +_001446_hash nfs_idmap_get_key 2 39616 _001446_hash NULL
84339 +_001447_hash nsm_get_handle 4 52089 _001447_hash NULL
84340 +_001448_hash ntfs_malloc_nofs 1 49572 _001448_hash NULL
84341 +_001449_hash ntfs_malloc_nofs_nofail 1 63631 _001449_hash NULL
84342 +_001450_hash nvme_create_queue 3 170 _001450_hash NULL
84343 +_001451_hash ocfs2_control_write 3 54737 _001451_hash NULL
84344 +_001452_hash orinoco_add_extscan_result 3 18207 _001452_hash NULL
84345 +_001454_hash override_release 2 52032 _001454_hash NULL
84346 +_001455_hash packet_snd 3 13634 _001455_hash NULL
84347 +_001456_hash pcbit_stat 2 27364 _001456_hash NULL
84348 +_001457_hash pcpu_extend_area_map 2 12589 _001457_hash NULL
84349 +_001458_hash pg_read 3 17276 _001458_hash NULL
84350 +_001459_hash picolcd_debug_eeprom_read 3 14549 _001459_hash NULL
84351 +_001460_hash pkt_alloc_packet_data 1 37928 _001460_hash NULL
84352 +_001461_hash pmcraid_build_passthrough_ioadls 2 62034 _001461_hash NULL
84353 +_001462_hash pms_capture 4 27142 _001462_hash NULL
84354 +_001463_hash posix_clock_register 2 5662 _001463_hash NULL
84355 +_001464_hash printer_read 3 54851 _001464_hash NULL
84356 +_001465_hash __proc_file_read 3 54978 _001465_hash NULL
84357 +_001466_hash pt_read 3 49136 _001466_hash NULL
84358 +_001467_hash put_cmsg 4 36589 _001467_hash NULL
84359 +_001468_hash pvr2_ioread_read 3 10720 _001505_hash NULL nohasharray
84360 +_001469_hash pwc_video_read 3 51735 _001469_hash NULL
84361 +_001470_hash px_raw_event 4 49371 _001470_hash NULL
84362 +_001471_hash qcam_read 3 13977 _001471_hash NULL
84363 +_001472_hash rawv6_sendmsg 4 20080 _001472_hash NULL
84364 +_001473_hash rds_sendmsg 4 40976 _001473_hash NULL
84365 +_001474_hash read_flush 3 43851 _001474_hash NULL
84366 +_001475_hash read_profile 3 27859 _001475_hash NULL
84367 +_001476_hash read_vmcore 3 26501 _001476_hash NULL
84368 +_001477_hash redirected_tty_write 3 65297 _001477_hash NULL
84369 +_001478_hash __register_chrdev 2-3 54223 _001478_hash NULL
84370 +_001480_hash regmap_raw_write 4 53803 _001480_hash NULL
84371 +_001481_hash reiserfs_allocate_list_bitmaps 3 21732 _001481_hash NULL
84372 +_001482_hash reiserfs_resize 2 34377 _001482_hash NULL
84373 +_001483_hash request_key_auth_read 3 24109 _001483_hash NULL
84374 +_001484_hash rfkill_fop_read 3 54711 _001484_hash NULL
84375 +_001485_hash rng_dev_read 3 41581 _001485_hash NULL
84376 +_001486_hash roccat_read 3 41093 _001486_hash NULL
84377 +_001487_hash sco_sock_sendmsg 4 62542 _001487_hash NULL
84378 +_001488_hash scsi_register 2 49094 _001488_hash NULL
84379 +_001489_hash sctp_getsockopt_events 2 3607 _001489_hash NULL
84380 +_001490_hash sctp_getsockopt_maxburst 2 42941 _001490_hash NULL
84381 +_001491_hash sctp_getsockopt_maxseg 2 10737 _001491_hash NULL
84382 +_001492_hash sctpprobe_read 3 17741 _001492_hash NULL
84383 +_001493_hash sdhci_alloc_host 2 7509 _001493_hash NULL
84384 +_001494_hash selinux_inode_post_setxattr 4 26037 _001494_hash NULL
84385 +_001495_hash selinux_inode_setsecurity 4 18148 _001495_hash NULL
84386 +_001496_hash selinux_inode_setxattr 4 10708 _001496_hash NULL
84387 +_001497_hash selinux_secctx_to_secid 2 63744 _001497_hash NULL
84388 +_001498_hash selinux_setprocattr 4 55611 _001498_hash NULL
84389 +_001499_hash sel_write_context 3 25726 _002397_hash NULL nohasharray
84390 +_001500_hash seq_copy_in_user 3 18543 _001500_hash NULL
84391 +_001501_hash seq_open_net 4 8968 _001594_hash NULL nohasharray
84392 +_001502_hash seq_open_private 3 61589 _001502_hash NULL
84393 +_001503_hash set_arg 3 42824 _001503_hash NULL
84394 +_001504_hash sg_read 3 25799 _001504_hash NULL
84395 +_001505_hash shash_async_setkey 3 10720 _001505_hash &_001468_hash
84396 +_001506_hash shash_compat_setkey 3 12267 _001506_hash NULL
84397 +_001507_hash shmem_setxattr 4 55867 _001507_hash NULL
84398 +_001508_hash simple_read_from_buffer 2-5 55957 _001508_hash NULL
84399 +_001511_hash sm_checker_extend 2 23615 _001511_hash NULL
84400 +_001512_hash sn9c102_read 3 29305 _001512_hash NULL
84401 +_001513_hash snd_es1938_capture_copy 5 25930 _001513_hash NULL
84402 +_001514_hash snd_gus_dram_peek 4 9062 _001514_hash NULL
84403 +_001515_hash snd_hdsp_capture_copy 5 4011 _001515_hash NULL
84404 +_001516_hash snd_korg1212_copy_to 6 92 _001516_hash NULL
84405 +_001517_hash snd_opl4_mem_proc_read 5 63774 _001517_hash NULL
84406 +_001518_hash snd_pcm_alloc_vmalloc_buffer 2 44595 _001518_hash NULL
84407 +_001519_hash snd_pcm_oss_read1 3 63771 _001519_hash NULL
84408 +_001520_hash snd_rawmidi_kernel_read1 4 36740 _001520_hash NULL
84409 +_001521_hash snd_rme9652_capture_copy 5 10287 _001521_hash NULL
84410 +_001522_hash srp_target_alloc 3 37288 _001522_hash NULL
84411 +_001523_hash stk_allocate_buffers 2 16291 _001523_hash NULL
84412 +_001524_hash store_ifalias 4 35088 _001524_hash NULL
84413 +_001525_hash store_msg 3 56417 _001525_hash NULL
84414 +_001526_hash str_to_user 2 11411 _001526_hash NULL
84415 +_001527_hash subbuf_read_actor 3 2071 _001527_hash NULL
84416 +_001528_hash sys_fgetxattr 4 25166 _001528_hash NULL
84417 +_001529_hash sys_gethostname 2 49698 _001529_hash NULL
84418 +_001530_hash sys_getxattr 4 37418 _001530_hash NULL
84419 +_001531_hash sys_kexec_load 2 14222 _001531_hash NULL
84420 +_001532_hash sys_msgsnd 3 44537 _001532_hash &_000129_hash
84421 +_001533_hash sys_process_vm_readv 3-5 19090 _003125_hash NULL nohasharray
84422 +_001535_hash sys_process_vm_writev 3-5 4928 _001535_hash NULL
84423 +_001537_hash sys_sched_getaffinity 2 60033 _001537_hash NULL
84424 +_001538_hash sys_setsockopt 5 35320 _001538_hash NULL
84425 +_001539_hash t3_init_l2t 1 8261 _001539_hash NULL
84426 +_001540_hash team_options_register 3 20091 _001540_hash NULL
84427 +_001541_hash tipc_send2name 6 16809 _001541_hash NULL
84428 +_001542_hash tipc_send2port 5 63935 _001542_hash NULL
84429 +_001543_hash tipc_send 4 51238 _001543_hash NULL
84430 +_001544_hash tm6000_i2c_recv_regs16 5 2949 _001544_hash NULL
84431 +_001545_hash tm6000_i2c_recv_regs 5 46215 _001545_hash NULL
84432 +_001546_hash tm6000_i2c_send_regs 5 20250 _001546_hash NULL
84433 +_001547_hash tnode_new 3 44757 _001547_hash NULL
84434 +_001548_hash tomoyo_read_self 3 33539 _001548_hash NULL
84435 +_001549_hash tomoyo_update_domain 2 5498 _001549_hash NULL
84436 +_001550_hash tomoyo_update_policy 2 40458 _001550_hash NULL
84437 +_001551_hash tpm_read 3 50344 _001551_hash NULL
84438 +_001552_hash TSS_rawhmac 3 17486 _001552_hash NULL
84439 +_001553_hash tt3650_ci_msg 4 57219 _001553_hash NULL
84440 +_001554_hash tun_get_user 3 33178 _001554_hash NULL
84441 +_001555_hash ubi_dbg_dump_flash 4 3870 _001555_hash NULL
84442 +_001556_hash ubi_io_write 4-5 15870 _001556_hash &_000954_hash
84443 +_001558_hash uio_read 3 49300 _001558_hash NULL
84444 +_001559_hash unix_seqpacket_sendmsg 4 27893 _001559_hash NULL
84445 +_001560_hash unlink1 3 63059 _001560_hash NULL
84446 +_001562_hash usb_allocate_stream_buffers 3 8964 _001562_hash NULL
84447 +_001563_hash usbdev_read 3 45114 _001563_hash NULL
84448 +_001564_hash usblp_read 3 57342 _001564_hash NULL
84449 +_001565_hash usbtmc_read 3 32377 _001565_hash NULL
84450 +_001566_hash usbvision_v4l2_read 3 34386 _001566_hash NULL
84451 +_001567_hash _usb_writeN_sync 4 31682 _001567_hash NULL
84452 +_001568_hash user_read 3 51881 _001568_hash NULL
84453 +_001569_hash v4l_stk_read 3 39672 _001569_hash NULL
84454 +_001570_hash vcs_read 3 8017 _001570_hash NULL
84455 +_001571_hash vdma_mem_alloc 1 6171 _001571_hash NULL
84456 +_001572_hash venus_create 4 20555 _001572_hash NULL
84457 +_001573_hash venus_link 5 32165 _001573_hash NULL
84458 +_001574_hash venus_lookup 4 8121 _001574_hash NULL
84459 +_001575_hash venus_mkdir 4 8967 _001575_hash NULL
84460 +_001576_hash venus_remove 4 59781 _001576_hash NULL
84461 +_001577_hash venus_rename 4-5 17707 _001577_hash NULL
84462 +_001579_hash venus_rmdir 4 45564 _001579_hash NULL
84463 +_001580_hash venus_symlink 4-6 23570 _001580_hash NULL
84464 +_001582_hash vfs_readlink 3 54368 _001582_hash NULL
84465 +_001583_hash vfs_readv 3 38011 _001583_hash NULL
84466 +_001584_hash vfs_writev 3 25278 _001584_hash NULL
84467 +_001585_hash vga_arb_read 3 4886 _001585_hash NULL
84468 +_001586_hash vhci_put_user 4 12604 _001586_hash NULL
84469 +_001587_hash vhost_add_used_n 3 10760 _001587_hash NULL
84470 +_001588_hash __videobuf_copy_to_user 4 15423 _001588_hash NULL
84471 +_001589_hash videobuf_pages_to_sg 2 3708 _001589_hash NULL
84472 +_001590_hash videobuf_vmalloc_to_sg 2 4548 _001590_hash NULL
84473 +_001591_hash virtnet_send_command 5-6 61993 _001591_hash NULL
84474 +_001593_hash vmbus_establish_gpadl 3 4495 _001593_hash NULL
84475 +_001594_hash vol_cdev_read 3 8968 _001594_hash &_001501_hash
84476 +_001595_hash w9966_v4l_read 3 31148 _001595_hash NULL
84477 +_001596_hash wdm_read 3 6549 _001596_hash NULL
84478 +_001597_hash wusb_prf 7 54261 _001597_hash &_000063_hash
84479 +_001598_hash xdi_copy_to_user 4 48900 _001598_hash NULL
84480 +_001599_hash xfs_buf_get_uncached 2 51477 _001599_hash NULL
84481 +_001600_hash xfs_efd_init 3 5463 _001600_hash NULL
84482 +_001601_hash xfs_efi_init 2 5476 _001601_hash NULL
84483 +_001602_hash xfs_iext_realloc_direct 2 20521 _001602_hash NULL
84484 +_001603_hash xfs_iext_realloc_indirect 2 59211 _001603_hash NULL
84485 +_001604_hash xfs_inumbers_fmt 3 12817 _001604_hash NULL
84486 +_001605_hash xlog_recover_add_to_cont_trans 4 44102 _001605_hash NULL
84487 +_001606_hash xz_dec_lzma2_create 2 36353 _002745_hash NULL nohasharray
84488 +_001607_hash _zd_iowrite32v_locked 3 44725 _001607_hash NULL
84489 +_001608_hash aat2870_reg_read_file 3 12221 _001608_hash NULL
84490 +_001609_hash add_sctp_bind_addr 3 12269 _001609_hash NULL
84491 +_001610_hash aes_decrypt_fail_read 3 54815 _001610_hash NULL
84492 +_001611_hash aes_decrypt_interrupt_read 3 19910 _001611_hash NULL
84493 +_001612_hash aes_decrypt_packets_read 3 10155 _001612_hash NULL
84494 +_001613_hash aes_encrypt_fail_read 3 32562 _001613_hash NULL
84495 +_001614_hash aes_encrypt_interrupt_read 3 39919 _001614_hash NULL
84496 +_001615_hash aes_encrypt_packets_read 3 48666 _001615_hash NULL
84497 +_001616_hash afs_cell_lookup 2 8482 _001616_hash NULL
84498 +_001617_hash agp_allocate_memory 2 58761 _001617_hash NULL
84499 +_001618_hash __alloc_bootmem 1 31498 _001618_hash NULL
84500 +_001619_hash __alloc_bootmem_low 1 43423 _003150_hash NULL nohasharray
84501 +_001620_hash __alloc_bootmem_node_nopanic 2 6432 _001620_hash NULL
84502 +_001621_hash alloc_cc770dev 1 48186 _001621_hash NULL
84503 +_001622_hash __alloc_ei_netdev 1 29338 _001622_hash NULL
84504 +_001623_hash __alloc_eip_netdev 1 51549 _001623_hash NULL
84505 +_001624_hash alloc_libipw 1 22708 _001624_hash NULL
84506 +_001625_hash alloc_pg_vec 2 8533 _001625_hash NULL
84507 +_001626_hash alloc_sja1000dev 1 17868 _001626_hash NULL
84508 +_001627_hash alloc_targets 2 8074 _001627_hash NULL
84509 +_001630_hash ath6kl_disconnect_timeout_read 3 3650 _001630_hash NULL
84510 +_001631_hash ath6kl_endpoint_stats_read 3 41554 _001631_hash NULL
84511 +_001632_hash ath6kl_fwlog_mask_read 3 2050 _001632_hash NULL
84512 +_001633_hash ath6kl_keepalive_read 3 44303 _001633_hash NULL
84513 +_001634_hash ath6kl_listen_int_read 3 10355 _001634_hash NULL
84514 +_001635_hash ath6kl_lrssi_roam_read 3 61022 _001635_hash NULL
84515 +_001636_hash ath6kl_regdump_read 3 14393 _001636_hash NULL
84516 +_001637_hash ath6kl_regread_read 3 25884 _001637_hash NULL
84517 +_001638_hash ath6kl_regwrite_read 3 48747 _001638_hash NULL
84518 +_001639_hash ath6kl_roam_table_read 3 26166 _001639_hash NULL
84519 +_001640_hash ath9k_debugfs_read_buf 3 25316 _001640_hash NULL
84520 +_001641_hash atk_debugfs_ggrp_read 3 29522 _001641_hash NULL
84521 +_001642_hash b43_debugfs_read 3 24425 _001642_hash NULL
84522 +_001643_hash b43legacy_debugfs_read 3 2473 _001643_hash NULL
84523 +_001644_hash bcm_recvmsg 4 43992 _001644_hash NULL
84524 +_001645_hash bfad_debugfs_read 3 13119 _001645_hash NULL
84525 +_001646_hash bfad_debugfs_read_regrd 3 57830 _001646_hash NULL
84526 +_001647_hash blk_init_tags 1 30592 _001647_hash NULL
84527 +_001648_hash blk_queue_init_tags 2 44355 _002686_hash NULL nohasharray
84528 +_001649_hash blk_rq_map_kern 4 47004 _001649_hash NULL
84529 +_001650_hash bm_entry_read 3 10976 _001650_hash NULL
84530 +_001651_hash bm_status_read 3 19583 _001651_hash NULL
84531 +_001652_hash bnad_debugfs_read 3 50665 _001652_hash NULL
84532 +_001653_hash bnad_debugfs_read_regrd 3 51308 _001653_hash NULL
84533 +_001654_hash btmrvl_curpsmode_read 3 46939 _001654_hash NULL
84534 +_001655_hash btmrvl_gpiogap_read 3 4718 _001655_hash NULL
84535 +_001656_hash btmrvl_hscfgcmd_read 3 56303 _001656_hash NULL
84536 +_001657_hash btmrvl_hscmd_read 3 1614 _001657_hash NULL
84537 +_001658_hash btmrvl_hsmode_read 3 1647 _001658_hash NULL
84538 +_001659_hash btmrvl_hsstate_read 3 920 _001659_hash NULL
84539 +_001660_hash btmrvl_pscmd_read 3 24308 _001660_hash NULL
84540 +_001661_hash btmrvl_psmode_read 3 22395 _001661_hash NULL
84541 +_001662_hash btmrvl_psstate_read 3 50683 _001662_hash NULL
84542 +_001663_hash btmrvl_txdnldready_read 3 413 _001663_hash NULL
84543 +_001664_hash btrfs_add_link 5 9973 _001664_hash NULL
84544 +_001665_hash btrfs_discard_extent 2 38547 _001665_hash NULL
84545 +_001666_hash btrfs_find_create_tree_block 3 55812 _001666_hash NULL
84546 +_001667_hash btrfsic_map_block 2 56751 _001667_hash NULL
84547 +_001668_hash caif_stream_recvmsg 4 13173 _001668_hash NULL
84548 +_001669_hash carl9170_alloc 1 27 _001669_hash NULL
84549 +_001670_hash carl9170_debugfs_read 3 47738 _001670_hash NULL
84550 +_001671_hash cgroup_read_s64 5 19570 _001671_hash NULL
84551 +_001672_hash cgroup_read_u64 5 45532 _001672_hash NULL
84552 +_001673_hash channel_type_read 3 47308 _001673_hash NULL
84553 +_001674_hash codec_list_read_file 3 24910 _001674_hash NULL
84554 +_001675_hash configfs_read_file 3 1683 _001675_hash NULL
84555 +_001676_hash cpuset_common_file_read 5 8800 _001676_hash NULL
84556 +_001677_hash create_subvol 4 2347 _001677_hash NULL
84557 +_001678_hash cx18_copy_mdl_to_user 4 45549 _001678_hash NULL
84558 +_001679_hash dai_list_read_file 3 25421 _001679_hash NULL
84559 +_001680_hash dapm_bias_read_file 3 64715 _001680_hash NULL
84560 +_001681_hash dapm_widget_power_read_file 3 59950 _001754_hash NULL nohasharray
84561 +_001684_hash dbgfs_frame 3 45917 _001684_hash NULL
84562 +_001685_hash dbgfs_state 3 38894 _001685_hash NULL
84563 +_001686_hash debugfs_read 3 62535 _001686_hash NULL
84564 +_001687_hash debug_output 3 18575 _001687_hash NULL
84565 +_001688_hash debug_read 3 19322 _001688_hash NULL
84566 +_001689_hash dfs_file_read 3 18116 _001689_hash NULL
84567 +_001690_hash dma_memcpy_pg_to_iovec 6 1725 _001690_hash NULL
84568 +_001691_hash dma_memcpy_to_iovec 5 12173 _001691_hash NULL
84569 +_001692_hash dma_rx_errors_read 3 52045 _001692_hash NULL
84570 +_001693_hash dma_rx_requested_read 3 65354 _001693_hash NULL
84571 +_001694_hash dma_show_regs 3 35266 _001694_hash NULL
84572 +_001695_hash dma_tx_errors_read 3 46060 _001695_hash NULL
84573 +_001696_hash dma_tx_requested_read 3 16110 _001775_hash NULL nohasharray
84574 +_001697_hash dm_exception_table_init 2 39645 _001697_hash &_001103_hash
84575 +_001698_hash dn_recvmsg 4 17213 _001698_hash NULL
84576 +_001699_hash dns_resolver_read 3 54658 _001699_hash NULL
84577 +_001700_hash do_msgrcv 4 5590 _001700_hash NULL
84578 +_001701_hash driver_state_read 3 17194 _001701_hash &_001394_hash
84579 +_001702_hash dvb_demux_do_ioctl 3 34871 _001702_hash NULL
84580 +_001703_hash dvb_dmxdev_buffer_read 4 20682 _001703_hash NULL
84581 +_001704_hash dvb_dvr_do_ioctl 3 43355 _001704_hash NULL
84582 +_001705_hash econet_recvmsg 4 40978 _001705_hash NULL
84583 +_001706_hash event_calibration_read 3 21083 _001706_hash NULL
84584 +_001707_hash event_heart_beat_read 3 48961 _001707_hash NULL
84585 +_001708_hash event_oom_late_read 3 61175 _001708_hash &_001014_hash
84586 +_001709_hash event_phy_transmit_error_read 3 10471 _001709_hash NULL
84587 +_001710_hash event_rx_mem_empty_read 3 40363 _001710_hash NULL
84588 +_001711_hash event_rx_mismatch_read 3 38518 _001711_hash NULL
84589 +_001712_hash event_rx_pool_read 3 25792 _001712_hash NULL
84590 +_001713_hash event_tx_stuck_read 3 19305 _001713_hash NULL
84591 +_001714_hash excessive_retries_read 3 60425 _001714_hash NULL
84592 +_001715_hash fallback_on_nodma_alloc 2 35332 _001715_hash NULL
84593 +_001716_hash filter_read 3 61692 _001716_hash NULL
84594 +_001717_hash format_devstat_counter 3 32550 _001717_hash NULL
84595 +_001718_hash fragmentation_threshold_read 3 61718 _001718_hash NULL
84596 +_001719_hash fuse_conn_limit_read 3 20084 _001719_hash NULL
84597 +_001720_hash fuse_conn_waiting_read 3 49762 _001720_hash NULL
84598 +_001721_hash generic_readlink 3 32654 _001721_hash NULL
84599 +_001722_hash gpio_power_read 3 36059 _001722_hash NULL
84600 +_001723_hash hash_recvmsg 4 50924 _001723_hash NULL
84601 +_001724_hash ht40allow_map_read 3 55209 _002830_hash NULL nohasharray
84602 +_001725_hash hwflags_read 3 52318 _001725_hash NULL
84603 +_001726_hash hysdn_conf_read 3 42324 _003205_hash NULL nohasharray
84604 +_001727_hash i2400m_rx_stats_read 3 57706 _001727_hash NULL
84605 +_001728_hash i2400m_tx_stats_read 3 28527 _001728_hash NULL
84606 +_001729_hash idmouse_read 3 63374 _001729_hash NULL
84607 +_001730_hash ieee80211_if_read 3 6785 _001730_hash NULL
84608 +_001731_hash ieee80211_rx_bss_info 3 61630 _001731_hash NULL
84609 +_001732_hash ikconfig_read_current 3 1658 _001732_hash NULL
84610 +_001733_hash il3945_sta_dbgfs_stats_table_read 3 48802 _001733_hash NULL
84611 +_001734_hash il3945_ucode_general_stats_read 3 46111 _001734_hash NULL
84612 +_001735_hash il3945_ucode_rx_stats_read 3 3048 _001735_hash NULL
84613 +_001736_hash il3945_ucode_tx_stats_read 3 36016 _001736_hash NULL
84614 +_001737_hash il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 _001737_hash NULL
84615 +_001738_hash il4965_rs_sta_dbgfs_scale_table_read 3 38564 _001738_hash NULL
84616 +_001739_hash il4965_rs_sta_dbgfs_stats_table_read 3 49206 _001739_hash NULL
84617 +_001740_hash il4965_ucode_general_stats_read 3 56277 _001740_hash NULL
84618 +_001741_hash il4965_ucode_rx_stats_read 3 61948 _001741_hash NULL
84619 +_001742_hash il4965_ucode_tx_stats_read 3 12064 _001742_hash NULL
84620 +_001743_hash il_dbgfs_chain_noise_read 3 38044 _001743_hash NULL
84621 +_001744_hash il_dbgfs_channels_read 3 25005 _001744_hash NULL
84622 +_001745_hash il_dbgfs_disable_ht40_read 3 42386 _001745_hash NULL
84623 +_001746_hash il_dbgfs_fh_reg_read 3 40993 _001746_hash NULL
84624 +_001747_hash il_dbgfs_force_reset_read 3 57517 _001747_hash NULL
84625 +_001748_hash il_dbgfs_interrupt_read 3 3351 _001748_hash NULL
84626 +_001749_hash il_dbgfs_missed_beacon_read 3 59956 _001749_hash NULL
84627 +_001750_hash il_dbgfs_nvm_read 3 12288 _001750_hash NULL
84628 +_001751_hash il_dbgfs_power_save_status_read 3 43165 _001751_hash NULL
84629 +_001752_hash il_dbgfs_qos_read 3 33615 _001752_hash NULL
84630 +_001753_hash il_dbgfs_rxon_filter_flags_read 3 19281 _001753_hash NULL
84631 +_001754_hash il_dbgfs_rxon_flags_read 3 59950 _001754_hash &_001681_hash
84632 +_001755_hash il_dbgfs_rx_queue_read 3 11221 _001755_hash NULL
84633 +_001756_hash il_dbgfs_rx_stats_read 3 15243 _001756_hash NULL
84634 +_001757_hash il_dbgfs_sensitivity_read 3 2370 _001757_hash NULL
84635 +_001758_hash il_dbgfs_sram_read 3 62296 _001758_hash NULL
84636 +_001759_hash il_dbgfs_stations_read 3 21532 _001759_hash NULL
84637 +_001760_hash il_dbgfs_status_read 3 58388 _001760_hash NULL
84638 +_001761_hash il_dbgfs_tx_queue_read 3 55668 _001761_hash NULL
84639 +_001762_hash il_dbgfs_tx_stats_read 3 32913 _001762_hash NULL
84640 +_001763_hash ima_show_htable_value 2 57136 _001763_hash NULL
84641 +_001765_hash ipw_write 3 59807 _001765_hash NULL
84642 +_001766_hash irda_recvmsg_stream 4 35280 _001766_hash NULL
84643 +_001767_hash iscsi_tcp_conn_setup 2 16376 _001767_hash NULL
84644 +_001768_hash isr_cmd_cmplt_read 3 53439 _001768_hash NULL
84645 +_001769_hash isr_commands_read 3 41398 _001769_hash NULL
84646 +_001770_hash isr_decrypt_done_read 3 49490 _001770_hash NULL
84647 +_001771_hash isr_dma0_done_read 3 8574 _001771_hash NULL
84648 +_001772_hash isr_dma1_done_read 3 48159 _001772_hash NULL
84649 +_001773_hash isr_fiqs_read 3 34687 _001773_hash NULL
84650 +_001774_hash isr_host_acknowledges_read 3 54136 _001774_hash NULL
84651 +_001775_hash isr_hw_pm_mode_changes_read 3 16110 _001775_hash &_001696_hash
84652 +_001776_hash isr_irqs_read 3 9181 _001776_hash NULL
84653 +_001777_hash isr_low_rssi_read 3 64789 _001777_hash NULL
84654 +_001778_hash isr_pci_pm_read 3 30271 _001778_hash NULL
84655 +_001779_hash isr_rx_headers_read 3 38325 _001779_hash NULL
84656 +_001780_hash isr_rx_mem_overflow_read 3 43025 _001780_hash NULL
84657 +_001781_hash isr_rx_procs_read 3 31804 _001781_hash NULL
84658 +_001782_hash isr_rx_rdys_read 3 35283 _001782_hash NULL
84659 +_001783_hash isr_tx_exch_complete_read 3 16103 _001783_hash NULL
84660 +_001784_hash isr_tx_procs_read 3 23084 _001784_hash NULL
84661 +_001785_hash isr_wakeups_read 3 49607 _001785_hash NULL
84662 +_001786_hash ivtv_read 3 57796 _001786_hash NULL
84663 +_001787_hash iwl_dbgfs_bt_traffic_read 3 35534 _001787_hash NULL
84664 +_001788_hash iwl_dbgfs_chain_noise_read 3 46355 _001788_hash NULL
84665 +_001789_hash iwl_dbgfs_channels_read 3 6784 _001789_hash NULL
84666 +_001790_hash iwl_dbgfs_current_sleep_command_read 3 2081 _001790_hash NULL
84667 +_001791_hash iwl_dbgfs_disable_ht40_read 3 35761 _001791_hash NULL
84668 +_001792_hash iwl_dbgfs_fh_reg_read 3 879 _001792_hash &_000393_hash
84669 +_001793_hash iwl_dbgfs_force_reset_read 3 62628 _001793_hash NULL
84670 +_001794_hash iwl_dbgfs_interrupt_read 3 23574 _001794_hash NULL
84671 +_001795_hash iwl_dbgfs_log_event_read 3 2107 _001795_hash NULL
84672 +_001796_hash iwl_dbgfs_missed_beacon_read 3 50584 _001796_hash NULL
84673 +_001797_hash iwl_dbgfs_nvm_read 3 23845 _001797_hash NULL
84674 +_001798_hash iwl_dbgfs_plcp_delta_read 3 55407 _001798_hash NULL
84675 +_001799_hash iwl_dbgfs_power_save_status_read 3 54392 _001799_hash NULL
84676 +_001800_hash iwl_dbgfs_protection_mode_read 3 13943 _001800_hash NULL
84677 +_001801_hash iwl_dbgfs_qos_read 3 11753 _001801_hash NULL
84678 +_001802_hash iwl_dbgfs_reply_tx_error_read 3 19205 _001802_hash NULL
84679 +_001803_hash iwl_dbgfs_rx_handlers_read 3 18708 _001803_hash NULL
84680 +_001804_hash iwl_dbgfs_rxon_filter_flags_read 3 28832 _001804_hash NULL
84681 +_001805_hash iwl_dbgfs_rxon_flags_read 3 20795 _001805_hash NULL
84682 +_001806_hash iwl_dbgfs_rx_queue_read 3 19943 _001806_hash NULL
84683 +_001807_hash iwl_dbgfs_rx_statistics_read 3 62687 _001807_hash &_000425_hash
84684 +_001808_hash iwl_dbgfs_sensitivity_read 3 63116 _003026_hash NULL nohasharray
84685 +_001809_hash iwl_dbgfs_sleep_level_override_read 3 3038 _001809_hash NULL
84686 +_001810_hash iwl_dbgfs_sram_read 3 44505 _001810_hash NULL
84687 +_001811_hash iwl_dbgfs_stations_read 3 9309 _001811_hash NULL
84688 +_001812_hash iwl_dbgfs_status_read 3 5171 _001812_hash NULL
84689 +_001813_hash iwl_dbgfs_temperature_read 3 29224 _001813_hash NULL
84690 +_001814_hash iwl_dbgfs_thermal_throttling_read 3 38779 _001814_hash NULL
84691 +_001815_hash iwl_dbgfs_traffic_log_read 3 58870 _001815_hash NULL
84692 +_001816_hash iwl_dbgfs_tx_queue_read 3 4635 _001816_hash NULL
84693 +_001817_hash iwl_dbgfs_tx_statistics_read 3 314 _001817_hash NULL
84694 +_001818_hash iwl_dbgfs_ucode_bt_stats_read 3 42820 _001818_hash NULL
84695 +_001819_hash iwl_dbgfs_ucode_general_stats_read 3 49199 _001819_hash NULL
84696 +_001820_hash iwl_dbgfs_ucode_rx_stats_read 3 58023 _001820_hash NULL
84697 +_001821_hash iwl_dbgfs_ucode_tracing_read 3 47983 _001821_hash &_000349_hash
84698 +_001822_hash iwl_dbgfs_ucode_tx_stats_read 3 31611 _001822_hash NULL
84699 +_001823_hash iwl_dbgfs_wowlan_sram_read 3 540 _001823_hash NULL
84700 +_001824_hash iwm_if_alloc 1 17027 _001824_hash &_001314_hash
84701 +_001825_hash kernel_readv 3 35617 _001825_hash NULL
84702 +_001826_hash key_algorithm_read 3 57946 _001826_hash NULL
84703 +_001827_hash key_icverrors_read 3 20895 _001827_hash NULL
84704 +_001828_hash key_key_read 3 3241 _001828_hash NULL
84705 +_001829_hash key_replays_read 3 62746 _001829_hash NULL
84706 +_001830_hash key_rx_spec_read 3 12736 _001830_hash NULL
84707 +_001831_hash key_tx_spec_read 3 4862 _001831_hash NULL
84708 +_001832_hash __kfifo_to_user 3 36555 _002199_hash NULL nohasharray
84709 +_001833_hash __kfifo_to_user_r 3 39123 _001833_hash NULL
84710 +_001834_hash kmem_zalloc_greedy 2-3 65268 _001834_hash NULL
84711 +_001836_hash l2cap_chan_send 3 49995 _001836_hash NULL
84712 +_001837_hash l2cap_sar_segment_sdu 3 27701 _001837_hash NULL
84713 +_001838_hash lbs_debugfs_read 3 30721 _001838_hash NULL
84714 +_001839_hash lbs_dev_info 3 51023 _001839_hash NULL
84715 +_001840_hash lbs_host_sleep_read 3 31013 _001840_hash NULL
84716 +_001841_hash lbs_rdbbp_read 3 45805 _001841_hash NULL
84717 +_001842_hash lbs_rdmac_read 3 418 _001842_hash NULL
84718 +_001843_hash lbs_rdrf_read 3 41431 _001843_hash NULL
84719 +_001844_hash lbs_sleepparams_read 3 10840 _001844_hash NULL
84720 +_001845_hash lbs_threshold_read 5 21046 _001845_hash NULL
84721 +_001846_hash libfc_vport_create 2 4415 _001846_hash NULL
84722 +_001847_hash lkdtm_debugfs_read 3 45752 _001847_hash NULL
84723 +_001848_hash llcp_sock_recvmsg 4 13556 _001848_hash NULL
84724 +_001849_hash long_retry_limit_read 3 59766 _001849_hash NULL
84725 +_001850_hash lpfc_debugfs_dif_err_read 3 36303 _001850_hash NULL
84726 +_001851_hash lpfc_debugfs_read 3 16566 _001851_hash NULL
84727 +_001852_hash lpfc_idiag_baracc_read 3 58466 _002447_hash NULL nohasharray
84728 +_001853_hash lpfc_idiag_ctlacc_read 3 33943 _001853_hash NULL
84729 +_001854_hash lpfc_idiag_drbacc_read 3 15948 _001854_hash NULL
84730 +_001855_hash lpfc_idiag_extacc_read 3 48301 _001855_hash NULL
84731 +_001856_hash lpfc_idiag_mbxacc_read 3 28061 _001856_hash NULL
84732 +_001857_hash lpfc_idiag_pcicfg_read 3 50334 _001857_hash NULL
84733 +_001858_hash lpfc_idiag_queacc_read 3 13950 _001858_hash NULL
84734 +_001859_hash lpfc_idiag_queinfo_read 3 55662 _001859_hash NULL
84735 +_001860_hash mac80211_format_buffer 2 41010 _001860_hash NULL
84736 +_001861_hash macvtap_put_user 4 55609 _001861_hash NULL
84737 +_001862_hash macvtap_sendmsg 4 30629 _001862_hash NULL
84738 +_001863_hash mic_calc_failure_read 3 59700 _001863_hash NULL
84739 +_001864_hash mic_rx_pkts_read 3 27972 _001864_hash NULL
84740 +_001865_hash minstrel_stats_read 3 17290 _001865_hash NULL
84741 +_001866_hash mmc_ext_csd_read 3 13205 _001866_hash NULL
84742 +_001867_hash mon_bin_read 3 6841 _001867_hash NULL
84743 +_001868_hash mon_stat_read 3 25238 _001868_hash NULL
84744 +_001870_hash mqueue_read_file 3 6228 _001870_hash NULL
84745 +_001871_hash mwifiex_debug_read 3 53074 _001871_hash NULL
84746 +_001872_hash mwifiex_getlog_read 3 54269 _001872_hash NULL
84747 +_001873_hash mwifiex_info_read 3 53447 _001873_hash NULL
84748 +_001874_hash mwifiex_rdeeprom_read 3 51429 _001874_hash NULL
84749 +_001875_hash mwifiex_regrdwr_read 3 34472 _001875_hash NULL
84750 +_001876_hash nfsd_vfs_read 6 62605 _003003_hash NULL nohasharray
84751 +_001877_hash nfsd_vfs_write 6 54577 _001877_hash NULL
84752 +_001878_hash nfs_idmap_lookup_id 2 10660 _001878_hash NULL
84753 +_001879_hash o2hb_debug_read 3 37851 _001879_hash NULL
84754 +_001880_hash o2net_debug_read 3 52105 _001880_hash NULL
84755 +_001881_hash ocfs2_control_read 3 56405 _001881_hash NULL
84756 +_001882_hash ocfs2_debug_read 3 14507 _001882_hash NULL
84757 +_001883_hash ocfs2_readlink 3 50656 _001883_hash NULL
84758 +_001884_hash oom_adjust_read 3 25127 _001884_hash NULL
84759 +_001885_hash oom_score_adj_read 3 39921 _002116_hash NULL nohasharray
84760 +_001886_hash oprofilefs_str_to_user 3 42182 _001886_hash NULL
84761 +_001887_hash oprofilefs_ulong_to_user 3 11582 _001887_hash NULL
84762 +_001888_hash _osd_req_list_objects 6 4204 _001888_hash NULL
84763 +_001889_hash osd_req_read_kern 5 59990 _001889_hash NULL
84764 +_001890_hash osd_req_write_kern 5 53486 _001890_hash NULL
84765 +_001891_hash p54_init_common 1 23850 _001891_hash NULL
84766 +_001892_hash packet_sendmsg 4 24954 _001892_hash NULL
84767 +_001893_hash page_readlink 3 23346 _001893_hash NULL
84768 +_001894_hash pcf50633_write_block 3 2124 _001894_hash NULL
84769 +_001895_hash platform_list_read_file 3 34734 _001895_hash NULL
84770 +_001896_hash pm860x_bulk_write 3 43875 _001896_hash NULL
84771 +_001897_hash pm_qos_power_read 3 55891 _001897_hash NULL
84772 +_001898_hash pms_read 3 53873 _001898_hash NULL
84773 +_001899_hash port_show_regs 3 5904 _001899_hash NULL
84774 +_001900_hash proc_coredump_filter_read 3 39153 _001900_hash NULL
84775 +_001901_hash proc_fdinfo_read 3 62043 _001901_hash NULL
84776 +_001902_hash proc_info_read 3 63344 _001902_hash NULL
84777 +_001903_hash proc_loginuid_read 3 15631 _001903_hash NULL
84778 +_001904_hash proc_pid_attr_read 3 10173 _001904_hash NULL
84779 +_001905_hash proc_pid_readlink 3 52186 _001905_hash NULL
84780 +_001906_hash proc_read 3 43614 _001906_hash NULL
84781 +_001907_hash proc_self_readlink 3 38094 _001907_hash NULL
84782 +_001908_hash proc_sessionid_read 3 6911 _002038_hash NULL nohasharray
84783 +_001909_hash provide_user_output 3 41105 _001909_hash NULL
84784 +_001910_hash ps_pspoll_max_apturn_read 3 6699 _001910_hash NULL
84785 +_001911_hash ps_pspoll_timeouts_read 3 11776 _001911_hash NULL
84786 +_001912_hash ps_pspoll_utilization_read 3 5361 _001912_hash NULL
84787 +_001913_hash pstore_file_read 3 57288 _001913_hash NULL
84788 +_001914_hash ps_upsd_max_apturn_read 3 19918 _001914_hash NULL
84789 +_001915_hash ps_upsd_max_sptime_read 3 63362 _001915_hash NULL
84790 +_001916_hash ps_upsd_timeouts_read 3 28924 _001916_hash NULL
84791 +_001917_hash ps_upsd_utilization_read 3 51669 _001917_hash NULL
84792 +_001918_hash pvr2_v4l2_read 3 18006 _001918_hash NULL
84793 +_001919_hash pwr_disable_ps_read 3 13176 _001919_hash NULL
84794 +_001920_hash pwr_elp_enter_read 3 5324 _001920_hash NULL
84795 +_001921_hash pwr_enable_ps_read 3 17686 _001921_hash NULL
84796 +_001922_hash pwr_fix_tsf_ps_read 3 26627 _001922_hash NULL
84797 +_001923_hash pwr_missing_bcns_read 3 25824 _001923_hash NULL
84798 +_001924_hash pwr_power_save_off_read 3 18355 _001924_hash NULL
84799 +_001925_hash pwr_ps_enter_read 3 26935 _001925_hash &_000501_hash
84800 +_001926_hash pwr_rcvd_awake_beacons_read 3 50505 _001926_hash NULL
84801 +_001927_hash pwr_rcvd_beacons_read 3 52836 _001927_hash NULL
84802 +_001928_hash pwr_tx_without_ps_read 3 48423 _001928_hash NULL
84803 +_001929_hash pwr_tx_with_ps_read 3 60851 _001929_hash NULL
84804 +_001930_hash pwr_wake_on_host_read 3 26321 _001930_hash NULL
84805 +_001931_hash pwr_wake_on_timer_exp_read 3 22640 _001931_hash NULL
84806 +_001932_hash queues_read 3 24877 _001932_hash NULL
84807 +_001933_hash raw_recvmsg 4 17277 _001933_hash NULL
84808 +_001934_hash rcname_read 3 25919 _001934_hash NULL
84809 +_001935_hash read_4k_modal_eeprom 3 30212 _001935_hash NULL
84810 +_001936_hash read_9287_modal_eeprom 3 59327 _001936_hash NULL
84811 +_001937_hash reada_find_extent 2 63486 _001937_hash NULL
84812 +_001938_hash read_def_modal_eeprom 3 14041 _001938_hash NULL
84813 +_001939_hash read_enabled_file_bool 3 37744 _001939_hash NULL
84814 +_001940_hash read_file_ani 3 23161 _001940_hash NULL
84815 +_001941_hash read_file_antenna 3 13574 _001941_hash NULL
84816 +_001942_hash read_file_base_eeprom 3 42168 _001942_hash NULL
84817 +_001943_hash read_file_beacon 3 32595 _001943_hash NULL
84818 +_001944_hash read_file_blob 3 57406 _001944_hash NULL
84819 +_001945_hash read_file_bool 3 4180 _001945_hash NULL
84820 +_001946_hash read_file_credit_dist_stats 3 54367 _001946_hash NULL
84821 +_001947_hash read_file_debug 3 58256 _001947_hash NULL
84822 +_001948_hash read_file_disable_ani 3 6536 _001948_hash NULL
84823 +_001949_hash read_file_dma 3 9530 _001949_hash NULL
84824 +_001950_hash read_file_dump_nfcal 3 18766 _001950_hash NULL
84825 +_001951_hash read_file_frameerrors 3 64001 _001951_hash NULL
84826 +_001952_hash read_file_interrupt 3 61742 _001959_hash NULL nohasharray
84827 +_001953_hash read_file_misc 3 9948 _001953_hash NULL
84828 +_001954_hash read_file_modal_eeprom 3 39909 _001954_hash NULL
84829 +_001955_hash read_file_queue 3 40895 _001955_hash NULL
84830 +_001956_hash read_file_rcstat 3 22854 _001956_hash NULL
84831 +_001957_hash read_file_recv 3 48232 _001957_hash NULL
84832 +_001958_hash read_file_regidx 3 33370 _001958_hash NULL
84833 +_001959_hash read_file_regval 3 61742 _001959_hash &_001952_hash
84834 +_001960_hash read_file_reset 3 52310 _001960_hash NULL
84835 +_001961_hash read_file_rx_chainmask 3 41605 _001961_hash NULL
84836 +_001962_hash read_file_slot 3 50111 _001962_hash NULL
84837 +_001963_hash read_file_stations 3 35795 _001963_hash NULL
84838 +_001964_hash read_file_tgt_int_stats 3 20697 _001964_hash NULL
84839 +_001965_hash read_file_tgt_rx_stats 3 33944 _001965_hash NULL
84840 +_001966_hash read_file_tgt_stats 3 8959 _001966_hash NULL
84841 +_001967_hash read_file_tgt_tx_stats 3 51847 _001967_hash NULL
84842 +_001968_hash read_file_tx_chainmask 3 3829 _001968_hash NULL
84843 +_001969_hash read_file_war_stats 3 292 _001969_hash NULL
84844 +_001970_hash read_file_xmit 3 21487 _001970_hash NULL
84845 +_001971_hash read_from_oldmem 2 3337 _001971_hash NULL
84846 +_001972_hash read_oldmem 3 55658 _001972_hash NULL
84847 +_001973_hash regmap_name_read_file 3 39379 _001973_hash NULL
84848 +_001974_hash repair_io_failure 4 4815 _001974_hash NULL
84849 +_001975_hash request_key_and_link 4 42693 _001975_hash NULL
84850 +_001976_hash res_counter_read 4 33499 _001976_hash NULL
84851 +_001977_hash retry_count_read 3 52129 _001977_hash NULL
84852 +_001978_hash rs_sta_dbgfs_rate_scale_data_read 3 47165 _001978_hash NULL
84853 +_001979_hash rs_sta_dbgfs_scale_table_read 3 40262 _001979_hash NULL
84854 +_001980_hash rs_sta_dbgfs_stats_table_read 3 56573 _001980_hash NULL
84855 +_001981_hash rts_threshold_read 3 44384 _001981_hash NULL
84856 +_001982_hash rx_dropped_read 3 44799 _001982_hash NULL
84857 +_001983_hash rx_fcs_err_read 3 62844 _001983_hash NULL
84858 +_001984_hash rx_hdr_overflow_read 3 64407 _001984_hash NULL
84859 +_001985_hash rx_hw_stuck_read 3 57179 _001985_hash NULL
84860 +_001986_hash rx_out_of_mem_read 3 10157 _001986_hash NULL
84861 +_001987_hash rx_path_reset_read 3 23801 _001987_hash NULL
84862 +_001988_hash rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 _001988_hash NULL
84863 +_001989_hash rxpipe_descr_host_int_trig_rx_data_read 3 22001 _003089_hash NULL nohasharray
84864 +_001990_hash rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 _001990_hash NULL
84865 +_001991_hash rxpipe_rx_prep_beacon_drop_read 3 2403 _001991_hash NULL
84866 +_001992_hash rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 _001992_hash NULL
84867 +_001993_hash rx_reset_counter_read 3 58001 _001993_hash NULL
84868 +_001994_hash rx_xfr_hint_trig_read 3 40283 _001994_hash NULL
84869 +_001995_hash s5m_bulk_write 3 4833 _001995_hash NULL
84870 +_001996_hash scrub_setup_recheck_block 3-4 56245 _001996_hash NULL
84871 +_001998_hash scsi_adjust_queue_depth 3 12802 _001998_hash NULL
84872 +_001999_hash selinux_inode_notifysecctx 3 36896 _001999_hash NULL
84873 +_002000_hash sel_read_avc_cache_threshold 3 33942 _002000_hash NULL
84874 +_002001_hash sel_read_avc_hash_stats 3 1984 _002001_hash NULL
84875 +_002002_hash sel_read_bool 3 24236 _002002_hash NULL
84876 +_002003_hash sel_read_checkreqprot 3 33068 _002003_hash NULL
84877 +_002004_hash sel_read_class 3 12669 _002541_hash NULL nohasharray
84878 +_002005_hash sel_read_enforce 3 2828 _002005_hash NULL
84879 +_002006_hash sel_read_handle_status 3 56139 _002006_hash NULL
84880 +_002007_hash sel_read_handle_unknown 3 57933 _002007_hash NULL
84881 +_002008_hash sel_read_initcon 3 32362 _002008_hash NULL
84882 +_002009_hash sel_read_mls 3 25369 _002009_hash NULL
84883 +_002010_hash sel_read_perm 3 42302 _002010_hash NULL
84884 +_002011_hash sel_read_policy 3 55947 _002011_hash NULL
84885 +_002012_hash sel_read_policycap 3 28544 _002012_hash NULL
84886 +_002013_hash sel_read_policyvers 3 55 _002013_hash NULL
84887 +_002014_hash send_msg 4 37323 _002014_hash NULL
84888 +_002015_hash send_packet 4 52960 _002015_hash NULL
84889 +_002016_hash short_retry_limit_read 3 4687 _002016_hash NULL
84890 +_002017_hash simple_attr_read 3 24738 _002017_hash NULL
84891 +_002018_hash simple_transaction_read 3 17076 _002018_hash NULL
84892 +_002019_hash skb_copy_datagram_const_iovec 2-5-4 48102 _002019_hash NULL
84893 +_002022_hash skb_copy_datagram_iovec 2-4 5806 _002022_hash NULL
84894 +_002024_hash smk_read_ambient 3 61220 _002024_hash NULL
84895 +_002025_hash smk_read_direct 3 15803 _002025_hash NULL
84896 +_002026_hash smk_read_doi 3 30813 _002026_hash NULL
84897 +_002027_hash smk_read_logging 3 37804 _002027_hash NULL
84898 +_002028_hash smk_read_onlycap 3 3855 _002028_hash NULL
84899 +_002029_hash snapshot_read 3 22601 _002029_hash NULL
84900 +_002030_hash snd_cs4281_BA0_read 5 6847 _002030_hash NULL
84901 +_002031_hash snd_cs4281_BA1_read 5 20323 _002031_hash NULL
84902 +_002032_hash snd_cs46xx_io_read 5 45734 _002032_hash NULL
84903 +_002033_hash snd_gus_dram_read 4 56686 _002033_hash NULL
84904 +_002034_hash snd_pcm_oss_read 3 28317 _002034_hash NULL
84905 +_002035_hash snd_rme32_capture_copy 5 39653 _002035_hash NULL
84906 +_002036_hash snd_rme96_capture_copy 5 58484 _002036_hash NULL
84907 +_002037_hash snd_soc_hw_bulk_write_raw 4 14245 _002037_hash NULL
84908 +_002038_hash spi_show_regs 3 6911 _002038_hash &_001908_hash
84909 +_002039_hash sta_agg_status_read 3 14058 _002039_hash NULL
84910 +_002040_hash sta_connected_time_read 3 17435 _002040_hash NULL
84911 +_002041_hash sta_flags_read 3 56710 _002041_hash NULL
84912 +_002042_hash sta_ht_capa_read 3 10366 _002042_hash NULL
84913 +_002043_hash sta_last_seq_ctrl_read 3 19106 _002043_hash NULL
84914 +_002044_hash sta_num_ps_buf_frames_read 3 1488 _002044_hash NULL
84915 +_002045_hash st_read 3 51251 _002045_hash NULL
84916 +_002046_hash supply_map_read_file 3 10608 _002046_hash NULL
84917 +_002047_hash sysfs_read_file 3 42113 _002047_hash NULL
84918 +_002048_hash sys_lgetxattr 4 45531 _002048_hash NULL
84919 +_002049_hash sys_preadv 3 17100 _002049_hash NULL
84920 +_002050_hash sys_pwritev 3 41722 _002050_hash NULL
84921 +_002051_hash sys_readv 3 50664 _002051_hash NULL
84922 +_002052_hash sys_rt_sigpending 2 24961 _002052_hash NULL
84923 +_002053_hash sys_writev 3 28384 _002053_hash NULL
84924 +_002054_hash test_iso_queue 5 62534 _002054_hash NULL
84925 +_002055_hash ts_read 3 44687 _002055_hash NULL
84926 +_002056_hash TSS_authhmac 3 12839 _002056_hash NULL
84927 +_002057_hash TSS_checkhmac1 5 31429 _002057_hash NULL
84928 +_002058_hash TSS_checkhmac2 5-7 40520 _002058_hash NULL
84929 +_002060_hash tt3650_ci_msg_locked 4 8013 _002060_hash NULL
84930 +_002061_hash tun_sendmsg 4 10337 _002061_hash NULL
84931 +_002062_hash tx_internal_desc_overflow_read 3 47300 _002062_hash NULL
84932 +_002063_hash tx_queue_len_read 3 1463 _002063_hash NULL
84933 +_002064_hash tx_queue_status_read 3 44978 _002064_hash NULL
84934 +_002065_hash ubi_io_write_data 4-5 40305 _002065_hash NULL
84935 +_002067_hash uhci_debug_read 3 5911 _002067_hash NULL
84936 +_002068_hash unix_stream_recvmsg 4 35210 _002068_hash NULL
84937 +_002069_hash uvc_debugfs_stats_read 3 56651 _002069_hash NULL
84938 +_002070_hash vhost_add_used_and_signal_n 4 8038 _002070_hash NULL
84939 +_002071_hash vifs_state_read 3 33762 _002071_hash NULL
84940 +_002072_hash vmbus_open 2-3 12154 _002072_hash NULL
84941 +_002074_hash waiters_read 3 40902 _002074_hash NULL
84942 +_002075_hash wep_addr_key_count_read 3 20174 _002075_hash NULL
84943 +_002076_hash wep_decrypt_fail_read 3 58567 _002076_hash NULL
84944 +_002077_hash wep_default_key_count_read 3 43035 _002077_hash NULL
84945 +_002078_hash wep_interrupt_read 3 41492 _002078_hash NULL
84946 +_002079_hash wep_key_not_found_read 3 13377 _002079_hash &_000915_hash
84947 +_002080_hash wep_packets_read 3 18751 _002080_hash NULL
84948 +_002081_hash wl1271_format_buffer 2 20834 _002081_hash NULL
84949 +_002082_hash wm8994_bulk_write 3 13615 _002082_hash NULL
84950 +_002083_hash wusb_prf_256 7 29203 _002083_hash NULL
84951 +_002084_hash wusb_prf_64 7 51065 _002084_hash NULL
84952 +_002085_hash xfs_buf_read_uncached 4 27519 _002085_hash NULL
84953 +_002086_hash xfs_iext_add 3 41422 _002086_hash NULL
84954 +_002087_hash xfs_iext_remove_direct 3 40744 _002087_hash NULL
84955 +_002088_hash xfs_trans_get_efd 3 51148 _002088_hash NULL
84956 +_002089_hash xfs_trans_get_efi 2 7898 _002089_hash NULL
84957 +_002090_hash xlog_get_bp 2 23229 _002090_hash NULL
84958 +_002091_hash xz_dec_init 2 29029 _002091_hash NULL
84959 +_002092_hash aac_change_queue_depth 2 825 _002092_hash NULL
84960 +_002093_hash agp_allocate_memory_wrap 1 16576 _002093_hash NULL
84961 +_002094_hash arcmsr_adjust_disk_queue_depth 2 16756 _002094_hash NULL
84962 +_002095_hash atalk_recvmsg 4 22053 _002095_hash NULL
84963 +_002097_hash atomic_read_file 3 16227 _002097_hash NULL
84964 +_002098_hash ax25_recvmsg 4 64441 _002098_hash NULL
84965 +_002099_hash beacon_interval_read 3 7091 _002099_hash NULL
84966 +_002100_hash btrfs_init_new_buffer 4 55761 _002100_hash NULL
84967 +_002101_hash btrfs_mksubvol 3 39479 _002101_hash NULL
84968 +_002102_hash bt_sock_recvmsg 4 12316 _002102_hash NULL
84969 +_002103_hash bt_sock_stream_recvmsg 4 52518 _002103_hash NULL
84970 +_002104_hash caif_seqpkt_recvmsg 4 32241 _002104_hash NULL
84971 +_002105_hash cpu_type_read 3 36540 _002105_hash NULL
84972 +_002106_hash cx18_read 3 23699 _002106_hash NULL
84973 +_002107_hash dccp_recvmsg 4 16056 _002107_hash NULL
84974 +_002108_hash depth_read 3 31112 _002108_hash NULL
84975 +_002109_hash dfs_global_file_read 3 7787 _002109_hash NULL
84976 +_002110_hash dgram_recvmsg 4 23104 _002110_hash NULL
84977 +_002111_hash dma_skb_copy_datagram_iovec 3-5 21516 _002111_hash NULL
84978 +_002113_hash dtim_interval_read 3 654 _002113_hash NULL
84979 +_002114_hash dynamic_ps_timeout_read 3 10110 _002114_hash NULL
84980 +_002115_hash enable_read 3 2117 _002115_hash NULL
84981 +_002116_hash exofs_read_kern 6 39921 _002116_hash &_001885_hash
84982 +_002117_hash fc_change_queue_depth 2 36841 _002117_hash NULL
84983 +_002118_hash forced_ps_read 3 31685 _002118_hash NULL
84984 +_002119_hash frequency_read 3 64031 _003106_hash NULL nohasharray
84985 +_002120_hash get_alua_req 3 4166 _002120_hash NULL
84986 +_002121_hash get_rdac_req 3 45882 _002121_hash NULL
84987 +_002122_hash hci_sock_recvmsg 4 7072 _002122_hash NULL
84988 +_002123_hash hpsa_change_queue_depth 2 15449 _002123_hash NULL
84989 +_002124_hash hptiop_adjust_disk_queue_depth 2 20122 _002124_hash NULL
84990 +_002125_hash ide_queue_pc_tail 5 11673 _002125_hash NULL
84991 +_002126_hash ide_raw_taskfile 4 42355 _002126_hash NULL
84992 +_002127_hash idetape_queue_rw_tail 3 29562 _002127_hash NULL
84993 +_002128_hash ieee80211_if_read_aid 3 9705 _002128_hash NULL
84994 +_002129_hash ieee80211_if_read_auto_open_plinks 3 38268 _002129_hash NULL
84995 +_002130_hash ieee80211_if_read_ave_beacon 3 64924 _002130_hash NULL
84996 +_002131_hash ieee80211_if_read_bssid 3 35161 _002131_hash NULL
84997 +_002132_hash ieee80211_if_read_channel_type 3 23884 _002132_hash NULL
84998 +_002133_hash ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 _002133_hash NULL
84999 +_002134_hash ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 _002134_hash NULL
85000 +_002135_hash ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 _002135_hash NULL
85001 +_002136_hash ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 _002136_hash NULL
85002 +_002137_hash ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 _002137_hash NULL
85003 +_002138_hash ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 _002138_hash NULL
85004 +_002139_hash ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 _002139_hash NULL
85005 +_002140_hash ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 _002140_hash NULL
85006 +_002141_hash ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 _002141_hash NULL
85007 +_002142_hash ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 _002142_hash NULL
85008 +_002143_hash ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 _002143_hash NULL
85009 +_002144_hash ieee80211_if_read_dot11MeshMaxRetries 3 12756 _002144_hash NULL
85010 +_002145_hash ieee80211_if_read_dot11MeshRetryTimeout 3 52168 _002145_hash NULL
85011 +_002146_hash ieee80211_if_read_dot11MeshTTL 3 58307 _002146_hash NULL
85012 +_002147_hash ieee80211_if_read_dropped_frames_congestion 3 32603 _002147_hash NULL
85013 +_002148_hash ieee80211_if_read_dropped_frames_no_route 3 33383 _002148_hash NULL
85014 +_002149_hash ieee80211_if_read_dropped_frames_ttl 3 44500 _002149_hash NULL
85015 +_002150_hash ieee80211_if_read_drop_unencrypted 3 37053 _002150_hash NULL
85016 +_002151_hash ieee80211_if_read_dtim_count 3 38419 _002151_hash NULL
85017 +_002152_hash ieee80211_if_read_element_ttl 3 18869 _002152_hash NULL
85018 +_002153_hash ieee80211_if_read_estab_plinks 3 32533 _002153_hash NULL
85019 +_002154_hash ieee80211_if_read_flags 3 57470 _002389_hash NULL nohasharray
85020 +_002155_hash ieee80211_if_read_fwded_frames 3 36520 _002155_hash NULL
85021 +_002156_hash ieee80211_if_read_fwded_mcast 3 39571 _002156_hash &_000151_hash
85022 +_002157_hash ieee80211_if_read_fwded_unicast 3 59740 _002859_hash NULL nohasharray
85023 +_002158_hash ieee80211_if_read_last_beacon 3 31257 _002158_hash NULL
85024 +_002159_hash ieee80211_if_read_min_discovery_timeout 3 13946 _002159_hash NULL
85025 +_002160_hash ieee80211_if_read_num_buffered_multicast 3 12716 _002160_hash NULL
85026 +_002161_hash ieee80211_if_read_num_sta_authorized 3 56177 _002161_hash NULL
85027 +_002162_hash ieee80211_if_read_num_sta_ps 3 34722 _002162_hash NULL
85028 +_002163_hash ieee80211_if_read_path_refresh_time 3 25545 _002163_hash NULL
85029 +_002164_hash ieee80211_if_read_peer 3 45233 _002164_hash NULL
85030 +_002165_hash ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 _002165_hash NULL
85031 +_002166_hash ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 _002166_hash NULL
85032 +_002167_hash ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 _002167_hash NULL
85033 +_002168_hash ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 _002168_hash NULL
85034 +_002169_hash ieee80211_if_read_rssi_threshold 3 49260 _002169_hash NULL
85035 +_002170_hash ieee80211_if_read_smps 3 27416 _002170_hash NULL
85036 +_002171_hash ieee80211_if_read_state 3 9813 _002280_hash NULL nohasharray
85037 +_002172_hash ieee80211_if_read_tkip_mic_test 3 19565 _002172_hash NULL
85038 +_002173_hash ieee80211_if_read_tsf 3 16420 _002173_hash NULL
85039 +_002174_hash ieee80211_if_read_uapsd_max_sp_len 3 15067 _002174_hash NULL
85040 +_002175_hash ieee80211_if_read_uapsd_queues 3 55150 _002175_hash NULL
85041 +_002176_hash ieee80211_rx_mgmt_beacon 3 24430 _002176_hash NULL
85042 +_002177_hash ieee80211_rx_mgmt_probe_resp 3 6918 _002177_hash NULL
85043 +_002178_hash ima_show_htable_violations 3 10619 _002178_hash NULL
85044 +_002179_hash ima_show_measurements_count 3 23536 _002179_hash NULL
85045 +_002180_hash insert_one_name 7 61668 _002180_hash NULL
85046 +_002181_hash ipr_change_queue_depth 2 6431 _002181_hash NULL
85047 +_002182_hash ip_recv_error 3 23109 _002182_hash NULL
85048 +_002183_hash ipv6_recv_error 3 56347 _002183_hash NULL
85049 +_002184_hash ipv6_recv_rxpmtu 3 7142 _002184_hash NULL
85050 +_002185_hash ipx_recvmsg 4 44366 _002185_hash NULL
85051 +_002186_hash irda_recvmsg_dgram 4 32631 _002186_hash NULL
85052 +_002187_hash iscsi_change_queue_depth 2 23416 _002187_hash NULL
85053 +_002188_hash ivtv_read_pos 3 34400 _002188_hash &_000303_hash
85054 +_002189_hash key_conf_hw_key_idx_read 3 25003 _002189_hash NULL
85055 +_002190_hash key_conf_keyidx_read 3 42443 _002190_hash NULL
85056 +_002191_hash key_conf_keylen_read 3 49758 _002191_hash NULL
85057 +_002192_hash key_flags_read 3 25931 _002192_hash NULL
85058 +_002193_hash key_ifindex_read 3 31411 _002193_hash NULL
85059 +_002194_hash key_tx_rx_count_read 3 44742 _002194_hash NULL
85060 +_002195_hash l2cap_sock_sendmsg 4 63427 _002195_hash NULL
85061 +_002196_hash l2tp_ip_recvmsg 4 22681 _002196_hash NULL
85062 +_002197_hash llc_ui_recvmsg 4 3826 _002197_hash NULL
85063 +_002198_hash lpfc_change_queue_depth 2 25905 _002198_hash NULL
85064 +_002199_hash macvtap_do_read 4 36555 _002199_hash &_001832_hash
85065 +_002200_hash megaraid_change_queue_depth 2 64815 _002200_hash NULL
85066 +_002201_hash megasas_change_queue_depth 2 32747 _002201_hash NULL
85067 +_002202_hash mptscsih_change_queue_depth 2 26036 _002202_hash NULL
85068 +_002203_hash NCR_700_change_queue_depth 2 31742 _002203_hash NULL
85069 +_002204_hash netlink_recvmsg 4 61600 _002204_hash NULL
85070 +_002205_hash nfsctl_transaction_read 3 48250 _002205_hash NULL
85071 +_002206_hash nfs_map_group_to_gid 3 15892 _002206_hash NULL
85072 +_002207_hash nfs_map_name_to_uid 3 51132 _002207_hash NULL
85073 +_002208_hash nr_recvmsg 4 12649 _002208_hash NULL
85074 +_002209_hash osd_req_list_collection_objects 5 36664 _002209_hash NULL
85075 +_002210_hash osd_req_list_partition_objects 5 56464 _002210_hash NULL
85076 +_002212_hash packet_recv_error 3 16669 _002212_hash NULL
85077 +_002213_hash packet_recvmsg 4 47700 _002213_hash NULL
85078 +_002214_hash pep_recvmsg 4 19402 _002214_hash NULL
85079 +_002215_hash pfkey_recvmsg 4 53604 _002215_hash NULL
85080 +_002216_hash ping_recvmsg 4 25597 _002216_hash NULL
85081 +_002217_hash pmcraid_change_queue_depth 2 9116 _002217_hash NULL
85082 +_002218_hash pn_recvmsg 4 30887 _002218_hash NULL
85083 +_002219_hash pointer_size_read 3 51863 _002219_hash NULL
85084 +_002220_hash power_read 3 15939 _002220_hash NULL
85085 +_002221_hash pppoe_recvmsg 4 15073 _002221_hash NULL
85086 +_002222_hash pppol2tp_recvmsg 4 57742 _002222_hash NULL
85087 +_002223_hash qla2x00_adjust_sdev_qdepth_up 2 20097 _002223_hash NULL
85088 +_002224_hash qla2x00_change_queue_depth 2 24742 _002224_hash NULL
85089 +_002225_hash raw_recvmsg 4 52529 _002225_hash NULL
85090 +_002226_hash rawsock_recvmsg 4 12144 _002226_hash NULL
85091 +_002227_hash rawv6_recvmsg 4 30265 _002227_hash NULL
85092 +_002228_hash reada_add_block 2 54247 _002228_hash NULL
85093 +_002229_hash readahead_tree_block 3 36285 _002229_hash NULL
85094 +_002230_hash reada_tree_block_flagged 3 18402 _002230_hash NULL
85095 +_002231_hash read_tree_block 3 841 _002231_hash NULL
85096 +_002232_hash recover_peb 6-7 29238 _002232_hash NULL
85097 +_002234_hash recv_msg 4 48709 _002234_hash NULL
85098 +_002235_hash recv_stream 4 30138 _002235_hash NULL
85099 +_002236_hash _req_append_segment 2 41031 _002236_hash NULL
85100 +_002237_hash request_key_async 4 6990 _002237_hash NULL
85101 +_002238_hash request_key_async_with_auxdata 4 46624 _002238_hash NULL
85102 +_002239_hash request_key_with_auxdata 4 24515 _002239_hash NULL
85103 +_002240_hash rose_recvmsg 4 2368 _002240_hash NULL
85104 +_002241_hash rxrpc_recvmsg 4 26233 _002241_hash NULL
85105 +_002242_hash rx_streaming_always_read 3 49401 _002242_hash NULL
85106 +_002243_hash rx_streaming_interval_read 3 55291 _002243_hash NULL
85107 +_002244_hash sas_change_queue_depth 2 18555 _002244_hash NULL
85108 +_002245_hash scsi_activate_tcq 2 42640 _002245_hash NULL
85109 +_002246_hash scsi_deactivate_tcq 2 47086 _002246_hash NULL
85110 +_002247_hash scsi_execute 5 33596 _002247_hash NULL
85111 +_002248_hash _scsih_adjust_queue_depth 2 1083 _002248_hash NULL
85112 +_002249_hash scsi_init_shared_tag_map 2 59812 _002249_hash NULL
85113 +_002250_hash scsi_track_queue_full 2 44239 _002250_hash NULL
85114 +_002251_hash sctp_recvmsg 4 23265 _002251_hash NULL
85115 +_002252_hash send_stream 4 3397 _002252_hash NULL
85116 +_002253_hash skb_copy_and_csum_datagram_iovec 2 24466 _002253_hash NULL
85117 +_002255_hash snd_gf1_mem_proc_dump 5 16926 _002255_hash NULL
85118 +_002256_hash split_scan_timeout_read 3 20029 _002256_hash NULL
85119 +_002257_hash sta_dev_read 3 14782 _002257_hash NULL
85120 +_002258_hash sta_inactive_ms_read 3 25690 _002258_hash NULL
85121 +_002259_hash sta_last_signal_read 3 31818 _002259_hash NULL
85122 +_002260_hash stats_dot11ACKFailureCount_read 3 45558 _002260_hash NULL
85123 +_002261_hash stats_dot11FCSErrorCount_read 3 28154 _002261_hash NULL
85124 +_002262_hash stats_dot11RTSFailureCount_read 3 43948 _002262_hash NULL
85125 +_002263_hash stats_dot11RTSSuccessCount_read 3 33065 _002263_hash NULL
85126 +_002264_hash storvsc_connect_to_vsp 2 22 _002264_hash NULL
85127 +_002265_hash suspend_dtim_interval_read 3 64971 _002265_hash NULL
85128 +_002266_hash sys_msgrcv 3 959 _002266_hash NULL
85129 +_002267_hash tcm_loop_change_queue_depth 2 42454 _002267_hash NULL
85130 +_002268_hash tcp_copy_to_iovec 3 28344 _002268_hash NULL
85131 +_002269_hash tcp_recvmsg 4 31238 _002269_hash NULL
85132 +_002270_hash timeout_read 3 47915 _002270_hash NULL
85133 +_002271_hash total_ps_buffered_read 3 16365 _002271_hash NULL
85134 +_002272_hash tun_put_user 4 59849 _002272_hash NULL
85135 +_002273_hash twa_change_queue_depth 2 48808 _002273_hash NULL
85136 +_002274_hash tw_change_queue_depth 2 11116 _002274_hash NULL
85137 +_002275_hash twl_change_queue_depth 2 41342 _002275_hash NULL
85138 +_002276_hash ubi_eba_write_leb 5-6 19826 _002276_hash NULL
85139 +_002278_hash ubi_eba_write_leb_st 5 27896 _002278_hash NULL
85140 +_002279_hash udp_recvmsg 4 42558 _002279_hash NULL
85141 +_002280_hash udpv6_recvmsg 4 9813 _002280_hash &_002171_hash
85142 +_002281_hash ulong_read_file 3 42304 _002281_hash &_000511_hash
85143 +_002282_hash unix_dgram_recvmsg 4 14952 _002282_hash NULL
85144 +_002283_hash user_power_read 3 39414 _002283_hash NULL
85145 +_002284_hash vcc_recvmsg 4 37198 _002284_hash NULL
85146 +_002285_hash wep_iv_read 3 54744 _002285_hash NULL
85147 +_002286_hash x25_recvmsg 4 42777 _002286_hash NULL
85148 +_002287_hash xfs_iext_insert 3 18667 _002287_hash NULL
85149 +_002288_hash xfs_iext_remove 3 50909 _002288_hash NULL
85150 +_002289_hash xlog_find_verify_log_record 2 18870 _002289_hash NULL
85151 +_002290_hash btrfs_alloc_free_block 3 29982 _002290_hash NULL
85152 +_002291_hash cx18_read_pos 3 4683 _002291_hash NULL
85153 +_002292_hash l2cap_sock_recvmsg 4 59886 _002292_hash NULL
85154 +_002293_hash osd_req_list_dev_partitions 4 60027 _002293_hash NULL
85155 +_002294_hash osd_req_list_partition_collections 5 38223 _002294_hash NULL
85156 +_002295_hash osst_do_scsi 4 44410 _002295_hash NULL
85157 +_002296_hash qla2x00_handle_queue_full 2 24365 _002296_hash NULL
85158 +_002297_hash rfcomm_sock_recvmsg 4 22227 _002297_hash NULL
85159 +_002298_hash scsi_execute_req 5 42088 _002298_hash NULL
85160 +_002299_hash _scsih_change_queue_depth 2 26230 _002299_hash NULL
85161 +_002300_hash spi_execute 5 28736 _002300_hash NULL
85162 +_002301_hash submit_inquiry 3 42108 _002301_hash NULL
85163 +_002302_hash tcp_dma_try_early_copy 3 37651 _002302_hash NULL
85164 +_002303_hash tun_do_read 4 50800 _002303_hash NULL
85165 +_002304_hash ubi_eba_atomic_leb_change 5 13041 _002304_hash NULL
85166 +_002305_hash ubi_leb_write 4-5 41691 _002305_hash NULL
85167 +_002307_hash unix_seqpacket_recvmsg 4 23062 _002307_hash NULL
85168 +_002308_hash write_leb 5 36957 _002308_hash NULL
85169 +_002309_hash ch_do_scsi 4 31171 _002309_hash NULL
85170 +_002310_hash dbg_leb_write 4-5 20478 _002310_hash NULL
85171 +_002312_hash scsi_mode_sense 5 16835 _002312_hash NULL
85172 +_002313_hash scsi_vpd_inquiry 4 30040 _002313_hash NULL
85173 +_002314_hash ses_recv_diag 4 47143 _002314_hash &_000673_hash
85174 +_002315_hash ses_send_diag 4 64527 _002315_hash NULL
85175 +_002316_hash spi_dv_device_echo_buffer 2-3 39846 _002316_hash NULL
85176 +_002318_hash ubifs_leb_write 4-5 61226 _002318_hash NULL
85177 +_002320_hash ubi_leb_change 4 14899 _002320_hash NULL
85178 +_002321_hash ubi_write 4-5 30809 _002321_hash NULL
85179 +_002322_hash dbg_leb_change 4 19969 _002322_hash NULL
85180 +_002323_hash gluebi_write 3 27905 _002323_hash NULL
85181 +_002324_hash scsi_get_vpd_page 4 51951 _002324_hash NULL
85182 +_002325_hash sd_do_mode_sense 5 11507 _002325_hash NULL
85183 +_002326_hash ubifs_leb_change 4 22399 _002436_hash NULL nohasharray
85184 +_002327_hash ubifs_write_node 5 15088 _002327_hash NULL
85185 +_002328_hash fixup_leb 3 43256 _002328_hash NULL
85186 +_002329_hash recover_head 3 17904 _002329_hash NULL
85187 +_002330_hash alloc_cpu_rmap 1 65363 _002330_hash NULL
85188 +_002331_hash alloc_ebda_hpc 1-2 50046 _002331_hash NULL
85189 +_002333_hash alloc_sched_domains 1 28972 _002333_hash NULL
85190 +_002334_hash amthi_read 4 45831 _002334_hash NULL
85191 +_002335_hash bcm_char_read 3 31750 _002335_hash NULL
85192 +_002336_hash BcmCopySection 5 2035 _002336_hash NULL
85193 +_002337_hash buffer_from_user 3 51826 _002337_hash NULL
85194 +_002338_hash buffer_to_user 3 35439 _002338_hash NULL
85195 +_002339_hash c4iw_init_resource_fifo 3 48090 _002339_hash NULL
85196 +_002340_hash c4iw_init_resource_fifo_random 3 25547 _002340_hash NULL
85197 +_002341_hash card_send_command 3 40757 _002341_hash NULL
85198 +_002342_hash chd_dec_fetch_cdata 3 50926 _002342_hash NULL
85199 +_002343_hash crystalhd_create_dio_pool 2 3427 _002343_hash NULL
85200 +_002344_hash crystalhd_user_data 3 18407 _002344_hash NULL
85201 +_002345_hash cxio_init_resource_fifo 3 28764 _002345_hash NULL
85202 +_002346_hash cxio_init_resource_fifo_random 3 47151 _002346_hash NULL
85203 +_002347_hash do_pages_stat 2 4437 _002347_hash NULL
85204 +_002348_hash do_read_log_to_user 4 3236 _002348_hash NULL
85205 +_002349_hash do_write_log_from_user 3 39362 _002349_hash NULL
85206 +_002350_hash dt3155_read 3 59226 _002350_hash NULL
85207 +_002351_hash easycap_alsa_vmalloc 2 14426 _002351_hash NULL
85208 +_002352_hash evm_read_key 3 54674 _002352_hash NULL
85209 +_002353_hash evm_write_key 3 27715 _002353_hash NULL
85210 +_002354_hash fir16_create 3 5574 _002354_hash NULL
85211 +_002355_hash iio_allocate_device 1 18821 _002355_hash NULL
85212 +_002356_hash __iio_allocate_kfifo 2-3 55738 _002356_hash NULL
85213 +_002358_hash __iio_allocate_sw_ring_buffer 3 4843 _002358_hash NULL
85214 +_002359_hash iio_debugfs_read_reg 3 60908 _002359_hash NULL
85215 +_002360_hash iio_debugfs_write_reg 3 22742 _002360_hash NULL
85216 +_002361_hash iio_event_chrdev_read 3 54757 _002361_hash NULL
85217 +_002362_hash iio_read_first_n_kfifo 2 57910 _002362_hash NULL
85218 +_002363_hash iio_read_first_n_sw_rb 2 51911 _002363_hash NULL
85219 +_002364_hash ioapic_setup_resources 1 35255 _002364_hash NULL
85220 +_002365_hash keymap_store 4 45406 _002365_hash NULL
85221 +_002366_hash kzalloc_node 1 24352 _002366_hash NULL
85222 +_002367_hash line6_alloc_sysex_buffer 4 28225 _002367_hash NULL
85223 +_002368_hash line6_dumpreq_initbuf 3 53123 _002368_hash NULL
85224 +_002369_hash line6_midibuf_init 2 52425 _002369_hash NULL
85225 +_002370_hash lirc_write 3 20604 _002370_hash NULL
85226 +_002371_hash _malloc 1 54077 _002371_hash NULL
85227 +_002372_hash mei_read 3 6507 _002372_hash NULL
85228 +_002373_hash mei_write 3 4005 _002373_hash NULL
85229 +_002374_hash mempool_create_node 1 44715 _002374_hash NULL
85230 +_002375_hash msg_set 3 51725 _002375_hash NULL
85231 +_002376_hash newpart 6 47485 _002376_hash NULL
85232 +_002377_hash OS_kmalloc 1 36909 _002377_hash NULL
85233 +_002378_hash pcpu_alloc_bootmem 2 62074 _002378_hash NULL
85234 +_002379_hash pcpu_get_vm_areas 3 50085 _002379_hash NULL
85235 +_002380_hash resource_from_user 3 30341 _002380_hash NULL
85236 +_002381_hash sca3000_read_data 4 57064 _002381_hash NULL
85237 +_002382_hash sca3000_read_first_n_hw_rb 2 11479 _002382_hash NULL
85238 +_002383_hash send_midi_async 3 57463 _002383_hash NULL
85239 +_002384_hash sep_create_dcb_dmatables_context 6 37551 _002384_hash NULL
85240 +_002385_hash sep_create_dcb_dmatables_context_kernel 6 49728 _002385_hash NULL
85241 +_002386_hash sep_create_msgarea_context 4 33829 _002386_hash NULL
85242 +_002387_hash sep_lli_table_secure_dma 2-3 64042 _002387_hash NULL
85243 +_002389_hash sep_lock_user_pages 2-3 57470 _002389_hash &_002154_hash
85244 +_002391_hash sep_prepare_input_output_dma_table_in_dcb 4-5 63087 _002391_hash NULL
85245 +_002393_hash sep_read 3 17161 _002393_hash NULL
85246 +_002394_hash TransmitTcb 4 12989 _002394_hash NULL
85247 +_002395_hash ValidateDSDParamsChecksum 3 63654 _002395_hash NULL
85248 +_002396_hash Wb35Reg_BurstWrite 4 62327 _002396_hash NULL
85249 +_002397_hash __alloc_bootmem_low_node 2 25726 _002397_hash &_001499_hash
85250 +_002398_hash __alloc_bootmem_node 2 1992 _002398_hash NULL
85251 +_002399_hash alloc_irq_cpu_rmap 1 28459 _002399_hash NULL
85252 +_002400_hash alloc_ring 2-4 18278 _002400_hash NULL
85253 +_002402_hash c4iw_init_resource 2-3 30393 _002402_hash NULL
85254 +_002404_hash cxio_hal_init_resource 2-7-6 29771 _002404_hash &_000284_hash
85255 +_002407_hash cxio_hal_init_rhdl_resource 1 25104 _002407_hash NULL
85256 +_002408_hash disk_expand_part_tbl 2 30561 _002408_hash NULL
85257 +_002409_hash InterfaceTransmitPacket 3 42058 _002409_hash NULL
85258 +_002410_hash line6_dumpreq_init 3 34473 _002410_hash NULL
85259 +_002411_hash mempool_create 1 29437 _002411_hash NULL
85260 +_002412_hash pcpu_fc_alloc 2 11818 _002412_hash NULL
85261 +_002413_hash pod_alloc_sysex_buffer 3 31651 _002413_hash NULL
85262 +_002414_hash r8712_usbctrl_vendorreq 6 48489 _002414_hash NULL
85263 +_002415_hash r871x_set_wpa_ie 3 7000 _002415_hash NULL
85264 +_002416_hash sys_move_pages 2 42626 _002416_hash NULL
85265 +_002417_hash variax_alloc_sysex_buffer 3 15237 _002417_hash NULL
85266 +_002418_hash vme_user_write 3 15587 _002418_hash NULL
85267 +_002419_hash add_partition 2 55588 _002419_hash NULL
85268 +_002420_hash __alloc_bootmem_node_high 2 65076 _002420_hash NULL
85269 +_002421_hash ceph_msgpool_init 3 33312 _002421_hash NULL
85270 +_002423_hash mempool_create_kmalloc_pool 1 41650 _002423_hash NULL
85271 +_002424_hash mempool_create_page_pool 1 30189 _002424_hash NULL
85272 +_002425_hash mempool_create_slab_pool 1 62907 _002425_hash NULL
85273 +_002426_hash variax_set_raw2 4 32374 _002426_hash NULL
85274 +_002427_hash bioset_create 1 5580 _002427_hash NULL
85275 +_002428_hash bioset_integrity_create 2 62708 _002428_hash NULL
85276 +_002429_hash biovec_create_pools 2 9575 _002429_hash NULL
85277 +_002430_hash i2o_pool_alloc 4 55485 _002430_hash NULL
85278 +_002431_hash prison_create 1 43623 _002431_hash NULL
85279 +_002432_hash unlink_simple 3 47506 _002432_hash NULL
85280 +_002433_hash alloc_ieee80211 1 20063 _002433_hash NULL
85281 +_002434_hash alloc_ieee80211_rsl 1 34564 _002434_hash NULL
85282 +_002435_hash alloc_page_cgroup 1 2919 _002435_hash NULL
85283 +_002436_hash alloc_private 2 22399 _002436_hash &_002326_hash
85284 +_002437_hash alloc_rtllib 1 51136 _002437_hash NULL
85285 +_002438_hash alloc_rx_desc_ring 2 18016 _002438_hash NULL
85286 +_002439_hash alloc_subdevices 2 43300 _002439_hash NULL
85287 +_002440_hash atomic_counters_read 3 48827 _002440_hash NULL
85288 +_002441_hash atomic_stats_read 3 36228 _002441_hash NULL
85289 +_002442_hash capabilities_read 3 58457 _002442_hash NULL
85290 +_002443_hash comedi_read 3 13199 _002443_hash NULL
85291 +_002444_hash comedi_write 3 47926 _002444_hash NULL
85292 +_002445_hash compat_do_arpt_set_ctl 4 12184 _002445_hash NULL
85293 +_002446_hash compat_do_ip6t_set_ctl 4 3184 _002446_hash NULL
85294 +_002447_hash compat_do_ipt_set_ctl 4 58466 _002447_hash &_001852_hash
85295 +_002448_hash compat_filldir 3 32999 _002448_hash NULL
85296 +_002449_hash compat_filldir64 3 35354 _002449_hash NULL
85297 +_002450_hash compat_fillonedir 3 15620 _002450_hash NULL
85298 +_002451_hash compat_rw_copy_check_uvector 3 25242 _002451_hash NULL
85299 +_002452_hash compat_sock_setsockopt 5 23 _002452_hash NULL
85300 +_002453_hash compat_sys_kexec_load 2 35674 _002453_hash NULL
85301 +_002454_hash compat_sys_keyctl 4 9639 _002454_hash NULL
85302 +_002455_hash compat_sys_move_pages 2 5861 _002455_hash NULL
85303 +_002456_hash compat_sys_mq_timedsend 3 31060 _002456_hash NULL
85304 +_002457_hash compat_sys_msgrcv 2 7482 _002457_hash NULL
85305 +_002458_hash compat_sys_msgsnd 2 10738 _002458_hash NULL
85306 +_002459_hash compat_sys_semtimedop 3 3606 _002459_hash NULL
85307 +_002460_hash __copy_in_user 3 34790 _002460_hash NULL
85308 +_002461_hash copy_in_user 3 57502 _002461_hash NULL
85309 +_002462_hash dev_counters_read 3 19216 _002462_hash NULL
85310 +_002463_hash dev_names_read 3 38509 _002463_hash NULL
85311 +_002464_hash do_arpt_set_ctl 4 51053 _002464_hash NULL
85312 +_002465_hash do_ip6t_set_ctl 4 60040 _002465_hash NULL
85313 +_002466_hash do_ipt_set_ctl 4 56238 _002466_hash NULL
85314 +_002467_hash drbd_bm_resize 2 20522 _002467_hash NULL
85315 +_002468_hash driver_names_read 3 60399 _002468_hash NULL
85316 +_002469_hash driver_stats_read 3 8944 _002469_hash NULL
85317 +_002470_hash __earlyonly_bootmem_alloc 2 23824 _002470_hash NULL
85318 +_002471_hash evtchn_read 3 3569 _002471_hash NULL
85319 +_002472_hash ext_sd_execute_read_data 9 48589 _002472_hash NULL
85320 +_002473_hash ext_sd_execute_write_data 9 8175 _002473_hash NULL
85321 +_002474_hash fat_compat_ioctl_filldir 3 36328 _002474_hash NULL
85322 +_002475_hash firmwareUpload 3 32794 _002475_hash NULL
85323 +_002476_hash flash_read 3 57843 _002476_hash NULL
85324 +_002477_hash flash_write 3 62354 _002477_hash NULL
85325 +_002478_hash gather_array 3 56641 _002478_hash NULL
85326 +_002479_hash ghash_async_setkey 3 60001 _002479_hash NULL
85327 +_002480_hash gntdev_alloc_map 2 35145 _002480_hash NULL
85328 +_002481_hash gnttab_map 2 56439 _002481_hash NULL
85329 +_002482_hash gru_alloc_gts 2-3 60056 _002482_hash NULL
85330 +_002484_hash handle_eviocgbit 3 44193 _002484_hash NULL
85331 +_002485_hash hid_parse_report 3 51737 _002485_hash NULL
85332 +_002486_hash ieee80211_alloc_txb 1-2 52477 _002486_hash NULL
85333 +_002487_hash ieee80211_wx_set_gen_ie 3 51399 _002487_hash NULL
85334 +_002488_hash ieee80211_wx_set_gen_ie_rsl 3 3521 _002488_hash NULL
85335 +_002489_hash init_cdev 1 8274 _002489_hash NULL
85336 +_002490_hash init_per_cpu 1 17880 _002490_hash NULL
85337 +_002491_hash ipath_create_cq 2 45586 _002491_hash NULL
85338 +_002492_hash ipath_get_base_info 3 7043 _002492_hash NULL
85339 +_002493_hash ipath_init_qp_table 2 25167 _002493_hash NULL
85340 +_002494_hash ipath_resize_cq 2 712 _002494_hash NULL
85341 +_002495_hash ni_gpct_device_construct 5 610 _002495_hash NULL
85342 +_002496_hash options_write 3 47243 _002496_hash NULL
85343 +_002497_hash portcntrs_1_read 3 47253 _002497_hash NULL
85344 +_002498_hash portcntrs_2_read 3 56586 _002498_hash NULL
85345 +_002499_hash portnames_read 3 41958 _002499_hash NULL
85346 +_002500_hash ptc_proc_write 3 12076 _002500_hash NULL
85347 +_002501_hash put_cmsg_compat 4 35937 _002501_hash NULL
85348 +_002502_hash qib_alloc_devdata 2 51819 _002502_hash NULL
85349 +_002503_hash qib_alloc_fast_reg_page_list 2 10507 _002503_hash NULL
85350 +_002504_hash qib_cdev_init 1 34778 _002504_hash NULL
85351 +_002505_hash qib_create_cq 2 27497 _002505_hash NULL
85352 +_002506_hash qib_diag_write 3 62133 _002506_hash NULL
85353 +_002507_hash qib_get_base_info 3 11369 _002507_hash NULL
85354 +_002508_hash qib_resize_cq 2 53090 _002508_hash NULL
85355 +_002509_hash qsfp_1_read 3 21915 _002509_hash NULL
85356 +_002510_hash qsfp_2_read 3 31491 _002510_hash NULL
85357 +_002511_hash queue_reply 3 22416 _002511_hash NULL
85358 +_002512_hash Realloc 2 34961 _002512_hash NULL
85359 +_002513_hash rfc4106_set_key 3 54519 _002513_hash NULL
85360 +_002514_hash rtllib_alloc_txb 1-2 21687 _002514_hash NULL
85361 +_002515_hash rtllib_wx_set_gen_ie 3 59808 _002515_hash NULL
85362 +_002516_hash rts51x_transfer_data_partial 6 5735 _002516_hash NULL
85363 +_002517_hash sparse_early_usemaps_alloc_node 4 9269 _002517_hash NULL
85364 +_002518_hash split 2 11691 _002518_hash NULL
85365 +_002519_hash stats_read_ul 3 32751 _002519_hash NULL
85366 +_002520_hash store_debug_level 3 35652 _002520_hash NULL
85367 +_002521_hash sys32_ipc 3 7238 _002521_hash NULL
85368 +_002522_hash sys32_rt_sigpending 2 25814 _002522_hash NULL
85369 +_002523_hash tunables_read 3 36385 _002523_hash NULL
85370 +_002524_hash tunables_write 3 59563 _002524_hash NULL
85371 +_002525_hash u32_array_read 3 2219 _002525_hash NULL
85372 +_002526_hash usb_buffer_alloc 2 36276 _002526_hash NULL
85373 +_002527_hash xenbus_file_write 3 6282 _002527_hash NULL
85374 +_002528_hash xpc_kmalloc_cacheline_aligned 1 42895 _002528_hash NULL
85375 +_002529_hash xpc_kzalloc_cacheline_aligned 1 65433 _002529_hash NULL
85376 +_002530_hash xsd_read 3 15653 _002530_hash NULL
85377 +_002531_hash compat_do_readv_writev 4 49102 _002531_hash NULL
85378 +_002532_hash compat_keyctl_instantiate_key_iov 3 57431 _003110_hash NULL nohasharray
85379 +_002533_hash compat_process_vm_rw 3-5 22254 _002533_hash NULL
85380 +_002535_hash compat_sys_setsockopt 5 3326 _002535_hash NULL
85381 +_002536_hash ipath_cdev_init 1 37752 _002536_hash NULL
85382 +_002537_hash ms_read_multiple_pages 4-5 8052 _002537_hash NULL
85383 +_002539_hash ms_write_multiple_pages 5-6 10362 _002539_hash NULL
85384 +_002541_hash sparse_mem_maps_populate_node 4 12669 _002541_hash &_002004_hash
85385 +_002542_hash vmemmap_alloc_block 1 43245 _002542_hash NULL
85386 +_002543_hash xd_read_multiple_pages 4-5 11422 _002543_hash NULL
85387 +_002545_hash xd_write_multiple_pages 5-6 53633 _002545_hash NULL
85388 +_002546_hash compat_readv 3 30273 _002546_hash NULL
85389 +_002547_hash compat_sys_process_vm_readv 3-5 15374 _002547_hash NULL
85390 +_002549_hash compat_sys_process_vm_writev 3-5 41194 _002549_hash NULL
85391 +_002551_hash compat_writev 3 60063 _002551_hash NULL
85392 +_002552_hash ms_rw_multi_sector 4 7459 _002552_hash NULL
85393 +_002553_hash sparse_early_mem_maps_alloc_node 4 36971 _002553_hash NULL
85394 +_002554_hash vmemmap_alloc_block_buf 1 61126 _002554_hash NULL
85395 +_002555_hash xd_rw 4 49020 _002555_hash NULL
85396 +_002556_hash compat_sys_preadv64 3 24283 _002556_hash NULL
85397 +_002557_hash compat_sys_pwritev64 3 51151 _002557_hash NULL
85398 +_002558_hash compat_sys_readv 3 20911 _002558_hash NULL
85399 +_002559_hash compat_sys_writev 3 5784 _002559_hash NULL
85400 +_002560_hash ms_rw 4 17220 _002560_hash NULL
85401 +_002561_hash compat_sys_preadv 3 583 _002561_hash NULL
85402 +_002562_hash compat_sys_pwritev 3 17886 _002562_hash NULL
85403 +_002563_hash alloc_apertures 1 56561 _002563_hash NULL
85404 +_002564_hash bin_uuid 3 28999 _002564_hash NULL
85405 +_002565_hash __copy_from_user_inatomic_nocache 3 49921 _002565_hash NULL
85406 +_002566_hash do_dmabuf_dirty_sou 7 3017 _002566_hash NULL
85407 +_002567_hash do_surface_dirty_sou 7 39678 _002567_hash NULL
85408 +_002568_hash drm_agp_bind_pages 3 56748 _002568_hash NULL
85409 +_002569_hash drm_calloc_large 1-2 65421 _002569_hash NULL
85410 +_002571_hash drm_fb_helper_init 3-4 19044 _002571_hash NULL
85411 +_002573_hash drm_ht_create 2 18853 _002573_hash NULL
85412 +_002574_hash drm_malloc_ab 1-2 16831 _002574_hash NULL
85413 +_002576_hash drm_mode_crtc_set_gamma_size 2 31881 _002576_hash NULL
85414 +_002577_hash drm_plane_init 6 28731 _002577_hash NULL
85415 +_002578_hash drm_property_create 4 51239 _002578_hash NULL
85416 +_002579_hash drm_property_create_blob 2 7414 _002579_hash NULL
85417 +_002580_hash drm_vblank_init 2 11362 _002580_hash NULL
85418 +_002581_hash drm_vmalloc_dma 1 14550 _002581_hash NULL
85419 +_002582_hash fb_alloc_cmap_gfp 2 20792 _002582_hash NULL
85420 +_002583_hash fbcon_prepare_logo 5 6246 _002583_hash NULL
85421 +_002584_hash fb_read 3 33506 _002584_hash NULL
85422 +_002585_hash fb_write 3 46924 _002585_hash NULL
85423 +_002586_hash framebuffer_alloc 1 59145 _002586_hash NULL
85424 +_002587_hash i915_cache_sharing_read 3 24775 _002587_hash NULL
85425 +_002588_hash i915_cache_sharing_write 3 57961 _002588_hash NULL
85426 +_002589_hash i915_max_freq_read 3 20581 _002589_hash NULL
85427 +_002590_hash i915_max_freq_write 3 11350 _002590_hash NULL
85428 +_002591_hash i915_wedged_read 3 35474 _002591_hash NULL
85429 +_002592_hash i915_wedged_write 3 47771 _002592_hash NULL
85430 +_002593_hash p9_client_read 5 19750 _002593_hash NULL
85431 +_002594_hash probe_kernel_write 3 17481 _002594_hash NULL
85432 +_002595_hash sched_feat_write 3 55202 _002595_hash NULL
85433 +_002596_hash sd_alloc_ctl_entry 1 29708 _002596_hash NULL
85434 +_002597_hash tstats_write 3 60432 _002597_hash &_000009_hash
85435 +_002598_hash ttm_bo_fbdev_io 4 9805 _002598_hash NULL
85436 +_002599_hash ttm_bo_io 5 47000 _002599_hash NULL
85437 +_002600_hash ttm_dma_page_pool_free 2 34135 _002600_hash NULL
85438 +_002601_hash ttm_page_pool_free 2 61661 _002601_hash NULL
85439 +_002602_hash vmw_execbuf_process 5 22885 _002602_hash NULL
85440 +_002603_hash vmw_fifo_reserve 2 12141 _002603_hash NULL
85441 +_002604_hash vmw_kms_present 9 38130 _002604_hash NULL
85442 +_002605_hash vmw_kms_readback 6 5727 _002605_hash NULL
85443 +_002606_hash do_dmabuf_dirty_ldu 6 52241 _002606_hash NULL
85444 +_002607_hash drm_mode_create_tv_properties 2 23122 _002607_hash NULL
85445 +_002608_hash drm_property_create_enum 5 29201 _002608_hash NULL
85446 +_002609_hash fast_user_write 5 20494 _002609_hash NULL
85447 +_002610_hash fb_alloc_cmap 2 6554 _002610_hash NULL
85448 +_002611_hash i915_gem_execbuffer_relocate_slow 7 25355 _002611_hash NULL
85449 +_002612_hash kgdb_hex2mem 3 24755 _002612_hash NULL
85450 +_002613_hash ttm_object_device_init 2 10321 _002613_hash NULL
85451 +_002614_hash ttm_object_file_init 2 27804 _002614_hash NULL
85452 +_002615_hash vmw_cursor_update_image 3-4 16332 _002615_hash NULL
85453 +_002617_hash vmw_gmr2_bind 3 21305 _002617_hash NULL
85454 +_002618_hash vmw_cursor_update_dmabuf 3-4 32045 _002618_hash NULL
85455 +_002620_hash vmw_gmr_bind 3 44130 _002620_hash NULL
85456 +_002621_hash vmw_du_crtc_cursor_set 4-5 28479 _002621_hash NULL
85457 +_002622_hash __module_alloc 1 50004 _002622_hash NULL
85458 +_002623_hash module_alloc_update_bounds_rw 1 63233 _002623_hash NULL
85459 +_002624_hash module_alloc_update_bounds_rx 1 58634 _002624_hash NULL
85460 +_002625_hash acpi_system_write_alarm 3 40205 _002625_hash NULL
85461 +_002626_hash create_table 2 16213 _002626_hash NULL
85462 +_002627_hash mem_read 3 57631 _002627_hash NULL
85463 +_002628_hash mem_write 3 22232 _002628_hash NULL
85464 +_002629_hash proc_fault_inject_read 3 36802 _002629_hash NULL
85465 +_002630_hash proc_fault_inject_write 3 21058 _002630_hash NULL
85466 +_002631_hash v9fs_fid_readn 4 60544 _002631_hash NULL
85467 +_002632_hash v9fs_file_read 3 40858 _002632_hash NULL
85468 +_002633_hash __devres_alloc 2 25598 _002633_hash NULL
85469 +_002634_hash alloc_dummy_extent_buffer 2 56374 _002634_hash NULL
85470 +_002635_hash alloc_fdtable 1 17389 _002635_hash NULL
85471 +_002636_hash alloc_large_system_hash 2 22391 _002636_hash NULL
85472 +_002637_hash alloc_ldt 2 21972 _002637_hash NULL
85473 +_002638_hash __alloc_skb 1 23940 _002638_hash NULL
85474 +_002639_hash __ata_change_queue_depth 3 23484 _002639_hash NULL
85475 +_002640_hash btrfs_alloc_free_block 3 8986 _002640_hash NULL
85476 +_002641_hash btrfs_find_device_for_logical 2 44993 _002641_hash NULL
85477 +_002642_hash ccid3_hc_rx_getsockopt 3 62331 _002642_hash NULL
85478 +_002643_hash ccid3_hc_tx_getsockopt 3 16314 _002643_hash NULL
85479 +_002644_hash cifs_readdata_alloc 1 26360 _002644_hash NULL
85480 +_002645_hash cistpl_vers_1 4 15023 _002645_hash NULL
85481 +_002646_hash cmm_read 3 57520 _002646_hash NULL
85482 +_002647_hash cosa_read 3 25966 _002647_hash NULL
85483 +_002648_hash dm_table_create 3 35687 _002648_hash NULL
85484 +_002649_hash dpcm_state_read_file 3 65489 _002649_hash NULL
85485 +_002651_hash edac_mc_alloc 4 3611 _002651_hash NULL
85486 +_002652_hash ep0_read 3 38095 _002652_hash NULL
85487 +_002653_hash event_buffer_read 3 48772 _002765_hash NULL nohasharray
85488 +_002654_hash extend_netdev_table 2 21453 _002654_hash NULL
85489 +_002655_hash extract_entropy_user 3 26952 _002655_hash NULL
85490 +_002656_hash fcoe_ctlr_device_add 3 1793 _002656_hash NULL
85491 +_002657_hash fd_do_readv 3 51297 _002657_hash NULL
85492 +_002658_hash fd_do_writev 3 29329 _002658_hash NULL
85493 +_002659_hash ffs_ep0_read 3 2672 _002659_hash NULL
85494 +_002660_hash fill_readbuf 3 32464 _002660_hash NULL
85495 +_002661_hash fw_iso_buffer_alloc 2 13704 _002661_hash NULL
85496 +_002662_hash get_fd_set 1 3866 _002662_hash NULL
85497 +_002663_hash hidraw_report_event 3 20503 _002663_hash NULL
85498 +_002664_hash ieee80211_if_read_ht_opmode 3 29044 _002664_hash NULL
85499 +_002665_hash ieee80211_if_read_num_mcast_sta 3 12419 _002665_hash NULL
85500 +_002666_hash iwl_dbgfs_calib_disabled_read 3 22649 _002666_hash NULL
85501 +_002667_hash iwl_dbgfs_rf_reset_read 3 26512 _002667_hash NULL
85502 +_002668_hash ixgbe_alloc_q_vector 4-6 24439 _002668_hash NULL
85503 +_002670_hash joydev_handle_JSIOCSAXMAP 3 48898 _002836_hash NULL nohasharray
85504 +_002671_hash joydev_handle_JSIOCSBTNMAP 3 15643 _002671_hash NULL
85505 +_002672_hash __kfifo_from_user_r 3 60345 _002672_hash NULL
85506 +_002673_hash kstrtoint_from_user 2 8778 _002673_hash NULL
85507 +_002674_hash kstrtol_from_user 2 10168 _002674_hash NULL
85508 +_002675_hash kstrtoll_from_user 2 19500 _002675_hash NULL
85509 +_002676_hash kstrtos16_from_user 2 28300 _002676_hash NULL
85510 +_002677_hash kstrtos8_from_user 2 58268 _002677_hash NULL
85511 +_002678_hash kstrtou16_from_user 2 54274 _002678_hash NULL
85512 +_002679_hash kstrtou8_from_user 2 55599 _002679_hash NULL
85513 +_002680_hash kstrtouint_from_user 2 10536 _002680_hash NULL
85514 +_002681_hash kstrtoul_from_user 2 64569 _002681_hash NULL
85515 +_002682_hash kstrtoull_from_user 2 63026 _002682_hash NULL
85516 +_002683_hash l2cap_create_iframe_pdu 3 40055 _002683_hash NULL
85517 +_002684_hash l2tp_ip6_recvmsg 4 62874 _002684_hash NULL
85518 +_002685_hash mem_cgroup_read 5 22461 _002685_hash NULL
85519 +_002686_hash nfs_fscache_get_super_cookie 3 44355 _002686_hash &_001648_hash
85520 +_002687_hash nfs_pgarray_set 2 1085 _002687_hash NULL
85521 +_002688_hash ntfs_rl_realloc 3 56831 _002688_hash &_000363_hash
85522 +_002689_hash ntfs_rl_realloc_nofail 3 32173 _002689_hash NULL
85523 +_002690_hash pn533_dep_link_up 5 22154 _002690_hash NULL
85524 +_002691_hash port_fops_write 3 54627 _002691_hash NULL
85525 +_002692_hash ptp_read 4 63251 _002692_hash NULL
85526 +_002693_hash qla4xxx_change_queue_depth 2 1268 _002693_hash NULL
85527 +_002694_hash reqsk_queue_alloc 2 40272 _002694_hash NULL
85528 +_002695_hash resize_info_buffer 2 62889 _002695_hash NULL
85529 +_002696_hash rfkill_fop_write 3 64808 _002696_hash NULL
85530 +_002697_hash rt2x00debug_write_rfcsr 3 41473 _002697_hash NULL
85531 +_002698_hash rvmalloc 1 46873 _002698_hash NULL
85532 +_002699_hash rw_copy_check_uvector 3 45748 _002699_hash NULL
85533 +_002700_hash sctp_getsockopt_active_key 2 45483 _002700_hash NULL
85534 +_002701_hash sctp_getsockopt_adaptation_layer 2 45375 _002701_hash NULL
85535 +_002702_hash sctp_getsockopt_assoc_ids 2 9043 _002702_hash NULL
85536 +_002703_hash sctp_getsockopt_associnfo 2 58169 _002703_hash NULL
85537 +_002704_hash sctp_getsockopt_assoc_number 2 6384 _002704_hash NULL
85538 +_002705_hash sctp_getsockopt_auto_asconf 2 46584 _002705_hash NULL
85539 +_002706_hash sctp_getsockopt_context 2 52490 _002706_hash NULL
85540 +_002707_hash sctp_getsockopt_default_send_param 2 63056 _002707_hash NULL
85541 +_002708_hash sctp_getsockopt_disable_fragments 2 12330 _002708_hash NULL
85542 +_002709_hash sctp_getsockopt_fragment_interleave 2 51215 _002709_hash NULL
85543 +_002710_hash sctp_getsockopt_initmsg 2 26042 _002710_hash NULL
85544 +_002711_hash sctp_getsockopt_mappedv4 2 20044 _002711_hash NULL
85545 +_002712_hash sctp_getsockopt_nodelay 2 9560 _002712_hash NULL
85546 +_002713_hash sctp_getsockopt_partial_delivery_point 2 60952 _002713_hash NULL
85547 +_002714_hash sctp_getsockopt_peeloff 2 59190 _002714_hash NULL
85548 +_002715_hash sctp_getsockopt_peer_addr_info 2 6024 _002715_hash NULL
85549 +_002716_hash sctp_getsockopt_peer_addr_params 2 53645 _002716_hash NULL
85550 +_002717_hash sctp_getsockopt_primary_addr 2 24639 _002717_hash NULL
85551 +_002718_hash sctp_getsockopt_rtoinfo 2 62027 _002718_hash NULL
85552 +_002719_hash sctp_getsockopt_sctp_status 2 56540 _002719_hash NULL
85553 +_002720_hash self_check_write 5 50856 _002720_hash NULL
85554 +_002721_hash smk_read_mapped 3 7562 _002721_hash NULL
85555 +_002722_hash smk_set_cipso 3 20379 _002722_hash NULL
85556 +_002723_hash smk_user_access 3 24440 _002723_hash NULL
85557 +_002724_hash smk_write_mapped 3 13519 _002724_hash NULL
85558 +_002725_hash smk_write_rules_list 3 18565 _002725_hash NULL
85559 +_002726_hash snd_mixart_BA0_read 5 45069 _002726_hash NULL
85560 +_002727_hash snd_mixart_BA1_read 5 5082 _002727_hash NULL
85561 +_002728_hash snd_pcm_oss_read2 3 54387 _002728_hash NULL
85562 +_002729_hash syslog_print 2 307 _002729_hash NULL
85563 +_002730_hash tcp_dma_try_early_copy 3 4457 _002730_hash NULL
85564 +_002731_hash tcp_send_rcvq 3 11316 _002731_hash NULL
85565 +_002732_hash tomoyo_init_log 2 61526 _002732_hash NULL
85566 +_002733_hash ubi_dump_flash 4 46381 _002733_hash NULL
85567 +_002734_hash ubi_eba_atomic_leb_change 5 60379 _002734_hash NULL
85568 +_002735_hash ubi_eba_write_leb 5-6 36029 _002735_hash NULL
85569 +_002737_hash ubi_eba_write_leb_st 5 44343 _002737_hash NULL
85570 +_002738_hash ubi_self_check_all_ff 4 41959 _002738_hash NULL
85571 +_002739_hash unix_bind 3 15668 _002739_hash NULL
85572 +_002740_hash usbvision_rvmalloc 1 19655 _002740_hash NULL
85573 +_002742_hash v4l2_ctrl_new 7 24927 _002742_hash NULL
85574 +_002743_hash v4l2_event_subscribe 3 53687 _002743_hash NULL
85575 +_002744_hash v9fs_direct_read 3 45546 _002744_hash NULL
85576 +_002745_hash v9fs_file_readn 4 36353 _002745_hash &_001606_hash
85577 +_002746_hash __videobuf_alloc_vb 1 5665 _002746_hash NULL
85578 +_002747_hash wm8350_write 3 24480 _002747_hash NULL
85579 +_002748_hash xfs_buf_read_uncached 3 42844 _002748_hash NULL
85580 +_002749_hash yurex_write 3 8761 _002749_hash NULL
85581 +_002750_hash alloc_skb 1 55439 _002750_hash NULL
85582 +_002751_hash alloc_skb_fclone 1 3467 _002751_hash NULL
85583 +_002752_hash ata_scsi_change_queue_depth 2 23126 _002752_hash NULL
85584 +_002753_hash ath6kl_disconnect_timeout_write 3 794 _002753_hash NULL
85585 +_002754_hash ath6kl_keepalive_write 3 45600 _002754_hash NULL
85586 +_002755_hash ath6kl_lrssi_roam_write 3 8362 _002755_hash NULL
85587 +_002756_hash ath6kl_regread_write 3 14220 _002756_hash NULL
85588 +_002757_hash core_sys_select 1 47494 _002757_hash NULL
85589 +_002758_hash do_syslog 3 56807 _002758_hash NULL
85590 +_002759_hash expand_fdtable 2 39273 _002759_hash NULL
85591 +_002760_hash fd_execute_cmd 3 1132 _002760_hash NULL
85592 +_002761_hash get_chars 3 40373 _002761_hash NULL
85593 +_002762_hash hid_report_raw_event 4 2762 _002762_hash NULL
85594 +_002763_hash inet_csk_listen_start 2 38233 _002763_hash NULL
85595 +_002764_hash kstrtou32_from_user 2 30361 _002764_hash NULL
85596 +_002765_hash l2cap_segment_sdu 4 48772 _002765_hash &_002653_hash
85597 +_002766_hash __netdev_alloc_skb 2 18595 _002766_hash NULL
85598 +_002767_hash nfs_readdata_alloc 2 65015 _002767_hash NULL
85599 +_002768_hash nfs_writedata_alloc 2 12133 _002768_hash NULL
85600 +_002769_hash ntfs_rl_append 2-4 6037 _002769_hash NULL
85601 +_002771_hash ntfs_rl_insert 2-4 4931 _002771_hash NULL
85602 +_002773_hash ntfs_rl_replace 2-4 14136 _002773_hash NULL
85603 +_002775_hash ntfs_rl_split 2-4 52328 _002775_hash NULL
85604 +_002777_hash port_fops_read 3 49626 _002777_hash NULL
85605 +_002778_hash random_read 3 13815 _002778_hash NULL
85606 +_002779_hash sg_proc_write_adio 3 45704 _002779_hash NULL
85607 +_002780_hash sg_proc_write_dressz 3 46316 _002780_hash NULL
85608 +_002781_hash tcp_sendmsg 4 30296 _002781_hash NULL
85609 +_002782_hash tomoyo_write_log2 2 34318 _002782_hash NULL
85610 +_002783_hash ubi_leb_change 4 10289 _002783_hash NULL
85611 +_002784_hash ubi_leb_write 4-5 5478 _002784_hash NULL
85612 +_002786_hash urandom_read 3 30462 _002786_hash NULL
85613 +_002787_hash v9fs_cached_file_read 3 2514 _002787_hash NULL
85614 +_002788_hash __videobuf_alloc_cached 1 12740 _002788_hash NULL
85615 +_002789_hash __videobuf_alloc_uncached 1 55711 _002789_hash NULL
85616 +_002790_hash wm8350_block_write 3 19727 _002790_hash NULL
85617 +_002791_hash alloc_tx 2 32143 _002791_hash NULL
85618 +_002792_hash alloc_wr 1-2 24635 _002792_hash NULL
85619 +_002794_hash ath6kl_endpoint_stats_write 3 59621 _002794_hash NULL
85620 +_002795_hash ath6kl_fwlog_mask_write 3 24810 _002795_hash NULL
85621 +_002796_hash ath9k_wmi_cmd 4 327 _002796_hash NULL
85622 +_002797_hash atm_alloc_charge 2 19517 _002879_hash NULL nohasharray
85623 +_002798_hash ax25_output 2 22736 _002798_hash NULL
85624 +_002799_hash bcsp_prepare_pkt 3 12961 _002799_hash NULL
85625 +_002800_hash bt_skb_alloc 1 6404 _002800_hash NULL
85626 +_002801_hash capinc_tty_write 3 28539 _002801_hash NULL
85627 +_002802_hash cfpkt_create_pfx 1-2 23594 _002802_hash NULL
85628 +_002804_hash cmd_complete 6 51629 _002804_hash NULL
85629 +_002805_hash cmtp_add_msgpart 4 9252 _002805_hash NULL
85630 +_002806_hash cmtp_send_interopmsg 7 376 _002806_hash NULL
85631 +_002807_hash cxgb3_get_cpl_reply_skb 2 10620 _002807_hash NULL
85632 +_002808_hash dbg_leb_change 4 23555 _002808_hash NULL
85633 +_002809_hash dbg_leb_write 4-5 63555 _002809_hash &_000940_hash
85634 +_002811_hash dccp_listen_start 2 35918 _002811_hash NULL
85635 +_002812_hash __dev_alloc_skb 1 28681 _002812_hash NULL
85636 +_002813_hash diva_os_alloc_message_buffer 1 64568 _002813_hash NULL
85637 +_002814_hash dn_alloc_skb 2 6631 _002814_hash NULL
85638 +_002815_hash do_pselect 1 62061 _002815_hash NULL
85639 +_002816_hash _fc_frame_alloc 1 43568 _002816_hash NULL
85640 +_002817_hash find_skb 2 20431 _002817_hash NULL
85641 +_002818_hash fm_send_cmd 5 39639 _002818_hash NULL
85642 +_002819_hash gem_alloc_skb 2 51715 _002819_hash NULL
85643 +_002820_hash get_packet 3 41914 _002820_hash NULL
85644 +_002821_hash get_packet 3 5747 _002821_hash NULL
85645 +_002822_hash get_packet_pg 4 28023 _002822_hash NULL
85646 +_002823_hash get_skb 2 63008 _002823_hash NULL
85647 +_002824_hash hidp_queue_report 3 1881 _002824_hash NULL
85648 +_002825_hash __hidp_send_ctrl_message 4 28303 _002825_hash NULL
85649 +_002826_hash hycapi_rx_capipkt 3 11602 _002826_hash NULL
85650 +_002827_hash i2400m_net_rx 5 27170 _002827_hash NULL
85651 +_002828_hash igmpv3_newpack 2 35912 _002828_hash NULL
85652 +_002829_hash inet_listen 2 14723 _002829_hash NULL
85653 +_002830_hash isdn_net_ciscohdlck_alloc_skb 2 55209 _002830_hash &_001724_hash
85654 +_002831_hash isdn_ppp_ccp_xmit_reset 6 63297 _002831_hash NULL
85655 +_002832_hash kmsg_read 3 46514 _002832_hash NULL
85656 +_002833_hash _l2_alloc_skb 1 11883 _002833_hash NULL
85657 +_002834_hash l3_alloc_skb 1 32289 _002834_hash NULL
85658 +_002835_hash llc_alloc_frame 4 64366 _002835_hash NULL
85659 +_002836_hash mac_drv_rx_init 2 48898 _002836_hash &_002670_hash
85660 +_002837_hash mgmt_event 4 12810 _002837_hash NULL
85661 +_002838_hash mI_alloc_skb 1 24770 _002838_hash NULL
85662 +_002839_hash nci_skb_alloc 2 49757 _002839_hash NULL
85663 +_002840_hash netdev_alloc_skb 2 62437 _002840_hash NULL
85664 +_002841_hash __netdev_alloc_skb_ip_align 2 55067 _002841_hash NULL
85665 +_002842_hash new_skb 1 21148 _002842_hash NULL
85666 +_002843_hash nfc_alloc_recv_skb 1 10244 _002843_hash NULL
85667 +_002844_hash nfcwilink_skb_alloc 1 16167 _002844_hash NULL
85668 +_002845_hash nfulnl_alloc_skb 2 65207 _002845_hash NULL
85669 +_002846_hash ni65_alloc_mem 3 10664 _002846_hash NULL
85670 +_002847_hash pep_alloc_skb 3 46303 _002847_hash NULL
85671 +_002848_hash pn_raw_send 2 54330 _002848_hash NULL
85672 +_002849_hash __pskb_copy 2 9038 _002849_hash NULL
85673 +_002850_hash refill_pool 2 19477 _002850_hash NULL
85674 +_002851_hash rfcomm_wmalloc 2 58090 _002851_hash NULL
85675 +_002852_hash rx 4 57944 _002852_hash NULL
85676 +_002853_hash sctp_ulpevent_new 1 33377 _002853_hash NULL
85677 +_002854_hash send_command 4 10832 _002854_hash NULL
85678 +_002855_hash skb_copy_expand 2-3 7685 _002855_hash &_000671_hash
85679 +_002857_hash sk_stream_alloc_skb 2 57622 _002857_hash NULL
85680 +_002858_hash sock_alloc_send_pskb 2 21246 _002858_hash NULL
85681 +_002859_hash sock_rmalloc 2 59740 _002859_hash &_002157_hash
85682 +_002860_hash sock_wmalloc 2 16472 _002860_hash NULL
85683 +_002861_hash solos_param_store 4 34755 _002861_hash NULL
85684 +_002862_hash sys_select 1 38827 _002862_hash NULL
85685 +_002863_hash sys_syslog 3 10746 _002863_hash NULL
85686 +_002864_hash t4vf_pktgl_to_skb 2 39005 _002864_hash NULL
85687 +_002865_hash tcp_collapse 5-6 63294 _002865_hash NULL
85688 +_002867_hash tipc_cfg_reply_alloc 1 27606 _002867_hash NULL
85689 +_002868_hash ubifs_leb_change 4 17789 _002868_hash NULL
85690 +_002869_hash ubifs_leb_write 4-5 22679 _002869_hash NULL
85691 +_002871_hash ulog_alloc_skb 1 23427 _002871_hash NULL
85692 +_002872_hash _alloc_mISDN_skb 3 52232 _002872_hash NULL
85693 +_002873_hash ath9k_multi_regread 4 65056 _002873_hash NULL
85694 +_002874_hash ath_rxbuf_alloc 2 24745 _002874_hash NULL
85695 +_002875_hash ax25_send_frame 2 19964 _002875_hash NULL
85696 +_002876_hash bchannel_get_rxbuf 2 37213 _002876_hash NULL
85697 +_002877_hash cfpkt_create 1 18197 _002877_hash NULL
85698 +_002878_hash console_store 4 36007 _002878_hash NULL
85699 +_002879_hash dev_alloc_skb 1 19517 _002879_hash &_002797_hash
85700 +_002880_hash dn_nsp_do_disc 2-6 49474 _002880_hash NULL
85701 +_002882_hash do_write_orph_node 2 64343 _002882_hash NULL
85702 +_002883_hash dsp_cmx_send_member 2 15625 _002883_hash NULL
85703 +_002884_hash fc_frame_alloc 2 1596 _002884_hash NULL
85704 +_002885_hash fc_frame_alloc_fill 2 59394 _002885_hash NULL
85705 +_002886_hash fmc_send_cmd 5 20435 _002886_hash NULL
85706 +_002887_hash hci_send_cmd 3 43810 _002887_hash NULL
85707 +_002888_hash hci_si_event 3 1404 _002888_hash NULL
85708 +_002889_hash hfcpci_empty_bfifo 4 62323 _002889_hash NULL
85709 +_002890_hash hidp_send_ctrl_message 4 43702 _002890_hash NULL
85710 +_002891_hash hysdn_sched_rx 3 60533 _002891_hash NULL
85711 +_002892_hash inet_dccp_listen 2 28565 _002892_hash NULL
85712 +_002893_hash ip6_append_data 4-5 36490 _002893_hash NULL
85713 +_002894_hash __ip_append_data 7-8 36191 _002894_hash NULL
85714 +_002895_hash l1oip_socket_recv 6 56537 _002895_hash NULL
85715 +_002896_hash l2cap_build_cmd 4 48676 _002896_hash NULL
85716 +_002897_hash l2down_create 4 21755 _002897_hash NULL
85717 +_002898_hash l2up_create 3 6430 _002898_hash NULL
85718 +_002899_hash ldisc_receive 4 41516 _002899_hash NULL
85719 +_002902_hash lro_gen_skb 6 2644 _002902_hash NULL
85720 +_002903_hash macvtap_alloc_skb 2-4-3 50629 _002903_hash NULL
85721 +_002906_hash mgmt_device_found 10 14146 _002906_hash NULL
85722 +_002907_hash nci_send_cmd 3 58206 _002907_hash NULL
85723 +_002908_hash netdev_alloc_skb_ip_align 2 40811 _002908_hash NULL
85724 +_002909_hash nfcwilink_send_bts_cmd 3 10802 _002909_hash NULL
85725 +_002910_hash nfqnl_mangle 2 14583 _002910_hash NULL
85726 +_002911_hash p54_alloc_skb 3 34366 _002911_hash &_000475_hash
85727 +_002912_hash packet_alloc_skb 2-5-4 62602 _002912_hash NULL
85728 +_002915_hash pep_indicate 5 38611 _002915_hash NULL
85729 +_002916_hash pep_reply 5 50582 _002916_hash NULL
85730 +_002917_hash pipe_handler_request 5 50774 _002917_hash &_001189_hash
85731 +_002918_hash ql_process_mac_rx_page 4 15543 _002918_hash NULL
85732 +_002919_hash ql_process_mac_rx_skb 4 6689 _002919_hash NULL
85733 +_002920_hash rfcomm_tty_write 3 51603 _002920_hash NULL
85734 +_002921_hash send_mpa_reject 3 7135 _002921_hash NULL
85735 +_002922_hash send_mpa_reply 3 32372 _002922_hash NULL
85736 +_002923_hash set_rxd_buffer_pointer 8 9950 _002923_hash NULL
85737 +_002924_hash sge_rx 3 50594 _002924_hash NULL
85738 +_002925_hash skb_cow_data 2 11565 _002925_hash NULL
85739 +_002926_hash smp_build_cmd 3 45853 _002926_hash NULL
85740 +_002927_hash sock_alloc_send_skb 2 23720 _002927_hash NULL
85741 +_002928_hash sys_pselect6 1 57449 _002928_hash NULL
85742 +_002929_hash tcp_fragment 3 20436 _002929_hash NULL
85743 +_002930_hash teiup_create 3 43201 _002930_hash NULL
85744 +_002931_hash tg3_run_loopback 2 30093 _002931_hash NULL
85745 +_002932_hash tun_alloc_skb 2-4-3 41216 _002932_hash NULL
85746 +_002935_hash ubifs_write_node 5 11258 _002935_hash NULL
85747 +_002936_hash use_pool 2 64607 _002936_hash NULL
85748 +_002937_hash vxge_rx_alloc 3 52024 _002937_hash NULL
85749 +_002938_hash add_packet 3 54433 _002938_hash NULL
85750 +_002939_hash add_rx_skb 3 8257 _002939_hash NULL
85751 +_002940_hash ath6kl_buf_alloc 1 57304 _002940_hash NULL
85752 +_002941_hash bat_iv_ogm_aggregate_new 2 2620 _002941_hash NULL
85753 +_002942_hash bnx2fc_process_l2_frame_compl 3 65072 _002942_hash NULL
85754 +_002943_hash brcmu_pkt_buf_get_skb 1 5556 _002943_hash NULL
85755 +_002944_hash br_send_bpdu 3 29669 _002944_hash NULL
85756 +_002945_hash bt_skb_send_alloc 2 6581 _002945_hash NULL
85757 +_002946_hash c4iw_reject_cr 3 28174 _002946_hash NULL
85758 +_002947_hash carl9170_rx_copy_data 2 21656 _002947_hash NULL
85759 +_002948_hash cfpkt_add_body 3 44630 _002948_hash NULL
85760 +_002949_hash cfpkt_append 3 61206 _002949_hash NULL
85761 +_002950_hash cosa_net_setup_rx 2 38594 _002950_hash NULL
85762 +_002951_hash cxgb4_pktgl_to_skb 2 61899 _002951_hash NULL
85763 +_002952_hash dn_alloc_send_pskb 2 4465 _002952_hash NULL
85764 +_002953_hash dn_nsp_return_disc 2 60296 _002953_hash NULL
85765 +_002954_hash dn_nsp_send_disc 2 23469 _002954_hash NULL
85766 +_002955_hash dsp_tone_hw_message 3 17678 _002955_hash NULL
85767 +_002956_hash dvb_net_sec 3 37884 _002956_hash NULL
85768 +_002957_hash e1000_check_copybreak 3 62448 _002957_hash NULL
85769 +_002958_hash fast_rx_path 3 59214 _002958_hash NULL
85770 +_002959_hash fc_fcp_frame_alloc 2 12624 _002959_hash NULL
85771 +_002960_hash fcoe_ctlr_send_keep_alive 3 15308 _002960_hash NULL
85772 +_002961_hash fwnet_incoming_packet 3 40380 _002961_hash NULL
85773 +_002962_hash fwnet_pd_new 4 39947 _002962_hash NULL
85774 +_002963_hash got_frame 2 16028 _002963_hash NULL
85775 +_002964_hash gsm_mux_rx_netchar 3 33336 _002964_hash NULL
85776 +_002965_hash hdlcdev_rx 3 997 _002965_hash NULL
85777 +_002966_hash hdlc_empty_fifo 2 18397 _002966_hash NULL
85778 +_002967_hash hfc_empty_fifo 2 57972 _002967_hash NULL
85779 +_002968_hash hfcpci_empty_fifo 4 2427 _002968_hash NULL
85780 +_002969_hash hfcsusb_rx_frame 3 52745 _002969_hash NULL
85781 +_002970_hash hidp_output_raw_report 3 5629 _002970_hash NULL
85782 +_002971_hash hscx_empty_fifo 2 13360 _002971_hash NULL
85783 +_002972_hash hysdn_rx_netpkt 3 16136 _002972_hash NULL
85784 +_002973_hash ieee80211_fragment 4 33112 _002973_hash NULL
85785 +_002974_hash ieee80211_probereq_get 4-6 29069 _002974_hash NULL
85786 +_002976_hash ieee80211_send_auth 5 24121 _002976_hash NULL
85787 +_002977_hash ieee80211_set_probe_resp 3 10077 _002977_hash NULL
85788 +_002978_hash ieee80211_tdls_mgmt 8 9581 _002978_hash NULL
85789 +_002979_hash ip6_ufo_append_data 5-7-6 4780 _002979_hash NULL
85790 +_002982_hash ip_ufo_append_data 6-8-7 12775 _002982_hash NULL
85791 +_002985_hash ipw_packet_received_skb 2 1230 _002985_hash NULL
85792 +_002986_hash iwch_reject_cr 3 23901 _002986_hash NULL
85793 +_002987_hash iwm_rx_packet_alloc 3 9898 _002987_hash NULL
85794 +_002988_hash ixgb_check_copybreak 3 5847 _002988_hash NULL
85795 +_002989_hash l1oip_socket_parse 4 4507 _002989_hash NULL
85796 +_002990_hash l2cap_send_cmd 4 14548 _002990_hash NULL
85797 +_002991_hash l2tp_ip6_sendmsg 4 7461 _002991_hash NULL
85798 +_002993_hash lowpan_fragment_xmit 3-4 22095 _002993_hash NULL
85799 +_002996_hash mcs_unwrap_fir 3 25733 _002996_hash NULL
85800 +_002997_hash mcs_unwrap_mir 3 9455 _002997_hash NULL
85801 +_002998_hash mld_newpack 2 50950 _002998_hash NULL
85802 +_002999_hash nfc_alloc_send_skb 4 3167 _002999_hash NULL
85803 +_003000_hash p54_download_eeprom 4 43842 _003000_hash NULL
85804 +_003002_hash ppp_tx_cp 5 62044 _003002_hash NULL
85805 +_003003_hash prism2_send_mgmt 4 62605 _003003_hash &_001876_hash
85806 +_003004_hash prism2_sta_send_mgmt 5 43916 _003004_hash NULL
85807 +_003005_hash _queue_data 4 54983 _003005_hash NULL
85808 +_003006_hash read_dma 3 55086 _003006_hash NULL
85809 +_003007_hash read_fifo 3 826 _003007_hash NULL
85810 +_003008_hash receive_copy 3 12216 _003008_hash NULL
85811 +_003009_hash rtl8169_try_rx_copy 3 705 _003009_hash NULL
85812 +_003010_hash _rtl92s_firmware_downloadcode 3 14021 _003010_hash NULL
85813 +_003011_hash rx_data 4 60442 _003011_hash NULL
85814 +_003012_hash sis190_try_rx_copy 3 57069 _003012_hash NULL
85815 +_003013_hash skge_rx_get 3 40598 _003013_hash NULL
85816 +_003014_hash tcp_mark_head_lost 2 35895 _003014_hash NULL
85817 +_003015_hash tcp_match_skb_to_sack 3-4 23568 _003015_hash NULL
85818 +_003017_hash tso_fragment 3 29050 _003017_hash NULL
85819 +_003018_hash tt_response_fill_table 1 57902 _003018_hash NULL
85820 +_003020_hash udpv6_sendmsg 4 22316 _003020_hash NULL
85821 +_003021_hash velocity_rx_copy 2 34583 _003021_hash NULL
85822 +_003022_hash W6692_empty_Bfifo 2 47804 _003022_hash NULL
85823 +_003023_hash zd_mac_rx 3 38296 _003023_hash NULL
85824 +_003024_hash ath6kl_wmi_get_new_buf 1 52304 _003024_hash NULL
85825 +_003025_hash bat_iv_ogm_queue_add 3 30870 _003025_hash NULL
85826 +_003026_hash brcmf_alloc_pkt_and_read 2 63116 _003026_hash &_001808_hash
85827 +_003027_hash brcmf_sdcard_recv_buf 6 38179 _003027_hash NULL
85828 +_003028_hash brcmf_sdcard_rwdata 5 65041 _003028_hash NULL
85829 +_003029_hash brcmf_sdcard_send_buf 6 7713 _003029_hash NULL
85830 +_003030_hash carl9170_handle_mpdu 3 11056 _003030_hash NULL
85831 +_003031_hash cfpkt_add_trail 3 27260 _003031_hash NULL
85832 +_003032_hash cfpkt_pad_trail 2 55511 _003032_hash NULL
85833 +_003033_hash dvb_net_sec_callback 2 28786 _003033_hash NULL
85834 +_003034_hash fwnet_receive_packet 9 50537 _003034_hash NULL
85835 +_003035_hash handle_rx_packet 3 58993 _003035_hash NULL
85836 +_003036_hash HDLC_irq 2 8709 _003036_hash NULL
85837 +_003037_hash hdlc_rpr_irq 2 10240 _003037_hash NULL
85838 +_003043_hash ipwireless_network_packet_received 4 51277 _003043_hash NULL
85839 +_003044_hash l2cap_bredr_sig_cmd 3 49065 _003044_hash NULL
85840 +_003045_hash l2cap_sock_alloc_skb_cb 2 33532 _003045_hash NULL
85841 +_003046_hash llcp_allocate_pdu 3 19866 _003046_hash NULL
85842 +_003047_hash ppp_cp_event 6 2965 _003047_hash NULL
85843 +_003048_hash receive_client_update_packet 3 49104 _003048_hash NULL
85844 +_003049_hash receive_server_sync_packet 3 59021 _003049_hash NULL
85845 +_003050_hash sky2_receive 2 13407 _003050_hash NULL
85846 +_003051_hash tcp_sacktag_walk 5-6 49703 _003051_hash NULL
85847 +_003053_hash tcp_write_xmit 2 64602 _003053_hash NULL
85848 +_003054_hash ath6kl_wmi_add_wow_pattern_cmd 4 12842 _003054_hash NULL
85849 +_003055_hash ath6kl_wmi_beginscan_cmd 8 25462 _003055_hash NULL
85850 +_003056_hash ath6kl_wmi_send_probe_response_cmd 6 31728 _003056_hash NULL
85851 +_003057_hash ath6kl_wmi_set_appie_cmd 5 39266 _003057_hash NULL
85852 +_003058_hash ath6kl_wmi_set_ie_cmd 6 37260 _003058_hash NULL
85853 +_003059_hash ath6kl_wmi_startscan_cmd 8 33674 _003059_hash NULL
85854 +_003060_hash ath6kl_wmi_test_cmd 3 27312 _003060_hash NULL
85855 +_003061_hash brcmf_sdbrcm_membytes 3-5 37324 _003061_hash NULL
85856 +_003063_hash brcmf_sdbrcm_read_control 3 22721 _003063_hash NULL
85857 +_003064_hash brcmf_tx_frame 3 20978 _003064_hash NULL
85858 +_003065_hash __carl9170_rx 3 56784 _003065_hash NULL
85859 +_003066_hash cfpkt_setlen 2 49343 _003066_hash NULL
85860 +_003067_hash hdlc_irq_one 2 3944 _003067_hash NULL
85861 +_003069_hash tcp_push_one 2 48816 _003069_hash NULL
85862 +_003070_hash __tcp_push_pending_frames 2 48148 _003070_hash NULL
85863 +_003071_hash brcmf_sdbrcm_bus_txctl 3 42492 _003071_hash NULL
85864 +_003072_hash carl9170_rx 3 13272 _003072_hash NULL
85865 +_003073_hash carl9170_rx_stream 3 1334 _003073_hash NULL
85866 +_003074_hash tcp_push 3 10680 _003074_hash NULL
85867 +_003075_hash create_log 2 8225 _003075_hash NULL
85868 +_003076_hash expand_files 2 17080 _003076_hash NULL
85869 +_003077_hash iio_device_alloc 1 41440 _003077_hash NULL
85870 +_003078_hash OS_mem_token_alloc 1 14276 _003078_hash NULL
85871 +_003079_hash packet_came 3 18072 _003079_hash NULL
85872 +_003080_hash softsynth_write 3 3455 _003080_hash NULL
85873 +_003081_hash alloc_fd 1 37637 _003081_hash NULL
85874 +_003082_hash sys_dup3 2 33421 _003082_hash NULL
85875 +_003083_hash do_fcntl 3 31468 _003083_hash NULL
85876 +_003084_hash sys_dup2 2 25284 _003084_hash NULL
85877 +_003085_hash sys_fcntl 3 19267 _003085_hash NULL
85878 +_003086_hash sys_fcntl64 3 29031 _003086_hash NULL
85879 +_003087_hash cmpk_message_handle_tx 4 54024 _003087_hash NULL
85880 +_003088_hash comedi_buf_alloc 3 24822 _003088_hash NULL
85881 +_003089_hash compat_rw_copy_check_uvector 3 22001 _003089_hash &_001989_hash
85882 +_003090_hash compat_sys_fcntl64 3 60256 _003090_hash NULL
85883 +_003091_hash evtchn_write 3 43278 _003091_hash NULL
85884 +_003092_hash fw_download_code 3 13249 _003092_hash NULL
85885 +_003093_hash fwSendNullPacket 2 54618 _003093_hash NULL
85886 +_003095_hash ieee80211_authentication_req 3 63973 _003095_hash NULL
85887 +_003097_hash rtllib_authentication_req 3 26713 _003097_hash NULL
85888 +_003098_hash SendTxCommandPacket 3 42901 _003098_hash NULL
85889 +_003099_hash snd_nm256_capture_copy 5 28622 _003099_hash NULL
85890 +_003100_hash snd_nm256_playback_copy 5 38567 _003100_hash NULL
85891 +_003101_hash tomoyo_init_log 2 14806 _003101_hash NULL
85892 +_003102_hash usbdux_attach_common 4 51764 _003102_hash NULL
85893 +_003103_hash compat_sys_fcntl 3 15654 _003103_hash NULL
85894 +_003104_hash ieee80211_auth_challenge 3 18810 _003104_hash NULL
85895 +_003105_hash ieee80211_rtl_auth_challenge 3 61897 _003105_hash NULL
85896 +_003106_hash resize_async_buffer 4 64031 _003106_hash &_002119_hash
85897 +_003107_hash rtllib_auth_challenge 3 12493 _003107_hash NULL
85898 +_003108_hash tomoyo_write_log2 2 11732 _003108_hash NULL
85899 +_003109_hash allocate_probes 1 40204 _003109_hash NULL
85900 +_003110_hash alloc_ftrace_hash 1 57431 _003110_hash &_002532_hash
85901 +_003111_hash __alloc_preds 2 9492 _003111_hash NULL
85902 +_003112_hash __alloc_pred_stack 2 26687 _003112_hash NULL
85903 +_003113_hash alloc_sched_domains 1 47756 _003113_hash NULL
85904 +_003114_hash alloc_trace_probe 6 38720 _003114_hash NULL
85905 +_003115_hash alloc_trace_uprobe 3 13870 _003115_hash NULL
85906 +_003116_hash arcfb_write 3 8702 _003116_hash NULL
85907 +_003117_hash ath6kl_sdio_alloc_prep_scat_req 2 51986 _003117_hash NULL
85908 +_003118_hash ath6kl_usb_post_recv_transfers 2 32892 _003118_hash NULL
85909 +_003119_hash ath6kl_usb_submit_ctrl_in 6 32880 _003119_hash &_000778_hash
85910 +_003120_hash ath6kl_usb_submit_ctrl_out 6 9978 _003120_hash NULL
85911 +_003121_hash auok190xfb_write 3 37001 _003121_hash NULL
85912 +_003122_hash beacon_interval_write 3 17952 _003122_hash NULL
85913 +_003123_hash blk_dropped_read 3 4168 _003123_hash NULL
85914 +_003124_hash blk_msg_write 3 13655 _003124_hash NULL
85915 +_003125_hash brcmf_usbdev_qinit 2 19090 _003125_hash &_001533_hash
85916 +_003126_hash brcmf_usb_dl_cmd 4 53130 _003126_hash NULL
85917 +_003127_hash broadsheetfb_write 3 39976 _003127_hash NULL
85918 +_003128_hash broadsheet_spiflash_rewrite_sector 2 54864 _003128_hash NULL
85919 +_003129_hash cyttsp_probe 4 1940 _003129_hash NULL
85920 +_003130_hash da9052_group_write 3 4534 _003130_hash NULL
85921 +_003131_hash dccpprobe_read 3 52549 _003131_hash NULL
85922 +_003132_hash drm_property_create_bitmask 5 30195 _003132_hash NULL
85923 +_003133_hash dtim_interval_write 3 30489 _003133_hash NULL
85924 +_003134_hash dynamic_ps_timeout_write 3 37713 _003134_hash NULL
85925 +_003135_hash event_enable_read 3 7074 _003135_hash NULL
85926 +_003136_hash event_enable_write 3 45238 _003136_hash NULL
85927 +_003137_hash event_filter_read 3 23494 _003137_hash NULL
85928 +_003138_hash event_filter_write 3 56609 _003138_hash NULL
85929 +_003139_hash event_id_read 3 64288 _003139_hash &_001240_hash
85930 +_003140_hash f_audio_buffer_alloc 1 41110 _003140_hash NULL
85931 +_003141_hash fb_sys_read 3 13778 _003141_hash NULL
85932 +_003142_hash fb_sys_write 3 33130 _003142_hash NULL
85933 +_003143_hash forced_ps_write 3 37209 _003143_hash NULL
85934 +_003144_hash __fprog_create 2 41263 _003144_hash NULL
85935 +_003145_hash fq_codel_zalloc 1 15378 _003145_hash NULL
85936 +_003146_hash ftrace_pid_write 3 39710 _003146_hash NULL
85937 +_003147_hash ftrace_profile_read 3 21327 _003147_hash NULL
85938 +_003148_hash ftrace_profile_write 3 53327 _003148_hash NULL
85939 +_003149_hash ftrace_write 3 29551 _003149_hash NULL
85940 +_003150_hash gdm_wimax_netif_rx 3 43423 _003150_hash &_001619_hash
85941 +_003151_hash gpio_power_write 3 1991 _003151_hash NULL
85942 +_003152_hash hecubafb_write 3 26942 _003152_hash NULL
85943 +_003153_hash hsc_msg_alloc 1 60990 _003153_hash NULL
85944 +_003154_hash hsc_write 3 55875 _003154_hash NULL
85945 +_003155_hash hsi_alloc_controller 1 41802 _003155_hash NULL
85946 +_003156_hash hsi_register_board_info 2 13820 _003156_hash NULL
85947 +_003157_hash i915_ring_stop_read 3 42549 _003157_hash NULL
85948 +_003158_hash i915_ring_stop_write 3 59010 _003158_hash NULL
85949 +_003159_hash ieee802154_alloc_device 1 13767 _003159_hash NULL
85950 +_003160_hash intel_sdvo_write_cmd 4 54377 _003160_hash &_000815_hash
85951 +_003161_hash ivtvfb_write 3 40023 _003161_hash NULL
85952 +_003162_hash metronomefb_write 3 8823 _003162_hash NULL
85953 +_003163_hash mwifiex_usb_submit_rx_urb 2 54558 _003163_hash NULL
85954 +_003164_hash nfc_hci_hcp_message_tx 6 14534 _003164_hash NULL
85955 +_003165_hash nfc_hci_set_param 5 40697 _003165_hash NULL
85956 +_003166_hash nfc_shdlc_alloc_skb 2 12741 _003166_hash NULL
85957 +_003167_hash odev_update 2 50169 _003167_hash NULL
85958 +_003168_hash oz_add_farewell 5 20652 _003168_hash NULL
85959 +_003169_hash oz_cdev_read 3 20659 _003169_hash NULL
85960 +_003170_hash oz_cdev_write 3 33852 _003170_hash NULL
85961 +_003171_hash oz_ep_alloc 2 5587 _003171_hash NULL
85962 +_003172_hash oz_events_read 3 47535 _003172_hash NULL
85963 +_003173_hash pmcraid_copy_sglist 3 38431 _003173_hash NULL
85964 +_003174_hash prctl_set_mm 3 64538 _003174_hash NULL
85965 +_003175_hash ptp_filter_init 2 36780 _003175_hash NULL
85966 +_003176_hash rb_simple_read 3 45972 _003176_hash NULL
85967 +_003177_hash rb_simple_write 3 20890 _003177_hash NULL
85968 +_003178_hash read_file_dfs 3 43145 _003178_hash NULL
85969 +_003179_hash rx_streaming_always_write 3 32357 _003179_hash NULL
85970 +_003180_hash rx_streaming_interval_write 3 50120 _003180_hash NULL
85971 +_003181_hash shmem_pread_fast 3 34147 _003181_hash NULL
85972 +_003182_hash shmem_pread_slow 3 3198 _003182_hash NULL
85973 +_003183_hash shmem_pwrite_fast 3 46842 _003183_hash NULL
85974 +_003184_hash shmem_pwrite_slow 3 31741 _003184_hash NULL
85975 +_003185_hash show_header 3 4722 _003185_hash &_000736_hash
85976 +_003186_hash split_scan_timeout_write 3 52128 _003186_hash NULL
85977 +_003187_hash stack_max_size_read 3 1445 _003187_hash NULL
85978 +_003188_hash stack_max_size_write 3 36068 _003188_hash NULL
85979 +_003189_hash subsystem_filter_read 3 62310 _003189_hash NULL
85980 +_003190_hash subsystem_filter_write 3 13022 _003190_hash NULL
85981 +_003191_hash suspend_dtim_interval_write 3 48854 _003191_hash NULL
85982 +_003192_hash system_enable_read 3 25815 _003192_hash NULL
85983 +_003193_hash system_enable_write 3 61396 _003193_hash NULL
85984 +_003194_hash trace_options_core_read 3 47390 _003194_hash NULL
85985 +_003195_hash trace_options_core_write 3 61551 _003195_hash NULL
85986 +_003196_hash trace_options_read 3 11419 _003196_hash NULL
85987 +_003197_hash trace_options_write 3 48275 _003197_hash NULL
85988 +_003198_hash trace_parser_get_init 2 31379 _003198_hash NULL
85989 +_003199_hash traceprobe_probes_write 3 64969 _003199_hash NULL
85990 +_003200_hash trace_seq_to_user 3 65398 _003200_hash NULL
85991 +_003201_hash tracing_buffers_read 3 11124 _003201_hash NULL
85992 +_003202_hash tracing_clock_write 3 27961 _003202_hash NULL
85993 +_003203_hash tracing_cpumask_read 3 7010 _003203_hash NULL
85994 +_003204_hash tracing_ctrl_read 3 46922 _003204_hash NULL
85995 +_003205_hash tracing_ctrl_write 3 42324 _003205_hash &_001726_hash
85996 +_003206_hash tracing_entries_read 3 8345 _003206_hash NULL
85997 +_003207_hash tracing_entries_write 3 60563 _003207_hash NULL
85998 +_003208_hash tracing_max_lat_read 3 8890 _003208_hash NULL
85999 +_003209_hash tracing_max_lat_write 3 8728 _003209_hash NULL
86000 +_003210_hash tracing_read_dyn_info 3 45468 _003210_hash NULL
86001 +_003211_hash tracing_readme_read 3 16493 _003211_hash NULL
86002 +_003212_hash tracing_saved_cmdlines_read 3 21434 _003212_hash NULL
86003 +_003213_hash tracing_set_trace_read 3 44122 _003213_hash NULL
86004 +_003214_hash tracing_set_trace_write 3 57096 _003214_hash NULL
86005 +_003215_hash tracing_stats_read 3 34537 _003215_hash NULL
86006 +_003216_hash tracing_total_entries_read 3 62817 _003216_hash NULL
86007 +_003217_hash tracing_trace_options_write 3 153 _003217_hash NULL
86008 +_003218_hash ttm_put_pages 2 9179 _003218_hash NULL
86009 +_003219_hash udl_prime_create 2 57159 _003219_hash NULL
86010 +_003220_hash ufx_alloc_urb_list 3 10349 _003220_hash NULL
86011 +_003221_hash u_memcpya 2-3 30139 _003221_hash NULL
86012 +_003223_hash viafb_dfph_proc_write 3 49288 _003223_hash NULL
86013 +_003224_hash viafb_dfpl_proc_write 3 627 _003224_hash NULL
86014 +_003225_hash viafb_dvp0_proc_write 3 23023 _003225_hash NULL
86015 +_003226_hash viafb_dvp1_proc_write 3 48864 _003226_hash NULL
86016 +_003227_hash viafb_vt1636_proc_write 3 16018 _003227_hash NULL
86017 +_003228_hash vivi_read 3 23073 _003228_hash NULL
86018 +_003229_hash wl1271_rx_filter_alloc_field 5 46721 _003229_hash NULL
86019 +_003230_hash wl12xx_cmd_build_probe_req 6-8 3098 _003230_hash NULL
86020 +_003232_hash wlcore_alloc_hw 1 7785 _003232_hash NULL
86021 +_003233_hash alloc_and_copy_ftrace_hash 1 29368 _003233_hash NULL
86022 +_003234_hash create_trace_probe 1 20175 _003234_hash NULL
86023 +_003235_hash create_trace_uprobe 1 13184 _003235_hash NULL
86024 +_003236_hash intel_sdvo_set_value 4 2311 _003236_hash NULL
86025 +_003237_hash mmio_read 4 40348 _003237_hash NULL
86026 +_003238_hash nfc_hci_execute_cmd 5 43882 _003238_hash NULL
86027 +_003239_hash nfc_hci_send_event 5 21452 _003239_hash NULL
86028 +_003240_hash nfc_hci_send_response 5 56462 _003240_hash NULL
86029 +_003241_hash picolcd_fb_write 3 2318 _003241_hash NULL
86030 +_003242_hash probes_write 3 29711 _003242_hash NULL
86031 +_003243_hash sys_prctl 4 8766 _003243_hash NULL
86032 +_003244_hash tracing_read_pipe 3 35312 _003244_hash NULL
86033 +_003245_hash brcmf_usb_attach 1-2 44656 _003245_hash NULL
86034 +_003247_hash dlfb_ops_write 3 64150 _003247_hash NULL
86035 +_003248_hash nfc_hci_send_cmd 5 55714 _003248_hash NULL
86036 +_003249_hash ufx_ops_write 3 54848 _003249_hash NULL
86037 +_003250_hash viafb_iga1_odev_proc_write 3 36241 _003250_hash NULL
86038 +_003251_hash viafb_iga2_odev_proc_write 3 2363 _003251_hash NULL
86039 +_003252_hash xenfb_write 3 43412 _003252_hash NULL
86040 +_003253_hash acl_alloc 1 35979 _003253_hash NULL
86041 +_003254_hash acl_alloc_stack_init 1 60630 _003254_hash NULL
86042 +_003255_hash acl_alloc_num 1-2 60778 _003255_hash NULL
86043 diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
86044 new file mode 100644
86045 index 0000000..e9310fa
86046 --- /dev/null
86047 +++ b/tools/gcc/size_overflow_plugin.c
86048 @@ -0,0 +1,1612 @@
86049 +/*
86050 + * Copyright 2011, 2012 by Emese Revfy <re.emese@gmail.com>
86051 + * Licensed under the GPL v2, or (at your option) v3
86052 + *
86053 + * Homepage:
86054 + * http://www.grsecurity.net/~ephox/overflow_plugin/
86055 + *
86056 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
86057 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
86058 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
86059 + *
86060 + * Usage:
86061 + * $ gcc -I`gcc -print-file-name=plugin`/include/c-family -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -ggdb -Wall -W -Wno-missing-field-initializers -o size_overflow_plugin.so size_overflow_plugin.c
86062 + * $ gcc -fplugin=size_overflow_plugin.so test.c -O2
86063 + */
86064 +
86065 +#include "gcc-plugin.h"
86066 +#include "config.h"
86067 +#include "system.h"
86068 +#include "coretypes.h"
86069 +#include "tree.h"
86070 +#include "tree-pass.h"
86071 +#include "intl.h"
86072 +#include "plugin-version.h"
86073 +#include "tm.h"
86074 +#include "toplev.h"
86075 +#include "function.h"
86076 +#include "tree-flow.h"
86077 +#include "plugin.h"
86078 +#include "gimple.h"
86079 +#include "c-common.h"
86080 +#include "diagnostic.h"
86081 +#include "cfgloop.h"
86082 +
86083 +struct size_overflow_hash {
86084 + const struct size_overflow_hash * const next;
86085 + const char * const name;
86086 + const unsigned int param;
86087 +};
86088 +
86089 +#include "size_overflow_hash.h"
86090 +
86091 +#define __unused __attribute__((__unused__))
86092 +#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
86093 +#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node))
86094 +#define BEFORE_STMT true
86095 +#define AFTER_STMT false
86096 +#define CREATE_NEW_VAR NULL_TREE
86097 +#define CODES_LIMIT 32
86098 +#define MAX_PARAM 10
86099 +#define MY_STMT GF_PLF_1
86100 +#define NO_CAST_CHECK GF_PLF_2
86101 +
86102 +#if BUILDING_GCC_VERSION == 4005
86103 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
86104 +#endif
86105 +
86106 +int plugin_is_GPL_compatible;
86107 +void debug_gimple_stmt(gimple gs);
86108 +
86109 +static tree expand(struct pointer_set_t *visited, bool *potentionally_overflowed, tree lhs);
86110 +static tree report_size_overflow_decl;
86111 +static const_tree const_char_ptr_type_node;
86112 +static unsigned int handle_function(void);
86113 +static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool *potentionally_overflowed, bool before);
86114 +static tree get_size_overflow_type(gimple stmt, tree node);
86115 +static tree dup_assign(struct pointer_set_t *visited, bool *potentionally_overflowed, gimple oldstmt, tree size_overflow_type, tree rhs1, tree rhs2, tree __unused rhs3);
86116 +
86117 +static struct plugin_info size_overflow_plugin_info = {
86118 + .version = "20120820beta",
86119 + .help = "no-size-overflow\tturn off size overflow checking\n",
86120 +};
86121 +
86122 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
86123 +{
86124 + unsigned int arg_count;
86125 +
86126 + if (TREE_CODE(*node) == FUNCTION_DECL)
86127 + arg_count = type_num_arguments(TREE_TYPE(*node));
86128 + else if (TREE_CODE(*node) == FUNCTION_TYPE || TREE_CODE(*node) == METHOD_TYPE)
86129 + arg_count = type_num_arguments(*node);
86130 + else {
86131 + *no_add_attrs = true;
86132 + error("%qE attribute only applies to functions", name);
86133 + return NULL_TREE;
86134 + }
86135 +
86136 + for (; args; args = TREE_CHAIN(args)) {
86137 + tree position = TREE_VALUE(args);
86138 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_HIGH(position) || TREE_INT_CST_LOW(position) < 1 || TREE_INT_CST_LOW(position) > arg_count ) {
86139 + error("handle_size_overflow_attribute: overflow parameter outside range.");
86140 + *no_add_attrs = true;
86141 + }
86142 + }
86143 + return NULL_TREE;
86144 +}
86145 +
86146 +static struct attribute_spec size_overflow_attr = {
86147 + .name = "size_overflow",
86148 + .min_length = 1,
86149 + .max_length = -1,
86150 + .decl_required = true,
86151 + .type_required = false,
86152 + .function_type_required = false,
86153 + .handler = handle_size_overflow_attribute,
86154 +#if BUILDING_GCC_VERSION >= 4007
86155 + .affects_type_identity = false
86156 +#endif
86157 +};
86158 +
86159 +static void register_attributes(void __unused *event_data, void __unused *data)
86160 +{
86161 + register_attribute(&size_overflow_attr);
86162 +}
86163 +
86164 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
86165 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
86166 +{
86167 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
86168 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
86169 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
86170 +
86171 + unsigned int m = 0x57559429;
86172 + unsigned int n = 0x5052acdb;
86173 + const unsigned int *key4 = (const unsigned int *)key;
86174 + unsigned int h = len;
86175 + unsigned int k = len + seed + n;
86176 + unsigned long long p;
86177 +
86178 + while (len >= 8) {
86179 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
86180 + len -= 8;
86181 + }
86182 + if (len >= 4) {
86183 + cwmixb(key4[0]) key4 += 1;
86184 + len -= 4;
86185 + }
86186 + if (len)
86187 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
86188 + cwmixb(h ^ (k + n));
86189 + return k ^ h;
86190 +
86191 +#undef cwfold
86192 +#undef cwmixa
86193 +#undef cwmixb
86194 +}
86195 +
86196 +static inline unsigned int get_hash_num(const char *fndecl, const char *tree_codes, unsigned int len, unsigned int seed)
86197 +{
86198 + unsigned int fn = CrapWow(fndecl, strlen(fndecl), seed) & 0xffff;
86199 + unsigned int codes = CrapWow(tree_codes, len, seed) & 0xffff;
86200 + return fn ^ codes;
86201 +}
86202 +
86203 +static inline const_tree get_original_function_decl(const_tree fndecl)
86204 +{
86205 + if (DECL_ABSTRACT_ORIGIN(fndecl))
86206 + return DECL_ABSTRACT_ORIGIN(fndecl);
86207 + return fndecl;
86208 +}
86209 +
86210 +static inline gimple get_def_stmt(const_tree node)
86211 +{
86212 + gcc_assert(node != NULL_TREE);
86213 + gcc_assert(TREE_CODE(node) == SSA_NAME);
86214 + return SSA_NAME_DEF_STMT(node);
86215 +}
86216 +
86217 +static unsigned char get_tree_code(tree type)
86218 +{
86219 + switch (TREE_CODE(type)) {
86220 + case ARRAY_TYPE:
86221 + return 0;
86222 + case BOOLEAN_TYPE:
86223 + return 1;
86224 + case ENUMERAL_TYPE:
86225 + return 2;
86226 + case FUNCTION_TYPE:
86227 + return 3;
86228 + case INTEGER_TYPE:
86229 + return 4;
86230 + case POINTER_TYPE:
86231 + return 5;
86232 + case RECORD_TYPE:
86233 + return 6;
86234 + case UNION_TYPE:
86235 + return 7;
86236 + case VOID_TYPE:
86237 + return 8;
86238 + case REAL_TYPE:
86239 + return 9;
86240 + case VECTOR_TYPE:
86241 + return 10;
86242 + case REFERENCE_TYPE:
86243 + return 11;
86244 + default:
86245 + debug_tree(type);
86246 + gcc_unreachable();
86247 + }
86248 +}
86249 +
86250 +static size_t add_type_codes(tree type, unsigned char *tree_codes, size_t len)
86251 +{
86252 + gcc_assert(type != NULL_TREE);
86253 +
86254 + while (type && len < CODES_LIMIT) {
86255 + tree_codes[len] = get_tree_code(type);
86256 + len++;
86257 + type = TREE_TYPE(type);
86258 + }
86259 + return len;
86260 +}
86261 +
86262 +static unsigned int get_function_decl(const_tree fndecl, unsigned char *tree_codes)
86263 +{
86264 + tree arg;
86265 + const_tree result, type = TREE_TYPE(fndecl);
86266 + enum tree_code code = TREE_CODE(type);
86267 + size_t len = 0;
86268 +
86269 + gcc_assert(code == FUNCTION_TYPE);
86270 +
86271 + arg = TYPE_ARG_TYPES(type);
86272 + // skip builtins __builtin_constant_p
86273 + if (!arg && DECL_BUILT_IN(fndecl))
86274 + return 0;
86275 + gcc_assert(arg != NULL_TREE);
86276 +
86277 + if (TREE_CODE_CLASS(code) == tcc_type)
86278 + result = type;
86279 + else
86280 + result = DECL_RESULT(fndecl);
86281 +
86282 + gcc_assert(result != NULL_TREE);
86283 + len = add_type_codes(TREE_TYPE(result), tree_codes, len);
86284 +
86285 + while (arg && len < CODES_LIMIT) {
86286 + len = add_type_codes(TREE_VALUE(arg), tree_codes, len);
86287 + arg = TREE_CHAIN(arg);
86288 + }
86289 +
86290 + gcc_assert(len != 0);
86291 + return len;
86292 +}
86293 +
86294 +static const struct size_overflow_hash *get_function_hash(const_tree fndecl)
86295 +{
86296 + unsigned int hash;
86297 + const struct size_overflow_hash *entry;
86298 + unsigned char tree_codes[CODES_LIMIT];
86299 + size_t len;
86300 + const char *func_name = NAME(fndecl);
86301 +
86302 + len = get_function_decl(fndecl, tree_codes);
86303 + if (len == 0)
86304 + return NULL;
86305 +
86306 + hash = get_hash_num(func_name, (const char*) tree_codes, len, 0);
86307 +
86308 + entry = size_overflow_hash[hash];
86309 + while (entry) {
86310 + if (!strcmp(entry->name, func_name))
86311 + return entry;
86312 + entry = entry->next;
86313 + }
86314 +
86315 + return NULL;
86316 +}
86317 +
86318 +static void check_arg_type(const_tree arg)
86319 +{
86320 + const_tree type = TREE_TYPE(arg);
86321 + enum tree_code code = TREE_CODE(type);
86322 +
86323 + gcc_assert(code == INTEGER_TYPE || code == ENUMERAL_TYPE ||
86324 + (code == POINTER_TYPE && TREE_CODE(TREE_TYPE(type)) == VOID_TYPE) ||
86325 + (code == POINTER_TYPE && TREE_CODE(TREE_TYPE(type)) == INTEGER_TYPE));
86326 +}
86327 +
86328 +static int find_arg_number(const_tree arg, const_tree func)
86329 +{
86330 + tree var;
86331 + bool match = false;
86332 + unsigned int argnum = 1;
86333 +
86334 + if (TREE_CODE(arg) == SSA_NAME)
86335 + arg = SSA_NAME_VAR(arg);
86336 +
86337 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var)) {
86338 + if (strcmp(NAME(arg), NAME(var))) {
86339 + argnum++;
86340 + continue;
86341 + }
86342 + check_arg_type(var);
86343 +
86344 + match = true;
86345 + break;
86346 + }
86347 + if (!match) {
86348 + warning(0, "find_arg_number: cannot find the %s argument in %s", NAME(arg), NAME(func));
86349 + return 0;
86350 + }
86351 + return argnum;
86352 +}
86353 +
86354 +static void print_missing_msg(const_tree func, unsigned int argnum)
86355 +{
86356 + unsigned int new_hash;
86357 + size_t len;
86358 + unsigned char tree_codes[CODES_LIMIT];
86359 + location_t loc = DECL_SOURCE_LOCATION(func);
86360 + const char *curfunc = NAME(func);
86361 +
86362 + len = get_function_decl(func, tree_codes);
86363 + new_hash = get_hash_num(curfunc, (const char *) tree_codes, len, 0);
86364 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%d+%u+", curfunc, curfunc, argnum, new_hash);
86365 +}
86366 +
86367 +static void check_missing_attribute(const_tree arg)
86368 +{
86369 + const_tree type = TREE_TYPE(arg);
86370 + const_tree func = get_original_function_decl(current_function_decl);
86371 + unsigned int argnum;
86372 + const struct size_overflow_hash *hash;
86373 +
86374 + gcc_assert(TREE_CODE(arg) != COMPONENT_REF);
86375 +
86376 + if (TREE_CODE(type) == POINTER_TYPE)
86377 + return;
86378 +
86379 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(func)))
86380 + return;
86381 +
86382 + argnum = find_arg_number(arg, func);
86383 + if (argnum == 0)
86384 + return;
86385 +
86386 + hash = get_function_hash(func);
86387 + if (!hash || !(hash->param & (1U << argnum)))
86388 + print_missing_msg(func, argnum);
86389 +}
86390 +
86391 +static tree create_new_var(tree type)
86392 +{
86393 + tree new_var = create_tmp_var(type, "cicus");
86394 +
86395 + add_referenced_var(new_var);
86396 + mark_sym_for_renaming(new_var);
86397 + return new_var;
86398 +}
86399 +
86400 +static gimple create_binary_assign(enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
86401 +{
86402 + gimple assign;
86403 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
86404 + tree type = TREE_TYPE(rhs1);
86405 + tree lhs = create_new_var(type);
86406 +
86407 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
86408 + gimple_set_lhs(assign, make_ssa_name(lhs, assign));
86409 +
86410 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
86411 + update_stmt(assign);
86412 + gimple_set_plf(assign, MY_STMT, true);
86413 + return assign;
86414 +}
86415 +
86416 +static bool is_bool(const_tree node)
86417 +{
86418 + const_tree type;
86419 +
86420 + if (node == NULL_TREE)
86421 + return false;
86422 +
86423 + type = TREE_TYPE(node);
86424 + if (!INTEGRAL_TYPE_P(type))
86425 + return false;
86426 + if (TREE_CODE(type) == BOOLEAN_TYPE)
86427 + return true;
86428 + if (TYPE_PRECISION(type) == 1)
86429 + return true;
86430 + return false;
86431 +}
86432 +
86433 +static tree cast_a_tree(tree type, tree var)
86434 +{
86435 + gcc_assert(type != NULL_TREE);
86436 + gcc_assert(var != NULL_TREE);
86437 + gcc_assert(fold_convertible_p(type, var));
86438 +
86439 + return fold_convert(type, var);
86440 +}
86441 +
86442 +static gimple build_cast_stmt(tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before)
86443 +{
86444 + gimple assign;
86445 +
86446 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
86447 + if (gsi_end_p(*gsi) && before == BEFORE_STMT)
86448 + gcc_unreachable();
86449 +
86450 + if (lhs == CREATE_NEW_VAR)
86451 + lhs = create_new_var(dst_type);
86452 +
86453 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
86454 +
86455 + if (!gsi_end_p(*gsi)) {
86456 + location_t loc = gimple_location(gsi_stmt(*gsi));
86457 + gimple_set_location(assign, loc);
86458 + }
86459 +
86460 + gimple_set_lhs(assign, make_ssa_name(lhs, assign));
86461 +
86462 + if (before)
86463 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
86464 + else
86465 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
86466 + update_stmt(assign);
86467 + gimple_set_plf(assign, MY_STMT, true);
86468 +
86469 + return assign;
86470 +}
86471 +
86472 +static tree cast_to_new_size_overflow_type(gimple stmt, tree new_rhs1, tree size_overflow_type, bool before)
86473 +{
86474 + const_gimple assign;
86475 + gimple_stmt_iterator gsi;
86476 +
86477 + if (new_rhs1 == NULL_TREE)
86478 + return NULL_TREE;
86479 +
86480 + if (!useless_type_conversion_p(TREE_TYPE(new_rhs1), size_overflow_type)) {
86481 + gsi = gsi_for_stmt(stmt);
86482 + assign = build_cast_stmt(size_overflow_type, new_rhs1, CREATE_NEW_VAR, &gsi, before);
86483 + return gimple_get_lhs(assign);
86484 + }
86485 + return new_rhs1;
86486 +}
86487 +
86488 +static tree follow_overflow_type_and_dup(struct pointer_set_t *visited, bool *potentionally_overflowed, gimple stmt, tree node, tree new_rhs1, tree new_rhs2, tree new_rhs3)
86489 +{
86490 + tree size_overflow_type = get_size_overflow_type(stmt, node);
86491 +
86492 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
86493 +
86494 + if (new_rhs2 != NULL_TREE)
86495 + new_rhs2 = cast_to_new_size_overflow_type(stmt, new_rhs2, size_overflow_type, BEFORE_STMT);
86496 +
86497 + if (new_rhs3 != NULL_TREE)
86498 + new_rhs3 = cast_to_new_size_overflow_type(stmt, new_rhs3, size_overflow_type, BEFORE_STMT);
86499 +
86500 + return dup_assign(visited, potentionally_overflowed, stmt, size_overflow_type, new_rhs1, new_rhs2, new_rhs3);
86501 +}
86502 +
86503 +static tree create_assign(struct pointer_set_t *visited, bool *potentionally_overflowed, gimple oldstmt, tree rhs1, bool before)
86504 +{
86505 + const_tree oldstmt_rhs1;
86506 + tree size_overflow_type, lhs;
86507 + enum tree_code code;
86508 + gimple stmt;
86509 + gimple_stmt_iterator gsi;
86510 +
86511 + if (!*potentionally_overflowed)
86512 + return NULL_TREE;
86513 +
86514 + if (rhs1 == NULL_TREE) {
86515 + debug_gimple_stmt(oldstmt);
86516 + error("create_assign: rhs1 is NULL_TREE");
86517 + gcc_unreachable();
86518 + }
86519 +
86520 + if (gimple_code(oldstmt) == GIMPLE_ASM)
86521 + lhs = rhs1;
86522 + else
86523 + lhs = gimple_get_lhs(oldstmt);
86524 +
86525 + oldstmt_rhs1 = gimple_assign_rhs1(oldstmt);
86526 + code = TREE_CODE(oldstmt_rhs1);
86527 + if (code == PARM_DECL || (code == SSA_NAME && gimple_code(get_def_stmt(oldstmt_rhs1)) == GIMPLE_NOP))
86528 + check_missing_attribute(oldstmt_rhs1);
86529 +
86530 + gsi = gsi_for_stmt(oldstmt);
86531 + pointer_set_insert(visited, oldstmt);
86532 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
86533 + basic_block next_bb, cur_bb;
86534 + const_edge e;
86535 +
86536 + gcc_assert(before == false);
86537 + gcc_assert(stmt_can_throw_internal(oldstmt));
86538 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
86539 + gcc_assert(!gsi_end_p(gsi));
86540 +
86541 + cur_bb = gimple_bb(oldstmt);
86542 + next_bb = cur_bb->next_bb;
86543 + e = find_edge(cur_bb, next_bb);
86544 + gcc_assert(e != NULL);
86545 + gcc_assert(e->flags & EDGE_FALLTHRU);
86546 +
86547 + gsi = gsi_after_labels(next_bb);
86548 + gcc_assert(!gsi_end_p(gsi));
86549 +
86550 + before = true;
86551 + oldstmt = gsi_stmt(gsi);
86552 + pointer_set_insert(visited, oldstmt);
86553 + }
86554 +
86555 + size_overflow_type = get_size_overflow_type(oldstmt, lhs);
86556 +
86557 + stmt = build_cast_stmt(size_overflow_type, rhs1, CREATE_NEW_VAR, &gsi, before);
86558 + gimple_set_plf(stmt, MY_STMT, true);
86559 + return gimple_get_lhs(stmt);
86560 +}
86561 +
86562 +static tree dup_assign(struct pointer_set_t *visited, bool *potentionally_overflowed, gimple oldstmt, tree size_overflow_type, tree rhs1, tree rhs2, tree __unused rhs3)
86563 +{
86564 + gimple stmt;
86565 + gimple_stmt_iterator gsi;
86566 + tree new_var, lhs = gimple_get_lhs(oldstmt);
86567 +
86568 + if (!*potentionally_overflowed)
86569 + return NULL_TREE;
86570 +
86571 + if (gimple_plf(oldstmt, MY_STMT))
86572 + return lhs;
86573 +
86574 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
86575 + rhs1 = gimple_assign_rhs1(oldstmt);
86576 + rhs1 = create_assign(visited, potentionally_overflowed, oldstmt, rhs1, BEFORE_STMT);
86577 + }
86578 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
86579 + rhs2 = gimple_assign_rhs2(oldstmt);
86580 + rhs2 = create_assign(visited, potentionally_overflowed, oldstmt, rhs2, BEFORE_STMT);
86581 + }
86582 +
86583 + stmt = gimple_copy(oldstmt);
86584 + gimple_set_location(stmt, gimple_location(oldstmt));
86585 + gimple_set_plf(stmt, MY_STMT, true);
86586 +
86587 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
86588 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
86589 +
86590 + if (is_bool(lhs))
86591 + new_var = SSA_NAME_VAR(lhs);
86592 + else
86593 + new_var = create_new_var(size_overflow_type);
86594 + new_var = make_ssa_name(new_var, stmt);
86595 + gimple_set_lhs(stmt, new_var);
86596 +
86597 + if (rhs1 != NULL_TREE) {
86598 + if (!gimple_assign_cast_p(oldstmt))
86599 + rhs1 = cast_a_tree(size_overflow_type, rhs1);
86600 + gimple_assign_set_rhs1(stmt, rhs1);
86601 + }
86602 +
86603 + if (rhs2 != NULL_TREE)
86604 + gimple_assign_set_rhs2(stmt, rhs2);
86605 +#if BUILDING_GCC_VERSION >= 4007
86606 + if (rhs3 != NULL_TREE)
86607 + gimple_assign_set_rhs3(stmt, rhs3);
86608 +#endif
86609 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
86610 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
86611 +
86612 + gsi = gsi_for_stmt(oldstmt);
86613 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
86614 + update_stmt(stmt);
86615 + pointer_set_insert(visited, oldstmt);
86616 + return gimple_get_lhs(stmt);
86617 +}
86618 +
86619 +static gimple overflow_create_phi_node(gimple oldstmt, tree result)
86620 +{
86621 + basic_block bb;
86622 + gimple phi;
86623 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
86624 +
86625 + bb = gsi_bb(gsi);
86626 +
86627 + phi = create_phi_node(result, bb);
86628 + gsi = gsi_last(phi_nodes(bb));
86629 + gsi_remove(&gsi, false);
86630 +
86631 + gsi = gsi_for_stmt(oldstmt);
86632 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
86633 + gimple_set_bb(phi, bb);
86634 + gimple_set_plf(phi, MY_STMT, true);
86635 + return phi;
86636 +}
86637 +
86638 +static basic_block create_a_first_bb(void)
86639 +{
86640 + basic_block first_bb;
86641 +
86642 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
86643 + if (dom_info_available_p(CDI_DOMINATORS))
86644 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
86645 + return first_bb;
86646 +}
86647 +
86648 +static tree cast_old_phi_arg(gimple oldstmt, tree size_overflow_type, tree arg, tree new_var, unsigned int i)
86649 +{
86650 + basic_block bb;
86651 + const_gimple newstmt;
86652 + gimple_stmt_iterator gsi;
86653 + bool before = BEFORE_STMT;
86654 +
86655 + if (TREE_CODE(arg) == SSA_NAME && gimple_code(get_def_stmt(arg)) != GIMPLE_NOP) {
86656 + gsi = gsi_for_stmt(get_def_stmt(arg));
86657 + newstmt = build_cast_stmt(size_overflow_type, arg, new_var, &gsi, AFTER_STMT);
86658 + return gimple_get_lhs(newstmt);
86659 + }
86660 +
86661 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
86662 + gsi = gsi_after_labels(bb);
86663 + if (bb->index == 0) {
86664 + bb = create_a_first_bb();
86665 + gsi = gsi_start_bb(bb);
86666 + }
86667 + if (gsi_end_p(gsi))
86668 + before = AFTER_STMT;
86669 + newstmt = build_cast_stmt(size_overflow_type, arg, new_var, &gsi, before);
86670 + return gimple_get_lhs(newstmt);
86671 +}
86672 +
86673 +static const_gimple handle_new_phi_arg(const_tree arg, tree new_var, tree new_rhs)
86674 +{
86675 + gimple newstmt;
86676 + gimple_stmt_iterator gsi;
86677 + void (*gsi_insert)(gimple_stmt_iterator *, gimple, enum gsi_iterator_update);
86678 + gimple def_newstmt = get_def_stmt(new_rhs);
86679 +
86680 + gsi_insert = gsi_insert_after;
86681 + gsi = gsi_for_stmt(def_newstmt);
86682 +
86683 + switch (gimple_code(get_def_stmt(arg))) {
86684 + case GIMPLE_PHI:
86685 + newstmt = gimple_build_assign(new_var, new_rhs);
86686 + gsi = gsi_after_labels(gimple_bb(def_newstmt));
86687 + gsi_insert = gsi_insert_before;
86688 + break;
86689 + case GIMPLE_ASM:
86690 + case GIMPLE_CALL:
86691 + newstmt = gimple_build_assign(new_var, new_rhs);
86692 + break;
86693 + case GIMPLE_ASSIGN:
86694 + newstmt = gimple_build_assign(new_var, gimple_get_lhs(def_newstmt));
86695 + break;
86696 + default:
86697 + /* unknown gimple_code (handle_build_new_phi_arg) */
86698 + gcc_unreachable();
86699 + }
86700 +
86701 + gimple_set_lhs(newstmt, make_ssa_name(new_var, newstmt));
86702 + gsi_insert(&gsi, newstmt, GSI_NEW_STMT);
86703 + gimple_set_plf(newstmt, MY_STMT, true);
86704 + update_stmt(newstmt);
86705 + return newstmt;
86706 +}
86707 +
86708 +static tree build_new_phi_arg(struct pointer_set_t *visited, bool *potentionally_overflowed, tree size_overflow_type, tree arg, tree new_var)
86709 +{
86710 + const_gimple newstmt;
86711 + tree new_rhs;
86712 +
86713 + new_rhs = expand(visited, potentionally_overflowed, arg);
86714 + if (new_rhs == NULL_TREE)
86715 + return NULL_TREE;
86716 +
86717 + new_rhs = cast_to_new_size_overflow_type(get_def_stmt(new_rhs), new_rhs, size_overflow_type, AFTER_STMT);
86718 +
86719 + newstmt = handle_new_phi_arg(arg, new_var, new_rhs);
86720 + return gimple_get_lhs(newstmt);
86721 +}
86722 +
86723 +static tree build_new_phi(struct pointer_set_t *visited, bool *potentionally_overflowed, tree orig_result)
86724 +{
86725 + gimple phi, oldstmt = get_def_stmt(orig_result);
86726 + tree new_result, size_overflow_type;
86727 + unsigned int i;
86728 + unsigned int n = gimple_phi_num_args(oldstmt);
86729 +
86730 + size_overflow_type = get_size_overflow_type(oldstmt, orig_result);
86731 +
86732 + new_result = create_new_var(size_overflow_type);
86733 +
86734 + pointer_set_insert(visited, oldstmt);
86735 + phi = overflow_create_phi_node(oldstmt, new_result);
86736 + for (i = 0; i < n; i++) {
86737 + tree arg, lhs;
86738 +
86739 + arg = gimple_phi_arg_def(oldstmt, i);
86740 + if (is_gimple_constant(arg))
86741 + arg = cast_a_tree(size_overflow_type, arg);
86742 + lhs = build_new_phi_arg(visited, potentionally_overflowed, size_overflow_type, arg, new_result);
86743 + if (lhs == NULL_TREE)
86744 + lhs = cast_old_phi_arg(oldstmt, size_overflow_type, arg, new_result, i);
86745 + add_phi_arg(phi, lhs, gimple_phi_arg_edge(oldstmt, i), gimple_location(oldstmt));
86746 + }
86747 +
86748 + update_stmt(phi);
86749 + return gimple_phi_result(phi);
86750 +}
86751 +
86752 +static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs)
86753 +{
86754 + const_gimple assign;
86755 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
86756 + tree origtype = TREE_TYPE(orig_rhs);
86757 +
86758 + gcc_assert(gimple_code(stmt) == GIMPLE_ASSIGN);
86759 +
86760 + assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
86761 + return gimple_get_lhs(assign);
86762 +}
86763 +
86764 +static void change_rhs1(gimple stmt, tree new_rhs1)
86765 +{
86766 + tree assign_rhs;
86767 + const_tree rhs = gimple_assign_rhs1(stmt);
86768 +
86769 + assign_rhs = change_assign_rhs(stmt, rhs, new_rhs1);
86770 + gimple_assign_set_rhs1(stmt, assign_rhs);
86771 + update_stmt(stmt);
86772 +}
86773 +
86774 +static bool check_mode_type(const_gimple stmt)
86775 +{
86776 + const_tree lhs = gimple_get_lhs(stmt);
86777 + const_tree lhs_type = TREE_TYPE(lhs);
86778 + const_tree rhs_type = TREE_TYPE(gimple_assign_rhs1(stmt));
86779 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
86780 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
86781 +
86782 + if (rhs_mode == lhs_mode && TYPE_UNSIGNED(rhs_type) == TYPE_UNSIGNED(lhs_type))
86783 + return false;
86784 +
86785 + if (rhs_mode == SImode && lhs_mode == DImode && (TYPE_UNSIGNED(rhs_type) || !TYPE_UNSIGNED(lhs_type)))
86786 + return false;
86787 +
86788 + return true;
86789 +}
86790 +
86791 +static bool check_undefined_integer_operation(const_gimple stmt)
86792 +{
86793 + const_gimple def_stmt;
86794 + const_tree lhs = gimple_get_lhs(stmt);
86795 + const_tree rhs1 = gimple_assign_rhs1(stmt);
86796 + const_tree rhs1_type = TREE_TYPE(rhs1);
86797 + const_tree lhs_type = TREE_TYPE(lhs);
86798 +
86799 + if (TYPE_MODE(rhs1_type) != TYPE_MODE(lhs_type) || TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
86800 + return false;
86801 +
86802 + def_stmt = get_def_stmt(rhs1);
86803 + if (gimple_code(def_stmt) != GIMPLE_ASSIGN)
86804 + return false;
86805 +
86806 + if (gimple_assign_rhs_code(def_stmt) != MINUS_EXPR)
86807 + return false;
86808 + return true;
86809 +}
86810 +
86811 +static bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
86812 +{
86813 + const_tree rhs1, lhs, rhs1_type, lhs_type;
86814 + enum machine_mode lhs_mode, rhs_mode;
86815 + gimple def_stmt = get_def_stmt(no_const_rhs);
86816 +
86817 + if (!gimple_assign_cast_p(def_stmt))
86818 + return false;
86819 +
86820 + rhs1 = gimple_assign_rhs1(def_stmt);
86821 + lhs = gimple_get_lhs(def_stmt);
86822 + rhs1_type = TREE_TYPE(rhs1);
86823 + lhs_type = TREE_TYPE(lhs);
86824 + rhs_mode = TYPE_MODE(rhs1_type);
86825 + lhs_mode = TYPE_MODE(lhs_type);
86826 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
86827 + return false;
86828 +
86829 + return true;
86830 +}
86831 +
86832 +static tree handle_unary_rhs(struct pointer_set_t *visited, bool *potentionally_overflowed, gimple stmt)
86833 +{
86834 + tree size_overflow_type, lhs = gimple_get_lhs(stmt);
86835 + tree new_rhs1, rhs1 = gimple_assign_rhs1(stmt);
86836 + const_tree rhs1_type = TREE_TYPE(rhs1);
86837 + const_tree lhs_type = TREE_TYPE(lhs);
86838 +
86839 + *potentionally_overflowed = true;
86840 +
86841 + new_rhs1 = expand(visited, potentionally_overflowed, rhs1);
86842 +
86843 + if (new_rhs1 == NULL_TREE || TREE_CODE(rhs1_type) == POINTER_TYPE)
86844 + return create_assign(visited, potentionally_overflowed, stmt, lhs, AFTER_STMT);
86845 +
86846 + if (gimple_plf(stmt, MY_STMT))
86847 + return lhs;
86848 +
86849 + if (gimple_plf(stmt, NO_CAST_CHECK))
86850 + return follow_overflow_type_and_dup(visited, potentionally_overflowed, stmt, rhs1, new_rhs1, NULL_TREE, NULL_TREE);
86851 +
86852 + if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) {
86853 + size_overflow_type = get_size_overflow_type(stmt, rhs1);
86854 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
86855 + check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, potentionally_overflowed, BEFORE_STMT);
86856 + return create_assign(visited, potentionally_overflowed, stmt, lhs, AFTER_STMT);
86857 + }
86858 +
86859 + if (!gimple_assign_cast_p(stmt) || check_undefined_integer_operation(stmt))
86860 + return follow_overflow_type_and_dup(visited, potentionally_overflowed, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
86861 +
86862 + size_overflow_type = get_size_overflow_type(stmt, rhs1);
86863 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
86864 +
86865 + change_rhs1(stmt, new_rhs1);
86866 + check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, potentionally_overflowed, BEFORE_STMT);
86867 +
86868 + rhs1 = gimple_assign_rhs1(stmt);
86869 + rhs1_type = TREE_TYPE(rhs1);
86870 + if (TYPE_UNSIGNED(rhs1_type) != TYPE_UNSIGNED(lhs_type))
86871 + return create_assign(visited, potentionally_overflowed, stmt, rhs1, AFTER_STMT);
86872 +
86873 + if (!check_mode_type(stmt))
86874 + return create_assign(visited, potentionally_overflowed, stmt, lhs, AFTER_STMT);
86875 +
86876 + size_overflow_type = get_size_overflow_type(stmt, lhs);
86877 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
86878 +
86879 + check_size_overflow(stmt, size_overflow_type, new_rhs1, lhs, potentionally_overflowed, BEFORE_STMT);
86880 +
86881 + return create_assign(visited, potentionally_overflowed, stmt, lhs, AFTER_STMT);
86882 +}
86883 +
86884 +static tree handle_unary_ops(struct pointer_set_t *visited, bool *potentionally_overflowed, tree lhs)
86885 +{
86886 + gimple def_stmt = get_def_stmt(lhs);
86887 + tree rhs1 = gimple_assign_rhs1(def_stmt);
86888 +
86889 + if (is_gimple_constant(rhs1))
86890 + return create_assign(visited, potentionally_overflowed, def_stmt, lhs, AFTER_STMT);
86891 +
86892 + gcc_assert(TREE_CODE(rhs1) != COND_EXPR);
86893 + switch (TREE_CODE(rhs1)) {
86894 + case SSA_NAME:
86895 + return handle_unary_rhs(visited, potentionally_overflowed, def_stmt);
86896 + case ARRAY_REF:
86897 + case BIT_FIELD_REF:
86898 + case ADDR_EXPR:
86899 + case COMPONENT_REF:
86900 + case INDIRECT_REF:
86901 +#if BUILDING_GCC_VERSION >= 4006
86902 + case MEM_REF:
86903 +#endif
86904 + case PARM_DECL:
86905 + case TARGET_MEM_REF:
86906 + case VAR_DECL:
86907 + return create_assign(visited, potentionally_overflowed, def_stmt, lhs, AFTER_STMT);
86908 +
86909 + default:
86910 + debug_gimple_stmt(def_stmt);
86911 + debug_tree(rhs1);
86912 + gcc_unreachable();
86913 + }
86914 +}
86915 +
86916 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
86917 +{
86918 + gimple cond_stmt;
86919 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
86920 +
86921 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
86922 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
86923 + update_stmt(cond_stmt);
86924 +}
86925 +
86926 +static tree create_string_param(tree string)
86927 +{
86928 + tree i_type, a_type;
86929 + const int length = TREE_STRING_LENGTH(string);
86930 +
86931 + gcc_assert(length > 0);
86932 +
86933 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
86934 + a_type = build_array_type(char_type_node, i_type);
86935 +
86936 + TREE_TYPE(string) = a_type;
86937 + TREE_CONSTANT(string) = 1;
86938 + TREE_READONLY(string) = 1;
86939 +
86940 + return build1(ADDR_EXPR, ptr_type_node, string);
86941 +}
86942 +
86943 +static void insert_cond_result(basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
86944 +{
86945 + gimple func_stmt;
86946 + const_gimple def_stmt;
86947 + const_tree loc_line;
86948 + tree loc_file, ssa_name, current_func;
86949 + expanded_location xloc;
86950 + char ssa_name_buf[256];
86951 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
86952 +
86953 + def_stmt = get_def_stmt(arg);
86954 + xloc = expand_location(gimple_location(def_stmt));
86955 +
86956 + if (!gimple_has_location(def_stmt)) {
86957 + xloc = expand_location(gimple_location(stmt));
86958 + if (!gimple_has_location(stmt))
86959 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
86960 + }
86961 +
86962 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
86963 +
86964 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
86965 + loc_file = create_string_param(loc_file);
86966 +
86967 + current_func = build_string(NAME_LEN(current_function_decl) + 1, NAME(current_function_decl));
86968 + current_func = create_string_param(current_func);
86969 +
86970 + snprintf(ssa_name_buf, 256, "%s_%u (%s)\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max");
86971 + ssa_name = build_string(256, ssa_name_buf);
86972 + ssa_name = create_string_param(ssa_name);
86973 +
86974 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
86975 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
86976 +
86977 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
86978 +}
86979 +
86980 +static void __unused print_the_code_insertions(const_gimple stmt)
86981 +{
86982 + location_t loc = gimple_location(stmt);
86983 +
86984 + inform(loc, "Integer size_overflow check applied here.");
86985 +}
86986 +
86987 +static void insert_check_size_overflow(gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min)
86988 +{
86989 + basic_block cond_bb, join_bb, bb_true;
86990 + edge e;
86991 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
86992 +
86993 + cond_bb = gimple_bb(stmt);
86994 + if (before)
86995 + gsi_prev(&gsi);
86996 + if (gsi_end_p(gsi))
86997 + e = split_block_after_labels(cond_bb);
86998 + else
86999 + e = split_block(cond_bb, gsi_stmt(gsi));
87000 + cond_bb = e->src;
87001 + join_bb = e->dest;
87002 + e->flags = EDGE_FALSE_VALUE;
87003 + e->probability = REG_BR_PROB_BASE;
87004 +
87005 + bb_true = create_empty_bb(cond_bb);
87006 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
87007 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
87008 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
87009 +
87010 + if (dom_info_available_p(CDI_DOMINATORS)) {
87011 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
87012 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
87013 + }
87014 +
87015 + if (current_loops != NULL) {
87016 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
87017 + add_bb_to_loop(bb_true, cond_bb->loop_father);
87018 + }
87019 +
87020 + insert_cond(cond_bb, arg, cond_code, type_value);
87021 + insert_cond_result(bb_true, stmt, arg, min);
87022 +
87023 +// print_the_code_insertions(stmt);
87024 +}
87025 +
87026 +static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool *potentionally_overflowed, bool before)
87027 +{
87028 + const_tree rhs_type = TREE_TYPE(rhs);
87029 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
87030 +
87031 + gcc_assert(rhs_type != NULL_TREE);
87032 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == BOOLEAN_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
87033 +
87034 + if (!*potentionally_overflowed)
87035 + return;
87036 +
87037 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
87038 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
87039 +
87040 + gcc_assert(!TREE_OVERFLOW(type_max));
87041 +
87042 + cast_rhs_type = TREE_TYPE(cast_rhs);
87043 + type_max_type = TREE_TYPE(type_max);
87044 + type_min_type = TREE_TYPE(type_min);
87045 + gcc_assert(useless_type_conversion_p(cast_rhs_type, type_max_type));
87046 + gcc_assert(useless_type_conversion_p(type_max_type, type_min_type));
87047 +
87048 + insert_check_size_overflow(stmt, GT_EXPR, cast_rhs, type_max, before, false);
87049 + insert_check_size_overflow(stmt, LT_EXPR, cast_rhs, type_min, before, true);
87050 +}
87051 +
87052 +static tree get_size_overflow_type_for_intentional_overflow(gimple def_stmt, tree change_rhs)
87053 +{
87054 + gimple change_rhs_def_stmt;
87055 + tree lhs = gimple_get_lhs(def_stmt);
87056 + tree lhs_type = TREE_TYPE(lhs);
87057 + tree rhs1_type = TREE_TYPE(gimple_assign_rhs1(def_stmt));
87058 + tree rhs2_type = TREE_TYPE(gimple_assign_rhs2(def_stmt));
87059 +
87060 + if (change_rhs == NULL_TREE)
87061 + return get_size_overflow_type(def_stmt, lhs);
87062 +
87063 + change_rhs_def_stmt = get_def_stmt(change_rhs);
87064 +
87065 + if (TREE_CODE_CLASS(gimple_assign_rhs_code(def_stmt)) == tcc_comparison)
87066 + return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
87067 +
87068 + if (gimple_assign_rhs_code(def_stmt) == LSHIFT_EXPR)
87069 + return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
87070 +
87071 + if (gimple_assign_rhs_code(def_stmt) == RSHIFT_EXPR)
87072 + return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
87073 +
87074 + if (!useless_type_conversion_p(lhs_type, rhs1_type) || !useless_type_conversion_p(rhs1_type, rhs2_type)) {
87075 + debug_gimple_stmt(def_stmt);
87076 + gcc_unreachable();
87077 + }
87078 +
87079 + return get_size_overflow_type(def_stmt, lhs);
87080 +}
87081 +
87082 +static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
87083 +{
87084 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
87085 + return false;
87086 + if (!is_gimple_constant(rhs))
87087 + return false;
87088 + return true;
87089 +}
87090 +
87091 +static tree get_cast_def_stmt_rhs(const_tree new_rhs)
87092 +{
87093 + gimple def_stmt;
87094 +
87095 + def_stmt = get_def_stmt(new_rhs);
87096 + // get_size_overflow_type
87097 + if (LONG_TYPE_SIZE != GET_MODE_BITSIZE(SImode))
87098 + gcc_assert(gimple_assign_cast_p(def_stmt));
87099 + return gimple_assign_rhs1(def_stmt);
87100 +}
87101 +
87102 +static tree cast_to_int_TI_type_and_check(bool *potentionally_overflowed, gimple stmt, tree new_rhs)
87103 +{
87104 + gimple_stmt_iterator gsi;
87105 + const_gimple cast_stmt;
87106 + gimple def_stmt;
87107 + enum machine_mode mode = TYPE_MODE(TREE_TYPE(new_rhs));
87108 +
87109 + if (mode != TImode && mode != DImode) {
87110 + def_stmt = get_def_stmt(new_rhs);
87111 + gcc_assert(gimple_assign_cast_p(def_stmt));
87112 + new_rhs = gimple_assign_rhs1(def_stmt);
87113 + mode = TYPE_MODE(TREE_TYPE(new_rhs));
87114 + }
87115 +
87116 + gcc_assert(mode == TImode || mode == DImode);
87117 +
87118 + if (mode == TYPE_MODE(intTI_type_node) && useless_type_conversion_p(TREE_TYPE(new_rhs), intTI_type_node))
87119 + return new_rhs;
87120 +
87121 + gsi = gsi_for_stmt(stmt);
87122 + cast_stmt = build_cast_stmt(intTI_type_node, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
87123 + new_rhs = gimple_get_lhs(cast_stmt);
87124 +
87125 + if (mode == DImode)
87126 + return new_rhs;
87127 +
87128 + check_size_overflow(stmt, intTI_type_node, new_rhs, new_rhs, potentionally_overflowed, BEFORE_STMT);
87129 +
87130 + return new_rhs;
87131 +}
87132 +
87133 +static bool is_an_integer_trunction(const_gimple stmt)
87134 +{
87135 + gimple rhs1_def_stmt, rhs2_def_stmt;
87136 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1;
87137 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode;
87138 + const_tree rhs1 = gimple_assign_rhs1(stmt);
87139 + const_tree rhs2 = gimple_assign_rhs2(stmt);
87140 + enum machine_mode rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1));
87141 + enum machine_mode rhs2_mode = TYPE_MODE(TREE_TYPE(rhs2));
87142 +
87143 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
87144 + return false;
87145 +
87146 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
87147 +
87148 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR || rhs1_mode != SImode || rhs2_mode != SImode)
87149 + return false;
87150 +
87151 + rhs1_def_stmt = get_def_stmt(rhs1);
87152 + rhs2_def_stmt = get_def_stmt(rhs2);
87153 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
87154 + return false;
87155 +
87156 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
87157 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
87158 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
87159 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
87160 + if (rhs1_def_stmt_rhs1_mode != DImode || rhs2_def_stmt_rhs1_mode != DImode)
87161 + return false;
87162 +
87163 + gimple_set_plf(rhs1_def_stmt, NO_CAST_CHECK, true);
87164 + gimple_set_plf(rhs2_def_stmt, NO_CAST_CHECK, true);
87165 + return true;
87166 +}
87167 +
87168 +static tree handle_integer_truncation(struct pointer_set_t *visited, bool *potentionally_overflowed, tree lhs)
87169 +{
87170 + tree new_rhs1, new_rhs2;
87171 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
87172 + tree new_rhs1_def_stmt_rhs1_type, new_rhs2_def_stmt_rhs1_type;
87173 + gimple assign, stmt = get_def_stmt(lhs);
87174 + tree rhs1 = gimple_assign_rhs1(stmt);
87175 + tree rhs2 = gimple_assign_rhs2(stmt);
87176 +
87177 + if (!is_an_integer_trunction(stmt))
87178 + return NULL_TREE;
87179 +
87180 + new_rhs1 = expand(visited, potentionally_overflowed, rhs1);
87181 + new_rhs2 = expand(visited, potentionally_overflowed, rhs2);
87182 +
87183 + new_rhs1_def_stmt_rhs1 = get_cast_def_stmt_rhs(new_rhs1);
87184 + new_rhs2_def_stmt_rhs1 = get_cast_def_stmt_rhs(new_rhs2);
87185 +
87186 + new_rhs1_def_stmt_rhs1_type = TREE_TYPE(new_rhs1_def_stmt_rhs1);
87187 + new_rhs2_def_stmt_rhs1_type = TREE_TYPE(new_rhs2_def_stmt_rhs1);
87188 +
87189 + if (!useless_type_conversion_p(new_rhs1_def_stmt_rhs1_type, new_rhs2_def_stmt_rhs1_type)) {
87190 + new_rhs1_def_stmt_rhs1 = cast_to_int_TI_type_and_check(potentionally_overflowed, stmt, new_rhs1_def_stmt_rhs1);
87191 + new_rhs2_def_stmt_rhs1 = cast_to_int_TI_type_and_check(potentionally_overflowed, stmt, new_rhs2_def_stmt_rhs1);
87192 + }
87193 +
87194 + assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
87195 + new_lhs = gimple_get_lhs(assign);
87196 + check_size_overflow(assign, TREE_TYPE(new_lhs), new_lhs, rhs1, potentionally_overflowed, AFTER_STMT);
87197 +
87198 + return follow_overflow_type_and_dup(visited, potentionally_overflowed, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
87199 +}
87200 +
87201 +static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
87202 +{
87203 + const_gimple def_stmt;
87204 +
87205 + if (TREE_CODE(rhs) != SSA_NAME)
87206 + return false;
87207 +
87208 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
87209 + return false;
87210 +
87211 + def_stmt = get_def_stmt(rhs);
87212 + if (gimple_code(def_stmt) != GIMPLE_ASSIGN || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
87213 + return false;
87214 +
87215 + return true;
87216 +}
87217 +
87218 +static tree handle_intentional_overflow(struct pointer_set_t *visited, bool *potentionally_overflowed, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs1, tree new_rhs2)
87219 +{
87220 + tree new_rhs, size_overflow_type, orig_rhs;
87221 + void (*gimple_assign_set_rhs)(gimple, tree);
87222 + tree rhs1 = gimple_assign_rhs1(stmt);
87223 + tree rhs2 = gimple_assign_rhs2(stmt);
87224 + tree lhs = gimple_get_lhs(stmt);
87225 +
87226 + if (change_rhs == NULL_TREE)
87227 + return create_assign(visited, potentionally_overflowed, stmt, lhs, AFTER_STMT);
87228 +
87229 + if (new_rhs2 == NULL_TREE) {
87230 + size_overflow_type = get_size_overflow_type_for_intentional_overflow(stmt, new_rhs1);
87231 + new_rhs2 = cast_a_tree(size_overflow_type, rhs2);
87232 + orig_rhs = rhs1;
87233 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
87234 + } else {
87235 + size_overflow_type = get_size_overflow_type_for_intentional_overflow(stmt, new_rhs2);
87236 + new_rhs1 = cast_a_tree(size_overflow_type, rhs1);
87237 + orig_rhs = rhs2;
87238 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
87239 + }
87240 +
87241 + change_rhs = cast_to_new_size_overflow_type(stmt, change_rhs, size_overflow_type, BEFORE_STMT);
87242 +
87243 + if (check_overflow)
87244 + check_size_overflow(stmt, size_overflow_type, change_rhs, orig_rhs, potentionally_overflowed, BEFORE_STMT);
87245 +
87246 + new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs);
87247 + gimple_assign_set_rhs(stmt, new_rhs);
87248 + update_stmt(stmt);
87249 +
87250 + return create_assign(visited, potentionally_overflowed, stmt, lhs, AFTER_STMT);
87251 +}
87252 +
87253 +static tree handle_binary_ops(struct pointer_set_t *visited, bool *potentionally_overflowed, tree lhs)
87254 +{
87255 + tree rhs1, rhs2, new_lhs;
87256 + gimple def_stmt = get_def_stmt(lhs);
87257 + tree new_rhs1 = NULL_TREE;
87258 + tree new_rhs2 = NULL_TREE;
87259 +
87260 + rhs1 = gimple_assign_rhs1(def_stmt);
87261 + rhs2 = gimple_assign_rhs2(def_stmt);
87262 +
87263 + /* no DImode/TImode division in the 32/64 bit kernel */
87264 + switch (gimple_assign_rhs_code(def_stmt)) {
87265 + case RDIV_EXPR:
87266 + case TRUNC_DIV_EXPR:
87267 + case CEIL_DIV_EXPR:
87268 + case FLOOR_DIV_EXPR:
87269 + case ROUND_DIV_EXPR:
87270 + case TRUNC_MOD_EXPR:
87271 + case CEIL_MOD_EXPR:
87272 + case FLOOR_MOD_EXPR:
87273 + case ROUND_MOD_EXPR:
87274 + case EXACT_DIV_EXPR:
87275 + case POINTER_PLUS_EXPR:
87276 + case BIT_AND_EXPR:
87277 + return create_assign(visited, potentionally_overflowed, def_stmt, lhs, AFTER_STMT);
87278 + default:
87279 + break;
87280 + }
87281 +
87282 + *potentionally_overflowed = true;
87283 +
87284 + new_lhs = handle_integer_truncation(visited, potentionally_overflowed, lhs);
87285 + if (new_lhs != NULL_TREE)
87286 + return new_lhs;
87287 +
87288 + if (TREE_CODE(rhs1) == SSA_NAME)
87289 + new_rhs1 = expand(visited, potentionally_overflowed, rhs1);
87290 + if (TREE_CODE(rhs2) == SSA_NAME)
87291 + new_rhs2 = expand(visited, potentionally_overflowed, rhs2);
87292 +
87293 + if (is_a_neg_overflow(def_stmt, rhs2))
87294 + return handle_intentional_overflow(visited, potentionally_overflowed, true, def_stmt, new_rhs1, new_rhs1, NULL_TREE);
87295 + if (is_a_neg_overflow(def_stmt, rhs1))
87296 + return handle_intentional_overflow(visited, potentionally_overflowed, true, def_stmt, new_rhs2, NULL_TREE, new_rhs2);
87297 +
87298 + if (is_a_constant_overflow(def_stmt, rhs2))
87299 + return handle_intentional_overflow(visited, potentionally_overflowed, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, new_rhs1, NULL_TREE);
87300 + if (is_a_constant_overflow(def_stmt, rhs1))
87301 + return handle_intentional_overflow(visited, potentionally_overflowed, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, NULL_TREE, new_rhs2);
87302 +
87303 + return follow_overflow_type_and_dup(visited, potentionally_overflowed, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
87304 +}
87305 +
87306 +#if BUILDING_GCC_VERSION >= 4007
87307 +static tree get_new_rhs(struct pointer_set_t *visited, bool *potentionally_overflowed, tree size_overflow_type, tree rhs)
87308 +{
87309 + if (is_gimple_constant(rhs))
87310 + return cast_a_tree(size_overflow_type, rhs);
87311 + if (TREE_CODE(rhs) != SSA_NAME)
87312 + return NULL_TREE;
87313 + return expand(visited, potentionally_overflowed, rhs);
87314 +}
87315 +
87316 +static tree handle_ternary_ops(struct pointer_set_t *visited, bool *potentionally_overflowed, tree lhs)
87317 +{
87318 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
87319 + gimple def_stmt = get_def_stmt(lhs);
87320 +
87321 + *potentionally_overflowed = true;
87322 +
87323 + size_overflow_type = get_size_overflow_type(def_stmt, lhs);
87324 +
87325 + rhs1 = gimple_assign_rhs1(def_stmt);
87326 + rhs2 = gimple_assign_rhs2(def_stmt);
87327 + rhs3 = gimple_assign_rhs3(def_stmt);
87328 + new_rhs1 = get_new_rhs(visited, potentionally_overflowed, size_overflow_type, rhs1);
87329 + new_rhs2 = get_new_rhs(visited, potentionally_overflowed, size_overflow_type, rhs2);
87330 + new_rhs3 = get_new_rhs(visited, potentionally_overflowed, size_overflow_type, rhs3);
87331 +
87332 + return follow_overflow_type_and_dup(visited, potentionally_overflowed, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
87333 +}
87334 +#endif
87335 +
87336 +static tree get_size_overflow_type(gimple stmt, tree node)
87337 +{
87338 + tree type;
87339 +
87340 + gcc_assert(node != NULL_TREE);
87341 +
87342 + type = TREE_TYPE(node);
87343 +
87344 + if (gimple_plf(stmt, MY_STMT))
87345 + return TREE_TYPE(node);
87346 +
87347 + switch (TYPE_MODE(type)) {
87348 + case QImode:
87349 + return (TYPE_UNSIGNED(type)) ? unsigned_intHI_type_node : intHI_type_node;
87350 + case HImode:
87351 + return (TYPE_UNSIGNED(type)) ? unsigned_intSI_type_node : intSI_type_node;
87352 + case SImode:
87353 + return (TYPE_UNSIGNED(type)) ? unsigned_intDI_type_node : intDI_type_node;
87354 + case DImode:
87355 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
87356 + return (TYPE_UNSIGNED(type)) ? unsigned_intDI_type_node : intDI_type_node;
87357 + return (TYPE_UNSIGNED(type)) ? unsigned_intTI_type_node : intTI_type_node;
87358 + default:
87359 + debug_tree(node);
87360 + error("get_size_overflow_type: unsupported gcc configuration.");
87361 + gcc_unreachable();
87362 + }
87363 +}
87364 +
87365 +static tree expand_visited(gimple def_stmt)
87366 +{
87367 + const_gimple next_stmt;
87368 + gimple_stmt_iterator gsi = gsi_for_stmt(def_stmt);
87369 +
87370 + gsi_next(&gsi);
87371 + next_stmt = gsi_stmt(gsi);
87372 +
87373 + switch (gimple_code(next_stmt)) {
87374 + case GIMPLE_ASSIGN:
87375 + return gimple_get_lhs(next_stmt);
87376 + case GIMPLE_PHI:
87377 + return gimple_phi_result(next_stmt);
87378 + case GIMPLE_CALL:
87379 + return gimple_call_lhs(next_stmt);
87380 + default:
87381 + return NULL_TREE;
87382 + }
87383 +}
87384 +
87385 +static tree expand(struct pointer_set_t *visited, bool *potentionally_overflowed, tree lhs)
87386 +{
87387 + gimple def_stmt;
87388 + enum tree_code code = TREE_CODE(TREE_TYPE(lhs));
87389 +
87390 + if (is_gimple_constant(lhs))
87391 + return NULL_TREE;
87392 +
87393 + if (TREE_CODE(lhs) == ADDR_EXPR)
87394 + return NULL_TREE;
87395 +
87396 + gcc_assert(code == INTEGER_TYPE || code == POINTER_TYPE || code == BOOLEAN_TYPE || code == ENUMERAL_TYPE);
87397 +
87398 + if (TREE_CODE(SSA_NAME_VAR(lhs)) == PARM_DECL)
87399 + check_missing_attribute(lhs);
87400 +
87401 + def_stmt = get_def_stmt(lhs);
87402 +
87403 + if (!def_stmt)
87404 + return NULL_TREE;
87405 +
87406 + if (gimple_plf(def_stmt, MY_STMT))
87407 + return lhs;
87408 +
87409 + if (pointer_set_contains(visited, def_stmt))
87410 + return expand_visited(def_stmt);
87411 +
87412 + switch (gimple_code(def_stmt)) {
87413 + case GIMPLE_NOP:
87414 + check_missing_attribute(lhs);
87415 + return NULL_TREE;
87416 + case GIMPLE_PHI:
87417 + return build_new_phi(visited, potentionally_overflowed, lhs);
87418 + case GIMPLE_CALL:
87419 + case GIMPLE_ASM:
87420 + return create_assign(visited, potentionally_overflowed, def_stmt, lhs, AFTER_STMT);
87421 + case GIMPLE_ASSIGN:
87422 + switch (gimple_num_ops(def_stmt)) {
87423 + case 2:
87424 + return handle_unary_ops(visited, potentionally_overflowed, lhs);
87425 + case 3:
87426 + return handle_binary_ops(visited, potentionally_overflowed, lhs);
87427 +#if BUILDING_GCC_VERSION >= 4007
87428 + case 4:
87429 + return handle_ternary_ops(visited, potentionally_overflowed, lhs);
87430 +#endif
87431 + }
87432 + default:
87433 + debug_gimple_stmt(def_stmt);
87434 + error("expand: unknown gimple code");
87435 + gcc_unreachable();
87436 + }
87437 +}
87438 +
87439 +static void change_function_arg(gimple stmt, const_tree origarg, unsigned int argnum, tree newarg)
87440 +{
87441 + const_gimple assign;
87442 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
87443 + tree origtype = TREE_TYPE(origarg);
87444 +
87445 + gcc_assert(gimple_code(stmt) == GIMPLE_CALL);
87446 +
87447 + assign = build_cast_stmt(origtype, newarg, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
87448 +
87449 + gimple_call_set_arg(stmt, argnum, gimple_get_lhs(assign));
87450 + update_stmt(stmt);
87451 +}
87452 +
87453 +static tree get_function_arg(unsigned int argnum, const_gimple stmt, const_tree fndecl)
87454 +{
87455 + const char *origid;
87456 + tree arg;
87457 + const_tree origarg;
87458 +
87459 + if (!DECL_ABSTRACT_ORIGIN(fndecl)) {
87460 + gcc_assert(gimple_call_num_args(stmt) > argnum);
87461 + return gimple_call_arg(stmt, argnum);
87462 + }
87463 +
87464 + origarg = DECL_ARGUMENTS(DECL_ABSTRACT_ORIGIN(fndecl));
87465 + while (origarg && argnum) {
87466 + argnum--;
87467 + origarg = TREE_CHAIN(origarg);
87468 + }
87469 +
87470 + gcc_assert(argnum == 0);
87471 +
87472 + gcc_assert(origarg != NULL_TREE);
87473 + origid = NAME(origarg);
87474 + for (arg = DECL_ARGUMENTS(fndecl); arg; arg = TREE_CHAIN(arg)) {
87475 + if (!strcmp(origid, NAME(arg)))
87476 + return arg;
87477 + }
87478 + return NULL_TREE;
87479 +}
87480 +
87481 +static void handle_function_arg(gimple stmt, const_tree fndecl, unsigned int argnum)
87482 +{
87483 + struct pointer_set_t *visited;
87484 + tree arg, newarg;
87485 + bool potentionally_overflowed;
87486 +
87487 + arg = get_function_arg(argnum, stmt, fndecl);
87488 + if (arg == NULL_TREE)
87489 + return;
87490 +
87491 + if (is_gimple_constant(arg))
87492 + return;
87493 + if (TREE_CODE(arg) != SSA_NAME)
87494 + return;
87495 +
87496 + check_arg_type(arg);
87497 +
87498 + visited = pointer_set_create();
87499 + potentionally_overflowed = false;
87500 + newarg = expand(visited, &potentionally_overflowed, arg);
87501 + pointer_set_destroy(visited);
87502 +
87503 + if (newarg == NULL_TREE || !potentionally_overflowed)
87504 + return;
87505 +
87506 + change_function_arg(stmt, arg, argnum, newarg);
87507 +
87508 + check_size_overflow(stmt, TREE_TYPE(newarg), newarg, arg, &potentionally_overflowed, BEFORE_STMT);
87509 +}
87510 +
87511 +static void handle_function_by_attribute(gimple stmt, const_tree attr, const_tree fndecl)
87512 +{
87513 + tree p = TREE_VALUE(attr);
87514 + do {
87515 + handle_function_arg(stmt, fndecl, TREE_INT_CST_LOW(TREE_VALUE(p))-1);
87516 + p = TREE_CHAIN(p);
87517 + } while (p);
87518 +}
87519 +
87520 +static void handle_function_by_hash(gimple stmt, const_tree fndecl)
87521 +{
87522 + const_tree orig_fndecl;
87523 + unsigned int num;
87524 + const struct size_overflow_hash *hash;
87525 +
87526 + orig_fndecl = get_original_function_decl(fndecl);
87527 + hash = get_function_hash(orig_fndecl);
87528 + if (!hash)
87529 + return;
87530 +
87531 + for (num = 1; num <= MAX_PARAM; num++)
87532 + if (hash->param & (1U << num))
87533 + handle_function_arg(stmt, fndecl, num - 1);
87534 +}
87535 +
87536 +static void set_plf_false(void)
87537 +{
87538 + basic_block bb;
87539 +
87540 + FOR_ALL_BB(bb) {
87541 + gimple_stmt_iterator si;
87542 +
87543 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
87544 + gimple_set_plf(gsi_stmt(si), MY_STMT, false);
87545 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
87546 + gimple_set_plf(gsi_stmt(si), MY_STMT, false);
87547 + }
87548 +}
87549 +
87550 +static unsigned int handle_function(void)
87551 +{
87552 + basic_block next, bb = ENTRY_BLOCK_PTR->next_bb;
87553 +
87554 + set_plf_false();
87555 +
87556 + do {
87557 + gimple_stmt_iterator gsi;
87558 + next = bb->next_bb;
87559 +
87560 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
87561 + const_tree fndecl, attr;
87562 + gimple stmt = gsi_stmt(gsi);
87563 +
87564 + if (!(is_gimple_call(stmt)))
87565 + continue;
87566 + fndecl = gimple_call_fndecl(stmt);
87567 + if (fndecl == NULL_TREE)
87568 + continue;
87569 + if (gimple_call_num_args(stmt) == 0)
87570 + continue;
87571 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
87572 + if (!attr || !TREE_VALUE(attr))
87573 + handle_function_by_hash(stmt, fndecl);
87574 + else
87575 + handle_function_by_attribute(stmt, attr, fndecl);
87576 + gsi = gsi_for_stmt(stmt);
87577 + next = gimple_bb(stmt)->next_bb;
87578 + }
87579 + bb = next;
87580 + } while (bb);
87581 + return 0;
87582 +}
87583 +
87584 +static struct gimple_opt_pass size_overflow_pass = {
87585 + .pass = {
87586 + .type = GIMPLE_PASS,
87587 + .name = "size_overflow",
87588 + .gate = NULL,
87589 + .execute = handle_function,
87590 + .sub = NULL,
87591 + .next = NULL,
87592 + .static_pass_number = 0,
87593 + .tv_id = TV_NONE,
87594 + .properties_required = PROP_cfg | PROP_referenced_vars,
87595 + .properties_provided = 0,
87596 + .properties_destroyed = 0,
87597 + .todo_flags_start = 0,
87598 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi | TODO_cleanup_cfg | TODO_ggc_collect | TODO_verify_flow
87599 + }
87600 +};
87601 +
87602 +static void start_unit_callback(void __unused *gcc_data, void __unused *user_data)
87603 +{
87604 + tree fntype;
87605 +
87606 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
87607 +
87608 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
87609 + fntype = build_function_type_list(void_type_node,
87610 + const_char_ptr_type_node,
87611 + unsigned_type_node,
87612 + const_char_ptr_type_node,
87613 + const_char_ptr_type_node,
87614 + NULL_TREE);
87615 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
87616 +
87617 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
87618 + TREE_PUBLIC(report_size_overflow_decl) = 1;
87619 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
87620 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
87621 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
87622 +}
87623 +
87624 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
87625 +{
87626 + int i;
87627 + const char * const plugin_name = plugin_info->base_name;
87628 + const int argc = plugin_info->argc;
87629 + const struct plugin_argument * const argv = plugin_info->argv;
87630 + bool enable = true;
87631 +
87632 + struct register_pass_info size_overflow_pass_info = {
87633 + .pass = &size_overflow_pass.pass,
87634 + .reference_pass_name = "ssa",
87635 + .ref_pass_instance_number = 1,
87636 + .pos_op = PASS_POS_INSERT_AFTER
87637 + };
87638 +
87639 + if (!plugin_default_version_check(version, &gcc_version)) {
87640 + error(G_("incompatible gcc/plugin versions"));
87641 + return 1;
87642 + }
87643 +
87644 + for (i = 0; i < argc; ++i) {
87645 + if (!strcmp(argv[i].key, "no-size-overflow")) {
87646 + enable = false;
87647 + continue;
87648 + }
87649 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87650 + }
87651 +
87652 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
87653 + if (enable) {
87654 + register_callback("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
87655 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &size_overflow_pass_info);
87656 + }
87657 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
87658 +
87659 + return 0;
87660 +}
87661 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
87662 new file mode 100644
87663 index 0000000..38d2014
87664 --- /dev/null
87665 +++ b/tools/gcc/stackleak_plugin.c
87666 @@ -0,0 +1,313 @@
87667 +/*
87668 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
87669 + * Licensed under the GPL v2
87670 + *
87671 + * Note: the choice of the license means that the compilation process is
87672 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
87673 + * but for the kernel it doesn't matter since it doesn't link against
87674 + * any of the gcc libraries
87675 + *
87676 + * gcc plugin to help implement various PaX features
87677 + *
87678 + * - track lowest stack pointer
87679 + *
87680 + * TODO:
87681 + * - initialize all local variables
87682 + *
87683 + * BUGS:
87684 + * - none known
87685 + */
87686 +#include "gcc-plugin.h"
87687 +#include "config.h"
87688 +#include "system.h"
87689 +#include "coretypes.h"
87690 +#include "tree.h"
87691 +#include "tree-pass.h"
87692 +#include "flags.h"
87693 +#include "intl.h"
87694 +#include "toplev.h"
87695 +#include "plugin.h"
87696 +//#include "expr.h" where are you...
87697 +#include "diagnostic.h"
87698 +#include "plugin-version.h"
87699 +#include "tm.h"
87700 +#include "function.h"
87701 +#include "basic-block.h"
87702 +#include "gimple.h"
87703 +#include "rtl.h"
87704 +#include "emit-rtl.h"
87705 +
87706 +extern void print_gimple_stmt(FILE *, gimple, int, int);
87707 +
87708 +int plugin_is_GPL_compatible;
87709 +
87710 +static int track_frame_size = -1;
87711 +static const char track_function[] = "pax_track_stack";
87712 +static const char check_function[] = "pax_check_alloca";
87713 +static bool init_locals;
87714 +
87715 +static struct plugin_info stackleak_plugin_info = {
87716 + .version = "201203140940",
87717 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
87718 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
87719 +};
87720 +
87721 +static bool gate_stackleak_track_stack(void);
87722 +static unsigned int execute_stackleak_tree_instrument(void);
87723 +static unsigned int execute_stackleak_final(void);
87724 +
87725 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
87726 + .pass = {
87727 + .type = GIMPLE_PASS,
87728 + .name = "stackleak_tree_instrument",
87729 + .gate = gate_stackleak_track_stack,
87730 + .execute = execute_stackleak_tree_instrument,
87731 + .sub = NULL,
87732 + .next = NULL,
87733 + .static_pass_number = 0,
87734 + .tv_id = TV_NONE,
87735 + .properties_required = PROP_gimple_leh | PROP_cfg,
87736 + .properties_provided = 0,
87737 + .properties_destroyed = 0,
87738 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
87739 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
87740 + }
87741 +};
87742 +
87743 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
87744 + .pass = {
87745 + .type = RTL_PASS,
87746 + .name = "stackleak_final",
87747 + .gate = gate_stackleak_track_stack,
87748 + .execute = execute_stackleak_final,
87749 + .sub = NULL,
87750 + .next = NULL,
87751 + .static_pass_number = 0,
87752 + .tv_id = TV_NONE,
87753 + .properties_required = 0,
87754 + .properties_provided = 0,
87755 + .properties_destroyed = 0,
87756 + .todo_flags_start = 0,
87757 + .todo_flags_finish = TODO_dump_func
87758 + }
87759 +};
87760 +
87761 +static bool gate_stackleak_track_stack(void)
87762 +{
87763 + return track_frame_size >= 0;
87764 +}
87765 +
87766 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
87767 +{
87768 + gimple check_alloca;
87769 + tree fntype, fndecl, alloca_size;
87770 +
87771 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
87772 + fndecl = build_fn_decl(check_function, fntype);
87773 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
87774 +
87775 + // insert call to void pax_check_alloca(unsigned long size)
87776 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
87777 + check_alloca = gimple_build_call(fndecl, 1, alloca_size);
87778 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
87779 +}
87780 +
87781 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
87782 +{
87783 + gimple track_stack;
87784 + tree fntype, fndecl;
87785 +
87786 + fntype = build_function_type_list(void_type_node, NULL_TREE);
87787 + fndecl = build_fn_decl(track_function, fntype);
87788 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
87789 +
87790 + // insert call to void pax_track_stack(void)
87791 + track_stack = gimple_build_call(fndecl, 0);
87792 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
87793 +}
87794 +
87795 +#if BUILDING_GCC_VERSION == 4005
87796 +static bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
87797 +{
87798 + tree fndecl;
87799 +
87800 + if (!is_gimple_call(stmt))
87801 + return false;
87802 + fndecl = gimple_call_fndecl(stmt);
87803 + if (!fndecl)
87804 + return false;
87805 + if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
87806 + return false;
87807 +// print_node(stderr, "pax", fndecl, 4);
87808 + return DECL_FUNCTION_CODE(fndecl) == code;
87809 +}
87810 +#endif
87811 +
87812 +static bool is_alloca(gimple stmt)
87813 +{
87814 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
87815 + return true;
87816 +
87817 +#if BUILDING_GCC_VERSION >= 4007
87818 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
87819 + return true;
87820 +#endif
87821 +
87822 + return false;
87823 +}
87824 +
87825 +static unsigned int execute_stackleak_tree_instrument(void)
87826 +{
87827 + basic_block bb, entry_bb;
87828 + bool prologue_instrumented = false, is_leaf = true;
87829 +
87830 + entry_bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
87831 +
87832 + // 1. loop through BBs and GIMPLE statements
87833 + FOR_EACH_BB(bb) {
87834 + gimple_stmt_iterator gsi;
87835 +
87836 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
87837 + gimple stmt;
87838 +
87839 + stmt = gsi_stmt(gsi);
87840 +
87841 + if (is_gimple_call(stmt))
87842 + is_leaf = false;
87843 +
87844 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
87845 + if (!is_alloca(stmt))
87846 + continue;
87847 +
87848 + // 2. insert stack overflow check before each __builtin_alloca call
87849 + stackleak_check_alloca(&gsi);
87850 +
87851 + // 3. insert track call after each __builtin_alloca call
87852 + stackleak_add_instrumentation(&gsi);
87853 + if (bb == entry_bb)
87854 + prologue_instrumented = true;
87855 + }
87856 + }
87857 +
87858 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
87859 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
87860 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
87861 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
87862 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
87863 + return 0;
87864 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
87865 + return 0;
87866 +
87867 + // 4. insert track call at the beginning
87868 + if (!prologue_instrumented) {
87869 + gimple_stmt_iterator gsi;
87870 +
87871 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
87872 + if (dom_info_available_p(CDI_DOMINATORS))
87873 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
87874 + gsi = gsi_start_bb(bb);
87875 + stackleak_add_instrumentation(&gsi);
87876 + }
87877 +
87878 + return 0;
87879 +}
87880 +
87881 +static unsigned int execute_stackleak_final(void)
87882 +{
87883 + rtx insn;
87884 +
87885 + if (cfun->calls_alloca)
87886 + return 0;
87887 +
87888 + // keep calls only if function frame is big enough
87889 + if (get_frame_size() >= track_frame_size)
87890 + return 0;
87891 +
87892 + // 1. find pax_track_stack calls
87893 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
87894 + // 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))
87895 + rtx body;
87896 +
87897 + if (!CALL_P(insn))
87898 + continue;
87899 + body = PATTERN(insn);
87900 + if (GET_CODE(body) != CALL)
87901 + continue;
87902 + body = XEXP(body, 0);
87903 + if (GET_CODE(body) != MEM)
87904 + continue;
87905 + body = XEXP(body, 0);
87906 + if (GET_CODE(body) != SYMBOL_REF)
87907 + continue;
87908 + if (strcmp(XSTR(body, 0), track_function))
87909 + continue;
87910 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
87911 + // 2. delete call
87912 + insn = delete_insn_and_edges(insn);
87913 +#if BUILDING_GCC_VERSION >= 4007
87914 + if (GET_CODE(insn) == NOTE && NOTE_KIND(insn) == NOTE_INSN_CALL_ARG_LOCATION)
87915 + insn = delete_insn_and_edges(insn);
87916 +#endif
87917 + }
87918 +
87919 +// print_simple_rtl(stderr, get_insns());
87920 +// print_rtl(stderr, get_insns());
87921 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
87922 +
87923 + return 0;
87924 +}
87925 +
87926 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
87927 +{
87928 + const char * const plugin_name = plugin_info->base_name;
87929 + const int argc = plugin_info->argc;
87930 + const struct plugin_argument * const argv = plugin_info->argv;
87931 + int i;
87932 + struct register_pass_info stackleak_tree_instrument_pass_info = {
87933 + .pass = &stackleak_tree_instrument_pass.pass,
87934 +// .reference_pass_name = "tree_profile",
87935 + .reference_pass_name = "optimized",
87936 + .ref_pass_instance_number = 1,
87937 + .pos_op = PASS_POS_INSERT_BEFORE
87938 + };
87939 + struct register_pass_info stackleak_final_pass_info = {
87940 + .pass = &stackleak_final_rtl_opt_pass.pass,
87941 + .reference_pass_name = "final",
87942 + .ref_pass_instance_number = 1,
87943 + .pos_op = PASS_POS_INSERT_BEFORE
87944 + };
87945 +
87946 + if (!plugin_default_version_check(version, &gcc_version)) {
87947 + error(G_("incompatible gcc/plugin versions"));
87948 + return 1;
87949 + }
87950 +
87951 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
87952 +
87953 + for (i = 0; i < argc; ++i) {
87954 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
87955 + if (!argv[i].value) {
87956 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87957 + continue;
87958 + }
87959 + track_frame_size = atoi(argv[i].value);
87960 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
87961 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
87962 + continue;
87963 + }
87964 + if (!strcmp(argv[i].key, "initialize-locals")) {
87965 + if (argv[i].value) {
87966 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
87967 + continue;
87968 + }
87969 + init_locals = true;
87970 + continue;
87971 + }
87972 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87973 + }
87974 +
87975 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
87976 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
87977 +
87978 + return 0;
87979 +}
87980 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
87981 index 6789d78..4afd019 100644
87982 --- a/tools/perf/util/include/asm/alternative-asm.h
87983 +++ b/tools/perf/util/include/asm/alternative-asm.h
87984 @@ -5,4 +5,7 @@
87985
87986 #define altinstruction_entry #
87987
87988 + .macro pax_force_retaddr rip=0, reload=0
87989 + .endm
87990 +
87991 #endif
87992 diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
87993 index af0f22f..9a7d479 100644
87994 --- a/usr/gen_init_cpio.c
87995 +++ b/usr/gen_init_cpio.c
87996 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name, const char *location,
87997 int retval;
87998 int rc = -1;
87999 int namesize;
88000 - int i;
88001 + unsigned int i;
88002
88003 mode |= S_IFREG;
88004
88005 @@ -392,9 +392,10 @@ static char *cpio_replace_env(char *new_location)
88006 *env_var = *expanded = '\0';
88007 strncat(env_var, start + 2, end - start - 2);
88008 strncat(expanded, new_location, start - new_location);
88009 - strncat(expanded, getenv(env_var), PATH_MAX);
88010 - strncat(expanded, end + 1, PATH_MAX);
88011 + strncat(expanded, getenv(env_var), PATH_MAX - strlen(expanded));
88012 + strncat(expanded, end + 1, PATH_MAX - strlen(expanded));
88013 strncpy(new_location, expanded, PATH_MAX);
88014 + new_location[PATH_MAX] = 0;
88015 } else
88016 break;
88017 }
88018 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
88019 index 44ee712..7da730b 100644
88020 --- a/virt/kvm/kvm_main.c
88021 +++ b/virt/kvm/kvm_main.c
88022 @@ -75,7 +75,7 @@ LIST_HEAD(vm_list);
88023
88024 static cpumask_var_t cpus_hardware_enabled;
88025 static int kvm_usage_count = 0;
88026 -static atomic_t hardware_enable_failed;
88027 +static atomic_unchecked_t hardware_enable_failed;
88028
88029 struct kmem_cache *kvm_vcpu_cache;
88030 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
88031 @@ -2291,7 +2291,7 @@ static void hardware_enable_nolock(void *junk)
88032
88033 if (r) {
88034 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
88035 - atomic_inc(&hardware_enable_failed);
88036 + atomic_inc_unchecked(&hardware_enable_failed);
88037 printk(KERN_INFO "kvm: enabling virtualization on "
88038 "CPU%d failed\n", cpu);
88039 }
88040 @@ -2345,10 +2345,10 @@ static int hardware_enable_all(void)
88041
88042 kvm_usage_count++;
88043 if (kvm_usage_count == 1) {
88044 - atomic_set(&hardware_enable_failed, 0);
88045 + atomic_set_unchecked(&hardware_enable_failed, 0);
88046 on_each_cpu(hardware_enable_nolock, NULL, 1);
88047
88048 - if (atomic_read(&hardware_enable_failed)) {
88049 + if (atomic_read_unchecked(&hardware_enable_failed)) {
88050 hardware_disable_all_nolock();
88051 r = -EBUSY;
88052 }
88053 @@ -2709,7 +2709,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
88054 kvm_arch_vcpu_put(vcpu);
88055 }
88056
88057 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
88058 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
88059 struct module *module)
88060 {
88061 int r;
88062 @@ -2772,7 +2772,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
88063 if (!vcpu_align)
88064 vcpu_align = __alignof__(struct kvm_vcpu);
88065 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
88066 - 0, NULL);
88067 + SLAB_USERCOPY, NULL);
88068 if (!kvm_vcpu_cache) {
88069 r = -ENOMEM;
88070 goto out_free_3;
88071 @@ -2782,9 +2782,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
88072 if (r)
88073 goto out_free;
88074
88075 - kvm_chardev_ops.owner = module;
88076 - kvm_vm_fops.owner = module;
88077 - kvm_vcpu_fops.owner = module;
88078 + pax_open_kernel();
88079 + *(void **)&kvm_chardev_ops.owner = module;
88080 + *(void **)&kvm_vm_fops.owner = module;
88081 + *(void **)&kvm_vcpu_fops.owner = module;
88082 + pax_close_kernel();
88083
88084 r = misc_register(&kvm_dev);
88085 if (r) {
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)